commit: 7a2dac446c66065706139f1b7ac55c6f2732762d Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Mon Nov 24 18:35:26 2014 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Mon Nov 24 18:35:26 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7a2dac44
app-accessibility/at-spi2-core: 2.14.0 → 2.14.1 --- ...re-2.14.0.ebuild => at-spi2-core-2.14.1.ebuild} | 29 ++++++++++++++-------- .../at-spi2-core/at-spi2-core-9999.ebuild | 29 ++++++++++++++-------- 2 files changed, 38 insertions(+), 20 deletions(-) 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 similarity index 62% rename from app-accessibility/at-spi2-core/at-spi2-core-2.14.0.ebuild rename to app-accessibility/at-spi2-core/at-spi2-core-2.14.1.ebuild index f67ba01..026f7de 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 5037aec..cab81ab 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; }
