[gentoo-commits] proj/gnome:master commit in: dev-libs/atk/

[Gilles Dartiguelongue]

commit:     6e5e445d8cde7e5161d805e6558062dc37425c00
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 11 16:24:50 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 11 16:34:11 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6e5e445d

dev-libs/atk: 2.12.0-r1 → 2.14.0

---
 .../atk/{atk-2.12.0.ebuild => atk-2.14.0.ebuild}   | 25 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/dev-libs/atk/atk-2.12.0.ebuild b/dev-libs/atk/atk-2.14.0.ebuild
similarity index 63%
rename from dev-libs/atk/atk-2.12.0.ebuild
rename to dev-libs/atk/atk-2.14.0.ebuild
index b9c8a8e..52f8b0a 100644
--- a/dev-libs/atk/atk-2.12.0.ebuild
+++ b/dev-libs/atk/atk-2.14.0.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit gnome2 multilib-minimal
 
 DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
 HOMEPAGE="http://projects.gnome.org/accessibility/";
@@ -16,13 +16,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86
 IUSE="+introspection nls test"
 
 RDEPEND="
-       >=dev-libs/glib-2.31.2:2
+       >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
        introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+       abi_x86_32? (
+               !<=app-emulation/emul-linux-x86-gtklibs-20140508
+               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+       )
 "
 DEPEND="${RDEPEND}
        >=dev-lang/perl-5
        dev-util/gtk-doc-am
-       virtual/pkgconfig
+       >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
        nls? ( sys-devel/gettext )
 "
 
@@ -36,6 +40,17 @@ src_prepare() {
        fi
 }
 
-src_configure() {
-       gnome2_src_configure $(use_enable introspection)
+multilib_src_configure() {
+       ECONF_SOURCE=${S} \
+       gnome2_src_configure \
+               $(multilib_native_use_enable introspection)
+
+       # work-around gtk-doc out-of-source brokedness
+       if multilib_is_native_abi; then
+               ln -s "${S}"/docs/html docs/html || die
+       fi
+}
+
+multilib_src_install() {
+       gnome2_src_install
 }