Version bump, fixes #415113. Thanks to Ian Delaney <johneed@hotmail.com> for report and testing

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 49 insertions, 130 deletions

diff --git a/dev-python/colander/ChangeLog b/dev-python/colander/ChangeLog
index 6c85f7929419..3e82ec2b8550 100644
--- a/dev-python/colander/ChangeLog
+++ b/dev-python/colander/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/colander
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/ChangeLog,v 1.4 2012/04/08 19:33:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/ChangeLog,v 1.5 2012/05/08 11:42:11 xarthisius Exp $
+
+*colander-0.9.8 (08 May 2012)
+
+  08 May 2012; Kacper Kowalik <xarthisius@gentoo.org> +colander-0.9.8.ebuild,
+  -colander-0.9.3.ebuild, -colander-0.9.4.ebuild, -colander-0.9.6.ebuild:
+  Version bump, fixes #415113. Thanks to Ian Delaney <johneed@hotmail.com> for
+  report and testing
 
 *colander-0.9.7 (08 Apr 2012)
 
diff --git a/dev-python/colander/Manifest b/dev-python/colander/Manifest
index df729e2e6cfd..580df873cea5 100644
--- a/dev-python/colander/Manifest
+++ b/dev-python/colander/Manifest
@@ -1,20 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST colander-0.9.3.tar.gz 67385 RMD160 334f92e3bf66003fabe6c510a5c6de29a1b72f2a SHA1 61aeb10fb28dc20cc91818b8b0870bcb3075324f SHA256 cb9d922f4c65fe4237e773eb44e34d43340171c08ba838264347a957f376cf2b
-DIST colander-0.9.4.tar.gz 72379 RMD160 dfc8ea457a78498b14215916efa0b769b100f7ca SHA1 aa2b390631ed0ed4782f6cfd75328b45c8a3b244 SHA256 cadb78a862968474200615e390a7955743e2eaeddf71646615f8f2cceeafdfbd
-DIST colander-0.9.6.tar.gz 75827 RMD160 69eb96b9ba090bf54a92896cb5a6234fd9c83308 SHA1 a9600206e60670bba0bf666146c96b4353acdc11 SHA256 df423d578854959b624450754d879724f1a5be2a8925d9f2945d9d5196409117
 DIST colander-0.9.7.tar.gz 78627 RMD160 25409caec91b1c8d853e5e3c2f06d12c74288996 SHA1 d6725d2592d06ae79c6c9a76fe0e8317a7b1f4f5 SHA256 0c696341a84476d59f554505afcc1ec3b9c428fcb78ef07ca9996588f57610f0
-EBUILD colander-0.9.3.ebuild 1177 RMD160 0e1ca5c9035ff13c5d1d66ab2ca9da9c639806e4 SHA1 4a1fc76af7eece791f1275390f1ac192f219664d SHA256 f9c991bd35170cc94ce96f9f8d156dd6ab7f598623a9073c94b9a64a363ed894
-EBUILD colander-0.9.4.ebuild 1171 RMD160 d3d04175d81690dacae723e39e361569e06d36fb SHA1 347ebfbf3e5de0414959173474d953d90f07931e SHA256 0ca6addf544dce7007d53b2bad9b98a1a89f840175fae47346e410bdb2201f72
-EBUILD colander-0.9.6.ebuild 1360 RMD160 18ad7d526f1abad08a8c7f435e5e308a72faf0f4 SHA1 b7bfafc530c51dadb7420cbc8000d1f9b594c225 SHA256 bb4e9ba89c657ae383fb227baeef9f90f6ad554f4176495c43be36cba1aa09d0
+DIST colander-0.9.8.tar.gz 81956 RMD160 208cab9c04fe2c8d5990cfdf2088a6b8c8efc799 SHA1 85732b9f27e371d85373347cb3036c8559aee3a1 SHA256 cab9bb0180a68ceffa1273d2ae98864989a0e00611c24371a5ffac8ea8a0e5ec
 EBUILD colander-0.9.7.ebuild 1360 RMD160 849c57aecbe6766bcffc1d5335295892c0162f42 SHA1 1ca19c62e64cc2982850c014f74f23b3c39f240e SHA256 2554e39c6c1eff3ef56f22bf85cc0951520f97ff5f4bc2307203bbe1e3ab547f
-MISC ChangeLog 843 RMD160 d52c83cdbb8659b58c08e1f44fec1da2b7a965db SHA1 c8cf2f8aab9415fe58c03fefb26776d2788a2618 SHA256 9e7395e5d4269f3ce5950e3a8864b8ddd777874aad605bda33ee22c565c3bdfb
+EBUILD colander-0.9.8.ebuild 1465 RMD160 e4c398a13f5a1158e8fecb2872fa266668875d29 SHA1 5acf5b4c615af4dcb9228c50d2e43b132b961c26 SHA256 187eb9089a88215f965a2b45c2553634b1841cabe22f4fc8f2accd5d1119aa4e
+MISC ChangeLog 1130 RMD160 5646a9f24bef256f184d2e75cb715fca81b1ba15 SHA1 c4825de6d76debbb35939b90bc17c40667ac1d93 SHA256 f29c45d02bba56737fd63a97e6fcafa6c04441d57947bdc1b739904e5e863940
 MISC metadata.xml 231 RMD160 26b240c04731da9a13f92112b3d32d86e57f052d SHA1 16320ffd932bf9c70836080e549b7fe94fddc28a SHA256 a6a4ee88a3c163358067d24563e0339eb2a3258219bbfd25cb1c5c1dd3d95ff1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk+B6B0ACgkQC77qH+pIQ6QIVwEApwnMLCVExK735aPPP6gxbRNQ
-MJU1eHWy8HAIfxJE+wUA/RrlamXn9GlES9QYSEWoC669OCsCmva/Jetk2Bh3BZdG
-=cTXx
+iQIcBAEBCAAGBQJPqQadAAoJEF0huFKJUZL559oQAI9IEIhvJcdS7qhq9sRd+7Q4
+KfJzC1w6fWsoZzCciVMpKSETcWcIaF88TPpg0IwcOn5cfelwOYPJ8ms3PpVkBGzE
+w36iZLkSb7dLUBF3PoinrHnY9NeS3O3mlms1c+sJIkmi08M3AW7WQFy7Jr9ZRX5z
+k7Z9kvayDGF7/pyQ5SBNTmx5trLiYSEcq5PVHPV0Lwdtm0DTDKO/koZYJocygLDw
+Vx3VlionbGlXF53K60jJ1IaRRsLY7QwUqsBbAaqf1KFoq51+QRDiz4vq6M0bWiTg
+KtNmyMp9wpQMAS+0gZl99G0MRFXNc20QhCqIhb5/zWdWRe5v/ZAIFvBLpuofp1V1
+ZVD5HgOaEaCGtl2ZDs2o+t5NaIvs2S8unr/biRzsfTGGyJEOAYsNF7vkATdNWUf1
+cRLM4kDXXhvEmzJrjD1+V0bJORlF5ozFdizDb2fWQrWTan/T2lp64oGgW2qpDhqg
+ozX6+0sr3ulfflIKv8ijvY8dBM9a47126cqKWMRbpdWzHNOeY/c+1HfycTgY/f+T
+9h56kJ98vmrQyra6qar0Xnk7P8M0aUGDRmRVfadnl+mXvAKZ2CjNibGUmCVBAHj9
+8ly5I3Qe8qr9QYZdb/pAVR7CKyhpwXlWTLwxxlkC9hAiE9GrJsTawR3D5l4Lg2ND
+vb065XCGDbGAnfNaAgiU
+=0BxX
 -----END PGP SIGNATURE-----
diff --git a/dev-python/colander/colander-0.9.3.ebuild b/dev-python/colander/colander-0.9.3.ebuild
deleted file mode 100644
index 4fa8b0935a73..000000000000
--- a/dev-python/colander/colander-0.9.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/colander-0.9.3.ebuild,v 1.1 2011/07/30 01:43:51 rafaelmartins Exp $
-
-EAPI=3
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="A simple schema-based serialization and deserialization library"
-HOMEPAGE="http://docs.repoze.org/colander http://pypi.python.org/pypi/colander"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="dev-python/translationstring
-	dev-python/iso8601"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# fix sphinx theme. pylons theme not include in source
-	sed -i -e 's/pylons/default/' docs/conf.py || die 'sed failed.'
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		cd docs
-		mkdir _themes
-		emake html || die "make html failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/_build/html/* || die "dohtml failed"
-	fi
-}
diff --git a/dev-python/colander/colander-0.9.4.ebuild b/dev-python/colander/colander-0.9.4.ebuild
deleted file mode 100644
index 7453d0a3b0fb..000000000000
--- a/dev-python/colander/colander-0.9.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/colander-0.9.4.ebuild,v 1.1 2012/02/07 08:03:54 patrick Exp $
-
-EAPI=3
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="A simple schema-based serialization and deserialization library"
-HOMEPAGE="http://docs.repoze.org/colander http://pypi.python.org/pypi/colander"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="dev-python/translationstring
-	dev-python/iso8601"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# fix sphinx theme. pylons theme not include in source
-	sed -i -e 's/pylons/default/' docs/conf.py || die 'sed failed.'
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		cd docs
-		mkdir _themes
-		emake html || die "make html failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/_build/html/* || die "dohtml failed"
-	fi
-}
diff --git a/dev-python/colander/colander-0.9.6.ebuild b/dev-python/colander/colander-0.9.8.ebuild
index 96feee028f2c..aa5022b6cff1 100644
--- a/dev-python/colander/colander-0.9.6.ebuild
+++ b/dev-python/colander/colander-0.9.8.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/colander-0.9.6.ebuild,v 1.1 2012/02/22 23:42:21 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/colander-0.9.8.ebuild,v 1.1 2012/05/08 11:42:11 xarthisius Exp $
 
 EAPI=4
 
 SUPPORT_PYTHON_ABIS=1
 PYTHON_DEPEND="2:2.6 3:3.2"
 RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 3.1"
-DISTUTILS_SRC_TEST="setup.py"
+DISTUTILS_SRC_TEST=nosetests
 
 inherit distutils
 
@@ -19,26 +19,38 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="repoze MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="doc"
 
 # Depend on an ebuild of translationstring with Python 3 support.
 RDEPEND=">=dev-python/translationstring-1.1"
 
 DEPEND="${RDEPEND}
-	dev-python/setuptools"
+	dev-python/setuptools
+	doc? ( dev-python/sphinx )"
 
 # Include COPYRIGHT.txt because the license seems to require it.
 DOCS="CHANGES.txt COPYRIGHT.txt README.txt"
 
+src_prepare() {
+	distutils_src_prepare
+
+	# Remove pylons theme since it's not included in source
+	sed -e "/# Add and use Pylons theme/,+37d" -i docs/conf.py || die
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		# https://github.com/Pylons/colander/issues/38
+		PYTHONPATH="." emake -C docs html SPHINXOPTS=""
+	fi
+}
+
 src_install() {
 	distutils_src_install
 
-	# The docs do not currently build for me and depend on a theme
-	# only available from git that contains hardcoded references
-	# to files on https://static.pylonsproject.org/ (so the docs
-	# would not actually work offline). Include the source, which
-	# is at least somewhat readable.
-
-	docinto docs
-	dodoc docs/*.rst
+	if use doc; then
+		dohtml -A inv -r docs/_build/html/
+	fi
 }