commit: 2568fba0eaa51d56011db5d2e2a6b8d50d48eb1d Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Sun Dec 14 22:26:49 2014 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Sun Dec 14 22:45:37 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2568fba0
app-accessibility/at-spi2-atk: moved to gentoo-x86, sync live ebuild --- .../at-spi2-atk/at-spi2-atk-2.14.1.ebuild | 38 ---------------------- .../at-spi2-atk/at-spi2-atk-9999.ebuild | 26 ++++++++++----- 2 files changed, 17 insertions(+), 47 deletions(-) diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.14.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.14.1.ebuild deleted file mode 100644 index 7ff6288..0000000 --- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.14.1.ebuild +++ /dev/null @@ -1,38 +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 virtualx - -DESCRIPTION="Gtk module for bridging AT-SPI to Atk" -HOMEPAGE="http://live.gnome.org/Accessibility"; - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos" -IUSE="" - -COMMON_DEPEND=" - >=app-accessibility/at-spi2-core-2.11.2 - >=dev-libs/atk-2.11.90 - >=dev-libs/glib-2.32:2 - >=sys-apps/dbus-1.5 -" -RDEPEND="${COMMON_DEPEND} - !<gnome-extra/at-spi-1.32.0-r1 -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -src_configure() { - gnome2_src_configure --enable-p2p -} - -src_test() { - Xemake check -} diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-9999.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-9999.ebuild index 510c498..3b17cae 100644 --- a/app-accessibility/at-spi2-atk/at-spi2-atk-9999.ebuild +++ b/app-accessibility/at-spi2-atk/at-spi2-atk-9999.ebuild @@ -6,7 +6,7 @@ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit eutils gnome2 virtualx +inherit eutils gnome2 multilib-minimal virtualx if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -19,27 +19,35 @@ SLOT="2" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" fi IUSE="" COMMON_DEPEND=" - >=app-accessibility/at-spi2-core-2.11.2 - >=dev-libs/atk-2.11.90 - >=dev-libs/glib-2.32:2 - >=sys-apps/dbus-1.5 + >=app-accessibility/at-spi2-core-2.11.2[${MULTILIB_USEDEP}] + >=dev-libs/atk-2.11.90[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}] + >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}] " RDEPEND="${COMMON_DEPEND} !<gnome-extra/at-spi-1.32.0-r1 + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3 + !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + ) " DEPEND="${COMMON_DEPEND} - virtual/pkgconfig + virtual/pkgconfig[${MULTILIB_USEDEP}] " -src_configure() { +multilib_src_configure() { + ECONF_SOURCE=${S} \ gnome2_src_configure --enable-p2p } -src_test() { +multilib_src_test() { Xemake check } + +multilib_src_compile() { gnome2_src_compile; } +multilib_src_install() { gnome2_src_install; }
