Version bump. Fix bug #430054.

Package-Manager: portage-2.2.14/cvs/Linux x86_64

diff --git a/dev-java/pdfbox/ChangeLog b/dev-java/pdfbox/ChangeLog
index cfad0a95d8920b3e0939694884aa3b8bed9bb06c..2a0198c19a369c4384d37dc64ac8dd147d14be73 100644 (file)
--- a/dev-java/pdfbox/ChangeLog
+++ b/dev-java/pdfbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/pdfbox
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/ChangeLog,v 1.28 2014/11/16 13:51:34 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/ChangeLog,v 1.29 2015/02/21 14:29:15 monsieurp Exp $
+
+*pdfbox-1.8.8 (21 Feb 2015)
+
+  21 Feb 2015; Patrice Clement <monsieurp@gentoo.org>
+  +files/pdfbox-1.8.8-build.xml.patch, +pdfbox-1.8.8.ebuild:
+  Version bump. Fix bug #430054.
 
   16 Nov 2014; Manuel Rüger <mrueg@gentoo.org> pdfbox-0.7.3-r3.ebuild:
   Fix HOMEPAGE. See bug #501500.

diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index f26d82953407f16711e98d39c52472b6fe3a635b..ce07392b871996ad14289075a9b0b293e9809173 100644 (file)
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -1,4 +1,8 @@
+AUX pdfbox-1.8.8-build.xml.patch 410 SHA256 c2080f0c3d4022cf58018149382e7900a7498931397785a8ee3829908a19705c SHA512 8c68c8ab9795d1442eccb017f19dfa4c37f50ebc0ca304f3edbc4f3914a6e631d424819a909235dd0f72389c178be31fdb856cd5c06702fab33a640e0ed7c074 WHIRLPOOL 85b99d07b3300e52d4a3c4234210ad7130c0bb416f42c5d3d70e7f6ce32361768ecda04e1a2073a3c76318f89253e22f2016ab0ae84e98ac6162ab952e9b3dd3
 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
-MISC ChangeLog 3667 SHA256 3eb5d607a88a69fd8fe529dcf6fce66636756b1738934db3aa6d1f73ec3a453c SHA512 c1ab61691a2c5b9e5f64127157b8b033e65b004adacd8f7e1b1b8e1a4359f65fc856da6031e60bb76112b0efa6dd7cc021bd956f774d06ab1560f5a4fa9e442f WHIRLPOOL aaf85158a659a29875457dd88de17a4b918979fd541abcb4512ce0a8b830a5b287503c9318278f784c2b302b6d70a71e521ae852861736b75d839789841ebb16
+EBUILD pdfbox-1.8.8.ebuild 2011 SHA256 dab1b543580f1112b37e7d88f807be90edfad6437cb42366784623480b88c788 SHA512 3b8e6ad4d79eda79fe6a626b76a80ba30f39d18973f4a3b5e6c652b05b3999994b65872494b454db0f389335dd83756a4f38d24bb86b3a568af67d6d7410acb2 WHIRLPOOL 6a5e1fe252ac570414101319d1da87f1304e448ff8f0a5a98b17080f0b4660960992f4fee86dd98d9d76ce5f47add0070a50a577356c773a149a4535253a13b1
+MISC ChangeLog 3849 SHA256 c9fe304b7fef861a061622d00defb99335fdbd018ef8c4cff03d5f48738ff31f SHA512 91590dc6584a542b3976b7eecf200a6979293527a904b56f88922088be1185d4fa1358275758700c3b327303e5809af8d7aae3b101357053c5e741ea5d57ab3b WHIRLPOOL 62f5d9e38410bc046d14a2a108ccea5604f8db70af3a9458e1da17cf4a64dfc5cac0feaf1dcb03924befb2b9e70ee89011ce485e5601f23044e0474904f2907f
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448

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
new file mode 100644 (file)
index 0000000..0396b53
--- /dev/null
+++ b/dev-java/pdfbox/files/pdfbox-1.8.8-build.xml.patch
@@ -0,0 +1,11 @@
+--- build.xml.orig     2015-02-21 14:23:45.700488598 +0100
++++ build.xml  2015-02-21 14:23:51.968504982 +0100
+@@ -28,7 +28,7 @@
+     <property name="tool.dir" value="tools" />
+     <property name="bin.dir" value="bin" />
+ 
+-    <property name="project.version" value="1.8.7" />
++    <property name="project.version" value="1.8.8" />
+ 
+     <!-- pdfbox -->
+     <property name="pdfbox.project.name" value="pdfbox"/>

diff --git a/dev-java/pdfbox/pdfbox-1.8.8.ebuild b/dev-java/pdfbox/pdfbox-1.8.8.ebuild
new file mode 100644 (file)
index 0000000..0dfa280
--- /dev/null
+++ b/dev-java/pdfbox/pdfbox-1.8.8.ebuild
@@ -0,0 +1,79 @@
+# 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.1 2015/02/21 14:29:15 monsieurp Exp $
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java library and utilities for working with PDF documents"
+HOMEPAGE="http://pdfbox.apache.org/"
+ADOBE_FILES="pcfi-2010.08.09.jar"
+SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
+       http://repo2.maven.org/maven2/com/adobe/pdf/pcfi/2010.08.09/${ADOBE_FILES}"
+LICENSE="BSD"
+SLOT="1.8"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+CDEPEND=">=dev-java/bcprov-1.50
+       >=dev-java/bcmail-1.45
+       >=dev-java/commons-logging-1.1.1:0
+       dev-java/icu4j:4
+       dev-java/junit:4"
+RDEPEND=">=virtual/jre-1.7
+       ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.7
+       app-arch/unzip
+       test? (
+               dev-java/ant-junit:0 )
+       ${CDEPEND}"
+
+S="${WORKDIR}/${P}/${PN}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="bcprov,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"
+
+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 :[
+       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
+       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 ${P}.jar ${PN}.jar
+
+       if use doc; then
+               java-pkg_dojavadoc target/site/apidocs
+       fi
+
+       if use source; then
+               java-pkg_dosrc src/main/java/org
+       fi
+}