app-accessibility/at-spi2-core: multilib-utize

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

3 files changed, 24 insertions, 24 deletions

diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index a592209..01a314f 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,7 +1,7 @@
 AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 SHA256 5834cf41154379002d3050810fce1da8a41c9bd1cce06593c1e7d5bdee083aef SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753 WHIRLPOOL 912c7cafdaecd93fb6fffec89a581346bf4c199c1e8a122483df4f3d36aca87ab11384380b49353910b70f70b96718133977e9ce7b4e9b02f54136da783cc309
 DIST at-spi2-core-2.10.2.tar.xz 446272 SHA256 d3da58f84f4c8e4d5fe940ecb52fb27b4d9ea2b4dcdb3e1fae0f46b5eaa2dde1 SHA512 51b3ec2f77933622ad3aa52e2bd91cab3a7ffbc396e1ec01a52ea277e5cbc972ab0998d3a54deeaf18fc67c5767c1958d4a0ff6bdc77768ca3a51b567013d5da WHIRLPOOL 480ab9c3c037e53f220abc42be9f09ea179a19de62b640efe0697ced1c04122d387eff8fc3fe7e359ea853de4415a3eddc42aa3fa18a00ddb57a1fa426a030e6
 DIST at-spi2-core-2.8.0.tar.xz 436836 SHA256 1861a30fc7f583d5a567a0ba547db67ce9bd294f0d1c9f7403c96a10a481c458 SHA512 5d31668dac3a93fd586686f4763da2839509e9607517bb9d5f35481a3125c549d69cc3834012a51f4dadafedaf919a880f1826c7f78bf94f3cdd8021d1918030 WHIRLPOOL 452d11b3d4e6442afa7af07231851e9bbced389c9073e631abcbe0ec13716342f7da133b5a2f2764885a4097a24c0ceaeeed561e213491685fb0a7c6c07846c3
-EBUILD at-spi2-core-2.10.2.ebuild 1275 SHA256 9876a4e624a60b6a21c5f01c650fd7698da82d5722059c8a4717f08d27bead7c SHA512 1a1168b7eb7596cd77ddcab9629dd5e61dfa2aa82a14d06c356c6204af67cfeedcc43634d84ecdcf8f1aeffc3714c9c7408aa602d04003f6833ead1f990a5229 WHIRLPOOL 5f4d7b0880c1a9069660c872d115f5dc9c0a206839d9ff5fdf6d2cfe95995f6f07b1db7dd34c80c424c257954f784780c73a93f6462bdba3dac7d71fff29043d
-EBUILD at-spi2-core-2.8.0-r1.ebuild 1202 SHA256 77334de854413c81b5d538ba0e415281d72e6cab2b4cb82b9de3f22dd2b861fa SHA512 f5a0a6cc33f6a4bdc494eff9bd6d6452b46817707834741220a6fa5fcf096d689f0a2bc5e46b587adc6a79e35d34a27ec0e39c3b5542bb452162e6ae7e1a3fde WHIRLPOOL c144e1ea9ffbb7a69a2de7c6542390f6da8ed36488c0aed56236f113397b2d0a11ce72b31bb9e09e99665a83816cfca22013e11946524ed5f6f66dbd0b911890
+EBUILD at-spi2-core-2.10.2.ebuild 1339 SHA256 60cb6f714adeb8d3da9f37aed22b7d91925db00dbc588d45038ff500a8d6638a SHA512 ebe28ef3c42fe16b4e9d50a62ae2092807f0c194ac80a75597281d2b39849b8daae3347ec248be935b918c57b21f01a5f4b275be7ad66b8c0a52f0765c54c4e5 WHIRLPOOL 3d4b477165b59c3e6e0351a4710aa26fb51e1c1feba06a4eb7ac9a79e85d5486deb7f59da4dc3b7df21e203557b5598ece4dccd3d782d056b72a5bfc60eaba93
+EBUILD at-spi2-core-2.8.0-r1.ebuild 1269 SHA256 73f48e04aebe9d3b7bbe7658f9d98afd7deafcc6cfb5a92471aafe6aafdf14f6 SHA512 d30ec7a76b53ca47e1cd1604439e494ff7fe78d718ac3f693fcee916f8a575fc48afc410e685bfa3e8db3575e86c5204f2dbbcaf14243f4be2cd862a108533a3 WHIRLPOOL a2189e8c2daa4ce3e865e511b68cc8fbf55e95c64fe61a71c9540d2c1c056a39954010a051e7dab3b710139158a7044666ebf2ab07793029d0e58f5cd34ee1a1
 MISC ChangeLog 7757 SHA256 659d9cd4174a8c1e3bcaa444e4ab9156272b1e5d3d6d16fc44dcd2a063a35e08 SHA512 c507f2a817e270fbd8ff7778687ceae327942133a248f42088070a3bfeea8e261a09afd7fd3af6167bda86da9cbb1efbbb2c0103cb639df42151396174aa1cd4 WHIRLPOOL ea4c699364635c1abe373b50514a85f8ac455f783e153854da9fe0233e2e16ed4aeda22193eba9d1a3f49a5de2440d2a386381a9363b3a45489b6ed60dc4ffd3
 MISC metadata.xml 174 SHA256 c0255e6a66375ac0e7f11c3712c6b47b7746432df4cf518e10c230674a6bc4f0 SHA512 b704bc8a6cbe98854b84a2ddedb7a2bc00309e3290e568dffed0bafc0acfcc81d6edb73dfacb95c56eef85982c2131f108e96abf55018ce45eda886f47bba1fb WHIRLPOOL 0e5a13b34c4e1ecf2888082f0c45255a63411981fbecbf4b8766de0f77993c2e6293f2ecb441adf901b20a48a56195a434cbb56c585d7e33693da12733ccb693
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.10.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.10.2.ebuild
index 331a6f1..2edf1e8 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.10.2.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.10.2.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit eutils gtk-doc gnome2-multilib
 
 DESCRIPTION="D-Bus accessibility specifications and registration daemon"
 HOMEPAGE="http://live.gnome.org/Accessibility"
@@ -14,19 +14,19 @@ HOMEPAGE="http://live.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="+X +introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64"
 
 # x11-libs/libSM is needed until upstream #719808 is solved either
 # making the dep unneeded or fixing their configure
 # Only libX11 is optional right now
 RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1
-	x11-libs/libSM
-	x11-libs/libXi
-	x11-libs/libXtst
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	X? ( x11-libs/libX11 )
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.9
@@ -38,12 +38,12 @@ src_prepare() {
 	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
 	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
 
-	gnome2_src_prepare
+	gnome2-multilib_src_prepare
 }
 
 src_configure() {
 	# xevie is deprecated/broken since xorg-1.6/1.7
-	gnome2_src_configure \
+	gnome2-multilib_src_configure \
 		--disable-xevie \
 		$(use_enable introspection) \
 		$(use_enable X x11)
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.8.0-r1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.8.0-r1.ebuild
index a6ad9f6..da27621 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.8.0-r1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.8.0-r1.ebuild
@@ -6,26 +6,26 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit eutils gtk-doc gnome2-multilib
 
 DESCRIPTION="D-Bus accessibility specifications and registration daemon"
 HOMEPAGE="http://live.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64"
 IUSE="+introspection"
 
 # x11-libs/libSM is needed until upstream #719808 is solved either
 # making the dep unneeded or fixing their configure
 RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXtst
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.9
@@ -37,12 +37,12 @@ src_prepare() {
 	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
 	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
 
-	gnome2_src_prepare
+	gnome2-multilib_src_prepare
 }
 
 src_configure() {
 	# xevie is deprecated/broken since xorg-1.6/1.7
-	gnome2_src_configure \
+	gnome2-multilib_src_configure \
 		--disable-xevie \
 		$(use_enable introspection)
 }