From 09eedcfcb879e02a03cbace81b3b6da1f4f103cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tiziano=20M=C3=BCller?= Date: Sat, 6 Jan 2007 21:19:11 +0000 Subject: [PATCH] Fixed several issues (tests, modname, dependencies) Package-Manager: portage-2.1.2_rc4-r1 --- dev-python/utidylib/ChangeLog | 8 +++-- dev-python/utidylib/Manifest | 28 ++++++++++------- dev-python/utidylib/files/digest-utidylib-0.2 | 2 ++ .../files/utidylib-0.2-fix_tests.patch | 31 +++++++++++++++++++ dev-python/utidylib/utidylib-0.2.ebuild | 17 +++++----- 5 files changed, 63 insertions(+), 23 deletions(-) create mode 100644 dev-python/utidylib/files/utidylib-0.2-fix_tests.patch diff --git a/dev-python/utidylib/ChangeLog b/dev-python/utidylib/ChangeLog index 67f8c3a07e4e..9edb1aa08345 100644 --- a/dev-python/utidylib/ChangeLog +++ b/dev-python/utidylib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/utidylib -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/utidylib/ChangeLog,v 1.4 2006/10/15 12:54:37 tcort Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/utidylib/ChangeLog,v 1.5 2007/01/06 21:19:11 dev-zero Exp $ + + 06 Jan 2007; Tiziano Müller + +files/utidylib-0.2-fix_tests.patch, utidylib-0.2.ebuild: + Fixed several issues (tests, modname, dependencies) 15 Oct 2006; Thomas Cort utidylib-0.2.ebuild: Added ~amd64 keyword wrt Bug #147370. diff --git a/dev-python/utidylib/Manifest b/dev-python/utidylib/Manifest index 05ece2350633..696cdde3371f 100644 --- a/dev-python/utidylib/Manifest +++ b/dev-python/utidylib/Manifest @@ -1,3 +1,7 @@ +AUX utidylib-0.2-fix_tests.patch 1585 RMD160 1cb1603322b8a397d7794827dd3ecd6ff1367cf4 SHA1 81c4689820829a615279a7964d1abdf2452be65c SHA256 8db1ce0399b2ca8ded39164475c73f2e1ec1a6546f9e4f2d72c328660177c764 +MD5 0f9b4e0ad487d80987c977dfb4046d72 files/utidylib-0.2-fix_tests.patch 1585 +RMD160 1cb1603322b8a397d7794827dd3ecd6ff1367cf4 files/utidylib-0.2-fix_tests.patch 1585 +SHA256 8db1ce0399b2ca8ded39164475c73f2e1ec1a6546f9e4f2d72c328660177c764 files/utidylib-0.2-fix_tests.patch 1585 AUX utidylib-0.2-no-docs-in-site-packages.patch 475 RMD160 e2806dc81b3537821cb83c09aefec81df5c27e43 SHA1 cd92da31f7a3eedf34b4ba79465ae6a64a6f85e7 SHA256 c833649b3ea32c48526b5cf819606ebf5edd98e42c299169e91397e72b4e35bf MD5 7249f3b046946a3f88bb2cd22f55b380 files/utidylib-0.2-no-docs-in-site-packages.patch 475 RMD160 e2806dc81b3537821cb83c09aefec81df5c27e43 files/utidylib-0.2-no-docs-in-site-packages.patch 475 @@ -6,19 +10,19 @@ AUX utidylib-0.2-tests-twisted-2.1-compat.patch 437 RMD160 d2e767fc76feb44f32d12 MD5 bffb3127ccf1eb531a55550b17b91a1e files/utidylib-0.2-tests-twisted-2.1-compat.patch 437 RMD160 d2e767fc76feb44f32d127fd7218a02cd329130c files/utidylib-0.2-tests-twisted-2.1-compat.patch 437 SHA256 9e0657e7a2e799ff80c6b0236ac655aac5f9853104e422fd52dc73f75507cca5 files/utidylib-0.2-tests-twisted-2.1-compat.patch 437 -DIST uTidylib-0.2.zip 17575 -EBUILD utidylib-0.2.ebuild 1078 RMD160 2af00924c7cf7fb146a4ce639c4fc05570295f18 SHA1 2eb2635e968d3d8fc69d6169565519fdb20f4b2e SHA256 9cd8ff5bc073ebbdb77e41fca7376880cd899847c9c1903ed8f4d7923dd29015 -MD5 7ca6011b0eb9d7e389ee6563fab17c18 utidylib-0.2.ebuild 1078 -RMD160 2af00924c7cf7fb146a4ce639c4fc05570295f18 utidylib-0.2.ebuild 1078 -SHA256 9cd8ff5bc073ebbdb77e41fca7376880cd899847c9c1903ed8f4d7923dd29015 utidylib-0.2.ebuild 1078 -MISC ChangeLog 840 RMD160 a9d092a10f0e285d7c9fd46e0758ab3281a0f1e2 SHA1 463331d39388c4630e1c813ce5525eddd3717511 SHA256 fa544a9fd5332443ddb1db59243a3d19ed59aad33c2fbdb8efd88dd7c85c4c48 -MD5 52f200408933ba654d7c3654f04c28f9 ChangeLog 840 -RMD160 a9d092a10f0e285d7c9fd46e0758ab3281a0f1e2 ChangeLog 840 -SHA256 fa544a9fd5332443ddb1db59243a3d19ed59aad33c2fbdb8efd88dd7c85c4c48 ChangeLog 840 +DIST uTidylib-0.2.zip 17575 RMD160 c0a80ced37ea93e678ba80bf1d5b18c93506719c SHA1 bbbd11016a80c2001180fbd33b550cb293d0f9a3 SHA256 0385b29b0e636fa1cc6eb86ecb5428cf399f9474c8f343af038afce59720a333 +EBUILD utidylib-0.2.ebuild 1120 RMD160 5a34df6c28c9925f0f900bd928625c71750d0e6c SHA1 9300881a8e0e9778e1f4b0f1048707479ee372f7 SHA256 fb27e55a1b90061469002f1f4c235aef3e777f7645872626029569e324ab9aab +MD5 71aa77c730ff548dce2639795b3e2709 utidylib-0.2.ebuild 1120 +RMD160 5a34df6c28c9925f0f900bd928625c71750d0e6c utidylib-0.2.ebuild 1120 +SHA256 fb27e55a1b90061469002f1f4c235aef3e777f7645872626029569e324ab9aab utidylib-0.2.ebuild 1120 +MISC ChangeLog 1011 RMD160 2026f50bd47363bbc621c31f3a39317b0857af9a SHA1 e760d204f4db699d51514283b3d3f692f54edbce SHA256 a1be7149c49e342f2c765a9e0c20a75e20032d2a84ed2bb897c56aa947c642f0 +MD5 99129ea8b4df8659c7ccc9647f610cc7 ChangeLog 1011 +RMD160 2026f50bd47363bbc621c31f3a39317b0857af9a ChangeLog 1011 +SHA256 a1be7149c49e342f2c765a9e0c20a75e20032d2a84ed2bb897c56aa947c642f0 ChangeLog 1011 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159 -MD5 48794b5a58ecddbbc0ffce1ed73393e8 files/digest-utidylib-0.2 60 -RMD160 b6bc4b553ce1969a05f3d2ffd85804d8d778d2c7 files/digest-utidylib-0.2 60 -SHA256 28e3d13b58f9c0c1cd9e4df5c2d8c608f12ec07168a36487af97feeb59c6fc09 files/digest-utidylib-0.2 60 +MD5 2060652192f8f9a3dbc03d8769d49551 files/digest-utidylib-0.2 226 +RMD160 072e072abe5349a60aadb96494588ce8c9eb0a1b files/digest-utidylib-0.2 226 +SHA256 f0a425bc4898eed1d75a9508a30587b88f24ddcefea0026199c782c3ca62f732 files/digest-utidylib-0.2 226 diff --git a/dev-python/utidylib/files/digest-utidylib-0.2 b/dev-python/utidylib/files/digest-utidylib-0.2 index 4519fa1fa97d..779534af6e83 100644 --- a/dev-python/utidylib/files/digest-utidylib-0.2 +++ b/dev-python/utidylib/files/digest-utidylib-0.2 @@ -1 +1,3 @@ MD5 c9f16988f92ef660f46523192ef37462 uTidylib-0.2.zip 17575 +RMD160 c0a80ced37ea93e678ba80bf1d5b18c93506719c uTidylib-0.2.zip 17575 +SHA256 0385b29b0e636fa1cc6eb86ecb5428cf399f9474c8f343af038afce59720a333 uTidylib-0.2.zip 17575 diff --git a/dev-python/utidylib/files/utidylib-0.2-fix_tests.patch b/dev-python/utidylib/files/utidylib-0.2-fix_tests.patch new file mode 100644 index 000000000000..319430134910 --- /dev/null +++ b/dev-python/utidylib/files/utidylib-0.2-fix_tests.patch @@ -0,0 +1,31 @@ +--- tidy/test_tidy.py.orig 2007-01-06 21:43:08.000000000 +0100 ++++ tidy/test_tidy.py 2007-01-06 21:43:27.000000000 +0100 +@@ -20,8 +20,8 @@ + def defaultDocs(self): + doc1 = tidy.parseString(self.input1) + doc2 = tidy.parseString(self.input2) +- doc3 = tidy.parse("foo.htm") +- doc4 = tidy.parse("bar.htm") # doesn't exist ++ doc3 = tidy.parse("../foo.htm") ++ doc4 = tidy.parse("../bar.htm") # doesn't exist + return (doc1, doc2, doc3, doc4) + def test_badOptions(self): + badopts = [{'foo': 1}, {'indent': '---'}, {'indent_spaces': None}] +@@ -34,7 +34,7 @@ + self.fail("Invalid option %s should have raised an error" % + repr(dct)) + def test_encodings(self): +- foo = file('foo.htm').read().decode('utf8').encode('ascii', ++ foo = file('../foo.htm').read().decode('utf8').encode('ascii', + 'xmlcharrefreplace') + doc1u = tidy.parseString(foo, input_encoding='ascii', + output_encoding='latin1') +@@ -59,7 +59,7 @@ + ## self.failIf(len(doc2.errors)>1) # FIXME - tidylib doesn't + ## # support this? + self.failUnless(str(doc2).find('\n')<0) +- doc3 = tidy.parse('foo.htm', char_encoding='utf8', ++ doc3 = tidy.parse('../foo.htm', char_encoding='utf8', + alt_text='foo') + self.failUnless(str(doc3).find('alt="foo"')>=0) + self.failUnless(str(doc3).find('\xc3\xa9')>=0) diff --git a/dev-python/utidylib/utidylib-0.2.ebuild b/dev-python/utidylib/utidylib-0.2.ebuild index a9e1242afc3d..aaac63b6d4bd 100644 --- a/dev-python/utidylib/utidylib-0.2.ebuild +++ b/dev-python/utidylib/utidylib-0.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/utidylib/utidylib-0.2.ebuild,v 1.4 2006/10/15 12:54:37 tcort Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/utidylib/utidylib-0.2.ebuild,v 1.5 2007/01/06 21:19:11 dev-zero Exp $ inherit distutils eutils @@ -16,14 +16,14 @@ KEYWORDS="~amd64 ~x86" IUSE="doc test" RDEPEND=">=dev-lang/python-2.3 - dev-python/ctypes - app-text/htmltidy" - + app-text/htmltidy + dev-python/ctypes" DEPEND="${RDEPEND} app-arch/unzip doc? ( dev-python/epydoc ) test? ( dev-python/twisted )" +PYTHON_MODNAME="tidy" S="${WORKDIR}/${MY_P}" src_unpack() { @@ -31,6 +31,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}/${P}-tests-twisted-2.1-compat.patch" epatch "${FILESDIR}/${P}-no-docs-in-site-packages.patch" + epatch "${FILESDIR}/${P}-fix_tests.patch" } src_compile() { @@ -41,12 +42,10 @@ src_compile() { } src_test() { - trial tidy/test_tidy.py || die "tests failed" + trial tidy || die "tests failed" } src_install() { distutils_src_install - if use doc; then - dohtml -r apidoc - fi + use doc && dohtml -r apidoc } -- 2.26.2