Ignore test failures with Jython. Simplify src_test(). Fix license. Patch by Arfrever.

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

3 files changed, 29 insertions, 32 deletions

diff --git a/dev-python/beaker/ChangeLog b/dev-python/beaker/ChangeLog
index c9b168123d53..49797fd2af53 100644
--- a/dev-python/beaker/ChangeLog
+++ b/dev-python/beaker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/beaker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beaker/ChangeLog,v 1.32 2011/04/18 23:15:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beaker/ChangeLog,v 1.33 2011/08/06 16:20:30 hwoarang Exp $
+
+  06 Aug 2011; Markos Chandras <hwoarang@gentoo.org> beaker-1.5.4-r1.ebuild:
+  Ignore test failures with Jython. Simplify src_test(). Fix license. Patch by
+  Arfrever.
 
 *beaker-1.5.4-r1 (18 Apr 2011)
 
diff --git a/dev-python/beaker/Manifest b/dev-python/beaker/Manifest
index 340cc45d28d4..4ef138cbc03c 100644
--- a/dev-python/beaker/Manifest
+++ b/dev-python/beaker/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST Beaker-1.5.4.tar.gz 46238 RMD160 a60e052a362a6fbf0d3564caaff625879fdef37f SHA1 72a696854e36e2ea92f4535209e4538baf06caa0 SHA256 a13dc6ae0e9490c85fc2c1ba035ea5b21cd684ee3b4b70b6a9e473f0550a716b
-EBUILD beaker-1.5.4-r1.ebuild 1128 RMD160 5b19dd2e285b0d4452912229453c52563842767c SHA1 80d55bd5ae40000972d5ede234eee0a8551c4579 SHA256 bd2fc6043a77ecaa2b5333597e94183d95184d71709f2d4d9bdcd1833c42e184
-MISC ChangeLog 4276 RMD160 714f46593880aa3e2d2dcf1bfcbce7aed325bd5d SHA1 4cd3c0af6204aabfdac3ba850479afa2b3ff7774 SHA256 1e5da412af0a22db8c2350414c409028a2145d2da7237b9fd003451201acfdab
+EBUILD beaker-1.5.4-r1.ebuild 1032 RMD160 6481de6809fea98fb12b2cb6db427b4c43d72def SHA1 0e11f5b3742176ca0816b8d4ab7fb13444c32eb4 SHA256 1c0d9eff964684d31155ce627e7928e43e517e57ae6219be87805b4829b97e64
+MISC ChangeLog 4445 RMD160 d476db016ac1e5bd22ff3ce79e71589be9f79155 SHA1 ed40aa85dba4d53423b3491152e16d7de21575b3 SHA256 e7604ec6e2f386b02af37c544dbeea5b65465de42c1df09b211e97e3127af702
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNrMYuAAoJENgZr6v6gHY0YikQAJ91oqA8LmF1ZEysuUB+lOrF
-sL6VtDXu6tT6TxsQIBSUo77Y/IPkqCWJqXF3zI0SCRaDG01a/WdpW+rA89Cv91KY
-O73P5WfAc+qubBmuga8fycwZCjsukTJBWA9ytaLb3XwRcgwHcoVJThf5OUzCKDVH
-FFikp3Wt0DTpqzKZfkgZGRvjTPy6zQHFSYx8fCoYq4rfLdcDdd9HW0I+4dGLgwmR
-koJ9DsZnQj13S4tW/p0ANEeRCzLuSlokzUDRNt9n+z64ISWthfQ0I5nI3IKhNxuu
-KBtaY6KzA41tLks/efv6QLX5/bkUVL7xelth8sJ20IEysY5CrRkSOLVp3IYLy0re
-uhVXotZhBT4NWxCbZpw6owXvY09Zpmgo553cG2seY1DgyaH6V7tHjNyTseyX3VNF
-6SJRtyTHqmYy3g9V+m74+cefjK6Zm+Wn3laC1mUQzhZ0OVuUdYuhXph3+m8Du9va
-UrhY8VmZbwlVECY+7lhgk5f3EV6eeN2Xvn3kX/BMT9B4jpmD1AASC/24cJHEB1vq
-DxS4J1UmR3SFMb4ZbUjWt9omuFo9lt8a9/KeZTd5DUHvSg3iXB2fe/YaY0Iye8lG
-8o0nn7eZPrH0/2tfntLSJU9bkFQmyzrrHCL+SkQ8pESlkSEZWuD7tzGOBoN0CCS6
-GtBF+ZmqHg4UW0ErIsWA
-=Rg42
+iQIcBAEBCgAGBQJOPWm7AAoJEPqDWhW0r/LCyDEQAKYNgOY23WG79V8344NnX0a2
+SoY0gSLRdmh30Q7E00RIpeDfTvYh6+rPotCABSxW8T2zQHXmrv51SrFy6EwC+5yP
+IiLbwnnNw7Jtn8sZWjvfev2MDYytnA4+rlmwVJWd7YGxIevNY4ZLacNd6jX9qKdG
+Er3AEhz7AmLnk+jGvE1KMLnaqnnRgcdIN5iFntXCWKbcI9YJMpQVlbHnbR4Rntp0
+/5N33OnN1upTORmLBboZrKJ40zhaJd6LScb06oQ+9xnhynFx6xJ9voeDMpSCFPt/
+iaw+H34mjCyXXhakmBKMTb8Icq4jejpmgWtpglRxuE8huYAoyPRfSV3yJ/cINbwq
+7EqirZMZG4bBgBi1nVnq7Aa2Ez67GEXS/enDD5jF5PFae5m1vHTYtaEzkEzWImej
+Zmj7gWD3uN+0ze54C1n3RKYck2AzO+7V93p94UBFehwKg58nHkQzpqpBdOknhEKr
+8EtMSnUY21np3WIwVw2Tl8+sUke6V86ni2NKm9B9o/vb7TUHGA9fpozYKp+2DeEp
+bYQbco9H5uRGascX2O9KFrPHbTmOxvi+fVd+tp1sV2NrSpAdewgDgKRRgJg79/BH
+Ibounk/FQc1LbdytmUsRW8bOcMhCjIrZhf5EYwkuBMJPfRrVMtBcbqR11QT7+/eh
+GS3lCgMvz/wkthYLiO0W
+=6NF1
 -----END PGP SIGNATURE-----
diff --git a/dev-python/beaker/beaker-1.5.4-r1.ebuild b/dev-python/beaker/beaker-1.5.4-r1.ebuild
index 8fc6742b16b0..d81e401e89c7 100644
--- a/dev-python/beaker/beaker-1.5.4-r1.ebuild
+++ b/dev-python/beaker/beaker-1.5.4-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beaker/beaker-1.5.4-r1.ebuild,v 1.1 2011/04/18 23:15:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beaker/beaker-1.5.4-r1.ebuild,v 1.2 2011/08/06 16:20:30 hwoarang Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
-#PYTHON_TESTS_RESTRICTED_ABIS="3.*"
-#DISTUTILS_SRC_TEST="nosetests"
+PYTHON_TESTS_RESTRICTED_ABIS="3.*"
+PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*-jython"
+DISTUTILS_SRC_TEST="nosetests"
 
 inherit distutils
 
@@ -16,13 +17,13 @@ DESCRIPTION="A Session and Caching library with WSGI Middleware"
 HOMEPAGE="http://beaker.groovie.org/ http://pypi.python.org/pypi/Beaker"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
-LICENSE="MIT"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 DEPEND="dev-python/setuptools
-	test? ( dev-python/nose dev-python/webtest )"
+	test? ( dev-python/webtest )"
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
@@ -31,13 +32,5 @@ src_prepare() {
 	distutils_src_prepare
 
 	# Workaround for http://bugs.python.org/issue11276.
-	sed -e "s/import anydbm/& as anydbm/" -i beaker/container.py
-}
-
-src_test() {
-	testing() {
-		[[ "${PYTHON_ABI}" == 3.* ]] && return
-		PYTHONPATH="build-${PYTHON_ABI}/lib" nosetests
-	}
-	python_execute_function testing
+	sed -e "s/import anydbm/& as anydbm/;/import anydbm/a dbm = anydbm" -i beaker/container.py
 }