Use slot dep for bcprov.

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

7 files changed, 12 insertions, 212 deletions

diff --git a/dev-java/itext/ChangeLog b/dev-java/itext/ChangeLog
index d509ff71b444..44b7274195b0 100644
--- a/dev-java/itext/ChangeLog
+++ b/dev-java/itext/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/itext
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/ChangeLog,v 1.89 2010/01/03 20:42:43 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/ChangeLog,v 1.90 2010/03/28 21:18:20 caster Exp $
+
+  28 Mar 2010; Vlastimil Babka <caster@gentoo.org> itext-2.0.8.ebuild,
+  -itext-2.1.2-r1.ebuild, -itext-2.1.3-r1.ebuild, itext-2.1.5.ebuild:
+  Use slot dep for bcprov.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org> itext-2.1.5.ebuild:
   Transfer Prefix keywords
diff --git a/dev-java/itext/files/2.0-ImageIO.patch b/dev-java/itext/files/2.0-ImageIO.patch
deleted file mode 100644
index e37dc904dcf0..000000000000
--- a/dev-java/itext/files/2.0-ImageIO.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../PdfGraphics2D.java	2007-05-30 12:38:56.000000000 -0400
-+++ com/lowagie/text/pdf/PdfGraphics2D.java	2007-05-30 13:07:37.000000000 -0400
-@@ -99,6 +99,7 @@
- import java.util.Iterator;

- import java.util.Map;

- import java.util.Set;

-+import javax.imageio.ImageIO;

- 

- import com.lowagie.text.pdf.internal.PolylineShape;

- 

-@@ -185,12 +186,6 @@
-         super();

-         dg2.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);

-         setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);

--        try {

--            Class.forName("com.sun.image.codec.jpeg.JPEGCodec");

--        }

--        catch (Throwable t) {

--            convertImagesToJPEG = false;

--        }

-         this.convertImagesToJPEG = convertImagesToJPEG;

-         this.jpegQuality = quality;

-         this.onlyShapes = onlyShapes;

-@@ -1354,10 +1349,7 @@
-                 g3.dispose();

-                 

-                 ByteArrayOutputStream baos = new ByteArrayOutputStream();

--                com.sun.image.codec.jpeg.JPEGImageEncoder encoder = com.sun.image.codec.jpeg.JPEGCodec.createJPEGEncoder(baos);

--                com.sun.image.codec.jpeg.JPEGEncodeParam param = com.sun.image.codec.jpeg.JPEGCodec.getDefaultJPEGEncodeParam(scaled);

--                param.setQuality(jpegQuality, true);

--                encoder.encode(scaled, param);

-+                ImageIO.write(scaled,"jpg",baos);

-                 scaled.flush();

-                 scaled = null;

-                 image = com.lowagie.text.Image.getInstance(baos.toByteArray());

diff --git a/dev-java/itext/files/2.0.2-site_xml.patch b/dev-java/itext/files/2.0.2-site_xml.patch
deleted file mode 100644
index 4a749e32bc10..000000000000
--- a/dev-java/itext/files/2.0.2-site_xml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ant/site.xml	2007-03-06 16:15:50.000000000 +0100
-+++ src/ant/site.xml	2007-04-03 12:07:50.000000000 +0200
-@@ -126,8 +126,6 @@
-       			<include name="com/lowagie/**" />

- 		    </packageset>

-         	<classpath refid="itext.classpath"/>

--            <link href="http://java.sun.com/j2se/1.3/docs/api/" />

--        	<link href="http://www.bouncycastle.org/docs/docs1.4/" />

-         	<header>&lt;a href="http://itext.ugent.be/itext-in-action/" target="_blank"&gt;&lt;img src="http://itext.ugent.be/img/lowagie_3d.jpg" border="0" /&gt;&lt;/a&gt;</header>

-         </javadoc>

-     </target>

diff --git a/dev-java/itext/itext-2.0.8.ebuild b/dev-java/itext/itext-2.0.8.ebuild
index c775829532a9..ecb199875810 100644
--- a/dev-java/itext/itext-2.0.8.ebuild
+++ b/dev-java/itext/itext-2.0.8.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.7 2009/05/23 07:49:56 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-2.0.8.ebuild,v 1.8 2010/03/28 21:18:20 caster Exp $
+
+EAPI=1
 
 JAVA_PKG_IUSE="doc source"
 
@@ -23,7 +25,7 @@ IUSE="cjk"
 BCV="1.38"
 
 COMMON_DEPEND=">=dev-java/bcmail-${BCV}
-	>=dev-java/bcprov-${BCV}"
+	>=dev-java/bcprov-${BCV}:0"
 DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
 	cjk? ( app-arch/unzip )
 	${COMMON_DEPEND}"
diff --git a/dev-java/itext/itext-2.1.2-r1.ebuild b/dev-java/itext/itext-2.1.2-r1.ebuild
deleted file mode 100644
index 645c1af649d3..000000000000
--- a/dev-java/itext/itext-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-2.1.2-r1.ebuild,v 1.2 2008/06/26 09:51:19 ali_bush Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java library that generate documents in the Portable Document Format (PDF) and/or HTML."
-HOMEPAGE="http://www.lowagie.com/iText/"
-DISTFILE="${PN/it/iT}-src-${PV}.tar.gz"
-ASIANJAR="iTextAsian.jar"
-ASIANCMAPSJAR="iTextAsianCmaps.jar"
-SRC_URI="mirror://sourceforge/itext/${DISTFILE}
-	cjk? ( mirror://sourceforge/itext/${ASIANJAR}
-		mirror://sourceforge/itext/${ASIANCMAPSJAR} )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="cjk rtf rups"
-
-BCV="1.38"
-
-COMMON_DEPEND=">=dev-java/bcmail-${BCV}
-	>=dev-java/bcprov-${BCV}
-	rups? ( dev-java/dom4j:1 )"
-DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* !doc? ( !rups? ( =virtual/jdk-1.4* ) ) )
-	 ${COMMON_DEPEND}"
-RDEPEND="!doc? ( !rups? ( >=virtual/jre-1.4 ) )
-	doc? ( !rups? ( >=virtual/jre-1.5 ) )
-	!doc? ( rups? ( >=virtual/jre-1.5 ) )
-	doc? ( rups? ( >=virtual/jre-1.5 ) )
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/src"
-
-src_unpack() {
-	cd "${WORKDIR}"
-	unpack ${DISTFILE}
-	cd "${S}"
-
-	if use cjk; then
-		cp "${DISTDIR}/${ASIANJAR}" "${DISTDIR}/${ASIANCMAPSJAR}" "${WORKDIR}" \
-			|| die "Could not copy asian fonts"
-	fi
-
-	sed -i -e 's|<link href="http://java.sun.com/j2se/1.4/docs/api/" />||' \
-		-e 's|<link href="http://www.bouncycastle.org/docs/docs1.4/" />||' \
-		"${S}/ant/site.xml"
-
-	java-ant_bsfix_files ant/*.xml || die "failed to rewrite build xml files"
-
-	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"
-	use rups && java-pkg_jar-from dom4j-1 dom4j.jar "dom4j-1.6.1.jar"
-}
-
-src_compile() {
-	eant jar $(use_doc javadoc) \
-		$(use rtf && echo "jar.rtf") \
-		$(use rups && echo "jar.rups")
-}
-
-src_install() {
-	cd "${WORKDIR}"
-	java-pkg_dojar lib/iText.jar
-	use rtf && java-pkg_dojar lib/iText-rtf.jar
-	use rups && java-pkg_dojar lib/iText-rups.jar
-	if use cjk; then
-		java-pkg_dojar "${ASIANJAR}"
-		java-pkg_dojar "${ASIANCMAPSJAR}"
-	fi
-
-	use source && java-pkg_dosrc src/core/com src/rups/com
-	use doc && java-pkg_dojavadoc build/docs
-}
diff --git a/dev-java/itext/itext-2.1.3-r1.ebuild b/dev-java/itext/itext-2.1.3-r1.ebuild
deleted file mode 100644
index 068384c31829..000000000000
--- a/dev-java/itext/itext-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-2.1.3-r1.ebuild,v 1.1 2008/07/15 06:30:11 wltjr Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java library that generate documents in the Portable Document Format (PDF) and/or HTML."
-HOMEPAGE="http://www.lowagie.com/iText/"
-DISTFILE="${PN/it/iT}-src-${PV}.tar.gz"
-ASIANJAR="iTextAsian.jar"
-ASIANCMAPSJAR="iTextAsianCmaps.jar"
-SRC_URI="mirror://sourceforge/itext/${DISTFILE}
-	cjk? ( mirror://sourceforge/itext/${ASIANJAR}
-		mirror://sourceforge/itext/${ASIANCMAPSJAR} )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="cjk rtf rups"
-
-BCV="1.38"
-
-COMMON_DEPEND=">=dev-java/bcmail-${BCV}
-	>=dev-java/bcprov-${BCV}
-	rups? ( dev-java/dom4j:1 )"
-DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* !doc? ( !rups? ( =virtual/jdk-1.4* ) ) )
-	 ${COMMON_DEPEND}"
-RDEPEND="!doc? ( !rups? ( >=virtual/jre-1.4 ) )
-	doc? ( !rups? ( >=virtual/jre-1.5 ) )
-	!doc? ( rups? ( >=virtual/jre-1.5 ) )
-	doc? ( rups? ( >=virtual/jre-1.5 ) )
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/src"
-
-src_unpack() {
-	cd "${WORKDIR}"
-	unpack ${DISTFILE}
-	cd "${S}"
-
-	if use cjk; then
-		cp "${DISTDIR}/${ASIANJAR}" "${DISTDIR}/${ASIANCMAPSJAR}" "${WORKDIR}" \
-			|| die "Could not copy asian fonts"
-	fi
-
-	sed -i -e 's|<link href="http://java.sun.com/j2se/1.4/docs/api/" />||' \
-		-e 's|<link href="http://www.bouncycastle.org/docs/docs1.4/" />||' \
-		"${S}/ant/site.xml"
-
-	java-ant_bsfix_files ant/*.xml || die "failed to rewrite build xml files"
-
-	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"
-	use rups && java-pkg_jar-from dom4j-1 dom4j.jar "dom4j-1.6.1.jar"
-}
-
-src_compile() {
-	eant jar $(use_doc javadoc) \
-		$(use rtf && echo "jar.rtf") \
-		$(use rups && echo "jar.rups")
-}
-
-src_install() {
-	cd "${WORKDIR}"
-	java-pkg_dojar lib/iText.jar
-	use rtf && java-pkg_dojar lib/iText-rtf.jar
-	use rups && java-pkg_dojar lib/iText-rups.jar
-	if use cjk; then
-		java-pkg_dojar "${ASIANJAR}"
-		java-pkg_dojar "${ASIANCMAPSJAR}"
-	fi
-
-	use source && java-pkg_dosrc src/core/com src/rups/com
-	use doc && java-pkg_dojavadoc build/docs
-}
diff --git a/dev-java/itext/itext-2.1.5.ebuild b/dev-java/itext/itext-2.1.5.ebuild
index 08fd2b2968c8..ecdf8aab3a0a 100644
--- a/dev-java/itext/itext-2.1.5.ebuild
+++ b/dev-java/itext/itext-2.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.ebuild,v 1.8 2010/01/03 20:42:43 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-2.1.5.ebuild,v 1.9 2010/03/28 21:18:20 caster Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source"
@@ -24,7 +24,7 @@ IUSE="cjk rtf rups"
 BCV="1.38"
 
 COMMON_DEPEND=">=dev-java/bcmail-${BCV}
-	>=dev-java/bcprov-${BCV}
+	>=dev-java/bcprov-${BCV}:0
 	rups? ( dev-java/dom4j:1 dev-java/pdf-renderer:0 )"
 DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* !doc? ( !rups? ( =virtual/jdk-1.4* ) ) )
 	cjk? ( app-arch/unzip )