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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64

6 files changed, 75 insertions, 20 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/Manifest b/app-accessibility/at-spi2-core/Manifest
index 305ec1d0662b..1dcfcd15bb74 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -5,9 +5,10 @@ AUX at-spi2-core-2.6.2-hung-crash-2.patch 876 SHA256 8ca2b4db84ad09221d7f3553f10
 DIST at-spi2-core-2.2.3.tar.xz 429444 SHA256 fb97f0a02fa378795e50857e22e640e099be1768081e28ca2dbdb3835f5b6af1 SHA512 4ff634339c7aecd90d1ec8b16478aae4da0db319ae1ee1ac5bcecc93098f797dc58359b718b9800bffa6da81afc41fed21eff71456a165aa6428f7a64179d631 WHIRLPOOL a698a217f99af089a9041b7162ebcff66d5d8a38050dd74750c77792380e368f57d91d2b1494a080674fb57560e566cd924cf930a5e7785f9ccdeb12a34504ab
 DIST at-spi2-core-2.4.2.tar.xz 441204 SHA256 61d926ffc49c7f9236580468c5c9dabda16cec37ef3aee78ca6f2751595518fd SHA512 38968eb9a135b3f7badae2a87e7ba6b3323bfd43f8494ac81fb6696f7056d0e0ab04679173f9f8f595284611327da83fcf5ada3a406080c3faf5ada98a5d6599 WHIRLPOOL aa0902f6992dc38610599d2ccabb7796699ee4ebe0ded3b5123a4c85e290565d0a8812dec82851be69bad4afcf29f2eda120265f1707792c06f36f96cba95e95
 DIST at-spi2-core-2.6.2.tar.xz 443900 SHA256 0d5321ce9fdd7d036b072ef28cba14088394606e1687183ec5d0ae6adea8c87e SHA512 946e46bcba025d298051d99e229dfc5a3ff0b477b9c4e1a97c1ea3cee8a86832e2ee7fe34a986a9fb8e1138389e8f9ad3e27c2638769f1251e12ce4df6ccda9d WHIRLPOOL b01abdaa0f749f113e10a19ce1eab9d7bd120975a738acdf96fa25776258c51749af77f44375800724067b5b9ced253e49cd0c87225e7baee4e522b628657a1c
-EBUILD at-spi2-core-2.2.3.ebuild 1098 SHA256 4ee9f4cdba1db277001901bb8c57bb542f31a2b890f3fdc820a133e18a9ee1be SHA512 9df86ab555093e6602d58aff2561c5a357783487cb834849743de662a51286fb7f24ce0ab050b5e35278ae7de448bdef6cfd86fb5a3234d6f9197b5a8dbb05ef WHIRLPOOL fb79ca902bdb5223c0fef446b0722d1bca7e819cae0cc722aa5094a5323a10021f5da38659e7761d1e80fae73846a6bbcc350fe7013bd68fc67c57700ced9408
-EBUILD at-spi2-core-2.4.2.ebuild 1129 SHA256 4921db482dd9a8a56d33c35fa666b0e59003d59e9a70e2651c4b5c72d1af883e SHA512 442351756b874c892724677df97f09f348d1db349e792649faeabe908f57cdecf433c12a7ee98a5f71848a7081b37974c60c8dd75186be84baaf2ac50b56bc5e WHIRLPOOL 9c861bff042ce110057eed1b289b635116486a46976ba40909ec1aa8ebce62275c36650c538f93ad1cb78ac36bf401e39f3fe65480b73f300e5ffbe12fc68919
+EBUILD at-spi2-core-2.2.3.ebuild 1091 SHA256 e0c459bc9c5949a073866e145137bdd5af03ac3aa5bde2859d63fb567f8c7c1e SHA512 0b141c5df5313e31605654b4e5f6c3d72e166311bccd5e15ba8c74c4251b26a9894f1e5c83f331f786a8d15b67f8a697c1c02c562f1c950e5c8e62f7308d8cfd WHIRLPOOL 0cc3ab65153dbd2781fa3792ace57f0bc02f9b3ab0b8bbaa0b63cbc6c14c742f3b68365ddd375e4033d5d90edd7cfa40cfdd151b4237f548633496ed732570ad
+EBUILD at-spi2-core-2.4.2-r1.ebuild 1140 SHA256 03a80da4563314773a7cfa7aae15a73c323a845c4169d94d96ced09b0f7c1a68 SHA512 310f52c0ba9b0c9608a4b4a8bb44226ef7b5448de59bce35825f67561deda434523ba785f17023acb44c30fa8a289fc11157b7d345ca35ed6fb3144e2812ff6f WHIRLPOOL 67df0fcced71664a4a3a4c2a76cd8573ade7f6644ce68907e6475031f5ca0ac62c9cb924e5b448ffbedc4a2249e5897381049b9c78f36d7add788adfec019db2
+EBUILD at-spi2-core-2.4.2.ebuild 1104 SHA256 8206203b418541d8ee2750c38e0edf22d3f69862688e44c6d48ccfc1ba95a412 SHA512 fac26d5387ce9db4898ce63843972eddac3cf8d425a3ede095c252982db861820923c81a5c6bdaf0cb1e99426c6ccf6750689fa0f142f5a1da8cebae118dfdd8 WHIRLPOOL cc749a2cbab7478ad4375a9f020acefffd833c4ef62997ce92068a29c81ba21df7a95a7dae939445949ecfe2460066c01daa11a52a317793146d57474e383e27
 EBUILD at-spi2-core-2.6.2-r1.ebuild 1235 SHA256 27b8b9b31d257226b1b8b67309dd5daf26ae82a3e0612ca4f02ea79ee6306125 SHA512 718e44e83950eca1f23d6943bf9234d37945ed38471a0d5bec5954f244858650bcf67bb4f711e9da50e0879bf23b047092cf31efb9f1988da9208cc40668bbe4 WHIRLPOOL 73515512462ec7f785ce5a3ce7c7d7c1f7a2b1fcaf652139682214016deaac1108a95e352eaaaa901437e9b50d84b4d709ba3d71f63c55d1e12f4e398ae09e4b
-EBUILD at-spi2-core-2.6.2.ebuild 1105 SHA256 048a95e0671dbdf99db7ac4e2db1cbae2ee44ded8e373d06f04907af38c3a5da SHA512 c568314f718c813af4bf98ba2590247936ea1bbe174eafb83f95d945d407d6c2d9d00ab408ac28e540c804a8c84b7aa4d6be020fa4ef200f9ff723add6cad63d WHIRLPOOL 8f8f6355419f5f9a3a7fbbade70f61fc8306b6cb84d58aa78735eac89a66be932a7c47d812e3afc524a9134d6063e20765d5ad871498883a0d9a65efe5e5f084
-MISC ChangeLog 4563 SHA256 06c3891638bf3788a14542e6e1d0410c01117106f2135c0a9b1f9db228823377 SHA512 6526f392531261f39f8887412f00c398d6f0fed5229c2a2c791b52a0f0481e6a6485ef8964257a9105ad0480406f32ac3ebd111bed7fa97f396f67381a0951d8 WHIRLPOOL f582830f616244c450eb5d863bafa5b5d42f180eb43851db56a611422d85963f374405e2ae3f16b02402def1ac92d6fb8c84c450be580389046d102b9a48008a
+EBUILD at-spi2-core-2.6.2-r2.ebuild 1235 SHA256 9438486d17c0a0131200ccc5d638cc68041a42e07d3253e4422c2a6a62f7fae8 SHA512 bc6b3df1e6d3ef71c70e8b4381c11551f95b8af37af8b6c2b87cc664258ac61c75e31bd6c1bbb160b24e085a4313cd6fbb2b8da83e56bcfd2a7be295748e6e02 WHIRLPOOL 667df5865b3fee357b60aebd7cbd9ace220527d771d775e6ffb0b6d20079d861679b4dcf8d7a85e1218871ad340071a867003beee70f0283736b8ce5ebb04eca
+MISC ChangeLog 4925 SHA256 472f43974720230766bde51372fb5f815385e4ab1cd6b9e401f5fffd424b0c15 SHA512 61477bf9e30f6d195a0d2611066a486fa4d453706a10017436f1766e1d97ae439bd133ea9ac2be42c1f58e0263acd9a280eaf2be5d48a31cdb05d74a4ab36eef WHIRLPOOL 24cf6618c9a4a3db0aec1d9fdf48e5e9ab891e32ac9c13239660e967b0e39a9d74df68b93604a7ecb931d790ee3b14c50b0de022dd31178f78a0bc692cb96c72
 MISC metadata.xml 174 SHA256 c0255e6a66375ac0e7f11c3712c6b47b7746432df4cf518e10c230674a6bc4f0 SHA512 b704bc8a6cbe98854b84a2ddedb7a2bc00309e3290e568dffed0bafc0acfcc81d6edb73dfacb95c56eef85982c2131f108e96abf55018ce45eda886f47bba1fb WHIRLPOOL 0e5a13b34c4e1ecf2888082f0c45255a63411981fbecbf4b8766de0f77993c2e6293f2ecb441adf901b20a48a56195a434cbb56c585d7e33693da12733ccb693
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
+}