From 86a6b78ffa83eade81e69b0477285ff8606e9eb2 Mon Sep 17 00:00:00 2001
From: Joe Sapp <nixphoeni@gentoo.org>
Date: Mon, 7 Feb 2011 13:06:20 +0000
Subject: 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)
---
 app-misc/gourmet/ChangeLog                |  9 +++++-
 app-misc/gourmet/gourmet-0.15.7-r1.ebuild | 46 ++++++++++++++++++++++++++++
 app-misc/gourmet/gourmet-0.15.7.ebuild    | 50 -------------------------------
 3 files changed, 54 insertions(+), 51 deletions(-)
 create mode 100644 app-misc/gourmet/gourmet-0.15.7-r1.ebuild
 delete mode 100644 app-misc/gourmet/gourmet-0.15.7.ebuild

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-r1.ebuild b/app-misc/gourmet/gourmet-0.15.7-r1.ebuild
new file mode 100644
index 000000000000..70d914e50557
--- /dev/null
+++ b/app-misc/gourmet/gourmet-0.15.7-r1.ebuild
@@ -0,0 +1,46 @@
+# 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-r1.ebuild,v 1.1 2011/02/07 13:06:20 nixphoeni Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils python
+
+DESCRIPTION="Recipe Organizer and Shopping List Generator for Gnome"
+HOMEPAGE="http://grecipe-manager.sourceforge.net/"
+SRC_URI="mirror://sourceforge/grecipe-manager/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome-print pdf rtf"
+
+RDEPEND=">=dev-python/pygtk-2.3.93
+	>=dev-python/libgnome-python-2
+	>=gnome-base/libglade-2
+	|| ( >=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]
+	pdf? ( dev-python/reportlab dev-python/python-poppler )
+	rtf? ( dev-python/pyrtf )
+	gnome-print? ( >=dev-python/libgnomeprint-python-2
+	               dev-python/python-poppler )"
+DEPEND="${RDEPEND}"
+
+RESTRICT_PYTHON_ABIS="3.*"
+
+# distutils gets a bunch of default docs
+DOCS="TESTS FAQ"
+
+src_prepare() {
+	distutils_src_prepare
+	python_convert_shebangs -r --quiet 2 .
+}
+
+src_install() {
+	distutils_src_install --disable-modules-check
+	doman gourmet.1
+}
diff --git a/app-misc/gourmet/gourmet-0.15.7.ebuild b/app-misc/gourmet/gourmet-0.15.7.ebuild
deleted file mode 100644
index 2bdce4e730b0..000000000000
--- a/app-misc/gourmet/gourmet-0.15.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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 $
-
-EAPI="2"
-PYTHON_DEPEND="2:2.4"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils python
-
-DESCRIPTION="Recipe Organizer and Shopping List Generator for Gnome"
-HOMEPAGE="http://grecipe-manager.sourceforge.net/"
-SRC_URI="mirror://sourceforge/grecipe-manager/${P}.tar.gz"
-
-LICENSE="GPL-2"
-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-python/imaging
-	dev-python/gtkspell-python
-	dev-db/metakit[python]
-	pdf? ( dev-python/reportlab dev-python/python-poppler )
-	rtf? ( dev-python/pyrtf )
-	gnome-print? ( >=dev-python/libgnomeprint-python-2
-	               dev-python/python-poppler )"
-DEPEND="${RDEPEND}"
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-# distutils gets a bunch of default docs
-DOCS="TESTS FAQ"
-
-src_prepare() {
-	distutils_src_prepare
-	python_convert_shebangs -r --quiet 2 .
-}
-
-src_install() {
-	distutils_src_install --disable-modules-check
-	doman gourmet.1
-}
-- 
cgit v1.2.3-65-gdbad