3 files changed, 70 insertions, 37 deletions
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index df822346f277..b81f631b4a46 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -1,8 +1,9 @@
-AUX rebar-3.18.0-bootstrap-vendored.patch 1292 BLAKE2B e91914c48e355e675be853282e5d9daf588dbf2c3ee57b71489d34336933a56b9638e5672d70f0d8649b2e55d90658b718e6a917bad74e6e6f0596819fc06e14 SHA512 487bc63e3951e06ffc4b55bed770f6ef82cd8465cacad21ef26c0642547e0663dc879d9b9f8021abf4242bfbf537a24d1e83f97def84511dbd50c88d0cb37480
 AUX rebar-erlang23.diff 602 BLAKE2B 761b7e35408487698b27b0169989937305e9c7db14b49f5cbd411f4cfe19525a82e50d3c105f38d1fedc75f4c51d264fbf4a4a496b9bbce826b994241073fea3 SHA512 5f57f199dcd5544dec48119feeb288c2d6f5f0a45307b09489a37702609f6e79db08982764bd07f898c7858d45d8c154e314fab131b70996c95a1473561ba8c4
 DIST meck-0.8.13.tar 34304 BLAKE2B f2bb100bdea75079351610edd572ea7ced1503c02f86ed3378ec00e023ee63b729e859dfb3aefd521eb50541d4fc3ce70f1425beae8dd32d2dd2adb68618cc57 SHA512 adcfd3fdf69d4926dc1d9c2f0b477c8977bddba8b8ffdbfedcf1b5dc3c1af47b39b1c6263c922a43efede90f145f009d71b27178597320522960c5ebbd84a15a
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
 DIST rebar-3.22.1.tar.gz 797521 BLAKE2B 7785dcfb400108324ea5ee351796cfdf7ca8658a93db01d4530e291feb22d64261749142cd74f9fe0dd5c1e53190f191531932315e6dcc4290870f13519b7df2 SHA512 fc41b306ba88ce2fb600763b226850d55f6b85a169d6177cf24c4483effbc6c4c202051b6e0b4d0cd1e06b913fb8597b1517d73d2c1422b573005e51ed81d54e
+DIST rebar-3.23.0.tar.gz 807007 BLAKE2B 97c4bdb2c2fa8d5ad6f3dd7760329ecff801495a3cd3c4e389a9197071fc6e34cc880626e94a30045a4783e0dd240fcd46d32f41a0d83f823daf8d304c02294b SHA512 4da1db8ed830c59fb322c1a652c2efe28d54e09ad74d12a87381ea7a7f13965b91815f383221831fbc14e6deed1a75db1039164f7df128a977d5b64048540cc3
 EBUILD rebar-2.6.4-r1.ebuild 671 BLAKE2B e2634bb01418f81f97c9d30a91083efb2ed87416b7e42a48e83acd5f07956ce14e8fed23f782bbba6437139da730c2cdabe7d0c523a447966b43c6e2dabf8033 SHA512 95cd7d605d4a3fe6940be8fe90d42db7b413bd0b1983a4ed44cd511308244e64e88d49a70306c9262556a1717402c41e42849c7420f1e958dfc300ce631eb382
 EBUILD rebar-3.22.1-r1.ebuild 1527 BLAKE2B 0ee47b404009f8c9b6b25eb6ca912ff75ce9b3574dcbff40fc58d53399446b84f9b6f2e15682804d0a3728d0fc72409a214982740e50df559ecd589df1bd0e62 SHA512 16789d1be7e77de2fc0eae32a5fbd56a544f30f1b7b3e85f70cbffc3d354c00eb25528109fefa0918b6e649ba7edcdedcf51ae15ff685e13465e826820e701ba
+EBUILD rebar-3.23.0.ebuild 1532 BLAKE2B 42a8d88eb729f58ffddd4348021fad811babce9c7d6ad9c118c2ca78118eb6b0f5ba8381b71eeef650cdf0e73ddeb7216a0623c031995cc9950c8cdceec80f8c SHA512 472308e5e2f8812ea99912c7868c48d2a1a2bf00ef454d7c26fb489dcc26edb4464d753d93f4aa074c066646998ef81a950cca2710a7a236bd14de0e5cccab18
 MISC metadata.xml 361 BLAKE2B d58dbad87667d782d0b5d81f0d9166b4e93dc0dea86b7b665acd6463c945949425746085f1a36cc952ad0ca3bcd7acb949a855c2aa57eae8a18bfd16120da1ae SHA512 aa1aae5e0688d6e921d4018714a37f079a333282baff352d7faeef3b1810471be421c99a705b1b97de0cb5c846efb69b3ec4f018033cb56efc307164fb8871c3
diff --git a/dev-util/rebar/files/rebar-3.18.0-bootstrap-vendored.patch b/dev-util/rebar/files/rebar-3.18.0-bootstrap-vendored.patch
deleted file mode 100644
index 633a74e174d4..000000000000
--- a/dev-util/rebar/files/rebar-3.18.0-bootstrap-vendored.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4c4b0d39dba07911a707f8b8f17711900d2ee786 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Viktor=20S=C3=B6derqvist?= <viktor.soderqvist@est.tech>
-Date: Fri, 5 Nov 2021 09:46:29 +0100
-Subject: [PATCH] Make bootstrap use _checkouts
-
-This makes it possible to run the bootstrap offline by placing the deps
-in the using the already documented _checkouts directory in advance.
----
- bootstrap | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/bootstrap b/bootstrap
-index 9632b6c77..18cc46216 100755
---- a/bootstrap
-+++ b/bootstrap
-@@ -92,7 +92,19 @@ fetch_and_compile({Name, ErlFirstFiles}, Deps) ->
- 
-     compile(Name, ErlFirstFiles).
- 
--fetch({pkg, Name, Vsn}, App) ->
-+fetch(Source, App) ->
-+    Dir = filename:join([filename:absname("_checkouts"), App]),
-+    case filelib:is_dir(Dir) of
-+        false ->
-+            fetch_from_hex(Source, App);
-+        true ->
-+            io:format("Using ~p from ~p~n", [App, Dir]),
-+            Dest = filename:absname("_build/default/lib"),
-+            ok = filelib:ensure_dir(filename:join([Dest, "dummy"])),
-+            cp_r([Dir], Dest)
-+    end.
-+
-+fetch_from_hex({pkg, Name, Vsn}, App) ->
-     Dir = filename:join([filename:absname("_build/default/lib/"), App]),
-     case filelib:is_dir(Dir) of
-         false ->
diff --git a/dev-util/rebar/rebar-3.23.0.ebuild b/dev-util/rebar/rebar-3.23.0.ebuild
new file mode 100644
index 000000000000..cac74bb37686
--- /dev/null
+++ b/dev-util/rebar/rebar-3.23.0.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}
+}