gentoo resync : 08.05.2018

4 files changed, 38 insertions, 16 deletions

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 67feff0e605d..e16a653203d8 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,9 +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
+DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
 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 3976 BLAKE2B 6bede6434d30b0fe6f07bb5f447b783dd0ac4a999d34afced1dd37039e949d1da06d3eadd1e08180bafdba274253d188099c3dd4747389a5f1fcc1009fbe3b04 SHA512 706833bf159c29c8045f686f2a11a4daa1672ab69c5925bc70952b3bacad641a61175c6898bec036fb7eb26b3d8b9fbf520ed2e9e5fcf32bac228992e6506e97
-EBUILD ibus-1.5.17.ebuild 3982 BLAKE2B 48c3ae5d7a6b0772ef0343ceb98f61ab9c384f0854af6e39500679a383df9c77e785e10e57c88f936fa72d8bccb4a75fb349e12584f6b02345150de3c676a560 SHA512 2c079b15bdc95da7b831c5da1d1094424644d18553732aae323c957d09228b41233de03a5c5641ff0a65d70e6ff81771c1d398af2a97c5e0c04a858c0a3987ef
-MISC metadata.xml 876 BLAKE2B 0594f787b71a972b67f1f52fde4e6e6c4eead1f604a1152ea9af2a15cd678677a29adaaba1a53251efbb95f0d12baa7d3dc63e54676757bbc7d9bf6235cf7e1e SHA512 eff80e5a8db4276c1138de9e661e5735c42abfc32950bc439eda9f342e5d2a68a8d5c848dc0000a2960a315ac38dbeda6b9fc44de8b9d526e7dddd94122f9f32
+EBUILD ibus-1.5.17.ebuild 4015 BLAKE2B 5112e3ca412d252307a5eb924ec66a69d60cef61aac7d9768fe9941a57eca109e89fb5a2c65abbec4a11bbc2d637cac627faba86f448245ead64ea7dfb3543df SHA512 3b3a1e0ab69c28c86ff92d6a5cbe4bed0b8b9c97e33b1e6fe776e091ae93b2bf451475c5e89f771042b2b42cd567d078c7823870f1986d3df7478776a7b498ca
+EBUILD ibus-1.5.18.ebuild 4249 BLAKE2B 88e341a0376f8493572923a77a9c9e6c44dabbaf6b1a19d90430883827ec3d53ccad6edd67b008956338ad4803ef3acc1daa11d63d490518db94953e936aff03 SHA512 b3566a4e2be3faa97a3e5757e16b2775dae4ee22b1e0458c9df74db2a42bd33c39ace2a220fa51731b6a4921fc16c0e8e98b657ef08820cf0f1f3b1cbb53c48b
+MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/ibus-1.5.17.ebuild b/app-i18n/ibus/ibus-1.5.17.ebuild
index 43eff2df2a0c..10bd3f700de7 100644
--- a/app-i18n/ibus/ibus-1.5.17.ebuild
+++ b/app-i18n/ibus/ibus-1.5.17.ebuild
@@ -5,7 +5,7 @@ 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
+inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx xdg-utils
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -98,6 +98,7 @@ src_prepare() {
 
 	default
 	eautoreconf
+	xdg_environment_reset
 }
 
 src_configure() {
diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index d98586b8db2f..0115a8275ea6 100644
--- a/app-i18n/ibus/ibus-1.5.15.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 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
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -14,8 +14,10 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland"
-REQUIRED_USE="gtk2? ( gtk )
+IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
 	libnotify? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
@@ -42,6 +44,7 @@ CDEPEND="app-text/iso-codes
 		gtk2? ( x11-libs/gtk+:2 )
 	)
 	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
 	libnotify? ( x11-libs/libnotify )
 	nls? ( virtual/libintl )
 	python? (
@@ -62,14 +65,24 @@ DEPEND="${CDEPEND}
 	$(vala_depend)
 	dev-util/intltool
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	unicode? ( app-i18n/unicode-data )"
 
 src_prepare() {
 	vala_src_prepare --ignore-use
-	# disable emoji
-	touch \
-		tools/main.vala \
-		ui/gtk3/panel.vala
+	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
+	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
@@ -87,9 +100,11 @@ src_prepare() {
 
 	default
 	eautoreconf
+	xdg_environment_reset
 }
 
 src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
 	local python_conf=()
 	if use python; then
 		python_setup
@@ -103,17 +118,22 @@ src_configure() {
 
 	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 unicode unicode-dict) \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
 		$(use_enable vala) \
 		$(use_enable wayland) \
-		--disable-emoji-dict \
 		"${python_conf[@]}"
 }
 
@@ -124,7 +144,7 @@ src_test() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 
 	if use python; then
 		python_install() {
diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 11716b823097..3e5476424e4b 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -14,6 +14,7 @@
     <flag name="emoji">Enable support for Emoji</flag>
     <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
     <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag>
+    <flag name="unicode">Enable support for Unicode choice</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:ibus_project:ibus</remote-id>