From 36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Sep 2019 17:49:31 +0100 Subject: Revert "gentoo resync : 13.09.2019" This reverts commit a1392efe64137262023d92492396ca9156d22396. --- dev-lang/python-exec/python-exec-9999.ebuild | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) (limited to 'dev-lang/python-exec/python-exec-9999.ebuild') diff --git a/dev-lang/python-exec/python-exec-9999.ebuild b/dev-lang/python-exec/python-exec-9999.ebuild index b37d3e0c3b6f..f5c7a17a180b 100644 --- a/dev-lang/python-exec/python-exec-9999.ebuild +++ b/dev-lang/python-exec/python-exec-9999.ebuild @@ -33,10 +33,8 @@ src_prepare() { src_configure() { local pyimpls=() i EPYTHON for i in "${_PYTHON_ALL_IMPLS[@]}"; do - if use "python_targets_${i}"; then - python_export "${i}" EPYTHON - pyimpls+=( "${EPYTHON}" ) - fi + python_export "${i}" EPYTHON + pyimpls+=( "${EPYTHON}" ) done local myconf=( @@ -55,29 +53,13 @@ src_install() { newins - python-exec.conf \ < <(sed -n -e '/^#/p' config/python-exec.conf.example) - local programs=( python ) - local scripts=( python-config 2to3 idle pydoc pyvenv ) - local i - for i in "${_PYTHON_ALL_IMPLS[@]}"; do - if use "python_targets_${i}"; then - # NB: duplicate entries are harmless - if python_is_python3 "${i}"; then - programs+=( python3 ) - scripts+=( python3-config ) - else - programs+=( python2 ) - scripts+=( python2-config ) - fi - fi - done - local f - for f in "${programs[@]}"; do + 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 "${scripts[@]}"; do + 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}" -- cgit v1.2.3