Drop old; fix tests

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/dev-python/ansi2html/ChangeLog b/dev-python/ansi2html/ChangeLog
index e0e1ff8f587ee8d7ff3cab69e50098ee064a6886..8f7551e80c0b55d874624fd143d5f8500acb1066 100644 (file)
--- a/dev-python/ansi2html/ChangeLog
+++ b/dev-python/ansi2html/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/ansi2html
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ChangeLog,v 1.21 2015/04/02 06:56:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ChangeLog,v 1.22 2015/04/04 12:56:41 jlec Exp $
+
+  04 Apr 2015; Justin Lecher <jlec@gentoo.org> -ansi2html-1.0.6.ebuild,
+  ansi2html-1.0.7.ebuild, ansi2html-1.1.0.ebuild, metadata.xml:
+  Drop old; fix tests
 
 *ansi2html-1.1.0 (02 Apr 2015)
 

diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index 762b1530c6a528b3881255adb1b7f06e09d3c539..29d594ef1d2f2c9bf491856931da674a809d2177 100644 (file)
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,10 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX ansi2html-0.9.1-fix-0-control-code.patch 1002 SHA256 fb61a09cc668ca074baf8a677da5c0a8224239107bf721701080f7d4b80e510a SHA512 59197d9d762f9726669eb26b7699990b475284324c27e4ea29e9162d180e038a2909bf47a6f4d2c69e460b20799faa1a478ea2dc099fe3b3c0e91a8224022b36 WHIRLPOOL 308a8fc6d1fd9a796cc24cc536aff5e622ad1998d4caf18392d740299847426a73ec87ea87007516b0dcc67cd3e95af78157590d61f475948261fbb97dcf5536
 AUX ansi2html-0.9.1-fix-sys-argv-in-tests.patch 984 SHA256 57dcd3318a85afa618535870ced78291ad4c183b4d5d105f2d8e81bd3da40859 SHA512 3885a02e281a6d70f85d828abaa6430b5c1d729892da140576c1b9959582d537f8c968be72e71b95e09a205159289e260d6cec9c0b778f89370f09e0c006a068 WHIRLPOOL 22d5388a0842b3de27f905a0b94f598746032787500a7bf4c2ac7d0863b6597a10a4d9da9704b6d95f426263ad08a33af8ca1280c098f99e473f8a2c0e75fc90
-DIST ansi2html-1.0.6.tar.gz 51701 SHA256 5e929c1817d8f33a63c5245eab2553fd45b453aa4dbb2fd8f674642231fc652d SHA512 ab05b789fe2d7c7333766e461f476cb534b7b9265c1eea2b80d07ae32f1896bd0a033d1deae4244036db6a8064c195221849dc76c6d51dd2d4075684acb77e02 WHIRLPOOL a29914fa9d982ae1c7fdc4eaa7284c676df53df2b27f38693aafad69790a9f726e7d2fa9c6affd16d4fc58f645f52ae162c007d9660d20f8c0a8c105b19a29e7
 DIST ansi2html-1.0.7.tar.gz 52307 SHA256 fcc732e4d10627f8060921c54c751ff181a098ceccd116311b4c6e26ec2ea5cd SHA512 75f6601315e47ec5fbd28fb360316e55f8204cf81f9ed9f6374318436b04b1baf86b556885a5a9a1f67a3495357b89d74ad23d3b0680817c09b5d9e82eb4c1f6 WHIRLPOOL 47834d7efc2fe475d2d588b73fc3dd641c37147e574d0ef4e57c997f3a090eb3da8d73aa6f2ad02479d32a82b55fd0c6dc45a4e8593d6598086bed71c3486df2
 DIST ansi2html-1.1.0.tar.gz 51514 SHA256 537fc4ececf872f83d5cbd218fb64bb49304d258487e283736bb9e5e64319ad3 SHA512 2121c91c821a89d63fcb6c27a8a088968a150a447c5c2a270b781aabd19e07387e59bc1c291e818569c4bafe495c2d3d2c2c6f172406fa830467e3ad541e3e21 WHIRLPOOL db8292f3ebd434a3507ea4f55c32c80e62bbe06a80f9baf2d21089ae27b6a3365cea1e9be4d16d9ed050d01402bdccfad477a8c7b5d19004fa6d250f87d9a6a9
-EBUILD ansi2html-1.0.6.ebuild 901 SHA256 2d008f2dcdfa96d437879dfcfed599fecd96dabe4f05b1ea93db8c0d15b2276a SHA512 f899ea0440215636d9b43e945344808a7893356272e4badda929b6d99229bee485a28b7116680e4fa1c4d6fd7fae163dc683b24ea26fb0f368d2d29777ced1aa WHIRLPOOL c439ae11be8a6573e94d1c047944fe1f4212e5c920d9e4c96820e530690df4d86e06d072891ea20decaa5043835266684206771e997e0cb87a31a2c68bcf745c
-EBUILD ansi2html-1.0.7.ebuild 988 SHA256 03956a59985d5af4b46b2156af44649f238502acfe8b41bbf83e8c24207ac1ca SHA512 7a028dff5210d93a9f784a0c76ac62a228149168abe27e586999263ed21d10ff1f0326b56056cb73344d799bae3dcb5325b9d3607b62e462429458fc82af4b56 WHIRLPOOL 8c5eb62435465d2a5e238b760945d2d462f9e85533d79288234d0082ec74561e8dfd7a5ac7972e89ee78ebd460988ab5cf4f0457899e3229243519345ab2be47
-EBUILD ansi2html-1.1.0.ebuild 992 SHA256 66a0500657e3a6e37cb39b938d8fd68075c05454a4f957befa1c0545d43f9614 SHA512 86513b2b3f7bff250237070a0f34c0618c917e2bbdd85634deb957bd44e0b6e7b4504494c871f4c6e7f236153f0dbe81baaec15fad11ba04217f1dbe341ed572 WHIRLPOOL 4d912d2aadca0001857d6315b7ef1bd43670206fb40804f4cf8335b0054877c09417ebc239bebca8f5d725c9a1ba16601229f4bc84e1542a344be2ca874c4a60
-MISC ChangeLog 3386 SHA256 99126e3993c47c45f296e98ac7977160218963e26466d5ebf2e99f9137f14db6 SHA512 869f10d5d971848078b2fde037cd7fd8938a8b1eac2b2fdabd3d128141df724128e699033096b73dd41f711cf1c7b2acd547deb0f3f9f7163bf7f91029d0722d WHIRLPOOL 3cb7e8240d202a965411b5790d5c182e44c29042ec1308550c1694d867a527e4a4f323c85aebc5274f3977352c43638bcf665552dd47ba8ef378d8b484a94c2e
-MISC metadata.xml 387 SHA256 3bcb186ee4c6c2a936b400b3844218679a02497e2a91649c94998176fe7037cf SHA512 924f144f65f5444871fcad06f819b9e75a2590db1abff14f97a83b7e5efcaaf8b66ddb2cf78d39582975e86ba55b7dc5fbcf3cb39a901ce97f3b677af9c3f0e3 WHIRLPOOL 543223b42cbb7124690e0690d6a9502b386ae9d181150b0c03994be91eb03b77aec32f5782dc8dfca820de2ace7fa4ebf39af04e82ba95b329946a19c818d1b9
+EBUILD ansi2html-1.0.7.ebuild 996 SHA256 e51ce8511997b3089544815dc8f40aeac111a1fa3d7520d1df86bae9d4d34bfc SHA512 13acb1851a0640a8050acd43c6e6800501a40b1d78eca662849ee77faa1e214f5b467aa00066f0bc725daecae05d8f4cfc534be552c028803a1b69dd62eec0c1 WHIRLPOOL dc1e78bd9b2e213c197ae03475282346b99dfc638de97ba5b63add2da89bfb6ae02d91d6374d0f915d1dd2e8f59376c117781c546bb854cdb2b8e971889c26bb
+EBUILD ansi2html-1.1.0.ebuild 974 SHA256 01063e3b447adaf33ce532174456bc2e716698b2ddbe2cb946713f71eef08d44 SHA512 a7f05188859bf356f1d9433451a23197f739cf78477c4c0b04adadbf236c14dc24b199c9a42ea97146d048614de1d5e8b500062818c6453614666d2b3e476f26 WHIRLPOOL bc10cefe087a27097ace5c1d4dd38822be3c2284184283e72e62a382f7d343adf407eeea67f94cbe0c1d1c4271707abbaa18131050040d1d215849dc1cf5e9d9
+MISC ChangeLog 3542 SHA256 aca56d95c0da7d08e5d9b02964e8b709cbad0f59841fc492b61994ba80e631ab SHA512 88a9f9104c1776ecc9b98a04d7272928c06adaaced872878269a9938f98b496c011becf62e3a483472667dc5aab201ef578b6ae4eaea16decf619c8933b8370b WHIRLPOOL f02838c7e3e21cbc1716c3fa427b6901fe327c54319ade6ba2eab9ece8591f35414b5d4c41ba33df4e57d53e3b23d667b0534a644a8c1c08f72d2c4994c30a78
+MISC metadata.xml 400 SHA256 a969ca8c45f6e58766a6c0df695d238ee99d32d3e67c64019284556e5f34e0f1 SHA512 94c877a8248129200772660c92b4e78cf153aa66219337313aa47aea9d46606c0a7cdef57cfdda7c540792032de63bdae69658fdd728e31c53834d018c0fa703 WHIRLPOOL a8a9e326a1f05bad2fa16de79472def3c0da663a1aacf5d89959f2204d5c7b9239c65240d64d34aec1a7a9d82a62a74a5bf4c7d6ffe813ce889ffabd9f4b645e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVH9+PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirUsUP/jun1qdRjECWMNKi/lfiOWd3
+kV8qpM1UXrvVF1s7szyvHBz6wEzuZcQq6RngMvZzt9X2NeRO/rzowD0fo/nlqNjv
+LLQSrJF1boK8DHUXmReFAg0FgsAZbGsRCoXFxckF2f7vFv0BVGBbYbLcvrE+r1rq
+n9hXVAlLCG40aIUVZWRm6Hi/STSXbkgVIhyIr682SidoJIa1qX1xIkd206U+RyCN
+PwhblxG7Tgu/ceNximBDBD5thgUrxouhBUYiZct69GVqLZqTAbCg0OGToQ5CrrMY
+3FGfPUvb4OdDGfdpN3D68qfu8GBY1MTk1sEyDUWbCyCVEdxeiltE8M1ZQa9UEMGC
+UfX8KyukwIyS7lFi+z62ECUaxf9UhvlEIetZ4Rg0fbZRaRfMOofPMuqQMDv74W5T
+8ih5BTllPNp7u4EL2/3CxPPOPsQwuPJNqXdW9NTWzrJsKwu022ar1raXRMTAJoZ1
+EshgOCotBd+cwr4+vbtNsNpBZDWY4L2wQTBXRHSJThp4sGX8JXYG9Kr2QpNGT8pn
+uCUtaMXqUtZgjXjJE6AyLUHhwZy5cwIjNW9S+rWsi435ynDd42IDvo8iKaGV90NW
+16R9KeU1TQ0QhhlXnGqm4mmao//hzKwuulGM6HRLPGiqEAJ5r+pz1+NAvF/Jyl6J
+86pb5x6Wg4U3z+EanJLr
+=2kFH
+-----END PGP SIGNATURE-----

diff --git a/dev-python/ansi2html/ansi2html-1.0.6.ebuild b/dev-python/ansi2html/ansi2html-1.0.6.ebuild
deleted file mode 100644 (file)
index 1c63699..0000000
--- a/dev-python/ansi2html/ansi2html-1.0.6.ebuild
+++ /dev/null
@@ -1,32 +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/ansi2html/ansi2html-1.0.6.ebuild,v 1.2 2014/03/31 20:48:37 mgorny Exp $
-
-EAPI=5
-
-# ordereddict is need for < 2.7, but it's not packaged (yet)
-PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="http://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-       test? (
-               dev-python/nose[${PYTHON_USEDEP}]
-               dev-python/mock[${PYTHON_USEDEP}]
-       )
-       dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-       nosetests -w tests \
-               || die "Tests fail with ${EPYTHON}"
-}

diff --git a/dev-python/ansi2html/ansi2html-1.0.7.ebuild b/dev-python/ansi2html/ansi2html-1.0.7.ebuild
index b6600f50bbb8476f091ad6544011d8458d689aa6..d9034d210bc0e72ba04a1d55a3371aca8f082110 100644 (file)
--- a/dev-python/ansi2html/ansi2html-1.0.7.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-1.0.7.ebuild,v 1.3 2015/03/08 23:38:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-1.0.7.ebuild,v 1.4 2015/04/04 12:56:41 jlec Exp $
 
 EAPI=5
 
@@ -25,7 +25,9 @@ DEPEND="test? ( ${RDEPEND}
        dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-       nosetests -w tests || die "Tests fail with ${EPYTHON}"
+       chmod -x "${S}"/tests/* || die
+       esetup.py check
+       esetup.py test
 }
 
 python_install_all() {

diff --git a/dev-python/ansi2html/ansi2html-1.1.0.ebuild b/dev-python/ansi2html/ansi2html-1.1.0.ebuild
index edd1fb068d8ff6881b0d5a21f72b8ba3b25e76ae..ccfce6106dd3dc5e814fb7674c3e13956d5d1b95 100644 (file)
--- a/dev-python/ansi2html/ansi2html-1.1.0.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.1.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-1.1.0.ebuild,v 1.1 2015/04/02 06:56:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-1.1.0.ebuild,v 1.2 2015/04/04 12:56:41 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
 
 inherit distutils-r1
 
@@ -17,15 +17,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
+RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
+DEPEND="
+       test? (
+               ${RDEPEND}
                dev-python/nose[${PYTHON_USEDEP}]
-               $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+               dev-python/mock[${PYTHON_USEDEP}]
        )
        dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-       nosetests -w tests || die "Tests fail with ${EPYTHON}"
+       chmod -x "${S}"/tests/* || die
+       esetup.py check
+       esetup.py test
 }
 
 python_install_all() {

diff --git a/dev-python/ansi2html/metadata.xml b/dev-python/ansi2html/metadata.xml
index 1ed75497fc761b58a742be5419cfee3390ae64d8..3936c4a0cc8476f58a4216966943b6bd00418f40 100644 (file)
--- a/dev-python/ansi2html/metadata.xml
+++ b/dev-python/ansi2html/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-       <herd>python</herd>
-       <maintainer>
-               <email>sping@gentoo.org</email>
-               <name>Sebastian Pipping</name>
-       </maintainer>
-       <upstream>
-               <remote-id type="pypi">ansi2html</remote-id>
-               <remote-id type="github">ralphbean/ansi2html</remote-id>
-       </upstream>
+  <herd>python</herd>
+  <maintainer>
+    <email>sping@gentoo.org</email>
+    <name>Sebastian Pipping</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">ansi2html</remote-id>
+    <remote-id type="github">ralphbean/ansi2html</remote-id>
+  </upstream>
 </pkgmetadata>