8 files changed, 76 insertions, 67 deletions
diff --git a/dev-util/nihtest/Manifest b/dev-util/nihtest/Manifest
index ed6ebb3be1fb..1494b30b9ebe 100644
--- a/dev-util/nihtest/Manifest
+++ b/dev-util/nihtest/Manifest
@@ -1,3 +1,2 @@
-DIST nihtest-1.5.0.tar.gz 39258 BLAKE2B 6f2bf228d080a705ac9c7a56e7f73cd6000e03fae09dc9076eb7c9003f8cd9629690ccc2860c7939461edc089f8e73419232ed08bc131f9b526f141b434f33f8 SHA512 aac6167c18b5af3f49f5b43b6a218f3f3921d5b0bfe74df546a6808cf826debbe587de44b04baf1d4abd8e0c193da1b86a1f6490cc6bd7888b7707e261a1ebcf
-DIST nihtest-1.5.1.tar.gz 39866 BLAKE2B 6e499db71d894e6fe3a5bcd2fe42b89c588edbec451b4c580feac1e07fe7b3cfa9e658dd52d21b0bda3a13be305a240698654eba672b22d9593af7a7335081ff SHA512 269b21c6e4baf2c00b01e799394361631f96a7876c5df7f08e8d97ab640312f77251b5024804cb66a3aa5cb5dd0e43f8e54eb4644d985038fe25de24de30f93a
 DIST nihtest-1.5.2.tar.gz 39901 BLAKE2B c6b71b457ec7ff2d154061d31f009e44b4208901bfaf7ff16c3b70d4da7e0790238ed21c310651e89ac7a8a335c9d5131b974a945ad41bff74da5ba14ecbf581 SHA512 7f7e29e6c1320cb2f1886b6a73c43e11a672bd42471d01a47d0941970b478361b3e463d7d64b4275ed707d87fe27773b34c0f79f398494393330d7091f9f2f53
+DIST nihtest-1.6.0.tar.gz 40473 BLAKE2B 98c1247485fc49a3a4b8f96dce16e35f7ac706ce8da7fc491ed62ad2c18a1514225ffdfcecae05266958f210d839897263bf2862abf0d771870f29a911f257fe SHA512 b70a7cd5624f7930f48cc75b454993f878a1d3d42035fa6dd90e89cc6d2b1928e8489974c583a814fa009f33749d9dc4614869f0693f51de1d1c74cf77801f0f
diff --git a/dev-util/nihtest/nihtest-1.5.0.ebuild b/dev-util/nihtest/nihtest-1.5.0.ebuild
deleted file mode 100644
index b2ccb4bcc1bd..000000000000
--- a/dev-util/nihtest/nihtest-1.5.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit cmake distutils-r1 pypi
-
-DESCRIPTION="A testing tool for command line utilities"
-HOMEPAGE="
-	https://nih.at/nihtest/
-	https://github.com/nih-at/nihtest
-	https://pypi.org/project/nihtest/
-"
-SRC_URI+="
-	https://nih.at/nihtest/${P}.tar.gz
-	https://github.com/nih-at/nihtest/releases/download/v${PV}/${P}.tar.gz
-"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/python-dateutil[${PYTHON_USEDEP}]')
-"
-BDEPEND="test? ( ${RDEPEND} )"
-
-CMAKE_SKIP_TESTS=(
-	preload-pass.test # https://github.com/nih-at/nihtest/issues/7
-)
-DOCS=( NEWS.md README.md TODO.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-	if use test; then
-		CMAKE_USE_DIR=${S}/tests
-		BUILD_DIR=${WORKDIR}/tests_build cmake_src_prepare
-	fi
-}
-
-python_test() {
-	local BUILD_DIR=${WORKDIR}/tests_build
-	local mycmakeargs=( -DNIHTEST=nihtest )
-	cmake_src_configure
-	cmake_src_compile
-	cmake_src_test
-}
-
-src_install() {
-	distutils-r1_src_install
-	newman manpages/nihtest.man nihtest.1
-	newman manpages/nihtest.conf.man nihtest.conf.5
-	newman manpages/nihtest-case.man nihtest-case.5
-}
diff --git a/dev-util/nihtest/nihtest-1.5.1.ebuild b/dev-util/nihtest/nihtest-1.6.0.ebuild
index 32440b5d4ded..32440b5d4ded 100644
--- a/dev-util/nihtest/nihtest-1.5.1.ebuild
+++ b/dev-util/nihtest/nihtest-1.6.0.ebuild
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index 9571d9405a94..8d3920cabb1f 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -1,3 +1,4 @@
 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
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}
+}
diff --git a/dev-util/uncrustify/uncrustify-0.76.0.ebuild b/dev-util/uncrustify/uncrustify-0.76.0.ebuild
index ef5d1e91430f..2f86f3cd8372 100644
--- a/dev-util/uncrustify/uncrustify-0.76.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.76.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 inherit cmake python-any-r1 ${scm_eclass}
 
 DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
-HOMEPAGE="http://uncrustify.sourceforge.net/"
+HOMEPAGE="https://uncrustify.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/uncrustify/uncrustify-0.78.1.ebuild b/dev-util/uncrustify/uncrustify-0.78.1.ebuild
index 67f2fd1b45a1..6b3db6b472c0 100644
--- a/dev-util/uncrustify/uncrustify-0.78.1.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.78.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 inherit cmake python-any-r1 ${scm_eclass}
 
 DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
-HOMEPAGE="http://uncrustify.sourceforge.net/"
+HOMEPAGE="https://uncrustify.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/uncrustify/uncrustify-9999.ebuild b/dev-util/uncrustify/uncrustify-9999.ebuild
index 4382debbf492..45d94eee19f1 100644
--- a/dev-util/uncrustify/uncrustify-9999.ebuild
+++ b/dev-util/uncrustify/uncrustify-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 inherit python-any-r1
 
 DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
-HOMEPAGE="http://uncrustify.sourceforge.net/"
+HOMEPAGE="https://uncrustify.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"