gentoo resync : 29.12.2022

3 files changed, 2 insertions, 67 deletions

diff --git a/dev-java/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest
index 252027a97864..2e5d5f51da09 100644
--- a/dev-java/leiningen-bin/Manifest
+++ b/dev-java/leiningen-bin/Manifest
@@ -1,8 +1,5 @@
 AUX leinrc 37 BLAKE2B 0c5df00ef323caebf53e52246ca87b066a1b6104fb03fc7e3548dba0947ecf53c33bf4e8215fc098212293915d9808b961c0df527f30d7f6316b4aff84bf3b69 SHA512 f948d5f355d43fdee6cf68d0dad39f53f72b341649869a6ca161f5d8c83bf30434ed03c51a7e01aaefa422ff4e93ca3db5680fd4c2af92f5393acde6e8aec7d0
-DIST leiningen-2.9.1-standalone.jar 14621704 BLAKE2B 51d3aca27c56dcdf1560271509e6c4868e387255af5f4e75f42755243b14949ef994cbee81f796a5a533089433fff59e9aff65d7e4e93df02e86fccfd47cf7f9 SHA512 4364aa2a071117049f97f95e020f75bfd0875c88475591d4e04100ac1b228137360a8b24c09877cd3400b7854bf9392b4e5d07ed7f7972e10e4ef5396d0db574
-DIST leiningen-2.9.1.sh 4511 BLAKE2B 66fd656c20ed9b109982840315951b062b1a3fbf0b2b76fc1b6ca612d4daa5d07480838f3f58ec1f1193ff29318323123b6f58bde390d4fb628566687ed39eab SHA512 044621254d31bee3bcdd3f6bd52e9c233a736e2e780edaa3af1d5a7a90424294efd25590c9d3a0606560b223b9e73c87c258fbbb626d2af1b39a400ba1aea86d
 DIST leiningen-2.9.8-standalone.jar 12834369 BLAKE2B 6c9bc9a2f990bb4959aa06f8f8b31c1084f0d2bad2e19c8343fb7e8a02acb6f6173737cbf36b028e113577ef26e380d7ace035316dee840c6da92512afa7ac0b SHA512 de4989bf31fe86bfb943d90b683dd17a7417c267e67ac8036967ed352e47a4361b8b6ec8378a1e6cf24fd8df51bcabb9578bc8f487d812c9fb5c2f5f476016cd
 DIST leiningen-2.9.8.sh 4555 BLAKE2B c876d19a4ba9a53d84c31874af442e57e6184ce1f7145512355a88b833d2d236bd73eef93f260d22b51e6200c5579c3721a8b6bcb16d516e503a98a2eaf26126 SHA512 58cba7d457c98546e530ad821273cb3f51445ed3191022d0963dd51683cb6b24d0f7d557da34313083b0df11a2c9885bf6d5bb073dea736731de95e8fbbca492
-EBUILD leiningen-bin-2.9.1.ebuild 1551 BLAKE2B 711f1bf3e8452e3def5e88ebe555533f87875670160ca44843647e0aef1b19d5117f6c7281ecf32fc626ff8c155a0b287cce2e5551ab794b21e6687bebeb9c3e SHA512 b57c0ad469d3b3bd2f1fb2fe0873c027106d699b30e7291607107f588a8f1283cf714b2d81fa2d8a8bd4f9a80d4e375be933e38d17e76ba64a81ff9fc633bf69
-EBUILD leiningen-bin-2.9.8.ebuild 1523 BLAKE2B 5ec541f1af1fb8789fc0dc93a1df3d18fca7648244af563d0892bb6cb5cf0e157c867eda345356063bbbea7006ad8ebb49fe9f3bf1ead650b836dae3bdf8e134 SHA512 07369b662ec871a47e696c803bfb58df02075035aaf0a61a26180cd5d5d54e91762587b1ef9a2019d83cf087319e6f6eb74428026d031206034385f18bd599fc
+EBUILD leiningen-bin-2.9.8.ebuild 1521 BLAKE2B 4a5bc3ba083467e263825305cf7cc0a336e68bdb164b4aac65dbbb47c56c54919f84f4128abf561db2572409dbebbce4f0da1bc314f1c9520785039cda1a6b97 SHA512 83768c69278eb4c08991a4e441f358e74b24c3cf1711a7b3c3b7d5fcd50b9ad35c03386f650ebb74126801057c8d8d16d9df8bf8f0bebfc5ffa42ae7ffe40583
 MISC metadata.xml 303 BLAKE2B 3567c3889af4a644c925f03a220c329a207daeeca9437b8382ff777db620106cc807aadfaf6c157654c634dfa26c14fd654933aa5bd4b8027068fd6f67f1f241 SHA512 73c6a8fbd269fdf6a20f70aa0228314e3010461dad5c1b04f7b7c54d1cc3a2c7b475f180c6740cc9795b6d73fd39c7ce326ecf69768b1f11f2b264618711c1c3
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.9.1.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.9.1.ebuild
deleted file mode 100644
index 9ce40e8c97b8..000000000000
--- a/dev-java/leiningen-bin/leiningen-bin-2.9.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-
-DESCRIPTION="Automate Clojure projects without setting your hair on fire"
-HOMEPAGE="https://leiningen.org/"
-SRC_URI="
-	https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.zip -> ${MY_PNV}-standalone.jar
-	https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
-"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~x64-macos"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8"
-
-RESTRICT="test"
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't mkdir ${S}"
-	cd "${S}"	|| die "Can't enter ${S}"
-	for file in ${A}; do
-		einfo "Copying ${file}"
-		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
-	done
-}
-
-src_prepare() {
-	einfo "Copying leinrc"
-	cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
-	einfo "Patching leinrc"
-	sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
-
-	einfo "Renaming lein-pkg"
-	# Rename generically to help user patching
-	mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
-
-	einfo "Patching lein"
-	java-pkg_init_paths_
-	sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \
-		|| die "Can't patch LEIN_JAR in lein"
-
-	default
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin "${S}/lein"
-	java-pkg_newjar "${MY_PNV}-standalone.jar"
-	insinto /etc
-	doins "${S}/leinrc"
-	fperms 0644 "/etc/leinrc"
-}
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild
index f0bd5ee2ac4a..182f3392805f 100644
--- a/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild
+++ b/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ~x86 ~x64-macos"
 
 RDEPEND=">=virtual/jre-1.8"
 DEPEND=">=virtual/jdk-1.8"