Fix libwww-perl dependency - bug #368261

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

4 files changed, 40 insertions, 12 deletions

diff --git a/net-mail/spamcup/ChangeLog b/net-mail/spamcup/ChangeLog
index dd4d64371752..0872ec97970e 100644
--- a/net-mail/spamcup/ChangeLog
+++ b/net-mail/spamcup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/spamcup
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/spamcup/ChangeLog,v 1.8 2008/10/27 04:58:35 darkside Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/spamcup/ChangeLog,v 1.9 2011/05/25 06:31:32 eras Exp $
+
+  25 May 2011; Eray Aslan <eras@gentoo.org> spamcup-1.08.ebuild,
+  spamcup-1.09.ebuild:
+  Fix libwww-perl dependency - bug #368261
 
   27 Oct 2008; Jeremy Olexa <darkside@gentoo.org> spamcup-1.09.ebuild:
   net-mail/spamcup - modify dobin call to actually do something, bug #241192
diff --git a/net-mail/spamcup/Manifest b/net-mail/spamcup/Manifest
index 5b13c7c6aab2..8536e13bb223 100644
--- a/net-mail/spamcup/Manifest
+++ b/net-mail/spamcup/Manifest
@@ -1,6 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST spamcup-1.08.tar.gz 7191 RMD160 55d34d401996f784a001592b309c6eeb3577192c SHA1 891997198c97dc41058d500922e0e70a5fa3e972 SHA256 73e2a0f0f2dae8bb0f05db7a14dea4460b43ce7212fc4eae147377a894811896
 DIST spamcup-1.09.tar.gz 6801 RMD160 361a6c458ce5b890b5fa35ce46548de8ba698457 SHA1 758954af5c3cbcba8643c0686c03e3e154ac5264 SHA256 6fb0123df76a4e8fc0a3c4212145f1c89f32d195eac373a58f3d29a5c2e59685
-EBUILD spamcup-1.08.ebuild 659 RMD160 3c2f99ba971d6241d7443c325bd0afdb443baab6 SHA1 94b6943aec984ae4a2f68d0e5dc7e661ac20fee4 SHA256 38464814f480405e477ffb9923ff79d50293c9cd4c9a6e11c380b188c73eb40c
-EBUILD spamcup-1.09.ebuild 675 RMD160 38baee7fce6c6869b0adf56e895a00ca9e36ca36 SHA1 14a04d39f8e77e01c419dad59d6827190dfc09a6 SHA256 abc7ce499024bd4781a27dcaad522903b0edbd44b097a659e966d2a3e7b48fa6
-MISC ChangeLog 1263 RMD160 958dd881c48fcb0491ed70513ea410437f1b0ba0 SHA1 21f63014dd112a12c284f4bf3bd9d78832ac2705 SHA256 ade56ac6ef76330fee5d89eeb3cbbca1d11635933012ceb149af23db6fb6f334
+EBUILD spamcup-1.08.ebuild 723 RMD160 83196e5438b13eafa92cab2fb9a4465a9946b530 SHA1 adbf6bcef85c4b68c0458584a339c9082fbcebf0 SHA256 1d29a654d0d39f654d99569f45e8337cce922de11601b231e9e99aa3a595a206
+EBUILD spamcup-1.09.ebuild 750 RMD160 a8d7f33498d8054caec2703fd1b9989a55f471d3 SHA1 b642cbb644268bfec52e6c071a51785be766d9b4 SHA256 e9c6f8e53bbe4be86c44e77827e9e0d168bb5739a499838c14beecf1802acc9a
+MISC ChangeLog 1391 RMD160 0e4687cf72e67de88455961c3b479022e3b1d612 SHA1 716d8f7c035c6c63b19f75f8f8192f46107d26fb SHA256 af95ecea2b0c5d04c6d8d5401462f361622f00a6566b9d417454c92503a11427
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJN3KJSAAoJEHfx8XVYajsfmKgP/3OApfzyyCNfAhBex0DSNZGA
+KEtAIWl7TDKjl7TEMQWLvjzAU1X0+mHzAZuapFUZhMZHVQOv5A6MgxdpEnC756CG
+UCJBVOv4rn9bey7FUtb474yOpSRYRP+bNeO6LYD+BU/D5tyhBpz6GpIQkfOf7lh8
+tUAAxqt8HrZShc/o9CrTcoBvjvWVYvWNbnSTK36KwR+WcHvhXXpkKUyYg5kxkQiY
+n9FsTtU/XZ5hbi7/UxvosrSCOfZKCGM1ah3NYyEh/LeLEVsL8B/4QUHj0c8mgQiK
+CteGJi4KJ9eDGi0M9kHJe7ggk8toGLeGenYuHOOZll95I2+B7+KD9b5hNazXvsau
+kmT0vo2PrVlt8vn93xnEDUQZsZIA2Mmdw5nmehLKv0EjwP9P1tMGTKnCIJba43hO
+JHtdcYeszNcGDevUN/IC7A5BCn6J5cUJYt8lB/xwkC6AJ4dPwG0Ml/XB55VxHika
+jv078IOtK1zHvM0ZGBb2E59w6b1ch2EuRda9jIoL5P4vsPIxQYRJ8Rye9Lsjs5nb
+TTx68cl2cnaKs5r1ZqkAvIe5AQhsgS3HxNL2hYuIRZTbfG54TYWDu5J9xEvIN0M2
+nApjPo9ngbTgu7ItmEBm0wrqkeKjGJKby3yfYLaKCzTZ52BBTJ54aXyrqTRLwEcD
+OQDLJB7KYcbdH41YBpkS
+=vjyO
+-----END PGP SIGNATURE-----
diff --git a/net-mail/spamcup/spamcup-1.08.ebuild b/net-mail/spamcup/spamcup-1.08.ebuild
index 67739382560f..6ce58c35f30f 100644
--- a/net-mail/spamcup/spamcup-1.08.ebuild
+++ b/net-mail/spamcup/spamcup-1.08.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/spamcup/spamcup-1.08.ebuild,v 1.4 2004/11/06 04:12:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/spamcup/spamcup-1.08.ebuild,v 1.5 2011/05/25 06:31:32 eras Exp $
 
 DESCRIPTION="This script does the same you would do when you report spam with your browser in Spamcop.net."
 HOMEPAGE="http://sourceforge.net/projects/spamcup/"
@@ -13,11 +13,13 @@ IUSE=""
 
 DEPEND=">=dev-lang/perl-5.8.0
 	dev-perl/Getopt-ArgvFile
-	dev-perl/libwww-perl"
+	|| ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6
+	) "
+RDEPEND="${DEPEND}"
 
 src_install() {
 	dodir /usr/bin
 	dobin spamcup
 
-	dodoc ChangeLog INSTALL LICENSE README
+	dodoc ChangeLog INSTALL README
 }
diff --git a/net-mail/spamcup/spamcup-1.09.ebuild b/net-mail/spamcup/spamcup-1.09.ebuild
index 3f801a30c575..e610a1b62379 100644
--- a/net-mail/spamcup/spamcup-1.09.ebuild
+++ b/net-mail/spamcup/spamcup-1.09.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/spamcup/spamcup-1.09.ebuild,v 1.2 2008/10/27 04:58:35 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/spamcup/spamcup-1.09.ebuild,v 1.3 2011/05/25 06:31:32 eras Exp $
 
 DESCRIPTION="This script does the same you would do when you report spam with your browser in Spamcop.net."
 HOMEPAGE="http://sourceforge.net/projects/spamcup/"
@@ -13,7 +13,9 @@ IUSE=""
 
 DEPEND=">=dev-lang/perl-5.8.0
 	dev-perl/Getopt-ArgvFile
-	dev-perl/libwww-perl"
+	|| ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6
+	) "
+RDEPEND="${DEPEND}"
 
 src_install() {
 	dodir /usr/bin