Clean up old revisions.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

12 files changed, 36 insertions, 287 deletions

diff --git a/app-accessibility/at-spi2-core/ChangeLog b/app-accessibility/at-spi2-core/ChangeLog
index 2831a7f9030c..9c40ae3de304 100644
--- a/app-accessibility/at-spi2-core/ChangeLog
+++ b/app-accessibility/at-spi2-core/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-accessibility/at-spi2-core
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog,v 1.33 2013/02/25 08:44:05 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog,v 1.34 2013/03/05 22:28:08 eva Exp $
+
+  05 Mar 2013; Gilles Dartiguelongue <eva@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-r2.ebuild,
+  -files/at-spi2-core-2.6.2-deregister.patch,
+  -files/at-spi2-core-2.6.2-hung-crash-1.patch,
+  -files/at-spi2-core-2.6.2-hung-crash-2.patch:
+  Clean up old revisions.
 
   25 Feb 2013; Zac Medico <zmedico@gentoo.org> at-spi2-core-2.6.3.ebuild:
   Add ~arm-linux keyword.
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 2dc68c1d439b..a0814fd14cf7 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -2,24 +2,18 @@
 Hash: SHA256
 
 AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 SHA256 5834cf41154379002d3050810fce1da8a41c9bd1cce06593c1e7d5bdee083aef SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753 WHIRLPOOL 912c7cafdaecd93fb6fffec89a581346bf4c199c1e8a122483df4f3d36aca87ab11384380b49353910b70f70b96718133977e9ce7b4e9b02f54136da783cc309
-AUX at-spi2-core-2.6.2-deregister.patch 901 SHA256 43aa423288063f8b6904bf0e0faf4c7ef976d111b14344135867703836eff7a7 SHA512 8f049a91bf59d64cd5bed49cec887d763d7e9a838cb5140391e7dad9ec70505d05543d1861b8c5f860a9454afa0efbc41c3f3c9f6d137288b1186d5f3e370e64 WHIRLPOOL 98db333953c875fe9d23fc7da826df8ed7c2f55db2e82139e29e4047f07ee8bc4f616d880ecec735203e35d31e6352836bc8b73f5a890f46b8d30c6ff2b2f491
-AUX at-spi2-core-2.6.2-hung-crash-1.patch 1025 SHA256 265191650ce2ec43d538171f2ead8490d200446d4953fa536498797dc5f444e3 SHA512 a9a3cc62ae77283972f6b78cd1711fc7dc2fe2f68ccfb7465e325d80550c06bf1bf63658098d37417599087f815794e41258b02cd218a607be84346b722ebf1c WHIRLPOOL dce250d3a4f888fcf4babb51ffdb3ca8588c4b70d777f636e21949a355a4e34616577a112b2adc6fb27dbbec8241992fafadd049c4394c69ffb9eb7c58b5c2d7
-AUX at-spi2-core-2.6.2-hung-crash-2.patch 876 SHA256 8ca2b4db84ad09221d7f3553f1076dae90c467785515c002779588fb4b97cb76 SHA512 c3ad8493b1eb8214ddf8aa81f45f7020db53e8c716f7e6921fe1b3d68f1c86f37cb8c4a69c8fd3b857144fe30fba852198c663b5ce7aef4b463e03a72cde7efd WHIRLPOOL 5d0bc5c42cb4ae980319a96e735748cd32fb4fbe51079d6a07dae2543d1435c8fefc3d33f7f880f7ef645723e4d52944e8d26f60f7420855e9bb97b3989d07b8
 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
 DIST at-spi2-core-2.6.3.tar.xz 445084 SHA256 fc4487ae46e847cfd057b329b852cf99923772ecd2ddc29f29670c9f2b15d0ea SHA512 8b72a7587506ab2f9891518c99c7393ae427bf0da74ea3c0c3fd83ec64217dd171e739fd00bc946a600fd50de2f234c7ee51642d9a6e51ca7825d3a4fcb0beed WHIRLPOOL c1d9eafe5c4a1b1f133ba7ee0db71c7d2e22efd7f0537e055c6d7ba479fddc807ff6446c46c9b7c50963bf232da2b746c4b69903117610072c31a1e847c069b5
-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-r2.ebuild 1242 SHA256 ba4b2ee16f298d6e4d89ce627e4cc11ebf8535a8c8bc11ff0426ca725fe420b5 SHA512 e997d7b80a003a7da2ede1e279cfbfb7dde481929e78c47840696e781cc0794946bf7110b70edac0b545c7345b701d77a88cf91aa1c35dee05a3c7fa5a60eb99 WHIRLPOOL 126d41a12560f5baa96f153dd4851a15f3aa324c6da0989ff7756e577677fe5dee774d73cf2c092d0bff38d8fa09cb90874d23a55050eebfa7687c499f1a4d87
+EBUILD at-spi2-core-2.2.3.ebuild 1054 SHA256 b31adfa25f7b8ac76648aeea8a7e0813327eb55e9d5ba1bbc709ee3c18c9f2da SHA512 e35089009c61cc6607e33daff561e27fceaa42ef9ff56d66ced31f5ff316908745b81b070fd855a750476635cb1d3b8ec4a5a8e59366a1792aeb9cb4cc3fc4c4 WHIRLPOOL d253fd9d02e51fd9b008aa3f6776a07437aa63d622bffdaaae1df1db3de6703ca5d05a236652eb865144b7d86f118938ea228b97a19980ed17fe32c6ab9eb447
+EBUILD at-spi2-core-2.4.2.ebuild 1050 SHA256 74c37909da5e89bce7209463fdf3cc31ec9ac215192bde187a2b1f9e75fb1b90 SHA512 f25a6d8ad741d96e5e03931e335711a37964f7ff83c7b879b64e3a791988de14552b8fb44e08d075c985ac473f8576cd1d739378c527f9837eb9e085ec92817a WHIRLPOOL 8fb850fed70bba900eab4c9b3ca9329eaa33234662268639105070ac4cd60516dc7edd5cd4fce640309437f537840575c637c0ed071b457aa63d80fd968801f6
 EBUILD at-spi2-core-2.6.3.ebuild 1161 SHA256 6d397cc01e6996559fd26c78bce3bd86621f337ac6de4db833da93b6fd768fab SHA512 ebf7015b9ef58c4d64f936de2e1dbc81870ffac6a2afefa6300122779984fc3b6c2770d8dac0775d29680fe3322652382ed3d61aaef80ce3e061431b01c89b87 WHIRLPOOL 42918e676de2997dde78d4744a4c9729899539e76b860746f665cbf627421a85afe212c6ccfad7fcfacd54254762bbc6ecc057333b1e597ebb8fbde61ab80607
-MISC ChangeLog 5640 SHA256 141d6e66ef7a7023fb9b3a8f93340043b2896f562b3e13107e390b6c78297c40 SHA512 71965a6e96a8c05f9c9c1073fa6793684cff939a6231395554e5c9230da926025e7d56e2cf2b0f9da4ecc62d1b6662ff7d871e1f5c457d0a1de17bdb0b5cc2e0 WHIRLPOOL 0ffb54e7a5231348a225f998691a50c738dc17011ef179b7f300afda02838be3415a49bf8b1cb2585aa0fe5811584b3c8ce311d540d333dfccef038f413d5f41
+MISC ChangeLog 5979 SHA256 b5fc692abc208b329f008f6f68c1c30535c6a43cdd239ae043b0cbcfc65c364d SHA512 2ed0bf0ccb722bae4353eef89d314341686425fa94e74e6d78fb3288c066761d0479c169ab2dd26c0161ed4e9f4c474a7298e5ef3e34a27828a6c7666cdd5d08 WHIRLPOOL ac938472de404a0a9e690e42c3cdc29a358612289bd3d3c3033190d72ad28e05877236a7f0612a4e365c78ccaa26ef94d70163dd9cd3cebd1341569db36ebbf4
 MISC metadata.xml 174 SHA256 c0255e6a66375ac0e7f11c3712c6b47b7746432df4cf518e10c230674a6bc4f0 SHA512 b704bc8a6cbe98854b84a2ddedb7a2bc00309e3290e568dffed0bafc0acfcc81d6edb73dfacb95c56eef85982c2131f108e96abf55018ce45eda886f47bba1fb WHIRLPOOL 0e5a13b34c4e1ecf2888082f0c45255a63411981fbecbf4b8766de0f77993c2e6293f2ecb441adf901b20a48a56195a434cbb56c585d7e33693da12733ccb693
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlErJFcACgkQ/ejvha5XGaNQ0ACfXScRxHF8WRc+GVTllYSMqn9y
-P3YAoJ4FQDS+MT6UjIC8t7j9WXf0kH7j
-=JeWY
+iEYEAREIAAYFAlE2cXkACgkQ1fmVwcYIWAalFwCg7Nfn752e5ja3g9DxcqGX1WMf
+4sUAoMPMAM5e/KSkJBd8ePMYqjDzBboj
+=3i62
 -----END PGP SIGNATURE-----
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 15b6ca6dd3f9..db0e538e6f9d 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
+# 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-core/at-spi2-core-2.2.3.ebuild,v 1.11 2012/12/23 02:49:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.2.3.ebuild,v 1.12 2013/03/05 22:28:08 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm x86"
 IUSE="+introspection"
 
 RDEPEND=">=dev-libs/glib-2.28:2
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.4.2-r1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.4.2-r1.ebuild
deleted file mode 100644
index 2a6a7656929c..000000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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-r1.ebuild,v 1.1 2012/12/23 02:49:08 tetromino Exp $
-
-EAPI="4"
-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
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	# 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"
-
-	gnome2_src_prepare
-}
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 e9c173b79728..6496cc312b13 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
+# 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-core/at-spi2-core-2.4.2.ebuild,v 1.10 2012/12/23 02:49:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.4.2.ebuild,v 1.11 2013/03/05 22:28:08 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="ppc ppc64"
 IUSE="+introspection"
 
 RDEPEND=">=dev-libs/glib-2.28:2
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
deleted file mode 100644
index 50adc0e2b11b..000000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.6.2-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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-core/at-spi2-core-2.6.2-r2.ebuild,v 1.3 2013/01/06 09:10:21 ago 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 ~mips ~ppc ~ppc64 ~sparc ~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
-}
diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-deregister.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-deregister.patch
deleted file mode 100644
index c5618b10895c..000000000000
--- a/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-deregister.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ca6778ba2a6c4fed24d5468213f8ed918f3dcbe4 Mon Sep 17 00:00:00 2001
-From: Mike Gorse <mgorse@suse.com>
-Date: Fri, 7 Dec 2012 11:21:19 -0600
-Subject: [PATCH 3/3] Fix deregistering of applications
-
----
- registryd/registry.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/registryd/registry.c b/registryd/registry.c
-index a64e094..e283a90 100644
---- a/registryd/registry.c
-+++ b/registryd/registry.c
-@@ -290,9 +290,10 @@ handle_disconnection (DBusConnection *bus, DBusMessage *message, void *user_data
-           for (i = 0; i < reg->apps->len; i++)
-             {
-               SpiReference *ref  = g_ptr_array_index (reg->apps, i);
--              while (!g_strcmp0 (old, ref->name))
-+              if (!g_strcmp0 (old, ref->name))
-                 {
-                   remove_application (reg, bus, i);
-+                  i--;
-                 }
-             } 
- 
--- 
-1.8.0
-
diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-hung-crash-1.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-hung-crash-1.patch
deleted file mode 100644
index 46d79ca757ad..000000000000
--- a/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-hung-crash-1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 860ccecf3de3fdca6742060174cab1f90d708fb3 Mon Sep 17 00:00:00 2001
-From: Mike Gorse <mgorse@suse.com>
-Date: Thu, 6 Dec 2012 09:50:18 -0600
-Subject: [PATCH 1/3] Remove the correct datum when clearing a hung process
-
-When clearing hung processes, we were passing the wrong variable to
-g_list_remove, meaning that the datum would never be removed from the
-list, even though it had been freed, resulting in a crash.
----
- registryd/deviceeventcontroller.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
-index b8c1bc7..101dc6f 100644
---- a/registryd/deviceeventcontroller.c
-+++ b/registryd/deviceeventcontroller.c
-@@ -1205,7 +1205,7 @@ reset_hung_process_from_ping (DBusPendingCall *pending, void *data)
-     if (!strcmp (l->data, data))
-     {
-       g_free (l->data);
--      hung_processes = g_slist_remove (hung_processes, data);
-+      hung_processes = g_slist_remove (hung_processes, l->data);
-       break;
-     }
-   }
--- 
-1.8.0
-
diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-hung-crash-2.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-hung-crash-2.patch
deleted file mode 100644
index 09234ac61578..000000000000
--- a/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-hung-crash-2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 00c94530c0d57808ac1f9e9b1525341654278ba3 Mon Sep 17 00:00:00 2001
-From: Mike Gorse <mgorse@suse.com>
-Date: Fri, 7 Dec 2012 10:27:58 -0600
-Subject: [PATCH 2/3] Fix another crash when removing hung processes
-
-There was another instance where we were freeing the wrong data.
----
- registryd/deviceeventcontroller.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
-index 101dc6f..b14cd1e 100644
---- a/registryd/deviceeventcontroller.c
-+++ b/registryd/deviceeventcontroller.c
-@@ -1179,7 +1179,7 @@ reset_hung_process (DBusPendingCall *pending, void *data)
-     if (!strcmp (l->data, dest))
-     {
-       g_free (l->data);
--      hung_processes = g_slist_remove (hung_processes, data);
-+      hung_processes = g_slist_remove (hung_processes, l->data);
-       break;
-     }
-   }
--- 
-1.8.0
-
diff --git a/app-accessibility/caribou/ChangeLog b/app-accessibility/caribou/ChangeLog
index 1d0c4f90d1c0..9a9401b3e01f 100644
--- a/app-accessibility/caribou/ChangeLog
+++ b/app-accessibility/caribou/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-accessibility/caribou
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/ChangeLog,v 1.20 2013/02/02 22:17:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/ChangeLog,v 1.21 2013/03/05 22:29:24 eva Exp $
+
+  05 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -caribou-0.4.6.ebuild:
+  Clean up old revisions.
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> caribou-0.4.7.ebuild:
   Add ~arm, wrt bug #449220
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index a9b29600dfdd..f7a5d05e2560 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -1,6 +1,14 @@
-DIST caribou-0.4.6.tar.xz 380844 SHA256 449890d53401c15ae7118ebc8ca1eebb7f9a60ad717bca35f822d7f895142226 SHA512 43dcb270a6d05cead322a537ec98363199018e7ef8d5169c8f3c7d9ec1ce04737ec1634bf944756a9ed14fa843e0b0ab5fafa3bc93ad1f7501129be21b4dface WHIRLPOOL a43045d1618c82adab912e9eb1ba5f279ae5b2eb1e0964876f74238c60b314f212afaac478f9c5a119bc32ec7983be059df055755760589de46300c24ad790a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST caribou-0.4.7.tar.xz 384856 SHA256 580406d72536ff23ee61cab416113fbc068cdc1fcaaedf1a4621f1d9ef9cf2e9 SHA512 52153e3ba305060823a61b29f13751cbaf6b67225a00f39895cab9054c40fc64f8153f289b5d1b967354ec1f6676b2a989a8a0710f5a95d7a299588e73f25b60 WHIRLPOOL 233f5f630c05b8b2fe68105ddca72a269adb46a87cbdd29344f14c80be4185e8bb99660800815d6834765371d434adb391ddf95907250c59b6499069e98f4499
-EBUILD caribou-0.4.6.ebuild 2503 SHA256 6dabeda40cd1a4a18ef277075c937e9447f17a86b23511e7dec4d9a666c47140 SHA512 1d497735ba0d15e038d0b55e165c76615a86949a96e85e28acb3e2bfaf112b21ea4f065e274983ef7b6c5307b19ba83b1ef39b10490e4de1374364dde8585b2c WHIRLPOOL 45ebad4b0e3bed14b8b2ace29e5a88be44352c95039d4aeb758efe0f932f30bf98a10e9f68f42ab3c2c26b35a652d77ba6fc526f73dd4678ef472b514b1baf5a
 EBUILD caribou-0.4.7.ebuild 2528 SHA256 b243f0ab0373fc94c445bc986b5d4a9de9c4d3cfaecd5cf5cda7716a286aedab SHA512 af678baf1e8b3d2e85fa4ef1912a74dcf898dc7f21fbbebabf4afae850e7b4d397552c91dd5f419fb0c9ffaa053eb8c720bd0e69f82bcc8acf9a06a7ead934e7 WHIRLPOOL 26dbd3ef26000a978508258b09db4d8326a9f1afac4fc3984964123287baa61cad6a5dab62d69f7b3cec44b9a77be6b37f4a689d2999c06e9b870a188b3fc789
-MISC ChangeLog 3366 SHA256 1242947a37f95496352145def00a344e7c81ae37ff17222c71ee0804e501f0db SHA512 2ef89a10b75bc70a84680330a869ddbf9f7456c7ac30134134d9fb38a45b1e4c42071772174a73f6e915006ec985a2df389602ad354c82230c40209fc8965f53 WHIRLPOOL b4649c3f0982d8a73aa35f2e4629d0f82dd2f4d2f9621d1454916bfee22c6fe6085d9345e8f5a0dcd37742d0718b5a87855b52d7e09d9d59b6ebabbc6b733081
+MISC ChangeLog 3470 SHA256 8c141dab55cf871fc302f6e026975276392d5ea51c7d74a035d530720360a2e1 SHA512 13b675639532bacd3aae3c8ca2bd8c2385ee364c387218b6eed14774b7348e751495e537b9e226c51d07645d7b13ade62a5d9b7d57780852cd05931b2995e6de WHIRLPOOL f127de73f5ce882b31529a71c9650f4eae9cc5bdde1d6e877046b42c4497c96d90160b4f5733ac69ddae0d07bd47964a88023aae041d72e499d20fb70a896ead
 MISC metadata.xml 591 SHA256 8c557bc4420494a9164aba4827b2ae7ff5fa33c4fbbee31e586cc90a5887dcf8 SHA512 79d99b9578739bf6fb6f093e9a92af05c895f517c22d6160dc229281d52dfc670a8c43270dff4a1772ea98e70b247d553aa226fb07e8c0793949c088e0fc2413 WHIRLPOOL 4e7d730ed334f16b70dbe939bed42a548010abee47c9024133125e81f351e603389723fc385794451568dcc1366e7b0602c57fc79010786b7109993a1163491d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlE2ccUACgkQ1fmVwcYIWAbzbwCdFeg2pRJ1JMa/vwJZP73Kxj8T
+GwgAn2Z/07rGjNTgfOH6MWD05dWbhItk
+=8kiV
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/caribou/caribou-0.4.6.ebuild b/app-accessibility/caribou/caribou-0.4.6.ebuild
deleted file mode 100644
index c5210df27c02..000000000000
--- a/app-accessibility/caribou/caribou-0.4.6.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/caribou-0.4.6.ebuild,v 1.1 2013/01/13 15:41:08 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Input assistive technology intended for switch and pointer users"
-HOMEPAGE="https://live.gnome.org/Caribou"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3:3[introspection]
-	x11-libs/gtk+:2
-	>=dev-libs/gobject-introspection-0.10.7
-	dev-libs/libgee:0.8
-	dev-libs/libxml2
-	>=media-libs/clutter-1.5.11:1.0[introspection]
-	x11-libs/libX11
-	x11-libs/libxklavier
-	x11-libs/libXtst
-"
-# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
-# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
-# librsvg needed to load svg images in css styles
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
-	>=gnome-base/gsettings-desktop-schemas-3
-	gnome-base/librsvg:2
-	sys-apps/dbus
-	virtual/python-argparse[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig"
-
-src_prepare() {
-	# delete custom PYTHONPATH, useless on Gentoo and potential bug source
-	# + caribou is python2 only so fix the shell scripts
-	sed -e '/export PYTHONPATH=.*python/ d' \
-		-e "s:@PYTHON@:${EPREFIX}/usr/bin/python2:" \
-		-i bin/{antler-keyboard,caribou,caribou-preferences}.in ||
-		die "sed failed"
-
-	gnome2_src_prepare
-
-	prepare_caribou() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-	python_foreach_impl prepare_caribou
-}
-
-src_configure() {
-	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			--disable-static \
-			--enable-gtk3-module \
-			--enable-gtk2-module \
-			VALAC=$(type -P true)
-		#	PYTHON=${EPREFIX}/usr/bin/python2
-	# PYTHON is substituted into several installed shell scripts
-	# vala is not needed for tarball builds, but configure checks for it...
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null
-}