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

3 files changed, 21 insertions, 14 deletions

diff --git a/dev-python/kaa-base/ChangeLog b/dev-python/kaa-base/ChangeLog
index 4daf26936a7b..41d1736e5aa5 100644
--- a/dev-python/kaa-base/ChangeLog
+++ b/dev-python/kaa-base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/kaa-base
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kaa-base/ChangeLog,v 1.25 2012/08/02 22:06:12 neurogeek Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kaa-base/ChangeLog,v 1.26 2013/01/17 16:20:45 mgorny Exp $
+
+  17 Jan 2013; Michał Górny <mgorny@gentoo.org> kaa-base-0.6.0.ebuild:
+  Use built-in Python sqlite3 support rather than pysqlite package.
 
   02 Aug 2012; Jesus Rivero <neurogeek@gentoo.org> kaa-base-0.6.0.ebuild:
   Bumped to EAPI 4 and added xml(+) to PYTHON_USE_WITH
@@ -95,4 +98,3 @@
   +kaa-base-0.1.3.ebuild:
   Initial commit of ebuild by Ian Stakenvicius (_AxS_)
   <ian@syndicated-productions.com> (bug #156497)
-
diff --git a/dev-python/kaa-base/Manifest b/dev-python/kaa-base/Manifest
index 516cd3c72d9c..122f56d94ee5 100644
--- a/dev-python/kaa-base/Manifest
+++ b/dev-python/kaa-base/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST kaa-base-0.6.0.tar.gz 346849 SHA256 04fb0f610ec19a1aad1698d20829fb8caa34a97fe9cd4d9acf9f4f9f918d79b0 SHA512 685bfbab9ccdfed529ce17185f50700f8b090c0ca2f5f8e937609c9f03efd19536cc8c2ae8218415eea3ccd89269c92aa4d9bfe88ca3e951d7546ea4ce91cd6f WHIRLPOOL 4887fd6af4cfbf16701a604aacf4f78aedeb96db50c6955a7fbb15d45fd5824288b76f5aa372358fd7c0983b7ca0ea55390334a301c55bcd0e219d777ebf546e
-EBUILD kaa-base-0.6.0.ebuild 975 SHA256 6695f2b8f18a83b286441c83bffc0ce6d8cfb591a277b4deefbd5838f8c2cd3f SHA512 d5456070a6f7bb4e78eccd8d6295b1631c11faedb2e5a1478e4e2ec4c590677ad4a7be4f54386ee609c03a24d32880f85cc0fc348282e1555ce925c4feaa6584 WHIRLPOOL f9e8cc0625e139cb6ba67d0df89b35f3b8b257aa6bae896634269d521b9ec9d8fdb1baa1b3900206a3e8385ef71832dc4f44b0cc7c868b389f73ee3899b181c5
-MISC ChangeLog 3412 SHA256 830372827e2a731c07191b71c01ac4518713e36cdb9caf4dd3a8e299af8c9cfb SHA512 6dda265f38476da51a6c45ca9e5172d516c70e86c5ae78da0ebb16d923ad11689be8727cdeff937dec41e422368bfbea4fbb5dbe4d8b2b76da614b9638b0db24 WHIRLPOOL 3632c3524450dfd5786f438c4bbb1cd76378685442d89b2cc0e452f173d70b9298ec46bc6646f543fe4d2e756a71d6776278102ac5ceba9dc37e8d387fdb49a1
+EBUILD kaa-base-0.6.0.ebuild 1034 SHA256 0cb40819ea3098ff30c953132ad80538640bd9c14bfa351f1a80f30fb3977dba SHA512 fb4951bbc48e918fee28295f11ce5655614b3cb12dbd67463df0ec90b708d0998a42c7457e4683f00a2d54c4c1d11ab710a87d49f55849dca155ac4bd869c39e WHIRLPOOL e8f409c674b62bc0142856ed8c2ef9a644ebfd93a69a6d0738a5e7a85a457fedf61ebd61b5c6e6fe0b99a589cf513010c3ccf3118423746ee1b74ef6a6c3e895
+MISC ChangeLog 3550 SHA256 c219b6eba1f75eea7f125788b7fddcce6999d17de0cc619641b17c3d9364e3a1 SHA512 cc67d724a43b4c8038f7d467a390d00514b80e5b099f839d18636a4e1d613fade48c28652f7cbbca6604e13878cd4c3f690dfa51e405fc50daed1318d116dca8 WHIRLPOOL 661a8b90a1023b0661fc8af150118c8cf9c07298f9b1c09d27e275fe19992c499a5b6751dabba628dc48f0b074aa00b6baeb051d790377115cbc85d013a6eb4e
 MISC metadata.xml 679 SHA256 8657eb8a57d8702bad2327f44b32c263e06ae18da8ee8d40223c237716124cb4 SHA512 26c2e6ac3bb73555e748dc9cb90aa73556d6f902ecc2f78e6ed36c7bd9fbf0acac585b4b5709ac92ad7c01963d61b15d8c1f1dd4530bcb1f5954c00c3003715c WHIRLPOOL 385c969c33ece6748afd19ddc6cfdfda8efdf2e81c03e89a6866474c1000abfd879f76dbce4f885000dff57aa91c321ef958dd878628e00fdb9589f946c7ae6a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAawZIACgkQdIssYB9vBoMBEwCeKUZicoG8j3EHbjL1RZ1QdLml
-Uy4AmgJunMfeyu6ZXRAHsk/FWuLqjKrd
-=VUEp
+iJwEAQEIAAYFAlD4JQMACgkQfXuS5UK5QB19WAQAqbpKB3rOfufVgQaMNUG2FWjL
+GI1B/h6BvJHm6wHtdp7kBKVgEPQO8wkdQVgOTIK6F0r8pMX3MQKqKr3uFf0EevXI
+08GtyMOG3bAvi0Hctj+eCk9MNrp0BaNLMEqrMpKONnzleZT21TwHKL2UWmNasKzL
+ihINpHX4u3n1Q1pboAs=
+=3L7T
 -----END PGP SIGNATURE-----
diff --git a/dev-python/kaa-base/kaa-base-0.6.0.ebuild b/dev-python/kaa-base/kaa-base-0.6.0.ebuild
index d52464d43688..0705da2246ee 100644
--- a/dev-python/kaa-base/kaa-base-0.6.0.ebuild
+++ b/dev-python/kaa-base/kaa-base-0.6.0.ebuild
@@ -1,10 +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/dev-python/kaa-base/kaa-base-0.6.0.ebuild,v 1.8 2012/08/02 22:06:12 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kaa-base/kaa-base-0.6.0.ebuild,v 1.9 2013/01/17 16:20:45 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="threads(+)"
+PYTHON_USE_WITH="sqlite? threads(+)"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
 
@@ -21,7 +21,7 @@ IUSE="avahi ssl sqlite tls lirc"
 
 DEPEND=">=dev-libs/glib-2.4.0
 	avahi? ( net-dns/avahi[python] )
-	sqlite? ( dev-python/dbus-python >=dev-python/pysqlite-2.3.0 )"
+	sqlite? ( dev-python/dbus-python )"
 RDEPEND="${DEPEND}
 	dev-python/pynotifier
 	lirc? ( dev-python/pylirc )
@@ -34,5 +34,8 @@ PYTHON_MODNAME="kaa"
 src_prepare() {
 	distutils_src_prepare
 
+	sed -i -e 's:from pysqlite2 import dbapi2:import sqlite3:' \
+		src/db.py || die
+
 	rm -fr src/pynotifier
 }