Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-util/redo
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/redo')
-rw-r--r--dev-util/redo/Manifest3
-rw-r--r--dev-util/redo/metadata.xml13
-rw-r--r--dev-util/redo/redo-0.42c.ebuild57
-rw-r--r--dev-util/redo/redo-0.42d.ebuild (renamed from dev-util/redo/redo-0.42a.ebuild)34
-rw-r--r--dev-util/redo/redo-99999.ebuild56
5 files changed, 26 insertions, 137 deletions
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index 905689146e67..d15292a95fda 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,2 +1 @@
-DIST redo-0.42a.tar.gz 195053 BLAKE2B 3e84e961eeb66396d5d5aa8a3f05f10d4000089d12c36bd8e061c163e050b9bc125cd8dcc5987c9f3b25e2b8803ff7c34d48a173ab91fc4a3e9fd63c114adc8a SHA512 8473bd8168c8e70b59a573560f8f725c8538061ee15eabeb63e467a363fa6869aa8088e8ce324726da4e2f7115e2ddf72cbb657703e9090f4f93c05f42bb67cb
-DIST redo-0.42c.tar.gz 195232 BLAKE2B b24969d71b247d02642340cebbf325e2ae68d4893d02e489930120e6aac76bd3099fd42e7dc36dae1fdea5c7825657957291876b906c2671a6319f8eb45a9d91 SHA512 3196ff5941d9e62084c7332a6771edd0db0082a499ba16fb6de273295c65b734e7dadb29a9fca3e6266421bc964369a8e725ef55f59ade2ecfb5e8bcc446ced0
+DIST redo-0.42d.tar.gz 195186 BLAKE2B 2f36dc8380d9e20475788b8d94ce02d6375ddf0a0e745dc68b7e350c427522088243bca16bd8d7c760ada17de75560e9cfdf5282a5e39081fee395a142164c82 SHA512 2749a1a1046f8edd63c4b4e2b0f4d95988dfcf8c776b264007914e583fc21ff51447be34ffc2c136c343ace8c38147d6a43c0c0dd01a681b6283a38d5d8f3fb7
diff --git a/dev-util/redo/metadata.xml b/dev-util/redo/metadata.xml
index cb9c806b559d..3e23529439d8 100644
--- a/dev-util/redo/metadata.xml
+++ b/dev-util/redo/metadata.xml
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
-Smaller, easier, more powerful, and more reliable than make. An implementation
-of djb's redo.
-</longdescription>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">apenwarr/redo</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-util/redo/redo-0.42c.ebuild b/dev-util/redo/redo-0.42c.ebuild
deleted file mode 100644
index 47a81ecf2022..000000000000
--- a/dev-util/redo/redo-0.42c.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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-0.42a.ebuild b/dev-util/redo/redo-0.42d.ebuild
index 47a81ecf2022..7a5d85d89fa0 100644
--- a/dev-util/redo/redo-0.42a.ebuild
+++ b/dev-util/redo/redo-0.42d.ebuild
@@ -1,14 +1,16 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="sqlite"
-inherit multilib 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"
@@ -17,35 +19,39 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
BDEPEND="
$(python_gen_cond_dep '
- dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
- dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
')
${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 eb551f91c49d..000000000000
--- a/dev-util/redo/redo-99999.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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 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"
-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/beautifulsoup[${PYTHON_MULTI_USEDEP}]
- dev-python/markdown[${PYTHON_MULTI_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
-}