diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-10-11 11:02:35 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-10-11 11:02:35 +0000 |
| commit | 1e9dd3c93390bc5a250e4cad02404bb61f85c9c9 (patch) | |
| tree | 8528db188fe1b423e5c680e13dc3d0da1583e5ba /dev-python/pysqlite | |
| parent | ppc stable #282290 (diff) | |
| download | gentoo-2-1e9dd3c93390bc5a250e4cad02404bb61f85c9c9.tar.gz gentoo-2-1e9dd3c93390bc5a250e4cad02404bb61f85c9c9.tar.bz2 gentoo-2-1e9dd3c93390bc5a250e4cad02404bb61f85c9c9.zip | |
Merge from Prefix
(Portage version: 2.2.00.14552-prefix/cvs/Darwin powerpc, RepoMan options: --force)
Diffstat (limited to 'dev-python/pysqlite')
| -rw-r--r-- | dev-python/pysqlite/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/pysqlite/pysqlite-2.5.5-r1.ebuild | 13 |
2 files changed, 14 insertions, 4 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} |