Use built-in Python sqlite3 support rather than pysqlite package.

Package-Manager: portage-2.2.0_alpha154/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

4 files changed, 39 insertions, 20 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/Manifest b/net-print/pykota/Manifest
index fb075e5b4f9d..5b1950f30e5a 100644
--- a/net-print/pykota/Manifest
+++ b/net-print/pykota/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST pykota-1.25_p2437.tar.bz2 1704330 RMD160 f11e46433bca09381018c301dd27e5e94672002b SHA1 db2fb846c6f6956a6766f783025f5a88b7f6d199 SHA256 b0d26ecaa2a0eaece67eb1040b0adcf4ab44f7a0d76380af20d4936afe7f7927
-DIST pykota-1.26.tar.xz 1377656 RMD160 b485cc88e905b62a704bcccf914c18860d85cdf9 SHA1 69db7d49553a3e81022682e19c400c9100470621 SHA256 17318092f30fb80b13ea9dbe8348fcaf66ad4efe3256e0d81b4739123955156e
-EBUILD pykota-1.25_p2437-r1.ebuild 1822 RMD160 07705918162c00a07176f888b26ec22382337795 SHA1 0d4bbe52f5e77f6267061f7d13c928308b630c8c SHA256 dca880135f14329df474295df12f7db02c2450b62747d538009c9d1940956b89
-EBUILD pykota-1.26.ebuild 1820 RMD160 121dcfc0cc90d478e9b4e86ff1389860c490c8b9 SHA1 be81893a1b5f4cd9881f209abc5940dd2e839e5d SHA256 8a3d0da74cc9eb955796735b0b301812a742ff58bc604a6af15dd8643944f383
-MISC ChangeLog 5285 RMD160 6d39399e681a3e259b42fd8dccda1f61c346253a SHA1 07ed2685376c674fb3b94fbafed90fbb17c6aaaa SHA256 a6eb0cfd98e8ebfc7b5c31e2eff401dbc6821c2ea78686b4c2e43155e9c9d72c
-MISC metadata.xml 427 RMD160 14e37f92bd061a0656aedf02bf73e86de573390d SHA1 af1a789a217fdf9918a334ddf3539eebc6373763 SHA256 0ba8afd5307d6a4e5aeb0ae19d754460edcd913dd632632721de2e93cf79043d
+DIST pykota-1.25_p2437.tar.bz2 1704330 SHA256 b0d26ecaa2a0eaece67eb1040b0adcf4ab44f7a0d76380af20d4936afe7f7927 SHA512 e4238f575ccb9e45804f2ec95a69ebc3dce9c77954dc072e2bf8470da4191df99937bc624f5f410843f868b47337109dea92f76ccf4dac881fe856696198149d WHIRLPOOL b2029f22022a9dbcc143fa298f179cbe0ba33b039453de9a58113421b8b427424e4b99f0986d16ed6615c13c360b733140792fd57732fee3767634c1519b385a
+DIST pykota-1.26.tar.xz 1377656 SHA256 17318092f30fb80b13ea9dbe8348fcaf66ad4efe3256e0d81b4739123955156e SHA512 b6b0b274a52b031837ff3ad267dcfd84e0292bf0210b46f09ed84d19c83e586297b4e0667f3338aa50cf9db13e750723c5d12868f5bfeb2079c343208cd72c1c WHIRLPOOL 8701c3367b3f0d69f454e0999513310e229d0c73bcff341d72a5d1ae25a167f90d0f2a47c67bbc2bbdb303787531a75cdef3666030d0d7bf3c71165a33df9e11
+EBUILD pykota-1.25_p2437-r1.ebuild 1961 SHA256 80ce535c54d57a3e5e6f73ec1d0fb653ea599a4f7f1e57f31f66bf2b62aa22e6 SHA512 5ffb0c1f91ca907ebf953940ee2bbfb9cc3e55b4c80f4ec345971ef7e3849753e2667277ebf28c57179bfab70c37a5d93c39771b0e2e689a051c5739c40cb265 WHIRLPOOL f8d81c45365c0d514f83296638fbb4087105e21d18c73c5031287260b98f002bbe5e52cba434f49151ebcdd6847f8de3261a1fa4810fb732ccc23131a413400f
+EBUILD pykota-1.26.ebuild 1959 SHA256 f8004b480d636f2f24d4854b873e0de81a3cf2fd548fbc343d6ce6a5050f69e6 SHA512 30d91e1402ba7d13df64692b93017a202ce6a845ce54658792fb3546fcb70e48e2138ea6dc761fdee7c905bd894d21f199728e01716a125611c3b34ebdd17397 WHIRLPOOL 341f217903390c6cea81550a575b53a6b368cb054183448395f0853bb90e634f65b04ba4ffcfe92c328b4ed236dcc76eb25a98dba28fd0caf461d563871d66d5
+MISC ChangeLog 5457 SHA256 32d8bbf145f30867ca8a20cffda3ba7a87c6cc4ab0f9419388eb8fc62df94f8f SHA512 ee52c58244e5192b4f712731bdeb5987ea356890d2da2d313546fafa01e0687c9c66173838d42f0a957394a83a2630ceab091d7eea894e5a209acc562eb97304 WHIRLPOOL b5f2f1e150cdfa25e44d5524035bd1961c939969a0750dbbe847db4863febfc516b9e042b30d2eb8ba391095e7edd7b67d24a26435f9fdfa86932ea87cca0a08
+MISC metadata.xml 427 SHA256 0ba8afd5307d6a4e5aeb0ae19d754460edcd913dd632632721de2e93cf79043d SHA512 2fcce2ae2863daa0debb6920efd870c02b93dee621d303aed686821d239ad51e47fef3eaa3ef193f357e738a8619b39ae98595e1c239a7c785f6c71e630d2889 WHIRLPOOL d3a20d98ccc34d509e946586d829cb8cbf6b6e660376cd0e229f751da994e019a36437630328fa112e27ea630deee0f7d20209e343efc7657bc81bae57653258
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9omDkACgkQVWmRsqeSphMDxACfZI9OkjzdLNG2CrvhP7aHsSCI
-Pf8An0yuxqpZQd39J66Jvg7j1t7dT6mT
-=A5Uq
+iJwEAQEIAAYFAlD4K1oACgkQfXuS5UK5QB2DxQQAj80rmFphvUpO2rA7aQQ195Oi
+1KkODmGJN/GFSOZDtQrvhQSgJ22QY/DJSwNWQhdKyN0jwhF/6j4COEwgxGr+RSj0
+8kYGt2krgvX3T9JbzD1gNMsvkrOWS6mU7Mfcwq0xIPpUQYPNrFl6XRAuROC/ssQl
+fXSaog/ks1karFgyDrg=
+=2Ng1
 -----END PGP SIGNATURE-----
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