app-accessibility/at-spi2-core: 2.14.0 → 2.14.1

3 files changed, 42 insertions, 24 deletions

diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 4eb10b81..87fce3fc 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST at-spi2-core-2.14.0.tar.xz 456376 SHA256 5807b02e6ef695b52fde7ff26d675dd94a0707df3c42fe7fd224828e092514c8 SHA512 e8dc541f4f1df6e51a6ebaa2fa2fb6f3fe933f95268b9fc9a01edf6466c1a123194ee006ac7c0a654cddd7afaba8faba942690f99ceae6676747cabe40b148f0 WHIRLPOOL 09c228565f753b0f40f36fba328c6bda215011b7ef9f6e3a4780542036ef24f1c8371df94f32202aab1e34435f5e1742939e812fb6813f7d721b142095281d08
+DIST at-spi2-core-2.14.1.tar.xz 456272 SHA256 eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a444425712f46ce657 SHA512 263f2353961787b510a22ede6243ebd6f9eba7fe00740b252ba372e78a2b4a20bd6ed1a9f509b2e33342fc5516d1e8b95f886573d51962755e51584771ac86b9 WHIRLPOOL 54d02cd41f1039c3b166c01215d983b768011c99b81831fc3256a4dde66b3a2fbff7b0fafa4958bbce367fee164c5f5c90531de11f57d65a1972af009b5afd62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREKAAYFAlQ5WpEACgkQ1fmVwcYIWAaQnwCguUtQyNFdD9zqOYhDG2AUcmTv
-WWkAoIuivp/HyKxGpmNM0mZ9nDLxANDu
-=l0BA
+iEYEAREKAAYFAlRzem8ACgkQ1fmVwcYIWAbAjwCfXIICn8S6/FuXZGkgr8SJ72xU
+QYMAn0xVqqF55Ho2XgNa5pEo/Sok9hWH
+=PTNT
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.14.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.14.1.ebuild
index f67ba018..026f7deb 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.14.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.14.1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit eutils gnome2 multilib-minimal
 
 DESCRIPTION="D-Bus accessibility specifications and registration daemon"
 HOMEPAGE="http://live.gnome.org/Accessibility"
@@ -20,18 +20,18 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fb
 # making the dep unneeded or fixing their configure
 # Only libX11 is optional right now
 RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=sys-apps/dbus-1
-	x11-libs/libSM
-	x11-libs/libXi
-	x11-libs/libXtst
+	>=dev-libs/glib-2.36: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 )
-	X? ( x11-libs/libX11 )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.9
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
 
 src_prepare() {
@@ -41,10 +41,19 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
-src_configure() {
+multilib_src_configure() {
 	# xevie is deprecated/broken since xorg-1.6/1.7
+	ECONF_SOURCE=${S} \
 	gnome2_src_configure \
 		--disable-xevie \
-		$(use_enable introspection) \
+		$(multilib_native_use_enable introspection) \
 		$(use_enable X x11)
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
+	fi
 }
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-9999.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-9999.ebuild
index 5037aecb..cab81ab5 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-9999.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit eutils gnome2 multilib-minimal
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -28,18 +28,18 @@ fi
 # making the dep unneeded or fixing their configure
 # Only libX11 is optional right now
 RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=sys-apps/dbus-1
-	x11-libs/libSM
-	x11-libs/libXi
-	x11-libs/libXtst
+	>=dev-libs/glib-2.36: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 )
-	X? ( x11-libs/libX11 )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.9
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
 
 if [[ ${PV} == 9999 ]]; then
@@ -54,10 +54,19 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
-src_configure() {
+multilib_src_configure() {
 	# xevie is deprecated/broken since xorg-1.6/1.7
+	ECONF_SOURCE=${S} \
 	gnome2_src_configure \
 		--disable-xevie \
-		$(use_enable introspection) \
+		$(multilib_native_use_enable introspection) \
 		$(use_enable X x11)
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
+	fi
 }
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }