7 files changed, 76 insertions, 93 deletions
diff --git a/dev-util/android-udev-rules/Manifest b/dev-util/android-udev-rules/Manifest
index 9635e149bc85..b4ce9d1479f5 100644
--- a/dev-util/android-udev-rules/Manifest
+++ b/dev-util/android-udev-rules/Manifest
@@ -1,4 +1,2 @@
-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
+DIST android-udev-rules-20240114.tar.gz 24655 BLAKE2B 078c19d5cbf937c12d1611c223613202c44c1cc70e6c3c475ed68b7197fb759b82883f60670ce9c0d188432b86ed2c1dce7460450e1a433f5672af8b2d99c1b7 SHA512 1ebc186abc6bc080e336765f07fea046db338da189ae098ecc696239aea3c2a93679de7ca3baacea94787b4f2df65ba3946676b5f5d09f7b2aa813ab20cb108e
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/intel_clc/intel_clc-23.3.1-r1.ebuild b/dev-util/intel_clc/intel_clc-23.3.1-r1.ebuild
index 62d4a112c91e..71db84e253cb 100644
--- a/dev-util/intel_clc/intel_clc-23.3.1-r1.ebuild
+++ b/dev-util/intel_clc/intel_clc-23.3.1-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	S="${WORKDIR}/mesa-${MY_PV}"
 	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="MIT SGI-B-2.0"
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0_p2.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0_p2.ebuild
index 7196f0b85f19..808cdc0731ae 100644
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0_p2.ebuild
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0_p2.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
@@ -100,7 +100,8 @@ src_compile() {
 	local conf=(
 		--build=${CBUILD:-${CHOST}}
 		--target=${CTARGET}
-		--{doc,info,man}dir=/.skip # let individual packages handle docs
+		--{doc,info,man}dir=/.skip # let the real binutils+gcc handle docs
+		MAKEINFO=: #922230
 	)
 
 	# binutils
@@ -239,9 +240,9 @@ src_compile() {
 		pushd "${build_dir}" >/dev/null || die
 
 		edo "${conf[@]}"
-		emake V=1
+		emake MAKEINFO=: V=1
 		# -j1 to match bug #906155, other packages may be fragile too
-		emake -j1 V=1 DESTDIR="${MWT_D}" install
+		emake -j1 MAKEINFO=: V=1 DESTDIR="${MWT_D}" install
 
 		declare -f mwt-${id} >/dev/null && edo mwt-${id}
 		declare -f mwt-${id}_${2} >/dev/null && edo mwt-${id}_${2}
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}
+}