Revision bump. Slotted bcmail and bcprov dependencies. Punted old and broken version.

(Portage version: 2.2.0/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 6D34E57D)

3 files changed, 23 insertions, 13 deletions

diff --git a/dev-java/itext/ChangeLog b/dev-java/itext/ChangeLog
index 3bbd9607d419..e7e04ca4cffc 100644
--- a/dev-java/itext/ChangeLog
+++ b/dev-java/itext/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/itext
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/ChangeLog,v 1.93 2012/05/08 12:20:43 sera Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/ChangeLog,v 1.94 2013/08/15 13:45:51 tomwij Exp $
+
+*itext-2.1.5-r2 (15 Aug 2013)
+*itext-2.0.8-r1 (15 Aug 2013)
+
+  15 Aug 2013; Tom Wijsman <TomWij@gentoo.org> +itext-2.0.8-r1.ebuild,
+  +itext-2.1.5-r2.ebuild, -itext-2.0.8.ebuild, -itext-2.1.5-r1.ebuild:
+  Revision bump. Slotted bcmail and bcprov dependencies. Punted old and broken
+  version.
 
 *itext-2.1.5-r1 (08 May 2012)
 
diff --git a/dev-java/itext/itext-2.0.8.ebuild b/dev-java/itext/itext-2.0.8-r1.ebuild
index ecb199875810..0067b31479cc 100644
--- a/dev-java/itext/itext-2.0.8.ebuild
+++ b/dev-java/itext/itext-2.0.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-2.0.8.ebuild,v 1.8 2010/03/28 21:18:20 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-2.0.8-r1.ebuild,v 1.1 2013/08/15 13:45:51 tomwij Exp $
 
 EAPI=1
 
@@ -24,8 +24,8 @@ IUSE="cjk"
 
 BCV="1.38"
 
-COMMON_DEPEND=">=dev-java/bcmail-${BCV}
-	>=dev-java/bcprov-${BCV}:0"
+COMMON_DEPEND="dev-java/bcmail:${BCV}
+	dev-java/bcprov:${BCV}"
 DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
 	cjk? ( app-arch/unzip )
 	${COMMON_DEPEND}"
@@ -47,8 +47,8 @@ src_unpack() {
 
 	mkdir -p "${WORKDIR}/lib" || die "Failed to create ${WORKDIR}/lib"
 	cd "${WORKDIR}/lib" || die "Could not cd ${WORKDIR}/lib"
-	java-pkg_jar-from bcmail bcmail.jar "bcmail-jdk14-${BCV/./}.jar"
-	java-pkg_jar-from bcprov bcprov.jar "bcprov-jdk14-${BCV/./}.jar"
+	java-pkg_jar-from bcmail-${BCV} bcmail.jar "bcmail-jdk14-${BCV/./}.jar"
+	java-pkg_jar-from bcprov-${BCV} bcprov.jar "bcprov-jdk14-${BCV/./}.jar"
 }
 
 EANT_BUILD_XML="src/build.xml"
diff --git a/dev-java/itext/itext-2.1.5-r1.ebuild b/dev-java/itext/itext-2.1.5-r2.ebuild
index c424d7b9dccb..db7863774591 100644
--- a/dev-java/itext/itext-2.1.5-r1.ebuild
+++ b/dev-java/itext/itext-2.1.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-2.1.5-r1.ebuild,v 1.1 2012/05/08 12:20:43 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-2.1.5-r2.ebuild,v 1.1 2013/08/15 13:45:51 tomwij Exp $
 
 EAPI="4"
 
@@ -23,9 +23,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cjk rtf rups"
 
+BCV="1.45"
+
 COMMON_DEPEND="
-	dev-java/bcmail:0
-	dev-java/bcprov:0
+	dev-java/bcmail:${BCV}
+	dev-java/bcprov:${BCV}
 	rups? (
 		dev-java/dom4j:1
 		dev-java/pdf-renderer:0
@@ -54,7 +56,7 @@ JAVA_ANT_REWRITE_CLASSPATH="true"
 JAVA_ANT_ENCODING="utf8"
 
 src_compile() {
-	EANT_GENTOO_CLASSPATH="bcmail,bcprov"
+	EANT_GENTOO_CLASSPATH="bcmail-${BCV},bcprov-${BCV}"
 	use rups && EANT_GENTOO_CLASSPATH+=",dom4j-1,pdf-renderer"
 
 	java-pkg-2_src_compile \