8 files changed, 80 insertions, 98 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 453383b4e59c..0c66f5315d80 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index fb1f07c36198..e2b20a889eda 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,4 +1,4 @@
-AUX diffoscope-231-pypdf.patch 5490 BLAKE2B a0226b4cd7b8b0d257968597c19706bf228c720fb5d13ab93aa68187f739c6dcc8e222c5a79b1e4e3ab6209842535080b52a7885d6538b456de8c94ec9154e19 SHA512 91afae48467e84ac85f70854fee56df731fda445b32e852dcf77f9d3afb8f5c6964e3a9912bb332789c60a79da84e6251e270a977ee2f5b5cf16d12eeb312689
+AUX diffoscope-231-pypdf.patch 5947 BLAKE2B 98ccfdcb3d7d62e34eac7dd59ba455996c7621f8a9ef3023c90969a42d69c3589af4db2d571e6c2d063cf44dc97f95d2872f8095b4b56e75d5350bf2e1b6e4ea SHA512 37cdcc4ecd7788f39e26f7e0581f81642ea2dd77560ff8423914f9f41e4cb121b5175a0fb660c93fb483dc94215eebcb3f22e5ab6398a3dd29158af128c4d074
 DIST diffoscope-229.tar.gz 3164192 BLAKE2B bee9fa1561ddcfde98cfa44cd6d66a28c636dbc7f3ec1f4895e91dfd3b66c039b68d53be0528b94c112552069886c3c81de4d9b9bc9038d183afdc9fdde6ddb9 SHA512 825c9c33f3088ba082ea3b998594445987558ee62b8b1fbfcded9b72a739faaa73908f8753b8772b3b1a8a43dbcfd52978265a18bdd92605defcd174884ccb23
 DIST diffoscope-230.tar.gz 3164600 BLAKE2B f5ad44ff36d07fc5724895e661e0946b292146d004e97159fef1cb58ff38669702a3990740e4ea34300a9b48aeb10263aeb6bb332da3ec987c355ed5b910fedd SHA512 e025e5f95ae2fb9de466b886c58a44f64e0f654fb049bf9f035209fe7ca1fd0ccc14a382b17085c13bc9f2be0d368482d57a071a577cb87628ae7eb0060158ad
 DIST diffoscope-231.tar.gz 3164686 BLAKE2B 5fe1546f63a047def4d1c9acc94360085be87460de1c106381532d937d1ad16be64749b9021caa7980a61a0dfd822ed7163e0f52bb0cab0520962b84bb184650 SHA512 544510de0790fc8f0c62030bc557f923bad6d5c39b7364e9944ebcf9bc5c1ecf2b9ecc91cf9142e54a23b1f004f53e96ed5b6f2f4637fa76cebd2ed7d0e4721d
diff --git a/dev-util/diffoscope/files/diffoscope-231-pypdf.patch b/dev-util/diffoscope/files/diffoscope-231-pypdf.patch
index 7b4365c80eca..4376e03f668c 100644
--- a/dev-util/diffoscope/files/diffoscope-231-pypdf.patch
+++ b/dev-util/diffoscope/files/diffoscope-231-pypdf.patch
@@ -1,6 +1,16 @@
+https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/6aed2e5320b5d412f0f81a36dd493ae4bd7c3ff4
 https://bugs.gentoo.org/889250
 
-(Can't yet submit upstream as can't login to gitlab.)
+From 6aed2e5320b5d412f0f81a36dd493ae4bd7c3ff4 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 9 Jan 2023 04:05:09 +0000
+Subject: [PATCH] Support PyPDF version 3.
+
+pypdf upstream has renamed the package from PyPDF2 to pypdf. This patch
+supporst the new pypdf version while keeping compatibility for older PyPDF2,
+adjusting to API changes.
+
+Signed-off-by: Chris Lamb <lamby@debian.org>
 --- a/diffoscope.egg-info/requires.txt
 +++ b/diffoscope.egg-info/requires.txt
 @@ -11,7 +11,7 @@ binwalk
diff --git a/dev-util/ply/Manifest b/dev-util/ply/Manifest
index b0b4f969373c..282783237583 100644
--- a/dev-util/ply/Manifest
+++ b/dev-util/ply/Manifest
@@ -1,10 +1,4 @@
-DIST ply-2.1.1-arm-build-fix.patch 1433 BLAKE2B 305bb06ce1e5516dc3868cd276edc94d89cb7c20866094c6947092048af2c090a29bae52dc82956cbf7f36e42e15d873c553948dade17f4b1f9d490bb8191ed9 SHA512 e7572e5e777e13b483e9123fc5c62d63f3f1a2c753d7dedce8de8d78a4c5baa9c10b45b0e31ba16a92b0e2af11e206662cfe815643f0a8145f8d79e388d536b9
-DIST ply-2.1.1.tar.gz 71578 BLAKE2B b63d0bd355985035b8d1c934c13982e21eeda0d710f40b8131562e9ef6a21a3eaf04960b871f5ab83d718ab1726450996988a2aef1a6fbd2e8f1a3c55db92beb SHA512 fdc66d752989a239e01d2746e6c56610c2c945fbeeff8f2a79be1db487a6cbba365d1bd1b553d25c43a3fdc3634ab96bf4a37ab4f694c6eb6eba82c35b37231e
-DIST ply-2.2.0-arm-build-fix.patch 1433 BLAKE2B 305bb06ce1e5516dc3868cd276edc94d89cb7c20866094c6947092048af2c090a29bae52dc82956cbf7f36e42e15d873c553948dade17f4b1f9d490bb8191ed9 SHA512 e7572e5e777e13b483e9123fc5c62d63f3f1a2c753d7dedce8de8d78a4c5baa9c10b45b0e31ba16a92b0e2af11e206662cfe815643f0a8145f8d79e388d536b9
-DIST ply-2.2.0.tar.gz 80367 BLAKE2B 111469f7a63a2b6442e60da78185e450630a372e423c4bfdd110868cf766537995cc54e8f7c790222f361162b8cb741c320310a2ae4f72faffd02bfc4ac707b2 SHA512 e0c34893be8b461d0e633125d412957c89a854a0e63f598d62d0fc93c6942a35694eb2020e534fd5004296cc83dd3e159dcc4ac29a63f9441d03714776d25c3a
 DIST ply-2.3.0-arm-build-fix.patch 1433 BLAKE2B 305bb06ce1e5516dc3868cd276edc94d89cb7c20866094c6947092048af2c090a29bae52dc82956cbf7f36e42e15d873c553948dade17f4b1f9d490bb8191ed9 SHA512 e7572e5e777e13b483e9123fc5c62d63f3f1a2c753d7dedce8de8d78a4c5baa9c10b45b0e31ba16a92b0e2af11e206662cfe815643f0a8145f8d79e388d536b9
 DIST ply-2.3.0.tar.gz 79753 BLAKE2B 7c2f71a6078ff65ce92b3959c3dac31d44fcf3b99fc0b2d0390152fcdfcb5f1620090b26a47f6579aaa7b7644700f2865e2693707e8746cdd78c77ce66e9ead1 SHA512 ee8acd31bef7b2ac318ef64f7775aae2b288bae15a7b7b5b28c2ce5728e8ece7833ce192bd10488dd54228685d3dc9053679a033960ed75fd91a10bb0fa6d912
-EBUILD ply-2.1.1-r1.ebuild 1204 BLAKE2B 391dfeadb5a7fefa1f4b300d3529fde460adfe29b3195d1ba1a686a9340c02e94273bb373e5b2820e6785804b93cb67cc675c26413f7e81fdeba61069d10e890 SHA512 90e5ba22c0f1af30e52f7df0634951e031bfd21f8de40a9273cbb0eb0f66a35c8a6b43cf1a7de470d89029fe29924c9afda44349c99740cc790c035e0805b2fb
-EBUILD ply-2.2.0.ebuild 1159 BLAKE2B b031ec88a988219c0dc9dcd4171b27cfb78a92d00678b7f23e9fabeca41c63f2d6be0221baf5a5602297f5353018db4a830449e51285f6d4d49530ac2b3282ac SHA512 bfe505b29eb37aebf3e76bbb05932147a52fb1a8b06f6950ca9db824913859ce227f8be860562d4a14c991349f00a823548f509ee0b70c698ebfef8babdbfbde
 EBUILD ply-2.3.0.ebuild 1162 BLAKE2B 8b04bba2ece7224558d9f64615e488cfa22afdcbe3bd827bce1427de079afe9a4d30306768ebc1c8bd36fd148379d9e10d42b7ab40245426ee88086066a08826 SHA512 3895076f4408568e067e1cbc4f3b24c9911c34c8069f89235bacb7a0b4f785c621a02db7272af6320402f51a2b19c0139b34fbd0865362b0606a410ba43e2dbf
 MISC metadata.xml 417 BLAKE2B 28ebd45dbaf6cca1bb15bbf344ed122b15f1925ce45a0d74b408c512a9116f767508e7aba47798f6becc5bbaa647fa74dec5153c1c82783fbba336b6eeafab62 SHA512 cd1f87108a632e8741bc85eeb949f75cc7a7375aa472b0bfa1fdc421e25056178ce565b1eb64047e5c26dae0642e9038f586fbe356b162e8a957d71d7b37117b
diff --git a/dev-util/ply/ply-2.1.1-r1.ebuild b/dev-util/ply/ply-2.1.1-r1.ebuild
deleted file mode 100644
index 21f30285c8e6..000000000000
--- a/dev-util/ply/ply-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-DESCRIPTION="Dynamic instrumentation of the Linux kernel with BPF and kprobes"
-HOMEPAGE="https://github.com/iovisor/ply"
-SRC_URI="https://github.com/iovisor/ply/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/iovisor/ply/commit/1bc183af8703023e377f92716ecd3f339ffffd11.patch -> ${P}-arm-build-fix.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc"
-IUSE="static-libs"
-# Bug 733248 file collisions with sys-boot/plymouth:
-# /usr/lib64/libply.la
-# /usr/lib64/libply.so
-RDEPEND="!sys-boot/plymouth"
-DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~HAVE_EBPF_JIT ~BPF_EVENTS"
-
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i "/^AC_INIT/c\AC_INIT(${PN}, ${PV}," configure.ac || die
-	eapply "${DISTDIR}/${P}-arm-build-fix.patch"
-	eapply_user
-	eautoreconf
-}
-
-src_install() {
-	default
-	rm -f "${ED}/usr/share/doc/${P}/COPYING"
-
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.a' -delete || die
-		find "${ED}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-util/ply/ply-2.2.0.ebuild b/dev-util/ply/ply-2.2.0.ebuild
deleted file mode 100644
index 5734efa8d475..000000000000
--- a/dev-util/ply/ply-2.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-DESCRIPTION="Dynamic instrumentation of the Linux kernel with BPF and kprobes"
-HOMEPAGE="https://github.com/iovisor/ply"
-SRC_URI="https://github.com/iovisor/ply/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/iovisor/ply/commit/1bc183af8703023e377f92716ecd3f339ffffd11.patch -> ${P}-arm-build-fix.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
-IUSE="static-libs"
-# Bug 733248 file collisions with sys-boot/plymouth:
-# /usr/lib64/libply.la
-# /usr/lib64/libply.so
-RDEPEND="!sys-boot/plymouth"
-DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~HAVE_EBPF_JIT ~BPF_EVENTS"
-
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i "/^AC_INIT/c\AC_INIT(${PN}, ${PV}," configure.ac || die
-
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	rm -f "${ED}/usr/share/doc/${P}/COPYING"
-
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.a' -delete || die
-		find "${ED}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index 0ae88066404f..951e541b3562 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -16,5 +16,6 @@ DIST relx-4.7.0.tar 76288 BLAKE2B 99af942824344a617dc19b771d5db697fd8d8a19776a67
 DIST ssl_verify_fun-1.1.6.tar 14848 BLAKE2B 31f8a92881803b1b93e2f65cf070449cd53af21b50f6aae7a9d036e28c17b2c093b2cb6238279191663ba011aab7fd604af8366ed8ae91b7b1d7c333f9de9ea8 SHA512 65980368629357ec16b37fd8ea1d42f7dbd7fa86318b329bec756e868b70eb4c93cf1bfe3dd34e1b6c011086ba32e11981d61e18fdad78564b77664e4d155a47
 EBUILD rebar-2.6.4-r1.ebuild 671 BLAKE2B e2634bb01418f81f97c9d30a91083efb2ed87416b7e42a48e83acd5f07956ce14e8fed23f782bbba6437139da730c2cdabe7d0c523a447966b43c6e2dabf8033 SHA512 95cd7d605d4a3fe6940be8fe90d42db7b413bd0b1983a4ed44cd511308244e64e88d49a70306c9262556a1717402c41e42849c7420f1e958dfc300ce631eb382
 EBUILD rebar-3.19.0.ebuild 2462 BLAKE2B 52b97493bde303b742e274dd294bde9df57a89b4bd4bce81034599e2297a73198373e9588da48fe54dc58e57b3100025a75fb78117c91fa76190a3b8795f8ffe SHA512 93c6921f3d94ebcf7d37f9e4f0d68717cb4e7e7924fac52297f95162940ba4ca8e2160b42cf37139721ad9c51ce63ab9cde1b71ba29491db2c1b409cc5e69c79
+EBUILD rebar-3.20.0-r1.ebuild 1467 BLAKE2B 4431e40b79721f27e5ad2115ceb2613c6c96149dc3a0db1d1b1fbe51a95ce9147e76440359a5b6357bd360eeb1255a4788f5fdb21cc9e4a0f7a5ca4613137eea SHA512 f50c2cdae112c820f099c4ccd0abd6cf86376c4c88ffff6447a4a867521966e8d09d566c4cc35dd33902a205820c927fff7c824f6ac009d042ebf5e4e3a72086
 EBUILD rebar-3.20.0.ebuild 1360 BLAKE2B 1b74606b259767109415f9f8657d77a04d91810ce0bd96176b92dfc6351bd3833e35caae6d4d74dcec1fd7d08a6e54b1f2f6915a1f8efd11ee4b2a32b7aa6527 SHA512 9d4da37362e8c66dc544f0667d14f094e7007c2948362a3d62cb8051cda790ca63441172911a93b5106320e8ceb9b1c8966675c6af55b29155f2e97ca47690a4
 MISC metadata.xml 361 BLAKE2B d58dbad87667d782d0b5d81f0d9166b4e93dc0dea86b7b665acd6463c945949425746085f1a36cc952ad0ca3bcd7acb949a855c2aa57eae8a18bfd16120da1ae SHA512 aa1aae5e0688d6e921d4018714a37f079a333282baff352d7faeef3b1810471be421c99a705b1b97de0cb5c846efb69b3ec4f018033cb56efc307164fb8871c3
diff --git a/dev-util/rebar/rebar-3.20.0-r1.ebuild b/dev-util/rebar/rebar-3.20.0-r1.ebuild
new file mode 100644
index 000000000000..71d819de495b
--- /dev/null
+++ b/dev-util/rebar/rebar-3.20.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2022-2023 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 )"
+
+RDEPEND="
+	dev-lang/erlang[ssl]
+	!dev-util/rebar-bin
+"
+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}
+}