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

[Miroslav Šulc]

commit:     861d16e6e8f48edb6a176649c806b6d1460b3f0e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 28 09:05:25 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr 28 09:05:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=861d16e6

dev-java/jansi: switched to slot 0 + eapi7/java 1.8 in 1.11

Closes: https://bugs.gentoo.org/783906
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../jansi/{jansi-1.11-r1.ebuild => jansi-1.11-r2.ebuild}  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/dev-java/jansi/jansi-1.11-r1.ebuild b/dev-java/jansi/jansi-1.11-r2.ebuild
similarity index 81%
rename from dev-java/jansi/jansi-1.11-r1.ebuild
rename to dev-java/jansi/jansi-1.11-r2.ebuild
index 0d9a907524d..0c1149bbd7b 100644
--- a/dev-java/jansi/jansi-1.11-r1.ebuild
+++ b/dev-java/jansi/jansi-1.11-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 # TODO: Get doc (missing classpath entries) working.
 JAVA_PKG_IUSE="source test"
@@ -10,10 +10,10 @@ inherit vcs-snapshot java-pkg-2 java-ant-2
 
 DESCRIPTION="A library that allows you to use ANSI escape sequences in your console output"
 HOMEPAGE="http://jansi.fusesource.org/"
-SRC_URI="https://github.com/fusesource/${PN}/tarball/${PN}-project-${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/fusesource/${PN}/archive/${PN}-project-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="1.11"
+SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 CDEPEND="dev-java/jansi-native:0"
@@ -23,10 +23,10 @@ DEPEND="${CDEPEND}
 		dev-java/ant-junit4:0
 		dev-java/junit:4
 	)
-	>=virtual/jdk-1.7"
+	>=virtual/jdk-1.8:*"
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${P}/jansi"
 
@@ -34,7 +34,8 @@ EANT_GENTOO_CLASSPATH="jansi-native"
 JAVA_ANT_REWRITE_CLASSPATH="true"
 JAVA_SRC_DIR="src/main/java"
 
-java_prepare() {
+src_prepare() {
+	default
 	cp "${FILESDIR}"/${P}-build.xml build.xml || die
 }