Fix the -r1 backport by syncing up to the fresh ebuild. Fixes bug #463572.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

3 files changed, 46 insertions, 39 deletions

diff --git a/dev-python/webob/ChangeLog b/dev-python/webob/ChangeLog
index 61682efdb093..0abcb5b8f325 100644
--- a/dev-python/webob/ChangeLog
+++ b/dev-python/webob/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/webob
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/ChangeLog,v 1.68 2013/03/27 14:09:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/ChangeLog,v 1.69 2013/03/28 10:51:19 mgorny Exp $
+
+  28 Mar 2013; Michał Górny <mgorny@gentoo.org> webob-1.0.8-r1.ebuild:
+  Fix the -r1 backport by syncing up to the fresh ebuild. Fixes bug #463572.
 
   27 Mar 2013; Agostino Sarubbo <ago@gentoo.org> webob-1.2.3.ebuild:
   Stable for arm, wrt bug #456614
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index c3bf69220a11..e2496689648c 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX webob-1.0.7-tests.patch 768 SHA256 da812d5a308adf81f649d9527bc8323a68a45eb06791d5db9cac5a07202673c7 SHA512 2f2e978d0c2b96fd37bd2677c6108356b4c52f95e115bfa8c9a240d7cbf702d41aeee4499fad306caf237ad511721e5b5414a6098f5dcd5e977f877e591a4c71 WHIRLPOOL 511595c3399684f3d63bf0b5e4bb1e78ab2983c03f65320743e3f612de5ba333d9526342bd5dc89c7e6356e10b7ef999b02bae2dc1e65e49e2e693d974e0e1d2
 DIST WebOb-1.0.7.zip 193712 SHA256 ea0f8be2555986e8e9a0cc104e8e58e438b5462b064d7e9da60101a266518620 SHA512 1af9630ac06af364d9c705f83210fd26581fc2b9341613b70aec48576ea6786a4762fb166df09ce302025735e77c21b5275cdd115c43c29bb68c6e2b2ed84d9e WHIRLPOOL a86b0b269d68b1b5104e2f3b81b82cdb42f1d6068425d93b2d7e5c6e71cff1c30cfedf0fa625dbc8303cc35e47bb9fc6263b43109043ca282621d9c8c322cb54
@@ -8,28 +8,30 @@ DIST WebOb-1.1.zip 196271 SHA256 391048babc0d2500a79df0386963f942594b7b986104b49
 DIST WebOb-1.2.2.zip 219653 SHA256 356b7277941fb263bfef9d3c4279fb1058ff9ea91b5f8a886a9579d614c79787 SHA512 9da345710e31e36a34af6d67d1bd78ad190f53dd99555fdbbf884a827a471c9798b65a31237c4d7808b7804d02936fedcb862a29e9fe9332f09e43489275836f WHIRLPOOL ef3eb650892d52dbb18a53ab8ce4ef066046f5c3116870a621005916f5cda14e57f790217e30c01233af4208e3c2e632fa072a82e7421e7c9cc33784c6922d46
 DIST WebOb-1.2.3.tar.gz 191327 SHA256 325c249f3ac35e72b75ba13b2c60317def0c986a24a413ebf700509ea4c73a13 SHA512 831e6bb1d2c6998b6929520098ed4aed3117d038457d9bba28ceba090bf32fcf6a935f88470bee1e0782f6c43395c4fa646d354c946596cc307edb7808e90559 WHIRLPOOL d56f808f0911565d1743c2d7bd1dfafa0fcff27dd6e4835def96a7ca1fec61224ccc9db06121d20cdbcda8f5f773405291e2a403e920c98c7d8fc8a8f9c20361
 EBUILD webob-1.0.7.ebuild 1350 SHA256 ac47cf1ee4492f296a0d149f1a137256f70f31845a0e0265a14de43ce82a2fdc SHA512 805109ac359b313787cea3ab61636eabfafeee45e2243fe4d5951017a5c89b11fae30d6d590c557d4d61f3322b50d39c752facac150ac2c16e9033478cb434d6 WHIRLPOOL 0e4b031b6a47ca070482c9e4eccf62eed916b8cc44427a3ee29b445aa66093fc5368ca699732684ca7a3084643a303538e8d566590616059054ed19f024ba3e9
-EBUILD webob-1.0.8-r1.ebuild 1197 SHA256 cfb52b8f66a6980c47d7b0362203e04dcd735fde027c2ed7b5f8e8949a084187 SHA512 0f013c6c4d8b46d6450aa551c67f42d492a2a9d38a1b8822115546112fcbf4bad4b92d444ffe0bab172d41af88372f7775595700a84fa56feec027a74ccee339 WHIRLPOOL eb7af31baad909a3e4f723d6f133c244a4cef7d0180e582c9a0118519b643e2695a2222c2cfa9bd8590828041a5eed52c16da2b19cd49a01885ffd0e2b703916
+EBUILD webob-1.0.8-r1.ebuild 1268 SHA256 7cc2f121577db0950bc01b3dfa8286a61f98c99d9bab083fe56145910ecaf756 SHA512 ea99d7f7a6f3c278e9ed5d34cfc00b57b91999d5faf57eaf8c7d71b653c8bea7cc9eaf4d6abafe975b7eb7a4c79595999fd72ab72232774e5d11e043c12d4ee8 WHIRLPOOL 062abd993cb50ffb25475c86ed32edbd15eaeeb2d25cb90f36762b39202c9490f924efc41e59c1538f50e814eff5a7e71bcf70afbf7814377d6aec48ee2907b6
 EBUILD webob-1.0.8.ebuild 1280 SHA256 40b3656d47973d79dbcc44e79dd1b5a283a855ad8e0e2e5bd66e1fdd3ba4aab1 SHA512 291abb4f86691689b4cab17f63c6fe424210620e918ea38ace1bac14a964b6246842bd74e0e7b191d16bc6072d459f8f9855e8acf459fa54226fb9cdbf76c3a0 WHIRLPOOL d72c08575b790928ec612aea384fcb10c1b4843457dab4f8d0348b4ce99099c82f38c7dda6cbb6b68755bcd760ffdeb7115f04bd23573386968561d5d81a9565
 EBUILD webob-1.1.ebuild 1283 SHA256 2cc42d272ed236b86276f1ea14d12e03223725e1ebe6ef3963f0752366c76bbc SHA512 0a1386620a1207f67083fad891e238eec58337aaad99a190710561ec6573b9d9a913e0e4b53c0a5a91f8ed0cf70999b9088f599726a3b78bcc615296685841d4 WHIRLPOOL 2ab32cb04a653f0ff0064e8c0c84744781d9130476ba53021631538426aea5395426efe71f9a22ada692222f260a57ce6269e973ab28f2248a794e7260040973
 EBUILD webob-1.2.2.ebuild 1015 SHA256 347f6f1ce00676b98aea8ff606fb87e0c8c82f26419686899e53ab4016db06ad SHA512 4183246005ff116ddceeed37bceb676fb0606d429a981fc738e464ff8063b0332205efe5b737bb30f74cd0847afb54b00d027f1d27177d783e96c1fd5f4d5af3 WHIRLPOOL f601fc4b38c155ea96d27d1fa047aeb2207c7cdf193ffce4933a59fb698f508bd1076c7280d1426a6120a40b8c78d7b793e67d606832bf8e0fb594a50f291272
 EBUILD webob-1.2.3-r1.ebuild 1135 SHA256 1a9dc756518d828a4d4f604d5624bb431775ae0460549a9c43dcba878999a3a0 SHA512 fcd6daeda35bf5336b8bd8cfa44486922079d7c571f8dba9d3befc29a949d135d321edeed95b7b85eaefc5247aba1219b48dca4f03444f83c44362d55960da09 WHIRLPOOL ed41878d7564bb1e07fc981bf6ac779dbb7277e32b99c3a794ed34262a26c7a2c4a03269726c84b408475898afaffd6bc37f966e6b7d3f9ea53d23a2c29c4b8d
 EBUILD webob-1.2.3.ebuild 993 SHA256 592dcda4730dc6ef44be7ac7a1967d395417d8abfeb45dd57b264810324f8b84 SHA512 d90990981a209d4be7f8cc81c865996fcf6d6aa1023027cd184014edec35202c0fe9e1492e7b00c02ba9ac0e127c36495355675e932f01cdb12e19bd129747ce WHIRLPOOL 7f1af0399ec68eb1d55a8dfeff86ff0d2c346611accdaa7e014c5439334e80972c235a3be1591465feb1676fb38830a5a105197caf760f43fce003f29b6e5beb
-MISC ChangeLog 8265 SHA256 9f26b3daa2f9bff7242e0ae0ced55b0173b60d62223a4490a19cb8c4a6b85e11 SHA512 b702bee8d0f6f03c357c96be9249f2d9c3cc116614def541cee4d3e99d51b8e7ed5f670149997fcf6ee21254e946237bd0cec3a197d14064390e16da81c76493 WHIRLPOOL 25748d1ebd61b6713126a08a902aa381cb8c5c870708d0e8783b3f1d21066adf20432d143fa767e4154ae2b43510ca5a3c8b3e3d510996f309541f30d16d4f53
+MISC ChangeLog 8419 SHA256 98f038dce3582780cf2f53b6635e9bed8d0e332600c25df85529c27a151fee67 SHA512 ff5c8443985f83d0575607c8e575fb30a3a27fe2781b8ce6e6f9369c328b0fb65663b7e66f1819340b4ba637780dbc1aebb1eb9143c10053e454bcd1465c20e2 WHIRLPOOL bd7055faeb8e4f95eed627d48e8bae4264e584213b39338f699a41f880d65951769de4c41ee4b6320d995489df1b9dc201616493c20045268daada7ec43e6dff
 MISC metadata.xml 228 SHA256 48b8c554aa1bbb2f1be03d0c3a319e932889b2bae35df46c99a43626ba7c1174 SHA512 99a9057fd5bc1cc0c5ef26d29555b53f456d5fef45a13e3858876fbfaebdc0ba8ae90a14e6bd470804d929e11d382aeee35e99eddb3edef6779ebf0f4659b679 WHIRLPOOL db8c702dbe87dc516c77fbaf455963d5c5bcc7b2208068a9b56b54ae39d92696f11427a95de019fe89b44b1b1f9df7ab8556f28b1a1cf3275e19b8ae51a7bbae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRUvzvAAoJELp701BxlEWfQvUP/RkPfFuZfxgDMfQiYjGOhdBe
-YavTdabR/DJulSO+MCt5loRXkF3Yk+xyANlomw3NM0G3nG1t86xWziboHy4Xe8YJ
-BrwXTy0AQ6kGZ0FAoMfDRTQSy+JOwTXkIgu3uhY74el0Z6xNFJvbknvAyLj2M3cj
-QfdpkZ0Ki3LQAHC88HP9qqX06rrSCYY5JaKZw7hT32Bu1CWTUnEo5Gk+YNO/ChFp
-eeHVHY0i8G2rXgxsebiUZT943v9dYzYNcK4rJygKFJyK61pdzkKgXoeq1fBSyCWI
-JI5rj9RZYyUsO5aYC4nzKfarpMeOC1aScQp2BwjA5CuBZKaCX76nhqo5lqgZtBMJ
-RKTi/tRhLYPfBeqnaaKazOoVcylnE6NxhbciEO6pRd2j/sey9YonSSOLXyt7sjzk
-1y96wTxWdIj0tVv9yscVCrY0v5bsdlt1tZluwaSRgjYBF2zrzxS8LUeT7bBTMopN
-SiEcn3akvhJ4cpyfnIGrQi6F6z7ffQjsIMY0hJS6boyMsvNRQsVpJDi6/FNU2LCG
-laY1Vh97VcmtpfY2CCbXypPvBnAX5gSN49H/V/YVcN1ft7Hb9my1OB7/7b0URwB9
-msy6vJtQCrzPc+Mk8bnB7RPMb9c0uM0HhgtkRibwerM5DT0T8fZXy5xLoiNRkZWC
-7FVo5knJD/4Pfju0sOc7
-=G1lV
+iQJ8BAEBCABmBQJRVCDkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDepQP/37ccCNaSYFc7ahw8dbcDMtu
+FT8b23oTYpUaT41rZGkqfqksJFKcz0OCGAVxj6WDpN8zDlQ4JGqfLeXrJxS4utVe
+8OwbRlVIHOgkEk3ygdk98JJCQk2fssZs+5fQqfdfWZeqF0SYjPyTkWhhOzKBVNWS
+CkmHNZAWEvC9iy9oeJXGpyb4xFkh+hc4SGnU1/QQSaIjU3OwZgHg/dBrG76ocJAJ
+SqmLLvcgyBiJss+U5vBDcLwphoTgtDWSlMaOvNeZrl3aifvHOOSEFG1K+6+E55rh
+Wf0DdKnD+Ggr/NdXysS1AqTHQceb08WfJXsEd2JT7O1/S09lweCer0ZXSQsk1xcC
+5dF/jot79JX7VgCB7TgBUIxEAUYjkltONexWMkgBc8ArkI7IBeQwVvLbQnA57fDy
+oI3kf9COym8gQ07vdZjGTVo4UDYx4KL1eHF9e3MggfGfE8FnmUnh//tlVh/Dxv1r
+kalCNipd9Wj6Dq1rONglWYMR1YJ7Y8kD2ZvDDIePND4UmJ08PArtWR/BJLVfs4oL
+GMD4BC9IC/00x4mdIpQQyNTPWhejjq1OKe5ZnBLggkyIrl2FSVEpvQ+dtMewIIw5
+d551/mXy0XZhbpSYG45LD4XIW2PWEEdT0w/bXKF3ebLScvsL7aLwFbGRVXQxtbnT
+nGIAZDaHPch9lXCNpmJ5
+=7VX2
 -----END PGP SIGNATURE-----
diff --git a/dev-python/webob/webob-1.0.8-r1.ebuild b/dev-python/webob/webob-1.0.8-r1.ebuild
index f068e892da0c..8e46422492e0 100644
--- a/dev-python/webob/webob-1.0.8-r1.ebuild
+++ b/dev-python/webob/webob-1.0.8-r1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/webob-1.0.8-r1.ebuild,v 1.1 2013/03/25 15:28:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/webob-1.0.8-r1.ebuild,v 1.2 2013/03/28 10:51:19 mgorny Exp $
 
-EAPI="5"
-PYTHON_COMPAT=( python2_{5,6,7} )
+EAPI=5
 
-inherit distutils-r1 eutils
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-MY_PN="WebOb"
-MY_P="${MY_PN}-${PV}"
+inherit distutils-r1
+
+MY_PN=WebOb
+MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="WSGI request and response object"
 HOMEPAGE="http://webob.org/ http://pypi.python.org/pypi/WebOb"
@@ -17,31 +18,32 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc"
+IUSE="doc" # test"
 
 DEPEND="app-arch/unzip
-	dev-python/setuptools
-	doc? ( dev-python/sphinx )"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+#	test? ( dev-python/nose[${PYTHON_USEDEP}]
+#		dev-python/webtest[${PYTHON_USEDEP}] )"
 RDEPEND=""
 
-S="${WORKDIR}/${MY_P}"
+# Almost impossible to solve circ-dep with dev-python/webtest.
+# (due to different PYTHON_COMPAT)
+RESTRICT=test
 
-src_compile() {
-	distutils-r1_python_compile
+S=${WORKDIR}/${MY_P}
 
+python_compile_all() {
 	if use doc; then
-		einfo "Generation of documentation"
-		"$(PYTHON -f)" setup.py build_sphinx || die "Generation of documentation failed"
+		"${PYTHON}" setup.py build_sphinx || die
 	fi
 }
 
-src_install() {
-	distutils-r1_python_install
+python_test() {
+	nosetests -w tests || die "Tests fail with ${EPYTHON}"
+}
 
-	if use doc; then
-		pushd build/sphinx/html > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
+python_install_all() {
+	use doc && local HTML_DOCS=( build/sphinx/html/. )
+	distutils-r1_python_install_all
 }