From 3e619edc053a1b49b06e757f2056f8bb782e88c8 Mon Sep 17 00:00:00 2001
From: Andrew Ammerlaan <andrewammerlaan@riseup.net>
Date: Wed, 3 Mar 2021 12:59:41 +0100
Subject: dev-java/jlatexmath-fop: EAPI bump

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
---
 .../files/jlatexmath-fop-1.0.3-fixpaths.patch             |  6 +++---
 dev-java/jlatexmath-fop/jlatexmath-fop-1.0.3.ebuild       | 15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'dev-java')

diff --git a/dev-java/jlatexmath-fop/files/jlatexmath-fop-1.0.3-fixpaths.patch b/dev-java/jlatexmath-fop/files/jlatexmath-fop-1.0.3-fixpaths.patch
index a03051c36..1cd5b69eb 100644
--- a/dev-java/jlatexmath-fop/files/jlatexmath-fop-1.0.3-fixpaths.patch
+++ b/dev-java/jlatexmath-fop/files/jlatexmath-fop-1.0.3-fixpaths.patch
@@ -1,6 +1,6 @@
-diff -urN work-orig/build.xml work/build.xml
---- work-orig/build.xml	2013-04-23 20:42:19.776644942 -0400
-+++ work/build.xml	2013-04-23 20:42:36.821646638 -0400
+diff -urN a/build.xml b/build.xml
+--- a/build.xml	2013-04-23 20:42:19.776644942 -0400
++++ b/build.xml	2013-04-23 20:42:36.821646638 -0400
 @@ -1,7 +1,7 @@
  <?xml version="1.0" encoding="ISO-8859-1"?>
  <project name="jlatexmath-fop" basedir="." default="buildJar">
diff --git a/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.3.ebuild b/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.3.ebuild
index a20d0ed9b..1782fb0b1 100644
--- a/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.3.ebuild
+++ b/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="examples source"
 
@@ -14,14 +14,13 @@ SRC_URI="http://forge.scilab.org/upload/jlatexmath/files/${PN}-src-${PV}.zip"
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 CDEPEND="dev-java/jlatexmath:1
 	dev-java/xmlgraphics-commons:2
 	>=dev-java/fop-2.0-r1:0"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${CDEPEND}"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+BDEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.5
 	${CDEPEND}"
 
@@ -29,8 +28,12 @@ EANT_BUILD_TARGET="buildJar"
 
 S="${WORKDIR}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fixpaths.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-fixpaths.patch"
+	default
 	cp "${FILESDIR}/version.xml" "${S}" || die
 	echo "fop.jar=$(java-pkg_getjar fop fop.jar)
 xmlgraphics-commons.jar=$(java-pkg_getjar xmlgraphics-commons-2 xmlgraphics-commons.jar)
-- 
cgit v1.2.3-65-gdbad