Revision bump, with patch to fix bug #139945. The patch itself is so trivial that I'm committing it straight into stable. Wiped out older revision.

Package-Manager: portage-2.1-r1

3 files changed, 18 insertions, 76 deletions

diff --git a/x11-plugins/wmhdplop/Manifest b/x11-plugins/wmhdplop/Manifest
index 99c109a2d3c0..1e0829ae148f 100644
--- a/x11-plugins/wmhdplop/Manifest
+++ b/x11-plugins/wmhdplop/Manifest
@@ -1,15 +1,24 @@
-MD5 0d8e70ef36e735d5d9e338fcf50af594 ChangeLog 1421
-RMD160 abf95d15719647429423617cb0ab048b997eabde ChangeLog 1421
-SHA256 f7af47863773cd8859b28240acd69a2c349f9b1161306fa5fa9ddd0d6db6f864 ChangeLog 1421
-MD5 0a55dceead9ad7a2f7205718807cc4df files/digest-wmhdplop-0.9.7 66
-RMD160 b14e2b99357fee01631c566d17ea902786d24031 files/digest-wmhdplop-0.9.7 66
-SHA256 40b9b1b29704869b1fdc357c6e54c092fda677514cf45007432edab9011494b2 files/digest-wmhdplop-0.9.7 66
+AUX wmhdplop-cflags.patch 313 RMD160 2d3b34ea1907cd635d783e49b1bc9ad8d8452006 SHA1 e74e7d8aef9b2705d3342f54bf4b64014180332a SHA256 a39817756af047d0d98128b9a3d7624481d8cf6629fda53ac735bf0cc5f3ee24
 MD5 2745de508ae424a95df9b4ec8cbd8a1a files/wmhdplop-cflags.patch 313
 RMD160 2d3b34ea1907cd635d783e49b1bc9ad8d8452006 files/wmhdplop-cflags.patch 313
 SHA256 a39817756af047d0d98128b9a3d7624481d8cf6629fda53ac735bf0cc5f3ee24 files/wmhdplop-cflags.patch 313
+AUX wmhdplop-fontpath.patch 441 RMD160 9a0c828f21b240a10314e48c3d94fc133ad51c3e SHA1 fab677791ff995a8d78ba25aeb8c6333886df71d SHA256 67508705910604d3a3bc0530e5649c7f05f605f3e05193a37c60054474f0773a
+MD5 480a31eab3e8c1622e1e5baa9097cd07 files/wmhdplop-fontpath.patch 441
+RMD160 9a0c828f21b240a10314e48c3d94fc133ad51c3e files/wmhdplop-fontpath.patch 441
+SHA256 67508705910604d3a3bc0530e5649c7f05f605f3e05193a37c60054474f0773a files/wmhdplop-fontpath.patch 441
+DIST wmhdplop-0.9.7.tar.gz 221552 RMD160 7d192f79b8f78dbb83c8dc334b9e9bbf7ed450cc SHA1 f729e76cd905d941ff137ad84c338f2e143bb6d4 SHA256 47b625590a34bddabff5fa64e16f6075cfd98aab35dd7c185d6693bcc1f48eb4
+EBUILD wmhdplop-0.9.7-r1.ebuild 1605 RMD160 b00c352c57526ddc4994923ec3f1f7a4a2c04c64 SHA1 1d1f628ae5c7464704c449732adaee94e43800bb SHA256 4bb4a91162d8807559e2ed9813e5585d804e625da2caa2a1854b0920aaec5bd0
+MD5 c362079e7f5a0d91eb5e43cb4c26a17e wmhdplop-0.9.7-r1.ebuild 1605
+RMD160 b00c352c57526ddc4994923ec3f1f7a4a2c04c64 wmhdplop-0.9.7-r1.ebuild 1605
+SHA256 4bb4a91162d8807559e2ed9813e5585d804e625da2caa2a1854b0920aaec5bd0 wmhdplop-0.9.7-r1.ebuild 1605
+MISC ChangeLog 1702 RMD160 9f090f186d4ee1820d47f9a33f0c557d683fb88f SHA1 acd1675d92ab7efa0bcc6f3c810fe8fd65a04eae SHA256 7a62446d0e411605f064f84a3e473f6bc23c2daf473d50be8ef77e73eca116b6
+MD5 76f436af76f886318ca15f2c4b362989 ChangeLog 1702
+RMD160 9f090f186d4ee1820d47f9a33f0c557d683fb88f ChangeLog 1702
+SHA256 7a62446d0e411605f064f84a3e473f6bc23c2daf473d50be8ef77e73eca116b6 ChangeLog 1702
+MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c metadata.xml 165
 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b metadata.xml 165
-MD5 8f4dd36933f6c7af5a05e3d24f768099 wmhdplop-0.9.7.ebuild 1486
-RMD160 9b09574f626025650d90d8b9cd9bfd3858b5e385 wmhdplop-0.9.7.ebuild 1486
-SHA256 54b97ef83ca904b4ff44eec3af4f8c553be6645c3e5ec50b7552fcb1f764a27d wmhdplop-0.9.7.ebuild 1486
+MD5 38b285709fb44a6a9d82c1c5408144b1 files/digest-wmhdplop-0.9.7-r1 244
+RMD160 296fd6049651e2be4dedfebbde38a6fb74c90c09 files/digest-wmhdplop-0.9.7-r1 244
+SHA256 f2cee6566cb26ad2ee581de448befb7d3aa77d6c39cd6b9e29d2f156ff2048a2 files/digest-wmhdplop-0.9.7-r1 244
diff --git a/x11-plugins/wmhdplop/files/digest-wmhdplop-0.9.7 b/x11-plugins/wmhdplop/files/digest-wmhdplop-0.9.7
deleted file mode 100644
index 49abf1ec9f57..000000000000
--- a/x11-plugins/wmhdplop/files/digest-wmhdplop-0.9.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 64984c0862319cce247f4aaedd1180c3 wmhdplop-0.9.7.tar.gz 221552
diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.7.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.7.ebuild
deleted file mode 100644
index c49905cd9b40..000000000000
--- a/x11-plugins/wmhdplop/wmhdplop-0.9.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/wmhdplop-0.9.7.ebuild,v 1.6 2006/01/31 19:25:21 nelchael Exp $
-
-inherit eutils
-
-IUSE="gkrellm"
-
-DESCRIPTION="A fancy hard drive activity monitor dockapp"
-HOMEPAGE="http://hules.free.fr/wmhdplop"
-SRC_URI="http://hules.free.fr/wmhdplop/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
-
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext )
-	virtual/x11 )"
-DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )
-	>=media-libs/imlib2-1.2.0-r2
-	gkrellm? ( >=app-admin/gkrellm-2.1.28-r1 )"
-
-src_unpack()
-{
-	unpack ${A}
-	cd ${S}
-
-	# Honour Gentoo CFLAGS, but retain some the package author chose himself
-	epatch ${FILESDIR}/${PN}-cflags.patch
-
-	if ! built_with_use media-libs/imlib2 X; then
-		echo
-		eerror "This package depends on media-libs/imlib2, which needs"
-		eerror "to be compiled with 'X' USE flag enabled..."
-		echo
-		die
-	fi
-}
-
-src_compile()
-{
-	econf                           \
-		GENTOO_CFLAGS="${CFLAGS}"   \
-		`use_enable gkrellm`        \
-		|| die "configure failed"
-
-	emake || die "parallel make failed"
-}
-
-src_install ()
-{
-	einstall || die "make install failed"
-
-	dodoc README AUTHORS ChangeLog
-
-	if use gkrellm; then
-		# I don't like hardcoded paths, but other
-		# gkrellm plugin ebuilds to it the same way...
-		exeinto /usr/lib/gkrellm2/plugins/
-		doexe gkhdplop.so
-	fi
-}