[gentoo-commits] gentoo-x86 commit in dev-python/docutils: docutils-0.9.1.ebuild ChangeLog

[Mike Gilbert (floppym)]

floppym     12/08/24 18:24:40

  Modified:             docutils-0.9.1.ebuild ChangeLog
  Log:
  Remove unneeded setuptools. Please drop pkg_preinst on the next version bump.
  
  (Portage version: 2.2.0_alpha122/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-python/docutils/docutils-0.9.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/docutils-0.9.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/docutils-0.9.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/docutils-0.9.1.ebuild?r1=1.1&r2=1.2

Index: docutils-0.9.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.9.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docutils-0.9.1.ebuild	24 Aug 2012 08:00:45 -0000	1.1
+++ docutils-0.9.1.ebuild	24 Aug 2012 18:24:40 -0000	1.2
@@ -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 @@
 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 @@
 		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
+}



1.155                dev-python/docutils/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/ChangeLog?rev=1.155&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/ChangeLog?rev=1.155&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/ChangeLog?r1=1.154&r2=1.155

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- ChangeLog	24 Aug 2012 08:00:45 -0000	1.154
+++ ChangeLog	24 Aug 2012 18:24:40 -0000	1.155
@@ -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@g.o> docutils-0.9.1.ebuild:
+  Remove unneeded setuptools. Please drop pkg_preinst on the next version bump.
 
 *docutils-0.9.1 (24 Aug 2012)