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 <jlec@gentoo.org>

diff --git a/app-misc/gourmet/gourmet-0.17.4.ebuild b/app-misc/gourmet/gourmet-0.17.4.ebuild
index 517335caad9607a2d4b85a364dfb9917ad846bef..e4b9f97e51a708034bc537309b037807aa0c84f2 100644 (file)
--- 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 0eef08b5197a2bfa80b1eeb03bc00eb2818d96f7..fcf8fc9c60ffb7f114f2bccf2c026288ad60c779 100644 (file)
--- a/app-misc/gourmet/metadata.xml
+++ b/app-misc/gourmet/metadata.xml
@@ -28,25 +28,20 @@
                <remote-id type="github">thinkle/gourmet</remote-id>
        </upstream>
        <use>
-               <flag name='i18n'>
-                       <pkg>&gt;app-misc/gourmet-0.16</pkg>
+               <flag name="i18n"><pkg>&gt;app-misc/gourmet-0.16</pkg>
                        Enable support for i18n through elib.intl
                </flag>
-               <flag name='ipython'>
-                       <pkg>&gt;app-misc/gourmet-0.16</pkg>
+               <flag name="ipython"><pkg>&gt;app-misc/gourmet-0.16</pkg>
                        Enable support for the interactive Python console plugin
                </flag>
-               <flag name='pdf'>Enable export to PDF</flag>
-               <flag name='print'>
-                       <pkg>&gt;app-misc/gourmet-0.16</pkg>
+               <flag name="pdf">Enable export to PDF</flag>
+               <flag name="print"><pkg>&gt;app-misc/gourmet-0.16</pkg>
                        Enable pretty Python printing
                </flag>
-               <flag name='spell'>
-                       <pkg>&gt;app-misc/gourmet-0.16</pkg>
+               <flag name="spell"><pkg>&gt;app-misc/gourmet-0.16</pkg>
                        Enable support for the spell check plugin
                </flag>
-               <flag name='web'>
-                       <pkg>&gt;app-misc/gourmet-0.16</pkg>
+               <flag name="web"><pkg>&gt;app-misc/gourmet-0.16</pkg>
                        Enable support for the web import plugin
                </flag>
        </use>