Remove unneeded setuptools. Please drop pkg_preinst on the next version bump.

(Portage version: 2.2.0_alpha122/cvs/Linux x86_64)

2 files changed, 19 insertions, 9 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index f6b739dc34d1..528c8687fa8b 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/docutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.154 2012/08/24 08:00:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.155 2012/08/24 18:24:40 floppym Exp $
+
+  24 Aug 2012; Mike Gilbert <floppym@gentoo.org> docutils-0.9.1.ebuild:
+  Remove unneeded setuptools. Please drop pkg_preinst on the next version bump.
 
 *docutils-0.9.1 (24 Aug 2012)
 
diff --git a/dev-python/docutils/docutils-0.9.1.ebuild b/dev-python/docutils/docutils-0.9.1.ebuild
index eaa51a6e6f93..6bc7983d6bf0 100644
--- a/dev-python/docutils/docutils-0.9.1.ebuild
+++ b/dev-python/docutils/docutils-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.9.1.ebuild,v 1.1 2012/08/24 08:00:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.9.1.ebuild,v 1.2 2012/08/24 18:24:40 floppym Exp $
 
 EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
@@ -19,18 +19,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="glep"
 
 RDEPEND="dev-python/pygments"
-DEPEND="dev-python/setuptools
-		${RDEPEND}"
+DEPEND="${RDEPEND}"
 
 DOCS="*.txt"
 
 GLEP_SRC="${WORKDIR}/glep-0.4-r1"
 
-src_prepare() {
-	distutils_src_prepare
-	sed -e "s/from distutils.core/from setuptools/" -i setup.py || die "sed setup.py failed"
-}
-
 src_compile() {
 	distutils_src_compile
 
@@ -107,3 +101,16 @@ src_install() {
 		python_execute_function --action-message 'Installation of GLEP tools with $(python_get_implementation_and_version)' installation_of_glep_tools
 	fi
 }
+
+pkg_preinst() {
+	# Remove egg-info directory left over from setuptools.
+	remove_egg_info() {
+		local lv="$(python_get_version --language)"
+		local sitedir="$(python_get_sitedir --base-path)"
+		local egg_info="${ROOT}${sitedir}/${P}-py${lv}.egg-info"
+		if [[ -d "${egg_info}" ]]; then
+			rm -r "${egg_info}"
+		fi
+	}
+	python_execute_function -q remove_egg_info
+}