Version bump bottle to 0.12.6

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x30380381

3 files changed, 55 insertions, 15 deletions

diff --git a/dev-python/bottle/ChangeLog b/dev-python/bottle/ChangeLog
index 62fd929622ff..c89a4201a7bb 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.24 2014/06/06 15:44:16 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bottle/ChangeLog,v 1.25 2014/06/06 15:47:25 djc Exp $
+
+*bottle-0.12.6 (06 Jun 2014)
+
+  06 Jun 2014; Dirkjan Ochtman <djc@gentoo.org> +bottle-0.12.6.ebuild:
+  Version bump bottle to 0.12.6
 
 *bottle-0.11.7 (06 Jun 2014)
 
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index 8ecd17f66402..12c8d0fb9ae0 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -6,28 +6,30 @@ DIST bottle-0.11.3.tar.gz 60391 SHA256 dfcb083b840a9b50753f24a13360b6a33d4976a69
 DIST bottle-0.11.6.tar.gz 60612 SHA256 2e63802cbe6a21537e35d92ec3c80a1e302dc619d169efe6a212cab9f48e7b29 SHA512 511748cee1694db9ec04f5f49cf5d44d273f6424733532d4558acc546b4a44a1462433ca9483bf59235b48318b20289e9ae8f8c5d1dc4379da4a86c03848f922 WHIRLPOOL 4746c3baa3c97a821f974069fef4d390e807078a187f2f041055427a90226c6e00ea4aecf75cd7b7754e62a7b52ab0df2c43d0d0db913b0e810d59512f4f1b6e
 DIST bottle-0.11.7.tar.gz 60212 SHA256 8f301e45c522e458e5f51a59e1737b0dd84fc49c691f40f3a8a042b70691bf42 SHA512 d85e2da58df564f7a305cd1003491b69ac0c2d950962580c28183f710346642de1d3c9706605a56aadae3d755d6e5dd62d8c9b76422b8e95c64512f6ba560269 WHIRLPOOL 89e3e4a7145eae16e529b0ffdd360e02ed18294cc95d9d65658fdcbc8e8f5e10058c5222ef970f658def1ce130f480599b561912b5cea120dc8309db5b8d8a37
 DIST bottle-0.12.5.tar.gz 69120 SHA256 1e35b63edf744999cd47d86099aa3d0ab030522e38c25038fc5fd77fbc35b75b SHA512 8a116a84e9b1d273e7c17a9d920044e8283a8916585ebcf265362f767e96e868b05739d20795f98565b07eb359b6ea76128e49a0850002280b37e54cddb237c0 WHIRLPOOL 7a4fc6ac17daf1ae59ba72bd0ffe0a51e95649372300674857c59efef0d08c894813c95236c655d9c6dc53dc67c48a8f254b1eb15cd35172425d588579aca5b9
+DIST bottle-0.12.6.tar.gz 68934 SHA256 2bc3b9e73b8617d0329226eb819fb196fc262fa7db950f8ff26ba073761b8059 SHA512 2e5dec0b76b483c1fa8220d7bfce0ff1f799aa84214c053db782056d312196a3a524d1cf636c234cde201ece382190d1d45bd0da6093c10016af24b34c994b0b WHIRLPOOL 76626cc2e995fa80da41081260c70cae51e86e6026b82cf379e5be7f8da8825acb331d0fb06e27cf30791bfff371c58380389e2e48750d3af445676aab198bd3
 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 1027 SHA256 f0e03765c27f8ada7c2cf4250a0834b156109c796e758a346d1ee6128d5e3aa1 SHA512 6df02c8f858eb43a2f27885778f48a8e3c66024f688ba0c73b925c0b5f1d4ea40fc1367fe798aaa2ca68ceae19b4f2ba6e3a2cadfb3bf33e080d7c56c8a09ce8 WHIRLPOOL b0d63c2831d6b8fd512d6c4b8ad5f2657f8e7190ce137582b981c5d3541530bb9da7318461ef1d555fe8c956d13cb12437fd6c63b751a79cbd982d4c5deb1351
 EBUILD bottle-0.11.6.ebuild 612 SHA256 21827d6ed3b5ef02ae73b5bc55484c3d02688bd53a5bb0fff275974b7d6ea743 SHA512 2ba5f7cc0c555f5c28605cfa3a7f10020e2f770e3697763044bb1167e391f1fc7645f82c1ed1105edfcf2dd6e0be8476cb979eaf270a56352ea7e1b7c0dad54f WHIRLPOOL 7c717954578c7fded64289228745c29804776bb0357bcd5cc514bad65e7397214637c076be58f0253eaa0609f562da7afb5edb6378841f96d6428a5ea0cb7a2b
 EBUILD bottle-0.11.7.ebuild 1028 SHA256 b46b5fed9a87841fe8b763ea0f2a22090991db15fb8f3d0d26cd14edfd804479 SHA512 bb96811d78b3a66e4f43aa3c207b1d5ddc45e926cdaa302854f6b4d5344bd51f562865d76aca3dff84d470b350ac0cbaf70644608ce3348cb721c2bf5aa57d7f WHIRLPOOL 5566064ecd3564cc066728ead29ac27b19b10711eab320e64c6af7d6f0399b6afa1eff7d4bd3498307da218c5602f70cf68538218a1174c8b2e4748b96bf6ef1
 EBUILD bottle-0.12.5.ebuild 1025 SHA256 7b7a8d6e4b0fec43b0f20a1b6524029565720d911808c4f6d6704f8f0fe61936 SHA512 8ce630fd4f23e3ca4d32ce9e58ce179c531f20cec4618046d3f7cd5ca2644a1984a9cda9f397c22bed1d1c529ebf591786cf009e1e4f1bb46d9ce12a4ea2fe4a WHIRLPOOL 8c3c18c5f85b8cfa90694edb5f3352275e657ffb351eba7a864290d5eb2b3ee6a3b5afa9a37224f1d567fedf10345f82ec60676b869553fe40e0b264d7edb801
-MISC ChangeLog 3669 SHA256 a47d2e0dd28dcfb1a5d335b3dfacd23f9cdd497d09c1aa2b7919c4ab3e3833d7 SHA512 66e8595e740d7c43d1b924b0ee8b9fc27628e853435e41daaaf9d232a1e5ad9d6c11bf67d86e0390e8c554ce402ed3cfd387494c6877c9f63e29a3562cc69cd0 WHIRLPOOL 21f988b75fe2aee5fbd0d301bf85185845b8f69b727dd9f8b2b5df771a4f7c79e97f6e3abc6f2bd4cd77bb2bc0508cd5262a972063ece9c58f68db1e0b50c22c
+EBUILD bottle-0.12.6.ebuild 1021 SHA256 a77f92fda93a003e4b698b707ba80e662d12241049edfecce6bf3bfb78b5f980 SHA512 e9306d80b70fbbe7aa5cea0f8717537b27e44d67692570244c4ebe1ef0e428d0926478b99a531295b18450013c549653b178b19e44dff06bc4ddba99c762f646 WHIRLPOOL b392513cd6b3fa4d20bab91a2c21c5828c3b037aa3a1ad74c33d83b56b71766a1dfa4b742ddc9c48d2cf271b70682fafb7084e5e373577f001f1b765c363ddc3
+MISC ChangeLog 3803 SHA256 f19901e22b5da57c09f2c393e9efac78a515fbac21500a46e623e2cb3e511210 SHA512 dddd11ecf422c0779b1d20b25f821b72c938c04f0a9b103da12c29466032a5aadadf970e77e79fa0ca06d22ace3dec19c37141162bb7986f4fe77257c0a70b7a WHIRLPOOL 0209fc1506e3cccacf89a9e8acb64e3db2a67b89b32db6f1a1a244acdf8afc491dc58f581a5f986436eeff8fb4b89808b9d2429c2dd4738e0dc3e4540198f334
 MISC metadata.xml 253 SHA256 e46efd590a64061ef839b703b4ea6f25ec8aa4b2e4da401c7ae00c74828de0c2 SHA512 8b47855847429a6f134541fe072f4b650f58e8ef0eb534e61c88442681429185b6ae3217512c69a427cf1309bad72fa7ab0d17bc62db76e4653081639224eac4 WHIRLPOOL 28eed9c27b29956e68cc70e1f74106f7e1b30a744c0cf045957cf80b5da93c05174f9a426ea7efef83ed07b7b3bdeb1c7139199e211837c5d4ec64870e0e7c69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTkeIJAAoJEJ+WuSkwOAOBnh4P/1thNZw3eZaz6D75Cb4LuVyQ
-KB7Rmxg9kKSgz9aIFGy5ZtJMtk5vX1OK6yWITOpYk7duLpn29mAdZv0SVAPLKzs1
-7/nRXA6lVpJ7WfUDp0Z/CEh5EPKUC7BbHvV6jUVgcn7NqZ8nB/E39sFamm1sxgXr
-/XUSSfKMr52dTA/nWakzTa6tX0CYOEBeN2tKPDhxwVe/D3JRrU0jQW0FbfJ2O34X
-PpryuY/eA4O//uUXLCe44m8iuC9cNdqvnSLVhpQgPNXtqPsWTarljugAvxOD1zWZ
-J7zHwgeGUZB0658M1t+xYZ8RRj11a/0rBTWg1XqpSTCsDsbJHnBg4whin7WkLFF+
-lcxTHKXr0L//8WF2IKp+sSRR4M+JAIhv24CcSerOLzhltUN4NIofNfig0hjVzLH2
-3ecw+iDoVa6zKI+wfX2qw/y0VLeN6flu0qdrZZmwseIxOKMxjsAfqd5hZKTIbDvK
-2mIgjtJlGVkW/i4JDaPK8hO87DB7AQbU7PKKSwp72ZgoEFnNgtKrUqPvKzJxX3eO
-qV8RH6Q1ItlBAy0B4KZP0pFIP4enEd90PZlVbJuXMbrbtXBYYxh6nos1UAjgM8Q9
-lRSMbGA2dQuTOx5YOXPyMUcC0Gs9ihjsjgpRbGifO9TgiGhNIPJRaSCsiH1fDSNs
-vbUvHQKgs8o8FKm8NW9g
-=/53B
+iQIcBAEBCAAGBQJTkeKUAAoJEJ+WuSkwOAOBGuEP/2uJogySo13b1yiICvc+MzgQ
+qY8cQXHFsawOE2m+nM2Q+qy/N8oImzs5WQwxrAfgLNRFyVH+tjspHlbUuQfHBxuk
+Wxqhw8yT7zZpi2zWtuXm9/mYeq84W8M5WovWzLF05jzWNLOxIo2+o9VnEu7vGAlZ
+F+g81mSnaNt+EcXRz5CMypFyg7pN6QHMIsv5m5fBBuF3c5W6yzsTXPI6VIX+Kabh
+Te1gcgUbWjjk2KLOcHDosFe2fQAROvArx8ksVMB8piIDBoB4g4/BFsCgVxRA3nZz
+rCyztaxO2TNjTayD3PGze8iR1k7RGwv92aI2RSLLNRYKFtj39fMxXD4bmvbw9GzP
+7+MVRFOp1B0AAbSfybugeMBj6rbxAb5UzowXPqJGPyt4sUO7FJxDexW21PZkagQf
+86b90nY9RJBg0FJxavx8os+r7gy+Myzi9xscoiMdJnTB36cCZF/OU28yrCHU7lHT
+9dhnqgSowyqLguckkURhMaGpHsMCib9u12S4PRhij0VP7myeNlW5PPdhkk48NHEv
+XEPvl2eDlw+SrmqmewHNdjLIR3trGtKyQLx+0mjEWW2qboKMgeQc8qamL7ncQ84K
+ZbsLulpUaDXCzllKni37YHKjGo2Rta6DVxyvAuegJZ2srO84yM+4d2Dj8PnwZ/6V
+UiUMWNP+YheKtTaUX/qD
+=uyTO
 -----END PGP SIGNATURE-----
diff --git a/dev-python/bottle/bottle-0.12.6.ebuild b/dev-python/bottle/bottle-0.12.6.ebuild
new file mode 100644
index 000000000000..e944e77fd7e2
--- /dev/null
+++ b/dev-python/bottle/bottle-0.12.6.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.6.ebuild,v 1.1 2014/06/06 15:47:25 djc Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+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`'
+}