summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-01-17 16:20:45 +0000
committerMichał Górny <mgorny@gentoo.org>2013-01-17 16:20:45 +0000
commit99f8a45fadb023211b176c56ab1afc8068d38229 (patch)
tree62a3df848617b9bb3b8f2769772635753b0044bf
parentold (diff)
downloadgentoo-2-99f8a45fadb023211b176c56ab1afc8068d38229.tar.gz
gentoo-2-99f8a45fadb023211b176c56ab1afc8068d38229.tar.bz2
gentoo-2-99f8a45fadb023211b176c56ab1afc8068d38229.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)
-rw-r--r--dev-python/kaa-base/ChangeLog8
-rw-r--r--dev-python/kaa-base/kaa-base-0.6.0.ebuild11
2 files changed, 12 insertions, 7 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/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
}