[gentoo-commits] proj/sci:master commit in: sci-misc/jwnl/

[Andrew Ammerlaan]

commit:     10b429a61f236385b562b09d2890e95f2fadf9c9
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Jan 29 12:21:17 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jan 29 12:21:17 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=10b429a6

sci-misc/jwnl: version bump 1.4_rc2, EAPI bump

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-misc/jwnl/jwnl-1.3_rc3.ebuild | 48 ---------------------------------------
 sci-misc/jwnl/jwnl-1.4_rc2.ebuild | 48 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/sci-misc/jwnl/jwnl-1.3_rc3.ebuild b/sci-misc/jwnl/jwnl-1.3_rc3.ebuild
deleted file mode 100644
index 7abef0b58..000000000
--- a/sci-misc/jwnl/jwnl-1.3_rc3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-utils-2 versionator
-
-MY_P=${PN}$(delete_all_version_separators)
-
-DESCRIPTION="Java interface to WordNet dictionary data"
-HOMEPAGE="http://jwordnet.sf.net"
-SRC_URI="
-	mirror://sourceforge/jwordnet/${MY_P}_src.zip
-	mirror://sourceforge/jwordnet/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/commons-logging"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	rm -v commons-logging.jar jwnl.jar || die
-}
-
-src_compile() {
-	# picked up from dev-java/ant-eclipse-ecj
-	ejavac -classpath "$(java-pkg_getjars commons-logging)" \
-		`find net -name '*.java'` || die "ejavac failed"
-	find net -name '*.class' -o -name '*.properties' | \
-		xargs jar cf "${S}/${PN}.jar" || die "jar failed"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar utilities.jar
-	insinto /usr/share/${PN}
-	doins create.sql database_properties.xml file_properties.xml \
-		jwnl_properties.dtd jwnl_properties.xsd map_properties.xml
-	dodoc changes.txt
-}

diff --git a/sci-misc/jwnl/jwnl-1.4_rc2.ebuild b/sci-misc/jwnl/jwnl-1.4_rc2.ebuild
new file mode 100644
index 000000000..6a25eede5
--- /dev/null
+++ b/sci-misc/jwnl/jwnl-1.4_rc2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-utils-2
+
+MY_P=${PN}${PV//.}
+
+DESCRIPTION="Java interface to WordNet dictionary data"
+HOMEPAGE="https://sourceforge.net/projects/jwordnet/"
+SRC_URI="mirror://sourceforge/jwordnet/${MY_P//_rc/-rc}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEP="
+	dev-java/commons-logging:0
+	dev-java/junit:4
+"
+DEPEND=">=virtual/jdk-1.7
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.7
+	${COMMON_DEP}"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_P//_rc/-rc}"
+
+src_prepare() {
+	rm jwnl.jar lib/commons-logging.jar lib/junit-4.1.jar || die
+	default
+}
+
+src_compile() {
+	# picked up from dev-java/ant-eclipse-ecj
+	ejavac -classpath "$(java-pkg_getjars commons-logging):$(java-pkg_getjars junit:4)" \
+		`find -name '*.java'` || die "ejavac failed"
+	find -name '*.class' -o -name '*.properties' | \
+		xargs jar cf "${S}/${PN}.jar" || die "jar failed"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	insinto /usr/share/${PN}
+	doins -r sql config/*
+	dodoc changes.txt
+}