[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-python/

[Michał Górny]

commit:     f28f2e793b1639b91e2e47ba50886bf25d0d28d6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 12:35:51 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 12:37:03 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f28f2e79

app-eselect/eselect-python: Replace python{,2,3} symlinks with files

Copy python-exec script to /usr/bin/python{,2,3} rather than symlinking
it because a lot of Python scripts like to readlink(sys.executable) and
don't expect to find python-exec in there...

 ...ct-python-20151117.ebuild => eselect-python-20151117-r1.ebuild} | 7 ++++++-
 app-eselect/eselect-python/eselect-python-99999999.ebuild          | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app-eselect/eselect-python/eselect-python-20151117.ebuild b/app-eselect/eselect-python/eselect-python-20151117-r1.ebuild
similarity index 89%
rename from app-eselect/eselect-python/eselect-python-20151117.ebuild
rename to app-eselect/eselect-python/eselect-python-20151117-r1.ebuild
index f78b25f..7fb2788 100644
--- a/app-eselect/eselect-python/eselect-python-20151117.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20151117-r1.ebuild
@@ -35,7 +35,12 @@ src_install() {
 	emake DESTDIR="${D}" install || die
 
 	local f
-	for f in python{,2,3}{,-config} 2to3 pydoc pyvenv; do
+	for f in python{,2,3}; do
+		# can't use symlinks here since random stuff
+		# loves to do readlink on sys.executable...
+		newbin "${EPREFIX}/usr/lib/python-exec/python-exec2" "${f}"
+	done
+	for f in python{,2,3}-config 2to3 pydoc pyvenv; do
 		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
 	done
 }

diff --git a/app-eselect/eselect-python/eselect-python-99999999.ebuild b/app-eselect/eselect-python/eselect-python-99999999.ebuild
index f78b25f..7fb2788 100644
--- a/app-eselect/eselect-python/eselect-python-99999999.ebuild
+++ b/app-eselect/eselect-python/eselect-python-99999999.ebuild
@@ -35,7 +35,12 @@ src_install() {
 	emake DESTDIR="${D}" install || die
 
 	local f
-	for f in python{,2,3}{,-config} 2to3 pydoc pyvenv; do
+	for f in python{,2,3}; do
+		# can't use symlinks here since random stuff
+		# loves to do readlink on sys.executable...
+		newbin "${EPREFIX}/usr/lib/python-exec/python-exec2" "${f}"
+	done
+	for f in python{,2,3}-config 2to3 pydoc pyvenv; do
 		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
 	done
 }