From 265dbe5dbc14c199299496c6db8fce3f76647015 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Sep 2018 18:00:10 +0100 Subject: gentoo resync : 21.09.2018 --- dev-lang/python-exec/Manifest | 4 +- dev-lang/python-exec/python-exec-2.4.5.ebuild | 134 -------------------------- dev-lang/python-exec/python-exec-2.4.6.ebuild | 2 +- 3 files changed, 2 insertions(+), 138 deletions(-) delete mode 100644 dev-lang/python-exec/python-exec-2.4.5.ebuild (limited to 'dev-lang/python-exec') diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest index 5f0d3e03f02f..adf282797a45 100644 --- a/dev-lang/python-exec/Manifest +++ b/dev-lang/python-exec/Manifest @@ -1,6 +1,4 @@ -DIST python-exec-2.4.5.tar.bz2 87137 BLAKE2B 2434bee0bcc64a78a83254d6b6f733ef0748d8209ff70654fc57ac50563d4f32be64705a3c56eefef4e173a238b272d00bef4929982a729a097b82a3a2b0b5b1 SHA512 8c1a520c565afa775cad0e8b88248b688814664e588f683fc2b2c039ee0494b168ebd3cd1042b8b7fe2583f287cf55b22ea0585bfb43efe2f8450d809cde0b21 DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050 -EBUILD python-exec-2.4.5.ebuild 4432 BLAKE2B 20e9cbc579b76b1927e8aa724c9429143645e92197a375f6fa477a7361d7e6105974d092694f0819df9715497724d005a593a736028a13bc91be01a1abc80db2 SHA512 f4311b291bd81d5dfb6729fc83ea1ea41a648aef281572e37e7cc9c188fc5493bbfd383b8cd9ef4108a67da48e2edc5b3be0fd954ae12eceabf8eb29d548be8f -EBUILD python-exec-2.4.6.ebuild 4410 BLAKE2B 8e826cadea6763f2014f309c85ff58d863e2da2a53726f2ff5ae6ee6c9fc8628cbd52a263456b8466ccaa2a556312caffaefadeb889e7352bf035cd02a3d6ab4 SHA512 7b200055ed09111429290362fd057fa0048e5997fc7ea3ffd7353c060c50cee13ff1570e89f89fea4dd69414a57783e3c67fa2979dd8ec7e2728758125a0cfc2 +EBUILD python-exec-2.4.6.ebuild 4406 BLAKE2B c709b8c9dde57edd58580dbd5b2ce4c596a6dd6b658b982da8bbeab2ccffc4cd89d6c2e3c08c04a98d9dadd29abfbf04b68138618854c7d14ceafc99622fcdde SHA512 4126268d9e19e15da7dfaf43b0ec0d025609e7de8aa7e7b1564f9bb03cb956936d5bb8a0e123c46d61385be79735504ab4e212619c45f1ce0ce202c0040a1e81 EBUILD python-exec-9999.ebuild 4208 BLAKE2B 20da448b11bce30dff44880e4007ca0435d962e33b528840e37341f34685d7732c9a66d633c5a66722718b4e9b49be181cd0e0eaa6a1fd99ad32ac938c88ccca SHA512 f18578c6241455ffe215d0cc841b0bbf0b7e453b44d3de661496106c628f833b7b98fdd65545951122145138bf18c32527131d490158e77b9bce308b30316479 MISC metadata.xml 589 BLAKE2B 7f9fa9750915db8b546b52a560a7fd8d9a63c4f310e423ebdc0508fe9b14363001b30f3c3db26f6d05eec8a44176d62a9335153dff2d55a41a31d3b428cc9ca6 SHA512 2ac0223af0a2cf95d2b18ef415eadb325af0094e4ec361a414b0d68b203dc1c937d3d680af96bdad1e8a48cb5786683bdbbd451f47a0f3a777c075e1690ccf7a diff --git a/dev-lang/python-exec/python-exec-2.4.5.ebuild b/dev-lang/python-exec/python-exec-2.4.5.ebuild deleted file mode 100644 index dd4f7d0d004e..000000000000 --- a/dev-lang/python-exec/python-exec-2.4.5.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# 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 python-r1 - -DESCRIPTION="Python script wrapper" -HOMEPAGE="https://github.com/mgorny/python-exec/" -SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2" - -LICENSE="BSD-2" -SLOT="2" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 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" -IUSE="" - -# eselect-python because of /usr/bin/python* collisions and new config -# python versions because of missing $scriptdir/python* symlinks -RDEPEND=" - ! "${T}"/python-exec.conf || die - insinto /etc/python-exec - doins "${T}"/python-exec.conf - - local f - for f in python{,2,3}; do - # symlink the C wrapper for python to avoid shebang recursion - # bug #568974 - dosym python-exec2c /usr/bin/"${f}" - done - for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do - # those are python scripts (except for new python-configs) - # so symlink them via the python wrapper - dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}" - done -} - -pkg_preinst() { - 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 - else - # preserve previous Python version preference - local py old_pythons=() - local config_base=${EROOT}etc/env.d/python - - # start with the 'global' preference (2 vs 3) - if [[ -f ${config_base}/config ]]; then - old_pythons+=( "$(<${config_base}/config)" ) - fi - - # then try specific py3 selection - for py in 3; do - local target= - - if [[ -f ${config_base}/python${py} ]]; then - # try the newer config files - target=$(<${config_base}/python${py}) - elif [[ -L ${EROOT}/usr/bin/python${py} ]]; then - # check the older symlink format - target=$(readlink "${EROOT}/usr/bin/python${py}") - - # check if it's actually old eselect symlink - [[ ${target} == python?.? ]] || target= - fi - - # add the extra target if found and != global - if [[ ${target} && ${old_pythons[0]} != ${target} ]]; then - old_pythons+=( "${target}" ) - fi - done - - if [[ ${old_pythons[@]} ]]; then - elog "You seem to have just upgraded into the new version of python-exec" - elog "that uses python-exec.conf for configuration. The ebuild has attempted" - elog "to convert your previous configuration to the new format, resulting" - elog "in the following preferences (most preferred version first):" - elog - for py in "${old_pythons[@]}"; do - elog " ${py}" - done - elog - elog "Those interpreters will be preferred when running Python scripts or" - elog "calling wrapped Python executables (python, python2, pydoc...)." - elog "If none of the preferred interpreters are supported, python-exec will" - elog "fall back to the newest supported Python version." - elog - elog "Please note that due to the ambiguous character of the old settings," - 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 - 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 - fi - fi -} diff --git a/dev-lang/python-exec/python-exec-2.4.6.ebuild b/dev-lang/python-exec/python-exec-2.4.6.ebuild index e32c5338d784..110ace50c3b8 100644 --- a/dev-lang/python-exec/python-exec-2.4.6.ebuild +++ b/dev-lang/python-exec/python-exec-2.4.6.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar LICENSE="BSD-2" SLOT="2" -KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~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" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 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" IUSE="" # eselect-python because of /usr/bin/python* collisions and new config -- cgit v1.2.3