diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-23 15:29:49 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-23 15:29:49 +0000 |
| commit | 9146cc2bb5ec2526f27582079d87dbe9bc1e1702 (patch) | |
| tree | a73d98c91645a3505d8f3248d5bda8ba89504863 /dev-lang/python/python-2.4.6.ebuild | |
| parent | kill virtual/libc (diff) | |
| download | gentoo-2-9146cc2bb5ec2526f27582079d87dbe9bc1e1702.tar.gz gentoo-2-9146cc2bb5ec2526f27582079d87dbe9bc1e1702.tar.bz2 gentoo-2-9146cc2bb5ec2526f27582079d87dbe9bc1e1702.zip | |
Fix handling of USE="-berkdb".
(Portage version: 14393-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/python/python-2.4.6.ebuild')
| -rw-r--r-- | dev-lang/python/python-2.4.6.ebuild | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/dev-lang/python/python-2.4.6.ebuild b/dev-lang/python/python-2.4.6.ebuild index c1f0e3875e0e..f253fde5636d 100644 --- a/dev-lang/python/python-2.4.6.ebuild +++ b/dev-lang/python/python-2.4.6.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-2.4.6.ebuild,v 1.15 2009/09/23 13:42:36 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.16 2009/09/23 15:29:49 arfrever Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage @@ -111,7 +111,7 @@ src_configure() { # Defaults to gdbm when both are enabled, #204343. local disable use berkdb || use gdbm || disable+=" dbm" - use berkdb || disable+=" bsddb" + use berkdb || disable+=" _bsddb" use gdbm || disable+=" gdbm" use ncurses || disable+=" _curses _curses_panel" use readline || disable+=" readline" @@ -246,12 +246,13 @@ src_install() { # Prevents the problem with compiling things with conflicting flags later. sed -e "s:^OPT=.*:OPT=-DNDEBUG:" -i "${D}usr/$(get_libdir)/python${PYVER}/config/Makefile" + # Python 2.4 partially doesn't respect $(get_libdir). if use build; then - rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb,email,encodings,lib-tk,test} + rm -fr "${D}"usr/lib*/python${PYVER}/{bsddb,email,encodings,lib-tk,test} else - use elibc_uclibc && rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb/test,test} - use berkdb || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb,test/test_bsddb*} - use tk || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/lib-tk" + use elibc_uclibc && rm -fr "${D}"usr/lib*/python${PYVER}/{bsddb/test,test} + use berkdb || rm -fr "${D}"usr/lib*/python${PYVER}/{bsddb,test/test_bsddb*} + use tk || rm -fr "${D}"usr/lib*/python${PYVER}/lib-tk fi prep_ml_includes usr/include/python${PYVER} |