From 1dd38c31fca99c48a5c783763ef9c85b281f44ea Mon Sep 17 00:00:00 2001
From: Craig Inches <craig.inches@xayto.net>
Date: Thu, 3 Dec 2015 00:53:24 +0800
Subject: [PATCH] dev-tex/pdfannotextractor: Add two new patches. Fixes bug
 545336.

---
 .../files/PDFAnnotExtractor.java.patch        | 25 +++++++++++++++++++
 .../files/StringVisitor.java.patch            | 14 +++++++++++
 .../pdfannotextractor-0.1l.ebuild             |  8 +++---
 3 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch
 create mode 100644 dev-tex/pdfannotextractor/files/StringVisitor.java.patch

diff --git a/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch b/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch
new file mode 100644
index 0000000000000..88c8d372e089e
--- /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 0000000000000..1b6a9d1d91618
--- /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/pdfannotextractor-0.1l.ebuild b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l.ebuild
index 3691bb94f5bcf..f6424b59ae1a3 100644
--- a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l.ebuild
+++ b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l.ebuild
@@ -16,8 +16,8 @@ KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE=""
 
 CDEPEND="virtual/latex-base
-	dev-java/pdfbox
-	dev-java/fontbox"
+	dev-java/pdfbox:1.8
+	dev-java/fontbox:1.7"
 DEPEND="${CDEPEND}
 	app-arch/unzip
 	>=virtual/jdk-1.5"
@@ -31,10 +31,12 @@ TEXMF=/usr/share/texmf-site
 S=${WORKDIR}
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="pdfbox fontbox"
+EANT_GENTOO_CLASSPATH="pdfbox-1.8 fontbox-1.7"
 
 src_prepare() {
 	epatch "${FILESDIR}/javajars.patch"
+	epatch "${FILESDIR}/PDFAnnotExtractor.java.patch"
+	epatch "${FILESDIR}/StringVisitor.java.patch"
 	java-pkg-2_src_prepare
 }