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/jansi/Manifest             |  2 +-
 dev-java/jansi/jansi-1.11-r1.ebuild | 53 ------------------------------------
 dev-java/jansi/jansi-1.11-r2.ebuild | 54 +++++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 54 deletions(-)
 delete mode 100644 dev-java/jansi/jansi-1.11-r1.ebuild
 create mode 100644 dev-java/jansi/jansi-1.11-r2.ebuild

(limited to 'dev-java/jansi')

diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest
index 3f171def455c..43a9c325f4aa 100644
--- a/dev-java/jansi/Manifest
+++ b/dev-java/jansi/Manifest
@@ -1,6 +1,6 @@
 AUX jansi-1.11-build.xml 14529 BLAKE2B ea9358a4a64e077ba9173f6f0d0548647489980cff2626760b6c92df9774117bc6ff32f4647c8b89b21b4e37722f018e4f1fd0ca2cfa5915a83e253f9c18d250 SHA512 cc60a9f48f220ee13a22ed814409126524d22f2329c574e61974e26fd70b9a53f703ade06bb6921c13f370016be79c00d111368018132abee20780e99096c0a5
 DIST jansi-1.11.tar.gz 252095 BLAKE2B 72b22392fa6731f49ebb5c2e94cdf7918ca37d5c73ccb14d8810402c9ec120b1220a739e54516eeb5355ad4dd74d01ae398a6003679c60b1dd6f1648691b2efa SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1
 DIST jansi-1.5.zip 211616 BLAKE2B 754105218e62d095f9f070ba7f66b68dd2cfbf1b7d8f95ea6dc40f01e536fd8997e2bfca481a4c57cafabc6fe044de5de171b51429e07081ebe1824a5cd5d3d0 SHA512 784c01b7ab48307cf881439d5c3531949a6459e8a90667f1ee7a73f9cbce72710fcf4af8b4cae610d15085641567c0d51cab487488daa0c1b0a4605864de2775
-EBUILD jansi-1.11-r1.ebuild 1138 BLAKE2B 9d8e6c2f60ec8b124951b75a9ea4185b357c8359d61a295cf9c61e1e3124c03701a3f4a7c0cbd4ed1d8ad5712944d694fa1cf1ab6097e777ee509ef107e70bc6 SHA512 d42fc45b1f33548bfb4da344eb67ad7f177a117112aa8d94280422650dbfec4f6862ca6e3667f25f850f7a7b42b1678835a52062f19083755d77212a42c57d7d
+EBUILD jansi-1.11-r2.ebuild 1152 BLAKE2B 6b0cc2ccc3f4c85455015154a7ee4c2193914084a33a40a286af62f88a032c492807e23618337eedf960dce1ace6452ea4e3798c256594fe5707fedabdd72aed SHA512 a0e1e7424615ce5228acbb4f549e14311c627792b2992cd84d33f95d6460b0f0f17652f325b7c7b7326982abb0f444f460aeebe4d6deaa1a793bebb16067c5dc
 EBUILD jansi-1.5-r2.ebuild 674 BLAKE2B bd3b686e6c35721f33d73357434a37800519b0b370edeb97288be68a98e95b04045c397700fbf78e0d3aa4dad82da714e20dcc30f0bcde1fdd9f666fbd302b19 SHA512 07dd8bc9d822b963be6db3ca5e39bc160ace104741ef0786de3a8482eeb7f075c67fbc60d4f6e5cc46c4ef58f4263960f796c1c0373c07baa0149f09cace0910
 MISC metadata.xml 491 BLAKE2B 57979797604525188358a5e2bbf92bd7cc40e9513710d9907302df960f0fb0961b3c8eca15bc09b53cae259dbe3b512d149a4e9fb2bb5e3b1ad6a13700af3c4b SHA512 46a12388363e4b59001bf8cf67923a4f38d8a4409fe158a813c9403e0da6067a8aff418cda7e0d02dc905e38591ded15e46b8f8095acb62d0a83a65146550669
diff --git a/dev-java/jansi/jansi-1.11-r1.ebuild b/dev-java/jansi/jansi-1.11-r1.ebuild
deleted file mode 100644
index 0d9a907524da..000000000000
--- a/dev-java/jansi/jansi-1.11-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# TODO: Get doc (missing classpath entries) working.
-JAVA_PKG_IUSE="source test"
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="1.11"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-CDEPEND="dev-java/jansi-native:0"
-
-DEPEND="${CDEPEND}
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/junit:4
-	)
-	>=virtual/jdk-1.7"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-S="${WORKDIR}/${P}/jansi"
-
-EANT_GENTOO_CLASSPATH="jansi-native"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4"
-
-src_test() {
-	EANT_EXTRA_ARGS="-Djunit.present=true"
-
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/jansi/jansi-1.11-r2.ebuild b/dev-java/jansi/jansi-1.11-r2.ebuild
new file mode 100644
index 000000000000..0c1149bbd7b2
--- /dev/null
+++ b/dev-java/jansi/jansi-1.11-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: Get doc (missing classpath entries) working.
+JAVA_PKG_IUSE="source test"
+
+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}/archive/${PN}-project-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+
+CDEPEND="dev-java/jansi-native:0"
+
+DEPEND="${CDEPEND}
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/junit:4
+	)
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${P}/jansi"
+
+EANT_GENTOO_CLASSPATH="jansi-native"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	default
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4"
+
+src_test() {
+	EANT_EXTRA_ARGS="-Djunit.present=true"
+
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	use source && java-pkg_dosrc src/main/java/org
+}
-- 
cgit v1.2.3