From 71deace00d1a2b091313fe137ab7092418c6f87c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Feb 2020 21:05:55 +0000 Subject: gentoo resync : 10.02.2020 --- dev-util/redo/Manifest | 4 ++-- dev-util/redo/redo-0.42-r1.ebuild | 50 +++++++++++++++++++++++++++++++++++++++ dev-util/redo/redo-0.42.ebuild | 48 ------------------------------------- dev-util/redo/redo-99999.ebuild | 8 ++++--- 4 files changed, 57 insertions(+), 53 deletions(-) create mode 100644 dev-util/redo/redo-0.42-r1.ebuild delete mode 100644 dev-util/redo/redo-0.42.ebuild (limited to 'dev-util/redo') diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest index 08cc36b33c69..8bf61463945f 100644 --- a/dev-util/redo/Manifest +++ b/dev-util/redo/Manifest @@ -1,4 +1,4 @@ DIST redo-0.42.tar.gz 194344 BLAKE2B ce17ba2bc8b6a074bfc5cae58cc99c1c41b2e8bab93a10f29d1178cb2071bd68ef5528529c320ee55063a4e3bce83705b486bc92992a9c0c18b65e7fec76fde5 SHA512 41b8417136f98d12edf3c62f027f2459ae3fb92f6c5464553d79c3a52344de57220a5c64b565118da0a99c1544eaa153a468ffcdcfbf7193c76c896bcd40e900 -EBUILD redo-0.42.ebuild 1021 BLAKE2B 20de212a0cfefd413028c3492235a074366971c9680b2ec2b01381531ba3a2fad44f0a38f0404329ab08442ca950c1a5d427251727785ebb65d75280b052727f SHA512 bae98a58189cba6452a5cbe59d5b3a40b50b229cb01830ca97da4e43a2d5029cf4969b9f1d5db1d09138226e8b92ea9bed40872f890c9525ebc1a7e05b755a7d -EBUILD redo-99999.ebuild 1013 BLAKE2B a9ca19da5f94f366d48a048d85f37028ac557ad8a2477ff3198c25ce1ffcb4a0202d55ea1cef1d087c77cdd61148b126b365b789d0f7c041d516c146e935a0de SHA512 c01c16ed861d3829d070b5663dc4f35728d0f4b4ca89b7becae0e3423a9a87e221cb8a3a2e36f03c5f81c2108acdc489f988fa6879dea1fc3bf7ad02136474e9 +EBUILD redo-0.42-r1.ebuild 1064 BLAKE2B 76ac6a5c76fe9b73695bea9b523fbccee16de07cf77eecff673dd1d770449c6acea9b8e62bf7e3ce34fe0a0adf6b13dac8dd2bf9fcc9da647dba28ab263849ac SHA512 8f03fa82a0b69cf564e29632f5faa223f469414ad6ae1ede6e35f80e4ca700d72b17712e8a232d4700d1602b94a3ff03c69672d1455c0af0d3b04251d02d7454 +EBUILD redo-99999.ebuild 1056 BLAKE2B b40c139b4c3bc20d687392e83bd089acbab56ffc82219a26621b9594b45fd21d38bd747366f390d955852c92b20d2949b5f355142cf0777322866e92729da521 SHA512 1057760528dd118e5ac10d26c7b3fb10e9bba98163b37d256b361ed3c975b4c5475d331813612ff171cad124b8e402e9707bb26018afd6211aed04c4f7a6b236 MISC metadata.xml 351 BLAKE2B 4093a6abf023ec3d67b11cc94ed6ae14d735ae51748f05ed328f64c44885ba68b72927b4601503ce4d20747f34bdeff17adfa9514c6259c9590609cdcee85128 SHA512 38a2902d3f8370fe111c11b4622250c5c76b2f3d03eca795b0d2ceaec0679fec274b98cf2df726559469844c18de00ac84eed6b391992d1b5aec88ff51ec96b9 diff --git a/dev-util/redo/redo-0.42-r1.ebuild b/dev-util/redo/redo-0.42-r1.ebuild new file mode 100644 index 000000000000..ea14d07a6f6a --- /dev/null +++ b/dev-util/redo/redo-0.42-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 2018-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" +inherit multilib 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" + +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_compile() { + ./do -j$(makeopts_jobs) build || die +} + +src_test() { + ./do -j$(makeopts_jobs) test || die +} + +src_install() { + DESTDIR="${D}" \ + DOCDIR="${D}/usr/share/doc/${PF}" \ + LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ + ./do -j$(makeopts_jobs) \ + install || die + + python_fix_shebang "${D}" + + sed -i \ + -e 's|/lib/|/'"$(get_libdir)"'/|g' \ + "${D}"/usr/bin/* || die +} diff --git a/dev-util/redo/redo-0.42.ebuild b/dev-util/redo/redo-0.42.ebuild deleted file mode 100644 index 17098dc04661..000000000000 --- a/dev-util/redo/redo-0.42.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2018-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" -inherit multilib 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" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -BDEPEND=" - dev-python/beautifulsoup[${PYTHON_USEDEP}] - dev-python/markdown[${PYTHON_USEDEP}] - ${PYTHON_DEPS} -" -RDEPEND=" - ${BDEPEND} -" -S=${WORKDIR}/${PN}-${P} - -src_compile() { - ./do -j$(makeopts_jobs) build || die -} - -src_test() { - ./do -j$(makeopts_jobs) test || die -} - -src_install() { - DESTDIR="${D}" \ - DOCDIR="${D}/usr/share/doc/${PF}" \ - LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ - ./do -j$(makeopts_jobs) \ - install || die - - python_fix_shebang "${D}" - - sed -i \ - -e 's|/lib/|/'"$(get_libdir)"'/|g' \ - "${D}"/usr/bin/* || die -} diff --git a/dev-util/redo/redo-99999.ebuild b/dev-util/redo/redo-99999.ebuild index 57197b9f75d3..6e92129f9b4a 100644 --- a/dev-util/redo/redo-99999.ebuild +++ b/dev-util/redo/redo-99999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018-2019 Gentoo Authors +# Copyright 2018-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,8 +16,10 @@ KEYWORDS="" REQUIRED_USE=${PYTHON_REQUIRED_USE} BDEPEND=" - dev-python/beautifulsoup[${PYTHON_USEDEP}] - dev-python/markdown[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}] + dev-python/markdown[${PYTHON_MULTI_USEDEP}] + ') ${PYTHON_DEPS} " RDEPEND=" -- cgit v1.2.3