bump; reset SRC_URI to pypi for this version, drop unused resource hungry dep from...
authorIan Delaney <idella4@gentoo.org>
Sun, 8 Feb 2015 08:58:55 +0000 (08:58 +0000)
committerIan Delaney <idella4@gentoo.org>
Sun, 8 Feb 2015 08:58:55 +0000 (08:58 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

dev-python/pygments/ChangeLog
dev-python/pygments/Manifest
dev-python/pygments/pygments-1.6_p20140324.ebuild [deleted file]
dev-python/pygments/pygments-2.0.2.ebuild [new file with mode: 0644]

index b353667ac31dff8e0bed2b333a0f7944ade85861..7dccfd7f5180541553f26b17ed0d0406ca807656 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pygments
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/ChangeLog,v 1.148 2015/01/05 09:13:16 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/ChangeLog,v 1.149 2015/02/08 08:58:27 idella4 Exp $
+
+*pygments-2.0.2 (08 Feb 2015)
+
+  08 Feb 2015; Ian Delaney <idella4@gentoo.org> +pygments-2.0.2.ebuild,
+  -pygments-1.6_p20140324.ebuild:
+  bump; reset SRC_URI to pypi for this version, drop unused resource hungry dep
+  from test phase, update test phase, rm 1 old
 
   05 Jan 2015; Yixun Lan <dlan@gentoo.org> pygments-2.0.1.ebuild:
   keyword ~arm64, test on board
index d9a73f23189880d691e432cc24f85fffb25e376a..ae362c8fa6d6719620e1676aa44dc755a510994d 100644 (file)
@@ -2,28 +2,19 @@
 Hash: SHA256
 
 DIST Pygments-1.6.tar.gz 1423161 SHA256 799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0 SHA512 552d0c2a1296773a5482122bd5cbec0ce91a497cd86ee105e1c5ddf2bfa9c206fcc7de504c6da480344c6e1bee30d7b26012fd061dcb2091d8b2b21bcd163bf0 WHIRLPOOL babf6e638529a902fab37c17fb1215aca3c04c3e2a00d00bdff7e8049ca6a46c238282c088e79816f7c6879fc9b13e3de9824ae93d3f184f4d9aae58af0c9c8d
+DIST Pygments-2.0.2.tar.gz 3462280 SHA256 7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51 SHA512 b58e2cc535ba3f1fda7cb147e12af128bc2755de56cf465f8f1d642730eaef50c06551cc4cc44f25f726b00f3f1c9c2078977233b11c0b6a7e1add6a4069c27e WHIRLPOOL 4c98134f27dd29c89e4d6157284bdeecaa81c53d823e089292be21a6c418ba4ccfd458ced50326d5a356a7b6cb761a1990440096f5f3d820f776bb19fc0da09d
 DIST pygments-1.6_p20140324.tar.gz 1641814 SHA256 f762d1104ab38a4e870824113e3be3fedc918900622f1e73b9c34386ee7be14a SHA512 de84977f346b41a60a849e681581b36787712d39010e0e23624cc2d9741cb5afbbb0a4e860b5120e3cb77eb5fc68ddf11d0f6c1d15e0bb4d7c56d800017b19bf WHIRLPOOL 7531e7a2483f3c043967d32848694324007c5a1a7e206472a17f5515eb6960dc1bec774851d75bc4ccc4615594db0c5218713da22da6c2d1cbfdf995827746be
 DIST pygments-2.0.1.tar.gz 1641814 SHA256 f762d1104ab38a4e870824113e3be3fedc918900622f1e73b9c34386ee7be14a SHA512 de84977f346b41a60a849e681581b36787712d39010e0e23624cc2d9741cb5afbbb0a4e860b5120e3cb77eb5fc68ddf11d0f6c1d15e0bb4d7c56d800017b19bf WHIRLPOOL 7531e7a2483f3c043967d32848694324007c5a1a7e206472a17f5515eb6960dc1bec774851d75bc4ccc4615594db0c5218713da22da6c2d1cbfdf995827746be
 EBUILD pygments-1.6.ebuild 1453 SHA256 3c4c2025679027cd6549b34469cb134f311d081535ea6105e202c84ca599a359 SHA512 827dc3b1c634091204125236f3c787b85e53599322d482dd322a09517f530798a6a0d0c1679c417e72458f9235ec5500ac9b7cf54e1b69405f1868ca1e09b345 WHIRLPOOL b4685d63ca72e3c5f9245237a185c2a95557ccdb681315c93914d64fda339aaefca4a5864929380a0d15d9ca03d7250f6ca9d17c27359556d3af4aea15b8f468
 EBUILD pygments-1.6_p20140324-r1.ebuild 1971 SHA256 f9814debca0413cbecd9dd965b8242c322e1b50d855948db1cd3eec71d350b2c SHA512 00f5fd982921a71b739632ecf859318595bcfd5776888c2a455c8e7a587f403aa1321829df631b125793e2a1dcba0d5e2ce253008af9d3ba8161c9e152acd8a7 WHIRLPOOL f08896d158902fbd4e0bc569f6123aaed4d588e3ca31d3dc295e2c5510a1fa8b42d805c60b57362f130a422f1c8f952a03e409b60933632be43a6f8cd3440880
-EBUILD pygments-1.6_p20140324.ebuild 1967 SHA256 2923024eba95da86ec5a0e005eaf5f6f93f2b157e8c0a559a518ad2d9dd3fd01 SHA512 d39262ea4f2905c15553610a8d59c80e0a5cd10adcdb9f8035ab3a0891d325662b87bfb14cff4fb6afe99c06d7b57162902ea2f0333fe7d1f476c260e89c98a5 WHIRLPOOL 1c91c50fa9f66d3d0f4c1df79cedaf5ee856ced0248335fa96faffca4c90a1ffbe2fac8c838f620de952a5ef99f353ff5ed286cfe3d1d3fbb4c015648301093b
 EBUILD pygments-2.0.1.ebuild 1934 SHA256 fcd95a55e16d6fe77efa9bbdd46d5a8966ad3ee5e81b1d777f7eb733c75c9a81 SHA512 834fd969c88393c630116ba2404b411b3f3f8bf846048ff424bb445a9b3f8f570ef64dba2c5824bd148db97a3d72bbe1bbf351717f05fbd30272174ee4f4485a WHIRLPOOL b80f3840e93b77c91ea24b8bb3cf180ea964dbc255068c33b2fcd771017590b6186a3672bb0f4cc7a36c478e97b03680afa9baa09059560ed7a284811633764c
-MISC ChangeLog 18642 SHA256 9c6158dd645421d3b90ffd7318ef7cf924afdf98e86e7349a830cb452a3414a8 SHA512 f2a362ca6d70d9e0211f82e2a1fb00fbae7135466a3aa4efaba4cf492214e8c9386a29d18a64070250f9884a50de71b39eb3386ebae48ea4cba0ab6699ae040a WHIRLPOOL b893697d1bdc07e538e2e91a5c62fc16e3b6b1090a44980dc23e3c3c6ab5e67de1b12d7c06a34b495e70ee77f85b8f4e6b11225cc7cca19a8a64614b399be81d
+EBUILD pygments-2.0.2.ebuild 1784 SHA256 2e71de54465b26e674880416034784d8f2aeb2fe0de7fdbcd92d4e992a32b0db SHA512 0883eba53cb8c8d85bc6dac85a7960c52c7fe661efe83e28f1556ed407db4e2367ed734bc2ee11db0bdb06d8b7736f695a3b2873b85b6fca320c4a4575f649d7 WHIRLPOOL ac30f228f93de978b61e938fa09bf66518387ec6702c10e8d46119718a44f3ebcdce84288e7f99ac6abcffdd23b22fd29fc846166a3969fdcdf2844122c42aca
+MISC ChangeLog 18910 SHA256 831b417014e672d5a627882b720aeea0815f63517062dbb46a374f309f287daa SHA512 9611af6665c94b9553c793da343ecaa366ac9a69a2a3c36b4b9a1ea57faaa8713e30dd186f07b536e92665861aca95c231a5d51d3410b1b7fea312786130c20c WHIRLPOOL 8814ccd13ba267c6e28d4b8738fbe74de1e0c782221733e26e7ee5b56e47eb5ad22bd42e4e768a5bf02a4016b1d5e01233cb27f376e28b66c9cc5aead762316e
 MISC metadata.xml 395 SHA256 fa28f657c40a4f24af13aa584d1e103e5d02996a48c135833199c3f62c0d140b SHA512 ab5d25b7e1a8a14097cde99e12c4146c58de8ae581ea8595f497aa085c34437fbc12ff379a26d99bcd43a623152ec84f207cc2abf452f405a0d6209697520401 WHIRLPOOL a83e096d6c89277a1c28e35f595ecf5406f04e30885ba0d0e611f3d9ea36eda5bc175075260e5dabe70d5e2a8b0fb54682234bf9f88c69a13b975cce1838970c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUqlW/AAoJEJIMDbyqvv1VECEQAISmDu86Ka9m6oBDcQUoAJy3
-iK81tmqpsPnyo2LHQYtOGGXDePf062ZWfFs4vhLETVBCwjIqPimpnbzmbmlBUGZ2
-8V2P4GqO0Pc4OH3MsGO2Pilwtso6lQEx7ivNTAaXOhC+CdPqVBYQubtLXZI+kN0U
-POFmmA6xWlI65ytRut9PkWpd4+nq8cWU456mK9V0w+u7Asy6Vxfwgi6cm+X+V5Zl
-Pc+Zlq9ypjUBWaLgmt+NeSFLY63GY6PIW7/FsU6rx2/wAKghANGO6+qxyMKW+yF3
-C3KASw9npPyoU4CHq7LOA7ZZAjVy6ZT9ixQDH6kFXV/wjnm+KrPA1CkNFl2b8R1t
-Dv+EUiGsTmxJXMalnYX4cpbr3JU6HRp9JjkThhMUdwQeLmVHVa7nmh9jOJiYWdnb
-kQ38FbWFpfRfCWXuUrs44seDtRt3fx9ECD4ZqfE54twZkSEMA5R74RZxsURMdaMs
-67lUjLDatM31fX1DxP3V7I95VtRJjvRjd39Fp64iR+7HklMtOmTURR85lmoH2vNv
-8XymgXUFJJ3bmG+Hl/tOZ+DVcG/Co5fzv846dixP+urM5wFLzy6TiiyJt1rHWLC7
-15RqbPH14pxNCx1nZBaHdtpeNjPJ/5ceTqgxl2VqKgilQkw9Ne3svrt4yc860105
-Iq69ODUub+nfOF8UUzYT
-=8czr
+iEYEAREIAAYFAlTXJUQACgkQso7CE7gHKw05kgCfbUPFOs4m3yOc3280uTv1wvNi
+0eIAmgO9CaSWex9QaJ8WnZ77CiHbl+yC
+=ADxE
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygments/pygments-1.6_p20140324.ebuild b/dev-python/pygments/pygments-1.6_p20140324.ebuild
deleted file mode 100644 (file)
index 9b1a66e..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-1.6_p20140324.ebuild,v 1.9 2014/10/31 16:09:05 ago Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
-
-inherit distutils-r1 bash-completion-r1 vcs-snapshot
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ http://pypi.python.org/pypi/Pygments"
-#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-SRC_URI="https://bitbucket.org/birkenfeld/pygments-main/get/b839f47dbb3a10830db7dc3114f0ad4f470bcfa5.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-       test? (
-               dev-python/nose[${PYTHON_USEDEP}]
-               virtual/ttf-fonts
-               dev-texlive/texlive-latexrecommended
-       )"
-
-#S="${WORKDIR}/${MY_P}"
-
-python_compile() {
-       distutils-r1_python_compile
-       if [[ ${EPYTHON} == python3.2 ]]; then
-               # python3.2 does not like u"" literals
-               2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
-       fi
-}
-
-python_compile_all() {
-       use doc && emake -C doc html
-}
-
-python_test() {
-       cp -r -l tests "${BUILD_DIR}"/ || die
-
-       if python_is_python3; then
-               # Notes:
-               #   -W is not supported by python3.1
-               #   -n causes Python to write into hardlinked files
-               2to3 --no-diffs -w "${BUILD_DIR}"/tests/*.py || die
-       fi
-
-       nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-       use doc && local HTML_DOCS=( doc/_build/html/. )
-
-       distutils-r1_python_install_all
-       newbashcomp external/pygments.bashcomp ${PN}
-}
diff --git a/dev-python/pygments/pygments-2.0.2.ebuild b/dev-python/pygments/pygments-2.0.2.ebuild
new file mode 100644 (file)
index 0000000..da6d4e9
--- /dev/null
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-2.0.2.ebuild,v 1.1 2015/02/08 08:58:27 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1 bash-completion-r1 vcs-snapshot
+
+MY_PN="Pygments"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="http://pygments.org/ http://pypi.python.org/pypi/Pygments"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+       test? (
+               dev-python/nose[${PYTHON_USEDEP}]
+               virtual/ttf-fonts )"
+#              dev-texlive/texlive-latexrecommended
+# Removing / commenting out this dep. I can find no mention of it in tests other than
+# importing pygment's own tex module.  If it's there and I missed it just uncomment and re-add
+# Tests pass without it
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+       use doc && emake -C doc html
+}
+
+python_test() {
+       cp -r -l tests "${BUILD_DIR}"/ || die
+       # With pypy3 there is 1 error out of 1556 tests when run as is and
+       # (SKIP=8, errors=1, failures=1) when run with 2to3; meh
+       nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+       use doc && local HTML_DOCS=( doc/_build/html/. )
+
+       distutils-r1_python_install_all
+       newbashcomp external/pygments.bashcomp pygmentize
+}