Bumped to 0.13.8 (bug #270944), removed 0.13.4, added patch to fix exporting issues for Python 2.6, and changed USE 'print' to 'gnome-print'

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 65 insertions, 45 deletions

diff --git a/app-misc/gourmet/ChangeLog b/app-misc/gourmet/ChangeLog
index 7a14d664193f..d7345484dc33 100644
--- a/app-misc/gourmet/ChangeLog
+++ b/app-misc/gourmet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/gourmet
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/ChangeLog,v 1.1 2008/08/15 03:09:28 nixphoeni Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/ChangeLog,v 1.2 2009/06/26 03:47:34 nixphoeni Exp $
+
+  26 Jun 2009; Joe Sapp <nixphoeni@gentoo.org> -gourmet-0.13.4.ebuild,
+  +gourmet-0.13.8.ebuild, +files/gourmet-python-2.6-threading.patch,
+  metadata.xml:
+  Bumped to 0.13.8 (thanks eva) - bug #270944. Added patch to make threading
+  (and thus exporting) work with python 2.6.
+  Removed 0.13.4 and changed USE flag 'print' to 'gnome-print' to better
+  match other USE flags in existence.
 
 *gourmet-0.13.4 (15 Aug 2008)
 
diff --git a/app-misc/gourmet/files/gourmet-python-2.6-threading.patch b/app-misc/gourmet/files/gourmet-python-2.6-threading.patch
new file mode 100644
index 000000000000..7174f8214657
--- /dev/null
+++ b/app-misc/gourmet/files/gourmet-python-2.6-threading.patch
@@ -0,0 +1,14 @@
+--- a/src/lib/GourmetThreads.py	2008-10-28 22:33:12.000000000 -0400
++++ b/src/lib/GourmetThreads.py	2009-06-25 23:24:02.000000000 -0400
+@@ -23,10 +23,9 @@
+         self.c = runnerClass
+         self.pre_hooks=pre_hooks
+         self.post_hooks=post_hooks
+-        self.name = name
+         self.completed = False
+         debug("SuspendableThread starting thread.",2)
+-        self.initialize_thread()
++        threading.Thread.__init__(self, target=self.target_func, name=name)
+ 
+     def initialize_thread (self):
+         threading.Thread.__init__(self, target=self.target_func, name=name)
diff --git a/app-misc/gourmet/gourmet-0.13.4.ebuild b/app-misc/gourmet/gourmet-0.13.4.ebuild
deleted file mode 100644
index 7ad8b6b876ca..000000000000
--- a/app-misc/gourmet/gourmet-0.13.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/gourmet-0.13.4.ebuild,v 1.1 2008/08/15 03:09:28 nixphoeni Exp $
-
-inherit eutils distutils
-
-MY_P="${P}-2"
-
-DESCRIPTION="Simple but powerful recipe-managing application"
-HOMEPAGE="http://grecipe-manager.sourceforge.net/"
-SRC_URI="mirror://sourceforge/grecipe-manager/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="print rtf"
-
-DEPEND=">=virtual/python-2.3
-	>=dev-python/pygtk-2.3.93
-	=dev-python/gnome-python-2*
-	=gnome-base/libglade-2*
-	>=dev-python/pysqlite-2.0
-	dev-python/imaging
-	dev-python/reportlab
-	dev-db/metakit
-	rtf? ( dev-python/pyrtf )
-	print? ( gnome-base/libgnomeprint
-		 dev-python/gnome-python-extras )"
-
-DOCS="README TODO PKG-INFO CHANGES"
-
-pkg_setup() {
-	if ! built_with_use 'dev-db/metakit' python ; then
-		eerror "You need to install metakit with python support. Try:"
-		eerror "USE='python' emerge metakit"
-		die "python support missing from metakit"
-	fi
-}
-
-src_install() {
-	distutils_src_install --disable-modules-check
-}
diff --git a/app-misc/gourmet/gourmet-0.13.8.ebuild b/app-misc/gourmet/gourmet-0.13.8.ebuild
new file mode 100644
index 000000000000..489fec3e0891
--- /dev/null
+++ b/app-misc/gourmet/gourmet-0.13.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/gourmet-0.13.8.ebuild,v 1.1 2009/06/26 03:47:34 nixphoeni Exp $
+
+EAPI="2"
+
+inherit distutils
+
+DESCRIPTION="Simple but powerful recipe-managing application"
+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 rtf"
+
+RDEPEND=">=virtual/python-2.3
+	>=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/imaging
+	dev-python/reportlab
+	dev-db/metakit[python]
+	rtf? ( dev-python/pyrtf )
+	gnome-print? (	>=gnome-base/libgnomeprint-2
+			>=dev-python/libgnomeprint-python-2 )"
+DEPEND="${RDEPEND}"
+
+DOCS="README TODO PKG-INFO CHANGES"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-python-2.6-threading.patch"
+}
+
+src_install() {
+	distutils_src_install --disable-modules-check
+}
diff --git a/app-misc/gourmet/metadata.xml b/app-misc/gourmet/metadata.xml
index fa2f7d35c8b1..84be566ab2e7 100644
--- a/app-misc/gourmet/metadata.xml
+++ b/app-misc/gourmet/metadata.xml
@@ -8,7 +8,7 @@
 	</maintainer>
 	<use>
 		<flag name='rtf'>Enable RTF support.</flag>
-		<flag name='print'>Enable printing support using
+		<flag name='gnome-print'>Enable printing support using
 			gnome-print.</flag>
 	</use>
 </pkgmetadata>