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.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 i686)

5 files changed, 47 insertions, 40 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/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"
 }
+