gentoo auto-resync : 02:12:2023 - 11:00:10

5 files changed, 82 insertions, 55 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index fb883e13b07c..310571f717ad 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest
index 9cee22aa2802..800393381e45 100644
--- a/dev-java/scala-cli-bin/Manifest
+++ b/dev-java/scala-cli-bin/Manifest
@@ -1,9 +1,13 @@
 DIST scala-cli-amd64-1.0.2.gz 33215510 BLAKE2B 288475cbd346260423188b4db038dd8cce2f5885bf0346e8a74b08cd02a2c44204fec37aaf6207ff6447beb4740df725bae6a0a129682ebedc1028ae5f0ec316 SHA512 ac18b43bd37717b2aab6b1056b727aba40f57eed33d1fc5f1903c3729f0344ed30ed595f2a60bff2c65ee3a6d4439e8ee4bcf95fc38baf059d4a66de9696cded
 DIST scala-cli-amd64-1.0.4.gz 33291617 BLAKE2B bd97626e7e95fb6b2a82fd424673078b89f5f4270087c667193e4de1ceff614076e73b728ba1f0334d5f9d7aa6f52c660487d52bf8fb49a786f7fe4ce18a0428 SHA512 447acafd47041cd173a06b5d113cd30adee76a2c161b2efc98b8ece60082d5b98189fd9b3da1f048061d306343cacb9b67566daa78ce8fe54dc82dd90a1e34bc
+DIST scala-cli-amd64-1.1.0.gz 33673708 BLAKE2B 332f5a974949af49914de8fdb3129b0937fbce842616d6fefe16f7aff89baf6be1ba536d0ee6ff9bc1dd2b5ebfa51943bd0c6279ef83b95bd25a337530fa1295 SHA512 ba7ebb321a27e95f786027257c3f50dac1d12e0cc33abde24dc7c5dffb2f57a11c3ea67d92ed487968c49ff9ec3eaf5d1d62065beda5b6fa373d09b9126f4529
 DIST scala-cli-arm64-1.0.2.gz 33058672 BLAKE2B a82b18eec6235100cbbd7ff1503283e5ef29ba0798f67b44f69b329aa0f1f525cc910a7b4a923f98c8b113d06bac6e1c5ba963d62204462635ef4eed3d0b7f85 SHA512 b1dc9de26d30336f283202aa23ba1c76baddcea21d4c8c4c0e5114de979c62ba3e2b483302d4f396c84e802497127a36d589dae2826f76e1d02760314f6f0765
 DIST scala-cli-arm64-1.0.4.gz 33185346 BLAKE2B 2b0131a56ed3f67fb5d5f25db6c511dc7d9e9128089e6826fa7d859b1457f03a99e290cc63f185820ea849a857f40d667d5db7a378dabcf545cdcdefded6a577 SHA512 3ff1c025a1035aa6a8550de17e85bc5c483007d5f07f03e0d792d6dc9ed1b18eb26909b3c7195fde12056a3b84ffa69dc53c01ec21b34187c1d7188a0a023aaa
+DIST scala-cli-arm64-1.1.0.gz 33575885 BLAKE2B ebccbe86044b4708a356060a16f06bb94df01d261ab7dabe8eba8e644c121864cdee99debf95468d936cbff670413ec47e1ef903a9071b267a61c5fe46738c1a SHA512 6a85529be06a8d43d729c5a795bb0dcdb2680bd7ef3de471fee908e91249401262e8322019c640d4eb45d0a15ed0073ff51b24d61846228f46c36bfb48731408
 DIST scala-cli-non-native-1.0.2 9633113 BLAKE2B d63fe324533393158ac945c3070843787c844584c3f8bdc141f6106fa22adf244c2ca5e010801c549b0a56ecf500495c754ed9e6186f74359b373c4d776645ff SHA512 c6e6262af236a315960a3d16dfebc7adaf88f830d43e68f89220f2cf250d57d083bd2b9231fd13a0b3adc723ed17200592b55a2a17ccd582b9cc3ceebf52a29b
 DIST scala-cli-non-native-1.0.4 7553232 BLAKE2B 9299b20dddec80d12e738af4b283e816de5bae23262510146cd33a9b175f2a343f52932fbd3254974bd4219d2903f32772409f234423d3a027b6b0f02268e584 SHA512 4e5281ef7f8a886ad79746477d852f485ccad317568a64ee513e691dcd9a9121c2aed51f6170b959f0226fb81efe9aa1f8ecf1d94a84a0b387c349adfb756762
+DIST scala-cli-non-native-1.1.0 7728727 BLAKE2B 05deb93b91029721a21bac729aa9b370e05909e67bbade921e00d09c3a37e851e519188bff73dc614c3f5768834ae56f94623347735e756a6bcb0c4c81c8713c SHA512 13e426915794df757b6eb029d2545316bd9f4b9ba6f58cf59a546227d6997741cf681ce0c5e721e8e95cb9e420702f2d28f004df1780637dc9b39fd3bc4c884a
 EBUILD scala-cli-bin-1.0.2.ebuild 1818 BLAKE2B b6f64c1a87aaeb118f5cea239ec569a77d8593a0963745c9977cc28e60b6538218eca4f8f7dd79205fc97ef6dc5fee1142b93da5f37a4b62a733b292327a06f8 SHA512 304c303924f7485630911d125f92fbdb05d25dc76581ec3a6737808a96e16780bcb33600cedb0078a0ba66c9828316a54e0f67f0e5ecb33445085b8becca4243
 EBUILD scala-cli-bin-1.0.4.ebuild 1818 BLAKE2B b6f64c1a87aaeb118f5cea239ec569a77d8593a0963745c9977cc28e60b6538218eca4f8f7dd79205fc97ef6dc5fee1142b93da5f37a4b62a733b292327a06f8 SHA512 304c303924f7485630911d125f92fbdb05d25dc76581ec3a6737808a96e16780bcb33600cedb0078a0ba66c9828316a54e0f67f0e5ecb33445085b8becca4243
+EBUILD scala-cli-bin-1.1.0.ebuild 1819 BLAKE2B 14ca153e13b5c9d2f35f2dd4d01a9247e94969b5532b399abe55de9ec9f7a347f50a8a3dc5ff672cdb2c3ba8a03e716b38f9ed92e0a8d5649e555316e2b1f523 SHA512 ebe443f3b7d520ff4fefa7760437196239a3538aceba4f887ef51eeb65e6f903fa20ef5d0fd42d70a6f33cb9a50c81c86d7e0f542bcc9b78b4669badcffc54ce
 MISC metadata.xml 398 BLAKE2B b9b93abb74284cfbf4adfdf5d78a62dc6d21fa9e33c36d65842aa225b499f2220fed94648e4422eed5ae9f3c93123aeb68965783f3980a6c046168b3cde3657c SHA512 94e42c3c3b2b4d0b0092dce77a564f5e96617ab74aff3fa1ec89344c4d787f06ea8ff3ab6245440c228aa9c7018c96e2e740417dafc1699124f72b0235aed11c
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild
new file mode 100644
index 000000000000..10fc71222c73
--- /dev/null
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+UPSTREAM_PV=${PV/_/-}
+UPSTREAM_PV=${UPSTREAM_PV/rc/RC}
+
+DESCRIPTION="CLI to interact with Scala and Java"
+HOMEPAGE="https://scala-cli.virtuslab.org/"
+SRC_URI="
+	!amd64? ( !arm64? (
+		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli
+			-> scala-cli-non-native-${UPSTREAM_PV}
+	) )
+	amd64? (
+		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz
+			-> scala-cli-amd64-${UPSTREAM_PV}.gz
+	)
+	arm64? (
+		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz
+			-> scala-cli-arm64-${UPSTREAM_PV}.gz
+	)
+"
+
+KEYWORDS="~amd64 ~arm64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}"
+
+# A JRE is not strictly required if native images of scala-cli are used
+# (amd64, arm64). However we may want a system JRE anyway, and having JRE
+# in RDEPEND reduces the chances that scala-cli needs to install one
+# for the user.
+RDEPEND="
+	>=virtual/jre-11
+	sys-libs/zlib
+"
+BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )"
+
+QA_TEXTRELS="*"
+QA_FLAGS_IGNORED="/usr/bin/scala-cli"
+
+src_prepare() {
+	default
+
+	if use amd64; then
+		mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die
+	elif use arm64; then
+		mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die
+	else
+		mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die
+	fi
+
+	chmod +x scala-cli || die
+}
+
+src_compile() {
+	for shell in bash zsh; do
+		./scala-cli install-completions \
+					--shell ${shell} \
+					--env \
+					--output "${S}" \
+					> ${shell}-completion || die
+	done
+}
+
+src_install() {
+	dobin scala-cli
+
+	newbashcomp bash-completion scala-cli
+
+	insinto /usr/share/zsh/site-functions
+	doins zsh/_scala-cli
+}
diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index ea562a4edbfb..21ad48931456 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -1,7 +1,6 @@
 AUX 1.1.7.8-gentoo.patch 832 BLAKE2B 0e3a5061c0b410b7609ac49ec3b610ca7934c664398488020a15033fabf3c1576ee9900359948e69e2e86c54a56709f98b68482a75dff156a77874ffaa966674 SHA512 2a75eebf1851bebda7d6204c43503b6464416adff12cf5de5e35825fd6a9c43495419e886343cf3566f6ae437295eff2098aea0f17314a5c138011a3abf6f9b9
 AUX 1.1.7.8-java-version-target.patch 1875 BLAKE2B 6e2b66e642806acbf3de146fa853bb642764eb73ebb3489edd5208622f15fa9bc037bcb26447c4f45cfb362ce72910943b76dd8c1a6cf5f61fd4b05f6929a974 SHA512 5a60cc590dd10829487108c04c82a10b207fe95524f94163be967f557782537c0e19176a44782a1189f0e72e14dbd62a9c0f2f8415476d0fc133e040881a7d61
 AUX 1.1.7.8-unbundle-bitshuffle.patch 1006 BLAKE2B 99b88fd2af02ff6d95d90ec2e302593c7ae00691156b283e11425677f904847d2809ce91d7094de8a5ec759595e721bf0f80d3deadd56f0f05e8d4ae1d4c4613 SHA512 dd4877f023095f7d41e6d22213d1916ae17ec8a88977354d5e1662fa3e555f89bc27def9537cd6ffd07a75794c25719379189b14a0db481df1c2e729525b12f0
-AUX 1.1.7.8-unbundle-snappy.patch 1820 BLAKE2B ec2f5724675cef1a796678f5b12ccd4b49c2415fcfd98e2a3f9214bb63477bfd9bed93999c2f12b2f0e8b5aedb705299bf37e52a16833797a745bf4e1eeecdd9 SHA512 408c09f01cb65dcf17b7ecd5542cd622b6296ab6d433be79ff2a8d03dc4e8f8b9c48165d95afa0b865c8ab196c4470e93f5b07e9eeded1f492d1ef2d8d91fa82
 AUX snappy-1.1.10.1-commons-lang3.patch 507 BLAKE2B 17a9219e4e9fbcf8900dff8ce06762262d5d40ac07861d895ba29da8a2583ce37c011b04892382359a86c79ffff77ceac36d0f8fcca420fc20011d3411f9078a SHA512 2c08bbf6fe408778233a1194df72182a5cf4083b8647f9baea740b9fb403f31e001e1671913992624465d2e7d7197142ea47cc4891d64124fc54ac95a9d9accb
 AUX snappy-1.1.10.1-unbundle-snappy.patch 1928 BLAKE2B cc67a38e53dcd08d208b33796a003d7ca73f79a54a8d0a4411de9f15aae1e09e079bc55c9230964e990f8a27e4be3872e9d5092fe7abb5af760ce91641b753c1 SHA512 78cef705a76c379ec7cc59e4f4c6012bbba5f54b4a24172b7ab2ef0ccd7a8e22cf3e469938c9dca5933e066990c3e973893c0c93368fecd90486010f9b8ad69f
 AUX snappy-1.1.10.5-SnappyOutputStreamTest.patch 1215 BLAKE2B 34005766546b28012ffbd86927b37d9368eab212b3fc2252492f2c49f7b639519cdf5bd197fb7dce3769108bab1175414f0b9287cf4893d41ad784e9f27ae8c0 SHA512 3c65030686fcdd1177c6865894510081ba41631db9c3945c52aeef921ccf049fa65083225af9f022a1537814e8a50de2ad0740292b9d6d8e8ee900176ff69267
diff --git a/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch b/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch
deleted file mode 100644
index 6113019be3ea..000000000000
--- a/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0821c87..04f0435 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,7 +8,8 @@
- 
- SNAPPY_OUT:=$(TARGET)/snappy-$(SNAPPY_VERSION)-$(os_arch)
- SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(SNAPPY_VERSION).tar.gz
--SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
-+#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
-+SNAPPY_CC:=
- SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(SNAPPY_VERSION)
- SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
- SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy
-@@ -100,7 +101,8 @@
- 
- $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class
- 
--$(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED)
-+$(SNAPPY_SRC):
-+# $(SNAPPY_GIT_UNPACKED)
- 
- # aarch64 can use big-endian optimzied code
- ifeq ($(OS_ARCH),aarch64)
-@@ -122,7 +124,7 @@
- 	$(CXX) $(CXXFLAGS) -c $< -o $@
- 
- $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
--	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS)
-+	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
-     # Workaround for strip Protocol error when using VirtualBox on Mac
- 	cp $@ /tmp/$(@F)
- 	$(STRIP) /tmp/$(@F)
-@@ -140,9 +142,9 @@
- #snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d")
- snappy-jar-version:=snappy
- 
--native: jni-header snappy-header $(NATIVE_DLL)
--native-nocmake: jni-header $(NATIVE_DLL)
--snappy: native $(TARGET)/$(snappy-jar-version).jar
-+native: $(NATIVE_DLL)
-+native-nocmake: $(NATIVE_DLL)
-+snappy: native
- 
- native-all: native win32 win64 native-arm linux32 linux64 linux-ppc64le
- 
-@@ -151,6 +153,7 @@
- 	cp $(SNAPPY_OUT)/$(LIBNAME) $@
- 	@mkdir -p $(NATIVE_TARGET_DIR)
- 	cp $(SNAPPY_OUT)/$(LIBNAME) $(NATIVE_TARGET_DIR)/$(LIBNAME)
-+	cp $< $(TARGET)/
- 
- package: $(TARGET)/$(snappy-jar-version).jar
-