gentoo resync : 28.04.2021

3 files changed, 3 insertions, 45 deletions

diff --git a/dev-java/jansi-native/Manifest b/dev-java/jansi-native/Manifest
index 95eeb7983ba5..5f6c701cfe21 100644
--- a/dev-java/jansi-native/Manifest
+++ b/dev-java/jansi-native/Manifest
@@ -1,5 +1,3 @@
-DIST jansi-native-1.5.tar.gz 205008 BLAKE2B 94f46527165e1956640ceabf10ea6ae90fb461e331389823ebd9f86b2b0cadd0ed777e20787fd5bcc9388fc250be1d5415feefe4953fba9a5610870409940060 SHA512 29d178f013701b7e7844f899530f51486037e3a1403018ba4a41475ceb8d58afec768d177f64cbedd41adfb681ba08e578c2e18d956770bc039dfece8602a212
 DIST jansi-native-1.8.tar.gz 33035 BLAKE2B 0008d1af45e8694d065beb7c55cf5e73aa1bff54aa9b83287490a307553ef6fb28f87011658f9fed54a3ba8d47497e2c267a94a63d50862d9ebf3e231b8eda23 SHA512 e5184bc8f5c819f54550791969df611df0b4fdfcfc6aaebf123d786a08a957e5854b15b2569871d5a9d0d20703a8831c99c42610a83fff77af3cf750b72a7fee
-EBUILD jansi-native-1.5.ebuild 795 BLAKE2B 641ebd29524c19173c9f96c107d5db21cfbe87bbe852621cfb652d20200ef46995cc76c312b927402fd1de909cf1aec7ac22acf68d1641f6ef5bcd5a516e14f0 SHA512 1dfe076ed89b24ad0245bdf77297473f22a1967ce024fdcf7477f9decf21b32f2ecc4342b30bbc29127d725c25fdebbc898203f1c7e7169c8e5cb7c44eb88180
-EBUILD jansi-native-1.8.ebuild 799 BLAKE2B bb73f823a67d01b50b7e7c8bd5d1de735a769a8ec30975a5166374bddb3b62589cf1eca02532bb5f2922b531588fe3964e5fdbb57606a4e265bd667fd650cb0f SHA512 abee1556c580ecfd9926557ec44b005948bf76e7b3697f275a6a44620da857bc77c1846a5d3496720e8d7988a291c3cae3f49b19d333303c907351531c69ba18
+EBUILD jansi-native-1.8.ebuild 796 BLAKE2B ec3b480384c742730ff3c6d4446154f9999836a8903f7f5327bf4b04cf6a73ef4bf76c84a9c4708cdbcf92f521ccafeba9a80c71407ce0619d8fdc11aaa7356c SHA512 1aad66ec8d8ae7b2c2c667708db5a909a9566be4de41d120b2d14668b098044f234dcb3f116062da0e86f1d436d7b01b8a8feaf102364dbcf4d6b6723b67c975
 MISC metadata.xml 334 BLAKE2B 344c274ef2a08d05c659d652711ca3d89e4f8d0fe067cf6dbf024e1ff1c5f3f7228773dee36f57c341ddfef60dfd6c4dd5da1a7bfbef9bb70a3ded7c5412f364 SHA512 0b5b8c67251d880d3a5702dbe70472234f6c83deb557597d6160b5321b1d187fd2752879215c65dd34f8ad6ccfc3fe2ade25804b29a46a584464940942e3ace0
diff --git a/dev-java/jansi-native/jansi-native-1.5.ebuild b/dev-java/jansi-native/jansi-native-1.5.ebuild
deleted file mode 100644
index 1f8a3e844a91..000000000000
--- a/dev-java/jansi-native/jansi-native-1.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit vcs-snapshot java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Native JNI component for dev-java/jansi"
-HOMEPAGE="http://fusesource.github.io/jansi/"
-SRC_URI="https://github.com/fusesource/${PN}/tarball/${P} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-CDEPEND="dev-java/hawtjni-runtime:0"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="hawtjni-runtime"
-
-java_prepare() {
-	# Easier to use java-pkg-simple.
-	rm -v pom.xml || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	dodoc {changelog,readme}.md
-}
diff --git a/dev-java/jansi-native/jansi-native-1.8.ebuild b/dev-java/jansi-native/jansi-native-1.8.ebuild
index ed594a3e3e58..a519b5eb26b6 100644
--- a/dev-java/jansi-native/jansi-native-1.8.ebuild
+++ b/dev-java/jansi-native/jansi-native-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 CDEPEND="dev-java/hawtjni-runtime:0"