diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-01-17 16:47:48 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-01-17 16:47:48 +0000 |
| commit | 5f7a42a1c79db9e9bf2784b7543acebaf638192e (patch) | |
| tree | 7d2974f565a4d5ee5f6f167a9e365fafb16409e7 /net-print | |
| parent | Remove improper dep on pysqlite:2 (not used in the code). (diff) | |
| download | gentoo-2-5f7a42a1c79db9e9bf2784b7543acebaf638192e.tar.gz gentoo-2-5f7a42a1c79db9e9bf2784b7543acebaf638192e.tar.bz2 gentoo-2-5f7a42a1c79db9e9bf2784b7543acebaf638192e.zip | |
Use built-in Python sqlite3 support rather than pysqlite package.
(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/pykota/ChangeLog | 9 | ||||
| -rw-r--r-- | net-print/pykota/pykota-1.25_p2437-r1.ebuild | 13 | ||||
| -rw-r--r-- | net-print/pykota/pykota-1.26.ebuild | 13 |
3 files changed, 26 insertions, 9 deletions
diff --git a/net-print/pykota/ChangeLog b/net-print/pykota/ChangeLog index ba7489626553..8e4830add6d7 100644 --- a/net-print/pykota/ChangeLog +++ b/net-print/pykota/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/pykota -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/ChangeLog,v 1.29 2012/03/20 14:46:11 jer Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/ChangeLog,v 1.30 2013/01/17 16:47:48 mgorny Exp $ + + 17 Jan 2013; Michał Górny <mgorny@gentoo.org> pykota-1.25_p2437-r1.ebuild, + pykota-1.26.ebuild: + Use built-in Python sqlite3 support rather than pysqlite package. 20 Mar 2012; Jeroen Roovers <jer@gentoo.org> pykota-1.25_p2437-r1.ebuild, pykota-1.26.ebuild: @@ -145,4 +149,3 @@ 06 Nov 2004; Christian Andreetta <satya@gentoo.org> : version bump. CVS version of pykota 1.20 - diff --git a/net-print/pykota/pykota-1.25_p2437-r1.ebuild b/net-print/pykota/pykota-1.25_p2437-r1.ebuild index 0b64107351e5..69f870966df3 100644 --- a/net-print/pykota/pykota-1.25_p2437-r1.ebuild +++ b/net-print/pykota/pykota-1.25_p2437-r1.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/pykota-1.25_p2437-r1.ebuild,v 1.8 2012/03/20 14:46:11 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/pykota-1.25_p2437-r1.ebuild,v 1.9 2013/01/17 16:47:48 mgorny Exp $ EAPI=3 PYTHON_DEPEND="2" +PYTHON_USE_WITH='sqlite?' inherit distutils @@ -24,7 +25,6 @@ DEPEND="dev-lang/python ldap? ( dev-python/python-ldap ) mysql? ( dev-python/mysql-python ) postgres? ( dev-db/postgresql-server dev-db/pygresql ) - sqlite? ( dev-python/pysqlite:2 ) snmp? ( net-analyzer/net-snmp =dev-python/pysnmp-3.4* ) xml? ( dev-python/jaxml )" RDEPEND="${DEPEND}" @@ -38,6 +38,13 @@ pkg_setup() { python_pkg_setup } +src_prepare() { + distutils_src_prepare + + sed -i -e 's:from pysqlite2 import dbapi2:import sqlite3:' \ + pykota/storages/sqlitestorage.py || die +} + src_install() { dodir /etc/${PN} || die distutils_src_install diff --git a/net-print/pykota/pykota-1.26.ebuild b/net-print/pykota/pykota-1.26.ebuild index 356c7f184c63..a9c2962a475f 100644 --- a/net-print/pykota/pykota-1.26.ebuild +++ b/net-print/pykota/pykota-1.26.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/pykota-1.26.ebuild,v 1.2 2012/03/20 14:46:11 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/pykota-1.26.ebuild,v 1.3 2013/01/17 16:47:48 mgorny Exp $ EAPI=3 PYTHON_DEPEND="2" +PYTHON_USE_WITH='sqlite?' inherit distutils @@ -24,7 +25,6 @@ DEPEND="dev-lang/python ldap? ( dev-python/python-ldap ) mysql? ( dev-python/mysql-python ) postgres? ( dev-db/postgresql-server dev-db/pygresql ) - sqlite? ( dev-python/pysqlite:2 ) snmp? ( net-analyzer/net-snmp =dev-python/pysnmp-3.4* ) xml? ( dev-python/jaxml )" RDEPEND="${DEPEND}" @@ -38,6 +38,13 @@ pkg_setup() { python_pkg_setup } +src_prepare() { + distutils_src_prepare + + sed -i -e 's:from pysqlite2 import dbapi2:import sqlite3:' \ + pykota/storages/sqlitestorage.py || die +} + src_install() { dodir /etc/${PN} || die distutils_src_install |