qa: prune old ebuilds, maketest -> test

Package-Manager: portage-2.1_pre4-r1

23 files changed, 38 insertions, 519 deletions

diff --git a/dev-python/gnome-python/ChangeLog b/dev-python/gnome-python/ChangeLog
index 59d4c334f3e0..f02f98f0a7ea 100644
--- a/dev-python/gnome-python/ChangeLog
+++ b/dev-python/gnome-python/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/gnome-python
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/ChangeLog,v 1.59 2006/02/09 14:55:10 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/ChangeLog,v 1.60 2006/02/24 03:21:43 allanonjl Exp $
+
+  24 Feb 2006; John N. Laliberte <allanonjl@gentoo.org>
+  -gnome-python-1.4.2.ebuild, -gnome-python-1.4.4.ebuild,
+  -gnome-python-1.4.4-r1.ebuild, -gnome-python-2.0.0.ebuild,
+  -gnome-python-2.0.0-r1.ebuild, -gnome-python-2.0.2.ebuild,
+  -gnome-python-2.6.1.ebuild, gnome-python-2.10.0.ebuild,
+  -gnome-python-2.12.0.ebuild, gnome-python-2.12.1.ebuild,
+  gnome-python-2.12.3.ebuild:
+  qa: prune old ebuilds, maketest -> test
 
 *gnome-python-2.12.3 (09 Feb 2006)
 
diff --git a/dev-python/gnome-python/Manifest b/dev-python/gnome-python/Manifest
index 8a262dbaf2e1..b4932569ca0a 100644
--- a/dev-python/gnome-python/Manifest
+++ b/dev-python/gnome-python/Manifest
@@ -1,72 +1,24 @@
-MD5 32aece8a788ba5531f7e8dc1bb559e60 ChangeLog 7798
-RMD160 ed561939ea11732e39827d6e49313e6d543a323b ChangeLog 7798
-SHA256 b6c443c8521b8d92171d8c7d1faa6c30bf910bb5e571a3d55c38c318d135c317 ChangeLog 7798
-MD5 7fd6852037c022d0f0f2413aabae59b4 files/digest-gnome-python-1.4.2 70
-RMD160 077e0a04ebb3f8e65f0faa1c2e76f926fc548329 files/digest-gnome-python-1.4.2 70
-SHA256 11fc18ddff5913de3cf056ec3a30900074cd2c5f0ebb37e89ad8321d265a2c91 files/digest-gnome-python-1.4.2 70
-MD5 ba9ea8c1b972e53626b9ab2d6cab4225 files/digest-gnome-python-1.4.4 71
-RMD160 239590630f00e7e4b93d6bf3d646fcbdb47af767 files/digest-gnome-python-1.4.4 71
-SHA256 430b0f4ea2ee55e9fdded85a1f9717fe8adc672095fbc1bc88a756f2fcb1c513 files/digest-gnome-python-1.4.4 71
-MD5 ba9ea8c1b972e53626b9ab2d6cab4225 files/digest-gnome-python-1.4.4-r1 71
-RMD160 239590630f00e7e4b93d6bf3d646fcbdb47af767 files/digest-gnome-python-1.4.4-r1 71
-SHA256 430b0f4ea2ee55e9fdded85a1f9717fe8adc672095fbc1bc88a756f2fcb1c513 files/digest-gnome-python-1.4.4-r1 71
-MD5 aa76f5d8b6e152a3b22f18773e522f80 files/digest-gnome-python-2.0.0 71
-RMD160 0360e065950693c2264a9be32b956ba85479fc7e files/digest-gnome-python-2.0.0 71
-SHA256 f6cbaeeaa7f0f68e638c43f11e634246f854f9e7c5ecaa811ea1f3485b8f29d5 files/digest-gnome-python-2.0.0 71
-MD5 aa76f5d8b6e152a3b22f18773e522f80 files/digest-gnome-python-2.0.0-r1 71
-RMD160 0360e065950693c2264a9be32b956ba85479fc7e files/digest-gnome-python-2.0.0-r1 71
-SHA256 f6cbaeeaa7f0f68e638c43f11e634246f854f9e7c5ecaa811ea1f3485b8f29d5 files/digest-gnome-python-2.0.0-r1 71
-MD5 fef37468e0970ab54e2ee7d70deee9be files/digest-gnome-python-2.0.2 71
-RMD160 b8cd16a979d1d4ccd0b6574399b8a750c7c358a8 files/digest-gnome-python-2.0.2 71
-SHA256 149d2bdb1b99c02e1209f90fe33d032f3604afeec3a665cca1de21e66c807cda files/digest-gnome-python-2.0.2 71
-MD5 ce53c6cf0fe7655ed7c57a31f4bb34a1 files/digest-gnome-python-2.10.0 72
-RMD160 ab47c9a82de2be9ef0a7dc46919d436fa8eef9a6 files/digest-gnome-python-2.10.0 72
-SHA256 1ac114366bff9a454997f049169c89fe2d9212ea5f2309fa235493aa993f278f files/digest-gnome-python-2.10.0 72
-MD5 3e55320aadde8f4e5fbe4a611f6d339d files/digest-gnome-python-2.12.0 72
-RMD160 c99cd9358ca17a8388f92eefd0dac80a975fd61d files/digest-gnome-python-2.12.0 72
-SHA256 07468980c6f4f1d761ff4a1951a9b9b9b2dd84e42309e4b15dd3e1c828515622 files/digest-gnome-python-2.12.0 72
-MD5 7009d27303672d1752d0c670f612d7d0 files/digest-gnome-python-2.12.1 72
-RMD160 3e993d7e55676b41f4d6af1abbf8201f6737c1f0 files/digest-gnome-python-2.12.1 72
-SHA256 68c8957f51f9b5c3964f3010452ddedd171512842cf49071a31284a23a35c138 files/digest-gnome-python-2.12.1 72
+MD5 f20954c5cbbae2f2691c3421e423c841 ChangeLog 8224
+RMD160 e87746d8765d70169b9a03ed173fffdd785f5869 ChangeLog 8224
+SHA256 bd397ed28ab7f90ab90405f965dedb836dd983db504162fb28a13a6e702f4630 ChangeLog 8224
+MD5 e434da3dcb319ec8c1c76256ad21a309 files/digest-gnome-python-2.10.0 262
+RMD160 c8c68bf7ed167293eb06940269636f9a38a43ad8 files/digest-gnome-python-2.10.0 262
+SHA256 4a5a983300015d8b9192d84620dacbfda9eae754ba8f195244cbfb3251187778 files/digest-gnome-python-2.10.0 262
+MD5 ba7d9c2c4405e19638e94679bf977f4f files/digest-gnome-python-2.12.1 262
+RMD160 eb140966f8526b3beef43e72adb85d39e2016f82 files/digest-gnome-python-2.12.1 262
+SHA256 d6488d0210edbd012d04e2c53f1fed180ab45758b4441e3bd5bd37b296933ff9 files/digest-gnome-python-2.12.1 262
 MD5 0dd621fc05e622e07ab66b97595b2fe2 files/digest-gnome-python-2.12.3 262
 RMD160 e2f0811bef2ebd9d73630a57f3a78586e6628118 files/digest-gnome-python-2.12.3 262
 SHA256 b6a55b11165f77d7339543ea2793483129257c5db2aa5bff567b700b3dd79897 files/digest-gnome-python-2.12.3 262
-MD5 78fc039ea7ba0b6a6b743078337acd9a files/digest-gnome-python-2.6.1 71
-RMD160 50dc554668be15d7dbf2a05fbe50ca6d029fc244 files/digest-gnome-python-2.6.1 71
-SHA256 cf73a6173e5129ff485396e59c81bfb6544aa6c70377c496810eeda6968de824 files/digest-gnome-python-2.6.1 71
-MD5 beaa7c0d8665ad4c48612a1127a1e16f gnome-python-1.4.2.ebuild 1261
-RMD160 1511c19c6fa1ee55b68a9c055bb87d030f82a030 gnome-python-1.4.2.ebuild 1261
-SHA256 c43e20958d19ee51ac1f1531d38f2f8ddbd59c7992fa20dece50607d5192d56a gnome-python-1.4.2.ebuild 1261
-MD5 1e2e39e780cb5a4348242df3ab9bcae5 gnome-python-1.4.4-r1.ebuild 1175
-RMD160 7a678a3440e7b1ee45618dd87fa9cc77e128f4fc gnome-python-1.4.4-r1.ebuild 1175
-SHA256 ec636ca7dac9eebb4d4caf05ba8ce90687d672e9f86dda380ea215a440609054 gnome-python-1.4.4-r1.ebuild 1175
-MD5 54b96012b8c9d68ff22f22fecb2ee06e gnome-python-1.4.4.ebuild 1206
-RMD160 0597b5ce9f787996c6a8b314891da486e6ea9dc6 gnome-python-1.4.4.ebuild 1206
-SHA256 9c302e1623d1f0f7076a1f851791b6aef555664cc53186aed99d3a4c07ecbe60 gnome-python-1.4.4.ebuild 1206
-MD5 0edce250970902c0703835e4ffb75bd8 gnome-python-2.0.0-r1.ebuild 1290
-RMD160 694e8ddeddab2dd95ba7dd08816abbee35de01fd gnome-python-2.0.0-r1.ebuild 1290
-SHA256 57b643f5da1c2a7ffa5feea4fbb005dd92fa26f5fdc4cbcedb8a6f0799db5d98 gnome-python-2.0.0-r1.ebuild 1290
-MD5 973907695edb60ef99341ea61a4f6460 gnome-python-2.0.0.ebuild 1083
-RMD160 e7dbd19129e8ad5129d2471ef0c958adc44d9680 gnome-python-2.0.0.ebuild 1083
-SHA256 95f589b2b338bb9223a308395b9a56b828771740527f934ecdff214a31dd518a gnome-python-2.0.0.ebuild 1083
-MD5 a2f2258f429e0dedf06a920dbd9f6eaa gnome-python-2.0.2.ebuild 1292
-RMD160 49f12ab069e392731b1e4ea9f824bb73c28a6af9 gnome-python-2.0.2.ebuild 1292
-SHA256 808a6cc485f4561d1fec3cbf7ab087340fd38fc808ebd3f302cfabb02fdc23ff gnome-python-2.0.2.ebuild 1292
-MD5 8b72ad43a7164d1f33e2dc1d839686c3 gnome-python-2.10.0.ebuild 1371
-RMD160 24fbda08c55d5127bba9657d88d5be5b21a5534c gnome-python-2.10.0.ebuild 1371
-SHA256 d2346089c276fc4e99bef16ea0fc2bf8b095db119818558d1398315840a40ef0 gnome-python-2.10.0.ebuild 1371
-MD5 e53fb7eed561b01c1690a413f62f5391 gnome-python-2.12.0.ebuild 1383
-RMD160 7a34497aecf1b508fa68698ebc38b42155941497 gnome-python-2.12.0.ebuild 1383
-SHA256 1a1923474a359b86b46080f2d6259353a44d6618daaec973dfa2f9efbfdb7437 gnome-python-2.12.0.ebuild 1383
-MD5 cd7d7b1528f6436f6a3ecd8d58dc4922 gnome-python-2.12.1.ebuild 1382
-RMD160 698f501d9c1a78e89259d7733cfb4a084cf08949 gnome-python-2.12.1.ebuild 1382
-SHA256 e09e8d26886a08ffaf2bafd15b552ef7af678306650f801cce4b9d8d4fbd818c gnome-python-2.12.1.ebuild 1382
-MD5 acbb1b94631ec13f0635eee920cf4957 gnome-python-2.12.3.ebuild 1390
-RMD160 00920adc7ac7d65683780fe6ca660b1558321353 gnome-python-2.12.3.ebuild 1390
-SHA256 579a82f85f8f19931ff38fd6848c5bcc696d73c412960d217a982db7d09c354f gnome-python-2.12.3.ebuild 1390
-MD5 c14b64ecfc7f2750f8ea4ec306144de9 gnome-python-2.6.1.ebuild 1558
-RMD160 3d5a01633fe8e024c4fbac974e5352b3f29a4152 gnome-python-2.6.1.ebuild 1558
-SHA256 344851b2ee13de9ba5e23712cdb7a5396da625690f7471b2d3da26ebcc3f2bcd gnome-python-2.6.1.ebuild 1558
+MD5 2ff6664f80050a27c70dcdd450a5f137 gnome-python-2.10.0.ebuild 1368
+RMD160 7eebfd64d617895ff969657762b7f8eaf772d24c gnome-python-2.10.0.ebuild 1368
+SHA256 26ea05dc3d37a7a4f451a63a2aff34867987483689a94db04988e518e4866efb gnome-python-2.10.0.ebuild 1368
+MD5 cd0d99b0bb63911fd1c17d2fee93fe0c gnome-python-2.12.1.ebuild 1380
+RMD160 ae4397263a9e67858c97ebc3fd0c46fb2f1e1a9a gnome-python-2.12.1.ebuild 1380
+SHA256 4709094154d17022ae9cb8ac5d7f78cf48d93249506063b0cb2dcfe4dcb053c6 gnome-python-2.12.1.ebuild 1380
+MD5 ee101ff118a1930a1c73f0b2158083e3 gnome-python-2.12.3.ebuild 1386
+RMD160 b2241aaff4af2183f2fa461fc7ff5f89b8c5c586 gnome-python-2.12.3.ebuild 1386
+SHA256 ecf54340071e9cff3167439278f1c4b0ee35adb22291793a5c9a5849fc91c9a5 gnome-python-2.12.3.ebuild 1386
 MD5 aab7d8b8a9c5777f5acad94eb998f367 metadata.xml 178
 RMD160 ec0937689a645defb2b870b481c4d4db57a0fa73 metadata.xml 178
 SHA256 ccdf4a821074a281d4fd442460b65f57e77546cea36756c435db5529d22fa2a6 metadata.xml 178
diff --git a/dev-python/gnome-python/files/digest-gnome-python-1.4.2 b/dev-python/gnome-python/files/digest-gnome-python-1.4.2
deleted file mode 100644
index b7ac47bbaa3c..000000000000
--- a/dev-python/gnome-python/files/digest-gnome-python-1.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a30fb606888a66bc52f595117c230eaf gnome-python-1.4.2.tar.gz 662706
diff --git a/dev-python/gnome-python/files/digest-gnome-python-1.4.4 b/dev-python/gnome-python/files/digest-gnome-python-1.4.4
deleted file mode 100644
index d4a1aa36a43b..000000000000
--- a/dev-python/gnome-python/files/digest-gnome-python-1.4.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5069c8ac77ba7ad991afceeab332319 gnome-python-1.4.4.tar.bz2 550412
diff --git a/dev-python/gnome-python/files/digest-gnome-python-1.4.4-r1 b/dev-python/gnome-python/files/digest-gnome-python-1.4.4-r1
deleted file mode 100644
index d4a1aa36a43b..000000000000
--- a/dev-python/gnome-python/files/digest-gnome-python-1.4.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5069c8ac77ba7ad991afceeab332319 gnome-python-1.4.4.tar.bz2 550412
diff --git a/dev-python/gnome-python/files/digest-gnome-python-2.0.0 b/dev-python/gnome-python/files/digest-gnome-python-2.0.0
deleted file mode 100644
index dbb47dd486bf..000000000000
--- a/dev-python/gnome-python/files/digest-gnome-python-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 48304c0865f74db33291115011bd08d5 gnome-python-2.0.0.tar.bz2 322139
diff --git a/dev-python/gnome-python/files/digest-gnome-python-2.0.0-r1 b/dev-python/gnome-python/files/digest-gnome-python-2.0.0-r1
deleted file mode 100644
index dbb47dd486bf..000000000000
--- a/dev-python/gnome-python/files/digest-gnome-python-2.0.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 48304c0865f74db33291115011bd08d5 gnome-python-2.0.0.tar.bz2 322139
diff --git a/dev-python/gnome-python/files/digest-gnome-python-2.0.2 b/dev-python/gnome-python/files/digest-gnome-python-2.0.2
deleted file mode 100644
index 6003a840e055..000000000000
--- a/dev-python/gnome-python/files/digest-gnome-python-2.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a8108fce2e50afece82640707569dc7 gnome-python-2.0.2.tar.bz2 348277
diff --git a/dev-python/gnome-python/files/digest-gnome-python-2.10.0 b/dev-python/gnome-python/files/digest-gnome-python-2.10.0
index 6e1027c4f5ae..7b7f2d69012f 100644
--- a/dev-python/gnome-python/files/digest-gnome-python-2.10.0
+++ b/dev-python/gnome-python/files/digest-gnome-python-2.10.0
@@ -1 +1,3 @@
 MD5 018c210bc5e2e9be36791bede9dbdc73 gnome-python-2.10.0.tar.bz2 359598
+RMD160 b60f61f27c2ef6ff730ec03fcec75789a5ef6dcd gnome-python-2.10.0.tar.bz2 359598
+SHA256 c92f8b6de8bc3deff3e754a802b42f7acaafb7fc5035c573c4fa4baad60e4fb2 gnome-python-2.10.0.tar.bz2 359598
diff --git a/dev-python/gnome-python/files/digest-gnome-python-2.12.0 b/dev-python/gnome-python/files/digest-gnome-python-2.12.0
deleted file mode 100644
index 41bdc3dc420b..000000000000
--- a/dev-python/gnome-python/files/digest-gnome-python-2.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a8f636a0cf8f179094287017f69bc39 gnome-python-2.12.0.tar.bz2 376189
diff --git a/dev-python/gnome-python/files/digest-gnome-python-2.12.1 b/dev-python/gnome-python/files/digest-gnome-python-2.12.1
index bee062857cc7..c95deaabbd71 100644
--- a/dev-python/gnome-python/files/digest-gnome-python-2.12.1
+++ b/dev-python/gnome-python/files/digest-gnome-python-2.12.1
@@ -1 +1,3 @@
 MD5 7f772bd8a209c1f1f42d9e52e12aed5b gnome-python-2.12.1.tar.bz2 376463
+RMD160 35b3520ffe1c6a9a4356f1c839935c135e1e0fa8 gnome-python-2.12.1.tar.bz2 376463
+SHA256 e293f54746aaec66f1b08bace73e2b729413ea542fce6c46c55e1c5f2c53cd00 gnome-python-2.12.1.tar.bz2 376463
diff --git a/dev-python/gnome-python/files/digest-gnome-python-2.6.1 b/dev-python/gnome-python/files/digest-gnome-python-2.6.1
deleted file mode 100644
index 6f2156c5eb07..000000000000
--- a/dev-python/gnome-python/files/digest-gnome-python-2.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4b6264b7715312d59d5648543933de51 gnome-python-2.6.1.tar.bz2 367394
diff --git a/dev-python/gnome-python/gnome-python-1.4.2.ebuild b/dev-python/gnome-python/gnome-python-1.4.2.ebuild
deleted file mode 100644
index e8f8cced5f40..000000000000
--- a/dev-python/gnome-python/gnome-python-1.4.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-1.4.2.ebuild,v 1.18 2005/03/23 14:27:19 liquidx Exp $
-
-IUSE="gnome opengl"
-
-DESCRIPTION="gnome-python"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/latest/sources/${P}.tar.gz"
-HOMEPAGE="http://www.pygtk.org/"
-
-DEPEND="virtual/python
-	=x11-libs/gtk+-1.2*
-	>=media-libs/imlib-1.9.10-r1
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-		 <gnome-base/libglade-1.90.0
-		 <gnome-base/control-center-1.90.0 )
-	opengl? ( <x11-libs/gtkglarea-1.99.0 )"
-
-SLOT="1"
-KEYWORDS="x86 ppc sparc alpha"
-LICENSE="GPL-2"
-
-src_compile() {
-	if use gnome
-	then
-		CFLAGS="${CFLAGS} `gnome-config capplet --cflags`" \
-		econf ${myopts} || die
-	else
-		cd ${S}/pygtk
-		econf ${myopts} || die
-	fi
-	make || die
-}
-
-src_install() {
-
-	if use gnome
-	then
-		cd ${S}/pygnome
-		make prefix=${D}/usr datadir=${D}/usr/share install || die
-
-		dodoc AUTHORS COPYING* ChangeLog NEWS MAPPING
-		dodoc README*
-
-		cd ${S}/pygnome
-		docinto pygnome
-		dodoc COPYING
-	fi
-
-	cd ${S}/pygtk
-	make prefix=${D}/usr datadir=${D}/usr/share install || die
-
-	cd ${S}/pygtk
-	docinto pygtk
-	dodoc AUTHORS COPYING ChangeLog NEWS MAPPING README
-}
diff --git a/dev-python/gnome-python/gnome-python-1.4.4-r1.ebuild b/dev-python/gnome-python/gnome-python-1.4.4-r1.ebuild
deleted file mode 100644
index d81b443d1ed3..000000000000
--- a/dev-python/gnome-python/gnome-python-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-1.4.4-r1.ebuild,v 1.7 2005/04/16 23:36:22 vapier Exp $
-
-inherit gnome.org python
-
-DESCRIPTION="GNOME1 Python Bindings"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha ia64 ppc ~sparc x86"
-IUSE=""
-
-DEPEND="virtual/python
-	=x11-libs/gtk+-1.2*
-	=dev-python/pygtk-0.6*
-	>=media-libs/imlib-1.9.10-r1
-	>=gnome-base/gnome-libs-1.4.1.2-r1
-	<gnome-base/libglade-1.90.0
-	<gnome-base/control-center-1.90.0"
-
-src_unpack() {
-	unpack ${A}
-	# disable pyc compiling
-	mv ${S}/py-compile ${S}/py-compile.orig
-	ln -s /bin/true ${S}/py-compile
-}
-
-src_compile() {
-	CFLAGS="${CFLAGS} `gnome-config capplet --cflags`" \
-		econf || die "econf failed"
-
-	cd ${S}/pygnome
-	emake || die
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog NEWS MAPPING README*
-	cd ${S}/pygnome
-	make prefix=${D}/usr datadir=${D}/usr/share install || die " install failed"
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages/gtk-1.2/gnome
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/dev-python/gnome-python/gnome-python-1.4.4.ebuild b/dev-python/gnome-python/gnome-python-1.4.4.ebuild
deleted file mode 100644
index 9b5f05adcf63..000000000000
--- a/dev-python/gnome-python/gnome-python-1.4.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-1.4.4.ebuild,v 1.13 2005/03/23 14:27:19 liquidx Exp $
-
-inherit gnome.org
-
-IUSE="gnome opengl"
-
-DESCRIPTION="gnome-python"
-HOMEPAGE="http://www.pygtk.org/"
-
-SLOT="1"
-KEYWORDS="x86 ppc ~sparc ~alpha"
-LICENSE="GPL-2"
-
-DEPEND="virtual/python
-	=x11-libs/gtk+-1.2*
-	>=media-libs/imlib-1.9.10-r1
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-		<gnome-base/libglade-1.90.0
-		<gnome-base/control-center-1.90.0 )
-	opengl? ( <x11-libs/gtkglarea-1.99.0 )"
-
-src_compile() {
-	if use gnome
-	then
-		CFLAGS="${CFLAGS} `gnome-config capplet --cflags`" \
-		econf ${myopts} || die
-	else
-		cd ${S}/pygtk
-		econf ${myopts} || die
-	fi
-	make || die
-}
-
-src_install() {
-
-	if use gnome
-	then
-		cd ${S}/pygnome
-		make prefix=${D}/usr datadir=${D}/usr/share install || die
-
-		dodoc AUTHORS COPYING* ChangeLog NEWS MAPPING
-		dodoc README*
-
-		cd ${S}/pygnome
-		docinto pygnome
-		dodoc COPYING
-	fi
-
-	cd ${S}/pygtk
-	make prefix=${D}/usr datadir=${D}/usr/share install || die
-
-	cd ${S}/pygtk
-	docinto pygtk
-	dodoc AUTHORS COPYING ChangeLog NEWS MAPPING README
-}
diff --git a/dev-python/gnome-python/gnome-python-2.0.0-r1.ebuild b/dev-python/gnome-python/gnome-python-2.0.0-r1.ebuild
deleted file mode 100644
index a65a546147ce..000000000000
--- a/dev-python/gnome-python/gnome-python-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.0.0-r1.ebuild,v 1.13 2006/01/12 23:34:57 compnerd Exp $
-
-inherit gnome2 python
-
-DESCRIPTION="GNOME 2 bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="gtkhtml"
-
-RDEPEND=">=dev-lang/python-2.2
-	>=dev-python/pygtk-${PV}
-	>=dev-python/pyorbit-2.0
-	>=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gconf-1.2
-	>=x11-libs/libzvt-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/nautilus-2
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	gtkhtml? ( =gnome-extra/gtkhtml-2* )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README"
-
-src_unpack() {
-	unpack ${A}
-	# disable pyc compiling
-	mv ${S}/py-compile ${S}/py-compile.orig
-	ln -s /bin/true ${S}/py-compile
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages/gtk-2.0
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup
-}
diff --git a/dev-python/gnome-python/gnome-python-2.0.0.ebuild b/dev-python/gnome-python/gnome-python-2.0.0.ebuild
deleted file mode 100644
index c9c940c46da6..000000000000
--- a/dev-python/gnome-python/gnome-python-2.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.0.0.ebuild,v 1.13 2006/01/12 23:34:57 compnerd Exp $
-
-# devel version - debug
-inherit gnome2 debug
-
-IUSE="gtkhtml"
-
-DESCRIPTION="GNOME 2 bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-LICENSE="LGPL-2"
-
-RDEPEND=">=dev-lang/python-2.2
-	>=dev-python/pygtk-${PV}
-	>=dev-python/pyorbit-2.0
-	>=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gconf-1.2
-	>=x11-libs/libzvt-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/nautilus-2
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	gtkhtml? ( =gnome-extra/gtkhtml-2* )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-SLOT="2"
-KEYWORDS="x86 ppc alpha sparc"
-
-# ugly, but necessary
-addwrite /usr/share/pygtk/2.0/codegen
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
diff --git a/dev-python/gnome-python/gnome-python-2.0.2.ebuild b/dev-python/gnome-python/gnome-python-2.0.2.ebuild
deleted file mode 100644
index f4bf013d4995..000000000000
--- a/dev-python/gnome-python/gnome-python-2.0.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.0.2.ebuild,v 1.7 2006/01/12 23:34:57 compnerd Exp $
-
-inherit gnome2 python
-
-DESCRIPTION="GNOME 2 bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="gtkhtml"
-
-RDEPEND=">=dev-lang/python-2.2
-	>=dev-python/pygtk-${PV}
-	>=dev-python/pyorbit-2.0
-	>=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gconf-1.2
-	>=x11-libs/libzvt-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/nautilus-2
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	gtkhtml? ( =gnome-extra/gtkhtml-2* )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README"
-
-src_unpack() {
-	unpack ${A}
-	# disable pyc compiling
-	mv ${S}/py-compile ${S}/py-compile.orig
-	ln -s /bin/true ${S}/py-compile
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages/gtk-2.0
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup
-}
diff --git a/dev-python/gnome-python/gnome-python-2.10.0.ebuild b/dev-python/gnome-python/gnome-python-2.10.0.ebuild
index 188d0e352faf..c9702a50744c 100644
--- a/dev-python/gnome-python/gnome-python-2.10.0.ebuild
+++ b/dev-python/gnome-python/gnome-python-2.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.10.0.ebuild,v 1.10 2006/01/12 23:34:57 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.10.0.ebuild,v 1.11 2006/02/24 03:21:43 allanonjl Exp $
 
 inherit gnome2 python eutils
 
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0"
 
 # Skip test, to avoid gnome-python-2.0 block (fixes bug 72594)
-RESTRICT="maketest"
+RESTRICT="test"
 DOCS="AUTHORS ChangeLog NEWS"
 
 src_unpack() {
diff --git a/dev-python/gnome-python/gnome-python-2.12.0.ebuild b/dev-python/gnome-python/gnome-python-2.12.0.ebuild
deleted file mode 100644
index efbc0b9ae864..000000000000
--- a/dev-python/gnome-python/gnome-python-2.12.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.12.0.ebuild,v 1.2 2006/01/12 23:34:57 compnerd Exp $
-
-inherit gnome2 python eutils
-
-DESCRIPTION="GNOME 2 bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc gtkhtml"
-
-RDEPEND=">=dev-lang/python-2.2
-	>=dev-python/pygtk-2.6.2
-	>=dev-python/pyorbit-2.0.1
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	>=gnome-base/libgnome-2.8
-	>=gnome-base/libgnomeui-2.8
-	>=gnome-base/libgnomecanvas-2.8
-	>=gnome-base/gnome-vfs-2.9.3
-	>=gnome-base/gconf-2.11.1
-	>=gnome-base/libbonobo-2.8
-	>=gnome-base/libbonoboui-2.8
-	>=gnome-base/libgnomeprintui-2.8
-	gtkhtml? ( >=gnome-extra/gtkhtml-3.2.5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-# Skip test, to avoid gnome-python-2.0 block (fixes bug 72594)
-RESTRICT="maketest"
-DOCS="AUTHORS ChangeLog NEWS"
-
-src_unpack() {
-	unpack ${A}
-	# disable pyc compiling
-	mv ${S}/py-compile ${S}/py-compile.orig
-	ln -s /bin/true ${S}/py-compile
-}
-
-src_install() {
-	gnome2_src_install
-
-	insinto /usr/share/doc/${P}
-	doins -r examples
-
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages/gtk-2.0
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup
-}
diff --git a/dev-python/gnome-python/gnome-python-2.12.1.ebuild b/dev-python/gnome-python/gnome-python-2.12.1.ebuild
index ef42955ff333..100550af6fad 100644
--- a/dev-python/gnome-python/gnome-python-2.12.1.ebuild
+++ b/dev-python/gnome-python/gnome-python-2.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.12.1.ebuild,v 1.9 2006/02/06 21:44:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.12.1.ebuild,v 1.10 2006/02/24 03:21:43 allanonjl Exp $
 
 inherit gnome2 python eutils
 
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0"
 
 # Skip test, to avoid gnome-python-2.0 block (fixes bug 72594)
-RESTRICT="maketest"
+RESTRICT="test"
 DOCS="AUTHORS ChangeLog NEWS"
 
 src_unpack() {
diff --git a/dev-python/gnome-python/gnome-python-2.12.3.ebuild b/dev-python/gnome-python/gnome-python-2.12.3.ebuild
index a1f1cc2b7690..b76e6dbd1352 100644
--- a/dev-python/gnome-python/gnome-python-2.12.3.ebuild
+++ b/dev-python/gnome-python/gnome-python-2.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.12.3.ebuild,v 1.1 2006/02/09 14:55:10 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.12.3.ebuild,v 1.2 2006/02/24 03:21:43 allanonjl Exp $
 
 inherit gnome2 python eutils
 
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0"
 
 # Skip test, to avoid gnome-python-2.0 block (fixes bug 72594)
-RESTRICT="maketest"
+RESTRICT="test"
 DOCS="AUTHORS ChangeLog NEWS"
 
 src_unpack() {
diff --git a/dev-python/gnome-python/gnome-python-2.6.1.ebuild b/dev-python/gnome-python/gnome-python-2.6.1.ebuild
deleted file mode 100644
index e14f356c2753..000000000000
--- a/dev-python/gnome-python/gnome-python-2.6.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.6.1.ebuild,v 1.6 2006/01/12 23:34:57 compnerd Exp $
-
-inherit gnome2 python eutils
-
-DESCRIPTION="GNOME 2 bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="gtkhtml"
-
-RDEPEND=">=dev-lang/python-2.2
-	>=dev-python/pygtk-2.4
-	>=dev-python/pyorbit-2.0.1
-	>=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gconf-1.2
-	>=x11-libs/libzvt-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/nautilus-2
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	gtkhtml? ( =gnome-extra/gtkhtml-2* )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-# Skip test, to avoid gnome-python-2.0 block (fixes bug 72594)
-RESTRICT="test"
-DOCS="AUTHORS ChangeLog INSTALL NEWS README"
-
-src_unpack() {
-	unpack ${A}
-	#cd ${S}
-	#epatch ${FILESDIR}/${P}-gtkhtml.patch
-	#epatch ${FILESDIR}/${P}-gtkhtml-atomic.patch
-	# disable pyc compiling
-	mv ${S}/py-compile ${S}/py-compile.orig
-	ln -s /bin/true ${S}/py-compile
-}
-
-src_install() {
-	gnome2_src_install
-
-	insinto /usr/share/doc/${P}
-	doins -r examples
-
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages/gtk-2.0
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup
-}