Made RDEPEND adjustments and support for multiple Python ABIs

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

3 files changed, 60 insertions, 12 deletions

diff --git a/app-misc/gourmet/ChangeLog b/app-misc/gourmet/ChangeLog
index eef4aee1f055..406288c663c6 100644
--- a/app-misc/gourmet/ChangeLog
+++ b/app-misc/gourmet/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2010/07/09 13:20:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/ChangeLog,v 1.10 2010/07/12 01:43:54 nixphoeni Exp $
+
+*gourmet-0.15.4-r1 (12 Jul 2010)
+
+  12 Jul 2010; Joe Sapp <nixphoeni@gentoo.org> +gourmet-0.15.4-r1.ebuild:
+  Adjusted versions in RDEPEND; added gtkspell-python and python-poppler to
+  RDEPEND; allow installation and compilation for multiple Python ABIs
 
   09 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   -gourmet-0.13.8.ebuild:
diff --git a/app-misc/gourmet/Manifest b/app-misc/gourmet/Manifest
index c761c21fa6a8..4e76be0cfe3d 100644
--- a/app-misc/gourmet/Manifest
+++ b/app-misc/gourmet/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
 EBUILD gourmet-0.15.0.ebuild 1117 RMD160 ba0de16f21ae92186f9b1902fc2f8029d451c810 SHA1 70f875dd065a511c01e3e9a224bb8fdc1047ed53 SHA256 ab7a0c8bfacd557cc8b6606db50ee89f4dd2a36fc6c8c8a12751dedbc246e8ed
+EBUILD gourmet-0.15.4-r1.ebuild 1403 RMD160 234d89e11b7501a7a154ba5daddb4f78fad1a847 SHA1 4e0b21525814a636e31b428b54d82447553b005d SHA256 4f5147217e6cdcf48af3eab31ac2ffb9bc47568e5773b463da83882aca5df0eb
 EBUILD gourmet-0.15.4.ebuild 1194 RMD160 600deaa9671c403db5dc2fa761edbbcdc74ea4d4 SHA1 a7798ee9e9a72b6f62c9e1e6e0cddd42d294d502 SHA256 8933b2544c6f890656cd2edd8f2d2b46225fb29be76292bf655d060955d56101
-MISC ChangeLog 1805 RMD160 4fb864aa675a46133c8b8477d8aa71f4bbbe535c SHA1 b28fe13b7769a6d81cbf3c6d7883b10d34ebe31c SHA256 3d5e546146c839624635bd4b60c2be73e81f64a06964cfb27e79909ede4590d6
+MISC ChangeLog 2062 RMD160 c9db7d6b596b4d190d0570d4537ecda3b2cf5a8f SHA1 4ed945fd983945988cf256c061749382b572cb99 SHA256 a4193e6ed408b2e614b159fdfe56a1603e79a78fc89ac37a2c52ea8bc8a0bd30
 MISC metadata.xml 1039 RMD160 21efedaa4c6fb26e52257fa911102ac848a3dbc0 SHA1 5b22bdb76b873df9a1d204d4e0eca132d57cc782 SHA256 6bab2e98d97232c237e90dc6d7f28ab5ac5522c8b2e90644a5bcf82d45eb29d7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkw3IfUACgkQHB6c3gNBRYdt/ACgkp3nOGIQXBCQ5FVNwVB/djPy
-fx4AoKbV4cWTqzofTIyD14/Q4SahPeHS
-=7noi
------END PGP SIGNATURE-----
diff --git a/app-misc/gourmet/gourmet-0.15.4-r1.ebuild b/app-misc/gourmet/gourmet-0.15.4-r1.ebuild
new file mode 100644
index 000000000000..4699af6f0bf6
--- /dev/null
+++ b/app-misc/gourmet/gourmet-0.15.4-r1.ebuild
@@ -0,0 +1,51 @@
+# 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.4-r1.ebuild,v 1.1 2010/07/12 01:43:54 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-python/python-poppler
+	dev-db/metakit[python]
+	pdf? ( dev-python/reportlab )
+	rtf? ( dev-python/pyrtf )
+	gnome-print? ( >=dev-python/libgnomeprint-python-2 )"
+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
+}