gentoo resync : 31.10.2017

2 files changed, 0 insertions, 61 deletions

diff --git a/app-misc/gourmet/Manifest b/app-misc/gourmet/Manifest
index 28b2101a62af..57c45613838c 100644
--- a/app-misc/gourmet/Manifest
+++ b/app-misc/gourmet/Manifest
@@ -3,7 +3,6 @@ AUX gourmet-0.17.4-pyglet.patch 1664 SHA256 134a23df0e5cf5a068719785d546915a5a4f
 AUX no-docs-0.17.0.patch 338 SHA256 b6fb37e3ea0794e7024cc2ad04e5b8b10b2c10d04f37cbe9465bde39e827b24e SHA512 0e8f3c35411ee7f895490762acca7da2eff6e498de6c35511c90c2dd91dc6872f405b8a73465dd411eb193cbf0c8a37b75a5dd06e89e8601e268bffbe6f674ba WHIRLPOOL f5d086b87d394b8c058daa901c88761c20badd2ba3db0603300363f9dbdd6c5ac3ed01e02d3f7ca16faf13c30d7649180956af387b6cb1c3b03f9f82ea8a3e1b
 AUX tostring-to-tobytes.patch 988 SHA256 107b0cc16de64681702587d19964b5f21c3be665e3011c44854c89cfaa95e9b3 SHA512 72b12c9e775bea34ce82c53a8e808fd212eec523f03ca591735ee90121cc45ec6a6464168fe16d66c9889e92168accf8643b0486bc53ef8d144aa92070f3f94c WHIRLPOOL e8413d4e4ef967666671892970f6c2f934b8c43d023b45cf4eac621c8f38838d3c744134d97dc1cdde3c9a57e01d0f0ece4b5f6232b689caddc529c0f0115ed2
 DIST gourmet-0.17.4.tar.gz 8487830 SHA256 13edd3b9c3a3507d20b80cff0f88183ac7979b720e7577290815ffacca097fe3 SHA512 54010a5527f33e08b38d0fdf143cc4528e8ccc65ccad3253074135212751c3bc4385ba5f721327268f455bf85ff6f248e56ebfa1b98933a4ee061983eb9daa4e WHIRLPOOL 9f0f795ee405c0e72587451cbe5b6b72d5d35df2697f55325879c6841a39110773a4837f93b7823e4c0f64a48feb7b192a76cb6c7cc91f8bcd1bf40e9a065105
-EBUILD gourmet-0.17.4-r1.ebuild 2291 SHA256 08dd4a8b2222780166673f8ab1a5e8e0e522fed618ccf854d558fd039744ba55 SHA512 03b300cbfa5d4a1d9cd13301f33d817d9171fed26d21e329d523276294a562111b0db9b2cb04012879d782a6d871eb4117865569b6c769ad98a492f8bc8c2a35 WHIRLPOOL 00c53c330ea226caaa501879abaa94ca5ebca6bd0e6fe7ecbc35fd160dfed587340b191778a8a22ecde7d88e8a38422e873035d27e4e58fd17d4ac7fb1e12c7f
 EBUILD gourmet-0.17.4-r2.ebuild 2312 SHA256 610f58aa96ab8fec8c269a74276a1c3694834a4c7235178546a7c9a1d497c612 SHA512 4163adbc0a8d7142a4779855d920f238f6870d2b94f3142b09b0f99bcf22108ebbd8c0161c808eaef6ad63d9d1ed858ed8a300d1b29a1b2a81b17ad91ff0a04c WHIRLPOOL 04367d6799caade424024aecf1f5636b62e73a953bf5c9795fbbd6ded739ac718e599e05ae63fa800e460679dceee4cbfa51c1467066fc62736742193ce923b3
 MISC ChangeLog 4043 SHA256 4d35bdb62214b893017d15f17f6d825cb2193ae3447425b54ae5cb6f42ec022a SHA512 0d3f109bff5b6b145714719eb7997908c06746ec4bfb07b6483ee107313fd4f79ce260c2969c025edb94c51ac435d63d19382c710c72b4457861423d5b3b57e0 WHIRLPOOL 59f7afd65d268274d2e60255a8b2abf2691ecc8bf9283854ec805fef1d21e93f1a4a4a656a04ecf73b8944290ba58d353c1a5b9606e7e5c8494d0fc35ade8d3e
 MISC ChangeLog-2015 8201 SHA256 b44e9b26ff4eb17d38233669702778e7d55cfa7741d4ed44d7213766765b0bd4 SHA512 04be873ec81e52ae74c1230b8b27774a37ffc80031bb997156c33d2412c1f189802eeb97999e6dd262cc85dd9e36f24bf863b57b94501be1d2f90ddbc2d433ee WHIRLPOOL 5e4cde6b304741352c3f598f2eefdf3e4fbc1c7743a04d4304059ae9b44d4564800822915b8d0e8f7077cfd63c94a90b4dac804624786c189ee5a27d1d30f7e9
diff --git a/app-misc/gourmet/gourmet-0.17.4-r1.ebuild b/app-misc/gourmet/gourmet-0.17.4-r1.ebuild
deleted file mode 100644
index 0ce9c07225d9..000000000000
--- a/app-misc/gourmet/gourmet-0.17.4-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Recipe Organizer and Shopping List Generator for Gnome"
-HOMEPAGE="https://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}]
-	dev-python/pillow[${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-2.25.3-r1[${PYTHON_USEDEP}] )
-	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-0.17.0.patch ${FILESDIR}/tostring-to-tobytes.patch )
-DOCS=( ChangeLog CODING.md FAQ README.md TESTS TODO.md )
-
-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
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman gourmet.1
-}