dev-lang/python: Remove python-config-X.Y compatibility
authorMichał Górny <mgorny@gentoo.org>
Fri, 6 Nov 2015 22:16:25 +0000 (23:16 +0100)
committerMichał Górny <mgorny@gentoo.org>
Wed, 11 Nov 2015 10:23:02 +0000 (11:23 +0100)
Remove the python-config-X.Y symlinks that were added as the Gentoo
divergence compatibility.

dev-lang/python/python-2.7.10-r3.ebuild [new file with mode: 0644]
dev-lang/python/python-3.3.5-r3.ebuild
dev-lang/python/python-3.4.3-r3.ebuild
dev-lang/python/python-3.5.0-r2.ebuild
profiles/package.mask

diff --git a/dev-lang/python/python-2.7.10-r3.ebuild b/dev-lang/python/python-2.7.10-r3.ebuild
new file mode 100644 (file)
index 0000000..1fa586e
--- /dev/null
@@ -0,0 +1,346 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="2.7.10-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+       https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2
+       >=sys-libs/zlib-1.1.3
+       virtual/libffi
+       virtual/libintl
+       xml? ( >=dev-libs/expat-2.1 )
+       berkdb? ( || (
+               sys-libs/db:5.3
+               sys-libs/db:5.2
+               sys-libs/db:5.1
+               sys-libs/db:5.0
+               sys-libs/db:4.8
+               sys-libs/db:4.7
+               sys-libs/db:4.6
+               sys-libs/db:4.5
+               sys-libs/db:4.4
+               sys-libs/db:4.3
+               sys-libs/db:4.2
+       ) )
+       gdbm? ( sys-libs/gdbm[berkdb] )
+       ncurses? (
+               >=sys-libs/ncurses-5.2
+               readline? ( >=sys-libs/readline-4.1 )
+       )
+       sqlite? ( >=dev-db/sqlite-3.3.8:3 )
+       ssl? (
+               !libressl? ( dev-libs/openssl:0 )
+               libressl? ( dev-libs/libressl )
+       )
+       tk? (
+               >=dev-lang/tk-8.0
+               dev-tcltk/blt
+               dev-tcltk/tix
+       )
+       !!<sys-apps/portage-2.1.9"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       >=sys-devel/autoconf-2.65
+       !sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )
+       doc? ( dev-python/python-docs:${SLOT} )"
+PDEPEND="app-eselect/eselect-python
+       app-admin/python-updater"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+       if use berkdb; then
+               ewarn "'bsddb' module is out-of-date and no longer maintained inside"
+               ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
+               ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
+               ewarn "is provided by dev-python/bsddb3."
+       else
+               if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
+                       ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
+                       ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
+                       ewarn "You might need to migrate your databases."
+               fi
+       fi
+}
+
+src_prepare() {
+       # Ensure that internal copies of expat, libffi and zlib are not used.
+       rm -r Modules/expat || die
+       rm -r Modules/_ctypes/libffi* || die
+       rm -r Modules/zlib || die
+
+       if tc-is-cross-compiler; then
+               local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
+       fi
+
+       EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+       # Fix for cross-compiling.
+       epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
+       epatch "${FILESDIR}/python-2.7.9-ncurses-pkg-config.patch"
+       epatch "${FILESDIR}/python-2.7.10-cross-compile-warn-test.patch"
+
+       sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+               Lib/distutils/command/install.py \
+               Lib/distutils/sysconfig.py \
+               Lib/site.py \
+               Lib/sysconfig.py \
+               Lib/test/test_site.py \
+               Makefile.pre.in \
+               Modules/Setup.dist \
+               Modules/getpath.c \
+               setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+       epatch_user
+
+       eautoreconf
+}
+
+src_configure() {
+               # dbm module can be linked against berkdb or gdbm.
+               # Defaults to gdbm when both are enabled, #204343.
+               local disable
+               use berkdb   || use gdbm || disable+=" dbm"
+               use berkdb   || disable+=" _bsddb"
+               use gdbm     || disable+=" gdbm"
+               use ncurses  || disable+=" _curses _curses_panel"
+               use readline || disable+=" readline"
+               use sqlite   || disable+=" _sqlite3"
+               use ssl      || export PYTHON_DISABLE_SSL="1"
+               use tk       || disable+=" _tkinter"
+               use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+               export PYTHON_DISABLE_MODULES="${disable}"
+
+               if ! use xml; then
+                       ewarn "You have configured Python without XML support."
+                       ewarn "This is NOT a recommended configuration as you"
+                       ewarn "may face problems parsing any XML documents."
+               fi
+
+       if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+               einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+       fi
+
+       if [[ "$(gcc-major-version)" -ge 4 ]]; then
+               append-flags -fwrapv
+       fi
+
+       filter-flags -malign-double
+
+       [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+       # https://bugs.gentoo.org/show_bug.cgi?id=50309
+       if is-flagq -O3; then
+               is-flagq -fstack-protector-all && replace-flags -O3 -O2
+               use hardened && replace-flags -O3 -O2
+       fi
+
+       if tc-is-cross-compiler; then
+               # Force some tests that try to poke fs paths.
+               export ac_cv_file__dev_ptc=no
+               export ac_cv_file__dev_ptmx=yes
+       fi
+
+       # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
+       tc-export CXX
+       # The configure script fails to use pkg-config correctly.
+       # http://bugs.python.org/issue15506
+       export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+       # Set LDFLAGS so we link modules with -lpython2.7 correctly.
+       # Needed on FreeBSD unless Python 2.7 is already installed.
+       # Please query BSD team before removing this!
+       append-ldflags "-L."
+
+       local dbmliborder
+       if use gdbm; then
+               dbmliborder+="${dbmliborder:+:}gdbm"
+       fi
+       if use berkdb; then
+               dbmliborder+="${dbmliborder:+:}bdb"
+       fi
+
+       BUILD_DIR="${WORKDIR}/${CHOST}"
+       mkdir -p "${BUILD_DIR}" || die
+       cd "${BUILD_DIR}" || die
+
+       ECONF_SOURCE="${S}" OPT="" \
+       econf \
+               --with-fpectl \
+               --enable-shared \
+               $(use_enable ipv6) \
+               $(use_with threads) \
+               $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
+               --infodir='${prefix}/share/info' \
+               --mandir='${prefix}/share/man' \
+               --with-dbmliborder="${dbmliborder}" \
+               --with-libc="" \
+               --enable-loadable-sqlite-extensions \
+               --with-system-expat \
+               --with-system-ffi \
+               --without-ensurepip
+
+       if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+               eerror "configure has detected that the sem_open function is broken."
+               eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+               die "Broken sem_open function (bug 496328)"
+       fi
+}
+
+src_compile() {
+       # Avoid invoking pgen for cross-compiles.
+       touch Include/graminit.h Python/graminit.c
+
+       cd "${BUILD_DIR}" || die
+       emake
+
+       # Work around bug 329499. See also bug 413751 and 457194.
+       if has_version dev-libs/libffi[pax_kernel]; then
+               pax-mark E python
+       else
+               pax-mark m python
+       fi
+}
+
+src_test() {
+       # Tests will not work when cross compiling.
+       if tc-is-cross-compiler; then
+               elog "Disabling tests due to crosscompiling."
+               return
+       fi
+
+       cd "${BUILD_DIR}" || die
+
+       # Skip failing tests.
+       local skipped_tests="distutils gdb"
+
+       for test in ${skipped_tests}; do
+               mv "${S}"/Lib/test/test_${test}.py "${T}"
+       done
+
+       # Rerun failed tests in verbose mode (regrtest -w).
+       emake test EXTRATESTOPTS="-w" < /dev/tty
+       local result="$?"
+
+       for test in ${skipped_tests}; do
+               mv "${T}/test_${test}.py" "${S}"/Lib/test
+       done
+
+       elog "The following tests have been skipped:"
+       for test in ${skipped_tests}; do
+               elog "test_${test}.py"
+       done
+
+       elog "If you would like to run them, you may:"
+       elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
+       elog "and run the tests separately."
+
+       if [[ "${result}" -ne 0 ]]; then
+               die "emake test failed"
+       fi
+}
+
+src_install() {
+       local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
+
+       cd "${BUILD_DIR}" || die
+       emake DESTDIR="${D}" altinstall
+
+       sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
+
+       # Fix collisions between different slots of Python.
+       mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
+       mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
+       mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
+       rm -f "${ED}usr/bin/smtpd.py"
+
+               use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
+               use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+               use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
+               use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
+
+       use threads || rm -r "${libdir}/multiprocessing" || die
+       use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
+
+       dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+       if use examples; then
+               insinto /usr/share/doc/${PF}/examples
+               doins -r "${S}"/Tools
+       fi
+       insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+       local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+               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}
+       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"
+
+       # for python-exec
+       python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+
+       # if not using a cross-compiler, use the fresh binary
+       if ! tc-is-cross-compiler; then
+               local PYTHON=./python
+               local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+       fi
+
+       echo "EPYTHON='${EPYTHON}'" > epython.py
+       python_domodule epython.py
+}
+
+pkg_preinst() {
+       if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
+               python_updater_warning="1"
+       fi
+}
+
+eselect_python_update() {
+       if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+               eselect python update
+       fi
+
+       if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+               eselect python update --python${PV%%.*}
+       fi
+}
+
+pkg_postinst() {
+       eselect_python_update
+
+       if [[ "${python_updater_warning}" == "1" ]]; then
+               ewarn "You have just upgraded from an older version of Python."
+               ewarn "You should switch active version of Python ${PV%%.*} and run"
+               ewarn "'python-updater [options]' to rebuild Python modules."
+       fi
+}
+
+pkg_postrm() {
+       eselect_python_update
+}
index 7164d5a178ee855885da352f7812b5f30f9b713f..ef9879408bef92a2d0fec616ee480b5595da889f 100644 (file)
@@ -246,9 +246,6 @@ src_install() {
                -e "s/\(PY_LDFLAGS=\).*/\1/" \
                -i "${libdir}/config-${SLOT}"*/Makefile || die "sed failed"
 
-       # Backwards compat with Gentoo divergence.
-       dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
        # Fix collisions between different slots of Python.
        rm -f "${ED}usr/$(get_libdir)/libpython3.so"
 
index 53c39a05aadf96127d8cd824a8d33f64ce2588db..32ddf14aed1af6f2e72fd72da35d65ca18eaa812 100644 (file)
@@ -231,9 +231,6 @@ src_install() {
                -e "s/\(PY_LDFLAGS=\).*/\1/" \
                -i "${libdir}/config-${SLOT}"*/Makefile || die "sed failed"
 
-       # Backwards compat with Gentoo divergence.
-       dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
        # Fix collisions between different slots of Python.
        rm -f "${ED}usr/$(get_libdir)/libpython3.so"
 
index 34ac46e1439494274fc0aa55bca57c7c4a707ddd..4e541d502b63da8ee72f62e31db9c1f6598eadc6 100644 (file)
@@ -237,9 +237,6 @@ src_install() {
                -e "s/\(PY_LDFLAGS=\).*/\1/" \
                -i "${libdir}/config-${SLOT}"*/Makefile || die "sed failed"
 
-       # Backwards compat with Gentoo divergence.
-       dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
        # Fix collisions between different slots of Python.
        rm -f "${ED}usr/$(get_libdir)/libpython3.so"
 
index f50214bbd7f94c4d7b9c4ad08b464e673d036483..d2483f6e2123f22bdda15f1fa11c9314c49c7ac9 100644 (file)
 
 # Michał Górny <mgorny@gentoo.org> (11 Nov 2015)
 # Cleaned up Python versions masked for testing:
+# - python-config-X.Y compatibility removed,
 # - ABIFLAGS reintroduced for 3.3+.
 # Resulting API/ABI change can break reverse dependencies, especially
 # if upstream hardcodes paths or library names.
+=dev-lang/python-2.7.10-r3
 =dev-lang/python-3.3.5-r3
 =dev-lang/python-3.4.3-r3
 =dev-lang/python-3.5.0-r2