diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-01-17 15:57:05 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-01-17 15:57:05 +0000 |
| commit | f7bb9d3d704361e77b8eb96cc8d08c0d76884f52 (patch) | |
| tree | b23907ef501a5508c9e5955ea9047ff6280c2891 /app-misc/gnomecatalog | |
| parent | app-text/xmlstarlet: Fix out-of-prefix installation (diff) | |
| download | gentoo-2-f7bb9d3d704361e77b8eb96cc8d08c0d76884f52.tar.gz gentoo-2-f7bb9d3d704361e77b8eb96cc8d08c0d76884f52.tar.bz2 gentoo-2-f7bb9d3d704361e77b8eb96cc8d08c0d76884f52.zip | |
Use built-in sqlite3 instead of pysqlite2, bug #452126.
(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)
Diffstat (limited to 'app-misc/gnomecatalog')
| -rw-r--r-- | app-misc/gnomecatalog/ChangeLog | 7 | ||||
| -rw-r--r-- | app-misc/gnomecatalog/gnomecatalog-0.3.4.2.ebuild | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/app-misc/gnomecatalog/ChangeLog b/app-misc/gnomecatalog/ChangeLog index 749546cdbf2e..fd751537bb82 100644 --- a/app-misc/gnomecatalog/ChangeLog +++ b/app-misc/gnomecatalog/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-misc/gnomecatalog -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gnomecatalog/ChangeLog,v 1.5 2012/03/18 19:16:57 pacho Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/gnomecatalog/ChangeLog,v 1.6 2013/01/17 15:57:05 mgorny Exp $ + + 17 Jan 2013; Michał Górny <mgorny@gentoo.org> gnomecatalog-0.3.4.2.ebuild: + Use built-in sqlite3 instead of pysqlite2, bug #452126. 18 Mar 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml: Drop maintainer due retirement, bug #391429. diff --git a/app-misc/gnomecatalog/gnomecatalog-0.3.4.2.ebuild b/app-misc/gnomecatalog/gnomecatalog-0.3.4.2.ebuild index 9ce8bdaaefdd..0ad62da369fb 100644 --- a/app-misc/gnomecatalog/gnomecatalog-0.3.4.2.ebuild +++ b/app-misc/gnomecatalog/gnomecatalog-0.3.4.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gnomecatalog/gnomecatalog-0.3.4.2.ebuild,v 1.3 2011/03/27 11:59:53 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gnomecatalog/gnomecatalog-0.3.4.2.ebuild,v 1.4 2013/01/17 15:57:05 mgorny Exp $ EAPI="3" PYTHON_DEPEND="2:2.6" -PYTHON_USE_WITH="xml" +PYTHON_USE_WITH="sqlite,xml" SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython" @@ -25,7 +25,6 @@ RDEPEND="dev-python/gconf-python:2 dev-python/libgnome-python:2 dev-python/pygobject:2 >=dev-python/pygtk-2.4:2 - dev-python/pysqlite:2 dev-python/pyvorbis >=gnome-base/libglade-2:2.0 >=x11-libs/gtk+-2.4:2" @@ -34,4 +33,8 @@ DEPEND="${RDEPEND}" src_prepare() { # Fix importing from a single folder in /media epatch "${FILESDIR}/${P}-dbus.patch" + + # Use sqlite3 instead of pysqlite2, bug #452126. + sed -i -e 's:from pysqlite2 import dbapi2:import sqlite3:' \ + gnomecatalog/storage.py || die } |