dev-lang/python: Replace python3.x executables with symlinks

Replace python3.X executables (duplicate to python3.Xm) installed by
the build system with symlinks to the ABIFLAGS-enabled variants.

diff --git a/dev-lang/python/python-3.3.5-r3.ebuild b/dev-lang/python/python-3.3.5-r3.ebuild
index d4b6b034e09cc88b4d4027cfba4705a7dbe51588..7164d5a178ee855885da352f7812b5f30f9b713f 100644 (file)
--- a/dev-lang/python/python-3.3.5-r3.ebuild
+++ b/dev-lang/python/python-3.3.5-r3.ebuild
@@ -252,6 +252,14 @@ src_install() {
        # Fix collisions between different slots of Python.
        rm -f "${ED}usr/$(get_libdir)/libpython3.so"
 
+       # Cheap hack to get version with ABIFLAGS
+       local abiver=$(cd "${ED}usr/include"; echo python*)
+       # Replace python3.X with a symlink if appropriate
+       if [[ ${abiver} != python${SLOT} ]]; then
+               rm "${ED}usr/bin/python${SLOT}" || die
+               dosym "${abiver}" "/usr/bin/python${SLOT}"
+       fi
+
        if use build; then
                rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
        else

diff --git a/dev-lang/python/python-3.4.3-r3.ebuild b/dev-lang/python/python-3.4.3-r3.ebuild
index b2b09ced1a331332c8d5349074003f7efc206241..53c39a05aadf96127d8cd824a8d33f64ce2588db 100644 (file)
--- a/dev-lang/python/python-3.4.3-r3.ebuild
+++ b/dev-lang/python/python-3.4.3-r3.ebuild
@@ -237,6 +237,14 @@ src_install() {
        # Fix collisions between different slots of Python.
        rm -f "${ED}usr/$(get_libdir)/libpython3.so"
 
+       # Cheap hack to get version with ABIFLAGS
+       local abiver=$(cd "${ED}usr/include"; echo python*)
+       # Replace python3.X with a symlink if appropriate
+       if [[ ${abiver} != python${SLOT} ]]; then
+               rm "${ED}usr/bin/python${SLOT}" || die
+               dosym "${abiver}" "/usr/bin/python${SLOT}"
+       fi
+
                use elibc_uclibc && rm -fr "${libdir}/test"
                use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
                use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}

diff --git a/dev-lang/python/python-3.5.0-r2.ebuild b/dev-lang/python/python-3.5.0-r2.ebuild
index 4029ec363128838d69b4a836f4996f59e6433e41..34ac46e1439494274fc0aa55bca57c7c4a707ddd 100644 (file)
--- a/dev-lang/python/python-3.5.0-r2.ebuild
+++ b/dev-lang/python/python-3.5.0-r2.ebuild
@@ -243,6 +243,14 @@ src_install() {
        # Fix collisions between different slots of Python.
        rm -f "${ED}usr/$(get_libdir)/libpython3.so"
 
+       # Cheap hack to get version with ABIFLAGS
+       local abiver=$(cd "${ED}usr/include"; echo python*)
+       # Replace python3.X with a symlink if appropriate
+       if [[ ${abiver} != python${SLOT} ]]; then
+               rm "${ED}usr/bin/python${SLOT}" || die
+               dosym "${abiver}" "/usr/bin/python${SLOT}"
+       fi
+
        use elibc_uclibc && rm -fr "${libdir}/test"
        use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
        use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}