Add libXpm to DEPEND (#204541), depend on =x11-libs/gtk+-1*, misc QA fixes.

Package-Manager: portage-2.1.3.19

4 files changed, 37 insertions, 47 deletions

diff --git a/x11-plugins/wmmaiload/ChangeLog b/x11-plugins/wmmaiload/ChangeLog
index 9cae5e8a6a04..8c4a9e128444 100644
--- a/x11-plugins/wmmaiload/ChangeLog
+++ b/x11-plugins/wmmaiload/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmaiload
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/ChangeLog,v 1.24 2007/02/21 23:39:18 jokey Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/ChangeLog,v 1.25 2008/01/12 01:04:26 coldwind Exp $
+
+  12 Jan 2008; Santiago M. Mola <coldwind@gentoo.org>
+  wmmaiload-1.0.2.ebuild, wmmaiload-2.2.1.ebuild:
+  Add libXpm to DEPEND (#204541), depend on =x11-libs/gtk+-1*, misc QA fixes.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmmaiload/Manifest b/x11-plugins/wmmaiload/Manifest
index 59956c1c9112..f692cfffa10c 100644
--- a/x11-plugins/wmmaiload/Manifest
+++ b/x11-plugins/wmmaiload/Manifest
@@ -1,20 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST wmmaiload-1.0.2.tar.gz 113552 RMD160 318fcf8835a8270a5e4654b08b1a5f574b2b90bf SHA1 ffa4b9c3cfc9390856a91dc158ccfeefdf18c044 SHA256 916a408f376a4f9d0117faac3c6034aabd06acdbff1cdc1d6fc87ce27360b915
 DIST wmmaiload-2.2.1.tar.gz 183538 RMD160 913ff65ce2c6bc208fcff617d986d23c458c8a4b SHA1 d49cef2098e36d9a66492027fcfc5376d3848b67 SHA256 f8f281590c238a713d38825b698931bf73459125eb47bbba8c2e1d8ff1b11d3f
-EBUILD wmmaiload-1.0.2.ebuild 659 RMD160 bdd91b8c177500052dd1246c91a7128cee65f1ac SHA1 b6c72c5475196bb1b66ea77c1048e2084355c648 SHA256 17024d3cf5b1f759e72248ef8f47f08411f489db04492c3928f094d0a0f7de93
-MD5 37cd40c30f922418071743fe7bddfd74 wmmaiload-1.0.2.ebuild 659
-RMD160 bdd91b8c177500052dd1246c91a7128cee65f1ac wmmaiload-1.0.2.ebuild 659
-SHA256 17024d3cf5b1f759e72248ef8f47f08411f489db04492c3928f094d0a0f7de93 wmmaiload-1.0.2.ebuild 659
-EBUILD wmmaiload-2.2.1.ebuild 1211 RMD160 63434438d9859594068874dbf79df22482157c38 SHA1 cf0af95a2546e4abc0e573d804239e674fd73dc0 SHA256 074d30c9a5c75de506ebbf0200392745be9ea16adf63121c96f67dd41b1fb10b
-MD5 4c23b3004560bdad611cf81bcc00dc62 wmmaiload-2.2.1.ebuild 1211
-RMD160 63434438d9859594068874dbf79df22482157c38 wmmaiload-2.2.1.ebuild 1211
-SHA256 074d30c9a5c75de506ebbf0200392745be9ea16adf63121c96f67dd41b1fb10b wmmaiload-2.2.1.ebuild 1211
-MISC ChangeLog 3109 RMD160 0bc6303595189ce9fd6b5eff552b2996690968e4 SHA1 79cfd77d4a9031612ee04d5af0b38baf7e48baff SHA256 1aefc12a101f202b3fc9034088bb32a297bdbe303e731535430444cf8af2c4f2
-MD5 beec11cea0d75980836842712ec5e1ac ChangeLog 3109
-RMD160 0bc6303595189ce9fd6b5eff552b2996690968e4 ChangeLog 3109
-SHA256 1aefc12a101f202b3fc9034088bb32a297bdbe303e731535430444cf8af2c4f2 ChangeLog 3109
+EBUILD wmmaiload-1.0.2.ebuild 633 RMD160 461f1f750ad08a9e23ab128d6ea81b505f472807 SHA1 d0c25a048e773202d7045a5255bbc96d3cb09caf SHA256 453d85a42a4a8bd8c81167026157d2adb0cee6e9162bb4ee9ea774f824d634bc
+MD5 373f02df363ddcae3fdf02b2bd38c569 wmmaiload-1.0.2.ebuild 633
+RMD160 461f1f750ad08a9e23ab128d6ea81b505f472807 wmmaiload-1.0.2.ebuild 633
+SHA256 453d85a42a4a8bd8c81167026157d2adb0cee6e9162bb4ee9ea774f824d634bc wmmaiload-1.0.2.ebuild 633
+EBUILD wmmaiload-2.2.1.ebuild 1129 RMD160 35c0caa66c6146b2f6d852e8869288fbf28a908e SHA1 a2c17e95552609dcb974d53c4532263467cd07e2 SHA256 dec98657eab990b2b605ef12d23b5790ac59143befbb6d5371237d462c35b8fc
+MD5 0761d99f29c17ccc81605ba862b547d0 wmmaiload-2.2.1.ebuild 1129
+RMD160 35c0caa66c6146b2f6d852e8869288fbf28a908e wmmaiload-2.2.1.ebuild 1129
+SHA256 dec98657eab990b2b605ef12d23b5790ac59143befbb6d5371237d462c35b8fc wmmaiload-2.2.1.ebuild 1129
+MISC ChangeLog 3295 RMD160 8e7f439368a605496be930c4ccd0eb1993810792 SHA1 6104d41e5bc50c700a8d37ec2a213e1191c124d7 SHA256 b8d1696f4ddaedb2a2393057bf39e9afd27c2574dd3123ceb3ffc627984e1edd
+MD5 0750147450f32b08a67844bea97221af ChangeLog 3295
+RMD160 8e7f439368a605496be930c4ccd0eb1993810792 ChangeLog 3295
+SHA256 b8d1696f4ddaedb2a2393057bf39e9afd27c2574dd3123ceb3ffc627984e1edd ChangeLog 3295
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c metadata.xml 165
@@ -25,10 +22,3 @@ SHA256 6f35fb1c4efb81ab07730c97fa4baf55eeaf871487b0c68ea9ae753858591bf1 files/di
 MD5 7c6720ea80befb4c91676d25722a6949 files/digest-wmmaiload-2.2.1 247
 RMD160 2d1f70b71d7ac3217f71bf0be4135072d0580c5a files/digest-wmmaiload-2.2.1 247
 SHA256 f7e8ac177448b6999d1757bbd7f1439bf6c8ea6e1b86b218860e9505721657fd files/digest-wmmaiload-2.2.1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF3Ne9z974XjDVpbkRAiryAKCWIEieU2gX7c8BS+BD1RSJ8HszfACfde/j
-G8+ZCQpJbg3KRSm5T3u13Ww=
-=alpH
------END PGP SIGNATURE-----
diff --git a/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild b/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild
index 22d3aa91366f..e5be5f106d18 100644
--- a/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild
+++ b/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild,v 1.5 2006/01/31 19:46:38 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild,v 1.6 2008/01/12 01:04:26 coldwind Exp $
 
-DESCRIPTION="dockapp that monitors one or more mailboxes."
+DESCRIPTION="dockapp that monitors one or more mailboxes"
 SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
 HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
 
 SLOT="0"
-KEYWORDS="x86 amd64 ppc ~sparc"
+KEYWORDS="amd64 ppc ~sparc x86"
 LICENSE="GPL-2"
-
-DEPEND=">=x11-libs/gtk+-1.2.10-r11"
 IUSE=""
 
-src_compile() {
-	econf || die "configure failed"
-	emake || die "parallel make failed"
-}
+DEPEND="=x11-libs/gtk+-1*
+	x11-libs/libXpm"
+RDEPEND="${DEPEND}"
 
 src_install () {
 	einstall || die "make install failed"
+	dodoc AUTHORS ChangeLog FAQ THANKS
 }
diff --git a/x11-plugins/wmmaiload/wmmaiload-2.2.1.ebuild b/x11-plugins/wmmaiload/wmmaiload-2.2.1.ebuild
index 05f6885f8413..72534821805c 100644
--- a/x11-plugins/wmmaiload/wmmaiload-2.2.1.ebuild
+++ b/x11-plugins/wmmaiload/wmmaiload-2.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/wmmaiload-2.2.1.ebuild,v 1.3 2006/08/05 08:16:11 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/wmmaiload-2.2.1.ebuild,v 1.4 2008/01/12 01:04:26 coldwind Exp $
 
 DESCRIPTION="dockapp that monitors one or more mailboxes."
 SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
@@ -10,9 +10,9 @@ SLOT="0"
 KEYWORDS="~amd64 ppc ~sparc x86"
 LICENSE="GPL-2"
 
-RDEPEND=">=x11-libs/gtk+-1.2.10-r11"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.1.4-r1"
+RDEPEND="=x11-libs/gtk+-1*
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
 
 IUSE=""
 
@@ -20,14 +20,12 @@ src_compile() {
 	./configure -p /usr || die "configure failed"
 
 	# Let's wipe out those horrid defaults
-	for file in "wmmaiload/Makefile wmmaiload-config/Makefile"
-	do
-		sed -i 's/^CFLAGS/#CFLAGS/' ${file}
-		sed -i 's/^CPPFLAGS/#CPPFLAGS/' ${file}
-		sed -i 's/^DEBUG_CFLAGS/#DEBUG_CFLAGS/' ${file}
-		sed -i 's/^DEBUG_CPPFLAGS/#DEBUG_CPPFLAGS/' ${file}
-		sed -i 's/^DEBUG_LDFLAGS/#DEBUG_LDFLAGS/' ${file}
-	done
+	sed -e 's/^CFLAGS/#CFLAGS/' \
+		-e 's/^CPPFLAGS/#CPPFLAGS/' \
+		-e 's/^DEBUG_CFLAGS/#DEBUG_CFLAGS/' \
+		-e 's/^DEBUG_CPPFLAGS/#DEBUG_CPPFLAGS/' \
+		-e 's/^DEBUG_LDFLAGS/#DEBUG_LDFLAGS/' \
+		-i wmmaiload/Makefile wmmaiload-config/Makefile
 
 	emake || die "parallel make failed"
 }