Add patch to fix adding pictures in "oddball WMs" per bug #489974

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x341D8825

4 files changed, 96 insertions, 10 deletions

diff --git a/app-misc/gourmet/ChangeLog b/app-misc/gourmet/ChangeLog
index 0213e11caae5..a68ab7f2a5a9 100644
--- a/app-misc/gourmet/ChangeLog
+++ b/app-misc/gourmet/ChangeLog
@@ -1,6 +1,13 @@
 # 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.38 2013/11/19 02:45:49 nixphoeni Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/ChangeLog,v 1.39 2014/02/09 17:28:26 nixphoeni Exp $
+
+*gourmet-0.16.1-r3 (09 Feb 2014)
+
+  09 Feb 2014; Joe Sapp <nixphoeni@gentoo.org> +gourmet-0.16.1-r3.ebuild,
+  +files/gourmet-0.16.1-pictures-dir.patch:
+  Add patch to fix adding pictures in "oddball WMs" per bug #489974 (thanks
+  m0par)
 
 *gourmet-0.16.1-r2 (19 Nov 2013)
 
diff --git a/app-misc/gourmet/Manifest b/app-misc/gourmet/Manifest
index fed6f21e5b3c..b4eff1e2f9d7 100644
--- a/app-misc/gourmet/Manifest
+++ b/app-misc/gourmet/Manifest
@@ -3,22 +3,24 @@ Hash: SHA256
 
 AUX desktop-entry.patch 291 SHA256 cc1e41d9a426639bc19465d0dbd6b6b041643a8eccdd4a98665f3b27723b0a60 SHA512 f93f41082a6483828dd9c579c00f3b4c39574370d76954223f9b1b17663bab389b941461dfa3c7aa82c045b97d1a326791b3ed8ea6bcafad17bb879db068aff7 WHIRLPOOL 6c08c0ef0afded0072d8cd251488c6c19f7e96c7a8252401d1c3ed22404425e739beb16175a15fc51cd52647a398462e640bd232ebbcdf9ef23b5562f0549596
 AUX gourmet-0.16.1-PIL-png.patch 957 SHA256 8b2d92bfe6ced6d5872f78dca60b246f4beca812aba37d2cf56bfffa061e1491 SHA512 08c3db118c733d85b82abf042e55c038f4c778cdd5c0d5860d43161dc878ee66fb16dfb5ca7a2ef9c6ffce17f66d6bffd1c6835e42e38e9c349d1497841b47da WHIRLPOOL e5789ea68e40939911aacfb269777368863af81e5f7ca874176cd6803717189a6a3eb8603480baa314939b9a6105f7340ffd6cfe885e9cb92faf18960e570ac9
+AUX gourmet-0.16.1-pictures-dir.patch 640 SHA256 2d7b773e8f552f4cd101b8580ad5d5abfbc38eb2bded9efdb5beafd1d67e43d0 SHA512 877000079a3b6d4228acfd8cfdb39209b7a48d4ae927608f70311885b3b70f1d93fd2be64a51d46d29f53dbbcf2511c3e5a4749830c55606918a03ebc8c9c03b WHIRLPOOL 4d9cf9e9e2e89e892d42385d844baf757596557d035a25e7539fbe2a95ea73e3c3177a4e25823aa12196c4655e18bb345cf3bb934c68584b187f9d12fe7e9edf
 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-r2.ebuild 2555 SHA256 229695e7a140d7104b911d69eeda2f7e3103177e72fa943a77025b4780f19474 SHA512 ecadac68263bbb3c156b96f34b923a3f6ef19f225347417146ea5632e7c838039bd49b6a48759226e90c65e54d12ff74322b74e81cff6194b3ff953501a55e72 WHIRLPOOL 97c2a45edb96f2a9caf654da7aa4266de04b3e403236c005fc262065f252af7bd0b47e57f26149045949c1ff3699240e59f0c1ee7c6f873be592d3ec93824104
-MISC ChangeLog 6583 SHA256 4c064b72c5214142704e3fe93ae747c874472e3cb56be60d29b2b0699fb693c3 SHA512 c3d2d375bb35fa8a5fa54050067aaec356d7f0b11de372b20fe39c51bdecc9535c8f9c63ac33c77842eadca6cb774778fa0f38ead30cf80ee960c04863eba970 WHIRLPOOL a40810c689f30b63e2a93826975e038104b0551b2d791add3bef06efb12832529016c8584cdedf85e5986b920cbd0d3097ec097a31bad2e2c418defb446ccda6
+EBUILD gourmet-0.16.1-r3.ebuild 2594 SHA256 0d6a7119e30467c7b36594d2eb6282ad893e5949a3b451a7a772d4faf4965bae SHA512 1f30ceafebd7769b6e5fcb2afd94a9c865b1fa356528c38be604a34180eeb7d0a3b9eb1e227168cc67f08e7c474bf653a81e89044ced77527da4330d5e86b42d WHIRLPOOL 1a5dab07c77127e69ff7f3ca847aafb29aecc6dc5fc775279f4f9f0d050d266acaf29186d9d7b4a666253eff23f2ed38e714768be3c8c00f618ffa7b6816740b
+MISC ChangeLog 6821 SHA256 2f0abd69709071c2b36a3c4ecb8e411146a618bf1cd6679e82c62d749fe533db SHA512 875a3fb56973477866874e6dace98edbccf8ce89686b95954efd1177502588f173d92847d653b2a3311ccaa79ef0faaf36dbb42059db1159029e2b0c75ac38f8 WHIRLPOOL 6a70cf5e373326704301f0281519160ff733cae9bb413c55d49e17532a40a316271a527516492ca9b3c4c79922918b3b16b76dc087989447d54e8999f06726e1
 MISC metadata.xml 1967 SHA256 409d0c3364eb936d8aec1510e000703dc3e19487039ac1eecce197e88cecd028 SHA512 b6c47e3eea07aac5c52037942bcb4bbceaf0c19aace11459c0969ba2540cec16d4fa8d035e5f221f4fe1aa1d9239e844033b1cd80ff69297c33c5209dbfe2e3b WHIRLPOOL 77797968405fc50548e568ddbb1dcac37534f3ff55d61d86f0eb70a931e6daaae8f04261ed8a610b7add19695e9a62c16313e2225e7c17e8814097446b3f6706
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSitDeAAoJEFCXUso0HYglH2oIAI6w1ZspbHtfNNKF2x77Fvrq
-Txl39zAWG+icLCF7T+i4BfJHIYEDgp5lUjRp/XvbIi7Oy0MgtXXOZZkoFwMhYVYw
-LC1lpVcMWeXNvOVTlM9y4WmAJrqQtIlurFMzU6szZtqkGK5omlOfKcD5EhzMcmFB
-k8e1yVjvwzl850HGkWTzJhEmdtYEYNaFRL6DQ2pWQF4IGuw4oOKjZWUoWHoIMI6U
-itLp4ZOVoILDX2sn1vr9cE+weVe1VPOonwF8DUBFIwfu1X+Sh3g/pYOUVlnp1opV
-ZPXoKA6QQ7HKabFliyAbpqh9U2gMNeCeCZC8EhRstndL5M1MLWyiC5Wbb4d+QQI=
-=o0Yy
+iQEcBAEBCAAGBQJS97q8AAoJEFCXUso0HYglSoQH/1eAOM3MolYbIqaAOtBrwDpq
+M4DZshXKaXt1IlYOAUIq7F+c3xUDUmIxMk69EdYcbXT7FhjKz9AyOGm226XKG8f1
+LFEwCvzG3OGVgUDdGAmJTuDciczMfml2o4J8xkybiv9FfkrJ1sxhFuIWUuKTWgYS
+otsx4+sgq4qvTR2iEwnMwVkK0BJztXRk9y1wtHnIKFT/iiTNWasNc6noWqCtQ+Ft
+j9/Npe2Fi0vPaI5OXcclKyxS2my9GvCcfEQzB67cupSz9htnlJzRsUMQQX5gulqO
+e8n7P/NF83VtgPqIEiuHb1LouV1SaevNOwpGuXvzZCByHnIJXTX2ZEV2GxkyVMw=
+=V8eS
 -----END PGP SIGNATURE-----
diff --git a/app-misc/gourmet/files/gourmet-0.16.1-pictures-dir.patch b/app-misc/gourmet/files/gourmet-0.16.1-pictures-dir.patch
new file mode 100644
index 000000000000..5c2bc3161baa
--- /dev/null
+++ b/app-misc/gourmet/files/gourmet-0.16.1-pictures-dir.patch
@@ -0,0 +1,13 @@
+--- gourmet/gtk_extras/dialog_extras.py	2013-10-31 09:03:08.456469166 -0500
++++ gourmet/gtk_extras/dialog_extras.py	2013-10-31 09:04:18.175067008 -0500
+@@ -1096,7 +1096,9 @@
+                   buttons=None
+                   ):
+         FileSelectorDialog.__init__(self, title, filename, filters, action, set_filter, buttons)
+-        self.fsd.set_current_folder(get_user_special_dir(USER_DIRECTORY_PICTURES))
++        pictures_dir = get_user_special_dir(USER_DIRECTORY_PICTURES)
++        if not pictures_dir == None:
++            self.fsd.set_current_folder(pictures_dir)
+ 
+     def post_dialog (self):
+         self.preview = gtk.Image()
diff --git a/app-misc/gourmet/gourmet-0.16.1-r3.ebuild b/app-misc/gourmet/gourmet-0.16.1-r3.ebuild
new file mode 100644
index 000000000000..63893169c2dd
--- /dev/null
+++ b/app-misc/gourmet/gourmet-0.16.1-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 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-r3.ebuild,v 1.1 2014/02/09 17:28:26 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="-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 )
+	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.37-r1[${PYTHON_USEDEP}]"
+
+PATCHES=( ${FILESDIR}/no-docs.patch \
+	${FILESDIR}/nutritional-db-fix.patch \
+	${FILESDIR}/desktop-entry.patch \
+	${FILESDIR}/${P}-PIL-png.patch \
+	${FILESDIR}/${P}-pictures-dir.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
+}