From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 dev-java/jspeex/Manifest               |  2 +-
 dev-java/jspeex/jspeex-0.9.7-r1.ebuild | 57 ------------------------------
 dev-java/jspeex/jspeex-0.9.7-r2.ebuild | 63 ++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 58 deletions(-)
 delete mode 100644 dev-java/jspeex/jspeex-0.9.7-r1.ebuild
 create mode 100644 dev-java/jspeex/jspeex-0.9.7-r2.ebuild

(limited to 'dev-java/jspeex')

diff --git a/dev-java/jspeex/Manifest b/dev-java/jspeex/Manifest
index 8450be585dfb..c40c285cf961 100644
--- a/dev-java/jspeex/Manifest
+++ b/dev-java/jspeex/Manifest
@@ -1,5 +1,5 @@
 AUX jspeex-0.9.7-remove-junit-report.patch 530 BLAKE2B 2ebc0fcdd0713615bdcb1c829e0f26437af3829cdf4d01f453a6f8a4df9b0728f2f4d746214d44a8fa63f61ccda1c7812fe22ee6c67b8b141021adb61d6076e9 SHA512 8a38a6033ca138a131ee716712efd463c2fda87829d46eabd8fa561af0327fd8718a673075eaa0f6a08a931bfd142be23c65e16959a36e1a845dc002744010aa
 AUX jspeex-0.9.7-remove-proguard-taskdef.patch 1655 BLAKE2B 3ec50cada7bfd9b69a448f12fc1c07fc23003952e190ddafad4d58cb3cb1f13e746c02846cc17e2323d5c4ec7f76f049edb038e559c45f92854a23f72946b2e1 SHA512 d8c6358d01c659bf2e83d99d7831f1177383701ea34c76e8b39fa83a85477f8712b6911b6bea5da4e07b0e677816a1b7b4e90e51ee3c71fb7d0faffc9fc9b0d1
 DIST jspeex-0.9.7.zip 733580 BLAKE2B d5bfabb0857975ab8ca74d54401f6d4008c7386d8e2464c7386ecccfde8dcf3b92580d6168e4ff06cf8c1a27ca848abc7f630be7f19c6a0245beb8a9cb66c3f6 SHA512 9673bef155f1cccc45bc0a0d5596e79b48ba044309ba3446548b570bc7bad60b4b22cc7761749b0769114c7341b9fab6db8e8a155070f9de6fe2730c843199fe
-EBUILD jspeex-0.9.7-r1.ebuild 1128 BLAKE2B 63ccb61ad93710e592be7845c5e3dd93afd425014d621ada0e1270e9fe42bbb7e823103d9744229b3b862766df254b998cbeba4b050b149f6addb994a00a1f33 SHA512 0b889a02983a970eb66e0be3464e96e3280641ae4d16a61f5fec11216e303dacea41af37e68417b2773a7a7ae05cbbc6614cc33dede51cb14e1b4734dbdcfcb5
+EBUILD jspeex-0.9.7-r2.ebuild 1098 BLAKE2B 2176c6e27a452c1b312f1e20475b341ea636fdbba4f9533f295ed821a4f1931cbf343de0beb4c7123ce21fe2735fe622391a116943b0a9135851290b1f44209d SHA512 72b0ea90ea7d78cf6eae25dbbde4ed3df96afbbf62d4d898771708a72a11ad0d7f9daecfb2603a1e5e898f89f5def94c01af92ff358829e55fe55a039f2afd0f
 MISC metadata.xml 312 BLAKE2B 030ecc0c42a9dc6ecfaa663b6e25d35bc2364cfb1f7c59a5aeb46728d5819c29f9c5389370782f30a5598553e7d1822b7a6d2018006aa7a69e8e0a1a98ee8e68 SHA512 bf48f9daeb64e474b08e897e502436b21db0f65ba4cee4987654e811b6b71a3a82c3ccf9ee49b37babc9a8d8f3c6d13978d9c2e19b4ae27da51c1fc28f15aec5
diff --git a/dev-java/jspeex/jspeex-0.9.7-r1.ebuild b/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
deleted file mode 100644
index 9d3390743ccd..000000000000
--- a/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit base 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"
-
-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
-	dev-java/junit:0
-	test? (
-		dev-java/ant-junit:0
-	)"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="ant-core"
-EANT_BUILD_TARGET="package"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-remove-junit-report.patch
-	epatch "${FILESDIR}"/${P}-remove-proguard-taskdef.patch
-
-	find . -name "*.jar" -delete || die "Failed to remove bundled libraries."
-
-	cd lib || die
-	java-pkg_jar-from --build-only junit
-}
-
-src_test() {
-	ANT_TASKS="ant-junit ant-core" eant test
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	dodoc README TODO
-
-	use doc && java-pkg_dojavadoc doc/javadoc
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/jspeex/jspeex-0.9.7-r2.ebuild b/dev-java/jspeex/jspeex-0.9.7-r2.ebuild
new file mode 100644
index 000000000000..404e7773e708
--- /dev/null
+++ b/dev-java/jspeex/jspeex-0.9.7-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+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.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"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-junit-report.patch
+	"${FILESDIR}"/${P}-remove-proguard-taskdef.patch
+)
+
+src_prepare() {
+	default
+
+	java-pkg_clean
+
+	cd lib || die
+	java-pkg_jar-from --build-only junit
+}
+
+src_test() {
+	ANT_TASKS="ant-junit ant-core" eant test
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	dodoc README TODO
+
+	use doc && java-pkg_dojavadoc doc/javadoc
+	use source && java-pkg_dosrc src/java/*
+}
-- 
cgit v1.2.3