[gentoo-commits] repo/gentoo:master commit in: app-misc/gourmet/

2019-01-20 Thread Michał Górny 
commit: c9f2f0c42bb277d19ee1c63fd9afbd7e399e7c38
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jan 20 10:38:42 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jan 20 10:41:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f2f0c4

app-misc/gourmet: Fix reassignment failure

Maintainer-needed tag was added but I accidentally missed removing him.

Signed-off-by: Michał Górny  gentoo.org>

 app-misc/gourmet/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/app-misc/gourmet/metadata.xml b/app-misc/gourmet/metadata.xml
index e36c4e51d64..78a34f757c5 100644
--- a/app-misc/gourmet/metadata.xml
+++ b/app-misc/gourmet/metadata.xml
@@ -2,10 +2,6 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   
-   nixpho...@gentoo.org
-   Joe Sapp
-   

Gourmet Recipe Manager is an application to store, organize
and search recipes. Gourmet also makes it easy to create

[gentoo-commits] repo/gentoo:master commit in: app-misc/gourmet/, dev-python/elib-intl/, sci-geosciences/josm/

2018-11-08 Thread Michał Górny 
commit: 4d3662cf23c94911395bb36d79171fa661587492
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Nov  8 11:56:11 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Nov  8 11:56:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d3662cf

*/*: reassign packages of nixphoeni

Bug: https://bugs.gentoo.org/79409
Signed-off-by: Michał Górny  gentoo.org>

 app-misc/gourmet/metadata.xml | 1 +
 dev-python/elib-intl/metadata.xml | 9 +
 sci-geosciences/josm/metadata.xml | 5 +
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app-misc/gourmet/metadata.xml b/app-misc/gourmet/metadata.xml
index 90652c4bf09..e36c4e51d64 100644
--- a/app-misc/gourmet/metadata.xml
+++ b/app-misc/gourmet/metadata.xml
@@ -1,6 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   

nixpho...@gentoo.org
Joe Sapp

diff --git a/dev-python/elib-intl/metadata.xml 
b/dev-python/elib-intl/metadata.xml
index b0cdfd61979..da93a457fa9 100644
--- a/dev-python/elib-intl/metadata.xml
+++ b/dev-python/elib-intl/metadata.xml
@@ -1,14 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   nixpho...@gentoo.org
-   Joe Sapp
-   
-   
-   pyt...@gentoo.org
-   Python
-   
+   

The elib.intl module provides enhanced internationalization
(I18N) services for your Python modules and applications.

diff --git a/sci-geosciences/josm/metadata.xml 
b/sci-geosciences/josm/metadata.xml
index 351807a5d5e..d78f8098182 100644
--- a/sci-geosciences/josm/metadata.xml
+++ b/sci-geosciences/josm/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-nixpho...@gentoo.org
-  
-
+  
 sci-geoscien...@gentoo.org
 Gentoo Geosciences Project

[gentoo-commits] repo/gentoo:master commit in: app-misc/gourmet/, sci-geosciences/josm/, dev-python/elib-intl/

2018-01-02 Thread Amy Liffey 
commit: 9df389f13b0e894d3ee9b472514759179d2af787
Author: Amy Liffey  gentoo  org>
AuthorDate: Tue Jan  2 19:48:55 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Tue Jan  2 19:48:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9df389f1

Revert "Retirement: packages reassignment nixphoeni"

This reverts commit f20dd1e22d33a05e98837c46817b651d62544106.

 app-misc/gourmet/metadata.xml | 5 -
 dev-python/elib-intl/metadata.xml | 4 
 sci-geosciences/josm/metadata.xml | 5 -
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app-misc/gourmet/metadata.xml b/app-misc/gourmet/metadata.xml
index f38c7f669c4..90652c4bf09 100644
--- a/app-misc/gourmet/metadata.xml
+++ b/app-misc/gourmet/metadata.xml
@@ -1,7 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   nixpho...@gentoo.org
+   Joe Sapp
+   

Gourmet Recipe Manager is an application to store, organize
and search recipes. Gourmet also makes it easy to create

diff --git a/dev-python/elib-intl/metadata.xml 
b/dev-python/elib-intl/metadata.xml
index f55f14f5003..b0cdfd61979 100644
--- a/dev-python/elib-intl/metadata.xml
+++ b/dev-python/elib-intl/metadata.xml
@@ -1,6 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   nixpho...@gentoo.org
+   Joe Sapp
+   

pyt...@gentoo.org
Python

diff --git a/sci-geosciences/josm/metadata.xml 
b/sci-geosciences/josm/metadata.xml
index d78f8098182..351807a5d5e 100644
--- a/sci-geosciences/josm/metadata.xml
+++ b/sci-geosciences/josm/metadata.xml
@@ -1,7 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
+  
+nixpho...@gentoo.org
+  
+
 sci-geoscien...@gentoo.org
 Gentoo Geosciences Project

[gentoo-commits] repo/gentoo:master commit in: app-misc/gourmet/files/

2017-11-04 Thread Michael Palimaka 
commit: 2bdf40b4b29fcc2f8d3555d2d6cd76420e097408
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Nov  3 11:23:11 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Nov  4 07:09:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bdf40b4

app-misc/gourmet: remove unused patch

 app-misc/gourmet/files/desktop-entry.patch | 10 --
 1 file changed, 10 deletions(-)

diff --git a/app-misc/gourmet/files/desktop-entry.patch 
b/app-misc/gourmet/files/desktop-entry.patch
deleted file mode 100644
index b79aa5f7b77..000
--- a/app-misc/gourmet/files/desktop-entry.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 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

[gentoo-commits] repo/gentoo:master commit in: app-misc/gourmet/

2017-10-29 Thread Joe Sapp 
commit: f4468535d57eb20671f693a90c37f9eba21d6546
Author: Joe Sapp  gentoo  org>
AuthorDate: Mon Oct 30 00:17:03 2017 +
Commit: Joe Sapp  gentoo  org>
CommitDate: Mon Oct 30 00:18:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4468535

app-misc/gourmet: Remove old version

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-misc/gourmet/gourmet-0.17.4-r1.ebuild | 60 ---
 1 file changed, 60 deletions(-)

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 0ce9c07225d..000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: app-misc/gourmet/

2017-10-25 Thread Agostino Sarubbo 
commit: 51a040c4583739fc761713dc4c9ce9cae942b2f7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct 25 09:28:45 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct 25 09:28:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51a040c4

app-misc/gourmet: amd64 stable wrt bug #610436

Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-misc/gourmet/gourmet-0.17.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/gourmet/gourmet-0.17.4-r2.ebuild 
b/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
index 1e75e017012..0e0dd28ffa9 100644
--- a/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
+++ b/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/thinkle/gourmet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="-i18n -ipython pdf print spell sound web"
 
 RDEPEND=">=dev-python/pygtk-2.22.0:2[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: app-misc/gourmet/

2017-10-13 Thread Thomas Deutschmann 
commit: 93ca63b673c8d0925a60f5bf10c14339d7640e18
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Oct 13 14:58:54 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Oct 13 15:00:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ca63b6

app-misc/gourmet: x86 stable (bug #610436)

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 app-misc/gourmet/gourmet-0.17.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/gourmet/gourmet-0.17.4-r2.ebuild 
b/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
index f58cbc6a509..1e75e017012 100644
--- a/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
+++ b/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/thinkle/gourmet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="-i18n -ipython pdf print spell sound web"
 
 RDEPEND=">=dev-python/pygtk-2.22.0:2[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: app-misc/gourmet/, app-misc/gourmet/files/

2017-07-14 Thread Joe Sapp 
commit: 7eb9b09827e7ac711b1745fe68f2472af3a0e8f0
Author: Joe Sapp  gentoo  org>
AuthorDate: Sat Jul 15 01:41:13 2017 +
Commit: Joe Sapp  gentoo  org>
CommitDate: Sat Jul 15 01:41:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eb9b098

app-misc/gourmet: Bump version to use pyglet for audio

See bug #610436.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-misc/gourmet/files/gourmet-0.17.4-pyglet.patch | 56 +++
 app-misc/gourmet/gourmet-0.17.4-r2.ebuild  | 62 ++
 2 files changed, 118 insertions(+)

diff --git a/app-misc/gourmet/files/gourmet-0.17.4-pyglet.patch 
b/app-misc/gourmet/files/gourmet-0.17.4-pyglet.patch
new file mode 100644
index 000..1547cde8f00
--- /dev/null
+++ b/app-misc/gourmet/files/gourmet-0.17.4-pyglet.patch
@@ -0,0 +1,56 @@
+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 ..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/gourmet-0.17.4-r2.ebuild 
b/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
new file mode 100644
index 000..f58cbc6a509
--- /dev/null
+++ b/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
@@ -0,0 +1,62 @@
+# 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

[gentoo-commits] repo/gentoo:master commit in: app-misc/gourmet/

2017-07-08 Thread Joe Sapp 
commit: 013e0991b60c9a44ff6d4dd39a79edaf5325e470
Author: Joe Sapp  gentoo  org>
AuthorDate: Sat Jul  8 19:51:54 2017 +
Commit: Joe Sapp  gentoo  org>
CommitDate: Sat Jul  8 19:55:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013e0991

app-misc/gourmet: Remove old version

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-misc/gourmet/gourmet-0.17.4.ebuild | 60 --
 1 file changed, 60 deletions(-)

diff --git a/app-misc/gourmet/gourmet-0.17.4.ebuild 
b/app-misc/gourmet/gourmet-0.17.4.ebuild
deleted file mode 100644
index 0b7aac53c78..000
--- a/app-misc/gourmet/gourmet-0.17.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 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 )
-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
-}

[gentoo-commits] repo/gentoo:master commit in: app-misc/gourmet/files/

2016-08-11 Thread Patrice Clement 
commit: a72b736e6881eb3d8d605ea3c747725776cf0945
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Thu Jul  7 17:23:31 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Aug 11 08:07:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a72b736e

app-misc/gourmet: remove unused patches

Signed-off-by: Patrice Clement  gentoo.org>

 .../gourmet/files/gourmet-0.16.1-PIL-png.patch | 29 --
 .../files/gourmet-0.16.1-pictures-dir.patch| 13 --
 app-misc/gourmet/files/no-docs.patch   | 10 
 app-misc/gourmet/files/nutritional-db-fix.patch| 29 --
 4 files changed, 81 deletions(-)

diff --git a/app-misc/gourmet/files/gourmet-0.16.1-PIL-png.patch 
b/app-misc/gourmet/files/gourmet-0.16.1-PIL-png.patch
deleted file mode 100644
index 2ddbd55..000
--- a/app-misc/gourmet/files/gourmet-0.16.1-PIL-png.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4eb110bbbc58af97fd6994b96d9482783037058d Mon Sep 17 00:00:00 2001
-From: Bernhard Reiter 
-Date: Wed, 13 Nov 2013 15:24:09 +0100
-Subject: [PATCH] Fix another PIL import.
-
-Reported at https://answers.launchpad.net/gourmet/+question/238352#comment-6

- gourmet/gtk_extras/thumbnail.py | 5 -
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gourmet/gtk_extras/thumbnail.py b/gourmet/gtk_extras/thumbnail.py
-index d096126..ea7e72c 100644
 a/gourmet/gtk_extras/thumbnail.py
-+++ b/gourmet/gtk_extras/thumbnail.py
-@@ -81,7 +81,10 @@ def create_thumbnail (path, thumbpath, uri, type="large"):
- info['Software']='Gourmet Recipe Manager'
- info['URI']=str(uri)
- # now we must create our image guy
--import PngImagePlugin
-+try:
-+from PIL import PngImagePlugin
-+except ImportError:
-+import PngImagePlugin
- pnginfo = PngImagePlugin.PngInfo()
- 
- for k,v in info.items():
--- 
-1.8.4
-

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
deleted file mode 100644
index 5c2bc31..000
--- a/app-misc/gourmet/files/gourmet-0.16.1-pictures-dir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 gourmet/gtk_extras/dialog_extras.py2013-10-31 09:03:08.456469166 
-0500
-+++ gourmet/gtk_extras/dialog_extras.py2013-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/files/no-docs.patch 
b/app-misc/gourmet/files/no-docs.patch
deleted file mode 100644
index 0a2aa7e..000
--- a/app-misc/gourmet/files/no-docs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 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
deleted file mode 100644
index 4779551..000
--- a/app-misc/gourmet/files/nutritional-db-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
 gourmet/plugins/nutritional_information/data_plugin.py 2013-08-28 
19:13:38.0 -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'
-

[gentoo-commits] repo/gentoo:master commit in: app-misc/gourmet/

2016-04-17 Thread Patrice Clement 
commit: 302b4f0aae1d82c28681bcd4cecbb6304e6ee342
Author: Patrice Clement  gentoo  org>
AuthorDate: Sun Apr 17 21:55:00 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Apr 17 21:58:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302b4f0a

app-misc/gourmet: Fix metadata.xml file.

Package-Manager: portage-2.2.26

 app-misc/gourmet/metadata.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-misc/gourmet/metadata.xml b/app-misc/gourmet/metadata.xml
index e582dca..90652c4 100644
--- a/app-misc/gourmet/metadata.xml
+++ b/app-misc/gourmet/metadata.xml
@@ -28,20 +28,20 @@
thinkle/gourmet


-   app-misc/gourmet-0.16
+   
Enable support for i18n through elib.intl

-   app-misc/gourmet-0.16
+   
Enable support for the interactive Python console plugin

Enable export to PDF
-   app-misc/gourmet-0.16
+   
Enable pretty Python printing

-   app-misc/gourmet-0.16
+   
Enable support for the spell check plugin

-   app-misc/gourmet-0.16
+   
Enable support for the web import plugin

[gentoo-commits] repo/gentoo:master commit in: app-misc/gourmet/, app-misc/gourmet/files/

2015-11-27 Thread Joe Sapp 
commit: 5c04c89d33aaa76dce05205ff8e39e2731519356
Author: Joe Sapp  gentoo  org>
AuthorDate: Fri Nov 27 20:24:54 2015 +
Commit: Joe Sapp  gentoo  org>
CommitDate: Fri Nov 27 20:25:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c04c89d

app-misc/gourmet: Add patch to address gourmet pull request 824; also 
eliminates PIL support

See https://github.com/thinkle/gourmet/pull/824 .

Package-Manager: portage-2.2.25

 app-misc/gourmet/files/tostring-to-tobytes.patch | 26 ++
 app-misc/gourmet/gourmet-0.17.4-r1.ebuild| 61 
 2 files changed, 87 insertions(+)

diff --git a/app-misc/gourmet/files/tostring-to-tobytes.patch 
b/app-misc/gourmet/files/tostring-to-tobytes.patch
new file mode 100644
index 000..e42c594
--- /dev/null
+++ b/app-misc/gourmet/files/tostring-to-tobytes.patch
@@ -0,0 +1,26 @@
+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-r1.ebuild 
b/app-misc/gourmet/gourmet-0.17.4-r1.ebuild
new file mode 100644
index 000..e5a07f2
--- /dev/null
+++ b/app-misc/gourmet/gourmet-0.17.4-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/gourmet/

2015-10-22 Thread Justin Lecher 
commit: e0906a415f9b87e95609c46d964f649d31d449bf
Author: Justin Lecher  gentoo  org>
AuthorDate: Thu Oct 22 11:06:11 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Oct 22 11:09:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0906a41

app-misc/gourmet: Drop deprecated usage of DISTUTILS_NO_PARALLEL_BUILD and QA 
fixes

properly use distutils-r1.eclasses phases
fix whitespaces

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 app-misc/gourmet/gourmet-0.17.4.ebuild | 18 ++
 app-misc/gourmet/metadata.xml  | 17 ++---
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/app-misc/gourmet/gourmet-0.17.4.ebuild 
b/app-misc/gourmet/gourmet-0.17.4.ebuild
index 517335c..e4b9f97 100644
--- a/app-misc/gourmet/gourmet-0.17.4.ebuild
+++ b/app-misc/gourmet/gourmet-0.17.4.ebuild
@@ -5,8 +5,6 @@
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
-# Parallel builds fail when building translations
-DISTUTILS_NO_PARALLEL_BUILD=1
 
 inherit distutils-r1
 
@@ -24,10 +22,14 @@ RDEPEND=">=dev-python/pygtk-2.22.0:2[${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}] )
+   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}] )"
@@ -53,7 +55,7 @@ python_prepare() {
sed -i "s:\(lib_dir = \)'../gourmet':\1'$(python_get_sitedir)':" 
gourmet/settings.py || die
 }
 
-src_install() {
-   distutils-r1_src_install
+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
index 0eef08b..fcf8fc9 100644
--- a/app-misc/gourmet/metadata.xml
+++ b/app-misc/gourmet/metadata.xml
@@ -28,25 +28,20 @@
thinkle/gourmet


-   
-   app-misc/gourmet-0.16
+   app-misc/gourmet-0.16
Enable support for i18n through elib.intl

-   
-   app-misc/gourmet-0.16
+   app-misc/gourmet-0.16
Enable support for the interactive Python console plugin

-   Enable export to PDF
-   
-   app-misc/gourmet-0.16
+   Enable export to PDF
+   app-misc/gourmet-0.16
Enable pretty Python printing

-   
-   app-misc/gourmet-0.16
+   app-misc/gourmet-0.16
Enable support for the spell check plugin

-   
-   app-misc/gourmet-0.16
+   app-misc/gourmet-0.16
Enable support for the web import plugin