Update dependencies; fix some more runtime-specific directories

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xC01FFE9C

7 files changed, 128 insertions, 4 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/Manifest b/app-misc/gourmet/Manifest
index 51e8fb62b76e..4dde9ba4e840 100644
--- a/app-misc/gourmet/Manifest
+++ b/app-misc/gourmet/Manifest
@@ -1,6 +1,10 @@
+AUX desktop-entry.patch 291 SHA256 cc1e41d9a426639bc19465d0dbd6b6b041643a8eccdd4a98665f3b27723b0a60 SHA512 f93f41082a6483828dd9c579c00f3b4c39574370d76954223f9b1b17663bab389b941461dfa3c7aa82c045b97d1a326791b3ed8ea6bcafad17bb879db068aff7 WHIRLPOOL 6c08c0ef0afded0072d8cd251488c6c19f7e96c7a8252401d1c3ed22404425e739beb16175a15fc51cd52647a398462e640bd232ebbcdf9ef23b5562f0549596
+AUX no-docs.patch 368 SHA256 db36e04a36e35c8bccdd27086eaf4afc5f434c577515ff541ed30dcfa9a82a30 SHA512 432199437c678033bfd4c2fe7188a274045acc8ba93a48634719c34e0d53314e1f76c067c16efcbbe6d063c456cc7cd03ba3a7a73702cb9ef2c40495f337f93b WHIRLPOOL 996f3180f256bf90a26aa948478983641690f54b6d01ef00b17be1cca8f3e2e83e2730b5f6328d4103571c21949e5959154f25cf4d6054f9ee4ad8aaa0a19d23
+AUX nutritional-db-fix.patch 1608 SHA256 cfd71eb5d89defde7019837b12105dca16170281e313237b98a29f6921fc7387 SHA512 e9fecdf247ba40a00f2c0a8ad1d77aae0fa7117941ff547238006f8b2aea9aef402c98cbd57718627231fe198e132511899837eb4f6846f93026ca9b30c0a28c WHIRLPOOL f3109578371dc949d4984f0e8c71d0e31deb4aa690f79440763ae5cc96e13c5275b99cc9e290c73fab5a06b2cb5aefa8c722c1515639d909ada24b8525368f6e
 DIST gourmet-0.15.9.tar.gz 3933250 SHA256 a1d101a497bd573bbc3c05c4398a6e9db7d7393427128c60d0cd832596b91b8c SHA512 4eb437606feb69339c38220dd54f4eff06fda8b1d36922fa9a5638f5aac686336889e2c9be90a094af25fe5bc8e29e5f3434ac804a1a704ab262bcef3d7de315 WHIRLPOOL 90c97f02d4b6fed139ed1f5a6deaf63c416ddc73802d1909cee45c446140473b6b87ffbe310b25c128719deebedf53d8644656f129b8528e241ffe50b26d60aa
 DIST gourmet-0.16.1.tar.gz 11130774 SHA256 860b88d2dd0f952fb10e07497877579ab5ad75d0ea45c32058b7f80233a3b107 SHA512 d0df893d289209ee292cf3702671b5d8b04f3367e65e2d7323de4cfe71286cfa14d02d0e9fa63d6afd7bb511251ca43555ecc61a9da05f6197beba20d72dd737 WHIRLPOOL e51dd6aeb68430e064aee672d350bbf74c0935b22216c30a8a89d5ea48804c5ef173cb13534aade658f1d95a784f3cd3815eb98affc00e36343f55facd76d2ad
 EBUILD gourmet-0.15.9.ebuild 1281 SHA256 2299cfc502af372daaa644a8f942910635ed579714bb0a2d0b6667dd9a17ef41 SHA512 152665b1e7fb14dbb406f1a0ce3c2a90883fcea3d8daf175e902023371b774bc4dd63820074082d0d8fc6064da35bcad9afa648006506136972457e416beaa56 WHIRLPOOL 2b9ed126a00621ec6af4fba4335b145faef0b00f337eb281e48f1101b934d75128458538b05bfad5261f0b9253bf492041acba9e4a90b314e37b200621a3f475
+EBUILD gourmet-0.16.1-r1.ebuild 2190 SHA256 b5a2f3b11398d269ee09d0b8a2302c5078f0f0223c86cab518a6df279aebe510 SHA512 fb9753368f1a3ffaba8cd748901ee1339cce6cbb0c2ae0458b5b595ce545d47a68948e53a564e1982981dba0222616e68e2eb032a02292cc5e899bad7341d55b WHIRLPOOL efd8b361297a77601e45b8fddb5502b1360052ccf2a3b90cecdf67944e75f0cf8616404479a9335fd28e5d32b5d3c4f35d7a663c2329efbf6186eda6d20c1622
 EBUILD gourmet-0.16.1.ebuild 1440 SHA256 ce77216a4b62d969a0e4a88d82ba2b103896beb9e3a569ac19afbdb60da30914 SHA512 8062737bdc9891a0502fb58e07c55cf683e9a506c84dba8ab6081aa69fe81ac66ef57b9130f6a68ccd382d04958531d16e5941b2c8f4e4d4d7097a99bbf1c293 WHIRLPOOL 663766ab2f4ff0ea69f2bc6ca1b50e5e61ff3cffc84d97086d42105a0954c2a11e897f62018164debc6bea4cd455d5a348c035179fcc0aee4ec9e72fd52b5660
-MISC ChangeLog 5809 SHA256 0910e27a3a4d1c62d7344ec8ff9f098bf2b042ca49310455ab357fdfb943f4be SHA512 dfaea031b64fdc23757953537ac195fcf2593b4df7e79272c52cb5098aedb2408be48efc68505eb9c09facd280f3164db158d0ead6759b5ed8f7491c765bc01c WHIRLPOOL 850d4f9111e70cc32cf1ff3a9b6346ba9f7eb1937f354bdadb8e221b02779846ac2c7bbdfa87a9176c7d6f84f4ba3367f8c15c570961ec923bfe7d3edd87a075
-MISC metadata.xml 1129 SHA256 12db1288df06f17003aac2d629f33baba377215c4c06a26740c6cf6b705046db SHA512 62c596060e491edf7ad9792f235c6dd936793156f2a223d1015da05127a543e1941610d7607cd19e6da37afda65a7535512ccb442c5c2013bb466123f2fd04a2 WHIRLPOOL 1c747e6c99d80a678116fcf59708e38ab28b95f846bc516ef641dd9aaccb53b6a833291ccdfadd7dcf33112ab71cbbe323c23e74fbf2418c6bff1d46826ad0c7
+MISC ChangeLog 6150 SHA256 57d4b2a25b57eee24060c55dca8df8a27ddd1d53efe8cc275e3ffad18ba5e750 SHA512 2abde521cf670217bb102e885d536035abaf14bf261ad20f994d8553e65e1b87a03e6c1416290ba959a8f9671ad57a989bbdb465cd1e6389213dd7cbed348ba5 WHIRLPOOL 733c2474350c7a51c1abd3f3ee79c83a0f6641b6cbc9eafb1c81f3e56543a3c61050d1ff6ac9dda4d63356581599a264f2eed9e14e924b7cd3f22e2758668b77
+MISC metadata.xml 1234 SHA256 db580be794f35f999f6a307fae07d40dfe3aed76f9bf6612f8b87ae07b3acf0f SHA512 257d26bf20307c5d8c9e1166b6eaf24ae7d3855cbf31cd2973df4742ad84879644dff785e2a2da45f3e8da22bde3b2e3119bf0c704a2e2adc2d0221381aaf5d7 WHIRLPOOL 4480f6b79ca254d03a97194c4af1c9afe84e14ec145f8e79f6ccc8107fa34919b0c3d78a378964576451ebae769336b7772ce8179a54c7a6cde92924581190d2
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>