summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2007-09-15 12:55:47 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2007-09-15 12:55:47 +0000
commit6fde4dc934c438306ca556510453bffbadaaef68 (patch)
tree00ab3bb396972f7665e1cbbddfad729ed75d6e36
parentAdded fix to allow test routines to pass on sparc (see bug #141206). (diff)
downloadhistorical-6fde4dc934c438306ca556510453bffbadaaef68.tar.gz
historical-6fde4dc934c438306ca556510453bffbadaaef68.tar.bz2
historical-6fde4dc934c438306ca556510453bffbadaaef68.zip
Add support for sqlite in Python 2.5, in other words stop depending on pysqlite unconditionally.
Package-Manager: portage-2.1.3.9
-rw-r--r--media-sound/exaile/ChangeLog5
-rw-r--r--media-sound/exaile/Manifest16
-rw-r--r--media-sound/exaile/exaile-0.2.10-r1.ebuild12
3 files changed, 22 insertions, 11 deletions
diff --git a/media-sound/exaile/ChangeLog b/media-sound/exaile/ChangeLog
index ebf3c6597aea..a1f69ce57d14 100644
--- a/media-sound/exaile/ChangeLog
+++ b/media-sound/exaile/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-sound/exaile
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/ChangeLog,v 1.25 2007/08/11 12:34:57 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/ChangeLog,v 1.26 2007/09/15 12:55:47 drac Exp $
+
+ 15 Sep 2007; Samuli Suominen <drac@gentoo.org> exaile-0.2.10-r1.ebuild:
+ Add support for sqlite support in Python 2.5.
11 Aug 2007; Samuli Suominen <drac@gentoo.org> exaile-0.2.10-r1.ebuild:
Check for xulrunner, firefox or seamonkey USE flag in gnome-python-extras
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index 5d0bf2dd5b22..05f239768060 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -7,14 +7,14 @@ MD5 54022a1f98a785de19d4128330e35d11 files/exaile-0.2.10-visual.patch 731
RMD160 0b073739a957b36d0b47f210f1f51ec728f25689 files/exaile-0.2.10-visual.patch 731
SHA256 152a676acb56a1b4473e8a5bad572a080ef2dc61cd40b39d4deb025cb95f9cb7 files/exaile-0.2.10-visual.patch 731
DIST exaile_0.2.10.tar.gz 516304 RMD160 80a688361964659785932ff1de3be71c798f5082 SHA1 201052c99762405fa99132f6ded308543fd1998b SHA256 11cbef758b770fcab44a73b0b3d7f7daa37c1eb3c9e96cb6754e664f76609184
-EBUILD exaile-0.2.10-r1.ebuild 3259 RMD160 97cc21a323e386d4e1e868a8ec39acbe18955fd3 SHA1 b131080fcf1ffc0dfa3fb0a3abe1939bcaf033bf SHA256 15e637ee2796d075e8b0510c963fd7712d84627233dee50a7a82e2f18f683e3d
-MD5 aba552d4cee937a0259aa8bd38ce3b18 exaile-0.2.10-r1.ebuild 3259
-RMD160 97cc21a323e386d4e1e868a8ec39acbe18955fd3 exaile-0.2.10-r1.ebuild 3259
-SHA256 15e637ee2796d075e8b0510c963fd7712d84627233dee50a7a82e2f18f683e3d exaile-0.2.10-r1.ebuild 3259
-MISC ChangeLog 4308 RMD160 eb1a443d10c15d0489021c4d51e98c9b34ace0a6 SHA1 1d7bd424e18b2e8717ad0b1bb69ec97d627df302 SHA256 d860382697dbd48e28cfe966549c6b5fc557da57dc612e637210c9ef3398b07f
-MD5 0b6336b4c44b9b41dd635e065dcb3cb3 ChangeLog 4308
-RMD160 eb1a443d10c15d0489021c4d51e98c9b34ace0a6 ChangeLog 4308
-SHA256 d860382697dbd48e28cfe966549c6b5fc557da57dc612e637210c9ef3398b07f ChangeLog 4308
+EBUILD exaile-0.2.10-r1.ebuild 3614 RMD160 394cba304237a781e4c1e6e9ec95689c063ec1c9 SHA1 808574196670b4d056e8a51f28a011c6f4fde825 SHA256 d6c9f50816b2d026ca0103baf0babb61185912616bd73df9e221b52095adac90
+MD5 42e2bc4dae576bc7ab4a929eddd3eef1 exaile-0.2.10-r1.ebuild 3614
+RMD160 394cba304237a781e4c1e6e9ec95689c063ec1c9 exaile-0.2.10-r1.ebuild 3614
+SHA256 d6c9f50816b2d026ca0103baf0babb61185912616bd73df9e221b52095adac90 exaile-0.2.10-r1.ebuild 3614
+MISC ChangeLog 4431 RMD160 f31e9992c46e2139004f458217fa211ddf37c78b SHA1 f1c627c520e6a8cb82d4b664a5b2a0bab540b81f SHA256 08449d389124b71303cf83f112cdd8d19785a07207aa82a0c990a482b9f198eb
+MD5 489ab91cae5f5f8a04f9f4d96d9d9e11 ChangeLog 4431
+RMD160 f31e9992c46e2139004f458217fa211ddf37c78b ChangeLog 4431
+SHA256 08449d389124b71303cf83f112cdd8d19785a07207aa82a0c990a482b9f198eb ChangeLog 4431
MISC metadata.xml 214 RMD160 3ef8a9b331ffe9433ac2b885f83a985e0f89236f SHA1 ec7c7723b21b430e43c31acc7176045413af0225 SHA256 690c22b23be5f116a9ab2986b9fdae7b4f53788c4a8fafb369f3f636a3b619ba
MD5 97f43390489104c86df538d5759098f0 metadata.xml 214
RMD160 3ef8a9b331ffe9433ac2b885f83a985e0f89236f metadata.xml 214
diff --git a/media-sound/exaile/exaile-0.2.10-r1.ebuild b/media-sound/exaile/exaile-0.2.10-r1.ebuild
index b756ce9a0add..8f659fd32120 100644
--- a/media-sound/exaile/exaile-0.2.10-r1.ebuild
+++ b/media-sound/exaile/exaile-0.2.10-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.10-r1.ebuild,v 1.8 2007/08/11 12:36:11 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.10-r1.ebuild,v 1.9 2007/09/15 12:55:47 drac Exp $
inherit eutils fdo-mime multilib python
@@ -19,7 +19,7 @@ IUSE="aac alsa cdparanoia flac gnome ipod libnotify libsexy mad musepack ogg
oss serpentine streamripper vorbis"
RDEPEND=">=dev-python/pygtk-2.8.6
- >=dev-python/pysqlite-2.3.4-r1
+ || ( >=dev-lang/python-2.5 >=dev-python/pysqlite-2.3.4-r1 )
>=media-libs/mutagen-1.6
|| ( >=dev-lang/python-2.5 dev-python/elementtree )
dev-python/dbus-python
@@ -55,6 +55,14 @@ pkg_setup() {
die "libgpod python use-flag not set"
fi
+ if ! has_version ">=dev-python/pysqlite-2.3.4-r1"; then
+ if ! built_with_use ">=dev-lang/python-2.5" sqlite; then
+ eerror "You need to compile dev-lang/python with USE sqlite, or"
+ eerror "install >=dev-python/pysqlite-2.3.4-r1."
+ die "python 2.5 or up with sqlite support or pysqlite 2.3.5 or up required."
+ fi
+ fi
+
if use gnome; then
if ! built_with_use dev-python/gnome-python-extras xulrunner; then
if ! built_with_use dev-python/gnome-python-extras firefox; then