Fix deps; add/fix USE flags; add patch to improve support for PIL

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 341D8825)

5 files changed, 90 insertions, 69 deletions

diff --git a/app-misc/gourmet/ChangeLog b/app-misc/gourmet/ChangeLog
index 77eee867608e..0213e11caae5 100644
--- a/app-misc/gourmet/ChangeLog
+++ b/app-misc/gourmet/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/gourmet
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/ChangeLog,v 1.37 2013/11/05 03:41:51 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/ChangeLog,v 1.38 2013/11/19 02:45:49 nixphoeni Exp $
+
+*gourmet-0.16.1-r2 (19 Nov 2013)
+
+  19 Nov 2013; Joe Sapp <nixphoeni@gentoo.org> -gourmet-0.16.1.ebuild,
+  -gourmet-0.16.1-r1.ebuild, +gourmet-0.16.1-r2.ebuild,
+  +files/gourmet-0.16.1-PIL-png.patch, metadata.xml:
+  Fix deps according to https://lists.launchpad.net/gourmet/msg00008.html; add
+  dependency on dev-python/elib-intl; add patch to address incomplete
+  support for PIL; add some USE flags; remove old versions of 0.16.1
 
 *gourmet-0.16.1-r1 (05 Nov 2013)
 
diff --git a/app-misc/gourmet/files/gourmet-0.16.1-PIL-png.patch b/app-misc/gourmet/files/gourmet-0.16.1-PIL-png.patch
new file mode 100644
index 000000000000..2ddbd553222f
--- /dev/null
+++ b/app-misc/gourmet/files/gourmet-0.16.1-PIL-png.patch
@@ -0,0 +1,29 @@
+From 4eb110bbbc58af97fd6994b96d9482783037058d Mon Sep 17 00:00:00 2001
+From: Bernhard Reiter <ockham@raz.or.at>
+Date: Wed, 13 Nov 2013 15:24:09 +0100
+Subject: [PATCH] Fix another PIL import.
+
+Reported at https://answers.launchpad.net/gourmet/+question/238352#comment-6
+---
+ gourmet/gtk_extras/thumbnail.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/gourmet/gtk_extras/thumbnail.py b/gourmet/gtk_extras/thumbnail.py
+index d096126..ea7e72c 100644
+--- a/gourmet/gtk_extras/thumbnail.py
++++ b/gourmet/gtk_extras/thumbnail.py
+@@ -81,7 +81,10 @@ def create_thumbnail (path, thumbpath, uri, type="large"):
+     info['Software']='Gourmet Recipe Manager'
+     info['URI']=str(uri)
+     # now we must create our image guy
+-    import PngImagePlugin
++    try:
++        from PIL import PngImagePlugin
++    except ImportError:
++        import PngImagePlugin
+     pnginfo = PngImagePlugin.PngInfo()
+ 
+     for k,v in info.items():
+-- 
+1.8.4
+
diff --git a/app-misc/gourmet/gourmet-0.16.1-r1.ebuild b/app-misc/gourmet/gourmet-0.16.1-r2.ebuild
index 6d3544715a72..8739d9713b6c 100644
--- a/app-misc/gourmet/gourmet-0.16.1-r1.ebuild
+++ b/app-misc/gourmet/gourmet-0.16.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/gourmet-0.16.1-r1.ebuild,v 1.1 2013/11/05 03:41:51 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/gourmet-0.16.1-r2.ebuild,v 1.1 2013/11/19 02:45:49 nixphoeni Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -17,26 +17,28 @@ SRC_URI="https://github.com/thinkle/gourmet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome-print pdf rtf spell web"
-
-RDEPEND=">dev-python/pygtk-2.3.96
-	dev-python/sqlalchemy
-	!=dev-python/sqlalchemy-0.6.4
-	virtual/python-imaging
-	dev-db/metakit[python]
+IUSE="-i18n -ipython pdf print spell sound web"
+
+RDEPEND=">=dev-python/pygtk-2.22.0:2[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.7.9-r1[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	i18n? ( dev-python/elib-intl[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-0.13.2[${PYTHON_USEDEP}] )
+	pdf? ( >=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+	       >=dev-python/python-poppler-0.12.1-r4[${PYTHON_USEDEP}] )
+	print? ( >=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+	         >=dev-python/python-poppler-0.12.1-r4[${PYTHON_USEDEP}] )
 	spell? ( dev-python/gtkspell-python )
-	pdf? ( dev-python/reportlab dev-python/python-poppler )
-	rtf? ( dev-python/pyrtf )
-	gnome-print? ( dev-python/libgnomeprint-python
-	               dev-python/python-poppler )
-	web? ( dev-python/beautifulsoup )"
+	sound? ( >=dev-python/gst-python-0.10.22-r1:0.10[${PYTHON_USEDEP}] )
+	web? ( >=dev-python/beautifulsoup-3.2.1-r1:python-2[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
-	>dev-python/python-distutils-extra-2.20"
+	>=dev-python/python-distutils-extra-2.37-r1[${PYTHON_USEDEP}]"
 
 PATCHES=( ${FILESDIR}/no-docs.patch \
 	${FILESDIR}/nutritional-db-fix.patch \
-	${FILESDIR}/desktop-entry.patch)
+	${FILESDIR}/desktop-entry.patch \
+	${FILESDIR}/${P}-PIL-png.patch )
 # distutils gets a bunch of default docs
 DOCS=( ChangeLog CODING FAQ TESTS TODO )
 
diff --git a/app-misc/gourmet/gourmet-0.16.1.ebuild b/app-misc/gourmet/gourmet-0.16.1.ebuild
deleted file mode 100644
index 69821aad4e83..000000000000
--- a/app-misc/gourmet/gourmet-0.16.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/gourmet-0.16.1.ebuild,v 1.1 2013/09/17 03:23:26 patrick Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Recipe Organizer and Shopping List Generator for Gnome"
-HOMEPAGE="http://thinkle.github.com/gourmet/"
-SRC_URI="https://github.com/thinkle/gourmet/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome-print pdf rtf"
-
-RDEPEND=">=dev-python/pygtk-2.3.93:2
-	dev-python/pygobject:2
-	>=dev-python/libgnome-python-2
-	>=gnome-base/libglade-2
-	dev-python/sqlalchemy
-	!=dev-python/sqlalchemy-0.6.4
-	dev-python/pillow
-	dev-python/gtkspell-python
-	dev-python/python-distutils-extra
-	dev-db/metakit[python]
-	pdf? ( dev-python/reportlab dev-python/python-poppler )
-	rtf? ( dev-python/pyrtf )
-	gnome-print? ( dev-python/libgnomeprint-python
-	               dev-python/python-poppler )"
-DEPEND="${RDEPEND}"
-
-# distutils gets a bunch of default docs
-DOCS=( TESTS FAQ )
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i "s:base_dir = '..':base_dir = '/usr/share':" gourmet/settings.py || die
-	sed -i 's:data_dir = os.path.join(base_dir, "gourmet", "data"):data_dir = os.path.join(base_dir, "gourmet"):' gourmet/settings.py || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	doman gourmet.1
-}
diff --git a/app-misc/gourmet/metadata.xml b/app-misc/gourmet/metadata.xml
index 7c7375308030..582ca0ed3962 100644
--- a/app-misc/gourmet/metadata.xml
+++ b/app-misc/gourmet/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer>
 		<email>nixphoeni@gentoo.org</email>
+		<name>Joe Sapp</name>
 	</maintainer>
 	<longdescription>
 		Gourmet Recipe Manager is an application to store, organize
@@ -19,14 +20,42 @@
 			<email>Thomas_Hinkle@alumni.brown.edu</email>
 			<name>Thomas Mills Hinkle</name>
 		</maintainer>
+		<maintainer>
+			<email>ockham@raz.or.at</email>
+			<name>Bernhard Reiter</name>
+		</maintainer>
 		<bugs-to>https://github.com/thinkle/gourmet/issues</bugs-to>
 		<remote-id type="github">thinkle/gourmet</remote-id>
 	</upstream>
 	<use>
-		<flag name='rtf'>Enable export to RTF</flag>
-		<flag name='gnome-print'>Enable pretty Python printing with
-			gnome-print</flag>
-		<flag name='web'>Enable the web import plugin</flag>
-		<flag name='spell'>Enable spell checking support</flag>
+		<flag name='gnome-print'>
+			<pkg>&lt;=app-misc/gourmet-0.15.9</pkg>
+			Enable pretty Python printing with Gnome
+		</flag>
+		<flag name='i18n'>
+			<pkg>&gt;app-misc/gourmet-0.16</pkg>
+			Enable support for i18n through elib.intl
+		</flag>
+		<flag name='ipython'>
+			<pkg>&gt;app-misc/gourmet-0.16</pkg>
+			Enable support for the interactive Python console plugin
+		</flag>
+		<flag name='pdf'>Enable export to PDF</flag>
+		<flag name='print'>
+			<pkg>&gt;app-misc/gourmet-0.16</pkg>
+			Enable pretty Python printing
+		</flag>
+		<flag name='rtf'>
+			<pkg>&lt;=app-misc/gourmet-0.15.9</pkg>
+			Enable export to RTF
+		</flag>
+		<flag name='spell'>
+			<pkg>&gt;app-misc/gourmet-0.16</pkg>
+			Enable support for the spell check plugin
+		</flag>
+		<flag name='web'>
+			<pkg>&gt;app-misc/gourmet-0.16</pkg>
+			Enable support for the web import plugin
+		</flag>
 	</use>
 </pkgmetadata>