commit: da24df6ecc81a364058b718dd8ca6d667dae9559
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 12:51:36 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 12:54:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da24df6e
dev-java/commons-math: eapi7, min java 1.8, fixed slot
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../{commons-math-3.2.ebuild => commons-math-3.2-r1.ebuild} | 12 +++++++-----
...ommons-math-3.6.1.ebuild => commons-math-3.6.1-r1.ebuild} | 8 ++++----
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/dev-java/commons-math/commons-math-3.2.ebuild
b/dev-java/commons-math/commons-math-3.2-r1.ebuild
similarity index 90%
rename from dev-java/commons-math/commons-math-3.2.ebuild
rename to dev-java/commons-math/commons-math-3.2-r1.ebuild
index 0fcdf307223..504819e8dd6 100644
--- a/dev-java/commons-math/commons-math-3.2.ebuild
+++ b/dev-java/commons-math/commons-math-3.2-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
# Tests are currently broken due to nasty -lib argument.
JAVA_PKG_IUSE="doc source" # test
@@ -19,7 +19,7 @@ LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
-DEPEND=">=virtual/jdk-1.5"
+DEPEND=">=virtual/jdk-1.8:*"
# Tests are currently broken due to nasty -lib argument.
# test? (
@@ -27,11 +27,13 @@ DEPEND=">=virtual/jdk-1.5"
# dev-java/hamcrest-core:0
# )"
-RDEPEND=">=virtual/jre-1.5"
+RDEPEND=">=virtual/jre-1.8:*"
S="${WORKDIR}/${MY_P}-src"
-java_prepare() {
+src_prepare() {
+ default
+
cp "${FILESDIR}"/${P}-build.xml build.xml || die
sed -i 's/manifest=".*MANIFEST.MF"//g' build.xml || die
diff --git a/dev-java/commons-math/commons-math-3.6.1.ebuild
b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
similarity index 89%
rename from dev-java/commons-math/commons-math-3.6.1.ebuild
rename to dev-java/commons-math/commons-math-3.6.1-r1.ebuild
index 71c61da8a32..39c582e3688 100644
--- a/dev-java/commons-math/commons-math-3.6.1.ebuild
+++ b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
JAVA_PKG_IUSE="doc examples source"
@@ -15,9 +15,9 @@ HOMEPAGE="https://commons.apache.org/math/";
SRC_URI="https://repo1.maven.org/maven2/org/apache/commons/${MY_PN}/${PV}/${MY_P}-sources.jar
-> ${MY_P}.jar"
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="3"
KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
