diff options
| -rw-r--r-- | dev-python/pysqlite/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/pysqlite/pysqlite-2.5.5-r1.ebuild | 13 | ||||
| -rw-r--r-- | dev-python/python-cdb/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/python-cdb/python-cdb-0.34.ebuild | 4 | ||||
| -rw-r--r-- | dev-python/python-dateutil/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/python-dateutil/python-dateutil-1.4.1-r1.ebuild | 7 |
6 files changed, 29 insertions, 11 deletions
diff --git a/dev-python/pysqlite/ChangeLog b/dev-python/pysqlite/ChangeLog index e4ffd8a8901c..863fd28b612b 100644 --- a/dev-python/pysqlite/ChangeLog +++ b/dev-python/pysqlite/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/pysqlite # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/ChangeLog,v 1.101 2009/10/10 10:01:58 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/ChangeLog,v 1.102 2009/10/11 11:02:35 grobian Exp $ + + 11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pysqlite-2.5.5-r1.ebuild: + Merge from Prefix 10 Oct 2009; Markus Meier <maekke@gentoo.org> pysqlite-2.5.5-r1.ebuild: amd64/x86 stable, bug #287572 diff --git a/dev-python/pysqlite/pysqlite-2.5.5-r1.ebuild b/dev-python/pysqlite/pysqlite-2.5.5-r1.ebuild index 9d1966b64e5b..47e22f85f49c 100644 --- a/dev-python/pysqlite/pysqlite-2.5.5-r1.ebuild +++ b/dev-python/pysqlite/pysqlite-2.5.5-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-python/pysqlite/pysqlite-2.5.5-r1.ebuild,v 1.4 2009/10/10 10:01:58 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/pysqlite-2.5.5-r1.ebuild,v 1.5 2009/10/11 11:02:35 grobian Exp $ EAPI="2" @@ -14,7 +14,7 @@ DESCRIPTION="Python wrapper for the local database Sqlite" SRC_URI="http://oss.itsystementwicklung.de/download/pysqlite/${PV:0:3}/${PV}/pysqlite-${PV}.tar.gz" HOMEPAGE="http://pysqlite.org/" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" LICENSE="pysqlite" SLOT="2" IUSE="examples" @@ -37,12 +37,19 @@ src_prepare() { # Correct encoding. sed -i -e "s/\(coding: \)ISO-8859-1/\1utf-8/" \ pysqlite2/__init__.py pysqlite2/dbapi2.py || die "sed failed" + # setup.cfg has hardcoded non-prefix paths, kill them + cd "${S}" + sed -i \ + -e '/^include_dirs=/d' \ + -e '/^library_dirs=/d' \ + setup.cfg } src_install() { + [[ -z ${ED} ]] && local ED=${D} distutils_src_install - rm -rf "${D}"/usr/pysqlite2-doc + rm -rf "${ED}"/usr/pysqlite2-doc if use examples; then insinto /usr/share/doc/${PF} diff --git a/dev-python/python-cdb/ChangeLog b/dev-python/python-cdb/ChangeLog index d21c02757c6e..d650f00531e4 100644 --- a/dev-python/python-cdb/ChangeLog +++ b/dev-python/python-cdb/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/python-cdb # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-cdb/ChangeLog,v 1.22 2009/09/12 23:23:33 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-cdb/ChangeLog,v 1.23 2009/10/11 11:04:08 grobian Exp $ + + 11 Oct 2009; Fabian Groffen <grobian@gentoo.org> python-cdb-0.34.ebuild: + Merge from Prefix *python-cdb-0.34 (13 Sep 2009) diff --git a/dev-python/python-cdb/python-cdb-0.34.ebuild b/dev-python/python-cdb/python-cdb-0.34.ebuild index ce392ef4c1ed..d2daa3408aae 100644 --- a/dev-python/python-cdb/python-cdb-0.34.ebuild +++ b/dev-python/python-cdb/python-cdb-0.34.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-python/python-cdb/python-cdb-0.34.ebuild,v 1.1 2009/09/12 23:23:33 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-cdb/python-cdb-0.34.ebuild,v 1.2 2009/10/11 11:04:08 grobian Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -14,7 +14,7 @@ HOMEPAGE="http://pilcrow.madison.wi.us/#pycdb" SLOT="0" IUSE="" LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" DEPEND="dev-db/cdb" RDEPEND="${DEPEND}" diff --git a/dev-python/python-dateutil/ChangeLog b/dev-python/python-dateutil/ChangeLog index 9090b6bf2b11..5db782cc0b1b 100644 --- a/dev-python/python-dateutil/ChangeLog +++ b/dev-python/python-dateutil/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/python-dateutil # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dateutil/ChangeLog,v 1.18 2009/09/04 18:25:29 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dateutil/ChangeLog,v 1.19 2009/10/11 11:05:59 grobian Exp $ + + 11 Oct 2009; Fabian Groffen <grobian@gentoo.org> + python-dateutil-1.4.1-r1.ebuild: + Merge from Prefix 04 Sep 2009; Patrick Lauer <patrick@gentoo.org> -python-dateutil-1.3.ebuild: diff --git a/dev-python/python-dateutil/python-dateutil-1.4.1-r1.ebuild b/dev-python/python-dateutil/python-dateutil-1.4.1-r1.ebuild index 3e5243c50748..1f3a36cf46c8 100644 --- a/dev-python/python-dateutil/python-dateutil-1.4.1-r1.ebuild +++ b/dev-python/python-dateutil/python-dateutil-1.4.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-python/python-dateutil/python-dateutil-1.4.1-r1.ebuild,v 1.1 2009/01/20 13:56:28 neurogeek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dateutil/python-dateutil-1.4.1-r1.ebuild,v 1.2 2009/10/11 11:05:59 grobian Exp $ EAPI=2 NEED_PYTHON=2.3 @@ -12,7 +12,7 @@ SRC_URI="http://labix.org/download/python-dateutil/${P}.tar.gz" LICENSE="PSF-2.3" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~x86" +KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="" DOCS="NEWS README" @@ -34,8 +34,9 @@ src_test() { } src_install() { + [[ -z ${ED} ]] && local ED=${D} distutils_src_install insinto /usr/share/doc/${PF}/examples doins example.py sandbox/*.py - rm -f "${D}"/usr/lib*/python*/site-packages/dateutil/zoneinfo/*.tar.* + rm -f "${ED}"/usr/lib*/python*/site-packages/dateutil/zoneinfo/*.tar.* } |