Version bump.

Package-Manager: portage-14273-svn/cvs/Linux x86_64

4 files changed, 12 insertions, 67 deletions

diff --git a/dev-python/pygments/ChangeLog b/dev-python/pygments/ChangeLog
index dd0588ed34ae..68b8beb438bb 100644
--- a/dev-python/pygments/ChangeLog
+++ b/dev-python/pygments/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pygments
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/ChangeLog,v 1.37 2009/09/12 21:49:10 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/ChangeLog,v 1.38 2009/09/15 20:21:58 arfrever Exp $
+
+*pygments-1.1.1 (15 Sep 2009)
+
+  15 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -pygments-1.0-r1.ebuild, -pygments-1.1.ebuild, +pygments-1.1.1.ebuild:
+  Version bump.
 
 *pygments-1.1 (12 Sep 2009)
 
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 4a1a4a164ff9..574c8bc63760 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,7 +1,6 @@
 DIST Pygments-1.0.tar.gz 930751 RMD160 aa9d4816bb1bd1b67a5e6ac0f94d9ae3410df71b SHA1 b71e33147fc402e361227b30e1f589eecafd42a7 SHA256 bbd1e8661e674b359a1717f13bfa9b2ff84991469b4fc3c1fa5c4d78b40766ff
-DIST Pygments-1.1.tar.gz 980624 RMD160 a34e92efcaf18a59666baeed00dbbfe66c7ebc50 SHA1 b1f911f8645fbe32c87487cad297c5fb31f261d6 SHA256 eb049f059447721d4f84bc917eaa25310fdeb50fcb35a0650f223a4f4553e830
-EBUILD pygments-1.0-r1.ebuild 1550 RMD160 ebe233d25c1a248b03419370385fd885ca2dc9df SHA1 7763623030dcab1255e60ea8b7a6aa4c17963571 SHA256 74ede716a7bf446ce763199f27e4aa661391d78f299578b4a194a544319e78a9
+DIST Pygments-1.1.1.tar.gz 986513 RMD160 e684a09c40575fa4c440ae7bba34e131ef93dc31 SHA1 383fdffd0dd1edfe2e46c0d2d14340b63966a2cf SHA256 2c5abb4b0bd22bd5a759a46b07d60845a19ed36e07359cf47fb22a206d181b8f
 EBUILD pygments-1.0.ebuild 1454 RMD160 17f72e3b570df89059de85cbd28df062b2f436a4 SHA1 52a60bd4de7f0396ff55390f73c4e9d5b540ec00 SHA256 7e4f11278b546c3d4da35118edc26ba5652bd468291dbaddfa3383c90afdf222
-EBUILD pygments-1.1.ebuild 1491 RMD160 992db7a49787038cef37ecc02ce24f22d8ed15e1 SHA1 02aa0d9f7788823c30514cca6c83893aa74eff7b SHA256 84594680e6ebf01bd387f57098e80f3ddf3f7c69f3b6dc6fbafdaa10b5185464
-MISC ChangeLog 5243 RMD160 9554dc3dd8bfabe8037bdc45d9f2c8abef617c7e SHA1 c4b9c738b8bac3095097e8ffe5e7adbe880cd183 SHA256 a1e3d314eb2dc1af400d21ff17c81da9dcbd9be867934b860a17faf711e1274a
+EBUILD pygments-1.1.1.ebuild 1487 RMD160 24c728a68351ce256c02bb31bc4c643cdc036511 SHA1 045cf3ec821a53726a810f4b615e223f3c4948c5 SHA256 86ee27ec8831210fec5bae23a382a010a2caff371f7b0f62833e92acff3f7306
+MISC ChangeLog 5437 RMD160 7d4c9559cae2e6cee1bc59f097064dbab26500a5 SHA1 ebf827784ae4334777dcd5abde4c3116a46e91cc SHA256 f854ba7254b5e062157e53122a17b5f90ba043eaf3061046598f739214f857e5
 MISC metadata.xml 324 RMD160 e99bd87525fcbccf3a5b10eae160832ae26a013c SHA1 330d20ed94f6607bb7293f935789dcf3f1151cc7 SHA256 83404c337ddbe4445d64859a64e352d02b7e3fd9929e4a265c06880d7938da3e
diff --git a/dev-python/pygments/pygments-1.0-r1.ebuild b/dev-python/pygments/pygments-1.0-r1.ebuild
deleted file mode 100644
index 7688f24a478d..000000000000
--- a/dev-python/pygments/pygments-1.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-1.0-r1.ebuild,v 1.1 2009/08/10 22:36:00 arfrever Exp $
-
-EAPI="2"
-
-NEED_PYTHON="2.3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE="doc test"
-
-DEPEND="test? ( media-fonts/ttf-bitstream-vera
-		dev-python/nose	)"
-RDEPEND="dev-python/setuptools"
-
-RESTRICT_PYTHON_ABIS="3*"
-
-S="${WORKDIR}/${MY_P}"
-DOCS="CHANGES"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# 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 -e "s/import pygments/sys.path.insert(0, '.');import pygments/" -i tests/run.py || die "sed failed"
-	fi
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" tests/run.py
-	}
-	python_execute_function testing
-}
-
-src_install(){
-	distutils_src_install
-	use doc && dohtml -r docs/build/
-}
diff --git a/dev-python/pygments/pygments-1.1.ebuild b/dev-python/pygments/pygments-1.1.1.ebuild
index 0de3aca66ee9..84191891c3d8 100644
--- a/dev-python/pygments/pygments-1.1.ebuild
+++ b/dev-python/pygments/pygments-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-1.1.ebuild,v 1.1 2009/09/12 21:49:10 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-1.1.1.ebuild,v 1.1 2009/09/15 20:21:58 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
 
 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"
+SRC_URI="http://pypi.python.org/packages/source/P/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"