summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2012-08-29 05:03:09 +0000
committerMart Raudsepp <leio@gentoo.org>2012-08-29 05:03:09 +0000
commit68c4dc6b63f37a55df52f2322bfde31a6d1eb601 (patch)
tree0f9694bc01942769a7e83af61dbc118718bb1623 /gnome-extra
parent[dev-util/catalyst-9999] Update ebuild now that 9999 (master) = catalyst_2 br... (diff)
downloadgentoo-2-68c4dc6b63f37a55df52f2322bfde31a6d1eb601.tar.gz
gentoo-2-68c4dc6b63f37a55df52f2322bfde31a6d1eb601.tar.bz2
gentoo-2-68c4dc6b63f37a55df52f2322bfde31a6d1eb601.zip
QA: Fix python[sqlite] depend to eclass method. This avoids portage trying to satisfy the sqlite USE dep by installing a python3 version with USE=sqlite if no version is installed with USE=sqlite, and properly requiring it of a python2 SLOT instead (though not necessarily the latest python2 we end up using)
(Portage version: 2.2.0_alpha122/cvs/Linux i686)
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/hamster-applet/ChangeLog9
-rw-r--r--gnome-extra/hamster-applet/hamster-applet-2.32.1.ebuild6
2 files changed, 11 insertions, 4 deletions
diff --git a/gnome-extra/hamster-applet/ChangeLog b/gnome-extra/hamster-applet/ChangeLog
index 6fcd4e701aa1..5ad27ab5f03f 100644
--- a/gnome-extra/hamster-applet/ChangeLog
+++ b/gnome-extra/hamster-applet/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for gnome-extra/hamster-applet
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/ChangeLog,v 1.45 2012/05/05 06:25:22 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/ChangeLog,v 1.46 2012/08/29 05:03:09 leio Exp $
+
+ 29 Aug 2012; Mart Raudsepp <leio@gentoo.org> hamster-applet-2.32.1.ebuild:
+ QA: Fix python[sqlite] depend to eclass method. This avoids portage trying to
+ satisfy the sqlite USE dep by installing a python3 version with USE=sqlite if
+ no version is installed with USE=sqlite, and properly requiring it of a
+ python2 SLOT instead (though not necessarily the latest python2 we end up
+ using)
05 May 2012; Jeff Horelick <jdhore@gentoo.org> hamster-applet-2.32.1.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/gnome-extra/hamster-applet/hamster-applet-2.32.1.ebuild b/gnome-extra/hamster-applet/hamster-applet-2.32.1.ebuild
index 2425407cfc61..9cb7e7011da2 100644
--- a/gnome-extra/hamster-applet/hamster-applet-2.32.1.ebuild
+++ b/gnome-extra/hamster-applet/hamster-applet-2.32.1.ebuild
@@ -1,10 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/hamster-applet-2.32.1.ebuild,v 1.8 2012/05/05 06:25:22 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/hamster-applet-2.32.1.ebuild,v 1.9 2012/08/29 05:03:09 leio Exp $
EAPI="3"
GCONF_DEBUG="no"
PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="sqlite"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
@@ -19,8 +20,7 @@ SLOT="0"
KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
IUSE="eds libnotify"
-RDEPEND=">=dev-lang/python-2.5[sqlite]
- dev-python/gconf-python
+RDEPEND="dev-python/gconf-python
dev-python/libgnome-python
dev-python/libwnck-python
dev-python/gnome-applets-python