summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Sapp <nixphoeni@gentoo.org>2011-02-07 13:06:20 +0000
committerJoe Sapp <nixphoeni@gentoo.org>2011-02-07 13:06:20 +0000
commit86a6b78ffa83eade81e69b0477285ff8606e9eb2 (patch)
treeefc4238ba165a78232ee438c4513ba68e51dd28e
parentx86 stable wrt bug #352280 (diff)
downloadgentoo-2-86a6b78ffa83eade81e69b0477285ff8606e9eb2.tar.gz
gentoo-2-86a6b78ffa83eade81e69b0477285ff8606e9eb2.tar.bz2
gentoo-2-86a6b78ffa83eade81e69b0477285ff8606e9eb2.zip
Fixed bad sqlalchemy dep per bug #353158; I think it originated from trying to fix bug #339415
(Portage version: 2.1.9.35/cvs/Linux x86_64)
-rw-r--r--app-misc/gourmet/ChangeLog9
-rw-r--r--app-misc/gourmet/gourmet-0.15.7-r1.ebuild (renamed from app-misc/gourmet/gourmet-0.15.7.ebuild)10
2 files changed, 11 insertions, 8 deletions
diff --git a/app-misc/gourmet/ChangeLog b/app-misc/gourmet/ChangeLog
index 2ea55d4a0d81..bff2320eff37 100644
--- a/app-misc/gourmet/ChangeLog
+++ b/app-misc/gourmet/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-misc/gourmet
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/ChangeLog,v 1.20 2011/01/29 02:54:56 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/ChangeLog,v 1.21 2011/02/07 13:06:20 nixphoeni Exp $
+
+*gourmet-0.15.7-r1 (07 Feb 2011)
+
+ 07 Feb 2011; Joe Sapp <nixphoeni@gentoo.org> -gourmet-0.15.7.ebuild,
+ +gourmet-0.15.7-r1.ebuild:
+ Fixed bad sqlalchemy dep per bug #353158; I think it originated from trying
+ to fix bug #339415
*gourmet-0.15.7 (29 Jan 2011)
diff --git a/app-misc/gourmet/gourmet-0.15.7.ebuild b/app-misc/gourmet/gourmet-0.15.7-r1.ebuild
index 2bdce4e730b0..70d914e50557 100644
--- a/app-misc/gourmet/gourmet-0.15.7.ebuild
+++ b/app-misc/gourmet/gourmet-0.15.7-r1.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/gourmet-0.15.7.ebuild,v 1.1 2011/01/29 02:54:56 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/gourmet-0.15.7-r1.ebuild,v 1.1 2011/02/07 13:06:20 nixphoeni Exp $
EAPI="2"
-PYTHON_DEPEND="2:2.4"
SUPPORT_PYTHON_ABIS="1"
inherit distutils python
@@ -17,14 +16,11 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gnome-print pdf rtf"
-# I wish there were a better way to check if the current Python version
-# was built with the 'sqlite' use flag and, if it wasn't, pull in pysqlite,
-# but I'm not sure how.
RDEPEND=">=dev-python/pygtk-2.3.93
>=dev-python/libgnome-python-2
>=gnome-base/libglade-2
- || ( =dev-lang/python-2*[sqlite] dev-python/pysqlite:2 )
- <dev-python/sqlalchemy-0.6.4
+ || ( >=dev-lang/python-2.4[sqlite] dev-python/pysqlite:2 )
+ !=dev-python/sqlalchemy-0.6.4
dev-python/imaging
dev-python/gtkspell-python
dev-db/metakit[python]