Drop useless doc USE flag (bug #447670). Respect USE=-introspection.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 70 insertions, 16 deletions

diff --git a/app-accessibility/at-spi2-core/ChangeLog b/app-accessibility/at-spi2-core/ChangeLog
index 720f4519ec4a..b795b8056e6f 100644
--- a/app-accessibility/at-spi2-core/ChangeLog
+++ b/app-accessibility/at-spi2-core/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-accessibility/at-spi2-core
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog,v 1.26 2012/12/18 17:56:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog,v 1.27 2012/12/23 02:49:08 tetromino Exp $
+
+*at-spi2-core-2.6.2-r2 (23 Dec 2012)
+*at-spi2-core-2.4.2-r1 (23 Dec 2012)
+
+  23 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  at-spi2-core-2.2.3.ebuild, at-spi2-core-2.4.2.ebuild,
+  +at-spi2-core-2.4.2-r1.ebuild, -at-spi2-core-2.6.2.ebuild,
+  +at-spi2-core-2.6.2-r2.ebuild:
+  Drop useless doc USE flag (bug #447670). Respect USE=-introspection.
 
   18 Dec 2012; Agostino Sarubbo <ago@gentoo.org> at-spi2-core-2.2.3.ebuild,
   at-spi2-core-2.4.2.ebuild, at-spi2-core-2.6.2-r1.ebuild,
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.2.3.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.2.3.ebuild
index d2182c07f8aa..15b6ca6dd3f9 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.2.3.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.2.3.ebuild,v 1.10 2012/12/18 17:56:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.2.3.ebuild,v 1.11 2012/12/23 02:49:08 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://live.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc64 x86 ~amd64-fbsd"
-IUSE="doc +introspection"
+IUSE="+introspection"
 
 RDEPEND=">=dev-libs/glib-2.28:2
 	>=sys-apps/dbus-1
@@ -24,17 +24,16 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 "
 DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
-	doc? ( >=dev-util/gtk-doc-1.9 )
+	virtual/pkgconfig
 "
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	# xevie is deprecated/broken since xorg-1.6/1.7
 	G2CONF="${G2CONF} --disable-xevie"
-}
 
-src_prepare() {
 	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
 	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
 
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.6.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.4.2-r1.ebuild
index ba794283ec77..2a6a7656929c 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.6.2.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.6.2.ebuild,v 1.2 2012/12/18 17:56:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.4.2-r1.ebuild,v 1.1 2012/12/23 02:49:08 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -24,7 +24,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.9
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
 "
@@ -32,7 +32,9 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	# xevie is deprecated/broken since xorg-1.6/1.7
-	G2CONF="${G2CONF} --disable-xevie"
+	G2CONF="${G2CONF}
+		--disable-xevie
+		$(use_enable introspection)"
 
 	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
 	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.4.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.4.2.ebuild
index cbf924b1ce7a..e9c173b79728 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.4.2.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.4.2.ebuild,v 1.9 2012/12/18 17:56:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.4.2.ebuild,v 1.10 2012/12/23 02:49:08 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://live.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~x86 ~amd64-fbsd"
-IUSE="doc +introspection"
+IUSE="+introspection"
 
 RDEPEND=">=dev-libs/glib-2.28:2
 	>=sys-apps/dbus-1
@@ -24,18 +24,16 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 "
 DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )
 "
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	# xevie is deprecated/broken since xorg-1.6/1.7
 	G2CONF="${G2CONF} --disable-xevie"
-}
 
-src_prepare() {
 	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
 	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
 
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.6.2-r2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.6.2-r2.ebuild
new file mode 100644
index 000000000000..708e9ef330d9
--- /dev/null
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.6.2-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.6.2-r2.ebuild,v 1.1 2012/12/23 02:49:08 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="http://live.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="+introspection"
+
+RDEPEND=">=dev-libs/glib-2.28:2
+	>=sys-apps/dbus-1
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXtst
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# xevie is deprecated/broken since xorg-1.6/1.7
+	G2CONF="${G2CONF}
+		--disable-xevie
+		$(use_enable introspection)"
+
+	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
+	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
+
+	# important patches from 2.6.3
+	epatch "${FILESDIR}/${P}-hung-crash-"{1,2}.patch
+	epatch "${FILESDIR}/${P}-deregister.patch"
+
+	gnome2_src_prepare
+}