From 1a0880806e37684b58b7ee65ba89039224473f4a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 28 May 2005 00:21:34 +0000 Subject: add USE=nocxx support Package-Manager: portage-2.0.51.22-r1 --- dev-lang/python/Manifest | 84 +++++++++++++++------------------- dev-lang/python/python-2.1.3-r1.ebuild | 3 +- dev-lang/python/python-2.2.3-r6.ebuild | 9 ++-- dev-lang/python/python-2.3.4-r1.ebuild | 6 +-- dev-lang/python/python-2.3.5.ebuild | 6 +-- dev-lang/python/python-2.4-r3.ebuild | 6 +-- dev-lang/python/python-2.4.1.ebuild | 12 ++--- 7 files changed, 56 insertions(+), 70 deletions(-) (limited to 'dev-lang') diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 48b53495d701..2b9f8cdeed44 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -1,59 +1,49 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 1e424541a26b4d5785a6e830e6a14fe8 python-2.2.3-r6.ebuild 4498 MD5 d6c10d477842a8a2ca084a4ec7ce12d9 ChangeLog 24500 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221 -MD5 ddc34a9214521820395f6eaf5f208ded python-2.1.3-r1.ebuild 2321 -MD5 1e8979b45045a6cbc3aa3db2af675ff6 python-2.4.1.ebuild 7948 -MD5 6bfece64d89a1688ed4736f94a5b966e python-2.3.4-r1.ebuild 7182 -MD5 1530016daeafa460f4cc407614e96af7 python-2.3.5.ebuild 7724 -MD5 11883082a4dbea2432a68330776944dd python-2.4-r3.ebuild 7102 -MD5 47e9455f3e16c3369c9e57388ba3d643 files/python-2.4.1-readline.patch 8984 -MD5 1cf4c21ad3b0aafc571b05b9a9e54594 files/python-updater 8761 +MD5 44bb955f0b7c62e851dfc8909e142026 python-2.1.3-r1.ebuild 2303 +MD5 473fa805d56a3656c6e59b3bfe236cb7 python-2.4.1.ebuild 7954 +MD5 9b5cf0bfc1448923881d883ae38e70b4 python-2.2.3-r6.ebuild 4512 +MD5 9a4707ee3150824065345564d42e80a1 python-2.3.5.ebuild 7750 +MD5 0e2f5d553d2f0290b7541fd42e5abb8d python-2.3.4-r1.ebuild 7212 +MD5 0eae585669f8f90830e13f053a12eeca python-2.4-r3.ebuild 7128 +MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235 +MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62 +MD5 1e4084c2a8ee240668d02e703e7c171f files/digest-python-2.4.1 66 +MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454 +MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r6 62 MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.3-db4.2.patch 1015 -MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997 MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152 -MD5 e9cc1b9be363e6c3f8df75cdb2ea9621 files/python-2.3-readline.patch 9596 -MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178 -MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454 -MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178 -MD5 3c77f8f9d55bbedacd9476a428088250 files/python-2.4-libdir.patch 8358 -MD5 eaa33949f072a9787c453c37c1236108 files/python-2.4.1-db4.patch 1414 +MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997 MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220 -MD5 a387f41bfc6767b90a51daaa0c0aac45 files/python-2.3.4-lib64.patch 11779 -MD5 2b953054102d344834597bc73b209e12 files/python-2.4-disable_modules_and_ssl.patch 1285 -MD5 2121d3986faa4b6c2c3ed472f77f2a9d files/python-2.4-gentoo_py_dontcompile.patch 477 -MD5 849ff6337b70ef28009c90021dfae0da files/digest-python-2.3.5 66 -MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62 -MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.4-db4.2.patch 1015 -MD5 55af7ba61954f03e09bcafbce1227c61 files/python-2.2.3-xmlrpc.patch 3659 -MD5 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.3-xmlrpc.patch 4228 -MD5 fccf57b8c47164b676517e516898dc46 files/digest-python-2.4-r3 64 -MD5 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732 -MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285 -MD5 5bee9fa15d4effc7423e76d2f7f47655 files/python-2.4-add_portage_search_path.patch 556 -MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r6 62 MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212 MD5 9fe31aedbbc7e8ea1847ed6dd70bf15b files/python-2.2.3-fPIC.patch 767 -MD5 4b9922f74b1076d82d1fdb653fa5769a files/python-2.3-add_portage_search_path_take_2.patch 614 -MD5 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.4-xmlrpc.patch 4228 -MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178 -MD5 7ed8f8f52ed392ef28dd320b130e3c6b files/python-2.4-lib64.patch 9941 -MD5 1e4084c2a8ee240668d02e703e7c171f files/digest-python-2.4.1 66 -MD5 d74e7f0fd47f00e8b3fe7ca36b7eb629 files/python-config-2.4 179 +MD5 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732 MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607 -MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.4-mimetypes_apache.patch 454 MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478 +MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178 +MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178 +MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178 MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178 -MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235 -MD5 30646e9931667060229fcf9685050ff4 files/python-2.4.1-libdir.patch 7910 +MD5 1cf4c21ad3b0aafc571b05b9a9e54594 files/python-updater 8761 +MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285 +MD5 4b9922f74b1076d82d1fdb653fa5769a files/python-2.3-add_portage_search_path_take_2.patch 614 MD5 c2e3a6ed5d700a7976f5b763cd935599 files/digest-python-2.3.4-r1 66 +MD5 a387f41bfc6767b90a51daaa0c0aac45 files/python-2.3.4-lib64.patch 11779 +MD5 5bee9fa15d4effc7423e76d2f7f47655 files/python-2.4-add_portage_search_path.patch 556 +MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.4-db4.2.patch 1015 +MD5 2b953054102d344834597bc73b209e12 files/python-2.4-disable_modules_and_ssl.patch 1285 +MD5 2121d3986faa4b6c2c3ed472f77f2a9d files/python-2.4-gentoo_py_dontcompile.patch 477 +MD5 7ed8f8f52ed392ef28dd320b130e3c6b files/python-2.4-lib64.patch 9941 +MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.4-mimetypes_apache.patch 454 +MD5 d74e7f0fd47f00e8b3fe7ca36b7eb629 files/python-config-2.4 179 +MD5 55af7ba61954f03e09bcafbce1227c61 files/python-2.2.3-xmlrpc.patch 3659 +MD5 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.3-xmlrpc.patch 4228 +MD5 3c77f8f9d55bbedacd9476a428088250 files/python-2.4-libdir.patch 8358 +MD5 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.4-xmlrpc.patch 4228 +MD5 849ff6337b70ef28009c90021dfae0da files/digest-python-2.3.5 66 +MD5 fccf57b8c47164b676517e516898dc46 files/digest-python-2.4-r3 64 +MD5 e9cc1b9be363e6c3f8df75cdb2ea9621 files/python-2.3-readline.patch 9596 MD5 6eab04aaa6abe2b795e4e5f4983bea38 files/python-2.4-readline.patch 9099 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCjvCTKf2g/qXtneoRAhV4AJ44eMLymE4GPm28PNYPj6wdUHr8MQCgviOh -5kurEjxaN9zi1Hm/i+c62Gc= -=NflM ------END PGP SIGNATURE----- +MD5 eaa33949f072a9787c453c37c1236108 files/python-2.4.1-db4.patch 1414 +MD5 30646e9931667060229fcf9685050ff4 files/python-2.4.1-libdir.patch 7910 +MD5 47e9455f3e16c3369c9e57388ba3d643 files/python-2.4.1-readline.patch 8984 diff --git a/dev-lang/python/python-2.1.3-r1.ebuild b/dev-lang/python/python-2.1.3-r1.ebuild index 2d89e155ce16..4ac663a9160f 100644 --- a/dev-lang/python/python-2.1.3-r1.ebuild +++ b/dev-lang/python/python-2.1.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.1.3-r1.ebuild,v 1.19 2005/05/21 08:25:33 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.1.3-r1.ebuild,v 1.20 2005/05/28 00:21:34 vapier Exp $ IUSE="readline tcltk berkdb" @@ -19,7 +19,6 @@ DEPEND="virtual/libc >=sys-libs/zlib-1.1.3 readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 ) berkdb? ( >=sys-libs/db-3 ) tcltk? ( >=dev-lang/tk-8.0 )" -RDEPEND="$DEPEND" # The dev-python/python-fchksum RDEPEND is needed to that this python provides # the functionality expected from previous pythons. diff --git a/dev-lang/python/python-2.2.3-r6.ebuild b/dev-lang/python/python-2.2.3-r6.ebuild index 5352533d4833..b2bbe9e425e9 100644 --- a/dev-lang/python/python-2.2.3-r6.ebuild +++ b/dev-lang/python/python-2.2.3-r6.ebuild @@ -1,22 +1,21 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.3-r6.ebuild,v 1.1 2005/02/07 04:28:20 pythonhead Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.3-r6.ebuild,v 1.2 2005/05/28 00:21:34 vapier Exp $ inherit flag-o-matic eutils python -IUSE="berkdb bootstrap build doc gdbm ncurses readline ssl tcltk" - PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`" PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`" PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" S="${WORKDIR}/Python-${PV}" DESCRIPTION="A really great language" +HOMEPAGE="http://www.python.org" SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tgz" -HOMEPAGE="http://www.python.org" LICENSE="PSF-2.2" KEYWORDS="amd64 x86 ppc sparc alpha mips hppa ia64 ppc64" +IUSE="berkdb bootstrap build doc gdbm ncurses readline ssl tcltk nocxx" DEPEND="virtual/libc >=sys-libs/zlib-1.1.3 @@ -85,7 +84,7 @@ src_compile() { local myopts #if we are creating a new build image, we remove the dependency on g++ - if use build && ! use bootstrap + if use build && ! use bootstrap || use nocxx then myopts="--with-cxx=no" fi diff --git a/dev-lang/python/python-2.3.4-r1.ebuild b/dev-lang/python/python-2.3.4-r1.ebuild index 53d539bfd51e..96820a75ec55 100644 --- a/dev-lang/python/python-2.3.4-r1.ebuild +++ b/dev-lang/python/python-2.3.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.4-r1.ebuild,v 1.5 2005/05/01 15:28:15 spb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.4-r1.ebuild,v 1.6 2005/05/28 00:21:34 vapier Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage @@ -21,7 +21,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tar.bz2" LICENSE="PSF-2.2" SLOT="2.3" KEYWORDS="alpha amd64 arm hppa ia64 mips ppc s390 sh sparc x86 ppc64" -IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X" +IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X uclibc nocxx" DEPEND="virtual/libc >=sys-libs/zlib-1.1.3 @@ -103,7 +103,7 @@ src_compile() { local myconf #if we are creating a new build image, we remove the dependency on g++ - if use build && ! use bootstrap; then + if use build && ! use bootstrap || use nocxx ; then myconf="--with-cxx=no" fi diff --git a/dev-lang/python/python-2.3.5.ebuild b/dev-lang/python/python-2.3.5.ebuild index 50ceb39552e0..3cad0db65697 100644 --- a/dev-lang/python/python-2.3.5.ebuild +++ b/dev-lang/python/python-2.3.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5.ebuild,v 1.14 2005/05/18 13:09:36 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5.ebuild,v 1.15 2005/05/28 00:21:34 vapier Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage @@ -21,7 +21,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tar.bz2" LICENSE="PSF-2.2" SLOT="2.3" KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86" -IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X" +IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X uclibc nocxx" DEPEND="virtual/libc >=sys-libs/zlib-1.1.3 @@ -110,7 +110,7 @@ src_compile() { local myconf #if we are creating a new build image, we remove the dependency on g++ - if use build && ! use bootstrap; then + if use build && ! use bootstrap || use nocxx ; then myconf="--with-cxx=no" fi diff --git a/dev-lang/python/python-2.4-r3.ebuild b/dev-lang/python/python-2.4-r3.ebuild index 1515f97039c8..edd9598e6008 100644 --- a/dev-lang/python/python-2.4-r3.ebuild +++ b/dev-lang/python/python-2.4-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4-r3.ebuild,v 1.3 2005/04/20 18:48:48 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4-r3.ebuild,v 1.4 2005/05/28 00:21:34 vapier Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage @@ -18,7 +18,7 @@ DESCRIPTION="A really great language" SRC_URI="http://www.python.org/ftp/python/${PYVER}/${MY_P}.tar.bz2" HOMEPAGE="http://www.python.org" -IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X" +IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X uclibc nocxx" LICENSE="PSF-2.2" SLOT="2.4" @@ -117,7 +117,7 @@ src_compile() { local myconf #if we are creating a new build image, we remove the dependency on g++ - if use build && ! use bootstrap; then + if use build && ! use bootstrap || use nocxx ; then myconf="--with-cxx=no" fi diff --git a/dev-lang/python/python-2.4.1.ebuild b/dev-lang/python/python-2.4.1.ebuild index 7773397d5e50..2652a4499098 100644 --- a/dev-lang/python/python-2.4.1.ebuild +++ b/dev-lang/python/python-2.4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1.ebuild,v 1.4 2005/05/07 16:36:19 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1.ebuild,v 1.5 2005/05/28 00:21:34 vapier Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage @@ -17,17 +17,15 @@ PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" MY_P="Python-${PV}" S="${WORKDIR}/${MY_P}" DESCRIPTION="Python is an interpreted, interactive, object-orientated programming language." +HOMEPAGE="http://www.python.org/" SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2" -HOMEPAGE="http://www.python.org" -IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X uclibc" LICENSE="PSF-2.2" SLOT="2.4" - KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~s390 ~alpha ~ia64 ~mips" +IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X uclibc nocxx" -DEPEND="virtual/libc - >=sys-libs/zlib-1.1.3 +DEPEND=">=sys-libs/zlib-1.1.3 !dev-python/cjkcodecs !build? ( X? ( tcltk? ( >=dev-lang/tk-8.0 ) ) @@ -118,7 +116,7 @@ src_compile() { local myconf #if we are creating a new build image, we remove the dependency on g++ - if use build && ! use bootstrap; then + if use build && ! use bootstrap || use nocxx ; then myconf="--with-cxx=no" fi -- cgit v1.2.3-65-gdbad