Version cleanup

Package-Manager: portage-2.1.11.2/cvs/Linux x86_64

5 files changed, 19 insertions, 391 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index c73316d28200..fda3e8d51984 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.190 2012/06/27 17:52:13 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.191 2012/06/27 17:54:53 lack Exp $
+
+  27 Jun 2012; Jim Ramsay <jim_ramsay@gentoo.org> -gkrellm-2.3.2-r1.ebuild,
+  -gkrellm-2.3.2.ebuild, -gkrellm-2.3.4.ebuild, gkrellm-2.3.5.ebuild:
+  Version cleanup
 
 *gkrellm-2.3.5-r1 (27 Jun 2012)
 
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 1a389616cc94..ddfb3974a7a6 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -6,30 +6,25 @@ AUX gkrellm-2.3.5-autofs.patch 363 RMD160 e2595563b8d6ffd31b1d8399451003022d74cc
 AUX gkrellm-2.3.5-cifs.patch 496 RMD160 96f9841d8ca0a8de0ee200acbb7a413ac3bf37d7 SHA1 141cb03c1693de4356f50f49f6c50910f82f68c1 SHA256 3b669243b900753f0b913cd8764b0f4389c684680ade75c60eaca2820b8caedc
 AUX gkrellmd 640 RMD160 13a345a246e9f7b7895a169829e78633498a0985 SHA1 96187e80c4c04ba19cb3cbba4fc321c4bdf007cc SHA256 68eafd11f1c1ff7080a2117facd62d8a3124993fc513c050387f6f32b02dd9f1
 AUX gkrellmd.conf 250 RMD160 4bef31a2562432515dfeb0c05acbba66863aa3b9 SHA1 e7374680680bc587c3bd8a8dba57fa619f20db45 SHA256 66ba64c7a3ce2d97ba2feebf3c38e75b278bbbe152c71472e363d720b198b935
-DIST gkrellm-2.3.2.tar.bz2 747697 RMD160 0aacc0d0783cff5bb2fd8c6736553a3ce8874ad9 SHA1 fe94996c4fe084c28bf7a7fbc3f8d4fd64724ac0 SHA256 a102e681cbcc45f8cb225ca0a321b62772106d6f0bb372eaa026b5a2da840873
-DIST gkrellm-2.3.4.tar.bz2 757875 RMD160 db60d996c732a18d55b7f9489594ca040beca535 SHA1 f02c7a3093df3b5c52123a79a3ddbe573da36a49 SHA256 3447b169134d220f30a42cef2e2f9c8a0141d4ddfdf7dd4c3bbae278fb154f56
 DIST gkrellm-2.3.5.tar.bz2 765011 RMD160 6ac017985981a8731690a54a296e673b6bf7fab0 SHA1 bcfc2efb5fd3f27e9bb703bda73f6a1d96b080df SHA256 702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b
-EBUILD gkrellm-2.3.2-r1.ebuild 3218 RMD160 3e3fa40d921274cd32269a40fa6882c9ec5be803 SHA1 b8541a260c2d3ec8deb82a0f30d7b125f725bc9d SHA256 d4a217ec8819ea52b0bcb7fa43c3678a29ed643d00b3631b7ebf99a3a8e3cf4c
-EBUILD gkrellm-2.3.2.ebuild 3173 RMD160 1f548ddcee6b3d202c62a7f22afcaf806a52500a SHA1 7aee8bbe8de577753c2c3f3e317a85bba7831fa9 SHA256 7003fa2af7e90ad601156cbb64fda30fbaa795776784763722949d88fb6cd9ce
-EBUILD gkrellm-2.3.4.ebuild 3248 RMD160 52612d34f11a198e41b7ec7c5626046bb34acde2 SHA1 66b66c03bd0596357f56df5395b0f76cbae9f67c SHA256 63c526e1a7799c16b517c77249c334aaf76f1140dbe9ffbe3afcafe9ff3063fa
 EBUILD gkrellm-2.3.5-r1.ebuild 3156 RMD160 9e5e17b9e8e83c2acafe92bb81f0d04c1c68151a SHA1 534848fce085e1b60e815f4e0dba08ab2b34e688 SHA256 d200b9ecb2f3e5c6a374bacd7ca0e9c4f2d8db8b5dd4f2571bb0fb2becc041d8
 EBUILD gkrellm-2.3.5.ebuild 3206 RMD160 12ca18f576080f57e5c3b4caf5291bf5e0f5dcc5 SHA1 169f5d9f73e2bb93357148ebc35b4a90005227ed SHA256 c8c7cf7593dc4f15370ef25e0095fc173ddb31a9fda5eeb8592a61c19a11909a
-MISC ChangeLog 26177 RMD160 9071a259d9d0eed4aca7437b3c0772d277cdf23a SHA1 6b4e20e0a9db0c1dfeb40a2931d98e8005d63f95 SHA256 58d6d874cd469aaa649c388d75b6628022f3630c484ce7e1f778062336aa6efd
+MISC ChangeLog 26342 RMD160 0f63e6ea2e5b879989e247df6f6a1e523e77a2ef SHA1 0b6ccabf443c76d6b89d45358ea59c3e120686ab SHA256 42831a1c1b42db30ad4ae7fa03a0e8b65de869f78e42e087558e1ecb1f1bb6fb
 MISC metadata.xml 940 RMD160 e85c2b39ba9e3d4fcdf2b314e9357b17e9b2aad2 SHA1 989f5eaebb57c3d432c9b1a9ae8cdee0f0729f5a SHA256 000169e157ad6f8af0d7506f288212f54640b849a4229467bccad41e924c6324
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP60hYAAoJEA8o5SF9Rr6qrNoP/jVSacUH2wa4ou36FW2BxiGc
-6Q5O1TfZ4lupRwjF+IhFktHkt+GMTQAyb0PS0ey4GlAIfAKqLofwtrsQ1xg8Kz49
-03cxlqqGoHV78B2QacEg6mDHAbR8tKAUXfQBBd0L/rw1tOucbQZZBGupHwjMD169
-7K85Rh4usz9C3oRBDF71Xl7HffzGCFT7wdrtMCZjF3Y7LUZabV+8E3ShtkkCHAPn
-aQZbnZksPVt4vfZmFj+mi7Dou9YFFoTWb2QNbXaAmPrs3CPBCbci9fRJ0Rx6HYr0
-XRJSVIAB47ATQB9pUexiup/VogJEy/d4WeOac04MIz77tXPyjImEzSPZtgnvnIJ0
-1tWGGg61QtWJz2oMZ4q9Z4e/6Fq/ZHNTvkdpQ5pkF5cAL5v3PtmCAgCqgVvxs8pw
-HtMPosXZOnEXPbH0lAHt+UxZA/MKf0XaC+5RDhRbB5KjCRC953rpER3Jp6b1107C
-O6fB1TjysFf/RdmL10s80oHbHwmapy3LJ4tN3rS2R1NrkYZjRZg8Li/tKa3ZdHBa
-f7BS9XOIjD+1Q++lqwEei81/SoVUImiuvM2+yoCfYXjkRNbCXmZqGg0AWkttWNLG
-hZtoCDtSgf7vAiHIsVVLzwRBdA2JyXt9xLAiFRp6YVxzV5FuKnEcvjH9E/C6uRCe
-Qlb9l6QA0r8f0wvB9xDo
-=bXWl
+iQIcBAEBAgAGBQJP60jyAAoJEA8o5SF9Rr6qxlwP/1qoWBFZx9N5Y911bpAgfBdG
+WrMY106/9GabY1qoIyvzSE01Tg92mnl8mszFqA8EKv9qS6qZu5fVR8q+roi2etU7
+z8G7VKd84+OxoKCvHOEeL79f3j3WnPWsZFNK/moe3D34mzOKzJFh1vTNKeAsBLWb
+ykSyR18TaVXTWSe7wxZKYdAZjMVNI62vxLM59fTvvIfB5hCthETppdOnzTwhvhI6
+npFNsHEeEbGsPNd4f3a5kiXcKYlgsn8O9qVq281QuQC+lqh6X7dxuammeeSPCut+
+avIV6jCyLhlFKuBJO4ouYaS5ZROnvYJxSBWzdLZa1deDN2nrAMcxJjsYlauudYAw
+mruLkHm+RlJR+IjIjhLjFcVJSlJ09G5viUCTEsODTQJEf2XRIyirJy60okbYNC03
+r2n4nlrivQ7C9DoXqGixchu63xv5KjvvJYVFiAvvklPh4EI7/48IY0z8huMqxNa8
+1VbiFBJQKMYLQpvffVgyMbyXg7qooyEBMaf3ALYevBxI+IudB+xGS6qLvAv6iwt4
+rgBiyhAiApwzSW/vTE+YooPIhoT7k3bgIe5eJM/u/Z/pcc3BnN1ohfYEvZq4/wRM
+4zn56XFIqOw33u1a5vws2T6j3eBAoC+aHIOcmf0u2og4dj+zswGOX7ZWhV2rXeUR
+Gt/T+8efPfeR6yOUgvCN
+=AXg1
 -----END PGP SIGNATURE-----
diff --git a/app-admin/gkrellm/gkrellm-2.3.2-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.2-r1.ebuild
deleted file mode 100644
index 26a84106fe2e..000000000000
--- a/app-admin/gkrellm/gkrellm-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.2-r1.ebuild,v 1.9 2012/05/31 02:30:55 zmedico Exp $
-
-EAPI=2
-
-inherit eutils multilib toolchain-funcs user
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD"
-
-RDEPEND="dev-libs/glib:2
-	hddtemp? ( app-admin/hddtemp )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( ssl? ( dev-libs/openssl ) )
-	lm_sensors? ( sys-apps/lm_sensors )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	X? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	enewgroup gkrellmd
-	enewuser gkrellmd -1 -1 -1 gkrellmd
-	TARGET=
-	use kernel_FreeBSD && TARGET="freebsd"
-}
-
-src_prepare() {
-	sed -e 's:-O2 ::' \
-		-e 's:override CC:CFLAGS:' \
-		-i */Makefile || die "sed Makefile(s) failed"
-
-	sed -e 's:#user\tnobody:user\tgkrellmd:' \
-		-e 's:#group\tproc:group\tgkrellmd:' \
-		-i server/gkrellmd.conf || die "sed gkrellmd.conf failed"
-
-	sed -e "s:/usr/lib:/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:/usr/local/$(get_libdir):" \
-		-i src/${PN}.h || die "sed ${PN}.h failed"
-
-	epatch "${FILESDIR}/gkrellm-2.3.2-getline-fix.patch"
-}
-
-src_compile() {
-	if use X ; then
-		local sslopt=""
-		if use gnutls; then
-			sslopt="without-ssl=yes"
-		elif use ssl; then
-			sslopt="without-gnutls=yes"
-		else
-			sslopt="without-ssl=yes without-gnutls=yes"
-		fi
-
-		emake ${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			INSTALLROOT="/usr" \
-			INCLUDEDIR="/usr/include/gkrellm2" \
-			LOCALEDIR="/usr/share/locale" \
-			$(use nls || echo enable_nls=0) \
-			$(use lm_sensors || echo without-libsensors=yes) \
-			${sslopt} \
-		|| die "emake failed"
-	else
-		cd server
-		emake ${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			$(use lm_sensors || echo without-libsensors=yes) \
-		|| die "emake failed"
-	fi
-}
-
-src_install() {
-	if use X ; then
-		emake install${TARGET:+_}${TARGET} \
-			$(use nls || echo enable_nls=0) \
-			STRIP="" \
-			INSTALLDIR="${D}/usr/bin" \
-			INCLUDEDIR="${D}/usr/include" \
-			LOCALEDIR="${D}/usr/share/locale" \
-			PKGCONFIGDIR="${D}/usr/$(get_libdir)/pkgconfig" \
-			MANDIR="${D}/usr/share/man/man1" \
-		|| die "emake install failed"
-
-		dohtml *.html
-
-		newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry ${PN} GKrellM ${PN}
-	else
-		dobin server/gkrellmd || die "dobin failed"
-
-		insinto /usr/include/gkrellm2
-		doins server/gkrellmd.h || die "doins failed"
-		doins shared/log.h || die "doins failed"
-	fi
-
-	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
-	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd || die "newconfd failed"
-
-	insinto /etc
-	doins server/gkrellmd.conf || die "doins failed"
-
-	dodoc Changelog CREDITS README
-}
-
-pkg_postinst() {
-	if use X ; then
-		ewarn "The old executable name 'gkrellm2' has been removed."
-		ewarn "Run 'gkrellm' instead."
-	fi
-}
diff --git a/app-admin/gkrellm/gkrellm-2.3.2.ebuild b/app-admin/gkrellm/gkrellm-2.3.2.ebuild
deleted file mode 100644
index 0c181b1c81c0..000000000000
--- a/app-admin/gkrellm/gkrellm-2.3.2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.2.ebuild,v 1.13 2012/05/31 02:30:55 zmedico Exp $
-
-EAPI=2
-
-inherit eutils multilib toolchain-funcs user
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD"
-
-RDEPEND="dev-libs/glib:2
-	hddtemp? ( app-admin/hddtemp )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( ssl? ( dev-libs/openssl ) )
-	lm_sensors? ( sys-apps/lm_sensors )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	X? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	enewgroup gkrellmd
-	enewuser gkrellmd -1 -1 -1 gkrellmd
-	TARGET=
-	use kernel_FreeBSD && TARGET="freebsd"
-}
-
-src_prepare() {
-	sed -e 's:-O2 ::' \
-		-e 's:override CC:CFLAGS:' \
-		-i */Makefile || die "sed Makefile(s) failed"
-
-	sed -e 's:#user\tnobody:user\tgkrellmd:' \
-		-e 's:#group\tproc:group\tgkrellmd:' \
-		-i server/gkrellmd.conf || die "sed gkrellmd.conf failed"
-
-	sed -e "s:/usr/lib:/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:/usr/local/$(get_libdir):" \
-		-i src/${PN}.h || die "sed ${PN}.h failed"
-
-	epatch "${FILESDIR}/gkrellm-2.3.2-getline-fix.patch"
-}
-
-src_compile() {
-	if use X ; then
-		local sslopt=""
-		if use gnutls; then
-			sslopt="without-ssl=yes"
-		elif use ssl; then
-			sslopt="without-gnutls=yes"
-		else
-			sslopt="without-ssl=yes without-gnutls=yes"
-		fi
-
-		emake ${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			INSTALLROOT="/usr" \
-			INCLUDEDIR="/usr/include/gkrellm2" \
-			LOCALEDIR="/usr/share/locale" \
-			$(use nls || echo enable_nls=0) \
-			$(use lm_sensors || echo without-libsensors=yes) \
-			${sslopt} \
-		|| die "emake failed"
-	else
-		cd server
-		emake ${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			$(use lm_sensors || echo without-libsensors=yes) \
-		|| die "emake failed"
-	fi
-}
-
-src_install() {
-	if use X ; then
-		emake install${TARGET:+_}${TARGET} \
-			$(use nls || echo enable_nls=0) \
-			STRIP="" \
-			INSTALLDIR="${D}/usr/bin" \
-			INCLUDEDIR="${D}/usr/include" \
-			LOCALEDIR="${D}/usr/share/locale" \
-			PKGCONFIGDIR="${D}/usr/$(get_libdir)/pkgconfig" \
-			MANDIR="${D}/usr/share/man/man1" \
-		|| die "emake install failed"
-
-		dohtml *.html
-
-		newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry ${PN} GKrellM ${PN}
-	else
-		dobin server/gkrellmd || die "dobin failed"
-
-		insinto /usr/include/gkrellm2
-		doins server/gkrellmd.h || die "doins failed"
-	fi
-
-	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
-	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd || die "newconfd failed"
-
-	insinto /etc
-	doins server/gkrellmd.conf || die "doins failed"
-
-	dodoc Changelog CREDITS README
-}
-
-pkg_postinst() {
-	if use X ; then
-		ewarn "The old executable name 'gkrellm2' has been removed."
-		ewarn "Run 'gkrellm' instead."
-	fi
-}
diff --git a/app-admin/gkrellm/gkrellm-2.3.4.ebuild b/app-admin/gkrellm/gkrellm-2.3.4.ebuild
deleted file mode 100644
index 016786f152ef..000000000000
--- a/app-admin/gkrellm/gkrellm-2.3.4.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.4.ebuild,v 1.4 2012/05/31 02:30:55 zmedico Exp $
-
-EAPI=2
-
-inherit eutils multilib toolchain-funcs user
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD"
-
-RDEPEND="dev-libs/glib:2
-	hddtemp? ( app-admin/hddtemp )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( ssl? ( dev-libs/openssl ) )
-	lm_sensors? ( sys-apps/lm_sensors )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	X? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	enewgroup gkrellmd
-	enewuser gkrellmd -1 -1 -1 gkrellmd
-	TARGET=
-	use kernel_FreeBSD && TARGET="freebsd"
-}
-
-src_prepare() {
-	sed -e 's:-O2 ::' \
-		-e 's:override CC:CFLAGS:' \
-		-i */Makefile || die "sed Makefile(s) failed"
-
-	sed -e 's:#user\tnobody:user\tgkrellmd:' \
-		-e 's:#group\tproc:group\tgkrellmd:' \
-		-i server/gkrellmd.conf || die "sed gkrellmd.conf failed"
-
-	sed -e "s:/usr/lib:/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:/usr/local/$(get_libdir):" \
-		-i src/${PN}.h || die "sed ${PN}.h failed"
-}
-
-src_compile() {
-	if use X ; then
-		local sslopt=""
-		if use gnutls; then
-			sslopt="without-ssl=yes"
-		elif use ssl; then
-			sslopt="without-gnutls=yes"
-		else
-			sslopt="without-ssl=yes without-gnutls=yes"
-		fi
-
-		emake ${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			INSTALLROOT="/usr" \
-			INCLUDEDIR="/usr/include/gkrellm2" \
-			LOCALEDIR="/usr/share/locale" \
-			$(use nls || echo enable_nls=0) \
-			$(use lm_sensors || echo without-libsensors=yes) \
-			$(use ntlm || echo without-ntlm=yes) \
-			${sslopt} \
-		|| die "emake failed"
-	else
-		cd server
-		emake ${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			$(use nls || echo enable_nls=0) \
-			$(use lm_sensors || echo without-libsensors=yes) \
-		|| die "emake failed"
-	fi
-}
-
-src_install() {
-	if use X ; then
-		emake install${TARGET:+_}${TARGET} \
-			$(use nls || echo enable_nls=0) \
-			STRIP="" \
-			INSTALLDIR="${D}/usr/bin" \
-			INCLUDEDIR="${D}/usr/include" \
-			LOCALEDIR="${D}/usr/share/locale" \
-			PKGCONFIGDIR="${D}/usr/$(get_libdir)/pkgconfig" \
-			MANDIR="${D}/usr/share/man/man1" \
-		|| die "emake install failed"
-
-		dohtml *.html
-
-		newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry ${PN} GKrellM ${PN}
-	else
-		dobin server/gkrellmd || die "dobin failed"
-
-		insinto /usr/include/gkrellm2
-		doins server/gkrellmd.h || die "doins failed"
-		doins shared/log.h || die "doins failed"
-	fi
-
-	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
-	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd || die "newconfd failed"
-
-	insinto /etc
-	doins server/gkrellmd.conf || die "doins failed"
-
-	dodoc Changelog CREDITS README
-}
-
-pkg_postinst() {
-	if use X ; then
-		ewarn "The old executable name 'gkrellm2' has been removed."
-		ewarn "Run 'gkrellm' instead."
-	fi
-}