6 files changed, 70 insertions, 37 deletions
diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index 3e374e281577..bbcee135502a 100644
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/setuptools
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.1 2005/10/15 05:41:59 pythonhead Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.2 2006/02/05 20:23:19 marienz Exp $
+
+*setuptools-0.6_alpha9 (05 Feb 2006)
+
+  05 Feb 2006; Marien Zwart <marienz@gentoo.org>
+  -setuptools-0.6_alpha5.ebuild, +setuptools-0.6_alpha9.ebuild:
+  Bump to alpha9, use the new --single-version-externally-managed switch to
+  install. Drop alpha5 which does not support that switch (the switch will be
+  used in ebuilds depending on setuptools).
 
 *setuptools-0.6_alpha5 (15 Oct 2005)
 
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 437c472d5b14..77855d938890 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,4 +1,22 @@
-MD5 11345df562d028a9089cb4c73602bfd9 setuptools-0.6_alpha5.ebuild 991
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a02c4abd2a9f7a7e60c996adbb55370a ChangeLog 849
+RMD160 dca74a71448850cf0d53ffaae513d5eefe741ad9 ChangeLog 849
+SHA256 8911c61b0517d9ceff4976fce60105dd24bc413524dc390d7700b6766d16ff2f ChangeLog 849
+MD5 d55e9ef8b3522f2bae7d1b9d19eb2162 files/digest-setuptools-0.6_alpha9 241
+RMD160 ef41573ce3f7c012416bede0b4e145c8e57ec630 files/digest-setuptools-0.6_alpha9 241
+SHA256 e15c31e3f767b2a4bf3939ccb9dcd10078dbfd1fa367471e51dbbc2c3961a8cb files/digest-setuptools-0.6_alpha9 241
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
-MD5 8c62de7e19c249039c102bd3bca2f4ce ChangeLog 502
-MD5 00a23217d512848371e81f66adfda033 files/digest-setuptools-0.6_alpha5 65
+RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb metadata.xml 160
+SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a metadata.xml 160
+MD5 a33c2fdbb611bef9c45e5beae21964b3 setuptools-0.6_alpha9.ebuild 1069
+RMD160 e03b5e79483d745d37c6a67641165a25815b2892 setuptools-0.6_alpha9.ebuild 1069
+SHA256 c95cdaec8173701e162346f448d15b6fa962e98b069e891ecdb17e9146896948 setuptools-0.6_alpha9.ebuild 1069
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD5l7LW78445TWHXcRAsCEAJ9SBNieUWWVr1VTI5r1+boSWjCf9gCdE77j
+JTLA0hy6wEHROOd8kKVwY0s=
+=CoWP
+-----END PGP SIGNATURE-----
diff --git a/dev-python/setuptools/files/digest-setuptools-0.6_alpha5 b/dev-python/setuptools/files/digest-setuptools-0.6_alpha5
deleted file mode 100644
index 975a6fcc23eb..000000000000
--- a/dev-python/setuptools/files/digest-setuptools-0.6_alpha5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ae3e44e29c7d5296ed4b2042ba1108ce setuptools-0.6a5.zip 194836
diff --git a/dev-python/setuptools/files/digest-setuptools-0.6_alpha9 b/dev-python/setuptools/files/digest-setuptools-0.6_alpha9
new file mode 100644
index 000000000000..9cf137dce6e2
--- /dev/null
+++ b/dev-python/setuptools/files/digest-setuptools-0.6_alpha9
@@ -0,0 +1,3 @@
+MD5 10bd22507d6115df6ba053228b648a0c setuptools-0.6a9.zip 226681
+RMD160 454ba1bba62a98c93493775416d79254288b7546 setuptools-0.6a9.zip 226681
+SHA256 6c13ff1e2ccd6afc7b4dfb7d4d35e68c687c20a97521301626e1e1d7d3278d53 setuptools-0.6a9.zip 226681
diff --git a/dev-python/setuptools/setuptools-0.6_alpha5.ebuild b/dev-python/setuptools/setuptools-0.6_alpha5.ebuild
deleted file mode 100644
index 69ed15799df7..000000000000
--- a/dev-python/setuptools/setuptools-0.6_alpha5.ebuild
+++ /dev/null
@@ -1,31 +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/setuptools/setuptools-0.6_alpha5.ebuild,v 1.1 2005/10/15 05:41:59 pythonhead Exp $
-
-inherit distutils
-
-MY_P=${P/_alpha/a}
-DESCRIPTION="A collection of enhancements to the Python distutils including easy install"
-HOMEPAGE="http://peak.telecommunity.com/"
-SRC_URI="http://cheeseshop.python.org/packages/source/s/setuptools/${MY_P}.zip"
-LICENSE="PSF-2.2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-S="${WORKDIR}/${MY_P}"
-
-DEPEND=">=dev-lang/python-2.4.2
-	app-arch/zip"
-
-src_install() {
-	DOCS="EasyInstall.txt api_tests.txt pkg_resources.txt setuptools.txt"
-	distutils_src_install
-	distutils_python_version
-
-	# create .pth file in site-packages so the setuptools egg is added to
-	# the module search path
-	insinto /usr/lib/python${PYVER}/site-packages
-	echo "${MY_P}-py${PYVER}.egg" > "${MY_P}-py${PYVER}.pth"
-	doins "${MY_P}-py${PYVER}.pth"
-}
-
diff --git a/dev-python/setuptools/setuptools-0.6_alpha9.ebuild b/dev-python/setuptools/setuptools-0.6_alpha9.ebuild
new file mode 100644
index 000000000000..092877ef0dc9
--- /dev/null
+++ b/dev-python/setuptools/setuptools-0.6_alpha9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6_alpha9.ebuild,v 1.1 2006/02/05 20:23:19 marienz Exp $
+
+inherit distutils
+
+MY_P=${P/_alpha/a}
+DESCRIPTION="A collection of enhancements to the Python distutils including easy install"
+HOMEPAGE="http://peak.telecommunity.com/DevCenter/setuptools"
+SRC_URI="http://cheeseshop.python.org/packages/source/s/setuptools/${MY_P}.zip"
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+S="${WORKDIR}/${MY_P}"
+
+DEPEND=">=dev-lang/python-2.4.2
+	app-arch/zip"
+
+DOCS="EasyInstall.txt api_tests.txt pkg_resources.txt setuptools.txt"
+
+src_install() {
+	${python} setup.py install --root=${D} --no-compile \
+		--single-version-externally-managed "$@" || die
+
+	DDOCS="CHANGELOG COPYRIGHT KNOWN_BUGS MAINTAINERS PKG-INFO"
+	DDOCS="${DDOCS} CONTRIBUTORS TODO"
+	DDOCS="${DDOCS} Change* MANIFEST* README*"
+
+	for doc in ${DDOCS}; do
+		[ -s "$doc" ] && dodoc $doc
+	done
+
+	[ -n "${DOCS}" ] && dodoc ${DOCS}
+
+}