Adjusted sqlalchemy dependency per bug #339415; removed old ebuilds

(Portage version: 2.1.9.14/cvs/Linux x86_64)

4 files changed, 8 insertions, 96 deletions

diff --git a/app-misc/gourmet/ChangeLog b/app-misc/gourmet/ChangeLog
index a46225c95550..d79011e2989d 100644
--- a/app-misc/gourmet/ChangeLog
+++ b/app-misc/gourmet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/gourmet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/ChangeLog,v 1.16 2010/10/06 17:09:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/ChangeLog,v 1.17 2010/10/09 20:00:31 nixphoeni Exp $
+
+  09 Oct 2010; Joe Sapp <nixphoeni@gentoo.org> -gourmet-0.15.0.ebuild,
+  -gourmet-0.15.5.ebuild, gourmet-0.15.6.ebuild:
+  Adjusted sqlalchemy dependency per bug #339415 (thanks Ben Scanlon);
+  removed old ebuilds
 
   06 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   gourmet-0.15.6.ebuild:
diff --git a/app-misc/gourmet/gourmet-0.15.0.ebuild b/app-misc/gourmet/gourmet-0.15.0.ebuild
deleted file mode 100644
index 2fb848260c4c..000000000000
--- a/app-misc/gourmet/gourmet-0.15.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/gourmet-0.15.0.ebuild,v 1.3 2010/02/07 20:24:05 pva Exp $
-
-EAPI="2"
-
-inherit eutils distutils
-
-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-lang/python-2.4
-	>=dev-python/pygtk-2.3.93
-	>=dev-python/libgnome-python-2
-	>=gnome-base/libglade-2
-	|| ( >=dev-lang/python-2.5[sqlite]
-	     >=dev-python/pysqlite-2 )
-	>=dev-python/sqlalchemy-0.5.5
-	dev-python/imaging
-	dev-db/metakit[python]
-	pdf? ( dev-python/reportlab )
-	rtf? ( dev-python/pyrtf )
-	gnome-print? ( >=dev-python/libgnomeprint-python-2 )"
-DEPEND="${RDEPEND}"
-
-# distutils gets a bunch of default docs
-DOCS="TESTS FAQ"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-empty_dictionary_insert.patch"
-}
-
-src_install() {
-	distutils_src_install --disable-modules-check
-	doman gourmet.1
-}
diff --git a/app-misc/gourmet/gourmet-0.15.5.ebuild b/app-misc/gourmet/gourmet-0.15.5.ebuild
deleted file mode 100644
index d69596f27954..000000000000
--- a/app-misc/gourmet/gourmet-0.15.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/gourmet-0.15.5.ebuild,v 1.1 2010/07/13 00:51:50 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[sqlite]
-	     dev-python/pysqlite:2 )
-	=dev-python/sqlalchemy-0.5.8
-	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.6.ebuild b/app-misc/gourmet/gourmet-0.15.6.ebuild
index 9a2d2dbc2e30..7cd564bba007 100644
--- a/app-misc/gourmet/gourmet-0.15.6.ebuild
+++ b/app-misc/gourmet/gourmet-0.15.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/gourmet-0.15.6.ebuild,v 1.4 2010/10/06 17:09:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/gourmet-0.15.6.ebuild,v 1.5 2010/10/09 20:00:31 nixphoeni Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2:2.4"
@@ -25,7 +25,7 @@ RDEPEND=">=dev-python/pygtk-2.3.93
 	>=gnome-base/libglade-2
 	|| ( dev-lang/python[sqlite]
 	     dev-python/pysqlite:2 )
-	dev-python/sqlalchemy
+	<dev-python/sqlalchemy-0.6.4
 	dev-python/imaging
 	dev-python/gtkspell-python
 	dev-db/metakit[python]