Do not embedd pcfi, which is the separate package now

Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: 9BF3548C

4 files changed, 73 insertions, 2 deletions

diff --git a/dev-java/pdfbox/ChangeLog b/dev-java/pdfbox/ChangeLog
new file mode 100644
index 0000000..2059bf4
--- /dev/null
+++ b/dev-java/pdfbox/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for dev-java/pdfbox
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  25 Dec 2012; <dmol@gentoo.org> pdfbox-1.7.1.ebuild,
+  +files/pdfbox-1.7.1-use-adobe-pcfi.patch:
+  Do not embedd pcfi, which is the separate package now
+
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index e806d2b..7973628 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -1,6 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX pdfbox-1.7.1-build.xml.patch 3706 SHA256 fb95aa7f19f362cb17f999bf6f451d2d7c117e72b9db4d908bb0161d1425ab00 SHA512 0a1eafd3388416224fc0783b2b2eff274222bb61e8141a88494389dc8a6d05508ffd55bea2528ad57a190b0a1c71d0a0ed6257a8676969528149db42046aca69 WHIRLPOOL 443ce31129460bd62efb7a13a9b2c9215dbb847279ca54cafae13a70d70cc0df143e467f3165dd24767f4717b7e81f86915c8faa2fc7ba90dc6f73d2d19b76c5
 AUX pdfbox-1.7.1-disable-TestPDDocumentCatalog.patch 878 SHA256 066efbb0b64d5c1468b03fd9da8bc28aaa4a716c1b21f72ba881c57c7ce72c9d SHA512 4ea5f1560c4f63dedc0065181953486ee82451294abecd43568ed3e0613cc9a5ef2348f294928008c3709ee273c85c898c82ec8ff18a4c60c8d11d31a6bf41d9 WHIRLPOOL 79055db297b953f616f7493e3bd38e152ced8c22edf0df7f72a7bb71de0ae2e748b699b60156a90b88b7b0050821660c12c6eaf51d9588813c29bac831cee56d
+AUX pdfbox-1.7.1-use-adobe-pcfi.patch 2210 SHA256 6f2e3a3fb6fb81e571f31028e55114ec95a34b2cce8327f6c61a5b89d795d970 SHA512 85fc75f99551f9fd2308dd0e6aa4fe4fa92dc99c1955bda9eacbcc750a9262a7769496e8b25798731ef437c13999b85ff4f9c71427470447faab86f6a0e4e024 WHIRLPOOL f96bec1095bb87a5334ee1679383d1b888d1bcf899a223098bdf698636cbe6089cdc9942ee0fae7e8ef57a6503d3d72d335d9c95973aa0577dd847e3c5fa7c16
 DIST pcfi-2010.08.09.jar 6731455 SHA256 a787fb2a842de7bd5ee4fa13c4808aa6793380dde0219560b50054f6ca25c77c SHA512 067394ddac4a48ba8ac94b03f907d0faf98a91be658689a34eb85fdce49515582426f6a1fa433bfa87ca417ce3a6fa3aa89d89126a36176d8e04f3359c36d10b WHIRLPOOL fa9e9b6b2cc45f749101726c8fb7a4c7719d78448122c465b60696cd5be1a2a27bc65f549429d5a74c79bc74aaed39b3c0a8dfe02ec569303b96faa818410e73
 DIST pdfbox-1.7.1-src.zip 9167805 SHA256 805c6b893ff10216cc826aa44e7a2eaf35bb43ca8ed19896c43132d253d3145e SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0 WHIRLPOOL 438fcd6f2d0128b972dfd5be83b2bc455daf9f126ac5b7a6a5de8a41e29f482b462e8e48e07a21ac1e896de4daa5ffed2eee400ec96ac93fbbce25fef99b0ade
-EBUILD pdfbox-1.7.1.ebuild 1861 SHA256 ececf7da87830dcaf3e5e39e435cf10b34d137da4622471ee7b7ebc36c32e9d1 SHA512 97a2b4b6ab8cba77795143023e0ae155e110826b3e1fb61a9e18e21978d47079c65054243f85fed475afe037fea9eff1a69b9c95e64464e07657c2c3043e25cb WHIRLPOOL 055f4e8cf5866ae94151edba986f0acf6aca9a3a7e8d62dc3f742a305bc525ab58f4ca314e5ebb08056900c6e2e6d5c6c4e5ff6ce689e9448308c4ce53ad1cd5
+EBUILD pdfbox-1.7.1.ebuild 2001 SHA256 31c596fe2bd2e2fb52339289397ba7e80941e93670adc1cb82c8ab7acb8828a4 SHA512 ce4e4c642d62a8f4ee780b9bc261bfb2e848dcfafa2e5c8a5a5721e8c9f0cab9d2fc938473501b2ea73fdabaad305d67ffe7e89ffac60b0f69f3c48f945101e3 WHIRLPOOL 0a9c10feaa8042022b93b8c378f3b09bf2558d351bea37a9ada641be700f6d4dd07bedc4d5d21be3e3b385f4e693a29cf2f6503aa1a7f0ae6bef45befce5ea8a
+MISC ChangeLog 271 SHA256 888315f6562ce12acee25811a1bb716fe00dbe414dce5e178d06e84424c18f4f SHA512 dd8ef33aa97ba26d05aeaed709d8fbd232b8a72d49025b6ac3c4a5600ad00a26a27ed30d04d0007a2f3e25dba68b550ce50a3b4156bfcb2e54deeb1e85aacfe2 WHIRLPOOL c9571dfb6378a1c6a139cdda2b95e6cdf34726c5803352f45d7ab403b7075d660c5fb8811544205f84b2d23fa3f37e73c586ce90c4657788327b8bc8c49ab1b9
 MISC metadata.xml 205 SHA256 2ff0740a5424b0e10c7888541a248d1bd363a60911b0921b4cfe5c36590498ce SHA512 e7c77c724739d0af43cc338ded09dcbeee2a710eb0e49f1e656dc4c891bee85bfd6935bf70a191a1c5823f473643e676d64970416e5f1820ea466681016757c5 WHIRLPOOL 5b7f0c2a5243244fa06b072c8f0d9f53e7b6f45c7e1b74a0d945bdcc28b7137fddfd58e85b0d3e721e80963916ceae0d4cca59f48114ba26c47b24a91d6abb27
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ2cIEAAoJEMw3yeub81SMKtUIAI38wzayZZZRf/6I20UlpcMq
+C1fumVFqx/0Dudy80YNEZR9Rfh1Gf2GmEdHMDLyEiJyYfLplUQwr8pepgoWTBUSZ
+R+652hWhuXVtwTCGMX2HwHoGyj2N8+0lvKgWbXh3DhyldCr2UyYE+4lO/gfDu590
+VuA3gPpXQrIYH76lbZBsMnMstEX55MyAR9JpLCvS6NabEsswo0S0OEnM3qtSBB2r
+UGPyHZrFZjQEjTZ7/+5pvNght1+OkF44CfXd5d8GTpvY/Bb6DUHGmmDAn/gdDIyN
+NmyShTjj/zM2s21bJG07ZFCkbq2tcb4cXnRvIBKppDfwKjZ7hs/xMsFMlz539bo=
+=acc1
+-----END PGP SIGNATURE-----
diff --git a/dev-java/pdfbox/files/pdfbox-1.7.1-use-adobe-pcfi.patch b/dev-java/pdfbox/files/pdfbox-1.7.1-use-adobe-pcfi.patch
new file mode 100644
index 0000000..3b493f4
--- /dev/null
+++ b/dev-java/pdfbox/files/pdfbox-1.7.1-use-adobe-pcfi.patch
@@ -0,0 +1,45 @@
+diff -Nru /tmp/pdfbox.orig/build.xml ./build.xml
+--- /tmp/pdfbox.orig/build.xml	2012-12-25 16:47:21.159814268 +0200
++++ ./build.xml	2012-12-25 16:48:31.770926566 +0200
+@@ -223,7 +223,8 @@
+     <target name="get.adobefiles"
+             unless="adobefiles.found" depends="find.adobefiles"
+             description="Download and unpack afm and cmap files from Adobe">
+-        <antcall target="downloadfile">
++<!-- 
++            <antcall target="downloadfile">
+             <param name="sourcefile" value="${adobefiles.url}"/>
+             <param name="destfile" value="${adobefiles.jar}"/>
+         </antcall>
+@@ -239,6 +240,7 @@
+             </patternset>
+             <mapper type="flatten"/>
+         </unjar>
++ -->
+     </target>
+ 
+     <target name="find.testfiles">
+diff -Nru /tmp/pdfbox.orig/src/main/java/org/apache/pdfbox/encoding/Encoding.java ./src/main/java/org/apache/pdfbox/encoding/Encoding.java
+--- /tmp/pdfbox.orig/src/main/java/org/apache/pdfbox/encoding/Encoding.java	2012-12-25 16:47:21.249813136 +0200
++++ ./src/main/java/org/apache/pdfbox/encoding/Encoding.java	2012-12-25 16:50:33.715393515 +0200
+@@ -70,7 +70,7 @@
+     static
+     {
+         //Loads the official Adobe Glyph List
+-        loadGlyphList("org/apache/pdfbox/resources/glyphlist.txt");
++        loadGlyphList("com/adobe/pdf/pcfi/glyphlist.txt");
+         //Loads some additional glyph mappings
+         loadGlyphList("org/apache/pdfbox/resources/additional_glyphlist.txt");
+ 
+diff -Nru /tmp/pdfbox.orig/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java ./src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
+--- /tmp/pdfbox.orig/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java	2012-12-25 16:47:21.225813439 +0200
++++ ./src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java	2012-12-25 16:50:58.558081202 +0200
+@@ -129,7 +129,7 @@
+     }
+ 
+     protected final static String resourceRootCMAP = "org/apache/pdfbox/resources/cmap/";
+-    private final static String resourceRootAFM = "org/apache/pdfbox/resources/afm/";
++    private final static String resourceRootAFM = "com/adobe/pdf/pcfi/afm/";
+ 
+     private static void addAdobeFontMetric(
+             Map<String, FontMetric> metrics, String name )
diff --git a/dev-java/pdfbox/pdfbox-1.7.1.ebuild b/dev-java/pdfbox/pdfbox-1.7.1.ebuild
index 0d466dc..9c7fb3d 100644
--- a/dev-java/pdfbox/pdfbox-1.7.1.ebuild
+++ b/dev-java/pdfbox/pdfbox-1.7.1.ebuild
@@ -24,6 +24,7 @@ CDEPEND=">=dev-java/bcprov-1.45:0
 	>=dev-java/bcmail-1.45
 	>=dev-java/commons-logging-1.1.1:0
 	dev-java/icu4j:4
+	dev-java/pcfi:0
 	>=dev-java/fontbox-${PV}:${SLOT}
 	>=dev-java/jempbox-${PV}:${SLOT}"
 RDEPEND=">=virtual/jre-1.5
@@ -50,11 +51,12 @@ src_unpack() {
 java_prepare() {
 	epatch "${FILESDIR}"/${P}-build.xml.patch
 	epatch "${FILESDIR}"/${P}-disable-TestPDDocumentCatalog.patch
+	epatch "${FILESDIR}"/${P}-use-adobe-pcfi.patch
 	mkdir -v download external
 	ln -s "${DISTDIR}/${ADOBE_FILES}" download
 }
 
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,pcfi"
 EANT_GENTOO_CLASSPATH_EXTRA="target/${P}.jar:src/main/resources:target/test-classes"
 
 src_test() {