gentoo auto-resync : 01:12:2024 - 02:06:42

4 files changed, 2 insertions, 82 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 90f69dde0f77..e66efff8c17d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest
index df4d0f1b0792..6a941ed2e070 100644
--- a/dev-java/jansi/Manifest
+++ b/dev-java/jansi/Manifest
@@ -1,11 +1,9 @@
 DIST jansi-1.13.tar.gz 253219 BLAKE2B 89fc81710bc0860c717241c97fe2e7a148ccbaa5fb1e7db30b978aa69cddccbc9ea45a0e30ef384c42a741d707f5eab73ce8b2a76e1095c66a2c95f9088f28f0 SHA512 9c4bb0b7435c102068718e039900828994f1ba60ed44307eb726eb91a2884bc406688c2747635b9353f3bd68a6bf0e7c082a4069343b59efffc900f59c563fde
 DIST jansi-1.18.tar.gz 273545 BLAKE2B 9bb18ac181551008316ecf2735a4e573a64e9869d1d5f2f79dc25072c40c088798d0388fe0c65f860617f1afcaf97af1be6c2539a6e19541e4ed40863aaed52c SHA512 d34f271853250d4b23987c0b4d2eeadd9fdb1211b2f5187258bb43e2741d8263312ee04c9a39812550eb658853668a5e941ff3978682cea47c059c6ba85d3e9d
-DIST jansi-2.4.0.tar.gz 225579 BLAKE2B f07dfde9b789d62ec31999632e35609143289c5ab0972ce7cb931dea72ba41e6f2b9b74f7b3d82050e9ed4abd89386040d5268c408d787d3edd49fcdf0cce965 SHA512 4172b264463b847d6008dfad5c80246b029c7add2fd659f4b1c636891a86860f8f5ddd0ce0a5150065faeae72b19682339dda2d019c82f45d8f1be7a547e4558
 DIST jansi-2.4.1-jni.h 74987 BLAKE2B 23ecaf1e83f043492d774420bb20b4a890fd37bc7469fe8710dcddc72ddbded4aaa7f17589f7b886f26bf9a95cac50c3afd6480fee25d6cf1b01660f98a55f3f SHA512 2c9be8438b8c93f3d00abb8cd3f4b14e57fbaa8de562c12b982db5d32c250a436210e4d44aba22585b489dcb47ea1504cd1a7695a6d1fc60808ecd2140f400b2
 DIST jansi-2.4.1-jni_md.h 2002 BLAKE2B 2112e87963902727e1755b6fa3bc4301b5181787a6f4003674db095896b78f9f745cabe3278b1df06b5cde13dffaf77938668f389f388e410b97cadd42851d75 SHA512 c3c7dffd9518accbcbab60c904af7acadb999048881c571acada162fd39f18de9aa024b09abe10a2138c1398b281890e4473fbaef6e27541e50370119eed5dff
 DIST jansi-2.4.1.tar.gz 243911 BLAKE2B 56955f71e37a2e2bbc59d0d859c9d04918737da02ea3121ab7747b763c2e5ef8fd0422f0be2bb51de64eaff526d73a6d78a74a3725ed7b1e93a12cf401892f97 SHA512 ca0de5a8e2098c4d2d72fff4e345d0426ac306ed6b9778ab1fc1a6a23c251a01c86da1089c663739aecea039b6bcfda785018c99046fec42112fa70d53b63ab6
 EBUILD jansi-1.13.ebuild 937 BLAKE2B d0cc11151b0824956f59d5e5bb8c4de3c5fdc64ec93bddd5a34f3b1d07bca87449c6b6b3cff13c08fe05571c0aa9ece8a7ef363fad727ed1dbc8ed1d47479b92 SHA512 ecdf7ef0238242a26317d0a5df1f40a77dc2d27b53479cf25de9c1e9daeb0549feedd0603299c37a51ffbee75f1c7d5221f93022db309d0cdc2a824a3585789e
 EBUILD jansi-1.18.ebuild 914 BLAKE2B e3cae8514ee487f0b2ef8ad1730d887f066c3f64a6ee1df7832d3767c81517554875294da2878f71b405355e17b59c9ef79b47e838e72de51f31cf8e1d564420 SHA512 16b8bfeb3364bdb9a344eef33b818a32d55638b8bb204bc7cf5c99d312b8eedd9553c5ff297176996fef2eddf82e473082f23a2f67b9be8eff033a899208a7ee
-EBUILD jansi-2.4.0-r1.ebuild 2334 BLAKE2B 1555b552c196764a3c4b616a14932a3039ec407f0b1f8ae60ee352f30d74d28b170e9e854938fde73ae05774850993ef54bbf057af7dde562831af908bb7215f SHA512 be21859229b421df230870582a4d860b506aabdd6eda35c89d2ebd70eef634a92da4e710ace50ea205dbef3947a869fbbacb64083bc8b8e54cdb0798bdb5f7a6
-EBUILD jansi-2.4.1.ebuild 1986 BLAKE2B 317d12768c0ef92bd2d242f835a1217164a610a73682aadc768ccc61f20740a34932ccba9c10e97a72ab4d20aa65f30192f16ad5275608e4506a7df6a7d2a7cc SHA512 b2f09ced931a6d2f1a7095ea01b8606bd0e677bc12c9ebf9e6d2c0fdfd488f4521fe13563bae647a24b490a22a83b9bd5b812d8cbef320f6841d458d4a6512cf
+EBUILD jansi-2.4.1.ebuild 1983 BLAKE2B d7da2140f43871b5d4484bc245454b4f7d1c7e7e877a8bc6f4721ddf884a3524619b90d6d50f36fcd4c1569de40675fe9b859ea229219cc3ac6f7c8530d2b25d SHA512 3fa3853a7f2fa607d889250767bc0328be9557b9a75e5565a1b734584475df36a119d92f3d5a22f977fbd55e175b78e37e1f2c4c0c6783be18bba77f201d5e45
 MISC metadata.xml 492 BLAKE2B 6620d0d7d7c5cc16b029617d431785e423a84ce8d23e06cc7a7a88c876d62223113be6c867d46b3a8537e3376174d00e2e3db19b3a178354140066a37da9956a SHA512 a460cd0627fa5d6ea41178f6268454f3841e67bbabaa7426d9d0e96caf941881694acd88e6c9a038ad5eafd46c78f7b0a29a3308e13be676f26d73e9fd9af79c
diff --git a/dev-java/jansi/jansi-2.4.0-r1.ebuild b/dev-java/jansi/jansi-2.4.0-r1.ebuild
deleted file mode 100644
index 1a9c7c87c3a4..000000000000
--- a/dev-java/jansi/jansi-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/fusesource/jansi/archive/refs/tags/jansi-2.4.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jansi-2.4.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.fusesource.jansi:jansi:2.4.0"
-
-inherit java-pkg-2 java-pkg-simple toolchain-funcs
-
-DESCRIPTION="Jansi is a java library for generating and interpreting ANSI escape sequences."
-HOMEPAGE="http://fusesource.github.io/jansi"
-SRC_URI="https://github.com/fusesource/${PN}/archive/refs/tags/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 arm64 ppc64"
-
-# Compile dependencies
-# POM: pom.xml
-# test? info.picocli:picocli-codegen:4.5.2 -> !!!artifactId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter:5.7.0 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.7.0 -> !!!groupId-not-found!!!
-
-DEPEND=">=virtual/jdk-1.8:*"
-
-# junit-jupiter is not available in ::gentoo
-#	test? (
-#		!!!artifactId-not-found!!!
-#		!!!groupId-not-found!!!
-#	)
-#"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( {changelog,readme}.md license.txt )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_MAIN_CLASS="org.fusesource.jansi.AnsiMain"
-
-# junit-jupiter is not available in ::gentoo
-#JAVA_TEST_GENTOO_CLASSPATH="!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-#JAVA_TEST_SRC_DIR="src/test/java"
-#JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
-	default
-	# Remove this directory containing libjansi.so, libjansi.jnilib and jansi.dll
-	rm -r "${JAVA_RESOURCE_DIRS}/org/fusesource/jansi/internal/native" || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	# build native library.
-	local args=(
-		CCFLAGS="${CFLAGS} ${CXXFLAGS} -Os -fPIC -fvisibility=hidden"
-		LINKFLAGS="-shared ${LDFLAGS}"
-		CC="$(tc-getCC)"
-		STRIP="$(tc-getSTRIP)"
-		LIBNAME="libjansi-$(ver_cut 1-2).so"
-	)
-	emake "${args[@]}" native
-}
-
-src_install() {
-	# default # https://bugs.gentoo.org/789582
-	# default fails with
-	# make: *** No rule to make target 'install'.  Stop.
-	java-pkg_doso target/native--/libjansi-$(ver_cut 1-2).so
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jansi/jansi-2.4.1.ebuild b/dev-java/jansi/jansi-2.4.1.ebuild
index ab0c5cb37189..74f1f384f48f 100644
--- a/dev-java/jansi/jansi-2.4.1.ebuild
+++ b/dev-java/jansi/jansi-2.4.1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 RESTRICT="test"	#839681
 
 DEPEND="