Fix python dependencies and remove old versions still using meta that we are going to drop.

(Portage version: 2.1.10.5/cvs/Linux x86_64)

4 files changed, 10 insertions, 98 deletions

diff --git a/app-misc/gourmet/ChangeLog b/app-misc/gourmet/ChangeLog
index 7381f5ab9c0c..cb29bf7d7fb2 100644
--- a/app-misc/gourmet/ChangeLog
+++ b/app-misc/gourmet/ChangeLog
@@ -1,6 +1,11 @@
 # 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.31 2011/06/19 13:47:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/ChangeLog,v 1.32 2011/07/14 12:46:02 pacho Exp $
+
+  14 Jul 2011; Pacho Ramos <pacho@gentoo.org> -gourmet-0.15.7-r1.ebuild,
+  -gourmet-0.15.8.ebuild, gourmet-0.15.9.ebuild:
+  Fix python dependencies and remove old versions still using meta that we are
+  going to drop.
 
   19 Jun 2011; Markus Meier <maekke@gentoo.org> gourmet-0.15.9.ebuild:
   x86 stable, bug #370527
diff --git a/app-misc/gourmet/gourmet-0.15.7-r1.ebuild b/app-misc/gourmet/gourmet-0.15.7-r1.ebuild
deleted file mode 100644
index 8bf25977d1fa..000000000000
--- a/app-misc/gourmet/gourmet-0.15.7-r1.ebuild
+++ /dev/null
@@ -1,47 +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-r1.ebuild,v 1.4 2011/03/21 13:21:16 tomka Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit 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-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
-	!=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}"
-
-# 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.8.ebuild b/app-misc/gourmet/gourmet-0.15.8.ebuild
deleted file mode 100644
index 5cc0724e633d..000000000000
--- a/app-misc/gourmet/gourmet-0.15.8.ebuild
+++ /dev/null
@@ -1,47 +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.8.ebuild,v 1.3 2011/05/24 21:01:41 maekke Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit 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-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
-	!=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/gnome-python-extras
-	               dev-python/python-poppler )"
-DEPEND="${RDEPEND}"
-
-# 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.9.ebuild b/app-misc/gourmet/gourmet-0.15.9.ebuild
index 24af3ad92f14..9f54a1481c61 100644
--- a/app-misc/gourmet/gourmet-0.15.9.ebuild
+++ b/app-misc/gourmet/gourmet-0.15.9.ebuild
@@ -1,6 +1,6 @@
 # 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.9.ebuild,v 1.3 2011/06/19 13:47:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/gourmet-0.15.9.ebuild,v 1.4 2011/07/14 12:46:02 pacho Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="gnome-print pdf rtf"
 
-RDEPEND=">=dev-python/pygtk-2.3.93
+RDEPEND=">=dev-python/pygtk-2.3.93:2
+	dev-python/pygobject:2
 	>=dev-python/libgnome-python-2
 	>=gnome-base/libglade-2
 	|| ( =dev-lang/python-2*[sqlite] dev-python/pysqlite:2 )
@@ -29,7 +30,7 @@ RDEPEND=">=dev-python/pygtk-2.3.93
 	dev-db/metakit[python]
 	pdf? ( dev-python/reportlab dev-python/python-poppler )
 	rtf? ( dev-python/pyrtf )
-	gnome-print? ( dev-python/gnome-python-extras
+	gnome-print? ( dev-python/libgnomeprint-python
 	               dev-python/python-poppler )"
 DEPEND="${RDEPEND}"