Depend on dev-perl/Email-MessageID, Email-Simple-Creator merged in Email-Simple-2.100 (#293687)

Package-Manager: portage-2.2_rc50/cvs/Linux x86_64

4 files changed, 26 insertions, 36 deletions

diff --git a/dev-perl/Email-MIME/ChangeLog b/dev-perl/Email-MIME/ChangeLog
index 368b28344d61..c71546c7cbf7 100644
--- a/dev-perl/Email-MIME/ChangeLog
+++ b/dev-perl/Email-MIME/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-perl/Email-MIME
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Email-MIME/ChangeLog,v 1.32 2009/11/13 02:15:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Email-MIME/ChangeLog,v 1.33 2009/11/19 07:36:58 tove Exp $
+
+  19 Nov 2009; Torsten Veller <tove@gentoo.org> -Email-MIME-1.901.ebuild,
+  Email-MIME-1.902.ebuild:
+  Depend on dev-perl/Email-MessageID, Email-Simple-Creator merged in
+  Email-Simple-2.100 (#293687)
 
 *Email-MIME-1.902 (13 Nov 2009)
 
diff --git a/dev-perl/Email-MIME/Email-MIME-1.901.ebuild b/dev-perl/Email-MIME/Email-MIME-1.901.ebuild
deleted file mode 100644
index 9dcfb23ebfb9..000000000000
--- a/dev-perl/Email-MIME/Email-MIME-1.901.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Email-MIME/Email-MIME-1.901.ebuild,v 1.1 2009/11/10 10:12:51 robbat2 Exp $
-
-MODULE_AUTHOR=RJBS
-inherit perl-module
-
-DESCRIPTION="Easy MIME message parsing"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-perl/Email-MIME-Encodings-1.310
-	>=dev-perl/Email-MIME-ContentType-1.012
-	>=dev-perl/Email-Simple-2.004
-	>=dev-perl/MIME-Types-1.18
-	!dev-perl/Email-MIME-Modifier
-	!dev-perl/Email-MIME-Creator
-	dev-lang/perl"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Email-MIME/Email-MIME-1.902.ebuild b/dev-perl/Email-MIME/Email-MIME-1.902.ebuild
index 4206d923d49a..8793d55cf4a4 100644
--- a/dev-perl/Email-MIME/Email-MIME-1.902.ebuild
+++ b/dev-perl/Email-MIME/Email-MIME-1.902.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Email-MIME/Email-MIME-1.902.ebuild,v 1.1 2009/11/13 02:15:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Email-MIME/Email-MIME-1.902.ebuild,v 1.2 2009/11/19 07:36:58 tove Exp $
+
+EAPI=2
 
 MODULE_AUTHOR=RJBS
 inherit perl-module
@@ -12,13 +14,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
-RDEPEND=">=dev-perl/Email-MIME-Encodings-1.310
+RDEPEND="dev-perl/Email-MessageID
+	>=dev-perl/Email-MIME-Encodings-1.310
 	>=dev-perl/Email-MIME-ContentType-1.012
 	>=dev-perl/Email-Simple-2.004
+	|| ( >=dev-perl/Email-Simple-2.100 dev-perl/Email-Simple-Creator )
 	>=dev-perl/MIME-Types-1.18
-	!dev-perl/Email-MIME-Modifier
-	!dev-perl/Email-MIME-Creator
-	dev-lang/perl"
+	!!dev-perl/Email-MIME-Modifier
+	!!dev-perl/Email-MIME-Creator"
 DEPEND="${RDEPEND}
 	test? ( dev-perl/Test-Pod
 		dev-perl/Test-Pod-Coverage )"
diff --git a/dev-perl/Email-MIME/Manifest b/dev-perl/Email-MIME/Manifest
index 2692935b7d62..68c20b73c9c6 100644
--- a/dev-perl/Email-MIME/Manifest
+++ b/dev-perl/Email-MIME/Manifest
@@ -1,8 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST Email-MIME-1.863.tar.gz 91500 RMD160 fb96df60ddd1fb597cc4f39dabb43664ce039240 SHA1 ca7558c6d3c92bfe9bff7bb273346ddc3c78c8c4 SHA256 8a7563d7b750b35895c88a6798b60b5bb77a8ef08fc50506a5fec291a0d1216d
-DIST Email-MIME-1.901.tar.gz 104562 RMD160 0a5e8420c5823e3003c934476e96c7bc2dde2126 SHA1 971e1a57dfc3f69295bc271f90666de99d2e0795 SHA256 909e9a2482d10c396d4e5f48846baa002d4e8f02d73f3e704abf14d27099c0f0
 DIST Email-MIME-1.902.tar.gz 104631 RMD160 a641f87c3f9d8b4a86252d3998ed45638afc5c12 SHA1 6f345d8df8f16fa2f3c09258c45db92e70030d74 SHA256 59149f029c2307bfe08966e4de3791f3882e349b86f855bd5131e9d9dda4f6c8
 EBUILD Email-MIME-1.863.ebuild 663 RMD160 f2237477532ac828bd0517f2960d3574d1c06740 SHA1 dc720dc99fedf08531d092122ee217378baa91b4 SHA256 d68b9c76be5868800b0f281c0156a7465830c07932b55476b657c73f6423b7c9
-EBUILD Email-MIME-1.901.ebuild 734 RMD160 af04bdce522735ecc20f9b10f10b3bd17a5a3198 SHA1 7118b2adcc49684a007fe099e2246f9ae111c6cc SHA256 76295b27dfe28074b4b63b795e9bc1f5399b17a696147fce6dfcd721e79d6da9
-EBUILD Email-MIME-1.902.ebuild 734 RMD160 1f230fc867dc4c116a9ef10beda319509d242c60 SHA1 82ea434dace77041bd980fe3e4c808f3e480e49a SHA256 6c4e9a187001f3184506ad043a065f46c3cab8c6f7878b2df00eb50e13cc8c9c
-MISC ChangeLog 3769 RMD160 b2a2c9703516195cb0b94f272a9ac1686649fb1b SHA1 20c2e77d997de7217d5d76d976993780e2e0f37e SHA256 2ffd45214322fa3a94300d4f65c72449e2c0fe65544cfab4d113e1755f46d2d4
+EBUILD Email-MIME-1.902.ebuild 820 RMD160 8a686afacd654ce79fd4092e7d9fb3d38c868af2 SHA1 996e0188c42a93c0d941bd15efadf2689e785fd3 SHA256 ea526c3a763d7893d4c780e5d4850a6b0c82f72169895526e00cbc4c5c9d3a5f
+MISC ChangeLog 3968 RMD160 a3aba5a221507ba8a858a736c6354a98a0015cf6 SHA1 58f40247376fd76e4da06813144b0e61316d3e61 SHA256 a9ee42d23d51af5c715677bb02e9391d29c004b0f15b9100fd3365a5c605b933
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAksE9Z8ACgkQV3J2n04Eauz+TwCeIh2TBHKB6Zv2Lb3HWZFb+zNF
+Cp4AnjCGIVi8VYdvrJWTbCENbOi1qGMJ
+=MNf/
+-----END PGP SIGNATURE-----