Revision bump, directly x86 stable, fixing bug with gkrellm

by forcefully disabling optional gkrellm support.
Closes bug #275262.
Wiped out older revisions.
(Portage version: 2.1.8.3/cvs/Linux i686, RepoMan options: --force)

4 files changed, 15 insertions, 57 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/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
-}