* [gentoo-commits] repo/gentoo:master commit in: profiles/base/, app-misc/gourmet/files/, profiles/, app-misc/gourmet/
@ 2020-02-21 20:23 Michał Górny
0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2020-02-21 20:23 UTC (permalink / raw
To: gentoo-commits
commit: ba98e36d33fdab81251c6270e7acccbd75a512f9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 21 20:20:19 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 20:20:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba98e36d
app-misc/gourmet: Remove last-rited pkg
Closes: https://bugs.gentoo.org/706030
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-misc/gourmet/Manifest | 1 -
app-misc/gourmet/files/gourmet-0.17.4-pyglet.patch | 56 -------------------
app-misc/gourmet/files/no-docs-0.17.0.patch | 10 ----
app-misc/gourmet/files/tostring-to-tobytes.patch | 26 ---------
app-misc/gourmet/gourmet-0.17.4-r2.ebuild | 62 ----------------------
app-misc/gourmet/metadata.xml | 45 ----------------
profiles/base/package.use.mask | 1 -
profiles/package.mask | 1 -
8 files changed, 202 deletions(-)
diff --git a/app-misc/gourmet/Manifest b/app-misc/gourmet/Manifest
deleted file mode 100644
index 7400ec6c1c4..00000000000
--- a/app-misc/gourmet/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gourmet-0.17.4.tar.gz 8487830 BLAKE2B 511da1ae85a788fdce622cb9eb1822e6f264daffc76f25ceb8148de0a4658d9a2307278e6e981073d1aed0fa6e96d543386ed7357e0c9a3c1b511bd107dee62d SHA512 54010a5527f33e08b38d0fdf143cc4528e8ccc65ccad3253074135212751c3bc4385ba5f721327268f455bf85ff6f248e56ebfa1b98933a4ee061983eb9daa4e
diff --git a/app-misc/gourmet/files/gourmet-0.17.4-pyglet.patch b/app-misc/gourmet/files/gourmet-0.17.4-pyglet.patch
deleted file mode 100644
index 1547cde8f00..00000000000
--- a/app-misc/gourmet/files/gourmet-0.17.4-pyglet.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/gourmet/sound.py b/gourmet/sound.py
-index 2dea6bb7..c232d258 100644
---- a/gourmet/sound.py
-+++ b/gourmet/sound.py
-@@ -1,15 +1,19 @@
- try:
-- from sound_gst import Player
-+ from sound_pyglet import Player
- except ImportError:
-- print 'No gst player'
-+ print 'No pyglet player'
- try:
-- from sound_windows import Player
-+ from sound_gst import Player
- except ImportError:
-- print 'No windows player'
-- import sys
-- class Player:
-- """Fallback player"""
-- def play_file (self,path):
-- print 'No player installed -- beeping instead'
-- for n in range(5): sys.stdout.write('\a'); sys.stdout.flush()
-+ print 'No gst player'
-+ try:
-+ from sound_windows import Player
-+ except ImportError:
-+ print 'No windows player'
-+ import sys
-+ class Player:
-+ """Fallback player"""
-+ def play_file (self,path):
-+ print 'No player installed -- beeping instead'
-+ for n in range(5): sys.stdout.write('\a'); sys.stdout.flush()
-
-diff --git a/gourmet/sound_pyglet.py b/gourmet/sound_pyglet.py
-new file mode 100644
-index 00000000..41da613a
---- /dev/null
-+++ b/gourmet/sound_pyglet.py
-@@ -0,0 +1,16 @@
-+import pyglet
-+
-+class Player:
-+ def __init__ (self):
-+ pass
-+
-+ def play_file (self,path):
-+ self.source = pyglet.media.load(path,streaming=False)
-+ self.source.play()
-+
-+ def stop_play (self,path):
-+ pass
-+
-+if __name__ == '__main__':
-+ p = Player()
-+ p.play_file('../data/sound/phone.wav')
diff --git a/app-misc/gourmet/files/no-docs-0.17.0.patch b/app-misc/gourmet/files/no-docs-0.17.0.patch
deleted file mode 100644
index 9002a2ef338..00000000000
--- a/app-misc/gourmet/files/no-docs-0.17.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- setup.py 2014-03-02 14:56:56.090600468 -0500
-+++ setup.py 2014-03-02 14:57:00.184465687 -0500
-@@ -141,7 +141,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'])])
-
- return files
-
diff --git a/app-misc/gourmet/files/tostring-to-tobytes.patch b/app-misc/gourmet/files/tostring-to-tobytes.patch
deleted file mode 100644
index e42c59403d5..00000000000
--- a/app-misc/gourmet/files/tostring-to-tobytes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/gourmet/gtk_extras/ratingWidget.py b/gourmet/gtk_extras/ratingWidget.py
-index 0e01735..efa6463 100644
---- a/gourmet/gtk_extras/ratingWidget.py
-+++ b/gourmet/gtk_extras/ratingWidget.py
-@@ -135,7 +135,7 @@ class StarGenerator:
- if is_rgba: rowstride = 4
- else: rowstride = 3
- pb=gtk.gdk.pixbuf_new_from_data(
-- image.tostring(),
-+ image.tobytes(),
- gtk.gdk.COLORSPACE_RGB,
- is_rgba,
- 8,
-diff --git a/gourmet/plugins/browse_recipes/icon_helpers.py b/gourmet/plugins/browse_recipes/icon_helpers.py
-index 61c772c..2e7b08b 100644
---- a/gourmet/plugins/browse_recipes/icon_helpers.py
-+++ b/gourmet/plugins/browse_recipes/icon_helpers.py
-@@ -38,7 +38,7 @@ def get_pixbuf_from_image (image):
- if is_rgba: rowstride = 4
- else: rowstride = 3
- pb=gtk.gdk.pixbuf_new_from_data(
-- image.tostring(),
-+ image.tobytes(),
- gtk.gdk.COLORSPACE_RGB,
- is_rgba,
- 8,
diff --git a/app-misc/gourmet/gourmet-0.17.4-r2.ebuild b/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
deleted file mode 100644
index 0e0dd28ffa9..00000000000
--- a/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
+++ /dev/null
@@ -1,62 +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/pyglet[${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 \
- ${FILESDIR}/${PN}-${PV}-pyglet.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
-}
diff --git a/app-misc/gourmet/metadata.xml b/app-misc/gourmet/metadata.xml
deleted file mode 100644
index 78a34f757c5..00000000000
--- a/app-misc/gourmet/metadata.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!--maintainer-needed-->
- <longdescription>
- Gourmet Recipe Manager is an application to store, organize
- and search recipes. Gourmet also makes it easy to create
- shopping lists from recipes. Gourmet imports recipes from a
- number of sources, including MealMaster and MasterCook
- archives and several popular websites. Gourmet can export
- recipes as text, MealMaster files, HTML web pages, PDF, and
- a custom XML format for exchange with other Gourmet users.
- Gourmet supports linking images with recipes.
- </longdescription>
- <upstream>
- <maintainer>
- <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="i18n">
- Enable support for i18n through elib.intl
- </flag>
- <flag name="ipython">
- Enable support for the interactive Python console plugin
- </flag>
- <flag name="pdf">Enable export to PDF</flag>
- <flag name="print">
- Enable pretty Python printing
- </flag>
- <flag name="spell">
- Enable support for the spell check plugin
- </flag>
- <flag name="web">
- Enable support for the web import plugin
- </flag>
- </use>
-</pkgmetadata>
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index b28fb1ff286..dc4649c6099 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -80,7 +80,6 @@ media-sound/beets webserver
# Michał Górny <mgorny@gentoo.org> (2019-12-04)
# Python 2.7 only packages optionally needing dev-python/ipython.
-app-misc/gourmet ipython
dev-python/restkit cli
# Michał Górny <mgorny@gentoo.org> (2019-12-04)
diff --git a/profiles/package.mask b/profiles/package.mask
index b1e8a135061..04d0401b268 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -604,7 +604,6 @@ sci-visualization/gfsview
# David Seifert <soap@gentoo.org> (2020-01-21)
# No sign of py3 port, depends on EOL pygtk. No revdeps.
# Bug #706030. Removal in 30 days.
-app-misc/gourmet
dev-python/python-poppler
# Michał Górny <mgorny@gentoo.org> (2020-01-16)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-02-21 20:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-21 20:23 [gentoo-commits] repo/gentoo:master commit in: profiles/base/, app-misc/gourmet/files/, profiles/, app-misc/gourmet/ Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox