Update dependencies; fix some more runtime-specific directories

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

6 files changed, 122 insertions, 2 deletions

diff --git a/app-misc/gourmet/ChangeLog b/app-misc/gourmet/ChangeLog
index ac8d15db2f0f..77eee867608e 100644
--- a/app-misc/gourmet/ChangeLog
+++ b/app-misc/gourmet/ChangeLog
@@ -1,6 +1,14 @@
 # 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.36 2013/09/17 03:23:26 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/ChangeLog,v 1.37 2013/11/05 03:41:51 nixphoeni Exp $
+
+*gourmet-0.16.1-r1 (05 Nov 2013)
+
+  05 Nov 2013; Joe Sapp <nixphoeni@gentoo.org> +gourmet-0.16.1-r1.ebuild,
+  +files/desktop-entry.patch, +files/no-docs.patch,
+  +files/nutritional-db-fix.patch, metadata.xml:
+  Update dependencies; fix some more runtime-specific directories; add 'web'
+  and 'spell' USE flags; add support for Python 2.6
 
 *gourmet-0.16.1 (17 Sep 2013)
 
diff --git a/app-misc/gourmet/files/desktop-entry.patch b/app-misc/gourmet/files/desktop-entry.patch
new file mode 100644
index 000000000000..b79aa5f7b770
--- /dev/null
+++ b/app-misc/gourmet/files/desktop-entry.patch
@@ -0,0 +1,10 @@
+--- gourmet.desktop.in
++++ gourmet.desktop.in
+@@ -4,6 +4,6 @@ _Comment=Organize recipes, create shopping lists, calculate nutritional informat
+ Exec=gourmet
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Application;Utility;
++Categories=GNOME;Utility;
+ StartupNotify=true
+ Icon=gourmet
diff --git a/app-misc/gourmet/files/no-docs.patch b/app-misc/gourmet/files/no-docs.patch
new file mode 100644
index 000000000000..0a2aa7eeec41
--- /dev/null
+++ b/app-misc/gourmet/files/no-docs.patch
@@ -0,0 +1,10 @@
+--- setup.py	2013-03-16 15:26:19.760162984 -0400
++++ setup.py	2013-03-16 15:26:26.966497095 -0400
+@@ -119,7 +119,6 @@
+ 
+     files.extend(data_files)
+     files.extend([(os.path.join(base,'ui'), glob.glob(os.path.join('ui','*.ui')))])
+-    files.extend([(os.path.join('share','doc','gourmet'), ['FAQ', 'LICENSE'])])
+     #print 'DATA FILES:',files
+     return files
+ 
diff --git a/app-misc/gourmet/files/nutritional-db-fix.patch b/app-misc/gourmet/files/nutritional-db-fix.patch
new file mode 100644
index 000000000000..4779551c89d8
--- /dev/null
+++ b/app-misc/gourmet/files/nutritional-db-fix.patch
@@ -0,0 +1,29 @@
+--- gourmet/plugins/nutritional_information/data_plugin.py	2013-08-28 19:13:38.000000000 -0400
++++ gourmet/plugins/nutritional_information/data_plugin.py	2013-10-30 23:37:51.358616037 -0400
+@@ -20,7 +20,7 @@
+             pass
+         self.db._setup_object_for_table(self.db.usda_weights_table, UsdaWeight)
+     
+-    def setup_nutrition_conversions_table (self):
++    def setup_nutritionconversions_table (self):
+         self.db.nutritionconversions_table = Table('nutritionconversions',self.db.metadata,
+                                                 Column('id',Integer(),primary_key=True),
+                                                 Column('ingkey',String(length=255),**{}),
+@@ -58,7 +58,7 @@
+         
+         self.setup_usda_weights_table()
+         self.setup_nutritionaliases_table()
+-        self.setup_nutrition_conversions_table()
++        self.setup_nutritionconversions_table()
+         self.db.do_add_nutrition = self.do_add_nutrition
+ 
+     def update_version (self, gourmet_stored, plugin_stored, gourmet_current, plugin_current):
+@@ -68,7 +68,7 @@
+             print 'RECREATE USDA WEIGHTS TABLE'
+             self.db.alter_table('usda_weights',self.setup_usda_weights_table,{},
+                              [name for lname,name,typ in parser_data.WEIGHT_FIELDS])
+-            self.db.alter_table('nutritionconversions',self.setup_nutrition_conversions_table,{},
++            self.db.alter_table('nutritionconversions',self.setup_nutritionconversions_table,{},
+                              ['ingkey','unit','factor'])
+         if plugin_stored == '1':
+             # Add choline
diff --git a/app-misc/gourmet/gourmet-0.16.1-r1.ebuild b/app-misc/gourmet/gourmet-0.16.1-r1.ebuild
new file mode 100644
index 000000000000..6d3544715a72
--- /dev/null
+++ b/app-misc/gourmet/gourmet-0.16.1-r1.ebuild
@@ -0,0 +1,61 @@
+# 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 $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite"
+# Parallel builds fail when building translations
+DISTUTILS_NO_PARALLEL_BUILD=1
+
+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 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]
+	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 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	>dev-python/python-distutils-extra-2.20"
+
+PATCHES=( ${FILESDIR}/no-docs.patch \
+	${FILESDIR}/nutritional-db-fix.patch \
+	${FILESDIR}/desktop-entry.patch)
+# distutils gets a bunch of default docs
+DOCS=( ChangeLog CODING FAQ TESTS TODO )
+
+python_prepare_all() {
+	# Modify these lines before copying them out
+	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
+	sed -i 's:\(icon_base = os.path.join(data_dir,\) "icons",:\1 "gourmet",:' gourmet/settings.py || die
+	sed -i 's:\(locale_base = os.path.join(base_dir, "gourmet",\) "build",:\1:' gourmet/settings.py || die
+	sed -i 's:\(plugin_base = os.path.join(base_dir,\) "gourmet", "build", "share",:\1:' gourmet/settings.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_prepare() {
+	distutils-r1_python_prepare
+	sed -i "s:\(lib_dir = \)'../gourmet':\1'$(python_get_sitedir)':" 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 f91220b6430f..7c7375308030 100644
--- a/app-misc/gourmet/metadata.xml
+++ b/app-misc/gourmet/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>nixphoeni@gentoo.org</email>
 	</maintainer>
 	<longdescription>
 		Gourmet Recipe Manager is an application to store, organize
@@ -26,5 +26,7 @@
 		<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>
 	</use>
 </pkgmetadata>