Use slot dep for bcprov.

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

3 files changed, 9 insertions, 106 deletions

diff --git a/dev-java/pdfbox/ChangeLog b/dev-java/pdfbox/ChangeLog
index ae5392dd8a05..a21b1f46a580 100644
--- a/dev-java/pdfbox/ChangeLog
+++ b/dev-java/pdfbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/pdfbox
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/ChangeLog,v 1.14 2008/05/17 14:12:02 ken69267 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/ChangeLog,v 1.15 2010/03/28 21:19:48 caster Exp $
+
+  28 Mar 2010; Vlastimil Babka <caster@gentoo.org> -pdfbox-0.7.3-r1.ebuild,
+  pdfbox-0.7.3-r2.ebuild:
+  Use slot dep for bcprov.
 
   17 May 2008; Kenneth Prugh <ken69267@gentoo.org> pdfbox-0.7.3-r2.ebuild:
   amd64 stable, bug #219663
diff --git a/dev-java/pdfbox/pdfbox-0.7.3-r1.ebuild b/dev-java/pdfbox/pdfbox-0.7.3-r1.ebuild
deleted file mode 100644
index 5357e26984b7..000000000000
--- a/dev-java/pdfbox/pdfbox-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,101 +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/pdfbox/pdfbox-0.7.3-r1.ebuild,v 1.2 2008/03/23 12:14:53 betelgeuse Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-nodeps"
-inherit java-pkg-2 java-ant-2
-
-MY_PN="PDFBox"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Java library and utilities for working with PDF documents"
-HOMEPAGE="http://www.pdfbox.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-CDEPEND="dev-java/fontbox
-	>=dev-java/bcprov-1.32
-	>=dev-java/bcmail-1.32
-	dev-java/lucene:2.1
-	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# missing needed files
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -v external/*.jar
-	rm -rf docs/javadoc
-
-	# the pdf files used in test cases are not included
-	rm -rf src/test
-
-	cd external
-	java-pkg_jar-from fontbox
-	java-pkg_jar-from bcprov
-	java-pkg_jar-from bcmail
-	java-pkg_jar-from lucene-2.1
-	java-pkg_jar-from ant-core ant.jar
-}
-
-EANT_BUILD_TARGET="package"
-
-my_launcher() {
-	java-pkg_dolauncher ${1} --main org.pdfbox.${2}
-	echo "${1} -> ${2}" >> "${T}"/launcher.list
-}
-
-src_install() {
-	java-pkg_newjar lib/${MY_P}.jar
-
-	my_launcher pdfconvertcolorspace ConvertColorspace
-	my_launcher pdfdecrypt Decrypt
-	my_launcher pdfencrypt Encrypt
-	my_launcher pdfexportfdf ExportFDF
-	my_launcher pdfexportxfdf ExportXFDF
-	my_launcher pdfextractimages ExtractImages
-	my_launcher pdfextracttext ExtractText
-	my_launcher pdfimportfdf ImportFDF
-	my_launcher pdfimportxfdf ImportXFDF
-	my_launcher pdfoverlay Overlay
-	my_launcher pdfdebugger PDFDebugger
-	my_launcher pdfmerger PDFMerger
-	my_launcher pdfreader PDFReader
-	my_launcher pdfsplit PDFSplit
-	my_launcher pdftoimage PDFToImage
-	my_launcher printpdf PrintPDF
-	my_launcher texttopdf TextToPDF
-
-	if use doc; then
-		dohtml -r docs/*
-		java-pkg_dojavadoc website/build/site/javadoc
-	fi
-
-	use source && java-pkg_dosrc src/org
-}
-
-pkg_postinst() {
-	elog "This package installs several command line tools for manipulating"
-	elog "PDF files. Some of their names were changed from upstream to"
-	elog "be less ambigous, and not collide with other packages. For"
-	elog "detailed information refer to the html documentation installed with"
-	elog "USE=doc, or ${HOMEPAGE}"
-
-	while read line
-	do
-		elog ${line}
-	done < "${T}"/launcher.list
-}
diff --git a/dev-java/pdfbox/pdfbox-0.7.3-r2.ebuild b/dev-java/pdfbox/pdfbox-0.7.3-r2.ebuild
index a1cb4abce1ff..31ed5e86ed25 100644
--- a/dev-java/pdfbox/pdfbox-0.7.3-r2.ebuild
+++ b/dev-java/pdfbox/pdfbox-0.7.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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/pdfbox/pdfbox-0.7.3-r2.ebuild,v 1.5 2008/05/17 14:12:02 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/pdfbox-0.7.3-r2.ebuild,v 1.6 2010/03/28 21:19:48 caster Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="doc source"
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 CDEPEND="dev-java/fontbox
-	>=dev-java/bcprov-1.32
+	>=dev-java/bcprov-1.32:0
 	>=dev-java/bcmail-1.32
 	dev-java/lucene:2.1
 	dev-java/ant-core"