gentoo Easter resync : 12.04.2020

3 files changed, 70 insertions, 5 deletions

diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index 8bf61463945f..051f63c47d0f 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,4 +1,6 @@
 DIST redo-0.42.tar.gz 194344 BLAKE2B ce17ba2bc8b6a074bfc5cae58cc99c1c41b2e8bab93a10f29d1178cb2071bd68ef5528529c320ee55063a4e3bce83705b486bc92992a9c0c18b65e7fec76fde5 SHA512 41b8417136f98d12edf3c62f027f2459ae3fb92f6c5464553d79c3a52344de57220a5c64b565118da0a99c1544eaa153a468ffcdcfbf7193c76c896bcd40e900
+DIST redo-0.42a.tar.gz 195053 BLAKE2B 3e84e961eeb66396d5d5aa8a3f05f10d4000089d12c36bd8e061c163e050b9bc125cd8dcc5987c9f3b25e2b8803ff7c34d48a173ab91fc4a3e9fd63c114adc8a SHA512 8473bd8168c8e70b59a573560f8f725c8538061ee15eabeb63e467a363fa6869aa8088e8ce324726da4e2f7115e2ddf72cbb657703e9090f4f93c05f42bb67cb
 EBUILD redo-0.42-r1.ebuild 1064 BLAKE2B 76ac6a5c76fe9b73695bea9b523fbccee16de07cf77eecff673dd1d770449c6acea9b8e62bf7e3ce34fe0a0adf6b13dac8dd2bf9fcc9da647dba28ab263849ac SHA512 8f03fa82a0b69cf564e29632f5faa223f469414ad6ae1ede6e35f80e4ca700d72b17712e8a232d4700d1602b94a3ff03c69672d1455c0af0d3b04251d02d7454
-EBUILD redo-99999.ebuild 1056 BLAKE2B b40c139b4c3bc20d687392e83bd089acbab56ffc82219a26621b9594b45fd21d38bd747366f390d955852c92b20d2949b5f355142cf0777322866e92729da521 SHA512 1057760528dd118e5ac10d26c7b3fb10e9bba98163b37d256b361ed3c975b4c5475d331813612ff171cad124b8e402e9707bb26018afd6211aed04c4f7a6b236
+EBUILD redo-0.42a.ebuild 1213 BLAKE2B c6d164192bb11fc89a85285e7ebfbd6b665be255ae93e66866fded161077350b6f2dd69c84ae8779bf4f1bb991d654b92bd7bc99753a1f9849a1c8723aa6e67b SHA512 a455891117bdd88c6bfca6952ffb13ebc27d7fe5a52d437356b1540a57e9dec0b54ae7fbdb50f86c305a280e10c9b2dc714011bf8780583dbf4d3c72f1dcae5a
+EBUILD redo-99999.ebuild 1165 BLAKE2B 39a1599939c4273cd1fa0c7541c55c02667932f7c68787abd10be5379ced05c860ffb9f2e2d2b298321b61c98e2e7aac7bb4144ddcc1c6f6e43aaa8076aac8f2 SHA512 a13fb769e4ddc7ad348e5063b9042c638ee6b37fcc0a48e91c3452923bac0ec4f5db744c096a454fc8f71b3fcdf5aed6067d307a2727eb98b58f7d0f6c297356
 MISC metadata.xml 351 BLAKE2B 4093a6abf023ec3d67b11cc94ed6ae14d735ae51748f05ed328f64c44885ba68b72927b4601503ce4d20747f34bdeff17adfa9514c6259c9590609cdcee85128 SHA512 38a2902d3f8370fe111c11b4622250c5c76b2f3d03eca795b0d2ceaec0679fec274b98cf2df726559469844c18de00ac84eed6b391992d1b5aec88ff51ec96b9
diff --git a/dev-util/redo/redo-0.42a.ebuild b/dev-util/redo/redo-0.42a.ebuild
new file mode 100644
index 000000000000..47a81ecf2022
--- /dev/null
+++ b/dev-util/redo/redo-0.42a.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+inherit multilib multiprocessing python-utils-r1 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"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+	')
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${BDEPEND}
+"
+S=${WORKDIR}/${PN}-${P}
+
+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
+}
diff --git a/dev-util/redo/redo-99999.ebuild b/dev-util/redo/redo-99999.ebuild
index 6e92129f9b4a..eb551f91c49d 100644
--- a/dev-util/redo/redo-99999.ebuild
+++ b/dev-util/redo/redo-99999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
-inherit git-r3 multilib multiprocessing python-single-r1
+inherit git-r3 multilib multiprocessing python-utils-r1 python-single-r1
 
 DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
 HOMEPAGE="https://github.com/apenwarr/redo"
@@ -13,7 +13,7 @@ EGIT_REPO_URI="https://github.com/apenwarr/redo"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	$(python_gen_cond_dep '
@@ -26,6 +26,10 @@ RDEPEND="
 	${BDEPEND}
 "
 
+src_configure() {
+	echo ${PYTHON} > redo/whichpython || die
+}
+
 src_compile() {
 	./do -j$(makeopts_jobs) build || die
 }
@@ -38,7 +42,7 @@ src_test() {
 src_install() {
 	DESTDIR="${D}" \
 	DOCDIR="${D}/usr/share/doc/${PF}" \
-	LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+	LIBDIR="${D}/$(python_get_sitedir)/${PN}" \
 	./do -j$(makeopts_jobs) \
 		install || die
 
@@ -47,4 +51,6 @@ src_install() {
 	sed -i \
 		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
 		"${D}"/usr/bin/* || die
+
+	python_optimize
 }