gentoo auto-resync : 01:07:2024 - 08:00:50

9 files changed, 32 insertions, 22 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index b3c53e587295..38c7f7a835ad 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/clojure/Manifest b/dev-lang/clojure/Manifest
index 8332bef8dce7..b849b595db80 100644
--- a/dev-lang/clojure/Manifest
+++ b/dev-lang/clojure/Manifest
@@ -8,5 +8,5 @@ DIST test.check-1.1.1.tar.gz 85399 BLAKE2B 752f0f0149dd5720dcabdcc65173906b124a8
 DIST test.generative-1.1.0.tar.gz 144819 BLAKE2B b6cbf42b401380e3977ac219ddbc8b26ddcfc285a06ce5f2d68c3a52bb6c36702922975e9c9e2bfd4198ec239f2efd676fdfc8293222b75eb5c417ef1d80681f SHA512 4ef4640be2f630c4ebbe81d7bafec1e6e32619480c09ef59882b182738a998941d442231148d8cd2fb4166454780fd72067e5dda4b64d0ae0b064c91928f5c67
 DIST tools.namespace-1.5.0.tar.gz 37913 BLAKE2B bae6be788507d200f6e781754b46d5c7c34069b3340006f078a3f0360c0c5d2dea0398d5afe1ea6b49166baa482cc07a7687735474afc84abe644c2b8b53cd9d SHA512 c1f4dba4758ecb39460334e61f989cf92e3e2ca1f6ff03b9e12bc137de088f994d86feec827f40d33034e2f8978e099326aed3b85a21c68a910714b662bf9052
 DIST tools.reader-1.4.2.tar.gz 63868 BLAKE2B 3f4ceab49de2d518ba5854a81af13cb51902b240d2db2be2c8ededd48d6f9db3898eb54fdb41c6b9ce49d9d8eb912b0a7d3683dc1d61b6e238c5b862fad4b4a5 SHA512 bc3510887b7c5c5f84f0969ff2224dc745a54c81c186c50d0436af9e6f8eb4abf6d9c6a7bba4362ba3f8c94cd6bedefdf1a7698a1cd67db4b324fbaffaae5fbf
-EBUILD clojure-1.11.3.ebuild 3456 BLAKE2B 753bf35e910bf891032252af794e73d597e1824386a2f6592abddb7c26cc034d0a81b04082a670585b2b00af635d3befc48f7c0d66973b9594aa3e385aa48237 SHA512 da3375de3bc6e9e6f8dd7589e9d6b2beb81a0bbe33f0ad55402528c5459c8e186821aed1013a39b62d0bdfae2022c6c645ca5bc9faf60450da77b5b3650606de
+EBUILD clojure-1.11.3-r1.ebuild 3482 BLAKE2B b5ca3cb3e89a9de7d9ccd9cfb055a1bddc74384a1ced66140f48765f58c5aa2a87e2c8c203cec3aeb1267dececd2a3f9c1abb3bd02763675bd977c6f8ce82fdb SHA512 a2ede4ec6a84e6c6e6aec8fdae8e34e9e351d8d653a8bb5c42cb4e4964f94c71b07e533273d1757e949885e8094941445d5d5fcb3cdc46fd83695cff42ecee7a
 MISC metadata.xml 335 BLAKE2B 9d5549eaaf88d24a1023d47406828fe19bb004dd23a8d53180d2f7cc3368b55105a3940051229a04f5a0071ef51591ec905c4fd1e527fc82b35f5f7920004267 SHA512 5d9f342b3e530281c617e5ffbc68ad085d6171148ff48c6842c5053cd35be57a244014b4b917610b833cbfa3d960f3e667aa6601d7e5cb29f05bd2030cc39200
diff --git a/dev-lang/clojure/clojure-1.11.3.ebuild b/dev-lang/clojure/clojure-1.11.3-r1.ebuild
index d29d73b5c0b1..0028a3915530 100644
--- a/dev-lang/clojure/clojure-1.11.3.ebuild
+++ b/dev-lang/clojure/clojure-1.11.3-r1.ebuild
@@ -15,7 +15,7 @@ TEST_CHECK_VER=1.1.1
 
 JAVA_PKG_IUSE="test"
 
-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2
 
 DESCRIPTION="General-purpose programming language with an emphasis on functional programming"
 HOMEPAGE="https://clojure.org/
@@ -50,6 +50,9 @@ SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="amd64 x86 ~x86-linux"
 RESTRICT="!test? ( test )"
 
+BDEPEND="
+	>=dev-java/ant-1.10.14-r3
+"
 RDEPEND="
 	>=virtual/jre-1.8:*
 "
@@ -65,7 +68,7 @@ DOCS=( changes.md CONTRIBUTING.md readme.txt )
 
 src_prepare() {
 	default
-	java-utils-2_src_prepare
+	java-pkg-2_src_prepare
 
 	ln -rs \
 		../spec.alpha-${SPEC_ALPHA_VER}/src/main/clojure/clojure/spec \
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index f68d83517689..fc74d1b4012b 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,4 +1,4 @@
 DIST mercury-extras-22.01.1-gentoo-patchset-1.tar.gz 824 BLAKE2B 677ab82f668f2e35cccf6eff0fc453fb5483941b5315891b1b02a2afb3216b59c86aa3712cdbc7382aa604ce7d1ac7cd8e32bb25c7643b8a3786bae09e987dbb SHA512 bb6ca63a9d4ceb71f7e2c07540301ca319a0163414b5d005251de4b8d4948fcd551b892e1520be0e95c845c31fd6953f2293f5fe52990af680b5bf9117a22e69
 DIST mercury-srcdist-22.01.1.tar.gz 48956249 BLAKE2B 0f5a7662327f27c27a4d9e421f71afa58920f6232093452781124817ce5c34d1953a80a08b75e95101a7e2e88159b7d4ead08d25c67a99abcb908a9582af2bab SHA512 5fa49640307233ea0f641488e5ea526385e52833007a31469e083711b63925ca7568d7ad6e09301ddf7816384a080546bc4cf46b1422f974e008917d1aa4f37a
-EBUILD mercury-extras-22.01.1.ebuild 7169 BLAKE2B 671c063c175dd52de6f876a4ba7e03be77e58b5592c633a2bc499eb7cbf30b116c93dd2f4b7282f07531e1ad2117f4d15c2b457f140b46daeffffd1d151c29d4 SHA512 c8b8b6f41ae548c86e6034ab334c3010c63c84fab55a6eff34911d02cb60639736c1807d3c411404f8239227e9ec2aaa577bce2e3687137baff1df6ca0f7d8cc
-MISC metadata.xml 245 BLAKE2B acd5a613f15b1a9fe045f911ce6a492d3ad813372be73d3a7b2f3f15aa0d17c6d99d30f08c971762feb0d7000266ee7a95db4afc46b224075ef103f0dec16f1d SHA512 b5511f2bcefde716bf42d87a84853e59969a33a5aa4fa7a497889f5b206a817f47d74b6637404c0ed448a579f22e68a0ae0c7a7195d58e58949a044b60ea881e
+EBUILD mercury-extras-22.01.1.ebuild 7159 BLAKE2B c048885b95140636207dcd13bb43e663c6a583d75577ff6e8123e0c31163399cb5d47b73f99bee9a713db0bbf397f5958175240bcdd333b12d9b178b26a2bbd1 SHA512 dac300adbae6e598b342b6a0262044a24e945522220a11148a4f6d7a7be9b7d068c99f4e00780273402732cfd48a6cc0f5344105689e4f259c7cf8f76a01ff1a
+MISC metadata.xml 332 BLAKE2B 6b3025c4b640ff7d6a598eab6840d805b7cc6cc78d03c95bbb6cbab305a64c2ab2f48d655bf700d980b50bb35ec47320d4e7910d407551afc51b6150c15dd4f1 SHA512 a433a9a617025b7082bc11fe5e47b9ecb01e3aa3d42e16001e17179260c419c61ae6c00bad0b5e14b85aece36d693571eaf10e18b961450c288fdcca63346106
diff --git a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
index 173c1939754c..239c88e3cd60 100644
--- a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit multilib vcs-clean
+inherit vcs-clean
 
 PATCHSET_VER="1"
 MY_P=mercury-srcdist-${PV}
@@ -12,6 +12,7 @@ DESCRIPTION="Additional libraries and tools that are not part of the Mercury sta
 HOMEPAGE="https://www.mercurylang.org/index.html"
 SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
 	https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+S="${WORKDIR}"/${MY_P}/extras
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
@@ -41,8 +42,6 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}"/${MY_P}/extras
-
 mercury_pkgs() {
 	echo "
 		align_right/align_right:bin:
diff --git a/dev-lang/mercury-extras/metadata.xml b/dev-lang/mercury-extras/metadata.xml
index d6a4b0b729f8..1736dbb41e2a 100644
--- a/dev-lang/mercury-extras/metadata.xml
+++ b/dev-lang/mercury-extras/metadata.xml
@@ -5,4 +5,7 @@
 <use>
   <flag name="tommath">Enable support for tommath library</flag>
 </use>
+<upstream>
+  <remote-id type="github">Mercury-Language/mercury</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index daa15a0e809a..34743fb3f176 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,5 +1,5 @@
 AUX 50mercury-gentoo.el 130 BLAKE2B b0108f529cbe5b66b510b2ebab6f091825df9ac92dc1d98bc98b34532b6c217ea5ede7bc5960f6616c3a8201788c6a5094b30871fba15e5ded87eb97ab3f7c1f SHA512 e790f1b396f63bf36e57160d588b1377d3f889156446a7d26a6edd3f7175ee8ac5b8972ee4d0b6045b5442ae750341b5e06adc42f094fd6d08f2b519f4432071
 DIST mercury-22.01.1-gentoo-patchset-2.tar.gz 4975 BLAKE2B 73dfe5688f7f2c44ee236e3b9fd38811afecc7f8f4dd8f0694c2c3f27ce20a74aade3678bb3a16f7bcfc1fc8b07e518a5954802e410a3f566c00df7898800675 SHA512 16319d2e78af5cb73f67555c1498b277e8c6435cfe4e62fc87817cf06f04deadfad6f8264a5270100aaf6985866b879e9b7c69d3c1839c25d36ca2506bbabd72
 DIST mercury-srcdist-22.01.1.tar.gz 48956249 BLAKE2B 0f5a7662327f27c27a4d9e421f71afa58920f6232093452781124817ce5c34d1953a80a08b75e95101a7e2e88159b7d4ead08d25c67a99abcb908a9582af2bab SHA512 5fa49640307233ea0f641488e5ea526385e52833007a31469e083711b63925ca7568d7ad6e09301ddf7816384a080546bc4cf46b1422f974e008917d1aa4f37a
-EBUILD mercury-22.01.1.ebuild 5109 BLAKE2B cfb43b3ebeb96dd1e38aef5aaef378fc87855464f9bf646d1d7c1c9a79b43bfcbeb1f48cbcea4c9c15ed915fe369d2fe54635828185362180f3a4176e96b0707 SHA512 ab82b96041a805983ceeda728d635bdc02b1cac5ae7724580af75763d09378fc270dd518d7e6af9745009023379f25b835bd84f2cc917351f848cbd19a7da021
-MISC metadata.xml 245 BLAKE2B 8b9b3b37eb7968bc70470ad8ca3558be11ba639523d6f6eda4ca477f5205e0af09337b86ca7139da797316f3d169293f45346f0a7f5357f3759257c36d77717a SHA512 61633840e25872835cd4cb6662b6a1416a9cc3e5d37f49503e8de62e8429fd6f95e4b2432118222073e795081bfcebdd66bdd911724f162b6ac50013e34ac786
+EBUILD mercury-22.01.1-r1.ebuild 5147 BLAKE2B ae5fcc06a16b1dc713921c87e181832e10648654c3da4b6050dc794733681b1e24b0e34059e13228c4b4d69c6c16ad06a76e277cdd96ab56dd87084384c79c59 SHA512 621540d6f729f925eb8d8e0efb17073095a95f6c49d0b08441c7656ba6e0fed92936dede262878c0cfb2ffd66abf292c4a6c543cd0c9af6518ccadaa369c2187
+MISC metadata.xml 338 BLAKE2B 82866c17c57d8e99549fcf1fb054f70a249d9618bb92468d9eba1f17995c30a07f4e5be75e4b9c6d32b405cdfcf40868d389d791e0c4e016feb45426be2b0aa0 SHA512 d428c6c8993259a651d5bf668cec87011fb04364d1e1243d4bb52326416c1cfd3d97e61b5f514f7f74461598426cc72b07ec4d7f47fd520cd47c2002fb870493
diff --git a/dev-lang/mercury/mercury-22.01.1.ebuild b/dev-lang/mercury/mercury-22.01.1-r1.ebuild
index b56c538277e8..d992abd8eb01 100644
--- a/dev-lang/mercury/mercury-22.01.1.ebuild
+++ b/dev-lang/mercury/mercury-22.01.1-r1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
+inherit autotools elisp-common flag-o-matic java-pkg-opt-2 vcs-clean xdg-utils
 
 PATCHSET_VER="2"
 MY_P=${PN}-srcdist-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="https://www.mercurylang.org/index.html"
+HOMEPAGE="https://mercurylang.org"
 SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
 	https://dev.gentoo.org/~keri/distfiles/mercury/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
@@ -20,18 +21,19 @@ KEYWORDS="amd64 x86"
 IUSE="debug doc emacs examples java mono profile readline test threads trail"
 RESTRICT="!test? ( test )"
 
-DEPEND="net-libs/libnsl:0=
+COMMON_DEP="net-libs/libnsl:0=
 	readline? ( sys-libs/readline:= )
-	java? ( >=virtual/jdk-1.8:* )
 	mono? ( dev-lang/mono )
 	doc? ( sys-apps/texinfo )"
 
-RDEPEND="${DEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )"
+DEPEND="${COMMON_DEP}
+	java? ( >=virtual/jdk-1.8:* )"
 
-BDEPEND="test? ( sys-libs/timezone-data )"
+RDEPEND="${COMMON_DEP}
+	emacs? ( >=app-editors/emacs-23.1:* )
+	java? ( >=virtual/jre-1.8:* )"
 
-S="${WORKDIR}"/${MY_P}
+BDEPEND="test? ( sys-libs/timezone-data )"
 
 SITEFILE=50${PN}-gentoo.el
 
diff --git a/dev-lang/mercury/metadata.xml b/dev-lang/mercury/metadata.xml
index 5061e4f27e59..3695e0c64d9e 100644
--- a/dev-lang/mercury/metadata.xml
+++ b/dev-lang/mercury/metadata.xml
@@ -5,4 +5,7 @@
   <use>
     <flag name="trail">Support Mercury trail grades</flag>
   </use>
+  <upstream>
+    <remote-id type="github">Mercury-Language/mercury</remote-id>
+  </upstream>
 </pkgmetadata>