Version bump, removed old version.

Package-Manager: portage-2.1.2.8

8 files changed, 45 insertions, 132 deletions

diff --git a/dev-python/pygments/ChangeLog b/dev-python/pygments/ChangeLog
index 45a8c8058922..19e903f8a5be 100644
--- a/dev-python/pygments/ChangeLog
+++ b/dev-python/pygments/ChangeLog
@@ -1,6 +1,17 @@
 # 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.2 2007/05/05 08:11:21 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/ChangeLog,v 1.3 2007/05/30 17:17:37 pythonhead Exp $
+
+*pygments-0.8 (30 May 2007)
+
+  30 May 2007; Rob Cakebread <pythonhead@gentoo.org>
+  -files/pygments-0.7.1-_mapping.py-ebuild.patch,
+  -files/pygments-0.7.1-html_formatter.patch,
+  -files/pygments-0.7.1-other.py-ebuild.patch,
+  +files/pygments-0.8-_mapping.py-ebuild.patch,
+  +files/pygments-0.8-other.py-ebuild.patch, -pygments-0.7.1.ebuild,
+  +pygments-0.8.ebuild:
+  Version bump, removed old version.
 
   05 May 2007; Lukasz Strzygowski <lucass@gentoo.org> pygments-0.7.1.ebuild:
   Minor cleanup. Keyworded ~amd64 (bug #176459).
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index b9bb19a01a46..6a3f8c900481 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,38 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pygments-0.7.1-_mapping.py-ebuild.patch 1043 RMD160 684881215c8be4af0b9568d4459105b56cc16f6d SHA1 7865e6fe854169ee588549e936b3d583102a6256 SHA256 d223874c43fb62171908a1a222328ac688357b760567e3739cc4fa31995ead5f
-MD5 f4c1df65543ec79c9b9506a5d8a8b00b files/pygments-0.7.1-_mapping.py-ebuild.patch 1043
-RMD160 684881215c8be4af0b9568d4459105b56cc16f6d files/pygments-0.7.1-_mapping.py-ebuild.patch 1043
-SHA256 d223874c43fb62171908a1a222328ac688357b760567e3739cc4fa31995ead5f files/pygments-0.7.1-_mapping.py-ebuild.patch 1043
-AUX pygments-0.7.1-html_formatter.patch 3196 RMD160 4e5e43356a457e58f49085ac26af8aeb3f571d1a SHA1 1775516adf17d8fcead0de9bb2248f0abf881b88 SHA256 14bad70101fc4c225a2626a0459a3929d447d9033e32e37895baff0572da2ff9
-MD5 37a210e6df740c2edbab2b9fe2e59148 files/pygments-0.7.1-html_formatter.patch 3196
-RMD160 4e5e43356a457e58f49085ac26af8aeb3f571d1a files/pygments-0.7.1-html_formatter.patch 3196
-SHA256 14bad70101fc4c225a2626a0459a3929d447d9033e32e37895baff0572da2ff9 files/pygments-0.7.1-html_formatter.patch 3196
-AUX pygments-0.7.1-other.py-ebuild.patch 350 RMD160 967b38bf2b6969cd9bf311f0542b97fa07dfff93 SHA1 68bd75593271e46b28bd961ee0bdb59d03f615df SHA256 a81336c004cc000b247f88836fe9e8cfdcb056269ca1e3c729b0b57ce93121ad
-MD5 010c3d12aab4183773a9ce3076561883 files/pygments-0.7.1-other.py-ebuild.patch 350
-RMD160 967b38bf2b6969cd9bf311f0542b97fa07dfff93 files/pygments-0.7.1-other.py-ebuild.patch 350
-SHA256 a81336c004cc000b247f88836fe9e8cfdcb056269ca1e3c729b0b57ce93121ad files/pygments-0.7.1-other.py-ebuild.patch 350
-DIST Pygments-0.7.1.tar.gz 664696 RMD160 5bf587c4496ff5330d16e1c73265d653b6ddf9b5 SHA1 740de095ce71d1b36a72b2df98207a22ead57690 SHA256 932866bde0019c370c36232d877c223a5f1d275c3161806552cb123d6f5d3638
-EBUILD pygments-0.7.1.ebuild 1245 RMD160 6f479420a540c4304fc3ed21b64ae786a3957b7e SHA1 1d0551f9134bf9628aa241d870643610ab110be7 SHA256 4a548c000ff13e51173890d4dee926b8a6325d76ef5c48be64a85bc73a04f103
-MD5 b4e6f2a442bc56b30b71efc70842d90a pygments-0.7.1.ebuild 1245
-RMD160 6f479420a540c4304fc3ed21b64ae786a3957b7e pygments-0.7.1.ebuild 1245
-SHA256 4a548c000ff13e51173890d4dee926b8a6325d76ef5c48be64a85bc73a04f103 pygments-0.7.1.ebuild 1245
-MISC ChangeLog 676 RMD160 7a287978e1a6dc13e9b9254ab1286418290c8d4c SHA1 813335477fa2d57f46bcc08c7fe16c892e5aabfe SHA256 d42fc56115b47c670fcd27d2f42a7b1a30026a49fdd5450f7098aa9444fd0d85
-MD5 6f511c2c3c698ce0bf8721adef8eda19 ChangeLog 676
-RMD160 7a287978e1a6dc13e9b9254ab1286418290c8d4c ChangeLog 676
-SHA256 d42fc56115b47c670fcd27d2f42a7b1a30026a49fdd5450f7098aa9444fd0d85 ChangeLog 676
+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
+SHA256 d223874c43fb62171908a1a222328ac688357b760567e3739cc4fa31995ead5f files/pygments-0.8-_mapping.py-ebuild.patch 1043
+AUX pygments-0.8-other.py-ebuild.patch 350 RMD160 967b38bf2b6969cd9bf311f0542b97fa07dfff93 SHA1 68bd75593271e46b28bd961ee0bdb59d03f615df SHA256 a81336c004cc000b247f88836fe9e8cfdcb056269ca1e3c729b0b57ce93121ad
+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.tar.gz 708369 RMD160 3373f31e4eb84bd2bc49ca4258123f3055aa9fcf SHA1 c529bd06f54cf3b8832eb56003b48021c04b5032 SHA256 a7765be5d7130dfe3965f145274e1cf7264e68ef5316273c155bf0d8637dc770
+EBUILD pygments-0.8.ebuild 1012 RMD160 c4ed66d3143a0579db4eceb39be7bb9f62a3823e SHA1 72975f886f30e7a0a6a3e88f9b6d72c1fc123548 SHA256 b1de3cc7d15cda8e44b97c8156baeb78da45f5ea1376819752a1932ebfb25790
+MD5 f1bff49b255175c7734ac5fc2166099e pygments-0.8.ebuild 1012
+RMD160 c4ed66d3143a0579db4eceb39be7bb9f62a3823e pygments-0.8.ebuild 1012
+SHA256 b1de3cc7d15cda8e44b97c8156baeb78da45f5ea1376819752a1932ebfb25790 pygments-0.8.ebuild 1012
+MISC ChangeLog 1084 RMD160 f0d7a493407716416921c4f2c2e17c456ec5ca5f SHA1 0a331538f04fe728c0ef2e574c8fd3255efbd737 SHA256 754ea8d3207b677ca24a8f220f7ecb2c28ff0dc3a337ed5fbc7e723846d4fc45
+MD5 ddf6fa8d27571d2b3cf91d9d29000590 ChangeLog 1084
+RMD160 f0d7a493407716416921c4f2c2e17c456ec5ca5f ChangeLog 1084
+SHA256 754ea8d3207b677ca24a8f220f7ecb2c28ff0dc3a337ed5fbc7e723846d4fc45 ChangeLog 1084
 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 79d62f4dcc90b31eac8cc4a8ed996054 files/digest-pygments-0.7.1 244
-RMD160 6f7fda0f129385cdd4ddbb61861a479f0addd7f4 files/digest-pygments-0.7.1 244
-SHA256 8f19e938f346b5b99fd1dc5fff933e7548c593edb0d24db8e37d925277c13dda files/digest-pygments-0.7.1 244
+MD5 6e943c0c8d96d6d787154b59b72dc533 files/digest-pygments-0.8 238
+RMD160 6f50ecf9e5a92b097f92cd31a4ee28fb389c7238 files/digest-pygments-0.8 238
+SHA256 e7eb81b9dc9a676128cde88b5e0855dc6310a05f5ca0639127ccfbbe05ecbd82 files/digest-pygments-0.8 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGPDw52jLqHNfbg2URArDEAJ9cvKrwLfRCU4glbeEow3m3S6OyRgCgqTHD
-PeDL/UZ77wOSaRacjY06Gl4=
-=Fk3X
+iD8DBQFGXbG/96cFzIajWwkRArjjAKDTaEG/9X+cTthd0Bvoyz9HMb0mVQCeJVP7
+U9gO5y1dobnrtWgq/vgmIkI=
+=vdYg
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygments/files/digest-pygments-0.7.1 b/dev-python/pygments/files/digest-pygments-0.7.1
deleted file mode 100644
index 43b4d28f17fb..000000000000
--- a/dev-python/pygments/files/digest-pygments-0.7.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8b5b50fb53ce39f94dbcf7040c0a441a Pygments-0.7.1.tar.gz 664696
-RMD160 5bf587c4496ff5330d16e1c73265d653b6ddf9b5 Pygments-0.7.1.tar.gz 664696
-SHA256 932866bde0019c370c36232d877c223a5f1d275c3161806552cb123d6f5d3638 Pygments-0.7.1.tar.gz 664696
diff --git a/dev-python/pygments/files/digest-pygments-0.8 b/dev-python/pygments/files/digest-pygments-0.8
new file mode 100644
index 000000000000..b7cce0704235
--- /dev/null
+++ b/dev-python/pygments/files/digest-pygments-0.8
@@ -0,0 +1,3 @@
+MD5 037b8f65d36b8f283d135dac17ec1bf8 Pygments-0.8.tar.gz 708369
+RMD160 3373f31e4eb84bd2bc49ca4258123f3055aa9fcf Pygments-0.8.tar.gz 708369
+SHA256 a7765be5d7130dfe3965f145274e1cf7264e68ef5316273c155bf0d8637dc770 Pygments-0.8.tar.gz 708369
diff --git a/dev-python/pygments/files/pygments-0.7.1-html_formatter.patch b/dev-python/pygments/files/pygments-0.7.1-html_formatter.patch
deleted file mode 100644
index 8ddb6e8610c6..000000000000
--- a/dev-python/pygments/files/pygments-0.7.1-html_formatter.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Index: /pygments/trunk/tests/test_html_formatter.py

-===================================================================

---- tests/test_html_formatter.py (revision 2849)

-+++ tests/test_html_formatter.py (revision 2850)

-@@ -94,2 +94,16 @@

- 

-         os.unlink(pathname)

-+

-+    def test_get_style_defs(self):

-+        fmt = HtmlFormatter()

-+        sd = fmt.get_style_defs()

-+        self.assert_(sd.startswith('.'))

-+        

-+        fmt = HtmlFormatter(cssclass='foo')

-+        sd = fmt.get_style_defs()

-+        self.assert_(sd.startswith('.foo'))

-+        sd = fmt.get_style_defs('.bar')

-+        self.assert_(sd.startswith('.bar'))

-+        sd = fmt.get_style_defs(['.bar', '.baz'])

-+        fl = sd.splitlines()[0]

-+        self.assert_('.bar' in fl and '.baz' in fl)

-Index: /pygments/trunk/pygments/formatters/html.py

-===================================================================

---- pygments/formatters/html.py (revision 2839)

-+++ pygments/formatters/html.py (revision 2850)

-@@ -182,4 +182,6 @@

-     `cssclass`

-         CSS class for the wrapping ``<div>`` tag (default: ``'highlight'``).

-+        If you set this option, the default selector for `get_style_defs()`

-+        will be this class.

- 

-     `cssstyles`

-@@ -314,10 +316,12 @@

-                 c2s[name] = (style[:-2], ttype, len(ttype))

- 

--    def get_style_defs(self, arg=''):

--        """

--        Return CSS style definitions for the classes produced by the

--        current highlighting style. ``arg`` can be a string of selectors

--        to insert before the token type classes.

--        """

-+    def get_style_defs(self, arg=None):

-+        """

-+        Return CSS style definitions for the classes produced by the current

-+        highlighting style. ``arg`` can be a string or list of selectors to

-+        insert before the token type classes.

-+        """

-+        if arg is None:

-+            arg = ('cssclass' in self.options and '.'+self.cssclass or '')

-         if isinstance(arg, basestring):

-             args = [arg]

-@@ -326,7 +330,9 @@

- 

-         def prefix(cls):

-+            if cls:

-+                cls = '.' + cls

-             tmp = []

-             for arg in args:

--                tmp.append((arg and arg + ' ' or '') + '.' + cls)

-+                tmp.append((arg and arg + ' ' or '') + cls)

-             return ', '.join(tmp)

- 

-@@ -343,5 +349,5 @@

-                 text_style = ' ' + self.class2style[self.ttype2class[Text]][0]

-             lines.insert(0, '%s { background: %s;%s }' %

--                         (arg, self.style.background_color, text_style))

-+                         (prefix(''), self.style.background_color, text_style))

-         return '\n'.join(lines)

- 

-Index: /pygments/trunk/CHANGES

-===================================================================

---- CHANGES (revision 2844)

-+++ CHANGES (revision 2850)

-@@ -1,4 +1,12 @@

- Pygments changelog

- ==================

-+

-+Version 0.8

-+-----------

-+(codename to be selected, released Apr XX, 2007)

-+

-+- The `get_style_defs` method of HTML formatters now uses the `cssclass`

-+  option as the default selector if it was given.

-+

- 

- Version 0.7.1

diff --git a/dev-python/pygments/files/pygments-0.7.1-_mapping.py-ebuild.patch b/dev-python/pygments/files/pygments-0.8-_mapping.py-ebuild.patch
index 0b4a7d5e0fc6..0b4a7d5e0fc6 100644
--- a/dev-python/pygments/files/pygments-0.7.1-_mapping.py-ebuild.patch
+++ b/dev-python/pygments/files/pygments-0.8-_mapping.py-ebuild.patch
diff --git a/dev-python/pygments/files/pygments-0.7.1-other.py-ebuild.patch b/dev-python/pygments/files/pygments-0.8-other.py-ebuild.patch
index e988a11577c6..e988a11577c6 100644
--- a/dev-python/pygments/files/pygments-0.7.1-other.py-ebuild.patch
+++ b/dev-python/pygments/files/pygments-0.8-other.py-ebuild.patch
diff --git a/dev-python/pygments/pygments-0.7.1.ebuild b/dev-python/pygments/pygments-0.8.ebuild
index da79c7eff790..6b09208e1d4f 100644
--- a/dev-python/pygments/pygments-0.7.1.ebuild
+++ b/dev-python/pygments/pygments-0.8.ebuild
@@ -1,13 +1,12 @@
 # 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.7.1.ebuild,v 1.2 2007/05/05 08:11:21 lucass Exp $
-
-NEED_PYTHON=2.3
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-0.8.ebuild,v 1.1 2007/05/30 17:17:37 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/"
@@ -16,21 +15,16 @@ LICENSE="BSD"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="doc"
-
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 PYTHON_MODNAME="pygments"
 DOCS="CHANGES"
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
-
-	#Patch from upstream trunk, can be removed in 0.8 bump
-	epatch "${FILESDIR}"/${P}-html_formatter.patch || die "Patch failed"
-
+	cd ${S}
 	#Gentoo patches to make lexer recognize ebuilds as bash input
-	epatch "${FILESDIR}"/${P}-other.py-ebuild.patch || die "Patch failed"
-	epatch "${FILESDIR}"/${P}-_mapping.py-ebuild.patch || die "Patch failed"
+	epatch ${FILESDIR}/${P}-other.py-ebuild.patch || die "Patch failed"
+	epatch ${FILESDIR}/${P}-_mapping.py-ebuild.patch || die "Patch failed"
 }
 
 src_install(){
@@ -39,7 +33,5 @@ src_install(){
 }
 
 src_test() {
-	#Doesn't play nicely in portage sandbox, check if fixed in 0.8
-	rm tests/test_html_formatter.py
 	PYTHONPATH=. "${python}" tests/run.py || die "tests failed"
 }