3 files changed, 80 insertions, 16 deletions
diff --git a/dev-python/beaker/ChangeLog b/dev-python/beaker/ChangeLog
index 384cc54300ff..9b2787bf2f50 100644
--- a/dev-python/beaker/ChangeLog
+++ b/dev-python/beaker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/beaker
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beaker/ChangeLog,v 1.47 2012/11/16 13:35:27 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beaker/ChangeLog,v 1.48 2013/02/22 00:03:12 mgorny Exp $
+
+*beaker-1.6.4-r1 (22 Feb 2013)
+
+  22 Feb 2013; Michał Górny <mgorny@gentoo.org> +beaker-1.6.4-r1.ebuild:
+  Migrate to distutils-r1.
 
   16 Nov 2012; Anthony G. Basile <blueness@gentoo.org> beaker-1.6.4.ebuild:
   keyword ~ppc64, bug #411761
diff --git a/dev-python/beaker/Manifest b/dev-python/beaker/Manifest
index b1d28d816a21..4638af5e0548 100644
--- a/dev-python/beaker/Manifest
+++ b/dev-python/beaker/Manifest
@@ -8,23 +8,26 @@ DIST Beaker-1.6.4.tar.gz 54480 SHA256 5b06dcc9f7b1921bc962235c4051aa5f3f5d3609f4
 EBUILD beaker-1.5.4-r1.ebuild 1046 SHA256 937cd6a4eb878945f319b6404f34d74f7431f338d906bab7133cf2b0fd52bb69 SHA512 a13fde95ba6c86fdcb3cfbb75818fa01b8050e51680b5cb45d5fb8cc6d5b79ef1335bad9854fd9c013e1a37717aa9f33c241e85d9977c9ae0f83acb8175a0c70 WHIRLPOOL 9639f5f6383e6c536583c758e90ccf6609fc17e611d8faa06a7f2ec22ada6480093fc3f0a2411352eef7027cee8cf94280267b50bf40ade4ca3e6abd066346e9
 EBUILD beaker-1.6.2.ebuild 1080 SHA256 0c56cfea82490702c13f7ca9d41c55c4aabd6b656dc03287c654f133caf0b410 SHA512 62f90771f82947713bd8b22c91b1e53a913e5eb32d0104635565e66db40f4593379141c86ce2d8ebc2211d39c2390bcef6ccbcdfce3bfa54b2b4603fd36f2772 WHIRLPOOL 031d4a11b8c935015730af5a69a6e133e5b58590b6d98a51b721834f35964794120f13152848aade084c9ca33125dd2ccec11fca14741ac61bdace5b5d9391e3
 EBUILD beaker-1.6.3.ebuild 1080 SHA256 61d2822ff98b8388666740ef123ef4f8110b9a0d49610c904dbf3cddf2065b8b SHA512 f0ff45b2aa28b4e68782b1bb80c6e95d3d75e147670746e4d54b7dbf7855895885ec48ed5455335fb32d6bace582e669f2ff46084247b9861c1b320a97e76d0e WHIRLPOOL 430cec5abd4b6035acd05c88ab1e3d9c8a440758ebd96d0c85b4583d1fd85a6f4c7347d013dc10f17473f5cf1a618559a87d646cde2dcb248e7884b39780bde4
+EBUILD beaker-1.6.4-r1.ebuild 1712 SHA256 8812620ad13ec64cddf6db54e37abced8d4366260b0a267f75023a643e2bb392 SHA512 60a93e620881eed062c62d0ac92b531de3eefe2a469770d27424688bfe2ebe7899f8483959f58c37c3def229a1a552a1d66f98d9dd93242eba2a4cc77a5703d9 WHIRLPOOL cc0fd1e7a2b9f5c86efab8513691b28bc2d280bd9d0d557e29ee79266ce171ea9ac5f1bcead76b247cf76ac00015136e0a3d8fe9ff10ae6eb5574e12f5abbce8
 EBUILD beaker-1.6.4.ebuild 1105 SHA256 97e0b20a6305637fccae6483f57a62e1a469c067075c05d855eaa4be7e0a841d SHA512 75e2926569f1a9d14b4683a63dcc5013bbf22776327ca8904c7ce4d858a3b01831bc27bb756fee317e7b89b8f74d3d5e13e4d323b7a57cf50c2fd75877988388 WHIRLPOOL 735c56e07fd6ec57ebee557d8c6fa15521549bd1eb3830c7d9af2de9be766473c58253d166b31925043fda541176841b4fc85409243c9f96322e880328f43e4e
-MISC ChangeLog 6004 SHA256 a108c2e6176311458dfcf241f84620925a30fcbb8a6b58936ba06176ff6d5886 SHA512 34e754d75be009c92b59ebd910ae84942ff799159f6269d25a48e1c67e184d85039f25daf7e7bca7b5a9ef09ae466d430920d10b7edc4fac872a14a2451c1536 WHIRLPOOL 6df8078178a48ebe19529759dfe873515067e02c7539e68c20b39e95abc1294b49f81b84859ab410974f49df449789da3cbae56d9db95cd4e5906d20b3d8c4be
+MISC ChangeLog 6137 SHA256 6b09d94e0d3590613d7bff8bc4e4c3927e6194a8e0c0e6356da052065a33b5e5 SHA512 0732f44adb3cdfaa32b3ec28072014b6a09267be20be139f48a5b4692cd9c1afafc0e19dc645f16f543c5795bbcc7cef84e253b75d9e6a3b92044dc351d28e85 WHIRLPOOL 72c74baaae37ba2265695d4716fc719966ae0ed477ee5cc068f114044cd9cb52508710f6833076f302d4d210de78882cdf4e5fb37e7b9deabea1307d59e58938
 MISC metadata.xml 229 SHA256 3bf73244c6b1ab868b503252c897f2dedd92579061aead2081f28debbab8b01e SHA512 c4d3532821b5ed7ed3d924087144a2ebf5d54eb471b6ca17a4ed7f78524c645a86fd54b0ec8b0caf4332ca9ae48e75fe69eaa61cc1746561209be4dfd951cbf9 WHIRLPOOL d3d462bb3ed0804c8445b95500473dffb33251b52cde94404321593bfd79128c866ddbe2784c483e49c7fc2d9df341cefd42687506c456bc791746aa20a7b1dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQpkEZAAoJEJOE+m71LUu6OnYQAJVz2yRzvs0or+rUuRMc8EK+
-9oE1DbyrK3zy4CjG+UwvdM2hTU2ORh1xCrA78CO3g0d9ij02Mrsk0hAQ1Gm6c0kV
-n0XqHYbTJ/mU61ZdrZTrlc6m69Ftsc/oY+m8yxRivh6hSvGLTD5pcjC6LxJNSu1/
-SRqb4lGcnAT0DuJ4jkHjNWEW1cZMFepbkN5LjaoLgOELzQiEXrkeTNZhrzFMUCzt
-e20vFhidbPN1ke42Dy5NLG4AuRVUgxetVcwUt5xXildlyykbVF2whPwLPs1jMuy6
-l6VqiyZ0q2KTS7Mg3//G9uOGU0LmuRbLEOZTj8CNv4lpx9xkXNfZGw0WAm6PeTGC
-0+6eL2WlN2p28ElxKN9MGvLmdXUw3NIVokRAz/BMS+TDE0MFvY5eJVAL+7hIkBrY
-DakQajS5jtvlscjgHXKOtodmOFYBdGwWVBTERIU/lcC68mBYD8SFDlWXHIlmqeo0
-3/yHSUic8aWGWcoerouHplMFagT2xrBjZheCKRRHRaQ4c1w6J+ZyTIVD5J0JtPq9
-i7YhP+hhjzyCMLWkInvygD6BvilgL6tGRmfp2URdfdWGERklU23ld+eep9cRVZx+
-z9Ab/ytvc1XZItBNTtfSFJnoLkvOCJ14Y7JFqg3F6bJTrd9EbbODvSCftL8NgYg6
-Z2rysiQIVCYkPhoO1fF5
-=l85i
+iQJ8BAEBCABmBQJRJrXUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDV40P/RrIsRdoptxyULCcmWuyKv8I
+jLE3kXnagZHcvSSeCOTBDuVIC6KPXfYLb3FdBwwpYFPQND1ZAEk+i7v3YdyuYldb
+hEytf0rGgQ5kuONn6JOcdfdVAmhtpuE/ATRpDHFv/aPHsxJxycjvOuY9rTg6+ttA
+MfP6Ma0+kh1GFbgSC4f2WMgSDZRoxBElYW8x0LP9R//D15VbKVy579g32VeZnhPt
+xY6Ke+w/EJPWrPRAbaP//86Q/yE6SHu7F6kLLQ3K8Fs//gagPoVVLQUS2E6IqwaR
+/WBO476jX3X0sacCP/4VMGQfgnpB0TO2l/S61yDMdzxTPj/Go0LDprafPgpKiYyN
+1hKwz1q0YlU7bSdiqcAmnb1PXnMGyUNKUc121RvQL4P7B056ODWcJWv0rStSMSsx
+U1w7bcrL3ea3nPm/V3YA8b0+SNGkpx5fSWIpNjpFztPADbWJipOa3kN9xO9d+4bM
+02RWH/0jDk5/Ekx4RxWW9to43TGzOtfG03y0wSQ8MPlnNgD6s1KYhg/Bk6z96Pmh
+35ZMt3k+DxBfN4l/Tt8VA0T0UtJNVHCIFolOpfO2RQ1NYRntfgtnDNZOWy8nxsuS
+7NIIPHpHIElXEi57FA7MGRrshCqxhCBZujRoaoxvINt+BIiXpbZNhIO36tfsmIBZ
+Ri9qlTgEB7xyqQ66F9+1
+=kEle
 -----END PGP SIGNATURE-----
diff --git a/dev-python/beaker/beaker-1.6.4-r1.ebuild b/dev-python/beaker/beaker-1.6.4-r1.ebuild
new file mode 100644
index 000000000000..54d7617baa70
--- /dev/null
+++ b/dev-python/beaker/beaker-1.6.4-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beaker/beaker-1.6.4-r1.ebuild,v 1.1 2013/02/22 00:03:12 mgorny Exp $
+
+EAPI=5
+
+# py2.5 seems to have db problems
+# pypy random exceptions, someone should take a closer look, it may
+# be just the usual test suite overload
+# py3.3 unfit with some types
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+
+inherit distutils-r1
+
+MY_PN="Beaker"
+MY_P="${MY_PN}-${PV}"
+
+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="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+# webtest-based tests are skipped when webtest is not installed
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/webtest[$(python_gen_usedep python{2_6,2_7,3_2,3_3})] )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Workaround for http://bugs.python.org/issue11276.
+	sed -e "s/import anydbm/& as anydbm/;/import anydbm/a dbm = anydbm" \
+		-i beaker/container.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+
+	if [[ ${EPYTHON} == python3.* ]]; then
+		# Notes:
+		#   -W is not supported by python3.1
+		#   -n causes Python to write into hardlinked files
+		2to3 --no-diffs -w "${BUILD_DIR}"/tests || die
+	fi
+
+	cd "${BUILD_DIR}"/tests || die
+	nosetests || die "Tests fail with ${EPYTHON}"
+}