gentoo resync : 15.01.2020

5 files changed, 71 insertions, 13 deletions

diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index 61af3b148694..17e55b04b88a 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -2,7 +2,9 @@ AUX bottle-0.12.8-py3.5-backport.patch 1720 BLAKE2B 63081eee3765d060d7381a0eeca9
 DIST bottle-0.12.12.tar.gz 71554 BLAKE2B 4b0d0d77c5ebaddcafd44e16a052535ded566245324d39e97a39dd20a193360487f9489e8e89471dd92ca35d6c5b2e8cbe1572a958db31b69d32d3e32f1b6403 SHA512 cdba3859129680f08b8c641708fd884ccf46d404786cbf48435d752fece998a446f49799e4e05e979b967843866f3e966a35a6cac7aed3270df55fae508bae31
 DIST bottle-0.12.13.tar.gz 70870 BLAKE2B d8bdef473181ce1cf6c0d1ea3537c407e68d23c1c44ca33e26c647d3b3783040d466b594c56c10cdd007d23bdf1708412d3e3ff108effa9e8a92e1b22f7a6c69 SHA512 86d106eb08e0b736a85aa69871f2d1e23c1d6f71948b85718daf131002c53c000e092ffdfe5b36c60460473467a2ca2b5af19767344689ffe638245e6859a80b
 DIST bottle-0.12.16.tar.gz 72248 BLAKE2B 21b5bc376648baec74577ac5b57fcacc58899babe07a034a436d5e2bde75a9e2e48b2569c5caf1478e77790c5fa327114ab9b084f014cc1ba97637d9ddfec659 SHA512 3c167f95902522c8f264e8478403da8e9b8cd84594318c4a773d38b7548b5ba95c99ef922033f6885cdc044b31f9c2e2f7ed263886637ce2a048e99c0c6e1403
-EBUILD bottle-0.12.12.ebuild 1448 BLAKE2B 43eca996f1b3afcb170b0bea233a6173f2a9883034488585d0a44782e65ff6c0fe14306789b3a9b5b7515db563e03ffb6cf14bf752f3c4d2e608646843a69d94 SHA512 32b5226b5032cf57fae85859a93a2699408d12db1b932761cb07805bf715b3266696ae3169f00534c86d80eb25c15fa293be788535b9082de97c79888643a0ad
-EBUILD bottle-0.12.13.ebuild 1459 BLAKE2B 069d94752319d6517cb41ffa3ad1ab928fed6e8ba218b7538d0eef2aa480df56a50d33fe405c5b57f3e483b95c6993b4286443ce6410eb39d22cb72f2aaa122b SHA512 41d734c873db91ad000a6e850941a9223166c3aa9edae8c87481dbe7b278f908e5307abd351ffa22b83a13f7a68d255681111094598ca6dee3f4a028167f3c03
-EBUILD bottle-0.12.16.ebuild 1453 BLAKE2B 32791c0e9eaa9cffaa883df662b4afdf5164a2dcf35982df25c2b947d35abcb94c2bfb9b286cc9c59c4f8f2f4b6526c154794e9e8c31cad9e1f7a87658441225 SHA512 cec3dcf52e663f49f5aa085303fc823934219d7eed1074ce625b7e077700eb7446abd36a378ff12125f14b295625cb08a9bec4bc7c5346d1376a3fad0a147cfe
+DIST bottle-0.12.18.tar.gz 71557 BLAKE2B a34cc1ab9a2a8505b7fda8bbddbae30b4e6c4829cae53f0f886237a21fdfa7f2b2463b216d7a16464539f41bdce4c1dabb5cc66027b8fdd19b10e9a78a3cdbb5 SHA512 db8a341cd80d755205518bb9eac5b79dca9e541ab3ad9d9d57f891d895f7df75a8facd16b068cbdf7c4f884f35e384449f4cbd565a43e9c5d000d3a9f5b7dcb0
+EBUILD bottle-0.12.12.ebuild 1439 BLAKE2B 03689e51e3e9d824be9e9c0c17c4ffec086d08143b1e34376be6e1fefb627686a9af62c95ca1eed4d0f3ff8be5127868b3bbcbe9dbf6575d2d02e9a5f068a297 SHA512 3e644818e3c96eb1a2c110109a66597353e0891b69a605e8c371fecf6592cce628c2c450ea206f804c797c487fc47fcf43318b8dab4322b6c2c1af60a597577a
+EBUILD bottle-0.12.13.ebuild 1452 BLAKE2B f135d7a49b999e4a718f852f460942f203c6bc421e17de32d14941ae4e8f7ec064b2eab6a29334146ae9fc9c74d41c9ee549b523c318c1b5fe5674295fa40ed7 SHA512 e788e402a32f4c1cfa8535cab12f4d999935a562475ce7d1179032e4aa062fae874a85551cd8bbecb4b9522256d4c9ed0de964f91139bc701cb7b51dcd629bb7
+EBUILD bottle-0.12.16.ebuild 1477 BLAKE2B 298e895147ca927d982c649109d3f40c515f11e81fa3367b38dfabb4b8263d884e4b83103999fc204da51b060aebad10a744350def2639db8103db95dadc2c90 SHA512 7c6cecc35d259c77fa1037094300119c0845dfd62307c7e0290d908eae6173f45a5daf4c85d78089102b2fffeae6c5af3c1b2a158657d897d749b4b77636fb38
+EBUILD bottle-0.12.18.ebuild 1446 BLAKE2B 403af2044ae8ace7378ccf2d7d6456b35af95dcf74a6314b04166ecf2cb256c4cb980e36f670b7e5d07065932fb9c2f4cdb6dcbe23a8751cc23df9116c7b1ec6 SHA512 8deb026f313edf9c4f2ba271935df3dbff0e00cfbe8b8a32b959427fcf4ea35e334ed93027fb88b037e257d81a38bc5603bbdf8189406d750c29d2164e16814d
 MISC metadata.xml 319 BLAKE2B 29a2c856ee0a0af9214a5cec842b697fcb095d2bcf4702225b2e81d4f715967c29a383da78c43ac60d4464e27e651e81f1b085684b0b6f39925a6df7c36a54c4 SHA512 2ff50f032ea6042a32a7d391906ff95d00115367770423874aa6ee638b1db03fc0b7fabc484e1ecc002eff1e5abf5d45075463b76b7d512535d4820c46b56251
diff --git a/dev-python/bottle/bottle-0.12.12.ebuild b/dev-python/bottle/bottle-0.12.12.ebuild
index d6c4500fb38a..7ffdcd18c13d 100644
--- a/dev-python/bottle/bottle-0.12.12.ebuild
+++ b/dev-python/bottle/bottle-0.12.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/bottle/bottle-0.12.13.ebuild b/dev-python/bottle/bottle-0.12.13.ebuild
index b5e4b879eda4..6b4830583b0e 100644
--- a/dev-python/bottle/bottle-0.12.13.ebuild
+++ b/dev-python/bottle/bottle-0.12.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/bottle/bottle-0.12.16.ebuild b/dev-python/bottle/bottle-0.12.16.ebuild
index 529b10e1111e..41250b4a6f30 100644
--- a/dev-python/bottle/bottle-0.12.16.ebuild
+++ b/dev-python/bottle/bottle-0.12.16.ebuild
@@ -1,24 +1,28 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1 eutils
 
 DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="https://pypi.org/project/bottle/ http://bottlepy.org/"
+HOMEPAGE="https://pypi.org/project/bottle/ https://bottlepy.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+		' 'python*')
+	)"
 RDEPEND=""
 
 PATCHES=(
@@ -36,7 +40,7 @@ python_prepare_all() {
 python_test() {
 	# A few odd fails in the suite under pypy
 	# https://github.com/bottlepy/bottle/issues/714
-	"${PYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
+	"${EPYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
 }
 
 pkg_postinst() {
diff --git a/dev-python/bottle/bottle-0.12.18.ebuild b/dev-python/bottle/bottle-0.12.18.ebuild
new file mode 100644
index 000000000000..5c483f67e834
--- /dev/null
+++ b/dev-python/bottle/bottle-0.12.18.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="https://pypi.org/project/bottle/ https://bottlepy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+		' 'python*')
+	)"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12.8-py3.5-backport.patch
+)
+
+python_prepare_all() {
+	sed -i -e '/scripts/d' setup.py || die
+
+	# Remove test file requring connection to network
+	rm test/test_server.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# A few odd fails in the suite under pypy
+	# https://github.com/bottlepy/bottle/issues/714
+	"${EPYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Templating support" dev-python/mako
+	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`'
+}