[gentoo-commits] repo/gentoo:master commit in: dev-lang/interprolog/

["Keri Harris" <keri@gentoo.org>]

commit:     23a4139a08be8eb393c37dc995dc56f9b9de0fe9
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 13:13:47 2019 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 13:14:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a4139a

dev-lang/interprolog: bump EAPI

Signed-off-by: Keri Harris <keri <AT> gentoo.org>
Package-Manager: Portage-2.3.76, Repoman-2.3.11

 dev-lang/interprolog/interprolog-2.1.2.ebuild | 28 ++++++++++++---------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/dev-lang/interprolog/interprolog-2.1.2.ebuild b/dev-lang/interprolog/interprolog-2.1.2.ebuild
index 7f9f9e0938f..afa655e41ff 100644
--- a/dev-lang/interprolog/interprolog-2.1.2.ebuild
+++ b/dev-lang/interprolog/interprolog-2.1.2.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils java-pkg-2 java-ant-2 versionator
+inherit java-pkg-2 java-ant-2
 
-MY_PV="$(delete_all_version_separators)"
-MY_P="${PN}${MY_PV}"
+MY_P="${PN}$(ver_rs 1- '')"
 
 DESCRIPTION="InterProlog is a Java front-end and enhancement for Prolog"
 HOMEPAGE="http://www.declarativa.com/interprolog/"
@@ -17,13 +16,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-DEPEND=">=virtual/jdk-1.4
+RDEPEND=">=virtual/jdk-1.4:=
+	dev-java/junit:0"
+
+DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	=dev-java/junit-3.8*"
-
-RDEPEND=">=virtual/jdk-1.4
-	=dev-java/junit-3.8*
 	|| (
 		dev-lang/xsb
 		dev-lang/swi-prolog
@@ -33,13 +31,11 @@ S="${WORKDIR}"/${MY_P}
 
 EANT_GENTOO_CLASSPATH="junit"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-java1.4.patch
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-java1.4.patch
+	eapply_user
 
-	cp "${FILESDIR}"/build.xml "${S}"
+	cp "${FILESDIR}"/build.xml "${S}" || die
 	mkdir "${S}"/src
 	mv "${S}"/com "${S}"/src
 	rm interprolog.jar junit.jar