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'

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

6 files changed, 70 insertions, 49 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/Manifest b/app-misc/gourmet/Manifest
index 95e940b9cc02..74679157f00e 100644
--- a/app-misc/gourmet/Manifest
+++ b/app-misc/gourmet/Manifest
@@ -1,4 +1,5 @@
-DIST gourmet-0.13.4-2.tar.gz 3015264 RMD160 19acfae42a3ee2ea06fad8374b4d34a5e8968f06 SHA1 944e7cc3dc4632d8ebfbf9106d0f6aa8b7435e43 SHA256 373d03f88854d575adde90e86ac64ff7182eb15d7d7c146cfa13c2b62e15583f
-EBUILD gourmet-0.13.4.ebuild 1125 RMD160 e388c6c7372a6fb0ae57e5d699f57a8167935f21 SHA1 8ce349f2b785ee0575b1822f771efb991e446012 SHA256 e444c151d1ce62427f3e8657742528fab5d3b0c50233a1c31099858739595378
-MISC ChangeLog 374 RMD160 c5884eee0bb234c7962aabed6e7f668aa29815b2 SHA1 d9d1216a1d66aff6a4098248bc504d0408f9ac6f SHA256 ed3eb18732bf9b2c0b219c10617661a33bb5d039d0478f552fc992475e6cb0bf
-MISC metadata.xml 387 RMD160 89486794c02f12bcec651ffe80ced6a07fa3316a SHA1 c6a60d8784abc20eea7b1e90a108dbdcfce5cd31 SHA256 3e3562865ea1e1c2a0ac0a667ef562730d72b6df2452ffd19e3817cbc06f8f0e
+AUX gourmet-python-2.6-threading.patch 593 RMD160 139326656d5aa832672cfd463f11fa2d14744bf5 SHA1 f7bb17615aedd6137173b66ec5ce00dea0ef8fcc SHA256 418f772429e3abea12e63a99f23778dbdef38828ceb6c1a9635c4910a0e25f45
+DIST gourmet-0.13.8.tar.gz 3080960 RMD160 948fdf94658b5c8d38230c9f05973573ae463243 SHA1 fa281e66ae1575b224dd607abdb85e5a4725f203 SHA256 87f22d3531fca142f44d22595c89b784f6f261109538282960dadbcf5167938d
+EBUILD gourmet-0.13.8.ebuild 1057 RMD160 b4d3919c46879260dfc8e59279c804f63426e497 SHA1 dddd93b829ed26092eb7dbbcfc863b0fe701acc7 SHA256 99c6a2e0a9d9cf11fa03289eb2bdd987b873682072b5690f1176062dbf9e606c
+MISC ChangeLog 764 RMD160 13bffe1830933d0b9e3fc3945d7a5765728bd2a1 SHA1 5b260309ff9dc6a7f716facf0a1de6f123e1eb1a SHA256 7de570e49516dd33bd7ccf10bb9f9963594aad0e5b4e34169d97c582d5bd21f6
+MISC metadata.xml 393 RMD160 81a90b4815ae2d942b2bbebd9859064c94bd6615 SHA1 a27a1ff99304aeb4e0d0a726038d0d86c9481437 SHA256 3476cae1d2f92c2b16d619b7e3a725eaeea5e52ff51aebff6db9bcb727e9ede8
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>