Modernize the ebuilds. Drop old. Switch to global introspection USE flag.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

7 files changed, 30 insertions, 89 deletions

diff --git a/dev-libs/atk/ChangeLog b/dev-libs/atk/ChangeLog
index 15ccb8e67fc5..4bbf2bfa18cb 100644
--- a/dev-libs/atk/ChangeLog
+++ b/dev-libs/atk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/atk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/ChangeLog,v 1.251 2012/10/28 15:39:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/ChangeLog,v 1.252 2012/12/16 06:01:24 tetromino Exp $
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  atk-1.32.0-r1.ebuild, -atk-2.2.0.ebuild, atk-2.4.0.ebuild, atk-2.6.0.ebuild,
+  metadata.xml:
+  Modernize the ebuilds. Drop old. Switch to global introspection USE flag.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> atk-2.4.0.ebuild:
   ia64/s390/sh/sparc stable wrt #427544
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 83e6484a6c94..9f3013072773 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -2,19 +2,21 @@
 Hash: SHA256
 
 DIST atk-1.32.0.tar.bz2 688186 SHA256 e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e SHA512 f10a752e2c57ffdaeaa2e41c5fb31acf6cd04ec850e002b6f5bfad2680a2a931db6ac395ebfcf7fca6356894dda14f4f87b02df1aff8d0096e265cf841e90d21 WHIRLPOOL 0ae816ec6e1999e5376f560ed0dfe84fd27ce899a953b9513eabec6a24d227e087f148ba42d256b738931f4353ff326754acad7cc826dab8ca773dc9df9bab30
-DIST atk-2.2.0.tar.xz 600140 SHA256 8b22f0e7803dd3734c676ccd68ea999ff1156ca49d99c3de5c1d269ad0c3739d SHA512 efdf135f7869dcb96b548e6278fb34ab2abd8b2f0e45c23794231a031af2f16690b8e5875e728ae5db8d325a578c7abae06989802896013623af83de765064e8 WHIRLPOOL c089c93646997860ea45ff8bd7d5c4232d83934e64f508ac38878ce13499cc2db344c19d04ac0e2880e155354acd39be41521138064a640f93cd277a6de74d28
 DIST atk-2.4.0.tar.xz 607156 SHA256 091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d SHA512 20316b4de66a1871bb9f802831b2262c54eaecf8d7c3696d3949f8464834c6aeca32d57382f0c9a9c093d2099e7d4c71c83b917474d528758339dcd1397e1571 WHIRLPOOL 77d882ae7d10fbbf6f81c7be149dbd85458b57b258da7a677b521e01ea19a727589d2aabd364fc23cf5569c8c6a1e398e09247aea291735fd506509041e29e0b
 DIST atk-2.6.0.tar.xz 609136 SHA256 eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f SHA512 2dbc6807987ac2e434d6c2f3df49d618ee0e3c80c4bec023bec71eb04c78691881bf6df54b6ffe5311bd580239220fc915c0a66b2e22c639ec191eed0af27bc4 WHIRLPOOL 2c38b5e3cabd1c256b708e83e5cb31a5f9be8512f57fb1bf3262564f82b93c18fa72f5096f8f74d436b22001db17f1d825ed1c4cd6c2899f78121851cd255e52
-EBUILD atk-1.32.0-r1.ebuild 1339 SHA256 2cf239c316d9db03df1efbcc4eaaf8d820f7c23b47d4db7713010ed48bd1e877 SHA512 b8372117e7e477bf35d0a790b5a22748b2c3e80e816afe2c42a5b7773392edb35a6a9e066a3ce51c4945919a97b70c86b8e936f2901525c6cfd2e3bc40d214ff WHIRLPOOL 828a0eb3848a8b66143010e0b3a27ca19aeb8f398a52439e021440b5485333c8662c8d67c24277160fd0cde48032e0d1dbe2103cbb906e59e0ce2897b58f4ab1
-EBUILD atk-2.2.0.ebuild 1359 SHA256 0a5b3534634a5665b0b8a912814a746d4b0d1f25ab0fcf7de8043796801eaa12 SHA512 02353ccf42fa92e463510218bce05970fabc6d84ec2c9d2185b9519483b586b6d49d2a7067693915aaa7627b20cd333cdd645d47028caabf4a68e1663eae8135 WHIRLPOOL 87b11bf0d998815d3e67713619e0de122a1b8d7e6cd746176b2de27f4f3086a1f059a10632b16d6ebdb607a900fe8f2a0cb58e7faddb67efbc818e5b3610956e
-EBUILD atk-2.4.0.ebuild 1378 SHA256 be6d50766ef27155b50f63a24ffa833dc9a754ce14c04d93b1c1029fee942e5f SHA512 0d4145fc2ce669d3685e12e50be40f193ec0d192baa58d586c4974c2b2ea6af6314106b4ff2e18185e672878440bb97a237a8911cd6c7631dade2d0a48f098b4 WHIRLPOOL 15e7ab94c75def2dcf990b87d949be3441edf92d4f29e7cf59e7e74e39806d5c82356c4e75549403d74fc85bee0cf06207658f1f844657bbf50202ea7deb876f
-EBUILD atk-2.6.0.ebuild 1390 SHA256 ecda2b98915f1350f68e5ad2b534828f94dc001b0cf2363621ffe6b0d9e7b9f0 SHA512 fdbe1278df0e97c0c69cab1f48e9d17526ec64454952d2645dcc62dbc5c9be93b041903aefcf7659d85e3e3016b18920806a1dbf0b88205e50c8bc6802269f48 WHIRLPOOL 36b9b65463c79602c59b349d1e4cc35859d450569e4cfdd5bd24ec0d7df4a7a05da95479c6864826ba4d74e1d71deba734b693ac38b2bbf851ef16e0817393dd
-MISC ChangeLog 27173 SHA256 f8180eaba3b987aa367957db4146215ece59f5167d9a0b08ab654629c9875a2d SHA512 7c3ce358f135aa7bc6c212bd4dea38826ab651fafb2f4123f191a961f8a137328385b13626699831c94e266c870c6d8fab6dd7c878c26524a157c9b1445d7a3f WHIRLPOOL f8d3a5dfdee4497bb79d97e25411d66ad42db7ece5686e2d9d46c3d115981f775552309e92b94c9159c368ad9cd0d712a551fad4177f99dfe72384b53312ea0a
-MISC metadata.xml 296 SHA256 2e63eb63088116c86450ff230207f5f7a5c5536aabe14d6a0d30376655a23c28 SHA512 104401f92cc9425284f1cdc0a0c1e8c292d02f0b7b7ac223006c291928e5e293d386c3ae585c51881617ddaf8a021c542a7df2ec95b2d38a10ea79917868c440 WHIRLPOOL d5277c202d1079a6c76619b24a9ae9324b5e975ebe65bbcb3910ff39a4978d1c06f05690dbaf8e213ccb8838d30dddbfba5a30408608948f1b50a181fef2c2d3
+EBUILD atk-1.32.0-r1.ebuild 1143 SHA256 74ea1be0fc6580e98be673de4a839ea9fd6a664e65049a9afad7734c403cb9c3 SHA512 3f68889f5f2215976f491a952b5ddac0fdf8c4f3347ec9c414931f68890abe16528ad9a0102368f0491610e92105f855f070501c74292dec4848a98bc284056f WHIRLPOOL f3e0133aff887793d5e59dcddb9ba08d0e729aa5a1caf12bfc3b772246749996e0a232de11ee3d7972f23341c50fa2e822e52aa0aeeeac703402bc0a8efe0b59
+EBUILD atk-2.4.0.ebuild 1181 SHA256 809f844ff28a8a02c545af4be7371dbb9e9a379e3fabc6b1492c52bd3baff607 SHA512 bd1619d51b360160568d322cb8fa54fd356833b3a226951c3f4b361b22edff8f5d98d174909fcad524d6f836897d023f49102ec2da2bb168fc54998e2b864fe5 WHIRLPOOL d724a58d6554a4b36ad482adbb6dcf983319ed43e1346a5d0c296cd1341971aba0a5a9f4acda8878105b35072b0b031f1c8792dc02be4a2d84dafc94091b9711
+EBUILD atk-2.6.0.ebuild 1191 SHA256 a96636afe0385aae0374ac1430a3d7237b62f794f388aba874a3007521aabcb2 SHA512 ca556bb771cb313441bf2b954fdfc383f8167af4b7255d19d259d1586870338724b580a064d55932df78ff5a11ddb87c1e8891947a2fc05052f50a32e3b17683 WHIRLPOOL 38397d0282c2ae76115f515fac7704e7b3d3dccde859cdf51452af477c82d4470bc04f8537881f9eb2ec568604dd9dabfd9ae090bbfc4eb8d72f5eeb2fe9a368
+MISC ChangeLog 27406 SHA256 ed871d7cb5c3abc3230c5cd13de6a2baefee92af0f0faae233d2657849707c25 SHA512 10a31675ce27819bad2c15014365b95263959ff5ae1056eec034e544df6ead32c79b558e5e7a273feea522cfa0b5597c581edb44d7f8405792befc031b7d32ab WHIRLPOOL a9a358c77fbd84158d14cb9a40bfe40d42d7316da76af4533de77fbac3a8a2fe2469392d8ca81441e0d034b6c73ccf1e2c6e899fd14306f3b6b08ba53110e60a
+MISC metadata.xml 174 SHA256 c0255e6a66375ac0e7f11c3712c6b47b7746432df4cf518e10c230674a6bc4f0 SHA512 b704bc8a6cbe98854b84a2ddedb7a2bc00309e3290e568dffed0bafc0acfcc81d6edb73dfacb95c56eef85982c2131f108e96abf55018ce45eda886f47bba1fb WHIRLPOOL 0e5a13b34c4e1ecf2888082f0c45255a63411981fbecbf4b8766de0f77993c2e6293f2ecb441adf901b20a48a56195a434cbb56c585d7e33693da12733ccb693
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNUbQACgkQuQc30/atMkCH7gCdGdqvHH/EfRA6eQ6W1qI4dns7
-8cQAn3C8IRImyR1dDxZZrjVwc6LdoA1b
-=W9Ss
+iQEcBAEBCAAGBQJQzWO1AAoJEJ0WA1zPCt1hACoIAJOT7OPuGWha9drkfW+y3LkK
+rw7b6yU5bLssu0KpdKCN6gC1CmEG+ea/s+mhUsvA1entt5rd/mP8hOGt6YH9wZLU
+B3/P0hx7uXL2HRSDTiYjI3CySCHn8Vha5U5LsT2i1sGb5o1BQRX4zpdIMalLXsGR
+5QMLE7RYWznT0lC9Yql4h5Rn4JxoAiHHlcppjrKHRT+zIWZJ8zvNzLBL2+qxB4Fg
+OHYUwWN3fAbR8bUfiuJYGFMb+Ci+EQu8MIsu+2fsjQmdJwV2wnfFvBqFSBqWVONk
+jxDA7TS7xozIjiuV87T+LoaqRoFfWJ/4hnPw5D+aZBY1wrNOFT0RDe/qjFr0wKQ=
+=KqCG
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/atk/atk-1.32.0-r1.ebuild b/dev-libs/atk/atk-1.32.0-r1.ebuild
index 172d7ee3ba98..693501c898f6 100644
--- a/dev-libs/atk/atk-1.32.0-r1.ebuild
+++ b/dev-libs/atk/atk-1.32.0-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/dev-libs/atk/atk-1.32.0-r1.ebuild,v 1.12 2012/09/25 11:52:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-1.32.0-r1.ebuild,v 1.13 2012/12/16 06:01:24 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -13,22 +13,20 @@ HOMEPAGE="http://projects.gnome.org/accessibility/"
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc +introspection nls"
+IUSE="+introspection nls"
 
 RDEPEND="dev-libs/glib:2
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
+	dev-util/gtk-doc-am
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )
 	nls? ( sys-devel/gettext )"
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF} $(use_enable introspection)"
 	DOCS="AUTHORS ChangeLog NEWS README"
-}
 
-src_prepare() {
 	gnome2_src_prepare
 
 	if ! use test; then
@@ -36,8 +34,4 @@ src_prepare() {
 		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
 			|| die "sed failed"
 	fi
-
-	# Remove DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i atk/Makefile.am atk/Makefile.in \
-		tests/Makefile.am tests/Makefile.in || die "sed 2 failed"
 }
diff --git a/dev-libs/atk/atk-2.2.0.ebuild b/dev-libs/atk/atk-2.2.0.ebuild
deleted file mode 100644
index f26b70b72101..000000000000
--- a/dev-libs/atk/atk-2.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-2.2.0.ebuild,v 1.11 2012/09/25 11:52:11 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
-HOMEPAGE="http://projects.gnome.org/accessibility/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc +introspection nls"
-
-RDEPEND="dev-libs/glib:2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable introspection)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test; then
-		# don't waste time building tests (bug #226353)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# Remove DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i atk/Makefile.am atk/Makefile.in \
-		tests/Makefile.am tests/Makefile.in || die "sed 2 failed"
-}
diff --git a/dev-libs/atk/atk-2.4.0.ebuild b/dev-libs/atk/atk-2.4.0.ebuild
index e2c0bdbce17a..1e670f081363 100644
--- a/dev-libs/atk/atk-2.4.0.ebuild
+++ b/dev-libs/atk/atk-2.4.0.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/dev-libs/atk/atk-2.4.0.ebuild,v 1.13 2012/10/28 15:39:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-2.4.0.ebuild,v 1.14 2012/12/16 06:01:24 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,22 +14,20 @@ HOMEPAGE="http://projects.gnome.org/accessibility/"
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc +introspection nls"
+IUSE="+introspection nls"
 
 RDEPEND=">=dev-libs/glib-2.31.2:2
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
+	dev-util/gtk-doc-am
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )
 	nls? ( sys-devel/gettext )"
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF} $(use_enable introspection)"
 	DOCS="AUTHORS ChangeLog NEWS README"
-}
 
-src_prepare() {
 	gnome2_src_prepare
 
 	if ! use test; then
@@ -37,8 +35,4 @@ src_prepare() {
 		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
 			|| die "sed failed"
 	fi
-
-	# Remove DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i atk/Makefile.am atk/Makefile.in \
-		tests/Makefile.am tests/Makefile.in || die "sed 2 failed"
 }
diff --git a/dev-libs/atk/atk-2.6.0.ebuild b/dev-libs/atk/atk-2.6.0.ebuild
index d12d0bcd8aad..c037224e46a1 100644
--- a/dev-libs/atk/atk-2.6.0.ebuild
+++ b/dev-libs/atk/atk-2.6.0.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/dev-libs/atk/atk-2.6.0.ebuild,v 1.1 2012/09/25 11:52:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-2.6.0.ebuild,v 1.2 2012/12/16 06:01:24 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,22 +14,20 @@ HOMEPAGE="http://projects.gnome.org/accessibility/"
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc +introspection nls"
+IUSE="+introspection nls"
 
 RDEPEND=">=dev-libs/glib-2.31.2:2
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
+	dev-util/gtk-doc-am
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )
 	nls? ( sys-devel/gettext )"
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF} $(use_enable introspection)"
 	DOCS="AUTHORS ChangeLog NEWS README"
-}
 
-src_prepare() {
 	gnome2_src_prepare
 
 	if ! use test; then
@@ -37,8 +35,4 @@ src_prepare() {
 		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
 			|| die "sed failed"
 	fi
-
-	# Remove DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i atk/Makefile.am atk/Makefile.in \
-		tests/Makefile.am tests/Makefile.in || die "sed 2 failed"
 }
diff --git a/dev-libs/atk/metadata.xml b/dev-libs/atk/metadata.xml
index d984e97ecd63..d9f21e6a89de 100644
--- a/dev-libs/atk/metadata.xml
+++ b/dev-libs/atk/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>gnome-accessibility</herd>
-  <use>
-	  <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-		  for introspection</flag>
-  </use>
 </pkgmetadata>