Change setuptools to RDEPEND, tests were importing installed version, added eclass highlighting and test DEPEND on ttf-bitstream-vera bug #232356 and #232359, thanks Bernhard Frauendienst <gentoo@obeliks.de>, remove patches and use sed instead.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 i686

6 files changed, 53 insertions, 48 deletions

diff --git a/dev-python/pygments/ChangeLog b/dev-python/pygments/ChangeLog
index 7cc5d440d2fb..f6a58dc00c6e 100644
--- a/dev-python/pygments/ChangeLog
+++ b/dev-python/pygments/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pygments
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/ChangeLog,v 1.15 2008/07/16 12:59:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/ChangeLog,v 1.16 2008/07/22 04:31:35 pythonhead Exp $
+
+  22 Jul 2008; Rob Cakebread <pythonhead@gentoo.org> pygments-0.9.ebuild,
+  pygments-0.10.ebuild:
+  Change setuptools to RDEPEND, tests were importing installed version,
+  added eclass highlighting and test DEPEND on ttf-bitstream-vera bug
+  #232356 and #232359, thanks Bernhard Frauendienst <gentoo@obeliks.de>,
+  remove patches and use sed instead.
 
   16 Jul 2008; Alexis Ballier <aballier@gentoo.org> pygments-0.10.ebuild:
   keyword ~x86-fbsd
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 94e7cc441aa9..e0f03272a309 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pygments-0.8-_mapping.py-ebuild.patch 1043 RMD160 684881215c8be4af0b9568d4459105b56cc16f6d SHA1 7865e6fe854169ee588549e936b3d583102a6256 SHA256 d223874c43fb62171908a1a222328ac688357b760567e3739cc4fa31995ead5f
-AUX pygments-0.8-other.py-ebuild.patch 350 RMD160 967b38bf2b6969cd9bf311f0542b97fa07dfff93 SHA1 68bd75593271e46b28bd961ee0bdb59d03f615df SHA256 a81336c004cc000b247f88836fe9e8cfdcb056269ca1e3c729b0b57ce93121ad
 DIST Pygments-0.10.tar.gz 836229 RMD160 8bfe3e3f9267f8f9366ff4dd2c3ae9b10fa778d8 SHA1 09ca526b40655db993fdc9f1c1b89de525f32080 SHA256 62a73fd3a009804910398aac2c5850609b7528d3e04dd003b0abd0f068bf684d
 DIST Pygments-0.9.tar.gz 780966 RMD160 17d1e3ca9a2986593c773a1b66cb5eae4032c6cf SHA1 2d5a3186a6b9c6f6e05c147eeb18af37b7937708 SHA256 5013074493a2df39024b1367b2e1184a5eb2306bdb57cd2098f89d0fd32912b9
-EBUILD pygments-0.10.ebuild 1123 RMD160 7f66064f9ed7bc02bb64a2bfa2145cb913cab190 SHA1 27c8a1ba440b6c8701e502e2dd76dabf14588f24 SHA256 237d70b696064268451b3a02fa4af9ddccc35cb9e44b994cfb217bf49534bf67
-EBUILD pygments-0.9.ebuild 1072 RMD160 da00607503197bbfba146f5b6e35c939b0da9396 SHA1 cdb5d51943bda529edd79d44761a439402f7d45d SHA256 af9d44778ac96658941b2c96353a95d1dbf38dda3c7c1746c1e51d5e74c9ef59
-MISC ChangeLog 2564 RMD160 34807b2b29d49d032b41e511e86bec71e5902208 SHA1 15e88f987a602aac44a482ec6f6128e33d23f2cd SHA256 c20d82ec9b5b99b5b2a85994352ecec4541e752161b79a9e74a0c2f982fc9814
+EBUILD pygments-0.10.ebuild 1435 RMD160 43aab5a5373b4f888a5bcdcc75e0ced003f4561e SHA1 37c387fda86ec285769ade52c327461a8aabf738 SHA256 a4815d3be9051d3b80a7005df95bb5c709291439ebb311537d7d536aeb90b9e3
+EBUILD pygments-0.9.ebuild 1432 RMD160 c0a554a04434d319dc980b48f45183509194a85f SHA1 3d89d3ec70542588b9feb8c4317c1af69d0f8806 SHA256 4aba43556d4cbf03bb29f43d8f3db56edfa7caac857b7b2d88921482ef29b113
+MISC ChangeLog 2918 RMD160 e57f53d5af9933e369412ee68587e88fd73fa04d SHA1 dafa201939a7ec04efdb135c3b6800e10b6db2eb SHA256 64ef2cfca561efe02150703ee17adb925e4a377d6668b7208791e4883ab91253
 MISC metadata.xml 324 RMD160 e99bd87525fcbccf3a5b10eae160832ae26a013c SHA1 330d20ed94f6607bb7293f935789dcf3f1151cc7 SHA256 83404c337ddbe4445d64859a64e352d02b7e3fd9929e4a265c06880d7938da3e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkh98KwACgkQvFcC4BYPU0o1mACgupvbc68nUb67bA4M4rFS1Xf9
-xrkAn29QBBWUziIvpkQOgl4VUNp7WD0O
-=AVae
+iEYEARECAAYFAkiFYrQACgkQ8aihIaC/zgAhigCfdzUlffaWZpfTztiRHv8WsoYW
+5XUAoMhgMQINqd4t2G3MXjECy9SF0gu3
+=drB8
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygments/files/pygments-0.8-_mapping.py-ebuild.patch b/dev-python/pygments/files/pygments-0.8-_mapping.py-ebuild.patch
deleted file mode 100644
index 0b4a7d5e0fc6..000000000000
--- a/dev-python/pygments/files/pygments-0.8-_mapping.py-ebuild.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pygments/lexers/_mapping.py.orig	2007-04-14 10:37:23.000000000 -0700
-+++ pygments/lexers/_mapping.py	2007-04-14 10:38:18.000000000 -0700
-@@ -16,7 +16,7 @@
- LEXERS = {
-     'ApacheConfLexer': ('pygments.lexers.text', 'ApacheConf', ('apacheconf', 'aconf', 'apache'), ('.htaccess', 'apache.conf', 'apache2.conf'), ('text/x-apacheconf',)),
-     'BBCodeLexer': ('pygments.lexers.text', 'BBCode', ('bbcode',), (), ('text/x-bbcode',)),
--    'BashLexer': ('pygments.lexers.other', 'Bash', ('bash', 'sh'), ('*.sh',), ('application/x-sh', 'application/x-shellscript')),
-+    'BashLexer': ('pygments.lexers.other', 'Bash', ('bash', 'sh', 'ebuild'), ('*.sh','*.ebuild',), ('application/x-sh', 'application/x-shellscript')),
-     'BatchLexer': ('pygments.lexers.other', 'Batchfile', ('bat',), ('*.bat', '*.cmd'), ('application/x-dos-batch',)),
-     'BefungeLexer': ('pygments.lexers.other', 'Befunge', ('befunge',), ('*.befunge',), ('application/x-befunge',)),
-     'BooLexer': ('pygments.lexers.dotnet', 'Boo', ('boo',), ('*.boo',), ('text/x-boo',)),
diff --git a/dev-python/pygments/files/pygments-0.8-other.py-ebuild.patch b/dev-python/pygments/files/pygments-0.8-other.py-ebuild.patch
deleted file mode 100644
index e988a11577c6..000000000000
--- a/dev-python/pygments/files/pygments-0.8-other.py-ebuild.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pygments/lexers/other.py.orig	2007-04-14 10:37:15.000000000 -0700
-+++ pygments/lexers/other.py	2007-04-14 10:37:46.000000000 -0700
-@@ -205,7 +205,7 @@
-     """
- 
-     name = 'Bash'
--    aliases = ['bash', 'sh']
-+    aliases = ['bash', 'sh', 'ebuild']
-     filenames = ['*.sh']
-     mimetypes = ['application/x-sh', 'application/x-shellscript']
- 
diff --git a/dev-python/pygments/pygments-0.10.ebuild b/dev-python/pygments/pygments-0.10.ebuild
index 87670b2dd2aa..2e3d99d4a173 100644
--- a/dev-python/pygments/pygments-0.10.ebuild
+++ b/dev-python/pygments/pygments-0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-0.10.ebuild,v 1.3 2008/07/16 12:59:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-0.10.ebuild,v 1.4 2008/07/22 04:31:35 pythonhead Exp $
 
 NEED_PYTHON=2.3
 
@@ -16,10 +16,10 @@ SRC_URI="http://cheeseshop.python.org/packages/source/P/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
-IUSE="doc"
+IUSE="doc test"
 
-DEPEND="dev-python/setuptools"
-RDEPEND=""
+DEPEND="test? ( media-fonts/ttf-bitstream-vera )"
+RDEPEND="dev-python/setuptools"
 
 S="${WORKDIR}/${MY_P}"
 DOCS="CHANGES"
@@ -29,10 +29,19 @@ src_unpack() {
 
 	# Make lexer recognize ebuilds as bash input
 	sed -i \
-		-e "/\(BashLexer\|aliases\)/s/\('sh'\)/\1, 'ebuild'/" \
-		-e "/\(BashLexer\|filenames\)/s/\('\*\.sh'\)/\1, '*.ebuild'/" \
-		${PN}/lexers/_mapping.py ${PN}/lexers/other.py ||\
+			-e "/\(BashLexer\|aliases\)/s/\('sh'\)/\1, 'ebuild', 'eclass'/" \
+			-e "/\(BashLexer\|filenames\)/s/\('\*\.sh'\)/\1, '*.ebuild', '*.eclass'/" \
+				${PN}/lexers/_mapping.py ${PN}/lexers/other.py ||\
 		die "sed failed."
+
+	#Our usual PYTHONPATH manipulation trick doesn't work, it will try to run
+	#tests on the installed version:
+	if use test ; then
+		sed -i \
+		-e "s/import pygments/sys.path.insert(0, '.');import pygments/" \
+		tests/run.py || \
+		die "sed failed"
+	fi
 }
 
 src_install(){
@@ -41,5 +50,5 @@ src_install(){
 }
 
 src_test() {
-	PYTHONPATH=. "${python}" tests/run.py || die "tests failed"
+	"${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 9287a96290f5..db0627ba066c 100644
--- a/dev-python/pygments/pygments-0.9.ebuild
+++ b/dev-python/pygments/pygments-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.7 2008/05/25 06:39:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-0.9.ebuild,v 1.8 2008/07/22 04:31:35 pythonhead Exp $
 
 NEED_PYTHON=2.3
 
@@ -16,26 +16,39 @@ SRC_URI="http://cheeseshop.python.org/packages/source/P/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
 SLOT="0"
-IUSE="doc"
+IUSE="doc test"
 
-DEPEND="dev-python/setuptools"
+DEPEND="test? ( media-fonts/ttf-bitstream-vera )"
+RDEPEND="dev-python/setuptools"
 
 S="${WORKDIR}/${MY_P}"
 DOCS="CHANGES"
 
 src_unpack() {
 	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"
+	# Make lexer recognize ebuilds as bash input
+	sed -i \
+			-e "/\(BashLexer\|aliases\)/s/\('sh'\)/\1, 'ebuild', 'eclass'/" \
+			-e "/\(BashLexer\|filenames\)/s/\('\*\.sh'\)/\1, '*.ebuild', '*.eclass'/" \
+				${PN}/lexers/_mapping.py ${PN}/lexers/other.py ||\
+		die "sed failed."
+
+	#Our usual PYTHONPATH manipulation trick doesn't work, it will try to run
+	#tests on the installed version:
+	if use test ; then
+		sed -i \
+			-e "s/import pygments/sys.path.insert(0, '.');import pygments/" \
+		tests/run.py || \
+		die "sed failed"
+	fi
 }
 
-src_install(){
+src_install() {
 	distutils_src_install
 	use doc && dohtml -r docs/build/
 }
 
 src_test() {
-	PYTHONPATH=. "${python}" tests/run.py || die "tests failed"
+	"${python}" tests/run.py || die "tests failed"
 }
+