7 files changed, 72 insertions, 91 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 485c4fa11b3e..299eeb260a6c 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-udev-rules/Manifest b/dev-util/android-udev-rules/Manifest
index b0a1552c7662..227cbc624ac5 100644
--- a/dev-util/android-udev-rules/Manifest
+++ b/dev-util/android-udev-rules/Manifest
@@ -1,9 +1,5 @@
-DIST android-udev-rules-20230614.tar.gz 22013 BLAKE2B eece288e673be456e6b470471e34fe744d59d13f052331efc23181c77e2dc83d31ca6a95e965a2ca35736a3c8bb478c5494bf2319b25cec215432b8fa6da78d2 SHA512 983282a6adcbc200e548985d403a317e0cca48282ec17cf8496f7009df9a75e4c6a16a2ec0a65214a019acfdf550fb6450ef1dfe4021d8e9449988427f9c25c2
-DIST android-udev-rules-20231104.tar.gz 24127 BLAKE2B d70ed1305da1a6115aa4e597318b0cab307ef75f7e75e8ffd0f07857e6523ac8153cbc0c306ad1fe850688145e8738a626ed63b08bf514c57baedb2ee6b9d1a7 SHA512 c1d44d6fbb2f3e05b0e53887c43e4dfc3560ff27c56773ec45927686ce5962400a778da823d58d5ecd8c604fd410bf8aa33058a4a2bc2b724397c4fa7ea9fbe6
-DIST android-udev-rules-20231124.tar.gz 24545 BLAKE2B e444b1ec90608bc16383afd3c5b90d29468c820e86e08e47f673df2b10675a14424dd6d715e620130de312378b6b7d1023658c73f0ba4f539472e75533ac8da9 SHA512 7f8519c9e957ba86879f50ef80fa2af2192f010bae1dfc5ab56c522e4e7817be47542140f21c163efa5b476159a715711f31366847647773601537413c2d1608
 DIST android-udev-rules-20231207.tar.gz 24610 BLAKE2B 3af1deafbd67c3d1afd725e23c455c3a7f8e721d2ae6b384b61d6816cf6a0e21cb5dc5284d0d645e1d3a448cb1e4e7191252e636a412358faf05275fd6d27300 SHA512 957704e64d7c34e9eab235a1223c8b2929ef6e079e5ba1aa083c5743684fc09711e0d4d3bd51f81c236ee444c4aea5c1c3fc9e613e1864ba0b56bbb6ce8afcf7
-EBUILD android-udev-rules-20230614.ebuild 767 BLAKE2B 83d80fb079230f31f22310401493c8b7e4a156d99b2344beb544868fca0973b451df3ac83ea480d7f55cdc920fbbdcc72f1beb8afb1d582eb2a2afe664d6d29c SHA512 b274d4a435f19434d542c37bd683002fc1d420b07a4913e2cbd742881bf4be93343e1845258b26e7a3609bb3e12d9c3cda632ce3d3131bb4e9a6bcb5ff283253
-EBUILD android-udev-rules-20231104.ebuild 767 BLAKE2B 83d80fb079230f31f22310401493c8b7e4a156d99b2344beb544868fca0973b451df3ac83ea480d7f55cdc920fbbdcc72f1beb8afb1d582eb2a2afe664d6d29c SHA512 b274d4a435f19434d542c37bd683002fc1d420b07a4913e2cbd742881bf4be93343e1845258b26e7a3609bb3e12d9c3cda632ce3d3131bb4e9a6bcb5ff283253
-EBUILD android-udev-rules-20231124.ebuild 769 BLAKE2B 94bee61f8fc8702773f566ae0b608b2d0d80c55e811c5ce1f350ca1cf4c06f30aa902adbc1c99bb87d6b5999e2ec332e97f100986094999f34a6c6321e149f70 SHA512 55682ac8ae5e6db91454f69967daaf2340e0c7b426b6070947ac5d638e2132a5ae39bc1d6eac6a3bb4be208a2bab943a8fb420b9e20d7615038fa03adefaa58f
+DIST android-udev-rules-20240114.tar.gz 24655 BLAKE2B 078c19d5cbf937c12d1611c223613202c44c1cc70e6c3c475ed68b7197fb759b82883f60670ce9c0d188432b86ed2c1dce7460450e1a433f5672af8b2d99c1b7 SHA512 1ebc186abc6bc080e336765f07fea046db338da189ae098ecc696239aea3c2a93679de7ca3baacea94787b4f2df65ba3946676b5f5d09f7b2aa813ab20cb108e
 EBUILD android-udev-rules-20231207.ebuild 767 BLAKE2B eecd2228f52097dd5b2a296132833fd97a598a4b0247139905f4e5631839d8afca932471c0168654f568b41a1e315f3dcc45ec09a8fb20979bdf1989b0b2d53c SHA512 93e90694130bc66905216ecdcfdd77b0e37a6bf03ae08d507fc3a93433f589d81079dfe6e34827a5331d551beedd1398ef31319a2316d6827fb34072f2493395
+EBUILD android-udev-rules-20240114.ebuild 769 BLAKE2B 0b07aa117be352ca786d93e9206b07e49257804e2f667402297f29cae654fd5c8434fcef2a512324db2a612649d7783ebc563eda4e53f405ce03cf5a646105d3 SHA512 69f3103464df10a403d04799c7bd24bcc37a40130814edd531849d0a359e3cd0243a0e63fbd6270d99591b8532008feee3727b4b5f2b2a737a52eb5a79d2e889
 MISC metadata.xml 513 BLAKE2B 6c3d6dc38ce42493d7d8a6705b506fd30f47705a51b07530f89fb31b55f3ee304c6af720c068c54090837df5f82043320af9fe165c92afefc5678c16765208e7 SHA512 dc0379358009a9e2548571034a3dbca2f1a446877452c81ef9ed6f07c7f6633af77693c505e3336e9ac87746f4f2e395c29deba9d119a0c41a91a322d180e19d
diff --git a/dev-util/android-udev-rules/android-udev-rules-20230614.ebuild b/dev-util/android-udev-rules/android-udev-rules-20230614.ebuild
deleted file mode 100644
index cd857f96ca8c..000000000000
--- a/dev-util/android-udev-rules/android-udev-rules-20230614.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit udev
-
-DESCRIPTION="Android udev rules list aimed to be the most comprehensive on the net"
-HOMEPAGE="https://github.com/M0Rf30/android-udev-rules"
-SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-# No tests
-RESTRICT="test"
-
-RDEPEND="
-	acct-group/android
-	virtual/udev
-"
-
-src_prepare() {
-	default
-
-	# Use the pre-existing android group
-	sed -i 's/GROUP="adbusers"/GROUP="android"/' 51-android.rules || die
-}
-
-src_install() {
-	udev_dorules 51-android.rules
-	einstalldocs
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/dev-util/android-udev-rules/android-udev-rules-20231104.ebuild b/dev-util/android-udev-rules/android-udev-rules-20231104.ebuild
deleted file mode 100644
index cd857f96ca8c..000000000000
--- a/dev-util/android-udev-rules/android-udev-rules-20231104.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit udev
-
-DESCRIPTION="Android udev rules list aimed to be the most comprehensive on the net"
-HOMEPAGE="https://github.com/M0Rf30/android-udev-rules"
-SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-# No tests
-RESTRICT="test"
-
-RDEPEND="
-	acct-group/android
-	virtual/udev
-"
-
-src_prepare() {
-	default
-
-	# Use the pre-existing android group
-	sed -i 's/GROUP="adbusers"/GROUP="android"/' 51-android.rules || die
-}
-
-src_install() {
-	udev_dorules 51-android.rules
-	einstalldocs
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/dev-util/android-udev-rules/android-udev-rules-20231124.ebuild b/dev-util/android-udev-rules/android-udev-rules-20240114.ebuild
index 62f49b941ae8..b566bb91970c 100644
--- a/dev-util/android-udev-rules/android-udev-rules-20231124.ebuild
+++ b/dev-util/android-udev-rules/android-udev-rules-20240114.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index cb56cc2d938c..3c51103772c5 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -21,5 +21,6 @@ EBUILD rebar-3.19.0.ebuild 2462 BLAKE2B 52b97493bde303b742e274dd294bde9df57a89b4
 EBUILD rebar-3.20.0-r1.ebuild 1467 BLAKE2B 4431e40b79721f27e5ad2115ceb2613c6c96149dc3a0db1d1b1fbe51a95ce9147e76440359a5b6357bd360eeb1255a4788f5fdb21cc9e4a0f7a5ca4613137eea SHA512 f50c2cdae112c820f099c4ccd0abd6cf86376c4c88ffff6447a4a867521966e8d09d566c4cc35dd33902a205820c927fff7c824f6ac009d042ebf5e4e3a72086
 EBUILD rebar-3.20.0.ebuild 1360 BLAKE2B 1b74606b259767109415f9f8657d77a04d91810ce0bd96176b92dfc6351bd3833e35caae6d4d74dcec1fd7d08a6e54b1f2f6915a1f8efd11ee4b2a32b7aa6527 SHA512 9d4da37362e8c66dc544f0667d14f094e7007c2948362a3d62cb8051cda790ca63441172911a93b5106320e8ceb9b1c8966675c6af55b29155f2e97ca47690a4
 EBUILD rebar-3.21.0.ebuild 1462 BLAKE2B 1a95bdbeb3842cc303603f09d85ce1d86351121febb07ea01e31cb01403770c1c120112e5c7a6aa59dc44646b94a22da071ae3e4c9b7c3222d7c0faaa3b03090 SHA512 547dfb2625d62c36b58251aca9afc2592f3c3412203387f5122c78c19706f17febfa89f9599ca6906d259485ede55fe9ffcb2a47110043e5e25b207d2d3e9cba
+EBUILD rebar-3.22.1-r1.ebuild 1527 BLAKE2B 0ee47b404009f8c9b6b25eb6ca912ff75ce9b3574dcbff40fc58d53399446b84f9b6f2e15682804d0a3728d0fc72409a214982740e50df559ecd589df1bd0e62 SHA512 16789d1be7e77de2fc0eae32a5fbd56a544f30f1b7b3e85f70cbffc3d354c00eb25528109fefa0918b6e649ba7edcdedcf51ae15ff685e13465e826820e701ba
 EBUILD rebar-3.22.1.ebuild 1462 BLAKE2B 1a95bdbeb3842cc303603f09d85ce1d86351121febb07ea01e31cb01403770c1c120112e5c7a6aa59dc44646b94a22da071ae3e4c9b7c3222d7c0faaa3b03090 SHA512 547dfb2625d62c36b58251aca9afc2592f3c3412203387f5122c78c19706f17febfa89f9599ca6906d259485ede55fe9ffcb2a47110043e5e25b207d2d3e9cba
 MISC metadata.xml 361 BLAKE2B d58dbad87667d782d0b5d81f0d9166b4e93dc0dea86b7b665acd6463c945949425746085f1a36cc952ad0ca3bcd7acb949a855c2aa57eae8a18bfd16120da1ae SHA512 aa1aae5e0688d6e921d4018714a37f079a333282baff352d7faeef3b1810471be421c99a705b1b97de0cb5c846efb69b3ec4f018033cb56efc307164fb8871c3
diff --git a/dev-util/rebar/rebar-3.22.1-r1.ebuild b/dev-util/rebar/rebar-3.22.1-r1.ebuild
new file mode 100644
index 000000000000..76fb5f3577b0
--- /dev/null
+++ b/dev-util/rebar/rebar-3.22.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN}3
+MECK_PV=0.8.13 # see rebar.config
+
+inherit bash-completion-r1
+
+DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
+HOMEPAGE="https://www.rebar3.org https://github.com/erlang/rebar3"
+SRC_URI="
+	https://github.com/erlang/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://repo.hex.pm/tarballs/meck-${MECK_PV}.tar )
+"
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+LICENSE="Apache-2.0 MIT BSD"
+SLOT="3"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+# Note: /usr/bin/rebar is a ZIP archive of BEAM files so := is needed
+# see #913601
+RDEPEND="
+	dev-lang/erlang:=[ssl]
+"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	if use test; then
+		mkdir "${S}"/vendor/meck || die
+		tar -O -xf "${DISTDIR}"/meck-${MECK_PV}.tar contents.tar.gz |
+			tar -xzf - -C "${S}"/vendor/meck
+		assert
+	fi
+}
+
+src_compile() {
+	./bootstrap || die
+}
+
+src_test() {
+	./rebar3 ct || die
+}
+
+src_install() {
+	dobashcomp apps/rebar/priv/shell-completion/bash/${MY_PN}
+	dobin ${MY_PN}
+	dodoc rebar.config.sample
+	doman manpages/${MY_PN}.1
+
+	# MIX_REBAR3: Used by elixir
+	newenvd - 98rebar3 <<-EOF
+	MIX_REBAR3=${EPREFIX}/usr/bin/${MY_PN}
+EOF
+
+	insinto /usr/share/fish/completion
+	newins apps/rebar/priv/shell-completion/fish/${MY_PN}.fish ${MY_PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins apps/rebar/priv/shell-completion/zsh/_${MY_PN}
+}