gentoo resync : 31.12.2017 (final resync this year)

14 files changed, 246 insertions, 97 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 51d40e679d44..548a1f7d042f 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 5f32d0edd291..c75ab02808e0 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,7 +1,9 @@
 DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81
 DIST ibus-1.5.15.tar.gz 2259352 BLAKE2B 52a820b55573f034f60dc705e0c513515c0f128f861d2dd9a22be9bfafdd10f116a159b8d9a21a64f7b66225e7191a08b9c5ff873bbe29421c53fec2bee08b71 SHA512 4e588acf2ca0172b365630dcfe2d9062e7583e50a44d435ec05c8e3976c6caf54c4708733f1f7dce5ef7724254469ee5c7ab3b086f0cbea18775c894863b0c3e
 DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
+DIST ibus-1.5.17.tar.gz 2522960 BLAKE2B a0d19eaae809549d678b42394e76107b8869232c90932bfaa5072621598e83db0569084e931c51c15b7179d9d8e0a2ce144b726229dae81a009665a5de87afc4 SHA512 8a7e4fabbcb2096e647b1fb7487c92882bd320a4d777f2765817378abec2e60cafd63364c881fefc2805ff2baa6b28b15ee0710587662a3e65eeb60ead19496c
 EBUILD ibus-1.5.12.ebuild 3695 BLAKE2B b22d441277f55324c4d5ecc6d592f3057900a46e0f4bed4ccc90c14ec10890fa26bab18c5ded5649f9bb83c3485899bcea8e9d0fc80410e55199ad97b51f2009 SHA512 2593129b58c41301ea94f7b7761cc40e13f3b6458230478067d6a0a1c6a23ad8aa5f225d4203259ad54eb38d87b3bbac1a029a4de5282aee82147891b3c2b394
 EBUILD ibus-1.5.15.ebuild 3552 BLAKE2B 040902ad38258aab1ff4b0d2b3eb495a6f7a3b5148b1cbd06378773b1c421da8e3240395d4412a712243663b1d70754b33356c2316d072dcc847f80a902d04ea SHA512 dec56dc700cc9e8fbe2280cf75e2550cc92d51e7ecbae307b87ef6e5707a2a7e31c5b82e8228818290bc94527f3c2bbdb34e0a4b61a0c8d5f1bafe5ebd00d485
 EBUILD ibus-1.5.16.ebuild 3961 BLAKE2B 6e53813b636479b1d34b238398950bd60f11407c1fe4c082e1936c0a4b71507ad5d205e663caf5818e2ea86d66328ae4304188320a3d22a5bfaaeae791b60061 SHA512 2e5c7cc15171fc83a76a793f4c307ba459cd2083ad52b94c48b6eecef71da1e409cb9982fd6973529a8ec97a6179414f9bf544b8444498d037b665dd1df5b076
+EBUILD ibus-1.5.17.ebuild 3965 BLAKE2B 56b920f04cbcf8de88b0cc4347f8876fd6972670c48d4717f372a5436a88e99f63a9b07bcd52a72dec0d313f06d8893fc3f6fda0e03fd7ebc78f6ed3e1c8ef79 SHA512 514bf67cb6331b0d7e1d583f865e66d5ab8c8f13db40de925e8bf51f976f89171f8b028b377676ca22f8c7465b53ab66bddd0237ff67a0319710d194bffc857b
 MISC metadata.xml 876 BLAKE2B 0594f787b71a972b67f1f52fde4e6e6c4eead1f604a1152ea9af2a15cd678677a29adaaba1a53251efbb95f0d12baa7d3dc63e54676757bbc7d9bf6235cf7e1e SHA512 eff80e5a8db4276c1138de9e661e5735c42abfc32950bc439eda9f342e5d2a68a8d5c848dc0000a2960a315ac38dbeda6b9fc44de8b9d526e7dddd94122f9f32
diff --git a/app-i18n/ibus/ibus-1.5.17.ebuild b/app-i18n/ibus/ibus-1.5.17.ebuild
new file mode 100644
index 000000000000..f04a122889f9
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.17.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	libnotify? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		gtk
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gconf? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+	if ! use libnotify; then
+		touch ui/gtk3/panel.vala
+	fi
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i \
+		-e "/^py2_compile/,/^$/d" \
+		-e "/^install-data-hook/,/^$/d" \
+		bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable libnotify) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-i18n/scim-hangul/Manifest b/app-i18n/scim-hangul/Manifest
index 96353dc753b8..548aa8186b93 100644
--- a/app-i18n/scim-hangul/Manifest
+++ b/app-i18n/scim-hangul/Manifest
@@ -1,8 +1,6 @@
 AUX scim-hangul-0.3.2+gcc-4.3.patch 883 BLAKE2B c891bb3865510bff80e28f4f770ea4f173d414b18c6c81cbd3b92f870774f4118e1f37ca68e94a83f128f5620d16ab77abfd03b237723def6828b353713a6bb0 SHA512 f7b65475af23667110219182ec9ba235da83d27603028c8f7655c39ffe36307762e3791d3630602c1cf0b56e87300f45562426e199f39845e39832d88fa7258a
 AUX scim-hangul-0.3.2+gcc-4.7.patch 318 BLAKE2B 379fd21d1ce405ffac797053f0011c2b81eb4567fe4e027be5678778316ccd5c025733c281c28955fbb6f2985e6c260df2a5f953867b7096c2827c92d02a2c83 SHA512 b07a6dadf8e206fad812e184f506d034628eccf76de00729f3c8b68eb20bfc48a881a26ed78fbfa87e16dbd7164778eebe03fc7d45297462311a5386ea72da38
-AUX scim-hangul-0.4.0+gtk.patch 511 BLAKE2B e8c20179d59012bdd80ebc95a31a89a3da599b29315bc455e76e3c906207a4ea259c573d8eb3f6bb28a149b32d861f8a4029cc07b47420458ce1d4b5ca48313c SHA512 ccdcf1b6f35bc02c29cde55a89c67b1d52a716a7e2cb87f98c15140e52266aab9c2fc4b78869fa3c69472d973988c2ccfc3204965fd3ebe2142a3f9d82d6aad5
-DIST scim-hangul-0.3.2.tar.gz 1176577 BLAKE2B 80c0ad3f988615f29ee25a0143ec325a0bb892d4c18f19783519dfbbfef373515c1e09eebcccc53c12ffbafb6fff479c0ca98569025cc53862af77ab0169154d SHA512 e8905320ff8aeeddf0041987ac5a63a19fb75bea44ffc55b5d28b825e064d6881ee0187b55025d69dad35af85da86818afa3ac39f1f10991021a7fbed3e1462e
+AUX scim-hangul-0.4.0+gtk.patch 438 BLAKE2B 4d76932fbd56d53eac9e0667774fa29fd884cce70a898b1f1f7f7c944766d8707d17ff73ef6f6d57923e532d554a5f66a92e32d46b71ac411f7cf3c6f189e7f1 SHA512 9e3ea01bbb73fab8a66ae52a81c976a67e6c47588f14194dfdee3acda3d493c38106344eea21584d350ebbd5eeb0dedd9ab6d08c16893e8f290d845c8d2281b1
 DIST scim-hangul-0.4.0.tar.gz 456953 BLAKE2B c7c2a320d03c4f15ad048b4e036a6dcd1f34044cb82e9a8fd18be8808e3f1be6f6f198e963982d1c6b742e614da5b3b2b3e2086ea8bbe19b4118f5493ae0188c SHA512 2f0285268deac35763c67487a40b718bf846d63634701a2a68d85109f686421f2c935b1f2998487b1f017c1a5e5bf453c56933ab4984f7464e1613d7e0b3131b
-EBUILD scim-hangul-0.3.2.ebuild 1048 BLAKE2B 818240e07a72b435502d67bf82ea5c965254d3152a9fa965d845f805e8a40364a81226edc24766624e3ce86d17719e75dccd7c1bce7bdb90fa08b3661fbd84fb SHA512 9e6c5ab33248ae92d34fedc05b6f5dbc3ef1811234d092717dffa7b93fc87643ccc0752ca0c9dd9df25786776588055a86c60c1c51b3bf076310e21bdfbce442
-EBUILD scim-hangul-0.4.0.ebuild 1133 BLAKE2B 48972dfe1fc92b1af1812038e2dfe410883e0a51883d1c8c11dbcef203c98f9be55f8158168a692d3dd81d6c5b2f830c9ce9c4c6f275f078faf4a8ccfd69eff8 SHA512 2645f1cbb0c7993bb7121ac7c766f048672bf854497902ac79d3fa31c0405fb0680cf8a10857d8f3ef3a96933424aac20c3a2a8933e55771a49240bf288ffd76
+EBUILD scim-hangul-0.4.0.ebuild 1065 BLAKE2B ca093b848f5bc563c59f6df461222ccdd18c3dedce18213ee9726da8f94b13a13c398123c2bc5b89c8df12a2830865f3eb33e82783ed19b33fe97a235faca074 SHA512 198f1a4f5032d6eec5132fb48b7fe934d01d2628b4c0fb55693ed53d261da22fb714a94f3a599aaa2e9c9c8a296ed0d48f0933b04960fe0485971ce3a3e25699
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch b/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch
index bc1fd4b673ee..82d9f8ee10b2 100644
--- a/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch
+++ b/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch
@@ -1,5 +1,5 @@
---- src/scim_hangul_imengine_setup.cpp.orig	2012-07-08 07:52:07.000000000 -0400
-+++ src/scim_hangul_imengine_setup.cpp	2012-11-02 14:13:14.000000000 -0400
+--- a/src/scim_hangul_imengine_setup.cpp
++++ b/src/scim_hangul_imengine_setup.cpp
 @@ -346,7 +346,7 @@
      for (i = 0; i < n; i++) {
  	const char* name = hangul_ic_get_keyboard_name(i);
diff --git a/app-i18n/scim-hangul/scim-hangul-0.3.2.ebuild b/app-i18n/scim-hangul/scim-hangul-0.3.2.ebuild
deleted file mode 100644
index e2ca5068562b..000000000000
--- a/app-i18n/scim-hangul/scim-hangul-0.3.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit base
-
-DESCRIPTION="Hangul IMEngine for SCIM ported from imhangul"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-RDEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 )
-	>=app-i18n/libhangul-0.0.4
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}/${P}+gcc-4.3.patch"
-	"${FILESDIR}/${P}+gcc-4.7.patch" )
-
-src_configure() {
-	econf \
-		--disable-skim-support \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog* NEWS README*
-}
-
-pkg_postinst() {
-	elog
-	elog "To use SCIM with both GTK2 and XIM, you should use the following"
-	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
-	elog
-	elog "LANG='your_language' scim -d"
-	elog "export XMODIFIERS=@im=SCIM"
-	elog
-}
diff --git a/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
index 13eba035c1c6..aa37d7ea868e 100644
--- a/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
+++ b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit autotools-utils
+EAPI=6
 
 DESCRIPTION="Hangul IMEngine for SCIM ported from imhangul"
 HOMEPAGE="http://www.scim-im.org/"
@@ -14,7 +12,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
-RDEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 )
+RDEPEND="
+	>=app-i18n/scim-0.99.8
 	>=app-i18n/libhangul-0.0.4
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
@@ -22,23 +21,23 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.3.2+gcc-4.3.patch"
-	"${FILESDIR}/${PN}-0.3.2+gcc-4.7.patch"
-	"${FILESDIR}/${PN}-0.4.0+gtk.patch" )
-
-DOCS=(AUTHORS NEWS)
+	"${FILESDIR}"/${PN}-0.3.2+gcc-4.3.patch
+	"${FILESDIR}"/${PN}-0.3.2+gcc-4.7.patch
+	"${FILESDIR}"/${PN}-0.4.0+gtk.patch
+)
 
 src_configure() {
-	local myeconfargs=(
-		--disable-skim-support
+	econf \
+		--disable-skim-support \
 		$(use_enable nls)
-	)
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
-	dodoc ChangeLog* README*
+	default
+	dodoc ChangeLog*
+
+	# plugin module, no point in .la files
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/app-i18n/scim-sayura/Manifest b/app-i18n/scim-sayura/Manifest
index 270f23b829f5..f90b0a399a21 100644
--- a/app-i18n/scim-sayura/Manifest
+++ b/app-i18n/scim-sayura/Manifest
@@ -1,4 +1,4 @@
-AUX scim-sayura-0.3.3-gcc45.patch 349 BLAKE2B eb3a0356f0d2b13aad1f6b39621e655d1bad1fc1b5a0dd0f23bbe931c1ca212ed5e101e72e03a1e08bfa6d76076b6d609cecf5461133219fe6d799dc6c497930 SHA512 0227a3a7cd6d602a677559235a2ab3ee4129b70861c12d0ae6c005a46d658a90a0e318d8cbcd638dfb24fa2d3f4d1be8c278e77cff850efcdba6757871085032
+AUX scim-sayura-0.3.3-gcc45.patch 353 BLAKE2B f2576aff8d65beec5ad0751f7f2cb22142a25a890081ee634606725a6eedf811f14e89d85d74bf968c4fed6b3264da45c5dd2832da252db12370eab7a1fcc98b SHA512 2f4c3ce88dc9b21eb59bff14cb16ae36ed60b0b0a75638bb2080e9bfbeab986857a6f7095f5ab4c4f065f168faaa870ba115922c9b8d28222da821d7dcd5d554
 DIST scim-sayura-0.3.3.tar.gz 380147 BLAKE2B 12e1968e0b581c20fe12fe306c0f01cc5ddff15b5d3bc01cf43efb3538747cd29ef223583b2b8a3fb890f2108536f5cae328dca4a4e666a56e5b7d666b9e8bf3 SHA512 bf97b8d82e0e193a94698dfe7d3c9b1256e928a2082dc0ca6be328ed56409a05d38ba04254617b3800116514c1c8fdbfca869f2aa3f2f005505a4e873d2b90bb
-EBUILD scim-sayura-0.3.3.ebuild 660 BLAKE2B 8dfa6bb28c738086ad7cc63bcc3847e27f0ca70d3033ccb53a69e5f6963a9674cbab5396aa6f6ae4e4f6d6fc0f6588a66d327b20076e31f7f2dbf6afe298d779 SHA512 544790f633a251e4a32ad676ea48624f760a1c9909c12f221f85bcd6c18e0fd62f368e02e798bd0807a063a96ac0c79636f99b6d4fbda352cfe27689f4f2cd7a
+EBUILD scim-sayura-0.3.3.ebuild 672 BLAKE2B 7d626a06c6ffac07427fafa803d52c7cdd99d3aa559396ef06ee7a9c25d2d8c793be6fcea18e07778885bbe18ea381ba83d446fef7c4f89500b81cb798b86b2b SHA512 65aae4dc4677101745f67c32e0b30a509806c04e9d787868093a434db6be04eda55b4316a6c283a4ac0f3fb603bed19d061b85e9b22376b1af8742131b4e95f9
 MISC metadata.xml 341 BLAKE2B 6f2f812f898b78c0198bd500116b4f0664ac37ee511e57dfb9c36abd9f5386171594aa7da706c5f93d4f98de2fad9630f94eac2e785c64918c865076360150b7 SHA512 93333f168a51bc5b932b06f436c6254d56da5b7de8cc3127e5641a74488a01aaa650d01a018970da8202a7432d8dab8f73d0786802634bc9b131f90219ee2eef
diff --git a/app-i18n/scim-sayura/files/scim-sayura-0.3.3-gcc45.patch b/app-i18n/scim-sayura/files/scim-sayura-0.3.3-gcc45.patch
index 64ee87416011..d80f654b6f67 100644
--- a/app-i18n/scim-sayura/files/scim-sayura-0.3.3-gcc45.patch
+++ b/app-i18n/scim-sayura/files/scim-sayura-0.3.3-gcc45.patch
@@ -2,8 +2,8 @@ Fixing build with gcc 4.5
 
 http://bugs.gentoo.org/show_bug.cgi?id=320879
 
---- src/scim_sinhala_imengine.cpp
-+++ src/scim_sinhala_imengine.cpp
+--- a/src/scim_sinhala_imengine.cpp
++++ b/src/scim_sinhala_imengine.cpp
 @@ -233,7 +233,7 @@
  
  void SinhalaInstance::backspace()
diff --git a/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild b/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild
index 77044b6d6326..f04f5993a8e9 100644
--- a/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild
+++ b/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Sayura Sinhala input method for SCIM"
 HOMEPAGE="http://www.sayura.net/im/"
@@ -18,14 +16,18 @@ RDEPEND=">=app-i18n/scim-0.99.8"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/scim-sayura-0.3.3-gcc45.patch
+PATCHES=( "${FILESDIR}"/scim-sayura-0.3.3-gcc45.patch )
+
+src_configure() {
+	econf --disable-static
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	HTML_DOCS=( doc/{index.html,style.css} )
+	default
 
-	dodoc AUTHORS ChangeLog NEWS README
-	dohtml doc/index.html doc/style.css
 	use doc && dodoc doc/sayura.pdf
+
+	# plugin module, no point in .la files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-i18n/scim-uim/Manifest b/app-i18n/scim-uim/Manifest
index e48c30986d87..e1b93d03341a 100644
--- a/app-i18n/scim-uim/Manifest
+++ b/app-i18n/scim-uim/Manifest
@@ -1,5 +1,5 @@
 AUX scim-uim-0.2.0-gcc43.patch 420 BLAKE2B 491828a4fa94ed7f0343b449b35e911666dd9abe8627264caa79f9d20605bd9a075e7165b367fee4669db0d4178c385fc4d4937491dd5bc5c31af1af2ab5cd6f SHA512 8baec8863a00d1a870f9c557340f089f51e991acec994a3445bc378f95b226aeb46018ba11b8dc605b90ab35f7923bfc029fa40e1e01e17caba1e3ca99e07c09
 AUX scim-uim-0.2.0-uim-1.5.patch 367 BLAKE2B e73cefa76abb64816265ee870c44d39966606624c649d97c09d5e5cf5494af34f49c9770ad103f7af2afa8eedc662098565c68a12fc70b0fc936e384a19035d8 SHA512 2c68a8fa1e5d99e624145ce9a85aeb1a286e4a4afe33d92c32c13ad3e14060afa8f730d58146d9a2b134b9565172a909138742357b640ba000a7129e5e65e485
 DIST scim-uim-0.2.0.tar.gz 344389 BLAKE2B da0cd29036cf3fd4a94ca0f5c9e72566ccb37c4d64019645b9ea04d9859d33d1614d8cf786ca67a0d2c474b79b13d7d100ddf815b982ba414ac950306ae00448 SHA512 18df8de8ebc02289e21bf54c921b5425f67ef3c379b3c3e4392431dc3b1d9d7f12a25bcbcaaddd264913bacf61ba2be9339845700f541c22f73981e99824c6e9
-EBUILD scim-uim-0.2.0-r2.ebuild 932 BLAKE2B 57e07ff7d4efb09a5c516a001cb8baddc1232e8b3f4249e0068dcfe60ae1b777c6aca97cf1034cbc231bfc300284246970face2483128e9a536cb1da68b2281a SHA512 79a5c8e0385f8114e7df01c991a5c3915bdd18912f86bd32e425e3dd8b3c63753be35dee054ecb9de193c62fb65e33ce4ef030ac2beea93ac68919ee70541aae
+EBUILD scim-uim-0.2.0-r2.ebuild 931 BLAKE2B df9a4bb7d1b155f9e1baba29a78e3879616b25e5222afc5d938768f0ac94bd07cfb603bc87695e8c87e4d91a825b6aa94a8da66991001db045d7f7a3c526930e SHA512 533313a1588e72431a6e759f21eddcffde6c7eccc142e8ef4ca651b8124ad2817ca917e78984f96f3057ee2bd401f6c0a70960b08e9cbca57055a3249283e60f
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild b/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild
index ad0fc7d82d8a..8b9fe22e0718 100644
--- a/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild
+++ b/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-inherit eutils
+EAPI=6
 
 DESCRIPTION="An input module for Smart Common Input Method (SCIM) which uses uim as backend"
 HOMEPAGE="http://www.scim-im.org/"
@@ -13,20 +12,26 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/uim-1.5.0
+RDEPEND="
+	>=app-i18n/uim-1.5.0
 	>=app-i18n/scim-1.4.0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc43.patch" \
-		"${FILESDIR}/${P}-uim-1.5.patch"
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-uim-1.5.patch
+)
+
+src_configure() {
+	econf --disable-static
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	default
 
-	dodoc AUTHORS ChangeLog README THANKS || die
+	# plugin module, no point in .la files
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/app-i18n/scim-wijesekera/Manifest b/app-i18n/scim-wijesekera/Manifest
index 52262611ac1b..b83d79bae010 100644
--- a/app-i18n/scim-wijesekera/Manifest
+++ b/app-i18n/scim-wijesekera/Manifest
@@ -1,4 +1,4 @@
 AUX scim-wijesekera-0.3.3-gcc43.patch 949 BLAKE2B d65f15add07ccceab709a3a47681274a6897aef008926646c40b4b6ed6c5a732870f66129d9fbc067bb7f1235140d43ac50f7e462faf6b05abcda64645a487fe SHA512 0719231165e2647b7fbfec9b39e98b2665bb8e7bdf708937afdb917df8762cc0a1b226bb60177367ea5019e8962fa5bc6fc4cc2d883a0bcc7049a29bf64aa974
 DIST scim-wijesekera-0.3.3.tar.gz 193023 BLAKE2B 6d8b4757e851a9e17b074c0bdda03e01b32a547a29d9755f82eb8828f8accf830a44aac8cc71ba6c6b18c7649a9a6e3009108e2fdc27992e9dc8d84d99a0c201 SHA512 98bfbb7a3cf499c7980c06504083744f46ce352b27e8e80362190359e8bfa88472a5510568f3753503c7d409d1730e7d1ae1162e3d43a5475e466c334b0a91fc
-EBUILD scim-wijesekera-0.3.3-r1.ebuild 632 BLAKE2B f27850d6dabb322303d450aedea0e83c3052f43e0cefce4428d81f0de3004925adc50f8f8eb578acd5ea9c739199a18c7316e4d536748ce123b98f129f6cf927 SHA512 f3a75e566829598a7c5e1d0e275a24c628b532b1f76e95eb0eaaf85dfbf5b810dd17fa55a80ec7c89256b590f50b688c76de9aca035a18d7c709787d0a2d9e90
+EBUILD scim-wijesekera-0.3.3-r1.ebuild 677 BLAKE2B 0eca6f938b54be2bc23308326fcb5b6a5c2f37eb699113dcc8d941f049ac94fdb6d6e284e24aaa001378763b3523a59b11a154abd0437e34a6bedcd5e64f2223 SHA512 df5322f2bceff7ece47c3daa63149e46a39c55d46838bbf0870a38125b9e4cac01eb3c697c008903bb8c1b2e3b28ab0190d423537f72e66b93456e894e02e5dc
 MISC metadata.xml 311 BLAKE2B afb6ee7bcdfdd6a60d60c65ff2796f3ae1be7aed807252c8a38e9ca364fe07a82730c354da96cddd357e046316aa6c9e3e85a848bf3fe0a9a873a45be9ede313 SHA512 f28f06e7380cddb887dc480bfd1c975a5aecf7fe3a9349547f058141cfc66f212e51728627638342958785843cdd668a9d35dc9c3b13963d4ea6c0ff91739a0a
diff --git a/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild b/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild
index 69f362e5b6ec..28914bc279f6 100644
--- a/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild
+++ b/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Wijesekara keyboard for Sinhala input using scim"
 HOMEPAGE="http://sinhala.sourceforge.net/"
@@ -18,13 +18,20 @@ RDEPEND=">=app-i18n/scim-0.99.8[-gtk3]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc43.patch"
+	default
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
-	dodoc AUTHORS ChangeLog NEWS README
+	# plugin module, no point in .la files
+	find "${D}" -name '*.la' -delete || die
 }