Added NEED_PYTHON. Added missing rdep on setuptools. Fixed setup.py to skip use_setuptools and extras_require. Fixed to install docs/*.txt. Dropped old versions.

Package-Manager: portage-2.1.2.2

15 files changed, 45 insertions, 275 deletions

diff --git a/dev-python/formencode/ChangeLog b/dev-python/formencode/ChangeLog
index e381eb69e99e..8798d47fb53e 100644
--- a/dev-python/formencode/ChangeLog
+++ b/dev-python/formencode/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-python/formencode
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/ChangeLog,v 1.9 2007/03/19 04:53:47 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/ChangeLog,v 1.10 2007/03/19 22:27:32 lucass Exp $
+
+  19 Mar 2007; Lukasz Strzygowski <lucass@gentoo.org>
+  -files/formencode-0.2.2-setup-gentoo.patch,
+  -files/formencode-0.3-setup-gentoo.patch,
+  -files/formencode-0.4-setup-gentoo.patch,
+  -files/formencode-0.6-setup-gentoo.patch, -formencode-0.2.2.ebuild,
+  -formencode-0.3.ebuild, -formencode-0.4.ebuild, -formencode-0.6.ebuild,
+  formencode-0.7.ebuild:
+  Added NEED_PYTHON. Added missing rdep on setuptools. Fixed setup.py to skip
+  use_setuptools and extras_require. Fixed to install docs/*.txt. Dropped old
+  versions.
 
 *formencode-0.7 (19 Mar 2007)
 
diff --git a/dev-python/formencode/Manifest b/dev-python/formencode/Manifest
index 644d1c5bd138..89ca2caeaac7 100644
--- a/dev-python/formencode/Manifest
+++ b/dev-python/formencode/Manifest
@@ -1,64 +1,26 @@
-AUX formencode-0.2.2-setup-gentoo.patch 405 RMD160 5d51c4c32bb0ea901e80e5f307b82c2e280f108e SHA1 1ecb60bfe187ea8f94e29bd280f31401af45abce SHA256 0faf894285280f5411504b5ca50c2e19349d7605bbd32e92ca1341ff3ec8f214
-MD5 b2bc4df3b59ec5949c4f9563ef49e289 files/formencode-0.2.2-setup-gentoo.patch 405
-RMD160 5d51c4c32bb0ea901e80e5f307b82c2e280f108e files/formencode-0.2.2-setup-gentoo.patch 405
-SHA256 0faf894285280f5411504b5ca50c2e19349d7605bbd32e92ca1341ff3ec8f214 files/formencode-0.2.2-setup-gentoo.patch 405
-AUX formencode-0.3-setup-gentoo.patch 405 RMD160 5d51c4c32bb0ea901e80e5f307b82c2e280f108e SHA1 1ecb60bfe187ea8f94e29bd280f31401af45abce SHA256 0faf894285280f5411504b5ca50c2e19349d7605bbd32e92ca1341ff3ec8f214
-MD5 b2bc4df3b59ec5949c4f9563ef49e289 files/formencode-0.3-setup-gentoo.patch 405
-RMD160 5d51c4c32bb0ea901e80e5f307b82c2e280f108e files/formencode-0.3-setup-gentoo.patch 405
-SHA256 0faf894285280f5411504b5ca50c2e19349d7605bbd32e92ca1341ff3ec8f214 files/formencode-0.3-setup-gentoo.patch 405
-AUX formencode-0.4-setup-gentoo.patch 405 RMD160 5d51c4c32bb0ea901e80e5f307b82c2e280f108e SHA1 1ecb60bfe187ea8f94e29bd280f31401af45abce SHA256 0faf894285280f5411504b5ca50c2e19349d7605bbd32e92ca1341ff3ec8f214
-MD5 b2bc4df3b59ec5949c4f9563ef49e289 files/formencode-0.4-setup-gentoo.patch 405
-RMD160 5d51c4c32bb0ea901e80e5f307b82c2e280f108e files/formencode-0.4-setup-gentoo.patch 405
-SHA256 0faf894285280f5411504b5ca50c2e19349d7605bbd32e92ca1341ff3ec8f214 files/formencode-0.4-setup-gentoo.patch 405
-AUX formencode-0.6-setup-gentoo.patch 405 RMD160 5d51c4c32bb0ea901e80e5f307b82c2e280f108e SHA1 1ecb60bfe187ea8f94e29bd280f31401af45abce SHA256 0faf894285280f5411504b5ca50c2e19349d7605bbd32e92ca1341ff3ec8f214
-MD5 b2bc4df3b59ec5949c4f9563ef49e289 files/formencode-0.6-setup-gentoo.patch 405
-RMD160 5d51c4c32bb0ea901e80e5f307b82c2e280f108e files/formencode-0.6-setup-gentoo.patch 405
-SHA256 0faf894285280f5411504b5ca50c2e19349d7605bbd32e92ca1341ff3ec8f214 files/formencode-0.6-setup-gentoo.patch 405
-DIST FormEncode-0.2.2.tar.gz 84126 RMD160 31d1e69cc74c6ee1a01decaffff639dade4bb712 SHA1 b83ee846b13d19db1bd86b30195d8ab775d59dab SHA256 063a533ab20782eb914630cf7c30be7518e0aafce9af1042695fb684c9652c9c
-DIST FormEncode-0.3.tar.gz 94346 RMD160 e637edfe7a06a13b222066e5b53af01289d25bba SHA1 e44a4433b61ce4d342d17c7d18c3a16757a8a49d SHA256 81742a9a9f9e4d19b48320b600674a462997b0d9f9ea4f4f42f5f945fc62e455
-DIST FormEncode-0.4.tar.gz 103978 RMD160 834bc437f2a32498b50ece9a902141fde4744f8e SHA1 89e2b3f63963c0b2cbc70388fd8dd081847f6390 SHA256 2c0de0243ce1853bf62ed9b2da122472b6682a117843af0cce4b4cf9588194ff
-DIST FormEncode-0.6.tar.gz 108841 RMD160 e282d9a0e9ca873c1bb06736fb5d3d9e769dd6a4 SHA1 ae45018e925ea0846a71ac3b366b3a127d1bb8e3 SHA256 6d27e15466fb5e8a2760ea47f6c6b8d8ba4190d4016fac6973adb20641f1b0ce
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST FormEncode-0.7.tar.gz 137206 RMD160 6a81487de16b08f21ce2127a8591db51ae7c63ef SHA1 2fa0022b6dcb211e2a3541259035073cd8449ac6 SHA256 3ade192e4192f9848d02f0e01918ff1403f27f82bde37e3002365bbe83e22b82
-EBUILD formencode-0.2.2.ebuild 884 RMD160 911bc483d3570687fcab67ec6fe9a981fab789c4 SHA1 a523cd39049fa7699d8185eba374938fea180c3e SHA256 a770213d44e6f770a85b4766ec1756285faaaf303ca1ff625556571635681b7e
-MD5 2faecb81aa076864f85181b2309bbaaa formencode-0.2.2.ebuild 884
-RMD160 911bc483d3570687fcab67ec6fe9a981fab789c4 formencode-0.2.2.ebuild 884
-SHA256 a770213d44e6f770a85b4766ec1756285faaaf303ca1ff625556571635681b7e formencode-0.2.2.ebuild 884
-EBUILD formencode-0.3.ebuild 985 RMD160 b14f8bf72282affedf161d8938d26c4d00d4e898 SHA1 5a13ffc4ec5e9fd3e784867e3619c033a0629396 SHA256 1c8551f49f9dd991793dc2638f6a5192681a6c0a8898acf24262e9c285debb51
-MD5 5b03fa936737cd27f2e1e985d257fa71 formencode-0.3.ebuild 985
-RMD160 b14f8bf72282affedf161d8938d26c4d00d4e898 formencode-0.3.ebuild 985
-SHA256 1c8551f49f9dd991793dc2638f6a5192681a6c0a8898acf24262e9c285debb51 formencode-0.3.ebuild 985
-EBUILD formencode-0.4.ebuild 993 RMD160 0e56b1982311f9d825834ea6b1b6077540ef39fc SHA1 50504d14c562b1bcbdba68fca79fabfcdafbc210 SHA256 be7236030d8f0f16acf34b9ab73943ee3bb606fa5919e381af5c5d2f2235ce9a
-MD5 cd9dce6aac9726b594abaaab182bee17 formencode-0.4.ebuild 993
-RMD160 0e56b1982311f9d825834ea6b1b6077540ef39fc formencode-0.4.ebuild 993
-SHA256 be7236030d8f0f16acf34b9ab73943ee3bb606fa5919e381af5c5d2f2235ce9a formencode-0.4.ebuild 993
-EBUILD formencode-0.6.ebuild 1037 RMD160 fce06af02c9855fe1f8c002df6fcb4220cb8b47a SHA1 e58e5e9abb35ac4a6f5b6b6f7886230a18225513 SHA256 9c757b3eaa033f565eeffa12b5c7088cd370520247ef92b30d8e7a834d88d7d1
-MD5 967345f9f119fe0be51d7208af3c4622 formencode-0.6.ebuild 1037
-RMD160 fce06af02c9855fe1f8c002df6fcb4220cb8b47a formencode-0.6.ebuild 1037
-SHA256 9c757b3eaa033f565eeffa12b5c7088cd370520247ef92b30d8e7a834d88d7d1 formencode-0.6.ebuild 1037
-EBUILD formencode-0.7.ebuild 828 RMD160 7809ccaddb31d9c27177fb798d0a40e6a317698e SHA1 d1246c777c16514c557305d1da78dc952a33ca24 SHA256 edbf66f0039dc2cd09f5900e5efbe74fbb68e15702957ad261963c4a4dd73a27
-MD5 b6c47a6f1aa4efdad61b2fe54e9b1f1a formencode-0.7.ebuild 828
-RMD160 7809ccaddb31d9c27177fb798d0a40e6a317698e formencode-0.7.ebuild 828
-SHA256 edbf66f0039dc2cd09f5900e5efbe74fbb68e15702957ad261963c4a4dd73a27 formencode-0.7.ebuild 828
-MISC ChangeLog 1463 RMD160 9ce758c8376dfd727aea9c5fddfb85d14751f64f SHA1 14fb4a385570b9d0b496fedc00cc2cf4295911f0 SHA256 debadf2b79b9a554b4add105c36061f879be1f92776c9eab2f976de39ecd50d8
-MD5 28427b536a01362bbb0cf2a1074f30e8 ChangeLog 1463
-RMD160 9ce758c8376dfd727aea9c5fddfb85d14751f64f ChangeLog 1463
-SHA256 debadf2b79b9a554b4add105c36061f879be1f92776c9eab2f976de39ecd50d8 ChangeLog 1463
+EBUILD formencode-0.7.ebuild 998 RMD160 f2e1da6d7ec132c8e000feeca355dc50cbc5db41 SHA1 f19439fba8375329c927bb0c04ac69fcca2b3945 SHA256 c9014cea6ae8b62b390160fb8eee3f838595c91f4041957d75f20f7808c55654
+MD5 6b9c8b87d4f8ca75347e506a9e33da64 formencode-0.7.ebuild 998
+RMD160 f2e1da6d7ec132c8e000feeca355dc50cbc5db41 formencode-0.7.ebuild 998
+SHA256 c9014cea6ae8b62b390160fb8eee3f838595c91f4041957d75f20f7808c55654 formencode-0.7.ebuild 998
+MISC ChangeLog 1986 RMD160 8ad8843340d75f510b16f95ca0b3a587033ddc06 SHA1 6397f140739a48ad6c08486f833d52d3b112b390 SHA256 f6177818dd941ae85946a4406ebe05bf922b84b406b3e33f4f11c10f22e19607
+MD5 ca908dcffc2bc28a24ca48c383c82992 ChangeLog 1986
+RMD160 8ad8843340d75f510b16f95ca0b3a587033ddc06 ChangeLog 1986
+SHA256 f6177818dd941ae85946a4406ebe05bf922b84b406b3e33f4f11c10f22e19607 ChangeLog 1986
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb metadata.xml 160
 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a metadata.xml 160
-MD5 ef1da7a969ab33a4bf78de97dcb49dd2 files/digest-formencode-0.2.2 247
-RMD160 9e9e3ef176827fa0577768e637a473102b63284f files/digest-formencode-0.2.2 247
-SHA256 209bc821d9c31866e6e2ee9ffb229e85e141e26024392b5cffe4ae823f0f8314 files/digest-formencode-0.2.2 247
-MD5 d8cb0ca38c2df0bd0c90bc53597b4fce files/digest-formencode-0.3 241
-RMD160 d5e1345bd2bca8943d5d74731632e26a8d315e75 files/digest-formencode-0.3 241
-SHA256 7e41aeebd20f2b69e01f80b37515cb01349952feedc86aaa1388e37858eeac21 files/digest-formencode-0.3 241
-MD5 4eac2f7b99998b98e03638cededcb0a3 files/digest-formencode-0.4 244
-RMD160 92b0ac2085e7b20375baea8187a886b2088f15e2 files/digest-formencode-0.4 244
-SHA256 fade072241a89e1014bbdb557425aa51900bf11c4d70e5ffbf1fe1fba16ab24d files/digest-formencode-0.4 244
-MD5 618cafd0d3b285273e48dbd4b9af13d0 files/digest-formencode-0.6 244
-RMD160 c0fa20109c966cdeebde3dabdaa1427366de7134 files/digest-formencode-0.6 244
-SHA256 2cc1cdc6b0e506bc5da495b1b30d35f823d566c3622d7295b60ab1f3552065bb files/digest-formencode-0.6 244
 MD5 72efbf69e37accb02057aef977d1824c files/digest-formencode-0.7 244
 RMD160 e4b3acd03b90c6cdeaf4ad7fbb5ae2761706880c files/digest-formencode-0.7 244
 SHA256 2d338ce79f6900fced1d124073af1d286bf9981af83534761fe059cd163aecf8 files/digest-formencode-0.7 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFF/w5i2jLqHNfbg2URAns9AJwN/1aeFe+oTinLOCXMxrPUAO4SBACfS7HG
+X90vjjcORKSFFECoA7Ocr7c=
+=tj7w
+-----END PGP SIGNATURE-----
diff --git a/dev-python/formencode/files/digest-formencode-0.2.2 b/dev-python/formencode/files/digest-formencode-0.2.2
deleted file mode 100644
index 4955f9784320..000000000000
--- a/dev-python/formencode/files/digest-formencode-0.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 56bb04a6ce9a3dcb187b3db6091ec5d9 FormEncode-0.2.2.tar.gz 84126
-RMD160 31d1e69cc74c6ee1a01decaffff639dade4bb712 FormEncode-0.2.2.tar.gz 84126
-SHA256 063a533ab20782eb914630cf7c30be7518e0aafce9af1042695fb684c9652c9c FormEncode-0.2.2.tar.gz 84126
diff --git a/dev-python/formencode/files/digest-formencode-0.3 b/dev-python/formencode/files/digest-formencode-0.3
deleted file mode 100644
index 029c507343ea..000000000000
--- a/dev-python/formencode/files/digest-formencode-0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 57afa5aad26bf3acb8b00e4babfe8297 FormEncode-0.3.tar.gz 94346
-RMD160 e637edfe7a06a13b222066e5b53af01289d25bba FormEncode-0.3.tar.gz 94346
-SHA256 81742a9a9f9e4d19b48320b600674a462997b0d9f9ea4f4f42f5f945fc62e455 FormEncode-0.3.tar.gz 94346
diff --git a/dev-python/formencode/files/digest-formencode-0.4 b/dev-python/formencode/files/digest-formencode-0.4
deleted file mode 100644
index 9ab3582a66e6..000000000000
--- a/dev-python/formencode/files/digest-formencode-0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 797852a19505f7d919db96dd994d0484 FormEncode-0.4.tar.gz 103978
-RMD160 834bc437f2a32498b50ece9a902141fde4744f8e FormEncode-0.4.tar.gz 103978
-SHA256 2c0de0243ce1853bf62ed9b2da122472b6682a117843af0cce4b4cf9588194ff FormEncode-0.4.tar.gz 103978
diff --git a/dev-python/formencode/files/digest-formencode-0.6 b/dev-python/formencode/files/digest-formencode-0.6
deleted file mode 100644
index f0732e5838e1..000000000000
--- a/dev-python/formencode/files/digest-formencode-0.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8504d515a8e25f1bba6842224b7494ae FormEncode-0.6.tar.gz 108841
-RMD160 e282d9a0e9ca873c1bb06736fb5d3d9e769dd6a4 FormEncode-0.6.tar.gz 108841
-SHA256 6d27e15466fb5e8a2760ea47f6c6b8d8ba4190d4016fac6973adb20641f1b0ce FormEncode-0.6.tar.gz 108841
diff --git a/dev-python/formencode/files/formencode-0.2.2-setup-gentoo.patch b/dev-python/formencode/files/formencode-0.2.2-setup-gentoo.patch
deleted file mode 100644
index 20e5d087854f..000000000000
--- a/dev-python/formencode/files/formencode-0.2.2-setup-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- setup.py.org	2005-10-17 13:00:43.570677240 -0700
-+++ setup.py	2005-10-17 13:02:11.089372376 -0700
-@@ -1,6 +1,9 @@
--from ez_setup import use_setuptools
--use_setuptools()
--from setuptools import setup
-+try:
-+    from ez_setup import use_setuptools
-+    use_setuptools()
-+    from setuptools import setup
-+except:
-+    from distutils.core import setup
- 
- setup(name="FormEncode",
-       version="0.2.2",
diff --git a/dev-python/formencode/files/formencode-0.3-setup-gentoo.patch b/dev-python/formencode/files/formencode-0.3-setup-gentoo.patch
deleted file mode 100644
index 20e5d087854f..000000000000
--- a/dev-python/formencode/files/formencode-0.3-setup-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- setup.py.org	2005-10-17 13:00:43.570677240 -0700
-+++ setup.py	2005-10-17 13:02:11.089372376 -0700
-@@ -1,6 +1,9 @@
--from ez_setup import use_setuptools
--use_setuptools()
--from setuptools import setup
-+try:
-+    from ez_setup import use_setuptools
-+    use_setuptools()
-+    from setuptools import setup
-+except:
-+    from distutils.core import setup
- 
- setup(name="FormEncode",
-       version="0.2.2",
diff --git a/dev-python/formencode/files/formencode-0.4-setup-gentoo.patch b/dev-python/formencode/files/formencode-0.4-setup-gentoo.patch
deleted file mode 100644
index 20e5d087854f..000000000000
--- a/dev-python/formencode/files/formencode-0.4-setup-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- setup.py.org	2005-10-17 13:00:43.570677240 -0700
-+++ setup.py	2005-10-17 13:02:11.089372376 -0700
-@@ -1,6 +1,9 @@
--from ez_setup import use_setuptools
--use_setuptools()
--from setuptools import setup
-+try:
-+    from ez_setup import use_setuptools
-+    use_setuptools()
-+    from setuptools import setup
-+except:
-+    from distutils.core import setup
- 
- setup(name="FormEncode",
-       version="0.2.2",
diff --git a/dev-python/formencode/files/formencode-0.6-setup-gentoo.patch b/dev-python/formencode/files/formencode-0.6-setup-gentoo.patch
deleted file mode 100644
index 20e5d087854f..000000000000
--- a/dev-python/formencode/files/formencode-0.6-setup-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- setup.py.org	2005-10-17 13:00:43.570677240 -0700
-+++ setup.py	2005-10-17 13:02:11.089372376 -0700
-@@ -1,6 +1,9 @@
--from ez_setup import use_setuptools
--use_setuptools()
--from setuptools import setup
-+try:
-+    from ez_setup import use_setuptools
-+    use_setuptools()
-+    from setuptools import setup
-+except:
-+    from distutils.core import setup
- 
- setup(name="FormEncode",
-       version="0.2.2",
diff --git a/dev-python/formencode/formencode-0.2.2.ebuild b/dev-python/formencode/formencode-0.2.2.ebuild
deleted file mode 100644
index 1b7bf84bc609..000000000000
--- a/dev-python/formencode/formencode-0.2.2.ebuild
+++ /dev/null
@@ -1,32 +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/formencode/formencode-0.2.2.ebuild,v 1.2 2005/10/24 17:10:19 dertobi123 Exp $
-
-inherit distutils eutils
-
-MY_PN="FormEncode"
-DESCRIPTION="formencode is a validation and form generation package"
-HOMEPAGE="http://formencode.org/"
-SRC_URI="http://cheeseshop.python.org/packages/source/F/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/python-2.3"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_unpack() {
-	unpack ${A} || die "Failed to unpack ${A}"
-	cd ${S} || die "Failed to cd to ${S}"
-	#We don't want to use setuptools until eggs.eclass is solid
-	rm -rf ez_setup
-	epatch ${FILESDIR}/${P}-setup-gentoo.patch
-}
-
-src_install() {
-	distutils_src_install
-	use doc && dodoc docs/*
-}
-
diff --git a/dev-python/formencode/formencode-0.3.ebuild b/dev-python/formencode/formencode-0.3.ebuild
deleted file mode 100644
index bc50fd97ecfb..000000000000
--- a/dev-python/formencode/formencode-0.3.ebuild
+++ /dev/null
@@ -1,36 +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/formencode/formencode-0.3.ebuild,v 1.2 2005/11/13 03:17:38 pythonhead Exp $
-
-inherit distutils eutils
-
-MY_PN="FormEncode"
-DESCRIPTION="formencode is a validation and form generation package"
-HOMEPAGE="http://formencode.org/"
-SRC_URI="http://cheeseshop.python.org/packages/source/F/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/python-2.3"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_unpack() {
-	unpack ${A} || die "Failed to unpack ${A}"
-	cd ${S} || die "Failed to cd to ${S}"
-	#We don't want to use setuptools until eggs.eclass is solid
-	rm -rf ez_setup
-	epatch ${FILESDIR}/${P}-setup-gentoo.patch
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dodoc docs/*
-		dodir /usr/share/doc/${PF}/examples
-		cp -R examples/* ${D}/usr/share/doc/${PF}/examples
-	fi
-}
-
diff --git a/dev-python/formencode/formencode-0.4.ebuild b/dev-python/formencode/formencode-0.4.ebuild
deleted file mode 100644
index 13a5be76796e..000000000000
--- a/dev-python/formencode/formencode-0.4.ebuild
+++ /dev/null
@@ -1,36 +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/formencode/formencode-0.4.ebuild,v 1.3 2006/05/08 00:41:51 weeve Exp $
-
-inherit distutils eutils
-
-MY_PN="FormEncode"
-DESCRIPTION="formencode is a validation and form generation package"
-HOMEPAGE="http://formencode.org/"
-SRC_URI="http://cheeseshop.python.org/packages/source/F/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/python-2.3"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_unpack() {
-	unpack ${A} || die "Failed to unpack ${A}"
-	cd ${S} || die "Failed to cd to ${S}"
-	#We don't want to use setuptools until eggs.eclass is solid
-	rm -rf ez_setup
-	epatch ${FILESDIR}/${P}-setup-gentoo.patch
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dodoc docs/*
-		dodir /usr/share/doc/${PF}/examples
-		cp -R examples/* ${D}/usr/share/doc/${PF}/examples
-	fi
-}
-
diff --git a/dev-python/formencode/formencode-0.6.ebuild b/dev-python/formencode/formencode-0.6.ebuild
deleted file mode 100644
index de2bdb0622b9..000000000000
--- a/dev-python/formencode/formencode-0.6.ebuild
+++ /dev/null
@@ -1,40 +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/formencode/formencode-0.6.ebuild,v 1.2 2006/11/27 23:35:40 kloeri Exp $
-
-# TODO: Add pudge support via "doc" flag
-#       currently broken with 0.6 release
-
-inherit distutils
-
-MY_PN="FormEncode"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="HTML form validation, generation, and conversion package"
-HOMEPAGE="http://formencode.org"
-SRC_URI="http://cheeseshop.python.org/packages/source/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2.4"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.3"
-
-PYTHON_MODNAME=$MY_PN
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A} || die "Failed to unpack ${A}"
-	cd ${S} || die "Failed to cd to ${S}"
-	#We don't want to use setuptools until eggs.eclass is solid
-	rm -rf ez_setup
-	epatch ${FILESDIR}/${P}-setup-gentoo.patch
-}
-
-src_install() {
-	distutils_src_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
diff --git a/dev-python/formencode/formencode-0.7.ebuild b/dev-python/formencode/formencode-0.7.ebuild
index f7a3b34ecaed..a413c39cd508 100644
--- a/dev-python/formencode/formencode-0.7.ebuild
+++ b/dev-python/formencode/formencode-0.7.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/formencode-0.7.ebuild,v 1.1 2007/03/19 04:53:47 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/formencode-0.7.ebuild,v 1.2 2007/03/19 22:27:32 lucass Exp $
 
 # TODO: Add pudge support via "doc" flag
 #       currently broken with 0.6 and 0.7 releases
 
+NEED_PYTHON=2.3
+
 inherit distutils
 
 MY_PN="FormEncode"
@@ -19,15 +21,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/python-2.3"
+RDEPEND="dev-python/setuptools"
 
 PYTHON_MODNAME=$MY_PN
 S="${WORKDIR}/${MY_P}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	
+	sed -i \
+		-e '/use_setuptools/d' \
+		-e '/extras_require/d' \
+		setup.py || die "sed failed"
+}
 
 src_install() {
 	distutils_src_install
 
+	dodoc docs/*.txt
+
 	insinto /usr/share/doc/${PF}
 	doins -r examples
 }