Revision bump, directly x86 stable, fixing bug with gkrellm

by forcefully disabling optional gkrellm support.
Closes bug #275262.
Wiped out older revisions.
Package-Manager: portage-2.1.8.3/cvs/Linux i686
RepoMan-Options: --force

5 files changed, 18 insertions, 61 deletions

diff --git a/x11-plugins/wmhdplop/ChangeLog b/x11-plugins/wmhdplop/ChangeLog
index 8910a0eacfe1..fbe4baa452f2 100644
--- a/x11-plugins/wmhdplop/ChangeLog
+++ b/x11-plugins/wmhdplop/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/wmhdplop
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/ChangeLog,v 1.17 2010/06/29 09:53:56 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/ChangeLog,v 1.18 2010/09/03 13:47:55 s4t4n Exp $
+
+*wmhdplop-0.9.9-r2 (03 Sep 2010)
+
+  03 Sep 2010; Michele Noberasco <s4t4n@gentoo.org> +wmhdplop-0.9.9-r2.ebuild:
+  Revision bump, directly x86 stable, fixing bug with gkrellm
+  by forcefully disabling optional gkrellm support.
+  Closes bug #275262.
+  -wmhdplop-0.9.9.ebuild, --wmhdplop-0.9.9-r1.ebuild:
+  Wiped out older revisions.
 
 *wmhdplop-0.9.9-r1 (29 Jun 2010)
 
diff --git a/x11-plugins/wmhdplop/Manifest b/x11-plugins/wmhdplop/Manifest
index d8aad7fadbe3..c63ea569ce6a 100644
--- a/x11-plugins/wmhdplop/Manifest
+++ b/x11-plugins/wmhdplop/Manifest
@@ -1,6 +1,5 @@
 AUX wmhdplop-0.9.9-64bit.patch 3955 RMD160 90a12dc01ee21d67e19e857663edb69cd8961dff SHA1 d8c9eed0d9f9ed334db65a7f40826cbbae4a7509 SHA256 d9f4b259e06785728ee1e83740a5601f0c31faae10fdc71724565022fd008a35
 DIST wmhdplop-0.9.9.tar.gz 232684 RMD160 c983a8261087b4c6289a3b8104d4d3532f71e241 SHA1 234384d8628912634fd45e71851ba9f4ed1548a1 SHA256 68f27918a8da4af2389544441eeee3a6fda3a875cd55603a3e04abedc1726553
-EBUILD wmhdplop-0.9.9-r1.ebuild 1104 RMD160 8e094e1d7b84d513ceb8feb1a56ca9050f2bcb45 SHA1 475308e0eba03edbec5f39df11c8cd7a218c886d SHA256 3cff4afde20eb18fcc7865f8769f2e166c937f8f64a0ce78bc73149b9f269f6c
-EBUILD wmhdplop-0.9.9.ebuild 1063 RMD160 bdc83e51a916263993909d54b350b5000d1f3323 SHA1 092e913860ba32547366cc8975a50c58dc7c8783 SHA256 03d532dae2e4b3b29767c220becf64c1925b0ea1f5051df6b740f8c79277e0f6
-MISC ChangeLog 2709 RMD160 99b75144a9180c608cd4c9c6eec6d5a0aa2e2978 SHA1 7c0ea8fecc3435a13cfea4969d9d07271af7ef0b SHA256 9cc820ba50fc1999c6c822bd48973f7978d70909053336296924ca365c7accbf
-MISC metadata.xml 264 RMD160 e15fe8b6bb7c533a82bdbf902ed3b20e8c001271 SHA1 1ac3c9520c0329026e81ab7f3e00ff95d584b877 SHA256 68f042d61abeb44f3a69ed9be88e43ec37aa60cca1afbb174491a73a32c2aea8
+EBUILD wmhdplop-0.9.9-r2.ebuild 952 RMD160 8d23ce98a7dfc206d06e4ff6d551f1f5dc15f0b0 SHA1 9a7980a0f3f4b960741af1253279865225363573 SHA256 d150f52c3b10eab562c2230cbcec5db2f35a721e1c62c3bc7a231238f62b5254
+MISC ChangeLog 3039 RMD160 8ebb1c968b9bd7dd378529bf33a46c05e531277c SHA1 52f17be9231193ee015e08426b2737d610a70c77 SHA256 0593272246f2695a036b07a0f7b87a2407d59c9e470b03fde76b324603cc4f4b
+MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
diff --git a/x11-plugins/wmhdplop/metadata.xml b/x11-plugins/wmhdplop/metadata.xml
index 70c6e54b08a3..b1a9efc4f2f0 100644
--- a/x11-plugins/wmhdplop/metadata.xml
+++ b/x11-plugins/wmhdplop/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>desktop-dock</herd>
-<use>
-	<flag name='gkrellm'>Enable building of <pkg>app-admin/gkrellm</pkg>
-		module</flag>
-</use>
 </pkgmetadata>
diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.9-r1.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.9-r2.ebuild
index a999dce31624..947e485c5161 100644
--- a/x11-plugins/wmhdplop/wmhdplop-0.9.9-r1.ebuild
+++ b/x11-plugins/wmhdplop/wmhdplop-0.9.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/wmhdplop-0.9.9-r1.ebuild,v 1.1 2010/06/29 09:53:56 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/wmhdplop-0.9.9-r2.ebuild,v 1.1 2010/09/03 13:47:55 s4t4n Exp $
 
 EAPI="2"
 
@@ -12,8 +12,8 @@ SRC_URI="http://hules.free.fr/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gkrellm"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
 
 RDEPEND="media-libs/imlib2[X]
 	x11-libs/libX11
@@ -21,9 +21,7 @@ RDEPEND="media-libs/imlib2[X]
 	media-fonts/corefonts
 	>=media-libs/freetype-2"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	gkrellm? ( dev-util/pkgconfig
-		>=app-admin/gkrellm-2 )"
+	x11-proto/xextproto"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-64bit.patch
@@ -31,13 +29,10 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable gkrellm)
+	econf --disable-gkrellm
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
 	dodoc AUTHORS ChangeLog NEWS README || die
-
-	insinto /usr/$(get_libdir)/gkrellm2/plugins
-	use gkrellm && doins gkhdplop.so
 }
diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.9.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.9.ebuild
deleted file mode 100644
index c491ba9e94e1..000000000000
--- a/x11-plugins/wmhdplop/wmhdplop-0.9.9.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/wmhdplop-0.9.9.ebuild,v 1.3 2009/08/16 08:47:55 betelgeuse Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="a dockapp for monitoring disk activities with fancy visuals."
-HOMEPAGE="http://hules.free.fr/wmhdplop"
-SRC_URI="http://hules.free.fr/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="gkrellm"
-
-RDEPEND="media-libs/imlib2[X]
-	x11-libs/libX11
-	x11-libs/libXext
-	media-fonts/corefonts
-	>=media-libs/freetype-2"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	gkrellm? ( dev-util/pkgconfig
-		>=app-admin/gkrellm-2 )"
-
-src_prepare() {
-	sed -i -e "s:-O3 -fomit-frame-pointer -ffast-math:${CFLAGS}:" "${S}"/configure
-}
-
-src_configure() {
-	econf $(use_enable gkrellm)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README || die
-
-	insinto /usr/$(get_libdir)/gkrellm2/plugins
-	use gkrellm && doins gkhdplop.so
-}