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

Package-Manager: portage-2.1.3.19

5 files changed, 35 insertions, 62 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/Manifest b/dev-python/pygments/Manifest
index eafc3afa8363..6f8c9ee859ea 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pygments-0.8-_mapping.py-ebuild.patch 1043 RMD160 684881215c8be4af0b9568d4459105b56cc16f6d SHA1 7865e6fe854169ee588549e936b3d583102a6256 SHA256 d223874c43fb62171908a1a222328ac688357b760567e3739cc4fa31995ead5f
 MD5 f4c1df65543ec79c9b9506a5d8a8b00b files/pygments-0.8-_mapping.py-ebuild.patch 1043
 RMD160 684881215c8be4af0b9568d4459105b56cc16f6d files/pygments-0.8-_mapping.py-ebuild.patch 1043
@@ -6,27 +9,26 @@ AUX pygments-0.8-other.py-ebuild.patch 350 RMD160 967b38bf2b6969cd9bf311f0542b97
 MD5 010c3d12aab4183773a9ce3076561883 files/pygments-0.8-other.py-ebuild.patch 350
 RMD160 967b38bf2b6969cd9bf311f0542b97fa07dfff93 files/pygments-0.8-other.py-ebuild.patch 350
 SHA256 a81336c004cc000b247f88836fe9e8cfdcb056269ca1e3c729b0b57ce93121ad files/pygments-0.8-other.py-ebuild.patch 350
-DIST Pygments-0.8.1.tar.gz 708778 RMD160 8574bc307f5ef33ba7ff0bc8b6dc468759c31d0e SHA1 1288c9876b334f2cf85bddfbd38b3237ee880c51 SHA256 c1394c794a8c3056ff581ccc09d089a3d99fb9d6a44e03eaac4165365b8f2707
 DIST Pygments-0.9.tar.gz 780966 RMD160 17d1e3ca9a2986593c773a1b66cb5eae4032c6cf SHA1 2d5a3186a6b9c6f6e05c147eeb18af37b7937708 SHA256 5013074493a2df39024b1367b2e1184a5eb2306bdb57cd2098f89d0fd32912b9
-EBUILD pygments-0.8.1.ebuild 1010 RMD160 5aa31411b27c2be7923637216f1419eda7a21261 SHA1 906a0c1402e74a7d45ca52a748f3cef3dd9ab100 SHA256 78a9e6bf7c267df09bdd97e31876ebf7a2b3272228c0029722580cfb5aee4af1
-MD5 099ed9f9a3d03cefcbd37cd68ca325c0 pygments-0.8.1.ebuild 1010
-RMD160 5aa31411b27c2be7923637216f1419eda7a21261 pygments-0.8.1.ebuild 1010
-SHA256 78a9e6bf7c267df09bdd97e31876ebf7a2b3272228c0029722580cfb5aee4af1 pygments-0.8.1.ebuild 1010
-EBUILD pygments-0.9.ebuild 1031 RMD160 51dbfe58c4b9fda06032c4e1808c65485e4f74c3 SHA1 a9b1ed564d0a7d8d9e5eb160faea147f4ab909b6 SHA256 d06f900280b9c8075ca49e9285f4522b46167d82bda12c36f41961d325142663
-MD5 e9f5751e88e43c5cb7fc78aa81805eb3 pygments-0.9.ebuild 1031
-RMD160 51dbfe58c4b9fda06032c4e1808c65485e4f74c3 pygments-0.9.ebuild 1031
-SHA256 d06f900280b9c8075ca49e9285f4522b46167d82bda12c36f41961d325142663 pygments-0.9.ebuild 1031
-MISC ChangeLog 1849 RMD160 9d1965d7cf1dd9b597ea83c054560e134036f810 SHA1 d5ed4d27b4fd036bbe7626022d4badb6aad41230 SHA256 d9e9417d7bcadd741b9ca5190ebf19d59464abbebc395372ff492adbc2bd288a
-MD5 ad7e2bbab9e48462ff89329fe66f984d ChangeLog 1849
-RMD160 9d1965d7cf1dd9b597ea83c054560e134036f810 ChangeLog 1849
-SHA256 d9e9417d7bcadd741b9ca5190ebf19d59464abbebc395372ff492adbc2bd288a ChangeLog 1849
+EBUILD pygments-0.9.ebuild 1067 RMD160 9c4c4ceaf6ee4733314d6e9d36628f9cf6ea5afc SHA1 85809a52f20c8e3e0ac77b59333cf0e59416938a SHA256 7421420cb46d8d026de20ddaf73c8027d84368f1646acd2b481df5f0a6efdae0
+MD5 51085bea6d4962ee5714cf0e0e9b63e9 pygments-0.9.ebuild 1067
+RMD160 9c4c4ceaf6ee4733314d6e9d36628f9cf6ea5afc pygments-0.9.ebuild 1067
+SHA256 7421420cb46d8d026de20ddaf73c8027d84368f1646acd2b481df5f0a6efdae0 pygments-0.9.ebuild 1067
+MISC ChangeLog 2054 RMD160 52fc6cf38a6db13a474f3a926bc73f2c15d96b63 SHA1 bfb849dbce22bbed96a5b417f35f9e4ebe1b3d3f SHA256 5c7797f2623f5af92ba7e866c9cb056339b90201930bb0290fec2f4b18d2308d
+MD5 e793ed4bd6ce63d5b879fee4110d90ba ChangeLog 2054
+RMD160 52fc6cf38a6db13a474f3a926bc73f2c15d96b63 ChangeLog 2054
+SHA256 5c7797f2623f5af92ba7e866c9cb056339b90201930bb0290fec2f4b18d2308d ChangeLog 2054
 MISC metadata.xml 324 RMD160 e99bd87525fcbccf3a5b10eae160832ae26a013c SHA1 330d20ed94f6607bb7293f935789dcf3f1151cc7 SHA256 83404c337ddbe4445d64859a64e352d02b7e3fd9929e4a265c06880d7938da3e
 MD5 8c5b007ef421db1269be4805edab4240 metadata.xml 324
 RMD160 e99bd87525fcbccf3a5b10eae160832ae26a013c metadata.xml 324
 SHA256 83404c337ddbe4445d64859a64e352d02b7e3fd9929e4a265c06880d7938da3e metadata.xml 324
-MD5 1cde9e76a76acb46fe68279740de62fb files/digest-pygments-0.8.1 244
-RMD160 598102e0081c229d1ce056095c734767274b619a files/digest-pygments-0.8.1 244
-SHA256 ebd137f7c841707976285ea1036b32e4990b13e079942216d271fa228b67479b files/digest-pygments-0.8.1 244
 MD5 5d28c627e80a3fc03b69bc6ec2c33a84 files/digest-pygments-0.9 238
 RMD160 827bd013cc842bda21c1bfa4470fe3cb48ac65cd files/digest-pygments-0.9 238
 SHA256 13dd4709d1f837f3b5de00c71e309149b3febbcacdea8e5874a83d60adc2aaf5 files/digest-pygments-0.9 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHOjJ72jLqHNfbg2URAmkAAJ9GusHesE5Z98xMg49EWKmmnVqHQACfVVz5
+adAQAqYw0ehVy/5Tmmrc/Lw=
+=s44I
+-----END PGP SIGNATURE-----
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"
 }