Fixed dependencies to not depend on newest versions which break compilation; might need better slotting, planning to look into that tomorrow. Fixes bug #476018, reported by Jason Mours.

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 24 insertions, 16 deletions

diff --git a/dev-java/pdfbox/ChangeLog b/dev-java/pdfbox/ChangeLog
index 25bfa5948e82..bb03a3f2d7c2 100644
--- a/dev-java/pdfbox/ChangeLog
+++ b/dev-java/pdfbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/pdfbox
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/ChangeLog,v 1.22 2012/10/10 08:49:42 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/ChangeLog,v 1.23 2013/07/11 22:49:50 tomwij Exp $
+
+  11 Jul 2013; Tom Wijsman <TomWij@gentoo.org> pdfbox-0.7.3-r2.ebuild:
+  Fixed dependencies to not depend on newest versions which break compilation;
+  might need better slotting, planning to look into that tomorrow. Fixes bug
+  #476018, reported by Jason Mours.
 
   10 Oct 2012; Justin Lecher <jlec@gentoo.org> pdfbox-0.7.3-r2.ebuild:
   Fix SLOT for dev-java/fontbox
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index 35eb8a9735b4..a14e1e56269f 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA256
 
 DIST PDFBox-0.7.3.zip 22769102 SHA256 5c6f6c87cdbf247ff29d0ce691ab977c2e869070d54cf1bd6305e0fd84e7373d SHA512 1d76d5e96be26f89fdb53f68d60320dbfd5ff9c575b8ef076c8dadd3ffac6aa42f69248f9df3532c171de6093e7b5ffc097f40461a33077256f57cf75e41a6b1 WHIRLPOOL 7d0eda7449e3e6bd8d7426ed884b9d6cdeebf03104d4b3dde2bf499595d3a15906d4f26b38dd84434faca7d6d9b150353b6e2e2bb1592d2b4af716a8633d7b1e
-EBUILD pdfbox-0.7.3-r2.ebuild 2589 SHA256 a1bbacf0eebfc76343865aa99527149835903e139bb7e89f0ee387ccb4d284f8 SHA512 c176168ad313beac23d6fbb266f9a6a856c22f3317c350725d0ab15c8b1c8b213c8612c38967764969ca8a5a22d7ec6c2731142f7ac717406c9b55e75e425933 WHIRLPOOL de7b03e99af5dbcc27b63f5d654682f1652139298b41df6f1a791aacf18e2fc2240c8c40435ae068434dfa96daaedef05add1098a6110a10998a3bafd028a949
-MISC ChangeLog 2727 SHA256 1e7b0ca99b7acc2818d996fe5ed16ed95b21780c20c2cb7290f79fa03984e505 SHA512 0cff16e378e39be9a9e50140dea49b6c5dd7e34dad51db11a98ae3a0d6557ba7b76bbea16ab4613d6b85de7665c037611b75720d03e4c11f6a2a732dd183bd38 WHIRLPOOL 343358a420c944f8960794849dd01dd8a875d9db78b3e696cae9e3117c1f372f5cbbf891aa350352be965b3507660a3666ceb7ad34bb6b3bac07dad7a7332b8e
+EBUILD pdfbox-0.7.3-r2.ebuild 2589 SHA256 e074313ac10c77cd483bc1776e73f097b5b355c833c8a53f1e04cd84171be05f SHA512 efc417c617718603f15d051922fa685a62f6c95d98accf27198cfbf979528a9b5cf56a397c026b3f9c6afbb5d834d6d55f14e73e6a9406ae8a7240c11a69c920 WHIRLPOOL ab5d1df4484ebf1fca63eea4e8052fa84ce5024e0e3de69fa9e87cb99a316fdef9081c9b232f6417b6adc24fcad6c5fe0806c70cab29f0e5f0ed628715745cee
+MISC ChangeLog 2993 SHA256 9df5e5770efd48770a807d1ead827918107046f654e05d36564b045579ccf1ac SHA512 48b6e53ee6f6f5f9df31af7ea595a5fc15ab5a7fa6aa4530bee49d4fcee82623ecdba3e98e60840afd75c08e9d0ddf28ab60eb05b3d60ecec32cbfc19168cfc7 WHIRLPOOL 8eb01af652b231aefbccc9c19815b8001a95f3e911ca819ce621ac4323218fb51f470b80dbed30fc5cb0c3279be99084ae9ed4c9caf359fbcf4f3e098eaf14e1
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlB1NqcACgkQgAnW8HDreRYwaACfWC2ES8l1F0Kc1U44jo3oeDK0
-2mYAniNUhStlSgrGGOM7rf9ctTJB4zTz
-=zYz5
+iQEcBAEBCAAGBQJR3zaSAAoJEJWyH81tNOV9LnQH/3nh4ur+dAqrnDODWNwEpPIc
+mDDzzCu8GMTgJQ5ARrN6k7Vj8uOMx7T5cT9I4eSvHMuUKnwCa7pXwfy8uas+zHgl
+4Fqm7UXDsaVjxWVHVRHaDCpJl+PvUB4Q246CUQ8YczMoCJ/qKEPEN8YwYCO/FJuM
+3Z8imjI39KaMmfbW8RvU2bOyFpVcAQzMMA6v/N1JIExmvyp0ZEfUD88kJzmG9Ibo
+za6CjY8hHpalQ5UFLo2thmmFhIfsIDSVvXYlX6LZvvck4GtCoeXoYFLc6DohZNUz
+ZB5PVDVgM7HKbqDuhvwQg9fNzgOLQNkwoK4iASaXvuQ812sawC11EbqyRm8Mzfk=
+=ff1N
 -----END PGP SIGNATURE-----
diff --git a/dev-java/pdfbox/pdfbox-0.7.3-r2.ebuild b/dev-java/pdfbox/pdfbox-0.7.3-r2.ebuild
index 1f0f13f69a0b..9784f9024466 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-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/pdfbox/pdfbox-0.7.3-r2.ebuild,v 1.13 2012/10/10 08:49:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/pdfbox-0.7.3-r2.ebuild,v 1.14 2013/07/11 22:49:50 tomwij Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="doc source"
@@ -14,14 +14,14 @@ HOMEPAGE="http://www.pdfbox.org"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-macos"
 IUSE=""
 
 CDEPEND="dev-java/fontbox:0
-	>=dev-java/bcprov-1.32:0
-	>=dev-java/bcmail-1.32
+	>=dev-java/bcprov-1.32:1.3
+	=dev-java/bcmail-1.38*:0
 	dev-java/lucene:2.1
-	dev-java/ant-core"
+	dev-java/ant-core:0"
 RDEPEND=">=virtual/jre-1.4
 	${CDEPEND}"
 DEPEND=">=virtual/jdk-1.4
@@ -46,7 +46,7 @@ src_unpack() {
 
 	cd external
 	java-pkg_jar-from fontbox
-	java-pkg_jar-from bcprov
+	java-pkg_jar-from bcprov-1.3
 	java-pkg_jar-from bcmail
 	java-pkg_jar-from lucene-2.1
 	java-pkg_jar-from ant-core ant.jar