Adjusted sqlalchemy dependency per bug #339415; removed old ebuilds

Package-Manager: portage-2.1.9.14/cvs/Linux x86_64

5 files changed, 10 insertions, 102 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/Manifest b/app-misc/gourmet/Manifest
index c311d4852073..b94f0aa050ff 100644
--- a/app-misc/gourmet/Manifest
+++ b/app-misc/gourmet/Manifest
@@ -1,13 +1,9 @@
 AUX gourmet-0.15.0-empty_dictionary_insert.patch 524 RMD160 4b39be39eba5adedeb4ca302be356f0ce177d3ed SHA1 c2d9cdc87bde4ea91e4f1d0f7970b2bd6e737225 SHA256 9718aa56d03a80e5cb9fa7f4958e9f513c5639b631371513cd20b399346217ba
 AUX gourmet-python-2.6-threading.patch 593 RMD160 139326656d5aa832672cfd463f11fa2d14744bf5 SHA1 f7bb17615aedd6137173b66ec5ce00dea0ef8fcc SHA256 418f772429e3abea12e63a99f23778dbdef38828ceb6c1a9635c4910a0e25f45
-DIST gourmet-0.15.0.tar.gz 3530571 RMD160 202873214d9ef38f43e76211fa278b171707daa6 SHA1 f371a7fd690748dca0709b02aea6c8c9e01fbe78 SHA256 1813ea735e5a503a7b3c3ff5be2a304cad3c307f548de19c3753ec7e81c65fe9
 DIST gourmet-0.15.4.tar.gz 3856704 RMD160 abc4f7f153ca02625944349d7256465578ecce1f SHA1 3b734562bcd3b147ef1ef1b1862bf4c65764c570 SHA256 ac374112a1bfe21291105cb94732ea64e8e8ceb3a7d3c678be61584bc379c4f5
-DIST gourmet-0.15.5.tar.gz 3902962 RMD160 30ceccc21f840218045be1773dd8d71504401248 SHA1 19a26089d86f0f76c1140cda0f838b23b2d1217e SHA256 df8eda06c78986fd1e71062e4e24fc9f34c4a257391802670b849e2dc668ede9
 DIST gourmet-0.15.6.tar.gz 3902560 RMD160 986c6e3107caa68b0967ed0e524eedcaea05c4d6 SHA1 dd82bbcf2f3e5b014f1f48abfa27405832ffeee1 SHA256 307c4e52c5e2e867ef60bbdccd7ed08f05dfd9a919d84c5a25bc3042a26e6af0
-EBUILD gourmet-0.15.0.ebuild 1117 RMD160 ba0de16f21ae92186f9b1902fc2f8029d451c810 SHA1 70f875dd065a511c01e3e9a224bb8fdc1047ed53 SHA256 ab7a0c8bfacd557cc8b6606db50ee89f4dd2a36fc6c8c8a12751dedbc246e8ed
 EBUILD gourmet-0.15.4-r1.ebuild 1444 RMD160 c5772a30525fdd4b684eab075c7425373e801f63 SHA1 31689f38edc3b1f5a02816aa93550d9689841fa6 SHA256 6a010a5e7a03bc4cb227e7b375879ed0f0830f4f4cdbc77479c9c739b5c3e90b
 EBUILD gourmet-0.15.4.ebuild 1193 RMD160 cda3b17ab9c9b53e87d987108366dda66ce0cb70 SHA1 f4b4965521e0284ccb3717cbc15661df279ccd2d SHA256 d3fe27e974ce45ad68bef963cb186b9c984cb46fd99b171adc69f68fb377bc6e
-EBUILD gourmet-0.15.5.ebuild 1441 RMD160 5781647d246cc695452e82b923f7cd0049a0d815 SHA1 e22b9414e713df5fd1ee64128a59a449eddce8f7 SHA256 6cf91583985ad661b572ebd2b17cd9bfc87a432e12fe3362ce836d56aff9073d
-EBUILD gourmet-0.15.6.ebuild 1433 RMD160 148fe2b1d36235dbcbc4d4d20123d260e4802289 SHA1 1cff00ecb42aa0880a32497b0f68d7091f7d9678 SHA256 a4349891936d1f3eb9485b273a53a09783ab302516dc83a832d26cd43a5f8bd8
-MISC ChangeLog 2977 RMD160 be73e3a916e945f5f85bf84da326c3510312ebe5 SHA1 4e78c0bd1179ce7376e67730a3e060d731b87381 SHA256 995c483737c24877fbfac0120f25d3e44a918ad3811077e592fe889469baf5ab
+EBUILD gourmet-0.15.6.ebuild 1439 RMD160 92f7f84ee067285cd7847a2a85b0086626c95d4e SHA1 82e33f631fab47bbeb14e6c9ecb7ac38a43e4a79 SHA256 e0efe1b9f31908d6941a1e27b82f4e0415bc05e51632589c59268fb54173b35c
+MISC ChangeLog 3190 RMD160 3551d9f4cc535de4a823966f73c9dde67dd0cb28 SHA1 205ee2ec83e694b9dbab59b8fd5d55ba4b91ff15 SHA256 2a319f07a2c3947697dd83b52878194f7a7173d38c053319dd3dcf292f2ed1bf
 MISC metadata.xml 1049 RMD160 e5c18e8b83c01c5b4db26bc6347c7b9131ea9445 SHA1 a054ab9fc77d8994d43273755df179c8e42594c9 SHA256 415dbf3f91d61c4fced37064132e5cba204214e3d0ea3403310e824b0ded3544
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]