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

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

5 files changed, 15 insertions, 107 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/Manifest b/app-misc/gourmet/Manifest
index c3a28fae762b..1448e2fb3c83 100644
--- a/app-misc/gourmet/Manifest
+++ b/app-misc/gourmet/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST gourmet-0.15.7.tar.gz 3933149 RMD160 a63dd6a511dc4d033b2827349f5f2dfe7b6031ed SHA1 64e50ac993684472817b5d684656b6b46c6943d8 SHA256 12484ef02f332c70a44c53f900e362e3688d9535f627b12d9d09778c42065944
-DIST gourmet-0.15.8.tar.gz 3933181 RMD160 f1f390fc79fb76ffde7f3caa20ace955bd6e349d SHA1 b217f0527edb4293a7a0ef04ddb8a3813c65a4e8 SHA256 b057e69ff54535d1c72d074c7fc97463812d42ca5cdbdabff31f45abc3d920f9
 DIST gourmet-0.15.9.tar.gz 3933250 RMD160 78ac08e4c2a094795929c28b8f82405df9a8b676 SHA1 74fa082bf007f545a050c8526ec39045320e2f34 SHA256 a1d101a497bd573bbc3c05c4398a6e9db7d7393427128c60d0cd832596b91b8c
-EBUILD gourmet-0.15.7-r1.ebuild 1285 RMD160 50c533cededfe8d3b603cd975330f515c285a366 SHA1 e6676f4fff1d5973b77de3b75072ca750832b180 SHA256 2d4cd732792eb7e7c9b62c2a75e040c71f56a18adb2d6b5b876b5f2e10381957
-EBUILD gourmet-0.15.8.ebuild 1278 RMD160 b45f9f87d95de0e3712cada465af052b7a8b1f8e SHA1 d809e70cb4013729a132185d425869ce1519cdc2 SHA256 64eaad8e0af4cb2465bf3ec3e36cb15402bfdf2a5d67d541e16266d01fac89dc
-EBUILD gourmet-0.15.9.ebuild 1278 RMD160 89fb8eadeda0a2ca39638db4a2211c40f99098bd SHA1 1d78ac0b4d5e3dde98d0f3261e2ae620f9c0ff85 SHA256 268226aaded78d5dd885ad0d4408b69ee964f55c0b3908bf1c66f1baad4368c3
-MISC ChangeLog 5140 RMD160 6d44549577e7dd79a796281f973e51a3bd6543d8 SHA1 7cdba611ae9dbbe4544c6fe716a45c2a2ab5188a SHA256 586260798f9a3336d27ef5c7d745e035ac94a27cd370d315fa190f2dada6fd9c
+EBUILD gourmet-0.15.9.ebuild 1304 RMD160 e0a7e9798e1daf9ad27105c0616041258da6b0d7 SHA1 19f6f4cdc600be0e29d6f2dc0081c99fbf7275b3 SHA256 8351a1f2c42c3165420e9fd97510120e2fc689659de4c6e1b9eeef69f2e1b967
+MISC ChangeLog 5358 RMD160 4b3d8170b8d679f2d4e621e31ceebe403164eb2c SHA1 9b288113aba99c6f0b09a1580532825f91cecac2 SHA256 19f482e11f2de87c19e787d85cc287410576d3c7c9e5979ce560896c66864f43
 MISC metadata.xml 1049 RMD160 e5c18e8b83c01c5b4db26bc6347c7b9131ea9445 SHA1 a054ab9fc77d8994d43273755df179c8e42594c9 SHA256 415dbf3f91d61c4fced37064132e5cba204214e3d0ea3403310e824b0ded3544
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk39/icACgkQkKaRLQcq0GIP0wCgpM46p9YggWy9HnzsByBTAGS+
-18gAn2OwL9r271Uh9cH9NELsjvky/5u0
-=uv8k
+iEYEARECAAYFAk4e5RAACgkQCaWpQKGI+9Q+kwCgg1Hq4BRA9avl8qVH65OKI1+g
+sm4AnAwOCpCUFHh5cBfbN9gyHD3SBZe/
+=38vE
 -----END PGP SIGNATURE-----
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}"