diff options
| -rw-r--r-- | dev-lang/python/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/python/python-2.6.4.ebuild | 9 | ||||
| -rw-r--r-- | dev-lang/python/python-3.1.1-r1.ebuild | 7 |
3 files changed, 14 insertions, 8 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 2e1d1665868c..60d68438881e 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.431 2009/11/07 23:17:35 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.432 2009/11/29 15:29:21 arfrever Exp $ + + 29 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + python-2.6.4.ebuild, python-3.1.1-r1.ebuild: + _ctypes module doesn't work with GCC's internal libffi. 07 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> python-3.1.1-r1.ebuild: diff --git a/dev-lang/python/python-2.6.4.ebuild b/dev-lang/python/python-2.6.4.ebuild index 9ba125cae4bc..8e13b5a5e545 100644 --- a/dev-lang/python/python-2.6.4.ebuild +++ b/dev-lang/python/python-2.6.4.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.6.4.ebuild,v 1.1 2009/10/30 11:49:20 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.4.ebuild,v 1.2 2009/11/29 15:29:21 arfrever Exp $ EAPI="2" @@ -54,7 +54,8 @@ RDEPEND=">=app-admin/eselect-python-20090606 xml? ( >=dev-libs/expat-2 ) )" DEPEND="${RDEPEND} - dev-util/pkgconfig" + dev-util/pkgconfig + !sys-devel/gcc[libffi]" RDEPEND+=" !build? ( app-misc/mime-types )" PDEPEND="app-admin/python-updater" @@ -264,8 +265,8 @@ src_install() { newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} - # Installs empty directory. - rmdir "${D}usr/$(get_libdir)/${PN}${PYVER}/lib-old" + # Don't install empty directory. + rmdir "${D}usr/$(get_libdir)/python${PYVER}/lib-old" } pkg_preinst() { diff --git a/dev-lang/python/python-3.1.1-r1.ebuild b/dev-lang/python/python-3.1.1-r1.ebuild index 3ffd64ac5388..5769d8bdb54a 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.17 2009/11/07 23:17:35 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.18 2009/11/29 15:29:21 arfrever Exp $ EAPI="2" @@ -43,7 +43,8 @@ RDEPEND=">=app-admin/eselect-python-20090606 xml? ( >=dev-libs/expat-2 ) )" DEPEND="${RDEPEND} - dev-util/pkgconfig" + dev-util/pkgconfig + !sys-devel/gcc[libffi]" RDEPEND+=" !build? ( app-misc/mime-types )" PDEPEND="app-admin/python-updater =dev-lang/python-2*" @@ -160,8 +161,8 @@ src_configure() { $(use_with !ucs2 wide-unicode) \ --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man \ - --with-libc='' \ --with-dbmliborder=${dbmliborder} \ + --with-libc='' \ --with-system-ffi } |