[gentoo-commits] repo/gentoo:master commit in: dev-tex/pdfannotextractor/, dev-tex/pdfannotextractor/files/

[Mikle Kolyada]

commit:     c2b8ac714bdf2d8087c5307f8824928179ca02da
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 19 16:26:29 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Jan 19 16:28:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2b8ac71

dev-tex/pdfannotextractor: port to EAPI=7

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 .../files/PDFAnnotExtractor.java.patch             | 25 -----------------
 .../files/StringVisitor.java.patch                 | 14 ----------
 dev-tex/pdfannotextractor/files/javajars.patch     | 13 ---------
 .../pdfannotextractor-0.1l-r1.ebuild               | 31 +++++++---------------
 4 files changed, 10 insertions(+), 73 deletions(-)

diff --git a/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch b/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch
deleted file mode 100644
index 88c8d372e08..00000000000
--- a/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
deleted file mode 100644
index 1b6a9d1d916..00000000000
--- a/dev-tex/pdfannotextractor/files/StringVisitor.java.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index bc52050e7b0..00000000000
--- a/dev-tex/pdfannotextractor/files/javajars.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 e33d504b94f..1b6371bf6db 100644
--- a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
+++ b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit latex-package java-pkg-2 java-ant-2 eutils
+inherit latex-package java-pkg-2 java-ant-2
 
 DESCRIPTION="Extract annotations from pdf files"
 HOMEPAGE="http://www.ctan.org/tex-archive/macros/latex/contrib/pax/"
@@ -12,23 +12,23 @@ SRC_URI="mirror://gentoo/${P}.zip"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ppc64 x86 ~x64-macos"
-IUSE=""
 
-CDEPEND="virtual/latex-base
+COMMON_DEPEND="virtual/latex-base
 	dev-java/pdfbox:1.8
 	dev-java/fontbox:1.7"
 
-DEPEND="${CDEPEND}
-	app-arch/unzip
+DEPEND="${COMMON_DEPEND}
 	>=virtual/jdk-1.6"
 
-RDEPEND="${CDEPEND}
+BDEPEND="app-arch/unzip"
+
+RDEPEND="${COMMIN_DEPEND}
 	virtual/perl-Getopt-Long
 	dev-perl/File-Which
-	>=virtual/jre-1.6
-	!<=dev-texlive/texlive-latexextra-2010"
+	>=virtual/jre-1.6"
 
 TEXMF=/usr/share/texmf-site
+
 S="${WORKDIR}"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
@@ -37,17 +37,6 @@ EANT_GENTOO_CLASSPATH="
 	fontbox-1.7
 "
 
-PATCHES=(
-	"${FILESDIR}/javajars.patch"
-	"${FILESDIR}/PDFAnnotExtractor.java.patch"
-	"${FILESDIR}/StringVisitor.java.patch"
-)
-
-java_prepare() {
-	java-pkg_clean
-	epatch "${PATCHES[@]}"
-}
-
 src_compile() {
 	cd "${S}/source/latex/pax" || die
 	eant || die