diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-10-18 20:22:02 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-10-18 20:22:02 +0000 |
| commit | 3947bbae9cd66e9df48636aae7ef40aef9e95418 (patch) | |
| tree | ffc32925c7be53bea4b5c10b1007a526d6564756 /dev-lang | |
| parent | version bump (bug #67882) (Manifest recommit) (diff) | |
| download | gentoo-2-3947bbae9cd66e9df48636aae7ef40aef9e95418.tar.gz gentoo-2-3947bbae9cd66e9df48636aae7ef40aef9e95418.tar.bz2 gentoo-2-3947bbae9cd66e9df48636aae7ef40aef9e95418.zip | |
Forward part from 2.3.3-r1 the removal of directories in /usr/lib/python based upon USE flags.
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/python/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/python/python-2.3.3-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-lang/python/python-2.3.4.ebuild | 10 |
3 files changed, 17 insertions, 4 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 39ea501fa04c..ac057157353a 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/python # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.113 2004/10/17 22:54:10 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.114 2004/10/18 20:22:02 vapier Exp $ + + 18 Oct 2004; Mike Frysinger <vapier@gentoo.org> python-2.3.3-r1.ebuild, + python-2.3.4.ebuild: + Forward part from 2.3.3-r1 the removal of directories in /usr/lib/python + based upon USE flags. 17 Oct 2004; Jason Wever <weeve@gentoo.org> python-2.3.4.ebuild: Stable on sparc. diff --git a/dev-lang/python/python-2.3.3-r1.ebuild b/dev-lang/python/python-2.3.3-r1.ebuild index 3b39da7d21cb..58596ba028e4 100644 --- a/dev-lang/python/python-2.3.3-r1.ebuild +++ b/dev-lang/python/python-2.3.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.3-r1.ebuild,v 1.22 2004/09/24 10:47:44 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.3-r1.ebuild,v 1.23 2004/10/18 20:22:02 vapier Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage @@ -154,7 +154,7 @@ src_install() { if [ "${CONF_LIBDIR}" == "lib64" ] ;then dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib64/python${PYVER}/config/Makefile else - dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib/python${PYVER}/config/Makefile + dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib/python${PYVER}/config/Makefile fi # install python-updater in /usr/sbin diff --git a/dev-lang/python/python-2.3.4.ebuild b/dev-lang/python/python-2.3.4.ebuild index f56fd01d76ed..719e1669a6db 100644 --- a/dev-lang/python/python-2.3.4.ebuild +++ b/dev-lang/python/python-2.3.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.ebuild,v 1.14 2004/10/17 22:54:10 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.4.ebuild,v 1.15 2004/10/18 20:22:02 vapier Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage @@ -157,6 +157,14 @@ src_install() { # install python-updater in /usr/sbin dosbin ${FILESDIR}/python-updater + + if use build ; then + rm -rf ${D}/usr/lib/python2.3/{test,encodings,email,lib-tk,bsddb/test} + else + use uclibc && rm -rf ${D}/usr/lib/python2.3/{test,bsddb/test} + use berkdb || rm -rf ${D}/usr/lib/python2.3/bsddb + ( use !X || use !tcltk ) || rm -rf ${D}/usr/lib/python2.3/lib-tk + fi } pkg_postrm() { |