From fc637fb28da700da71ec2064d65ca5a7a31b9c6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Aug 2019 18:16:17 +0100 Subject: gentoo resync : 18.08.2019 --- dev-lang/python-exec/Manifest | 3 +- dev-lang/python-exec/python-exec-2.4.6-r1.ebuild | 128 +++++++++++++++++++++++ dev-lang/python-exec/python-exec-9999.ebuild | 29 +++-- 3 files changed, 142 insertions(+), 18 deletions(-) create mode 100644 dev-lang/python-exec/python-exec-2.4.6-r1.ebuild (limited to 'dev-lang/python-exec') diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest index f9ad98faabb9..766f95957137 100644 --- a/dev-lang/python-exec/Manifest +++ b/dev-lang/python-exec/Manifest @@ -1,4 +1,5 @@ DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050 +EBUILD python-exec-2.4.6-r1.ebuild 4312 BLAKE2B 7fea7d02a9d4621717a700ede8b4e01ed99186675844d5d61e02ee35e64f33ce668a32f99c4bfac4ac8ab61b22bc8ce8efe485597f5ede70f27240814f38a69a SHA512 dce24155e8aa576cc1a5082a4ea508242762d5e961a03ae3bcafd7ad311a50d9e606d733c7d4a9d69053d5b5bada7216210b053b9f39f4cdd49a6e0c2ed4ebdf EBUILD python-exec-2.4.6.ebuild 4410 BLAKE2B f1c24ea633225370dc1390cd56861c230d28fa55f3bbf5a8588d7cd26e45bdc17a1edd163f0d6b5b01de9b8d98342013b456a5d2f9e4498fdf031cc222c76b44 SHA512 8ca031a55c23587a8129b25afcfb5bfccf2016d7bfa7dbd70bdf47d752d80d80f0edfb62aa2e811609a220d51211865de1f0a2fb9236f50aaa10110ed4cea83d -EBUILD python-exec-9999.ebuild 4208 BLAKE2B 20da448b11bce30dff44880e4007ca0435d962e33b528840e37341f34685d7732c9a66d633c5a66722718b4e9b49be181cd0e0eaa6a1fd99ad32ac938c88ccca SHA512 f18578c6241455ffe215d0cc841b0bbf0b7e453b44d3de661496106c628f833b7b98fdd65545951122145138bf18c32527131d490158e77b9bce308b30316479 +EBUILD python-exec-9999.ebuild 4101 BLAKE2B c9a38a540fb5548d34bb239d3f23bfd3ce3e8f8eea9e01f9d64a92218bced4e15212e25f12a28ff165a80412d7a62dad08f86f8183704da67dcff6238d6c239f SHA512 a57aa9bd6a88ea62e1f8d6b01a3c25491d4b405eda4de05f64a03575f737493700d73581ee2de2d79f3b3a681532f04433c33748a90dd615010340d44a316277 MISC metadata.xml 589 BLAKE2B 7f9fa9750915db8b546b52a560a7fd8d9a63c4f310e423ebdc0508fe9b14363001b30f3c3db26f6d05eec8a44176d62a9335153dff2d55a41a31d3b428cc9ca6 SHA512 2ac0223af0a2cf95d2b18ef415eadb325af0094e4ec361a414b0d68b203dc1c937d3d680af96bdad1e8a48cb5786683bdbbd451f47a0f3a777c075e1690ccf7a diff --git a/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild new file mode 100644 index 000000000000..427a37c2724a --- /dev/null +++ b/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit python-utils-r1 + +DESCRIPTION="Python script wrapper" +HOMEPAGE="https://github.com/mgorny/python-exec/" +SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="BSD-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# Internal Python project hack. Do not copy it. Ever. +IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}" + +# eselect-python because of /usr/bin/python* collisions and new config +# python versions because of missing $scriptdir/python* symlinks +RDEPEND=" + !> "${ED}"/etc/python-exec/python-exec.conf || die + fi + fi +} diff --git a/dev-lang/python-exec/python-exec-9999.ebuild b/dev-lang/python-exec/python-exec-9999.ebuild index c0f5a62b4d0b..f5c7a17a180b 100644 --- a/dev-lang/python-exec/python-exec-9999.ebuild +++ b/dev-lang/python-exec/python-exec-9999.ebuild @@ -1,15 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -# Kids, don't do this at home! -inherit python-utils-r1 -PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" ) - -# Inherited purely to have PYTHON_TARGET flags which will satisfy USE -# dependencies and trigger necessary rebuilds. -inherit autotools git-r3 python-r1 +inherit autotools git-r3 python-utils-r1 DESCRIPTION="Python script wrapper" HOMEPAGE="https://github.com/mgorny/python-exec/" @@ -19,7 +13,8 @@ EGIT_REPO_URI="https://github.com/mgorny/python-exec.git" LICENSE="BSD-2" SLOT="2" KEYWORDS="" -IUSE="" +# Internal Python project hack. Do not copy it. Ever. +IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}" # eselect-python because of /usr/bin/python* collisions and new config # python versions because of missing $scriptdir/python* symlinks @@ -37,7 +32,7 @@ src_prepare() { src_configure() { local pyimpls=() i EPYTHON - for i in "${PYTHON_COMPAT[@]}"; do + for i in "${_PYTHON_ALL_IMPLS[@]}"; do python_export "${i}" EPYTHON pyimpls+=( "${EPYTHON}" ) done @@ -72,14 +67,14 @@ src_install() { } pkg_preinst() { - if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then + if [[ -e ${EROOT}/etc/python-exec/python-exec.conf ]]; then # preserve current configuration - cp "${EROOT}"etc/python-exec/python-exec.conf \ - "${ED}"etc/python-exec/python-exec.conf || die + cp "${EROOT}"/etc/python-exec/python-exec.conf \ + "${ED}"/etc/python-exec/python-exec.conf || die else # preserve previous Python version preference local py old_pythons=() - local config_base=${EROOT}etc/env.d/python + local config_base=${EROOT}/etc/env.d/python # start with the 'global' preference (2 vs 3) if [[ -f ${config_base}/config ]]; then @@ -126,14 +121,14 @@ pkg_preinst() { elog "you may want to modify the preference list yourself. In order to do so," elog "open the following file in your favorite editor:" elog - elog " ${EROOT}etc/python-exec/python-exec.conf" + elog " ${EROOT}/etc/python-exec/python-exec.conf" elog elog "For more information on the new configuration format, please read" elog "the comment on top of the installed configuration file." local IFS=$'\n' echo "${old_pythons[*]}" \ - >> "${ED}"etc/python-exec/python-exec.conf || die + >> "${ED}"/etc/python-exec/python-exec.conf || die fi fi } -- cgit v1.2.3