Revbump. Don't install windows executables, bug 198023

(Portage version: 2.1.3.16)

6 files changed, 25 insertions, 32 deletions

diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index 5d97df048587..0847a9787c4a 100644
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/setuptools
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.28 2007/10/04 10:04:26 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.29 2007/11/04 08:01:24 hawking Exp $
+
+*setuptools-0.6_rc7-r1 (04 Nov 2007)
+
+  04 Nov 2007; Ali Polatel <hawking@gentoo.org>
+  +files/setuptools-0.6_rc7-noexe.patch, -setuptools-0.6_rc5.ebuild,
+  -setuptools-0.6_rc7.ebuild, +setuptools-0.6_rc7-r1.ebuild:
+  Revbump. Don't install windows executables, bug 198023
 
 *setuptools-0.6_rc7 (04 Oct 2007)
 
diff --git a/dev-python/setuptools/files/digest-setuptools-0.6_rc5 b/dev-python/setuptools/files/digest-setuptools-0.6_rc5
deleted file mode 100644
index 478ed36f018b..000000000000
--- a/dev-python/setuptools/files/digest-setuptools-0.6_rc5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c43562970b700ab779d5328ec170f659 setuptools-0.6c5.tar.gz 245470
-RMD160 07a8d1998750edacf3e0dd0a6f2eb4575b93286b setuptools-0.6c5.tar.gz 245470
-SHA256 ae1ee9b1a4a26d93e7920b19e3f322318faa3f6b98e38f3d40d04a5c131abe2f setuptools-0.6c5.tar.gz 245470
diff --git a/dev-python/setuptools/files/digest-setuptools-0.6_rc7 b/dev-python/setuptools/files/digest-setuptools-0.6_rc7-r1
index d017dede3af9..d017dede3af9 100644
--- a/dev-python/setuptools/files/digest-setuptools-0.6_rc7
+++ b/dev-python/setuptools/files/digest-setuptools-0.6_rc7-r1
diff --git a/dev-python/setuptools/files/setuptools-0.6_rc7-noexe.patch b/dev-python/setuptools/files/setuptools-0.6_rc7-noexe.patch
new file mode 100644
index 000000000000..662767e7621c
--- /dev/null
+++ b/dev-python/setuptools/files/setuptools-0.6_rc7-noexe.patch
@@ -0,0 +1,10 @@
+--- setup.py	2007-09-04 19:18:46.000000000 +0300
++++ setup.py	2007-11-04 09:49:18.000000000 +0200
+@@ -26,7 +26,6 @@
+     url = "http://pypi.python.org/pypi/setuptools",
+     test_suite = 'setuptools.tests',
+     packages = find_packages(),
+-    package_data = {'setuptools':['*.exe']},
+ 
+     py_modules = ['pkg_resources', 'easy_install', 'site'],
+ 
diff --git a/dev-python/setuptools/setuptools-0.6_rc5.ebuild b/dev-python/setuptools/setuptools-0.6_rc5.ebuild
deleted file mode 100644
index 449526212f43..000000000000
--- a/dev-python/setuptools/setuptools-0.6_rc5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6_rc5.ebuild,v 1.4 2007/07/11 06:19:47 mr_bones_ Exp $
-
-inherit distutils
-
-MY_P=${P/_rc/c}
-S="${WORKDIR}/${MY_P}"
-
-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}.tar.gz"
-
-LICENSE="PSF-2.2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.4.2"
-DEPEND="${RDEPEND}"
-
-DOCS="EasyInstall.txt api_tests.txt pkg_resources.txt setuptools.txt"
-
-src_test() {
-	"${python}" setup.py test || die "tests failed"
-}
diff --git a/dev-python/setuptools/setuptools-0.6_rc7.ebuild b/dev-python/setuptools/setuptools-0.6_rc7-r1.ebuild
index 55e1ba967d9c..6a80878bea83 100644
--- a/dev-python/setuptools/setuptools-0.6_rc7.ebuild
+++ b/dev-python/setuptools/setuptools-0.6_rc7-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6_rc7.ebuild,v 1.1 2007/10/04 07:26:04 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6_rc7-r1.ebuild,v 1.1 2007/11/04 08:01:24 hawking Exp $
 
-inherit distutils
+inherit distutils eutils
 
 MY_P=${P/_rc/c}
 S="${WORKDIR}/${MY_P}"
@@ -21,6 +21,11 @@ DEPEND="${RDEPEND}"
 
 DOCS="EasyInstall.txt api_tests.txt pkg_resources.txt setuptools.txt README.txt"
 
+src_unpack() {
+	distutils_src_unpack
+	epatch "${FILESDIR}/${P}-noexe.patch"
+}
+
 src_test() {
 	"${python}" setup.py test || die "tests failed"
 }