projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ad6cfee)
dev-lang/python: Correct SLOT use after subslot introduction
authorMichał Górny <mgorny@gentoo.org>
Wed, 11 Nov 2015 11:42:09 +0000 (12:42 +0100)
committerMichał Górny <mgorny@gentoo.org>
Wed, 11 Nov 2015 11:44:14 +0000 (12:44 +0100)
dev-lang/python/python-3.3.5-r3.ebuild patch | blob | history
dev-lang/python/python-3.4.3-r3.ebuild patch | blob | history
dev-lang/python/python-3.5.0-r2.ebuild patch | blob | history

diff --git a/dev-lang/python/python-3.3.5-r3.ebuild b/dev-lang/python/python-3.3.5-r3.ebuild
index a215e16809d8020b7c4956adbedec07494f90b61..3ec857b2d228ccc68d6fb6c04383c18b11ce8631 100644 (file)
--- a/dev-lang/python/python-3.3.5-r3.ebuild
+++ b/dev-lang/python/python-3.3.5-r3.ebuild
@@ -27,6 +27,8 @@ IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +read
 # run the bootstrap code on your dev box and include the results in the
 # patchset. See bug 447752.
 
+PYVER=${SLOT%/*}
+
 RDEPEND="app-arch/bzip2:0=
        app-arch/xz-utils:0=
        >=sys-libs/zlib-1.1.3:0=
@@ -57,7 +59,7 @@ DEPEND="${RDEPEND}
        >=sys-devel/autoconf-2.65
        !sys-devel/gcc[libffi]"
 RDEPEND+=" !build? ( app-misc/mime-types )
-       doc? ( dev-python/python-docs:${SLOT} )"
+       doc? ( dev-python/python-docs:${PYVER} )"
 PDEPEND="app-eselect/eselect-python
        app-admin/python-updater"
 
@@ -227,7 +229,7 @@ src_test() {
        done
 
        elog "If you would like to run them, you may:"
-       elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
+       elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
        elog "and run the tests separately."
 
        if [[ "${result}" -ne 0 ]]; then
@@ -236,7 +238,7 @@ src_test() {
 }
 
 src_install() {
-       local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
+       local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
 
        cd "${BUILD_DIR}" || die
 
@@ -245,7 +247,7 @@ src_install() {
        sed \
                -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
                -e "s/\(PY_LDFLAGS=\).*/\1/" \
-               -i "${libdir}/config-${SLOT}"*/Makefile || die "sed failed"
+               -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
 
        # Fix collisions between different slots of Python.
        rm -f "${ED}usr/$(get_libdir)/libpython3.so"
@@ -253,17 +255,17 @@ src_install() {
        # 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}"
+       if [[ ${abiver} != python${PYVER} ]]; then
+               rm "${ED}usr/bin/python${PYVER}" || die
+               dosym "${abiver}" "/usr/bin/python${PYVER}"
        fi
 
        if use build; then
-               rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
+               rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
        else
                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*}
+               use tk || rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
        fi
 
        use threads || rm -fr "${libdir}/multiprocessing"
@@ -281,15 +283,15 @@ src_install() {
                emake --no-print-directory -s -f - 2>/dev/null)
        newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
 
-       newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-       newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
+       newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+       newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
        sed \
-               -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-               -e "s:@PYDOC@:pydoc${SLOT}:" \
-               -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
+               -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+               -e "s:@PYDOC@:pydoc${PYVER}:" \
+               -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
 
        # for python-exec
-       python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+       python_export python${PYVER} EPYTHON PYTHON PYTHON_SITEDIR
 
        # if not using a cross-compiler, use the fresh binary
        if ! tc-is-cross-compiler; then
@@ -302,7 +304,7 @@ src_install() {
 }
 
 pkg_preinst() {
-       if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
+       if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
                python_updater_warning="1"
        fi
 }
diff --git a/dev-lang/python/python-3.4.3-r3.ebuild b/dev-lang/python/python-3.4.3-r3.ebuild
index 1f861117be964310d7f8aaa377c6b368486175d8..c57324c0dac0930753d51a33cf4421cd9ceaae10 100644 (file)
--- a/dev-lang/python/python-3.4.3-r3.ebuild
+++ b/dev-lang/python/python-3.4.3-r3.ebuild
@@ -58,6 +58,8 @@ PDEPEND="app-eselect/eselect-python
 
 S="${WORKDIR}/${MY_P}"
 
+PYVER=${SLOT%/*}
+
 src_prepare() {
        # Ensure that internal copies of expat, libffi and zlib are not used.
        rm -fr Modules/expat
@@ -214,7 +216,7 @@ src_test() {
        done
 
        elog "If you would like to run them, you may:"
-       elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
+       elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
        elog "and run the tests separately."
 
        if [[ ${result} -ne 0 ]]; then
@@ -223,7 +225,7 @@ src_test() {
 }
 
 src_install() {
-       local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
+       local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
 
        cd "${BUILD_DIR}" || die
 
@@ -232,7 +234,7 @@ src_install() {
        sed \
                -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
                -e "s/\(PY_LDFLAGS=\).*/\1/" \
-               -i "${libdir}/config-${SLOT}"*/Makefile || die "sed failed"
+               -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
 
        # Fix collisions between different slots of Python.
        rm -f "${ED}usr/$(get_libdir)/libpython3.so"
@@ -240,14 +242,14 @@ src_install() {
        # 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}"
+       if [[ ${abiver} != python${PYVER} ]]; then
+               rm "${ED}usr/bin/python${PYVER}" || die
+               dosym "${abiver}" "/usr/bin/python${PYVER}"
        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*}
+       use tk || rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
 
        use threads || rm -fr "${libdir}/multiprocessing"
        use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
@@ -264,15 +266,15 @@ src_install() {
                emake --no-print-directory -s -f - 2>/dev/null)
        newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
 
-       newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-       newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
+       newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+       newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
        sed \
-               -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-               -e "s:@PYDOC@:pydoc${SLOT}:" \
-               -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
+               -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+               -e "s:@PYDOC@:pydoc${PYVER}:" \
+               -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
 
        # for python-exec
-       python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+       python_export python${PYVER} EPYTHON PYTHON PYTHON_SITEDIR
 
        # if not using a cross-compiler, use the fresh binary
        if ! tc-is-cross-compiler; then
@@ -285,7 +287,7 @@ src_install() {
 }
 
 pkg_preinst() {
-       if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
+       if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
                python_updater_warning="1"
        fi
 }
diff --git a/dev-lang/python/python-3.5.0-r2.ebuild b/dev-lang/python/python-3.5.0-r2.ebuild
index 4e541d502b63da8ee72f62e31db9c1f6598eadc6..30e4d9f8b4e700aa69cafcb23abc6e6c84f82922 100644 (file)
--- a/dev-lang/python/python-3.5.0-r2.ebuild
+++ b/dev-lang/python/python-3.5.0-r2.ebuild
@@ -56,6 +56,8 @@ PDEPEND="app-eselect/eselect-python"
 
 S="${WORKDIR}/${MY_P}"
 
+PYVER=${SLOT%/*}
+
 src_prepare() {
        # Ensure that internal copies of expat, libffi and zlib are not used.
        rm -fr Modules/expat
@@ -217,7 +219,7 @@ src_test() {
        done
 
        elog "If you would like to run them, you may:"
-       elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
+       elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
        elog "and run the tests separately."
 
        if [[ ${result} -ne 0 ]]; then
@@ -226,7 +228,7 @@ src_test() {
 }
 
 src_install() {
-       local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
+       local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
 
        cd "${BUILD_DIR}" || die
 
@@ -235,7 +237,7 @@ src_install() {
        sed \
                -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
                -e "s/\(PY_LDFLAGS=\).*/\1/" \
-               -i "${libdir}/config-${SLOT}"*/Makefile || die "sed failed"
+               -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
 
        # Fix collisions between different slots of Python.
        rm -f "${ED}usr/$(get_libdir)/libpython3.so"
@@ -243,14 +245,14 @@ src_install() {
        # 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}"
+       if [[ ${abiver} != python${PYVER} ]]; then
+               rm "${ED}usr/bin/python${PYVER}" || die
+               dosym "${abiver}" "/usr/bin/python${PYVER}"
        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*}
+       use tk || rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
 
        use threads || rm -fr "${libdir}/multiprocessing"
        use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
@@ -267,15 +269,15 @@ src_install() {
                emake --no-print-directory -s -f - 2>/dev/null)
        newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
 
-       newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-       newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
+       newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+       newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
        sed \
-               -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-               -e "s:@PYDOC@:pydoc${SLOT}:" \
-               -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
+               -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+               -e "s:@PYDOC@:pydoc${PYVER}:" \
+               -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
 
        # for python-exec
-       python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+       python_export python${PYVER} EPYTHON PYTHON PYTHON_SITEDIR
 
        # if not using a cross-compiler, use the fresh binary
        if ! tc-is-cross-compiler; then
@@ -288,7 +290,7 @@ src_install() {
 }
 
 pkg_preinst() {
-       if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
+       if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
                python_updater_warning="1"
        fi
 }
Unnamed repository; edit this file 'description' to name the repository.