gentoo resync : 09.03.2018

5 files changed, 40 insertions, 18 deletions

diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 137d096e565b..846228ddfd40 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -2,7 +2,7 @@ AUX xinput-scim 240 BLAKE2B 8c235304288f531db5bea179ff0100f6152b55348057a2604f37
 DIST scim-1.4.14.tar.gz 1519287 BLAKE2B 6bd2f7328e9a75c392b0f8d1d096b09b55dc88489e4524213743a9be61b29b2d610d20394d59aa83001d17d7a210e30627ab06148a4677b02344a2872608babd SHA512 00fe7a1b40b69aae123c0a1e67eb3744ad1e6b1e66726bb011a7426bd28012c52b346c62f08c7ecf0977ac3e88ee416337c9fa89b39142d5eea338d99641f5df
 DIST scim-1.4.17.tar.gz 1285383 BLAKE2B 95b9ecb0bb25a15876df8175ee0b9392c301e3b0c554ac6ccba6b863420828ce185d3454f2fef48c03e7451f01815020290be7611b8536d8a028153af3a3fe2b SHA512 a7e0696330bca6fdf929ec0565ab4af1b4d0e5f73592cf5cccf1af6412eb351cd5a5ec9a3e5b83b24d6abad89bbb38a375cbbb0fd978f2fa17f6d64b69da0e3a
 DIST scim-1.4.18.tar.gz 1288060 BLAKE2B c2f1ce5608423734899aa6698060245c4ee253048d04d32bf5e853b8c68255340a8d35c0ebaaa50871b07c23ee9018b6bac03b18fbd4fa4dbea0e67c32c9ae30 SHA512 9a6090fc1ab950905a9c54d6678ce3d2a44297d1a992a3e933b0466688638e6cf470c1682daa58a6fbb6de3216b649273faf7edff1ac0ecca1c2c77fc19108fb
-EBUILD scim-1.4.14.ebuild 2685 BLAKE2B bcbf792257404fa964580c7435fe18d0ec4998b939fd17203dbfaa0a941435a14e8e90ee41e1982ea4c25386e28dc0cef2ca7d1ec0c57c1001b29612f10110e3 SHA512 dec5a027f66361a4faa930bfa51d618208be71f05c7172171a8dfaf968d3969bd26e940bd34ffd00c414f57786362cc9aca35ccbb5e49774200abd8ab08adafb
-EBUILD scim-1.4.17.ebuild 2484 BLAKE2B 708a7ed8ff3d17fbb0f41547dcd573ecc658789c451dc1d3107608bc15be794c520b9bd641dc5c570e9d7a02d05f71c8b2b999dea8c847b25e583d1e87fe6dda SHA512 8dfe8edbd237980c3c47076326277ddc2c075f488651da161c146e5596ee2f0b10c4a2115b69785011ef4ac36ef13afff38385e666f233cdd3dd3ec0956dd6e8
-EBUILD scim-1.4.18.ebuild 2521 BLAKE2B d52e2a4146ee2f0979cfb211e21972d5db261cdf325c72a9baab370fbe1a8af8de3a4288b7d94933ef9358bbdb330276e0913b175f143cafaed06ff5c85429e8 SHA512 937e79d87ac2997d3ec4d464b22bcfbf8c6adc8ef9f178f01312830c8c9822784194f3d5c44ded77718ede8f388d40c592b2d82164966ba312ff060a55b1a01c
-MISC metadata.xml 396 BLAKE2B 8f9d138bff9990a958ba79208e2ebdbee5174f84d6e7c6175aa70d514a3f0d53351c07745fed86d196e167f6854ab507b89557a586340e6b5f7973a4df54cbb9 SHA512 89418967f338111cae8dac484c2411891e9d496253fe59a38ec87a179da4d7ff415bd8942923a9231f6c80d48b457cafd43f2015df13a3d8749a22c0412ce9a0
+EBUILD scim-1.4.14.ebuild 2846 BLAKE2B f1117dd36956b602a0d1d86131a9963d735b8d9144aa3d23ac2585470d1667fda09e093aeb10e1ebe1f29932e766b6d7f8be1b16ff851c04c7b51cfc88c1e479 SHA512 0551c8bb04bef44b4b0cb93cf6fcce4c01dd598e84bf11f707802149a20efc87aee9a9fdaec687e7d590cfa6b7741fbab999f88a1a3c3ee291c5ca687c88f247
+EBUILD scim-1.4.17.ebuild 2651 BLAKE2B 132253835c2c9232b51c35829da9957c0bfaa4b836508b8f06c7a7c4d1a8a0157f4542d96fe2cbb69857a13e98d8d763de22469a37f2985995677483178a7481 SHA512 f875619634cba10e9fefc285f6e2735a466f768640ad515d3e5e7ad3ec15b10708339663b5d01259bb459b24ae0ebdc6fd58a2e037c6e32e62e4afad6862f537
+EBUILD scim-1.4.18.ebuild 2670 BLAKE2B 272db2d25bb6048fed0d64efa9e403ce545b390c5f6d012888f5495dcad65d0871426763c067336cafbab78db29b92fb0b12d35c5ca63496f97bc312b1acfef3 SHA512 5e034c522a44689cc53b88acdb2b3351fe206e363a5a765da8b1de53f65e13d9f4264c79a5ee2c5fd0d952ce900ecaf06c4198efe93641b29b66f9b7d7f06691
+MISC metadata.xml 399 BLAKE2B 35834cd16ccba6bf71752ae33d56e8a70391517ba09f83526d402b3aec5fc5d9c13513e090bb014cad67658c905c1dbbe396cc0c9dfc6f1e7c32c4c09a81d777 SHA512 3bbbad26a22cc5222316cf769f638a0e181ea94d8cee39058bcbd1a08e61dd0096441721190323ddb285c504dc061027e4c4185f8bee1d4d0b4b197903f3be0e
diff --git a/app-i18n/scim/metadata.xml b/app-i18n/scim/metadata.xml
index 3590c797aa6c..9115a5e98acc 100644
--- a/app-i18n/scim/metadata.xml
+++ b/app-i18n/scim/metadata.xml
@@ -9,6 +9,6 @@
 		<flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">scim</remote-id>
+		<remote-id type="github">scim-im/scim</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/scim/scim-1.4.14.ebuild b/app-i18n/scim/scim-1.4.14.ebuild
index d2595037a5cf..ff91c1be7ca9 100644
--- a/app-i18n/scim/scim-1.4.14.ebuild
+++ b/app-i18n/scim/scim-1.4.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
-inherit eutils flag-o-matic multilib gnome2-utils autotools-utils
+inherit eutils flag-o-matic multilib gnome2-utils autotools-utils qmake-utils
 
 DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
 HOMEPAGE="http://www.scim-im.org/"
@@ -11,12 +11,16 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc gtk3"
+IUSE="doc gtk3 qt4"
 
 RDEPEND="x11-libs/libX11
 	dev-libs/glib:2
 	gtk3? ( x11-libs/gtk+:3 )
 	!gtk3? ( x11-libs/gtk+:2 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
 	>=dev-libs/atk-1
 	>=x11-libs/pango-1
 	!app-i18n/scim-cvs"
@@ -50,6 +54,9 @@ src_configure() {
 		$(use_with doc doxygen)
 		--enable-ld-version-script
 		$gtk_version
+		--disable-qt3-immodule
+		$(use_enable qt4 qt4-immodule)
+		--with-qt4-moc="$(qt4_get_bindir)/moc"
 	)
 	autotools-utils_src_configure
 }
diff --git a/app-i18n/scim/scim-1.4.17.ebuild b/app-i18n/scim/scim-1.4.17.ebuild
index 3333549b69c9..aab97c120331 100644
--- a/app-i18n/scim/scim-1.4.17.ebuild
+++ b/app-i18n/scim/scim-1.4.17.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils flag-o-matic multilib gnome2-utils autotools
+inherit eutils flag-o-matic multilib gnome2-utils autotools qmake-utils
 
 DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
 HOMEPAGE="https://sourceforge.net/projects/scim"
@@ -11,12 +11,16 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc gtk3"
+IUSE="doc gtk3 qt4"
 
 RDEPEND="x11-libs/libX11
 	dev-libs/glib:2
 	gtk3? ( x11-libs/gtk+:3 )
 	!gtk3? ( x11-libs/gtk+:2 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
 	>=dev-libs/atk-1
 	>=x11-libs/pango-1"
 DEPEND="${RDEPEND}
@@ -44,7 +48,10 @@ src_configure() {
 	filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
 	econf $(use_with doc doxygen) \
 		--enable-ld-version-script \
-		$(usex gtk3 --with-gtk-version={3,2})
+		$(usex gtk3 --with-gtk-version={3,2}) \
+		--disable-qt3-immodule \
+		$(use_enable qt4 qt4-immodule) \
+		--with-qt4-moc="$(qt4_get_bindir)/moc"
 }
 
 src_compile() {
diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild
index fed4fdc5b771..e5b61f913afb 100644
--- a/app-i18n/scim/scim-1.4.18.ebuild
+++ b/app-i18n/scim/scim-1.4.18.ebuild
@@ -1,22 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic multilib gnome2-utils autotools
+EAPI="6"
+
+inherit autotools flag-o-matic gnome2-utils qmake-utils
 
 DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
-HOMEPAGE="https://sourceforge.net/projects/scim"
-SRC_URI="https://github.com/scim-im/scim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/scim-im/scim"
+SRC_URI="https://github.com/scim-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc gtk3"
+IUSE="doc gtk3 qt4"
 
 RDEPEND="x11-libs/libX11
 	dev-libs/glib:2
 	gtk3? ( x11-libs/gtk+:3 )
 	!gtk3? ( x11-libs/gtk+:2 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
 	>=dev-libs/atk-1
 	>=x11-libs/pango-1"
 DEPEND="${RDEPEND}
@@ -44,7 +49,10 @@ src_configure() {
 	filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
 	econf $(use_with doc doxygen) \
 		--enable-ld-version-script \
-		$(usex gtk3 --with-gtk-version={3,2})
+		$(usex gtk3 --with-gtk-version={3,2}) \
+		--disable-qt3-immodule \
+		$(use_enable qt4 qt4-immodule) \
+		--with-qt4-moc="$(qt4_get_bindir)/moc"
 }
 
 src_compile() {