gentoo resync : 10.02.2020

5 files changed, 62 insertions, 1 deletions

diff --git a/dev-tex/pdfannotextractor/Manifest b/dev-tex/pdfannotextractor/Manifest
index b3332d170954..6655eb1d4f36 100644
--- a/dev-tex/pdfannotextractor/Manifest
+++ b/dev-tex/pdfannotextractor/Manifest
@@ -1,3 +1,6 @@
+AUX PDFAnnotExtractor.java.patch 1043 BLAKE2B 7630ce97561e6c92ebb834539cfc93b2247b49249195e738c952b99671ee33331ac2fc2a655af5bfb2469b9015e78cbd1084d9b20097b5cbbf20cf980f81a009 SHA512 d5b727d1fce4e23a7e4054a6bb1644165dfac207f20371cee0e7935f0d750c33e65a650b590fb97a6c7216137df05f7a0cf4cc4a37428535efea82866379a078
+AUX StringVisitor.java.patch 449 BLAKE2B a294525c1ae93bd5349f7321827e294460c41aed37b81ef436fd2d73388e0c2d54e84da998bf1134f205c026252bf2d7a9beba93a5467ede8fe03595e5100023 SHA512 50982eae2e9479f359daae5ae711207a425fe16af1b9e2a9eea321bde791404fc4a2036e98966c628c8a5c561093fba92e1420709949642a69895669097002e5
+AUX javajars.patch 403 BLAKE2B 1895fcc6398bdbdcff5d6828da11a4d9b2baa5b52eae01a2c3297f265432102fa61283031fc71630ab70b7be9c33a88093bde01bd1c154aadd870cf880fe61cb SHA512 c140c8d6c306c04e092a491a09dfe67cee3afd824790c022ed49198b5ce004481c28addd985427cafbebc350ab8a1c03a5bccfd655bb60631ba3c3e63247a600
 DIST pdfannotextractor-0.1l.zip 48496 BLAKE2B f6c5be87c1b083f8a7b6e894e8ffd0f28b910c67661a9a773164c18ca27acafa22252a78e57d8c521abee2a57f3ce55f55067c7a7b54d51760ed0188571d64df SHA512 043a12545889cbdf9309024bcb381a70eef6ac1c1a3214d678b606c97102dde6cfd473fbd8057f9ed7badebd0fc85db0ce0e05f361a71f8b8c3f71e523f8beba
-EBUILD pdfannotextractor-0.1l-r1.ebuild 1011 BLAKE2B 5dc9be4ab07dca32e9cfaea1f1fa07ca346f392c06e6fd16fecb5aed14e8c608d410507b6d743863e33a88c8dd4cb8764c8b8588033dba6ed9260c08ab8f527e SHA512 c3bd3f48aa2ae4421c52c63281ff887035e69d4e39e2ac4a3252d2b14bbe4dfcaeaf4207800280a5ee4bab0e626dce5ef8ebc7c050f706c47f5557d676895a5e
+EBUILD pdfannotextractor-0.1l-r1.ebuild 1173 BLAKE2B 3b9f45d9643e74b0893823a656171423215ae08c9945c0c456a9d37a27275d2ef5341b90efa5d4af17ebd41ca7f1d5d448545552b17f038b14082085fd8d057b SHA512 793b645c2415516c304afe94d0c45b57be592a86d01bd675557da71a4ff44eef681a1e0d76a696f300a5638d3be8572de674023200ef4432f219b1458516b8ad
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch b/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch
new file mode 100644
index 000000000000..88c8d372e089
--- /dev/null
+++ b/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch
@@ -0,0 +1,25 @@
+--- PDFAnnotExtractor.java.org	2015-11-26 16:20:12.614852847 +0800
++++ work/source/latex/pax/src/PDFAnnotExtractor.java	2015-11-26 16:21:42.592303074 +0800
+@@ -24,14 +24,14 @@
+ import java.text.*;
+ import java.util.*;
+ 
+-import org.pdfbox.cos.*;
+-import org.pdfbox.pdfparser.*;
+-import org.pdfbox.pdmodel.*;
+-import org.pdfbox.pdmodel.common.*;
+-import org.pdfbox.pdmodel.interactive.action.*;
+-import org.pdfbox.pdmodel.interactive.action.type.*;
+-import org.pdfbox.pdmodel.interactive.annotation.*;
+-import org.pdfbox.pdmodel.interactive.documentnavigation.destination.*;
++import org.apache.pdfbox.cos.*;
++import org.apache.pdfbox.pdfparser.*;
++import org.apache.pdfbox.pdmodel.*;
++import org.apache.pdfbox.pdmodel.common.*;
++import org.apache.pdfbox.pdmodel.interactive.action.*;
++import org.apache.pdfbox.pdmodel.interactive.action.type.*;
++import org.apache.pdfbox.pdmodel.interactive.annotation.*;
++import org.apache.pdfbox.pdmodel.interactive.documentnavigation.destination.*;
+ 
+ public class PDFAnnotExtractor implements Constants {
+ 
diff --git a/dev-tex/pdfannotextractor/files/StringVisitor.java.patch b/dev-tex/pdfannotextractor/files/StringVisitor.java.patch
new file mode 100644
index 000000000000..1b6a9d1d9161
--- /dev/null
+++ b/dev-tex/pdfannotextractor/files/StringVisitor.java.patch
@@ -0,0 +1,14 @@
+Index: work/source/latex/pax/src/StringVisitor.java
+--- StringVisitor.java.org	2015-11-26 16:20:35.434967156 +0800
++++ work/source/latex/pax/src/StringVisitor.java	2015-11-26 16:20:56.504072659 +0800
+@@ -22,8 +22,8 @@
+ 
+ import java.io.*;
+ import java.util.*;
+-import org.pdfbox.cos.*;
+-import org.pdfbox.exceptions.*;
++import org.apache.pdfbox.cos.*;
++import org.apache.pdfbox.exceptions.*;
+ 
+ public class StringVisitor implements ICOSVisitor {
+ 
diff --git a/dev-tex/pdfannotextractor/files/javajars.patch b/dev-tex/pdfannotextractor/files/javajars.patch
new file mode 100644
index 000000000000..bc52050e7b06
--- /dev/null
+++ b/dev-tex/pdfannotextractor/files/javajars.patch
@@ -0,0 +1,13 @@
+Index: work/scripts/pax/pdfannotextractor.pl
+===================================================================
+--- work.orig/scripts/pax/pdfannotextractor.pl
++++ work/scripts/pax/pdfannotextractor.pl
+@@ -84,6 +84,8 @@ my @jar_pdfbox = qw[
+     PDFBox-0.7.2.jar
+ ];
+ my @dir_jar = qw[
++    /usr/share/pdfannotextractor/lib
++    /usr/share/pdfbox/lib
+     /usr/share/java
+     /usr/local/share/java
+ ];
diff --git a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
index 1b6371bf6dbe..5ae9bb84c9eb 100644
--- a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
+++ b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
@@ -36,6 +36,12 @@ EANT_GENTOO_CLASSPATH="
 	pdfbox-1.8
 	fontbox-1.7
 "
+src_prepare() {
+	eapply "${FILESDIR}"/javajars.patch
+	eapply "${FILESDIR}"/StringVisitor.java.patch
+	eapply "${FILESDIR}"/PDFAnnotExtractor.java.patch
+	default
+}
 
 src_compile() {
 	cd "${S}/source/latex/pax" || die