commit: 1d20cd3f917455d09c8b63f26ecfda422711be74 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Sun Dec 14 22:27:41 2014 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Sun Dec 14 22:45:38 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1d20cd3f
app-accessibility/at-spi2-core: moved to gentoo-x86, sync live ebuild --- .../at-spi2-core/at-spi2-core-2.14.1.ebuild | 59 ---------------------- .../at-spi2-core/at-spi2-core-9999.ebuild | 12 +++-- 2 files changed, 9 insertions(+), 62 deletions(-) diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.14.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.14.1.ebuild deleted file mode 100644 index 026f7de..0000000 --- a/app-accessibility/at-spi2-core/at-spi2-core-2.14.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 multilib-minimal - -DESCRIPTION="D-Bus accessibility specifications and registration daemon" -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 ~x64-macos" - -# 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.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[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.9 - >=dev-util/intltool-0.40 - virtual/pkgconfig[${MULTILIB_USEDEP}] -" - -src_prepare() { - # disable teamspaces test since that requires Novell.ICEDesktop.Daemon - epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch" - - gnome2_src_prepare -} - -multilib_src_configure() { - # xevie is deprecated/broken since xorg-1.6/1.7 - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - --disable-xevie \ - $(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 cab81ab..53e8d14 100644 --- a/app-accessibility/at-spi2-core/at-spi2-core-9999.ebuild +++ b/app-accessibility/at-spi2-core/at-spi2-core-9999.ebuild @@ -21,13 +21,13 @@ if [[ ${PV} = 9999 ]]; then KEYWORDS="" IUSE="${IUSE} doc" else - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" fi # 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=" +COMMON_DEPEND=" >=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}] >=sys-apps/dbus-1[${MULTILIB_USEDEP}] x11-libs/libSM[${MULTILIB_USEDEP}] @@ -36,7 +36,13 @@ RDEPEND=" introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) " -DEPEND="${RDEPEND} +RDEPEND="${COMMON_DEPEND} + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3 + !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + ) +" +DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.40 virtual/pkgconfig[${MULTILIB_USEDEP}]
