commit: e56e45bd9f75994a542436f59efc6ea7962215b3 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Tue Dec 15 19:39:18 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Tue Dec 15 19:39:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e56e45bd
dev-lang/python: drop ~ppc-aix Bug: https://bugs.gentoo.org/760057 Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> dev-lang/python/python-2.7.16.ebuild | 21 ++------------------- dev-lang/python/python-3.7.8-r2.ebuild | 5 +---- dev-lang/python/python-3.8.5.ebuild | 5 +---- dev-lang/python/python-3.8.6.ebuild | 5 +---- 4 files changed, 5 insertions(+), 31 deletions(-) diff --git a/dev-lang/python/python-2.7.16.ebuild b/dev-lang/python/python-2.7.16.ebuild index 4ef22948f1..90390f85c8 100644 --- a/dev-lang/python/python-2.7.16.ebuild +++ b/dev-lang/python/python-2.7.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -24,7 +24,7 @@ SRC_URI+=" elibc_Cygwin? ( LICENSE="PSF-2" SLOT="2.7" -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="aqua -berkdb bluetooth 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. @@ -136,8 +136,6 @@ src_prepare() { fi # don't try to do fancy things on Darwin sed -i -e 's/__APPLE__/__NO_MUCKING_AROUND__/g' Modules/readline.c || die - # On AIX, we've wrapped /usr/ccs/bin/nm to work around long TMPDIR. - sed -i -e "/^NM=.*nm$/s,^.*$,NM=$(tc-getNM)," Modules/makexp_aix || die # fix header standards conflicts on Solaris if [[ ${CHOST} == *-solaris* ]] ; then # GCC5 switched the default from gnu89 to gnu11, a standards @@ -241,7 +239,6 @@ src_configure() { # Needed on FreeBSD unless Python 2.7 is already installed. # Please query BSD team before removing this! # On AIX this is not needed, but would record '.' as runpath. - [[ ${CHOST} == *-aix* ]] || append-ldflags "-L." if use prefix ; then @@ -520,20 +517,6 @@ EOF fi sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed" - if [[ ${CHOST} == *-aix* ]]; then - # fix upstream bugs with quite large proposed diffs still to be sorted out: - # http://bugs.python.org/issue13493 - # http://bugs.python.org/issue14150 - # http://bugs.python.org/issue15590 - # http://bugs.python.org/issue16189 - sed -e "/Libs:/s|\$| -Wl,-bE:${EPREFIX}/${libdir#$ED}/config/python.exp -lld|" \ - -i "${ED}"usr/$(get_libdir)/pkgconfig/python-${SLOT}.pc || die "sed failed" - sed -e "s|:Modules/python.exp|:${EPREFIX}/${libdir#$ED}/config/python.exp|" \ - -e 's| -bI:| -Wl,-bI:|g' \ - -e '/LINKFORSHARED/s|-bE:|-bI:|g' \ - -e '/LINKFORSHARED/s| -lld||g' \ - -i "${libdir}"/{_sysconfigdata.py,config/Makefile} || die "sed failed" - fi # Fix collisions between different slots of Python. mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}" diff --git a/dev-lang/python/python-3.7.8-r2.ebuild b/dev-lang/python/python-3.7.8-r2.ebuild index 178495ae2b..d3d0ee4837 100644 --- a/dev-lang/python/python-3.7.8-r2.ebuild +++ b/dev-lang/python/python-3.7.8-r2.ebuild @@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}/${PYVER}m" -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="aqua bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" RESTRICT="!test? ( test )" @@ -101,9 +101,6 @@ src_prepare() { # missed patch sed -i -e '/is_macosx_sdk_path(zlib_h):/s/darwin/no-darwin/' setup.py || die - # We may have wrapped /usr/ccs/bin/nm on AIX for long TMPDIR. - sed -i -e "/^NM=.*nm$/s,^.*$,NM=$(tc-getNM)," Modules/makexp_aix || die - sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" diff --git a/dev-lang/python/python-3.8.5.ebuild b/dev-lang/python/python-3.8.5.ebuild index 32c823df81..19da75249a 100644 --- a/dev-lang/python/python-3.8.5.ebuild +++ b/dev-lang/python/python-3.8.5.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="aqua bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" RESTRICT="!test? ( test )" @@ -78,9 +78,6 @@ src_prepare() { # usage of less functional libedit sed -i -e 's/__APPLE__/__NO_MUCKING_AROUND__/g' Modules/readline.c || die - # We may have wrapped /usr/ccs/bin/nm on AIX for long TMPDIR. - sed -i -e "/^NM=.*nm$/s,^.*$,NM=$(tc-getNM)," Modules/makexp_aix || die - sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" diff --git a/dev-lang/python/python-3.8.6.ebuild b/dev-lang/python/python-3.8.6.ebuild index 6c73eff420..b041b10b83 100644 --- a/dev-lang/python/python-3.8.6.ebuild +++ b/dev-lang/python/python-3.8.6.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="aqua bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" RESTRICT="!test? ( test )" @@ -75,9 +75,6 @@ src_prepare() { default - # We may have wrapped /usr/ccs/bin/nm on AIX for long TMPDIR. - sed -i -e "/^NM=.*nm$/s,^.*$,NM=$(tc-getNM)," Modules/makexp_aix || die - sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
