dev-python/bottle: Version bump. Fix proper support for Python 3.x. Expect src_test...

svn path=/sunrise/; revision=12365

diff --git a/dev-python/bottle/ChangeLog b/dev-python/bottle/ChangeLog
index dd255bdd6f4fa46da530200918fb5450e5358c7e..ed889c53ce0954b4ee9fcdcdad83c7da0c287326 100644 (file)
--- a/dev-python/bottle/ChangeLog
+++ b/dev-python/bottle/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Sep 2011; Johan Bergström (jbergstroem) <bugs@bergstroem.nu>
+  -bottle-0.9.5.ebuild, +bottle-0.9.6.ebuild:
+  Version bump. Fix proper support for Python 3.x. Expect src_test soon
+
   29 Jun 2011; Mike MacDonald (crazymykl) <crazymykl@gmail.com> ChangeLog:
   fix Manifest snafu
 

diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index 0d83ca696b5d92dd3270a7ee93ef312f59f95fa6..bd455aef56ac707dae0b5601c2e48bb7a9cc0b12 100644 (file)
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,4 +1,4 @@
-DIST bottle-0.9.5.tar.gz 45252 RMD160 3160f5b1ccfe9df28e40edaa8096fa8ea4ab0714 SHA1 c54e9f4d1ccf2c4585acd1b52c67f66b89efd47d SHA256 375d460a06dd903a1ddb89b01e5e882f3f9524730a5ae08ddd0f119f0eaeb5cd
-EBUILD bottle-0.9.5.ebuild 472 RMD160 bb3af082655668be37aba3946c5ca5b7166392f4 SHA1 a9da6627716a56c2ffcc6c19b3f1dc66b50c1c9d SHA256 bf129f375fe47ea2d2e987fd03db6c4178cdf20babcdd2da81e5129c2ba0ae6f
-MISC ChangeLog 905 RMD160 1c45f6d005a3b12e4cf68a626566cda19de6c1d5 SHA1 29a9a637bd37cd93cdd049de461147535010ef77 SHA256 6794a4fb5dda266b29aaf16c39ce50c48e7a6f9084aaa2d2dc94b36fc1493885
+DIST bottle-0.9.6.tar.gz 45332 RMD160 10c2c4b85caafe16877c345ebad59dfa43ccb58a SHA1 4cafe5b44b8400f0f344f37cb66fcde5c8166fd8 SHA256 b9c894069a74db70b9f8717894957e1427ea2a662517fcde0e011351da89a69c
+EBUILD bottle-0.9.6.ebuild 710 RMD160 ca6908f3aa6638cbd4a39c0cf9a4af9296749e78 SHA1 5dccdb0c0c7ee9517acc8294e33cb701422c6968 SHA256 9526733440ce3d8caf31d9fc649cd17f9f5d00d6a1210d861f7b30543daf2e3a
+MISC ChangeLog 1091 RMD160 b4a3cc70753cc5b0f3d3700a8328b9de2b16e720 SHA1 901e05ff5026cb5ba79615d8717fee66ac6706cf SHA256 9b9968af42f3b2475670dd6ae530d355bf440934608053b7e1aa8f20743e22d1
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/dev-python/bottle/bottle-0.9.5.ebuild b/dev-python/bottle/bottle-0.9.6.ebuild
similarity index 62%
rename from dev-python/bottle/bottle-0.9.5.ebuild
rename to dev-python/bottle/bottle-0.9.6.ebuild
index f53a52349385adfd6d08ee8afdd60ef6864dcaa6..fe57837e875b8606a0cb5f97a4a1443f2c47c474 100644 (file)
--- a/dev-python/bottle/bottle-0.9.5.ebuild
+++ b/dev-python/bottle/bottle-0.9.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_DEPEND="*:2.5"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.4"
 
-inherit python distutils
+inherit distutils
 
 DESCRIPTION="A fast and simple micro-framework for small web-applications"
 HOMEPAGE="http://bottle.paws.de/"
@@ -20,3 +20,15 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 PYTHON_MODNAME=${PN}.py
+
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+src_prepare() {
+       distutils_src_prepare
+
+       2to3_conversion() {
+               [[ "${PYTHON_ABI}" == 2.* ]] && return
+               2to3-${PYTHON_ABI} -nw --no-diffs bottle.py
+       }
+       python_execute_function -s 2to3_conversion
+}