[gentoo-commits] gentoo-x86 commit in app-accessibility/at-spi2-atk: ChangeLog at-spi2-atk-2.8.1.ebuild at-spi2-atk-2.6.2.ebuild at-spi2-atk-2.6.2-r1.ebuild metadata.xml at-spi2-atk-2.8.0.ebuild

[Alexandre Rostovtsev (tetromino)]

tetromino    13/10/04 01:03:00

  Modified:             ChangeLog at-spi2-atk-2.8.1.ebuild
                        at-spi2-atk-2.6.2.ebuild metadata.xml
  Added:                at-spi2-atk-2.6.2-r1.ebuild
  Removed:              at-spi2-atk-2.8.0.ebuild
  Log:
  Make gtk2 module optional to provide a way for gnome2 accessibility users to install >=gtk+-3.6
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

Revision  Changes    Path
1.26                 app-accessibility/at-spi2-atk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog?r1=1.25&r2=1.26

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	17 Apr 2013 16:57:53 -0000	1.25
+++ ChangeLog	4 Oct 2013 01:03:00 -0000	1.26
@@ -1,6 +1,14 @@
 # ChangeLog for app-accessibility/at-spi2-atk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.25 2013/04/17 16:57:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.26 2013/10/04 01:03:00 tetromino Exp $
+
+*at-spi2-atk-2.6.2-r1 (04 Oct 2013)
+
+  04 Oct 2013; Alexandre Rostovtsev <tetromino@g.o>
+  at-spi2-atk-2.6.2.ebuild, +at-spi2-atk-2.6.2-r1.ebuild,
+  -at-spi2-atk-2.8.0.ebuild, at-spi2-atk-2.8.1.ebuild, metadata.xml:
+  Make gtk2 module optional to provide a way for gnome2 accessibility users to
+  install >=gtk+-3.6
 
 *at-spi2-atk-2.8.1 (17 Apr 2013)
 



1.2                  app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild?r1=1.1&r2=1.2

Index: at-spi2-atk-2.8.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- at-spi2-atk-2.8.1.ebuild	17 Apr 2013 16:57:53 -0000	1.1
+++ at-spi2-atk-2.8.1.ebuild	4 Oct 2013 01:03:00 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild,v 1.1 2013/04/17 16:57:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild,v 1.2 2013/10/04 01:03:00 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@
 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"
-IUSE=""
+IUSE="+gtk2"
 
 COMMON_DEPEND="
 	>=app-accessibility/at-spi2-core-2.7.5
@@ -23,13 +23,22 @@
 	>=sys-apps/dbus-1
 "
 RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/at-spi-1.32.0-r1
+	gtk2? ( !<gnome-extra/at-spi-1.32.0-r1 )
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
-src_configure(){
+src_prepare() {
+	if ! use gtk2; then
+		sed -e '/SUBDIRS/ s/gtk-2.0//' \
+			-i atk-adaptor/Makefile.{am,in} || die "sed failed"
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
 	gnome2_src_configure --enable-p2p
 }
 



1.10                 app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2.ebuild?r1=1.9&r2=1.10

Index: at-spi2-atk-2.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- at-spi2-atk-2.6.2.ebuild	25 Feb 2013 08:47:28 -0000	1.9
+++ at-spi2-atk-2.6.2.ebuild	4 Oct 2013 01:03:00 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2.ebuild,v 1.9 2013/02/25 08:47:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2.ebuild,v 1.10 2013/10/04 01:03:00 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -22,9 +22,9 @@
 	dev-libs/glib:2
 	>=sys-apps/dbus-1
 "
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/at-spi-1.32.0-r1
-"
+RDEPEND="${COMMON_DEPEND}"
+#	!<gnome-extra/at-spi-1.32.0-r1
+#"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "



1.2                  app-accessibility/at-spi2-atk/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	14 Aug 2011 14:15:31 -0000	1.1
+++ metadata.xml	4 Oct 2013 01:03:00 -0000	1.2
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>gnome-accessibility</herd>
+  <use>
+    <flag name="gtk2">Install bridge module for <pkg>x11-libs/gtk+:2</pkg>. Disable
+        this flag if you want to use <pkg>gnome-extra/at-spi</pkg> instead.</flag>
+  </use>
 </pkgmetadata>



1.1                  app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: at-spi2-atk-2.6.2-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild,v 1.1 2013/10/04 01:03:00 tetromino Exp $

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"
IUSE="+gtk2"

COMMON_DEPEND="
	>=app-accessibility/at-spi2-core-2.6
	>=dev-libs/atk-2.1.0
	dev-libs/glib:2
	>=sys-apps/dbus-1
"
RDEPEND="${COMMON_DEPEND}
	gtk2? ( !<gnome-extra/at-spi-1.32.0-r1 )
"
DEPEND="${COMMON_DEPEND}
	virtual/pkgconfig
"

src_prepare() {
	if ! use gtk2; then
		sed -e '/SUBDIRS/ s/gtk-2.0//' \
			-i atk-adaptor/Makefile.{am,in} || die "sed failed"
	fi

	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"

	gnome2_src_prepare
}

src_configure() {
	gnome2_src_configure --enable-p2p
}

src_test() {
	Xemake check
}