app-i18n/tomoe-gtk: fix build with USE=python

Gentoo-Bug: 567632

Package-Manager: Portage-2.3.6, Repoman-2.3.1

diff --git a/app-i18n/tomoe-gtk/metadata.xml b/app-i18n/tomoe-gtk/metadata.xml
index bb5bed5adfa2f1a8238d994cb3137546503eebf6..b26c59a53cf321543021cdc813b9668979efb885 100644 (file)
--- a/app-i18n/tomoe-gtk/metadata.xml
+++ b/app-i18n/tomoe-gtk/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-       <maintainer type="project">
-               <email>cjk@gentoo.org</email>
-               <name>Cjk</name>
-       </maintainer>
-       <upstream>
-               <remote-id type="sourceforge">tomoe</remote-id>
-               <remote-id type="sourceforge-jp">tomoe</remote-id>
-       </upstream>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">tomoe</remote-id>
+    <remote-id type="sourceforge-jp">tomoe</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild
index 6bb529d3d1438200918fc3ffe71069e48d7e12b2..91da3cffbfdc54b0a048a162880aa88797d109e4 100644 (file)
--- a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild
+++ b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild
@@ -1,59 +1,41 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 
 inherit python-single-r1
 
-MY_P="tomoe-gtk-${PV}"
 DESCRIPTION="Tomoe GTK+ interface widget library"
 HOMEPAGE="http://tomoe.sourceforge.jp/"
-SRC_URI="mirror://sourceforge/tomoe/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="
-       >=app-i18n/tomoe-0.6.0
+RDEPEND="app-i18n/tomoe[python(+)?,${PYTHON_USEDEP}]
        python? (
                ${PYTHON_DEPS}
-               >=app-i18n/tomoe-0.6.0[python,${PYTHON_USEDEP}]
-               dev-python/pygtk:2[${PYTHON_USEDEP}]
                dev-python/pygobject:2[${PYTHON_USEDEP}]
-       )
-"
+               dev-python/pygtk:2[${PYTHON_USEDEP}]
+       )"
 DEPEND="${RDEPEND}
        dev-util/gtk-doc-am
-       virtual/pkgconfig
        sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
+       virtual/pkgconfig"
 
 pkg_setup() {
-       if use python ; then
-               python-single-r1_pkg_setup
-       fi
+       use python && python-single-r1_pkg_setup
 }
 
 src_configure() {
-       local myconf
-       #--with-python b0rked hard
-       unset PYTHON
-       use python || myconf="${myconf} --without-python"
-
-       # Rely on precompiled gtk-doc files,
-       # https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#gtk-doc
        econf \
-               --disable-gtk-doc \
-               --without-gucharmap \
                $(use_enable static-libs static) \
-               ${myconf}
+               $(use_with python python "") \
+               --without-gucharmap
 }
 
 src_install() {