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
commitc53e0f80e3eaaf55a458bd7f042974d754cc7882 (patch)
tree2cce780dbc81a43b75996b87bbe49d0dc4fa2f13 /app-misc
parentx86 stable wrt bug #352280 (diff)
downloadhistorical-c53e0f80e3eaaf55a458bd7f042974d754cc7882.tar.gz
historical-c53e0f80e3eaaf55a458bd7f042974d754cc7882.tar.bz2
historical-c53e0f80e3eaaf55a458bd7f042974d754cc7882.zip
Fixed bad sqlalchemy dep per bug #353158; I think it originated from trying to fix bug #339415
Package-Manager: portage-2.1.9.35/cvs/Linux x86_64
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/gourmet/ChangeLog9
-rw-r--r--app-misc/gourmet/Manifest4
-rw-r--r--app-misc/gourmet/gourmet-0.15.7-r1.ebuild (renamed from app-misc/gourmet/gourmet-0.15.7.ebuild)10
3 files changed, 13 insertions, 10 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/Manifest b/app-misc/gourmet/Manifest
index eecd10d6a278..43c12b3b0ba2 100644
--- a/app-misc/gourmet/Manifest
+++ b/app-misc/gourmet/Manifest
@@ -1,6 +1,6 @@
DIST gourmet-0.15.6.tar.gz 3902560 RMD160 986c6e3107caa68b0967ed0e524eedcaea05c4d6 SHA1 dd82bbcf2f3e5b014f1f48abfa27405832ffeee1 SHA256 307c4e52c5e2e867ef60bbdccd7ed08f05dfd9a919d84c5a25bc3042a26e6af0
DIST gourmet-0.15.7.tar.gz 3933149 RMD160 a63dd6a511dc4d033b2827349f5f2dfe7b6031ed SHA1 64e50ac993684472817b5d684656b6b46c6943d8 SHA256 12484ef02f332c70a44c53f900e362e3688d9535f627b12d9d09778c42065944
EBUILD gourmet-0.15.6.ebuild 1436 RMD160 3ddffaa683c97e7f3e9903c972ab9b435e1b8287 SHA1 691f30b206854f977cb515baeebf1c1dd6123506 SHA256 56010986aa0b6216f240ff09301cad5baae623790744ff9edf25a6f16fa99b5e
-EBUILD gourmet-0.15.7.ebuild 1439 RMD160 1673b131141d07b22bf7a2f27f678d21a8e5bbaf SHA1 9f3ab253bd2243f7cf78ce075340492b2b1ac8a4 SHA256 b07bab03ace9f8382f3b8e66acf4e78e954eef023aa8e1ad0d13faa61a44fcdd
-MISC ChangeLog 3699 RMD160 a67874f255ac117befdd9c221c8923af22a730a0 SHA1 b8ea27752d2a3d78f6e0e42f0840ab175007f63a SHA256 02768ff919c78456ddedd93d50c2831a00772adee6c154a6d5d6362546a7f051
+EBUILD gourmet-0.15.7-r1.ebuild 1251 RMD160 3ba1dd7a0f11da309ab0ca9d392293c6307e82a2 SHA1 2bd76016df76da763df6df4b70009628c5bb7451 SHA256 4d4225b0f1ead312836d4937a7fd31dd8d581e1ec721775fa956318bdd6b3665
+MISC ChangeLog 3933 RMD160 d3b31b1abf54124e9e9c2592de784e3d334fce9c SHA1 62425ed0ba3de526835b87c1d6ebccdea6e95dba SHA256 d4e431cb8fe4507559b118bdd9cb73af53d10e8d62d7ff779f7ef5544548274c
MISC metadata.xml 1049 RMD160 e5c18e8b83c01c5b4db26bc6347c7b9131ea9445 SHA1 a054ab9fc77d8994d43273755df179c8e42594c9 SHA256 415dbf3f91d61c4fced37064132e5cba204214e3d0ea3403310e824b0ded3544
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]