Added setuptools dep and call to distutils_src_unpack (bug #199060), cleanup. Dropped old version.

(Portage version: 2.1.3.19)

4 files changed, 17 insertions, 46 deletions

diff --git a/dev-python/pygments/ChangeLog b/dev-python/pygments/ChangeLog
index 37e484f82f50..c524fbc3e223 100644
--- a/dev-python/pygments/ChangeLog
+++ b/dev-python/pygments/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pygments
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/ChangeLog,v 1.9 2007/11/13 17:11:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/ChangeLog,v 1.10 2007/11/13 23:25:33 lucass Exp $
+
+  13 Nov 2007; Lukasz Strzygowski <lucass@gentoo.org>
+  -pygments-0.8.1.ebuild, pygments-0.9.ebuild:
+  Added setuptools dep and call to distutils_src_unpack (bug #199060),
+  cleanup. Dropped old version.
 
   13 Nov 2007; Raúl Porcel <armin76@gentoo.org> pygments-0.9.ebuild:
   Add ~alpha/~ia64 wrt #198989
diff --git a/dev-python/pygments/files/digest-pygments-0.8.1 b/dev-python/pygments/files/digest-pygments-0.8.1
deleted file mode 100644
index 84503a6ad6d0..000000000000
--- a/dev-python/pygments/files/digest-pygments-0.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f71971cbe9db538a40ea808ac5da3dc0 Pygments-0.8.1.tar.gz 708778
-RMD160 8574bc307f5ef33ba7ff0bc8b6dc468759c31d0e Pygments-0.8.1.tar.gz 708778
-SHA256 c1394c794a8c3056ff581ccc09d089a3d99fb9d6a44e03eaac4165365b8f2707 Pygments-0.8.1.tar.gz 708778
diff --git a/dev-python/pygments/pygments-0.8.1.ebuild b/dev-python/pygments/pygments-0.8.1.ebuild
deleted file mode 100644
index ac082e91bffa..000000000000
--- a/dev-python/pygments/pygments-0.8.1.ebuild
+++ /dev/null
@@ -1,36 +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/pygments/pygments-0.8.1.ebuild,v 1.2 2007/10/14 23:14:47 pythonhead Exp $
-
-inherit eutils distutils
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-NEED_PYTHON=2.3
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python."
-HOMEPAGE="http://pygments.org/"
-SRC_URI="http://cheeseshop.python.org/packages/source/P/${MY_PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-SLOT="0"
-IUSE="doc"
-S=${WORKDIR}/${MY_P}
-DOCS="CHANGES"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#Gentoo patches to make lexer recognize ebuilds as bash input
-	epatch "${FILESDIR}/${PN}-0.8-other.py-ebuild.patch" || die "Patch failed"
-	epatch "${FILESDIR}/${PN}-0.8-_mapping.py-ebuild.patch" || die "Patch failed"
-}
-
-src_install(){
-	distutils_src_install
-	use doc && dohtml -r docs/build/
-}
-
-src_test() {
-	PYTHONPATH=. "${python}" tests/run.py || die "tests failed"
-}
diff --git a/dev-python/pygments/pygments-0.9.ebuild b/dev-python/pygments/pygments-0.9.ebuild
index 1381b08e451b..aa5219ec1f0b 100644
--- a/dev-python/pygments/pygments-0.9.ebuild
+++ b/dev-python/pygments/pygments-0.9.ebuild
@@ -1,27 +1,32 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-0.9.ebuild,v 1.4 2007/11/13 17:11:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-0.9.ebuild,v 1.5 2007/11/13 23:25:33 lucass Exp $
+
+NEED_PYTHON=2.3
 
 inherit eutils distutils
 
 MY_PN="Pygments"
 MY_P="${MY_PN}-${PV}"
-NEED_PYTHON=2.3
 
 DESCRIPTION="Pygments is a syntax highlighting package written in Python."
 HOMEPAGE="http://pygments.org/"
 SRC_URI="http://cheeseshop.python.org/packages/source/P/${MY_PN}/${MY_P}.tar.gz"
+
 LICENSE="BSD"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="doc"
-S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools"
+
+S="${WORKDIR}/${MY_P}"
 DOCS="CHANGES"
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#Gentoo patches to make lexer recognize ebuilds as bash input
+	distutils_src_unpack
+
+	# Gentoo patches to make lexer recognize ebuilds as bash input
 	epatch "${FILESDIR}/${PN}-0.8-other.py-ebuild.patch" || die "Patch failed"
 	epatch "${FILESDIR}/${PN}-0.8-_mapping.py-ebuild.patch" || die "Patch failed"
 }