gentoo resync : 14.05.2020

3 files changed, 33 insertions, 48 deletions

diff --git a/app-i18n/tomoe-gtk/Manifest b/app-i18n/tomoe-gtk/Manifest
index 1bc4a6f8e97a..ff3d68a76c7c 100644
--- a/app-i18n/tomoe-gtk/Manifest
+++ b/app-i18n/tomoe-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST tomoe-gtk-0.6.0.tar.gz 448058 BLAKE2B 06db81c971bf06ae1b625afb90950e7a76ad2acfb6abf038ce0c6114c4f7bc42a76a7f07dc848cfa5e6aef3039e6bab32b0d7496fea1fb67bf936b5f9631a130 SHA512 caa9b79edde7885e00d939cb3de30b32da0c1c8a7d803e26c756ee0695f7e15bee241036b1125f838e72e016f4bee9736a398108fff0eed20f1fdb86d221dc43
-EBUILD tomoe-gtk-0.6.0-r5.ebuild 991 BLAKE2B 62f4ae57bf4142032e454826210511592c6ac838730190668b5a12436108d10515d576dc5b29115b89696f7bf446c4c7f53626fa6d96ae386248b6c29f5dc89e SHA512 6e0b1763d13cbcf01fda05dc0feb4a75b181ba1a63043fc66e6222982fe235b9c321afa360a0036e303e434881d87aa6a77431159693a6a716b3072efec5be47
+EBUILD tomoe-gtk-0.6.0-r6.ebuild 598 BLAKE2B 9c42e9bc2f8ecaa3dfade024ef12090f37905fa2d796aa7168620996b1e20b6bc1ab10da0e2b4b5793d8b0c247624ed08faa4c0e304777e1c70a9c72a31403fa SHA512 0e47634b15a80ed9b5ce49fc8f62e434f805aeda61e04c679a6d6a458aa58aa87b83543f537460ca8ea28d4cba9fdffe2a6b86ba0f5f15a31b4199ec5fd29932
 MISC metadata.xml 374 BLAKE2B 39965153f406f0dab239af88b4da0823befba31b026a262e1dd42373514fdd91b21cf582c3a00184459f62253f5fed7828bae911d82c3ba31331bb7f6d6abc6e SHA512 8b35eb486271612ca74076681fc7c84a27ec5bf49b8523996d14f7cb26d22952569497656378d07ca03ec7f9e05a30e851b9220f905fcc2265d4a4568badf15e
diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r5.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r5.ebuild
deleted file mode 100644
index f5a0c638be4f..000000000000
--- a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ltprune python-single-r1
-
-DESCRIPTION="Tomoe GTK+ interface widget library"
-HOMEPAGE="http://tomoe.osdn.jp/"
-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[python(+)?,${PYTHON_SINGLE_USEDEP}]
-	x11-libs/gtk+:2
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with python python "") \
-		--without-gucharmap
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild
new file mode 100644
index 000000000000..24fcbb8f3374
--- /dev/null
+++ b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Tomoe GTK+ interface widget library"
+HOMEPAGE="http://tomoe.osdn.jp/"
+SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="app-i18n/tomoe
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--without-python \
+		--without-gucharmap
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}