Add RESTRICT=test back and turn off tests. Correct wrong slots. Fix bug 549110.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux i686
Manifest-Sign-Key: 0x93491BB8

4 files changed, 162 insertions, 35 deletions

diff --git a/dev-java/pdfbox/ChangeLog b/dev-java/pdfbox/ChangeLog
index f4a00d6b0a34..3226d3b6d680 100644
--- a/dev-java/pdfbox/ChangeLog
+++ b/dev-java/pdfbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/pdfbox
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/ChangeLog,v 1.30 2015/02/22 12:01:04 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/ChangeLog,v 1.31 2015/05/12 17:03:34 monsieurp Exp $
+
+  12 May 2015; Patrice Clement <monsieurp@gentoo.org>
+  files/pdfbox-1.8.8-build.xml.patch, pdfbox-1.8.8.ebuild:
+  Add RESTRICT=test back and turn off tests. Correct wrong slots. Fix bug
+  549110.
 
   22 Feb 2015; Miroslav Šulc <fordfrog@gentoo.org> pdfbox-1.8.8.ebuild:
   fixed installation of jar file (bug #540998)
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index 03afcb9c8f78..253affb71e72 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -1,8 +1,22 @@
-AUX pdfbox-1.8.8-build.xml.patch 410 SHA256 c2080f0c3d4022cf58018149382e7900a7498931397785a8ee3829908a19705c SHA512 8c68c8ab9795d1442eccb017f19dfa4c37f50ebc0ca304f3edbc4f3914a6e631d424819a909235dd0f72389c178be31fdb856cd5c06702fab33a640e0ed7c074 WHIRLPOOL 85b99d07b3300e52d4a3c4234210ad7130c0bb416f42c5d3d70e7f6ce32361768ecda04e1a2073a3c76318f89253e22f2016ab0ae84e98ac6162ab952e9b3dd3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX pdfbox-1.8.8-build.xml.patch 5968 SHA256 598b8ddcd98233afea4a48c99c68c9326d2b057b60f331ce5b342d2c10f65366 SHA512 b2662394228ed7b1c77f810cd976a5471fb590556cccfd5c0ce909e5ab9489e4fe3772dc5339caa83b925bba79b73291118b36072585622562802c94f56df888 WHIRLPOOL c60b48170396ef671ff4527c1c0f6af77724c8f1e1900818c2e3ba24a7c97c27598da69f742e44decf21ea5ccbf1251b347fba81a86b7ea36a3aae1c86c74d53
 DIST PDFBox-0.7.3.zip 22769102 SHA256 5c6f6c87cdbf247ff29d0ce691ab977c2e869070d54cf1bd6305e0fd84e7373d SHA512 1d76d5e96be26f89fdb53f68d60320dbfd5ff9c575b8ef076c8dadd3ffac6aa42f69248f9df3532c171de6093e7b5ffc097f40461a33077256f57cf75e41a6b1 WHIRLPOOL 7d0eda7449e3e6bd8d7426ed884b9d6cdeebf03104d4b3dde2bf499595d3a15906d4f26b38dd84434faca7d6d9b150353b6e2e2bb1592d2b4af716a8633d7b1e
 DIST pcfi-2010.08.09.jar 6731455 SHA256 a787fb2a842de7bd5ee4fa13c4808aa6793380dde0219560b50054f6ca25c77c SHA512 067394ddac4a48ba8ac94b03f907d0faf98a91be658689a34eb85fdce49515582426f6a1fa433bfa87ca417ce3a6fa3aa89d89126a36176d8e04f3359c36d10b WHIRLPOOL fa9e9b6b2cc45f749101726c8fb7a4c7719d78448122c465b60696cd5be1a2a27bc65f549429d5a74c79bc74aaed39b3c0a8dfe02ec569303b96faa818410e73
 DIST pdfbox-1.8.8-src.zip 11339989 SHA256 90d6b9a33682586e29bbce4ffeadf38c12fe0373bfe82441c1a63610a9c4ea8a SHA512 254361d0dcbfdc52bc78a2ed7e121065a2d173d1362a219d6644c3cc8a83a37904744e03f1725e2db67494d5f54f822b6e5a16dd8e791906efb9c348d564552f WHIRLPOOL cd9e71be60ee6d92c34f4affe7d6b074896920491a731a65f2b74e9e09754e836288c632e5d4a24b2d8aba64505dc58d2c3f8d0dd103c33773fce6dcd187e5a3
 EBUILD pdfbox-0.7.3-r3.ebuild 2602 SHA256 a7f10849a5f208e8a459d935d6654e86328230f4a950d0b5ac205a9ab0556525 SHA512 c3fc7dd5c9eb67e318b3edd48cf5be7ef1492024f37061e99cd38db4f5ac1d304cc47594a83c9d7fe2fdda4b4f667c271baf38f890f6e8c914a3541966e0c917 WHIRLPOOL b1c31be2facdf97df0dfd021b4e97fd950b314f5b524d63cc752245aaa4804a8d9713d763175cdc4323a5ab4dc7567d2741ce6ba5ee0cc73db3a0eea4e6dbe6c
-EBUILD pdfbox-1.8.8.ebuild 2013 SHA256 af78b6b5061793d26d32a110dc233a122856f4296aedc7081f7ed6026e343af5 SHA512 e44bb84436f75bc9e7ec841698ec37a715d20e9d52e2ab2a3a993ff361ff68996058c30e3b5ea3a865b16995f26c860e4500e09ebab1c569ab7ccd4dfc34c2d3 WHIRLPOOL cf3f42ec83ecb95869a86746e2faaab33fc6a37ee8db5ec4fe2025fddf069bbb1bb283498dc5c0de0faed25da67db9157b64bd0eec2274024b8f28637be6204b
-MISC ChangeLog 3969 SHA256 ecbdb134f1ae72d1dea18457adb6a06f16dda7bc799190ac88aaec9798371062 SHA512 9dbe6869c8e7eade26053704249846b32b1a909a0cc111e47b2276a7f179dbc33d4c9dd84209405987a750b3bb74d7ce7429ca405e0060c04b6c55cf448e0701 WHIRLPOOL 5946e33264fc006e7c3b69c007964ef1e397e7bbc34b5af6efe9b0a7967b303651a8770c89fb3157c539637f79aa7ee7af7c39f837204a9425aa298b49101ecb
+EBUILD pdfbox-1.8.8.ebuild 1473 SHA256 a8c864d8dd0383bb28297f12996ac42f73ebae0909e1712e1fb0b42081f82c0c SHA512 139f707bb62445044f3c329a9d78431c7f9a6b9c4fa730dc53b18492ba329a55e4f3be21a31328236c333ba50b3448c19f6b167cfe972bbc302ef72b4bfa7902 WHIRLPOOL d85cce54f986882d00bc2a82754dff4ca58d00a626a5297c87bbb81cb0cd9f4c0ee7a648fe4b0caa6d026025040af12c4be89957927c71ddb15ca33414908637
+MISC ChangeLog 4168 SHA256 5ebab9072ac629cbd1930de3a1b92161a42ceea2f72bc165b729cfc23acc94bc SHA512 054ce6c1e108d01049837a9b0532962c77f242703ba1aa417ae704ca9103fffd78d51b4ce2827adba2e8ec3e04160d294af3b98700650fea9f69cd7bd19eb933 WHIRLPOOL d4db79232d25edd5077984ea7adcf4eb6312636af02824367748a35f211d91229676397e8ab1e6d08ec21892018eb2827a0c0a473a6f8f113c9cab7f1d5f0e42
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVUjKqAAoJEJGRpfGTSRu4E0cIAK5Oi+u40tWU/2Na0lXNyrRJ
+caAnCrOqwBHCsZ/z6PxPwD7NpI99P6DKJ8ySiIL0b9NgNobPPY++zIqsATSWYh3q
+bah5nzWZb7jCDiVMGDGeHntTO9vWGx2uwG+t8RLGDTxKw5yAaiNqAvUfZg7RHkiO
+K+gfuNfPY8OM21pOdMZ2F07gNGN2X8QYTcA8PJqnGivu1VMKiuUvta+hdICO1OHY
+VlAgrysTbOe9nZxueFeF+faUY7YbUwMIXt6ehHr7SKq3F9o7tTRT4Rn802f/hggD
+BUDTv0JcYS03Qmgtp+B3WAIVhAMUP0XL7nEMVXu5wWiTn2Jcuwm38BEeM21GIO4=
+=oDMl
+-----END PGP SIGNATURE-----
diff --git a/dev-java/pdfbox/files/pdfbox-1.8.8-build.xml.patch b/dev-java/pdfbox/files/pdfbox-1.8.8-build.xml.patch
index 0396b534551e..cb8c8cd62a42 100644
--- a/dev-java/pdfbox/files/pdfbox-1.8.8-build.xml.patch
+++ b/dev-java/pdfbox/files/pdfbox-1.8.8-build.xml.patch
@@ -1,5 +1,5 @@
---- build.xml.orig	2015-02-21 14:23:45.700488598 +0100
-+++ build.xml	2015-02-21 14:23:51.968504982 +0100
+--- build.xml.orig	2015-05-12 16:41:01.813664913 +0000
++++ build.xml	2015-05-12 16:44:10.434652444 +0000
 @@ -28,7 +28,7 @@
      <property name="tool.dir" value="tools" />
      <property name="bin.dir" value="bin" />
@@ -9,3 +9,126 @@
  
      <!-- pdfbox -->
      <property name="pdfbox.project.name" value="pdfbox"/>
+@@ -95,9 +95,6 @@
+     <property name="testoutput-ext.dir" value="${pdfbox.target.dir}/test-output-ext"/>
+     <property name="testinput-ext.dir" value="${pdfbox.target.dir}/test-input-ext"/>
+ 
+-    <property name="adobefiles.url" value="${maven.repo2}/com/adobe/pdf/pcfi/2010.08.09/pcfi-2010.08.09.jar"/>
+-    <property name="adobefiles.jar" value="${download.dir}/pcfi-2010.08.09.jar"/>
+-
+     <property name="file" value=""/>
+ 
+     <!--.NET properties -->
+@@ -171,7 +168,7 @@
+         <mkdir dir="${jempbox.dest.dir}"/>
+     </target>
+ 
+-    <target name="pdfbox.compile" depends="fontbox.package,jempbox.package,pdfbox.init,get.adobefiles"
++    <target name="pdfbox.compile" depends="fontbox.package,jempbox.package,pdfbox.init"
+             description="Compile Java source files">
+         <!-- required encoding flag to be able to build using ibm-jdk on redhat ES-->
+         <javac srcdir="${pdfbox.src.dir}" destdir="${pdfbox.dest.dir}"
+@@ -206,31 +203,6 @@
+ 
+     <target name="test" depends="testextract,test-junit,testimage" description="Run all the junit tests"/>
+ 
+-    <target name="find.adobefiles">
+-        <available property="adobefiles.found" file="${dest.dir}/org/apache/pdfbox/resources/cmap"/>
+-    </target>
+-
+-    <target name="get.adobefiles"
+-            unless="adobefiles.found" depends="find.adobefiles"
+-            description="Download and unpack afm and cmap files from Adobe">
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${adobefiles.url}"/>
+-            <param name="destfile" value="${adobefiles.jar}"/>
+-        </antcall>
+-        <unjar src="${adobefiles.jar}" dest="${pdfbox.dest.dir}/org/apache/pdfbox/resources/afm">
+-            <patternset>
+-                <include name="com/adobe/pdf/pcfi/afm/*.afm"/>
+-            </patternset>
+-            <mapper type="flatten"/>
+-        </unjar>
+-        <unjar src="${adobefiles.jar}" dest="${pdfbox.dest.dir}/org/apache/pdfbox/resources">
+-            <patternset>
+-                <include name="com/adobe/pdf/pcfi/glyphlist.txt"/>
+-            </patternset>
+-            <mapper type="flatten"/>
+-        </unjar>
+-    </target>
+-
+     <target name="testextract" depends="clean,pdfbox.compile" description="Test text extraction">
+         <junit printsummary="off" fork="on" dir=".">
+             <jvmarg value="-Xmx1024M"/>
+@@ -341,52 +313,7 @@
+         </checkstyle>
+     </target>
+ 
+-    <target name="get.externallibs.pdfbox">
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${bcmail.url}"/>
+-            <param name="destfile" value="${bcmail.jar}"/>
+-        </antcall>
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${bcprov.url}"/>
+-            <param name="destfile" value="${bcprov.jar}"/>
+-        </antcall>
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${junit.url}"/>
+-            <param name="destfile" value="${junit.jar}"/>
+-        </antcall>
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${logging.url}"/>
+-            <param name="destfile" value="${logging.jar}"/>
+-        </antcall>
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${icu4j.url}"/>
+-            <param name="destfile" value="${icu4j.jar}"/>
+-        </antcall>
+-    </target>
+-
+-    <target name="get.externallibs.fontbox">
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${junit.url}"/>
+-            <param name="destfile" value="${junit.jar}"/>
+-        </antcall>
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${logging.url}"/>
+-            <param name="destfile" value="${logging.jar}"/>
+-        </antcall>
+-    </target>
+-
+-    <target name="get.externallibs.jempbox">
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${junit.url}"/>
+-            <param name="destfile" value="${junit.jar}"/>
+-        </antcall>
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${logging.url}"/>
+-            <param name="destfile" value="${logging.jar}"/>
+-        </antcall>
+-    </target>
+-
+-    <target name="pdfbox.package" depends="get.externallibs.pdfbox,pdfbox.compile" description="Package pdfbox into a jar file">
++    <target name="pdfbox.package" depends="pdfbox.compile" description="Package pdfbox into a jar file">
+         <propertyfile file="${pdfbox.resources.dir}/org/apache/pdfbox/resources/pdfbox.version">
+             <entry  key="pdfbox.version" value="${pdfbox.release.name}"/>
+         </propertyfile>
+@@ -405,7 +332,7 @@
+         </jar>
+     </target>
+ 
+-    <target name="fontbox.package" depends="get.externallibs.fontbox,fontbox.compile" description="Package fontbox into a jar file">
++    <target name="fontbox.package" depends="fontbox.compile" description="Package fontbox into a jar file">
+         <jar jarfile="${fontbox.jar}">
+             <fileset dir="${fontbox.dest.dir}"/>
+             <metainf dir="." includes="*.txt"/>
+@@ -419,7 +346,7 @@
+         </jar>
+     </target>
+ 
+-    <target name="jempbox.package" depends="get.externallibs.jempbox,jempbox.compile" description="Package jempbox into a jar file">
++    <target name="jempbox.package" depends="jempbox.compile" description="Package jempbox into a jar file">
+         <jar jarfile="${jempbox.jar}">
+             <fileset dir="${jempbox.dest.dir}"/>
+             <metainf dir="." includes="*.txt"/>
diff --git a/dev-java/pdfbox/pdfbox-1.8.8.ebuild b/dev-java/pdfbox/pdfbox-1.8.8.ebuild
index 087659eabf17..ed36723a6afe 100644
--- a/dev-java/pdfbox/pdfbox-1.8.8.ebuild
+++ b/dev-java/pdfbox/pdfbox-1.8.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/pdfbox-1.8.8.ebuild,v 1.3 2015/04/02 18:33:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/pdfbox-1.8.8.ebuild,v 1.4 2015/05/12 17:03:34 monsieurp Exp $
 EAPI=5
 
-JAVA_PKG_IUSE="doc source test"
+JAVA_PKG_IUSE="source test"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Java library and utilities for working with PDF documents"
@@ -16,11 +16,11 @@ SLOT="1.8"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-CDEPEND=">=dev-java/bcprov-1.50
+CDEPEND="dev-java/icu4j:4
+	dev-java/junit:4
+	dev-java/bcprov:1.45
 	dev-java/bcmail:1.45
-	>=dev-java/commons-logging-1.1.1:0
-	dev-java/icu4j:4
-	dev-java/junit:4"
+	>=dev-java/commons-logging-1.1.1:0"
 RDEPEND=">=virtual/jre-1.7
 	${CDEPEND}"
 DEPEND=">=virtual/jdk-1.7
@@ -33,45 +33,30 @@ S="${WORKDIR}/${P}/${PN}"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 
-EANT_GENTOO_CLASSPATH="bcprov,bcmail-1.45,commons-logging,junit-4,icu4j-4"
+EANT_GENTOO_CLASSPATH="bcprov-1.45,bcmail-1.45,commons-logging,junit-4,icu4j-4"
 EANT_BUILD_TARGET="pdfbox.package"
 WANT_ANT_TASKS="ant-nodeps"
 
-EANT_TEST_GENTOO_CLASSPATH="ant-junit,junit-4"
-EANT_TEST_TARGET="test"
+RESTRICT="test"
 
 src_unpack() {
 	unpack ${A}
 }
 
 java_prepare() {
-	# Correct version number in build.xml.
-	# Silly typo from upstream (version mismatch) but as a result,
-	# the generated jar bears version 1.8.7 instead of 1.8.8 :[
+	# This patch:
+	# - turns off downloads
+	# - increments version number (silly mistake from upstream)
 	epatch "${FILESDIR}"/${P}-build.xml.patch
-	mkdir -v download external
-	ln -s "${DISTDIR}/${ADOBE_FILES}" download
 }
 
-src_test() {
-	# For some reason that I have YET to figure out,
-	# running the junit tests delete the jar file (!?)
-	# (well I guess everything inside target/*)
-
-	# So let's move our precious jar to another dir
+src_compile() {
+	java-pkg-2_src_compile
 	mv target/${P}.jar ${P}.jar
-
-	# TODO: not all tests pass; investigate why.
-	# (is it our business or upstream's?)
-	java-pkg-2_src_test
 }
 
 src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	if use doc; then
-		java-pkg_dojavadoc target/site/apidocs
-	fi
+	java-pkg_newjar ${P}.jar ${PN}.jar
 
 	if use source; then
 		java-pkg_dosrc src/main/java/org