gentoo auto-resync : 20:07:2023 - 13:07:51

5 files changed, 36 insertions, 8 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 0bef6069b501..e41b3a25a804 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/sendxmpp-amm/Manifest b/net-im/sendxmpp-amm/Manifest
index f56dabd7625d..b7e1407f44a5 100644
--- a/net-im/sendxmpp-amm/Manifest
+++ b/net-im/sendxmpp-amm/Manifest
@@ -1,4 +1,4 @@
 DIST sendxmpp-amm-1.1.1.tar.gz 14012 BLAKE2B 769f888ad5522a5566f4b6fa4478ebe9321850eb3c21c9677dd96b36244a62dd7bdcc70c7093f5cd27721c14cd056c58cb740e6b5f2469afb32130dabc34ca3f SHA512 64b813647e50ec1cb1c6d123ce93ad89abcb1d734a9bf2867d6be8e8b9eae1f315db18f7c5fde6504cfcaa31dd4aad619006c97c4ffc1fa54056287f3b194198
-EBUILD sendxmpp-amm-1.1.1.ebuild 663 BLAKE2B 2f484991a51b5f7036fbaeb3922ad6f6c9044140c8c0cd57c93b84a52604f5027d0a0ffc8ac2a30e1feae362286474b7891328bad5a1627a54ddd87d25225567 SHA512 649040fd936b5fc6a12ebda8d15bbc6fb2177f56114592aa894a6ba8c2e66eccf338477a282b80b9769c394ff7780570b10655636cc61ae88e58cc00a715c9fd
-EBUILD sendxmpp-amm-9999.ebuild 620 BLAKE2B 1c3c9cfbde18bfbe3b0ed19aa14d0c136292963effe90081680f4b068f091c9ac2c0a4bcf51de1a87c8e330ab94284fb765c33e0ea26d5427df58d16502e156d SHA512 6c2c4da1b943c3a0fedea563b855980c6732a6dab9df5aeb2d9b77aa64a2ffad6ac9078bd0562c4a1de93a43377f66ee732f682f20c3fd9eaef0491b40992b9d
-MISC metadata.xml 247 BLAKE2B f18c471812d5b8c75f2e05c4fb556108fb93554b59ee61a8215803f2654854a7401fcd62964192c228bfebfb52ae4573cfd24b29a944630c8c733d154d2b0d9a SHA512 cea16f7db3110bd4629b9265d5acdec6d70877330664f8e83f726002eb69aec7f822e9cde9c7da900451cdef60f1ceba373dfe73c73f82173bbf1d2f9f7338b7
+EBUILD sendxmpp-amm-1.1.1-r1.ebuild 844 BLAKE2B b4d08768eb84e2787691aa2a2377bbb6c3cd7f5bc1a39d4cc3cf37111bf9bc73dab251a387bbcb8d83f0a58068b03f3a5f032f79ee72684ac7a7e2f27c9631b2 SHA512 becc63888fb5062bdba9860e969c1e4fe5bbbd04404e8dd0ec0b1bae8551e37fec2b4d28e7ccbe2f421d5a58996c25d3d97c36633db1dc43d18fb37aa7fdaf17
+EBUILD sendxmpp-amm-9999.ebuild 860 BLAKE2B 400be7d930c9543efbe85ac9b2c7961d18b63705d2f5238083839cd05359884b0b7a895740567d7d2ef744c6f01e1bc9cdb3627d0a56d2da16a0db76075efd55 SHA512 a957c4740d5edd2b4b870f7bc3f0996655c555842005296ce0779690cebf8232811de03db22a671464d6938a62fe06ebda0b07d15428865bfe410834c330f8d6
+MISC metadata.xml 330 BLAKE2B 424e85ebb23a9781920407c9b5b2dd6c06a3c7532720b586f04bab66c980ac469dad191d474eff667efa5623713908a5db8b319d236f2ab2f3695c8dadcbefe6 SHA512 07360aefef89eeb0e2611a4f13a2b57c22df57307a9f7a61c7ed4a2fe25a3da646c026d40296598eae7955b3d7f3f11051f9edf2b8c78bea283f132cd843d79f
diff --git a/net-im/sendxmpp-amm/metadata.xml b/net-im/sendxmpp-amm/metadata.xml
index a7fa285c7476..8e918cf7058e 100644
--- a/net-im/sendxmpp-amm/metadata.xml
+++ b/net-im/sendxmpp-amm/metadata.xml
@@ -5,4 +5,7 @@
 		<name>Florian Schmaus</name>
 		<email>flow@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">flowdalic/sendxmpp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild b/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1-r1.ebuild
index faee439560d1..4f057429d997 100644
--- a/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild
+++ b/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,10 +22,20 @@ LICENSE="GPL-3+"
 SLOT="0"
 
 RDEPEND="
-	dev-lang/ammonite-repl-bin
+	dev-lang/ammonite-repl-bin[scala2-13]
 	!net-im/sendxmpp
 "
 
+src_prepare() {
+	default
+	# Ensure that the script is using the right Scala version.
+	sed -i '1 s;^.*$;#!/usr/bin/env amm-2.13;' sendxmpp || die
+}
+
+src_compile() {
+	:
+}
+
 src_install() {
 	default
 	dobin sendxmpp
diff --git a/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild b/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild
index 782316d17024..c5dec761f9fd 100644
--- a/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild
+++ b/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/flowdalic/${ORIG_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	S="${WORKDIR}/${ORIG_PN}-${PV}"
 fi
 
@@ -22,6 +22,21 @@ LICENSE="GPL-3+"
 SLOT="0"
 
 RDEPEND="
-	dev-lang/ammonite-repl-bin
+	dev-lang/ammonite-repl-bin[scala2-13]
 	!net-im/sendxmpp
 "
+
+src_prepare() {
+	default
+	# Ensure that the script is using the right Scala version.
+	sed -i '1 s;^.*$;#!/usr/bin/env amm-2.13;' sendxmpp.sc || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	default
+	newbin sendxmpp.sc sendxmpp
+}