diff options
author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-10-02 04:46:17 +0000 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-10-02 04:46:17 +0000 |
commit | 85ad306213945004aaeeab4776c003e5496042da (patch) | |
tree | 20f9afac7f5f11df796e5076020b020d95c35a8a /dev-lang | |
parent | QA: Remove excessive preserve_old_lib on detailed symlink targets that is not... (diff) | |
download | historical-85ad306213945004aaeeab4776c003e5496042da.tar.gz historical-85ad306213945004aaeeab4776c003e5496042da.tar.bz2 historical-85ad306213945004aaeeab4776c003e5496042da.zip |
Remove a workaround for missing keywords.
Package-Manager: portage-14471-svn/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/python/ChangeLog | 6 | ||||
-rw-r--r-- | dev-lang/python/Manifest | 6 | ||||
-rw-r--r-- | dev-lang/python/python-2.6.2-r2.ebuild | 32 | ||||
-rw-r--r-- | dev-lang/python/python-3.1.1-r1.ebuild | 22 |
4 files changed, 24 insertions, 42 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index b7360c27956e..bc095bec6aec 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/python # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.421 2009/09/27 17:56:00 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.422 2009/10/02 04:46:17 arfrever Exp $ + + 02 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + python-2.6.2-r2.ebuild, python-3.1.1-r1.ebuild: + Remove a workaround for missing keywords. 27 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r2.ebuild, diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 147228b9ea05..c92c74bdfd33 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -17,7 +17,7 @@ DIST python-gentoo-patches-3.1.1-r2.tar.bz2 8929 RMD160 26afbdbbec3bf0e394cb3082 EBUILD python-2.4.6.ebuild 9291 RMD160 f1ca2496e7ab869f10a996b50e7a87fd75b3f9d0 SHA1 232b195c5406fdce86b304bdfdc18071e28a8535 SHA256 fc7ee034012141f83b3daf0051f3ef745ea55d4643ea62054eb6b1013ec7f676 EBUILD python-2.5.4-r3.ebuild 9593 RMD160 d5033bd32a4b00d0732734a44c93271b6f25ea63 SHA1 1745d9d4eb9bfa9cb1ab71b63adad1668803673b SHA256 7c93c0c2f9ce8d46a95985e531ca02a4f8cac4368a6a8997b821ea9a663d9c18 EBUILD python-2.6.2-r1.ebuild 9993 RMD160 2643d6d116e2f05e3d28f55293d8314f0a72d875 SHA1 4d778dbf57131881df1b82f2d9117b84661273ba SHA256 0268cbeec142b0579314898ed74f2a2fe7eea5e7a3d67561b3c90f47aa658955 -EBUILD python-2.6.2-r2.ebuild 10374 RMD160 3fb1490b4443a6235e1a64fbcf5d76e4d0da6384 SHA1 836945d9e53b3569d0ac22528051b18d8ff7a056 SHA256 19d2a8b562d03fd2480fb5f483b0ab822e9e945e37b198a1ebb876c6a183f769 -EBUILD python-3.1.1-r1.ebuild 9583 RMD160 54f233e7c24525a4feb73192c34c8ed51fef24a4 SHA1 54fb498b9973892e627b8e39db0c0dc14b4dd5ae SHA256 c01f1c89660922bcfc0e9d7f6585cf6cb5ab0cb4b07d72c784871eb4b5067335 -MISC ChangeLog 73819 RMD160 9b22502837e947f7285824a164c6d7bf4679f823 SHA1 36c4749f2e85dec16026624d3e25e3d6043fca38 SHA256 460382ca727ffce23730819d4358b0514e62ea8592a3a25dc8b5d83917fa358f +EBUILD python-2.6.2-r2.ebuild 10010 RMD160 758a14a9ea1aa3dc96853e685bbcc2814cd7b1a0 SHA1 40f38ac6c5693f4a22545fd2a400d4ab0b5be4ec SHA256 95aa1ba447ddd8ad0e57730a9b6d9b970a8d901b355ee01a4eb6718c058a7ef7 +EBUILD python-3.1.1-r1.ebuild 9373 RMD160 2f1567ceb06f52ef12916ebe6994b1ee9cdae380 SHA1 556de2e17f7edd2765d2c558997e3fec6d7eadab SHA256 b47ab3863971f9eb76596c32d699199185f4411ecf91e6e98f690a18167cc591 +MISC ChangeLog 73987 RMD160 1b7e12ed219602247cbd87ae26918176bde151bd SHA1 b0fa92d9edaff329c9326661189da477b674acf4 SHA256 a5f16670e7594b7bb1d7082ad11e0b94ac7c3985fef2dd2f33fc9ed1f6defc2d MISC metadata.xml 501 RMD160 0cc2c851a7c59ed77809c1f3ac2130710f0700e9 SHA1 59bfd447cf15419f68077913de7228f3556ce6e3 SHA256 51c09ee221463f34722a6c655db605a7d6d683069453d173947e4416a43a071c diff --git a/dev-lang/python/python-2.6.2-r2.ebuild b/dev-lang/python/python-2.6.2-r2.ebuild index d50c6622a125..1cf56891ce9b 100644 --- a/dev-lang/python/python-2.6.2-r2.ebuild +++ b/dev-lang/python/python-2.6.2-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild,v 1.9 2009/10/01 20:03:52 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild,v 1.10 2009/10/02 04:46:17 arfrever Exp $ EAPI="2" -inherit autotools eutils flag-o-matic libtool multilib pax-utils python toolchain-funcs versionator +inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs versionator # We need this so that we don't depend on python.eclass. PYVER_MAJOR=$(get_major_version) @@ -23,7 +23,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2 LICENSE="PSF-2.2" SLOT="2.6" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite ssl +threads tk ucs2 wininst +xml" # NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes} @@ -31,6 +31,7 @@ IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlit RDEPEND=">=app-admin/eselect-python-20090606 >=sys-libs/zlib-1.1.3 + virtual/libffi !build? ( berkdb? ( || ( sys-libs/db:4.7 @@ -50,10 +51,9 @@ RDEPEND=">=app-admin/eselect-python-20090606 ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 ) xml? ( >=dev-libs/expat-2 ) - ) - !m68k? ( !sparc-fbsd? ( virtual/libffi ) )" + )" DEPEND="${RDEPEND} - !m68k? ( !sparc-fbsd? ( dev-util/pkgconfig ) )" + dev-util/pkgconfig" RDEPEND+=" !build? ( app-misc/mime-types )" PDEPEND="app-admin/python-updater" @@ -70,9 +70,7 @@ pkg_setup() { src_prepare() { # Ensure that internal copy of libffi isn't used. - if ! use m68k && ! use sparc-fbsd; then - rm -fr Modules/_ctypes/libffi* - fi + rm -fr Modules/_ctypes/libffi* if tc-is-cross-compiler; then epatch "${FILESDIR}/python-2.5-cross-printf.patch" @@ -145,15 +143,6 @@ src_configure() { export OPT="${CFLAGS}" - local myconf - - # Super-secret switch. Don't use this unless you know what you're - # doing. Enabling UCS2 support will break your existing python - # modules - use ucs2 \ - && myconf+=" --enable-unicode=ucs2" \ - || myconf+=" --enable-unicode=ucs4" - filter-flags -malign-double [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC @@ -185,19 +174,16 @@ src_configure() { # Please query BSD team before removing this! append-ldflags "-L." - if ! use m68k && ! use sparc-fbsd; then - myconf+=" --with-system-ffi" - fi - econf \ --with-fpectl \ --enable-shared \ $(use_enable ipv6) \ $(use_with threads) \ + $(use ucs2 && echo "--enable-unicode=ucs2" || echo "--enable-unicode=ucs4") \ --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man \ --with-libc='' \ - ${myconf} + --with-system-ffi } src_test() { diff --git a/dev-lang/python/python-3.1.1-r1.ebuild b/dev-lang/python/python-3.1.1-r1.ebuild index f06fb9ff46f9..c09e25ca6b64 100644 --- a/dev-lang/python/python-3.1.1-r1.ebuild +++ b/dev-lang/python/python-3.1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.8 2009/10/01 20:03:52 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.9 2009/10/02 04:46:17 arfrever Exp $ EAPI="2" @@ -23,11 +23,12 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2 LICENSE="PSF-2.2" SLOT="3.1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite ssl +threads tk ucs2 wininst +xml" RDEPEND=">=app-admin/eselect-python-20090606 >=sys-libs/zlib-1.1.3 + virtual/libffi !build? ( doc? ( dev-python/python-docs:${SLOT} ) gdbm? ( sys-libs/gdbm ) @@ -39,10 +40,9 @@ RDEPEND=">=app-admin/eselect-python-20090606 ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 ) xml? ( >=dev-libs/expat-2 ) - ) - !m68k? ( !sparc-fbsd? ( virtual/libffi ) )" + )" DEPEND="${RDEPEND} - !m68k? ( !sparc-fbsd? ( dev-util/pkgconfig ) )" + dev-util/pkgconfig" RDEPEND+=" !build? ( app-misc/mime-types )" PDEPEND="app-admin/python-updater =dev-lang/python-2*" @@ -51,9 +51,7 @@ PROVIDE="virtual/python" src_prepare() { # Ensure that internal copy of libffi isn't used. - if ! use m68k && ! use sparc-fbsd; then - rm -fr Modules/_ctypes/libffi* - fi + rm -fr Modules/_ctypes/libffi* if ! tc-is-cross-compiler; then rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch @@ -118,8 +116,6 @@ src_configure() { export OPT="${CFLAGS}" - local myconf - filter-flags -malign-double [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC @@ -157,10 +153,6 @@ src_configure() { fi dbmliborder="${dbmliborder#:}" - if ! use m68k && ! use sparc-fbsd; then - myconf+=" --with-system-ffi" - fi - econf \ --with-fpectl \ --enable-shared \ @@ -171,7 +163,7 @@ src_configure() { --mandir='${prefix}'/share/man \ --with-libc='' \ --with-dbmliborder=${dbmliborder} \ - ${myconf} + --with-system-ffi } src_test() { |