app-i18n/ibus: multilib-utize

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

2 files changed, 38 insertions, 25 deletions

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 8c33515..6683c1b 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -7,6 +7,6 @@ AUX ibus-1.5.1-setup.patch 951 SHA256 9bd2e40af53c165ce5ecee4fdf65fda4b2b754f123
 AUX ibus-1.5.1-use-system-keyboard-layout.patch 3265 SHA256 2b5f28ac04dcb5225f6c26717e7692d2b47bddffd9658dff29b418b0519d5053 SHA512 dfbe7afa955c33edc0735e915f0205fb745ae1354479d345e8493b32e2e5b71e1f92e0d1239a625cc7288db136859b89a1eb7c5d73453fbe8dbea0e4272e5dc2 WHIRLPOOL 320af37e567560822ba5e5ab0451acde3d461459e0a79095117307d9318418374539ac92de79ba02aa823ce7ae745a85fa5a263df614309ee414985346488574
 AUX ibus-gconf-2.m4.patch 1707 SHA256 40c54a970779f4586161f45ebd245c9db71b46ced0d7deda22f47de851c02954 SHA512 5310d371ae53c31551824e01c9fc3ee815b64c5595c778b956f807973be57ba26efa72977b3f3798347ecf25551f7da95f11bb545def761968b96edd81575985 WHIRLPOOL 74337f038a655689911c0fa3d219747b64c440453d62a1c9597f7cd9e8b45f6b3119e81e8daa8f7dd0eff4a74f2e78bef8ed16ea3c41ebad5cb10b0c7b2d9952
 DIST ibus-1.5.4.tar.gz 2026656 SHA256 703ebaba3f01b54a86119fb6161d85b9d1ccdb4edb79782d0d23ccde64d214fd SHA512 754cb402c5cd620955b553ab10a397e6f2e8a7db3016c83508fdfefeca0326e9a467bd2d5cc564914082cb1044e2bedeb79f7a20972395f58f58bad0d0855124 WHIRLPOOL 558fca78dcc2c05fdd154ca0940520a2caf579e6ca31b6f284ee2885fb3a5c2b6bc98d114589177f9fd7f5a7c27e036452e85d4c0fa646c7e7e7a947c485f759
-EBUILD ibus-1.5.4-r2.ebuild 4370 SHA256 71592f41e5a3dc0291b117cd49c19609a9a96dd18939ef60c8c2d6ea7903bf7c SHA512 2541928eece97fe6bff21194c8e72b452920e14dfb93f23ad3cb79cc56056defbf0a5a723ae6162c1c9fa3755843964b389f32b20885548c8b5b32c2dbf22124 WHIRLPOOL 4670ffeacf5910ba03645eeff7365e1d0171761c4b9460d717095246b7aabef261fea3edf07f3d5bed60d3dd48a439855db8a1d83e1a1ddda44bea9670166495
+EBUILD ibus-1.5.4-r2.ebuild 5014 SHA256 d370f78fcaac0ac712f0799675150712405a7ca97191034e9a591b52d8eddbb7 SHA512 5e4fedaee44c94efc5803d4526f698657843b3ae67224d9b75f7926578d55ae353198135154d22c8a04d6dd8dbf6f0d4e7bc9693ec1d1485d2f607a1fddf1fc0 WHIRLPOOL bae203df781d0ef692abb4e87fa11c7ed496647f23b65ac545b02991781695f3217f77cb1a53c7d1e8998d7bf1c01ef69df3b699480282cc7dfd18f9b75141e6
 MISC ChangeLog 21695 SHA256 864cc69e7ccc4a4b684116fef7f7aa5facb2f7fdde580542afeffea06763f253 SHA512 c2a11bded20d88ba9418f1e30ce13eced137073d34dff6082b5b7e25942deaacbdecd33386492232cd280d17a3bf892ba35a9d0b744505704958d7e495097f7e WHIRLPOOL 6d67de459e16dd56580d05a8c29bfb8cce6750691ea1a42c3191c76a26af21f50b78a059da455310dad7ee6cef8ee53cbba73c07a78dea505c3b8e7e31c3c304
 MISC metadata.xml 984 SHA256 3fc098fc1705fd2415044e6fdba35555bdecad080c056ec418c7d53ddb8738c4 SHA512 b768faa0466a08629bd416b575c35b0e7868972d16878e7da79da5837549cbe4a5e5772a06117e7536f3b3b2d2c417afac14e7639747a9a2a1d220b297adffc3 WHIRLPOOL a3050b1d6a123b7a82d067d6fbdb35c941ac6fd902d58ccbb0a4a339f319e67b2dc8ad2f3fc1af521dd981fc3af41c9c4242a15235847856c1feb1f03e4bdc61
diff --git a/app-i18n/ibus/ibus-1.5.4-r2.ebuild b/app-i18n/ibus/ibus-1.5.4-r2.ebuild
index 3799133..4f37830 100644
--- a/app-i18n/ibus/ibus-1.5.4-r2.ebuild
+++ b/app-i18n/ibus/ibus-1.5.4-r2.ebuild
@@ -6,10 +6,11 @@ EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
+
 # Vapigen is needed for the vala binding
 # Valac is needed when building from git for the engine
 
-inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 vala virtualx
+inherit bash-completion-r1 eutils multilib python-single-r1 vala virtualx gnome2-multilib
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="http://code.google.com/p/ibus/"
@@ -17,7 +18,7 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="|| ( gtk gtk3 X )
 	deprecated? ( python )
@@ -26,23 +27,23 @@ REQUIRED_USE="|| ( gtk gtk3 X )
 		|| ( deprecated ( gtk3 introspection ) ) )" #342903
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
+	>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
+	gnome-base/librsvg:2[${MULTILIB_USEDEP}]
+	sys-apps/dbus[X?,${MULTILIB_USEDEP}]
 	app-text/iso-codes
-	>=gnome-base/dconf-0.13.4
-	x11-libs/libnotify
+	>=gnome-base/dconf-0.13.4[${MULTILIB_USEDEP}]
+	x11-libs/libnotify[${MULTILIB_USEDEP}]
 
-	gconf? ( >=gnome-base/gconf-2.12:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
+	gconf? ( >=gnome-base/gconf-2.12:2[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
+	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 	X? (
-		x11-libs/libX11
-		x11-libs/gtk+:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-	nls? ( virtual/libintl )
-	wayland? ( dev-libs/wayland )"
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8[${MULTILIB_USEDEP}] )
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )"
 RDEPEND="${COMMON_DEPEND}
 	x11-apps/setxkbmap
 	python? (
@@ -62,9 +63,9 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	dev-util/intltool
 	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )
+	nls? ( >=sys-devel/gettext-0.16.1[${MULTILIB_USEDEP}] )
 	vala? ( $(vala_depend) )
-	gnome-base/gconf"
+	gnome-base/gconf[${MULTILIB_USEDEP}]"
 
 # stress test in bus/ fails
 # IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
@@ -82,6 +83,7 @@ src_prepare() {
 		-i data/dconf/Makefile.{am,in} || die
 	use vala && vala_src_prepare
 	cp "${S}"/client/gtk2/ibusimcontext.c "${S}"/client/gtk3/ibusimcontext.c || die
+	gnome2-multilib_src_prepare
 }
 
 src_configure() {
@@ -93,7 +95,7 @@ src_configure() {
 	else
 		python_conf="--disable-python-library --disable-setup"
 	fi
-	econf \
+	gnome2-multilib_src_configure \
 		--enable-dconf \
 		$(use_enable introspection) \
 		$(use_enable gconf) \
@@ -109,14 +111,25 @@ src_configure() {
 		${python_conf}
 }
 
-src_test() {
+src_install() {
+	gnome2-multilib_src_install
+}
+
+ehook gnome2-multilib-per-abi-pre_src_test my_abi_pre_test
+my_abi_pre_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check || die
+	return 1
 }
 
-src_install() {
+ehook gnome2-multilib-per-abi-pre_src_install my_abi_pre_install
+my_abi_pre_install() {
 	default
+	return 1
+}
 
+ehook gnome2-multilib-global-post_src_install my_global_post_install
+my_global_post_install() {
 	prune_libtool_files --all
 
 	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
@@ -139,8 +152,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
+	use gtk && gnome2-multilib_query_immodules_gtk2
+	use gtk3 && gnome2-multilib_query_immodules_gtk3
 	gnome2_schemas_update
 	gnome2_icon_cache_update
 
@@ -163,8 +176,8 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
+	use gtk && gnome2-multilib_query_immodules_gtk2
+	use gtk3 && gnome2-multilib_query_immodules_gtk3
 	use gconf && gnome2_schemas_update
 	gnome2_schemas_savelist
 	gnome2_icon_cache_update