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

(Portage version: 2.2_rc50/cvs/Linux x86_64)

3 files changed, 14 insertions, 32 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 )"