gentoo auto-resync : 25:06:2023 - 19:30:41

4 files changed, 26 insertions, 69 deletions

diff --git a/dev-lang/ammonite-repl-bin/Manifest b/dev-lang/ammonite-repl-bin/Manifest
index 252d9f926656..1a557fda3f96 100644
--- a/dev-lang/ammonite-repl-bin/Manifest
+++ b/dev-lang/ammonite-repl-bin/Manifest
@@ -1,13 +1,10 @@
-DIST ammonite-repl-bin-2.5.5-2.13 48455620 BLAKE2B 7cd2701a5bc26f49dac4ac9ff924d92c96ab2fde3a29ed4728ce4fbf97572fb22b627391882bf78e5ee9f767886bb101129d2bbb5ca8f3f206c10a68733d9318 SHA512 5cc9c263d75b11afa0c5a4700b2790268453f7497101a14a00a6107eee026394f45411b81d87a85f2949bffbfe0a64bc4c0392ee80bd0b60e3fbedbcedb193e6
-DIST ammonite-repl-bin-2.5.5-3.0 53685162 BLAKE2B 7ab579bb3738a938e5ad4da105794add287704dae151c77092469864b124aad8c214ae94e42efd43b069bf4c849864e04fe9e826d8cb553f778a318ccc835697 SHA512 8f6230341ca2288218166a9ebb8a74b8abede0b0a37e89e7ced6b17cc034458cf03109af6676bb3a34df969e86c8550270e7a446d4aa7e3684d89a288df2436c
-DIST ammonite-repl-bin-2.5.5-3.1 54766874 BLAKE2B 5bcf183eedad202b34c971253f73cf480baca35c122dfde5ed1fe2617332241d30b31912263d619155cbbc9d7126802d40fc4f0fba73cd1d59cc52c4cf670293 SHA512 02b7c84e91c67f1e9d0ff82fbef6dc7dcc2ff2fe3ab36db5fc4181a5f7529a4997501d7420d5ddb2404e00965f1f12a17128c1ba3f990ff92d9ff18620a3cb02
-DIST ammonite-repl-bin-2.5.6-2.13 54860357 BLAKE2B 9a3cdbfb0c9ed228214353f5e25a22b7c3cb7480024de680185e8399564012c895e6f73d20555a11e1724fc8b36c9f597af5a67e5d7e951b104f8089eacb06f9 SHA512 97ff31819cbf45384175df899fe7b72bbc8fa97ff97de62c70d2d20f536a4066fb1a4e262364ef9c49865f57062d50fdd87338034fcc108b688fb3b424d7e2c0
-DIST ammonite-repl-bin-2.5.6-3.0 60096793 BLAKE2B 4f4218ea1e09f879be72eb67c8c3538004ba221369a172ff7b3da3c6b0d5538c3499f620fb7e9af9a7b23011456452a94fcd2cde04e1b666693e1f1ff5a7f3b0 SHA512 e1968fc2b838e08bd2f7c2dabdeb5f612088549dbc4091b169eab26bcdc16c4c9f2e1d37857a4c161efdff8f05dd5579eff185683ecc758b86f9702d5932d592
-DIST ammonite-repl-bin-2.5.6-3.1 61179318 BLAKE2B 84be1ee7d862ff05bab8bd9f168f77ade35235778fb09c9cd46c02fa8c22b648103615dc04bef517737b41f0799c69ac801a094752736903839d724163fa1c40 SHA512 709d721797c6aeeb1cd72c8ec75b1fa37cdefcc9ddde4de2e9231e7a3745958788128dc4a3d39e289bd35132051d77b06a73f3de8a9a34d157b68330b30437a8
 DIST ammonite-repl-bin-2.5.8-2.13 54860380 BLAKE2B 0cd77d60a540591ea8ad1fa5d85e318120c3605d486a29d631e7a68081f680bc8fe3e28b9dd569bfa478d10b69505416f425368ef9b976ece0f6f1362523f872 SHA512 111a5c1de707fab79b46ce78c31bd66d1370ce1c7f61bd53a4cb5be941426389f5c1bafec09555c39922dff4a221e3b9f2c72175c32e3fb0c47336080cb8a5e2
 DIST ammonite-repl-bin-2.5.8-3.0 60096866 BLAKE2B 3b48b6beb3000d16c8e5564435a38003dabf168b3ec28e54c50e5220b55a73b7b7aafd9995d3a17f16646366374938b67d528b4351125a66113fe0befcb3057f SHA512 90c87cf9c5525f8a5810a9cb10b0001883df9980b861ae5e60e80792cdd7481b8d15615c006a032a8bd7bd6d365c2270379d9fc525f9a87eade67273a3145d15
 DIST ammonite-repl-bin-2.5.8-3.1 61179360 BLAKE2B d6c538bd88146024ef83e3aa651e2b1759aaa148758a3ccdbc47c071826b7f38fb6f013b9a49f2e0eb9d997e2cafcd28ea9f00d5d3120a9ad2eea86aa2d05862 SHA512 70aef39a7ef0f7a5022192474bde19d13591b5c4d069c91a8e63b2649fc744c02718b231faba8ec91779fde602b930b3e50926c6efa6532996ee5afb6358d74c
-EBUILD ammonite-repl-bin-2.5.5.ebuild 1043 BLAKE2B 3bc2e83255b51d5c3ea1d14f33dfced7a2f60cc9b19350ca03c1595c5b272f38880b2cce7c7a931f3de8eff946c0beb2db2fac5f3bba2e3d5637bcbc0b72d084 SHA512 d458554eee968cecadc2b6e75052939ba90a53cf5160f97fabdf6913a330c404f2a85ccb9f2e40badbd93784f79d3434704e2337708284fa4b8afedf401ce087
-EBUILD ammonite-repl-bin-2.5.6.ebuild 1044 BLAKE2B e0b52f5a5fd5c88d9b2a8a563be966e544464c5b4adc6c3999a02610aee0fb2cbebda8c05fe04113e7fb7a49d54d9a3fbec8a861f008ff0ca6fd7a1227ee5207 SHA512 a9ab992ba0e6abca10f31bc3c5a7125420e314073f4986d7ed35cbb50e4a93278edc4fba8bbb96147b7f180d3f63557486fd8fdea316687ba3c545156b41562f
+DIST ammonite-repl-bin-2.5.9-2.13 56786192 BLAKE2B e63264b1735132cdb22626d35a0a8c484a26676618cf2369a56bc46d789009b27fd68b475b363959bbfd937388918a310c61ed5188885fdb18d6c7c011f21ec4 SHA512 5ba118d5ff96bf9a50ddff3420d47dc14ab14a4f53ef715c63ab002e5487d698871afbea0392e7b8c036c48a33833faa2eecc86919a1b42bb2dfd6b70fb44bb9
+DIST ammonite-repl-bin-2.5.9-3.0 61696887 BLAKE2B fc7afabf3fc6129ea8da03cfb03da7cee10889ed4ceffe08e965b6f27649af6daf1db5e6bfb12871ac2fd5fe5b74cc27e1e467c25f3b5a4a7b9662943c4ef7fa SHA512 b33aebc31b5b54739389212533780b99145aaf74905532c1de55ee8e79dc1e12e217968f6f0a5f39fb6ffeb87f70792dcef98c0f75f3fe81a96f2c4adbc9f066
+DIST ammonite-repl-bin-2.5.9-3.1 62779382 BLAKE2B 0136efb63727ba47ddac62671a510b0742a1b3f888ced421518b052fd95dabc15cf20626e0b4692a936df468cc6c96b16a486ea847973ed9ab5d7c8dce52481c SHA512 3e422d9402a4a8a71c77b4c8bdcc980f19274938a122a57ce712709961fd3d6c7417b3e85fff414863c84f412c183b7a5bd92882348161d55be8c48a98ea2e3b
+DIST ammonite-repl-bin-2.5.9-3.2 63805907 BLAKE2B cc9329f0f7e91675838b2735a38dda16e934ec3c7c3be827af4ae56d7f67e632e6a26866cffa6f4bf4e08b955fe608dbfed540f8ea34901cdab6acef41ee2e8e SHA512 f57fa352fc4d074e5f482c1b4e0593154943e81e722d0b5f9c4a9059c07bf2774d5c03bca192e5d66cd6c078c7978d323059606d41268f9f56903550fce9e2f8
 EBUILD ammonite-repl-bin-2.5.8.ebuild 1043 BLAKE2B e3db1c32209c1b62fc8a4b594dabfd7eb12c96f88c3f6e851c6a26899f78038616722cab5854c2c5efb5f32e26ab4b9847e0ba837173ba115b174536342249b4 SHA512 2c41f663d3fb50300fe0a8f2cb12b5a3bcaa060057a8f9baee59c4080276043b86620fb363254f36a543c151fbc1e3c0c5bbe585bedb9c4c26c4fb859f34cc5f
-MISC metadata.xml 736 BLAKE2B 72e4d24ad974a4459e4717d25dbb50b601609400cff9c8f0386e7470a21ddf72e811b015d8d019147cd2c81e5aa24de96ef2aeeb0c98d5cda6001cc010519d6d SHA512 3445736cf37693d907c929f519a3f8ca1fd450cbeb5eda48438e8af3399c13542979fb75bf11a2e50025c5785ed4cd176b7e22012cea0565bece209411aa15ca
+EBUILD ammonite-repl-bin-2.5.9.ebuild 1178 BLAKE2B 3798aeccbc79cd4dad79a037e2d0028efea722bce81b70495c7e35e609464691221d1f07fad07280305338b8cffc193830f0bdf614cb482040f58b66d91b090d SHA512 3ffd088305ff1f8298d564b2f273f539af6835f54cb45c8216548e62e50c3cf196d69602d5c67698f4009a06d4948b7949d0951ffae953b18c050d136901bccb
+MISC metadata.xml 798 BLAKE2B ffb8e809662233799e0197adee436280dc4a5949723db00af1fd985db36dc0b8b610e0667bebec13429495d38b41288348dbd644fa6641ae9498dc7ee206fae2 SHA512 170b1c51dae0240f25415873112f5a890e40db58897ae3b4e4e3ef49fe0236bf32188e04b72463a18195635c112257fbb62c49206e2af05eb643a67bc646f588
diff --git a/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.5.ebuild b/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.5.ebuild
deleted file mode 100644
index 7bda042dadbb..000000000000
--- a/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Scala language-based scripting and REPL"
-HOMEPAGE="https://ammonite.io/"
-
-SRC_URI="
-	scala2-13? ( https://github.com/com-lihaoyi/Ammonite/releases/download/${PV}/2.13-${PV} -> ${P}-2.13 )
-	scala3-0? ( https://github.com/com-lihaoyi/Ammonite/releases/download/${PV}/3.0-${PV} -> ${P}-3.0 )
-	scala3-1? ( https://github.com/com-lihaoyi/Ammonite/releases/download/${PV}/3.1-${PV} -> ${P}-3.1 )
-"
-
-KEYWORDS="amd64 x86"
-LICENSE="MIT"
-SLOT="0"
-
-S="${WORKDIR}"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-IUSE="+scala2-13 scala3-0 +scala3-1"
-REQUIRED_USE="|| ( scala2-13 scala3-0 scala3-1 )"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	local last_amm
-	if use scala3-1; then
-		newbin "${DISTDIR}"/${P}-3.1 amm-3.1
-		last_amm=amm-3.1
-	fi
-	if use scala3-0; then
-		newbin "${DISTDIR}"/${P}-3.0 amm-3.0
-		last_amm=amm-3.0
-	fi
-	if use scala2-13; then
-		newbin "${DISTDIR}"/${P}-2.13 amm-2.13
-		last_amm=amm-2.13
-	fi
-	dosym $last_amm /usr/bin/amm
-}
diff --git a/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.6.ebuild b/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.9.ebuild
index dd81d28e949a..103d0f16b926 100644
--- a/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.6.ebuild
+++ b/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.9.ebuild
@@ -10,9 +10,10 @@ SRC_URI="
 	scala2-13? ( https://github.com/com-lihaoyi/Ammonite/releases/download/${PV}/2.13-${PV} -> ${P}-2.13 )
 	scala3-0? ( https://github.com/com-lihaoyi/Ammonite/releases/download/${PV}/3.0-${PV} -> ${P}-3.0 )
 	scala3-1? ( https://github.com/com-lihaoyi/Ammonite/releases/download/${PV}/3.1-${PV} -> ${P}-3.1 )
+	scala3-2? ( https://github.com/com-lihaoyi/Ammonite/releases/download/${PV}/3.2-${PV} -> ${P}-3.2 )
 "
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
 
@@ -20,8 +21,7 @@ S="${WORKDIR}"
 
 RDEPEND=">=virtual/jre-1.8:*"
 
-IUSE="+scala2-13 scala3-0 +scala3-1"
-REQUIRED_USE="|| ( scala2-13 scala3-0 scala3-1 )"
+IUSE="+scala2-13 scala3-0 scala3-1 +scala3-2"
 
 src_unpack() {
 	:
@@ -29,17 +29,21 @@ src_unpack() {
 
 src_install() {
 	local last_amm
-	if use scala3-1; then
-		newbin "${DISTDIR}"/${P}-3.1 amm-3.1
-		last_amm=amm-3.1
-	fi
-	if use scala3-0; then
-		newbin "${DISTDIR}"/${P}-3.0 amm-3.0
-		last_amm=amm-3.0
-	fi
-	if use scala2-13; then
-		newbin "${DISTDIR}"/${P}-2.13 amm-2.13
-		last_amm=amm-2.13
-	fi
+	local scala_versions=(2.13 3.{0,1,2})
+	local scala_version
+	for scala_version in ${scala_versions[@]}; do
+		local use_flag=scala${scala_version/./-}
+
+		if ! use ${use_flag}; then
+			continue
+		fi
+
+		local amm_bin
+		amm_bin="amm-${scala_version}"
+
+		newbin "${DISTDIR}/${P}-${scala_version}" ${amm_bin}
+		last_amm=${amm_bin}
+	done
+
 	dosym $last_amm /usr/bin/amm
 }
diff --git a/dev-lang/ammonite-repl-bin/metadata.xml b/dev-lang/ammonite-repl-bin/metadata.xml
index a6816afd69b6..e745765d8d2b 100644
--- a/dev-lang/ammonite-repl-bin/metadata.xml
+++ b/dev-lang/ammonite-repl-bin/metadata.xml
@@ -18,5 +18,6 @@
 		<flag name="scala2-13">Install Ammonite for Scala 2.13</flag>
 		<flag name="scala3-0">Install Ammonite for Scala 3.0</flag>
 		<flag name="scala3-1">Install Ammonite for Scala 3.1</flag>
+		<flag name="scala3-2">Install Ammonite for Scala 3.2</flag>
 	</use>
 </pkgmetadata>