[gentoo-commits] repo/gentoo:master commit in: app-i18n/tomoe-gtk/

["Akinori Hattori" <hattya@gentoo.org>]

commit:     0f0b2c8b7c4d48faa49167d3f227ce3a63ac18d3
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 14:11:47 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 14:21:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f0b2c8b

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

Gentoo-Bug: 567632

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/tomoe-gtk/metadata.xml              | 16 ++++++------
 app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild | 38 ++++++++--------------------
 2 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/app-i18n/tomoe-gtk/metadata.xml b/app-i18n/tomoe-gtk/metadata.xml
index bb5bed5adfa..b26c59a53cf 100644
--- 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 6bb529d3d14..91da3cffbfd 100644
--- 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() {