gentoo resync : 29.12.2022

3 files changed, 19 insertions, 70 deletions

diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index 81abdf0ca938..b212e8b6c164 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,4 +1,3 @@
-DIST redo-0.42c.tar.gz 195232 BLAKE2B b24969d71b247d02642340cebbf325e2ae68d4893d02e489930120e6aac76bd3099fd42e7dc36dae1fdea5c7825657957291876b906c2671a6319f8eb45a9d91 SHA512 3196ff5941d9e62084c7332a6771edd0db0082a499ba16fb6de273295c65b734e7dadb29a9fca3e6266421bc964369a8e725ef55f59ade2ecfb5e8bcc446ced0
-EBUILD redo-0.42c.ebuild 1187 BLAKE2B bea4c700e0d4afc0d8f51407e4a109cb32514cbb0731783410e5c8f22543a436f5e8d15126512a485e7d54e50b3f0f840c36aba2193f246e9f878cd33b41bff3 SHA512 f2afbbc16d676fd40e2756e646050cf17d34926bda7f937c4b231db7a08b8ce68e2ec0a16eb71d78168c625b3a06d3333a3a8ff47d42d742efc5398fc02485bd
-EBUILD redo-99999.ebuild 1139 BLAKE2B 717a33d6db4707f505c7d547cf2e6f8e1c25b4c23e6e6e1af1e184c2ef6e38f4d8f391ee4f1ab99209c5127af228240631ed80f9a00f395ac69798d83c456f60 SHA512 d8b70be4b2c3bfd1fa9efa8108e1aea30895f17b3da4c46411ce62cf43128b7642c453bf1ddab57c37eed789172ec0033ed534a7e8308bb245005624d9a79b89
+DIST redo-0.42d.tar.gz 195186 BLAKE2B 2f36dc8380d9e20475788b8d94ce02d6375ddf0a0e745dc68b7e350c427522088243bca16bd8d7c760ada17de75560e9cfdf5282a5e39081fee395a142164c82 SHA512 2749a1a1046f8edd63c4b4e2b0f4d95988dfcf8c776b264007914e583fc21ff51447be34ffc2c136c343ace8c38147d6a43c0c0dd01a681b6283a38d5d8f3fb7
+EBUILD redo-0.42d.ebuild 1304 BLAKE2B 93321ea9abcb006ffaa4f51815b3c63004a09bd8e1a5b3a6a8bad5b1bc9494de0056b28d66f1119a118bc4aa0156cbccf3aba024042f4fa4e881d0ba7abe04fe SHA512 bb7119a4bd214612aee08e5384b131e32edab2481395a242d79b6d35e4834bd311efa761dcffdf335b6aba84b4dc65a1dbbc91000ec04224fdcf9c4e13b75551
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-util/redo/redo-0.42c.ebuild b/dev-util/redo/redo-0.42d.ebuild
index e35d391bae31..3eb879fff843 100644
--- a/dev-util/redo/redo-0.42c.ebuild
+++ b/dev-util/redo/redo-0.42d.ebuild
@@ -1,14 +1,16 @@
 # Copyright 2018-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_8 )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="sqlite"
-inherit multiprocessing python-utils-r1 python-single-r1
+inherit edo multiprocessing python-single-r1
 
 DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
 HOMEPAGE="https://github.com/apenwarr/redo"
 SRC_URI="https://github.com/apenwarr/redo/archive/${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${P}
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -22,30 +24,34 @@ BDEPEND="
 	')
 	${PYTHON_DEPS}
 "
-RDEPEND="
-	${BDEPEND}
-"
-S=${WORKDIR}/${PN}-${P}
+RDEPEND="${BDEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i -e "s:which:command -v:" redo/sh.do || die
+	sed -i "1s;^;#!${PYTHON}\n;" docs/md2man.py || die
+}
 
 src_configure() {
 	echo ${PYTHON} > redo/whichpython || die
 }
 
 src_compile() {
-	./do -j$(makeopts_jobs) build || die
+	edo ./do -j$(makeopts_jobs) build
 }
 
 src_test() {
 	local ARCH= CFLAGS= CXXFLAGS= LDFLAGS=
-	./do -j$(makeopts_jobs) test || die
+	edo ./do -j$(makeopts_jobs) test
 }
 
 src_install() {
 	DESTDIR="${D}" \
 	DOCDIR="${D}/usr/share/doc/${PF}" \
 	LIBDIR="${D}/$(python_get_sitedir)/${PN}" \
-	./do -j$(makeopts_jobs) \
-		install || die
+	edo ./do -j$(makeopts_jobs) \
+		install
 
 	python_fix_shebang "${D}"
 
diff --git a/dev-util/redo/redo-99999.ebuild b/dev-util/redo/redo-99999.ebuild
deleted file mode 100644
index 954705061ace..000000000000
--- a/dev-util/redo/redo-99999.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_8 )
-PYTHON_REQ_USE="sqlite"
-inherit git-r3 multiprocessing python-utils-r1 python-single-r1
-
-DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
-HOMEPAGE="https://github.com/apenwarr/redo"
-EGIT_REPO_URI="https://github.com/apenwarr/redo"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	${BDEPEND}
-"
-
-src_configure() {
-	echo ${PYTHON} > redo/whichpython || die
-}
-
-src_compile() {
-	./do -j$(makeopts_jobs) build || die
-}
-
-src_test() {
-	local ARCH= CFLAGS= CXXFLAGS= LDFLAGS=
-	./do -j$(makeopts_jobs) test || die
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	DOCDIR="${D}/usr/share/doc/${PF}" \
-	LIBDIR="${D}/$(python_get_sitedir)/${PN}" \
-	./do -j$(makeopts_jobs) \
-		install || die
-
-	python_fix_shebang "${D}"
-
-	sed -i \
-		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
-		"${D}"/usr/bin/* || die
-
-	python_optimize
-}