3 files changed, 45 insertions, 15 deletions
diff --git a/dev-python/bottle/ChangeLog b/dev-python/bottle/ChangeLog
index c6ddc013a4bf..118a59fd2f35 100644
--- a/dev-python/bottle/ChangeLog
+++ b/dev-python/bottle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/bottle
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bottle/ChangeLog,v 1.20 2014/01/05 17:51:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bottle/ChangeLog,v 1.21 2014/03/10 08:42:29 ultrabug Exp $
+
+*bottle-0.12.5 (10 Mar 2014)
+
+  10 Mar 2014; Ultrabug <ultrabug@gentoo.org> +bottle-0.12.5.ebuild:
+  version bump fix #503340 thx to Ondřej Súkup
 
   05 Jan 2014; Agostino Sarubbo <ago@gentoo.org> bottle-0.11.6-r1.ebuild:
   Stable for sparc, wrt bug #481896
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index 616ad5b4a55d..c2461c5c5970 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -4,26 +4,18 @@ Hash: SHA256
 DIST bottle-0.10.9.tar.gz 55771 SHA256 bfe88bcf920880d9c355f58b651a97e7f8b56437b104ff951fb985a129c06794 SHA512 0e8ef787b6cc7a0f527af1ec4cf3929a8eafc694eb24c24e4e86d60c28432643d0aed4c014f4c6375661d52a57f7216ea3693879599848d72dce9e1777fa762e WHIRLPOOL 48eba826b2f40d85808420e1c825c1c5b35705b03447d7a64095558637f68c8d2900a441ead26f2909bfea417f4e411e2fa026805b0db7f51411770f81703fac
 DIST bottle-0.11.3.tar.gz 60391 SHA256 dfcb083b840a9b50753f24a13360b6a33d4976a69845ba27b87903b2cb1318bd SHA512 1730e72efc9a88ec36727a01c297901f6732e3314044ff6b11378b75b79bdb16ff00e89c11bab1cbd1053f132d599bcacc2e7de8facaedaaf8ee687ada7d7984 WHIRLPOOL 28fae5b62f341e161bb22525ecf4b92ecd4801babd46741be232bf6b1ebef13c0446f504d68f5204c288c2b176613d18a6c50ea75a3306b5176fb3d991fa7ede
 DIST bottle-0.11.6.tar.gz 60612 SHA256 2e63802cbe6a21537e35d92ec3c80a1e302dc619d169efe6a212cab9f48e7b29 SHA512 511748cee1694db9ec04f5f49cf5d44d273f6424733532d4558acc546b4a44a1462433ca9483bf59235b48318b20289e9ae8f8c5d1dc4379da4a86c03848f922 WHIRLPOOL 4746c3baa3c97a821f974069fef4d390e807078a187f2f041055427a90226c6e00ea4aecf75cd7b7754e62a7b52ab0df2c43d0d0db913b0e810d59512f4f1b6e
+DIST bottle-0.12.5.tar.gz 69120 SHA256 1e35b63edf744999cd47d86099aa3d0ab030522e38c25038fc5fd77fbc35b75b SHA512 8a116a84e9b1d273e7c17a9d920044e8283a8916585ebcf265362f767e96e868b05739d20795f98565b07eb359b6ea76128e49a0850002280b37e54cddb237c0 WHIRLPOOL 7a4fc6ac17daf1ae59ba72bd0ffe0a51e95649372300674857c59efef0d08c894813c95236c655d9c6dc53dc67c48a8f254b1eb15cd35172425d588579aca5b9
 EBUILD bottle-0.10.9.ebuild 1200 SHA256 3862f22e3f8e2dfe623bc7499b9cfda9bfe670641a787b863ac87a406697736a SHA512 e709de53bda4e25c3cc8be1a4d9c27d41267593b887d1012ead802e8a323a078d83731facedb9487f7309974efccbecdca26642553ee57bd6cba599f82bb4971 WHIRLPOOL 15419e5ecdca70f6fb02b7fa56f36c4a7de50fe4a3989a32aac280a48908590db20a52c2877b8e0ee9163b442f9d487b65419f735cf86f1a333cd857a68dbab7
 EBUILD bottle-0.11.3.ebuild 1197 SHA256 97a1f3a6c700ad9fd04ee11b230acb150b542c8c403a07f33b5ae6248ad2d2e1 SHA512 2cd121a1ad8cf6841e9d395659ab10db177a123a4a1b7e8b43252477a611f3c58c697b484050889003e883e44921416d7b01d195281ca639ba6dba51060bb71c WHIRLPOOL c03e32c50b95a40928aa4ea28d762292e0d42400b2664f096fd2174ef3922757c1eef46d303f7ba523d36bf50831c5c15183c88cb70071aaf7f81cb27eac4ca5
 EBUILD bottle-0.11.6-r1.ebuild 1019 SHA256 0e8b879c4b006589575bc186e2b92c025f466140d51a8b95a1964f14c0dcc642 SHA512 73e39b210c28e3ca0b9ca16b29e5596a26a81af0f26a8f918fda3655845c7bd3033202054f06a32d663c416cfa131ad41af937bc02e6a4cbcc4f8e83803ab452 WHIRLPOOL e2e3748ea9fbdcae897cc34b7be4515e6bb81e2c620420152a28dd076d8e8e28babce32a7e30c65a10327ff7c2c0ebaed96fde1cee9a05028ce7a32e0799219f
 EBUILD bottle-0.11.6.ebuild 607 SHA256 c2ecc38b96dee07b732db22d13597ce4e3d1803a1815fcb9368302313790b558 SHA512 fe2585630c82b1b3b538a01ac09e90277a8fc9773e996243869ff2c5ae11cfdb2716ff81cf00e04ba7e45ae16708da85aeceddf2ff58955a81ff9677a3107542 WHIRLPOOL 56b903d0fa7bdfed623c49505b04d06c6de40b40e74b2a2f6b34bffbcd180a4c048d8d76c8ea2bc4d82359a944d3b79bf37ec01e0d20c9eff8dc57d26e4923d5
-MISC ChangeLog 3094 SHA256 db9d00edc352073422e3535c2cda07ea86a4f1f676b51ca7b115376d7962f13c SHA512 41b0afd72249f0905cda20f312f94b98aafbf07191883c5bedfa98d4de2afcb4879adeecb61833ca8f02523973da74417c0fa5b6028190205357a0f317154394 WHIRLPOOL ecc34d8a79714269c7a20af22e4837b8b4eb75985d3607ece9f9cfe84c45eeb8dd8c1f7bb94869313f151f1f096b291673279014c1b3cb49011a32089718ce5c
+EBUILD bottle-0.12.5.ebuild 1028 SHA256 06e618e47100be30295a10a684ffd5346bfc465ebcab80c6a2fd224ce0d8ab5b SHA512 4f80c15bfcf4e08b59b0b4d5715cc96368581a27a1a7f209f01f46e9acd113a3fbfbf10c3787d02d0a7ae64a24795cf600ec513c094636fc7aad2011f2ee2056 WHIRLPOOL 77efaad8d857c9af0e39143e8869ef8b92292fc2fdbb567879ae57befc495d3baeb3c988b783165a1c31479802af9813a126c22c44c8196da3b3bae9161fe17a
+MISC ChangeLog 3248 SHA256 8e20771d5039b0057ab136a1dd78bee2cc7c259d423ca2bbc847fe5864d449f2 SHA512 77108664195a9f4b51beeb8fbf03f85f541a8aae046f089c60c2b49648547a35fc3cd898d9f4fa7a4b0456715205d2d4ef2a67a558f27be5d8ecc0aaa9f56b56 WHIRLPOOL 71f6ea0363602a0db2ef8af10071cb4dc0dadae1ed5f739c7db0dab6d1fc2e7bdeaef5171c25c34f3a8728fd6167da9ddc6be026869b6dd587ef4b8d0ffeb1b8
 MISC metadata.xml 253 SHA256 e46efd590a64061ef839b703b4ea6f25ec8aa4b2e4da401c7ae00c74828de0c2 SHA512 8b47855847429a6f134541fe072f4b650f58e8ef0eb534e61c88442681429185b6ae3217512c69a427cf1309bad72fa7ab0d17bc62db76e4653081639224eac4 WHIRLPOOL 28eed9c27b29956e68cc70e1f74106f7e1b30a744c0cf045957cf80b5da93c05174f9a426ea7efef83ed07b7b3bdeb1c7139199e211837c5d4ec64870e0e7c69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSyZu3AAoJELp701BxlEWfzaEP/RPIntSI2NnJzuA63+myLISF
-Sb6qfMYcG8fNz8XwN4MAn0lfnIDEvcL/Noc0HNc6oYCsijJUGUYxMOX6oy0BDkDK
-HerXLaX+SVQxlEfDA4eJlJncQuujg88BVwa6KsHMMYwi6gbY6M3+iWJKkEv3Bw1u
-T60QEvdlgN7KljP8Rl/kX7F/06pd2OdMz9zpTzN1482lKN5qugN+KoxaPILe6gEd
-MYzZWQ9GAhPhMC0ndyxZH4XFAkhQ7icg3vLp3LBkGJLzniglLhPlC02lh0R0KXEL
-08p5MOinnH7AyZidQFlGKwD6dPFY4PJ5EAxQi/8mkgfBCQbLB8DQhM9SrEnWvgfF
-Rc4m/ReaVaJoNOAHXrPWmm20GuxVpyC/CfwOrkw/Q0QvZ0a9XouSCFKt6JtHJXhK
-2HRlQU1cY1+TrGcKjeyt4Oz6PSaV1SqKUlxSY7+Y6jSwpNyWtwv5uhaPwjGA4y6o
-buN+cLwLRJg4LZpRNWIOPqvGXml4Hu5uCqSG4m4wxOSwa9ZondsBYneUq2HOutW1
-5qZ4nbXAHxImAzJ7MxPsuPDzy/Xj/rVnYowluxnLDuUfnPhVBG0mXrvF8JNXKGkA
-MQbZeLer9bIAJpRAIUd61KnQdKAsP+pNJBn+IieFGhrEC9UV+fTcWawMHS0cVycy
-LeFBM2IIFe+5b6mvkjSv
-=uc4R
+iF4EAREIAAYFAlMdevoACgkQKiQSS7ZY+hMTwgD+NwCxbRCHol/HcPknL00DGHse
+xlkhUgClWz0G8Vihs4cA/2uUcLWJYNCRBZQLnH6TYFptH/mFrHQLgIQIQy99R7gT
+=5AZ3
 -----END PGP SIGNATURE-----
diff --git a/dev-python/bottle/bottle-0.12.5.ebuild b/dev-python/bottle/bottle-0.12.5.ebuild
new file mode 100644
index 000000000000..1b30cc68d906
--- /dev/null
+++ b/dev-python/bottle/bottle-0.12.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bottle/bottle-0.12.5.ebuild,v 1.1 2014/03/10 08:42:29 ultrabug Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0)
+inherit distutils-r1
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="http://pypi.python.org/pypi/bottle http://bottlepy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+python_prepare_all() {
+	sed -i -e '/scripts/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
+	elog "we do as most other distros and do not install the script anymore."
+	elog "If you do want/have to call it directly rather than through your app,"
+	elog "please use the following instead:"
+	elog '  `python -m bottle`'
+}