[gentoo-commits] repo/gentoo:master commit in: dev-java/jspeex/

[gentoo-commits] repo/gentoo:master commit in: dev-java/jspeex/

[Pacho Ramos]

commit:     359f204e61b310dfec070b82e31d2fd555f57ce4
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 13:21:29 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 13:35:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=359f204e

dev-java/jspeex: Drop dependencies on obsolete dev-java/ant-trax and dev-java/ant-nodeps (#466558)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-java/jspeex/jspeex-0.9.7-r1.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-java/jspeex/jspeex-0.9.7-r1.ebuild b/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
index 89f27c78cd7..9d3390743cc 100644
--- a/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
+++ b/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -25,7 +25,6 @@ DEPEND="${CDEPEND}
 	dev-java/junit:0
 	test? (
 		dev-java/ant-junit:0
-		dev-java/ant-trax:0
 	)"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
@@ -45,7 +44,7 @@ java_prepare() {
 }
 
 src_test() {
-	ANT_TASKS="ant-junit ant-trax" eant test
+	ANT_TASKS="ant-junit ant-core" eant test
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: dev-java/jspeex/

[Sam James]

commit:     4e8e6c869976cc71f166fbc0554ac4676da8d26b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 31 06:45:21 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr  9 20:25:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e8e6c86

dev-java/jspeex: port to EAPI 7, drop base.eclass

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...peex-0.9.7-r1.ebuild => jspeex-0.9.7-r2.ebuild} | 36 +++++++++++++---------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/dev-java/jspeex/jspeex-0.9.7-r1.ebuild b/dev-java/jspeex/jspeex-0.9.7-r2.ebuild
similarity index 67%
rename from dev-java/jspeex/jspeex-0.9.7-r1.ebuild
rename to dev-java/jspeex/jspeex-0.9.7-r2.ebuild
index 9d3390743cc..404e7773e70 100644
--- a/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
+++ b/dev-java/jspeex/jspeex-0.9.7-r2.ebuild
@@ -1,43 +1,49 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit base java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Speex speech codec library for Java"
 HOMEPAGE="http://jspeex.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 CDEPEND="dev-java/ant-core:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.4"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.4
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*
+"
+DEPEND="
+	${CDEPEND}
 	dev-java/junit:0
+	>=virtual/jdk-1.8:*
 	test? (
 		dev-java/ant-junit:0
-	)"
+	)
+"
+BDEPEND="app-arch/unzip"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_GENTOO_CLASSPATH="ant-core"
 EANT_BUILD_TARGET="package"
 
-S="${WORKDIR}/${PN}"
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-junit-report.patch
+	"${FILESDIR}"/${P}-remove-proguard-taskdef.patch
+)
 
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-remove-junit-report.patch
-	epatch "${FILESDIR}"/${P}-remove-proguard-taskdef.patch
+src_prepare() {
+	default
 
-	find . -name "*.jar" -delete || die "Failed to remove bundled libraries."
+	java-pkg_clean
 
 	cd lib || die
 	java-pkg_jar-from --build-only junit