gentoo resync : 29.12.2022

3 files changed, 65 insertions, 11 deletions

diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index c277783bd51d..f94a94e6f520 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,4 +1,5 @@
+AUX bottle-0.12.19-py311.patch 1606 BLAKE2B 78808f90cf5c32ad6ac4675c3f55b144cb3d6d4fb5299a7e78de785553de13d5c9e44da78a9444aa92f869cede8d8e75a52773c1d5bea5d5a29893d27d8edbc4 SHA512 584ef8a5a66175841c318596c63c6ffa702a4c5b0958c1465f8def98a89aa32c9e36ad6caaf361bfdcfed050f4b2361e58b32fbffa2490014bd51c29244bd39d
 AUX bottle-0.12.8-py3.5-backport.patch 1720 BLAKE2B 63081eee3765d060d7381a0eeca97fde17367273b0308449678301f0d2ed9357c90881aeeff31c6a26920ff256b76b0567a74628499fb4d9f2325bc75de6a2e8 SHA512 10f8b95d77d35db582be9bb937ca0c52050c22faa191f373b34039c6ddec24a8e71ce26f6bc9c3f3af7973670343b2f3131c02ed626e3d161a636f8c9e4cdd2b
-DIST bottle-0.12.19.tar.gz 73142 BLAKE2B e59d7a507d3401869ba4953a48274062fc56226afa2f7aad596b4ef4352e4a79cea2d224dfe32d7ce014e4f4a3ba088d0e7a0886f64a84bb6b78571e953fa3c3 SHA512 e5d2f6a32d1b89ae3cc9607456c0614db2b58882c6d36273d695c51d3d77b1858cac4d914dbf19bca3b74be68c197aa6473f162e40d9b7ae2af3a084a28c2637
-EBUILD bottle-0.12.19.ebuild 1380 BLAKE2B f3b2dd740980f6e11b66a5ccfb75070a03b7449f605ca3b280165316292102df2c5ae805f8bf079e4dff8df829e8fd1a494076cf4127301b551feb29a44c05f5 SHA512 2e1fff641be3a3f377d0724db4cdf1f2d3d339ca968450c5fe388696bc6e72e7469655b042d6536dde989821007b8de3845edbaeaf83542a22b9c02dcdffb180
+DIST bottle-0.12.21.tar.gz 74229 BLAKE2B 88674389d2c087a7416443d031995ee923a98b790eb85d81b625f11b2fb0baee35d90a3ee2dba5b9d4744a343a34396a50edef0f85a2d6f4f0f4da95bae31b5b SHA512 3d621f6684f439a4a5718ad25e8b45eb0d1100cd565ec5b797adf67141e01d835cde671e687f5515cb6eab69bb465e9c7d004131634609266c2e1b69b0adbf43
+EBUILD bottle-0.12.21.ebuild 1417 BLAKE2B f5c8c1d9e0f9a45aef84a0a68b7117d955b31d78988a104a5b668f60c37c8c4e5b9c312cd6d92b83c4af6bbe9518df5432af76726fba05ed14c4a0b2e2b27a3e SHA512 b11d4a990ff0986af51d0b90513c41169f62c7af08b2af30a7762c70aa8b54b442ebf45d8424ac2a888caf16a30d634666bb36b99a3082d52ceaf52eec8add85
 MISC metadata.xml 345 BLAKE2B aef224dc08d75b22612e8f781673a84f4de7a50d2dd2af98c31286cbfbae19a1f4777f60c279b73a5291e7167581640c1bf9928884c95d8489f6f6c2045b9898 SHA512 62bdb54efd9580ecba9372b45973138202d7524bad742fd8752ef09149daa5f650c278aabaadec3de7c852595775ca7c858451a3dbf78a8f1f4df11379fe275e
diff --git a/dev-python/bottle/bottle-0.12.19.ebuild b/dev-python/bottle/bottle-0.12.21.ebuild
index 4a7ace2670ef..5f1690c5bbf0 100644
--- a/dev-python/bottle/bottle-0.12.19.ebuild
+++ b/dev-python/bottle/bottle-0.12.21.ebuild
@@ -1,26 +1,36 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1 optfeature
 
 DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="https://pypi.org/project/bottle/ https://bottlepy.org/"
+HOMEPAGE="
+	https://bottlepy.org/
+	https://github.com/bottlepy/bottle/
+	https://pypi.org/project/bottle/
+"
 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 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="test? ( dev-python/mako[${PYTHON_USEDEP}] )"
+BDEPEND="
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.12.8-py3.5-backport.patch
+	"${FILESDIR}"/bottle-0.12.8-py3.5-backport.patch
+	"${FILESDIR}"/bottle-0.12.19-py311.patch
 )
 
 python_prepare_all() {
@@ -32,8 +42,6 @@ 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}"
 }
 
diff --git a/dev-python/bottle/files/bottle-0.12.19-py311.patch b/dev-python/bottle/files/bottle-0.12.19-py311.patch
new file mode 100644
index 000000000000..c7c36c3a37ee
--- /dev/null
+++ b/dev-python/bottle/files/bottle-0.12.19-py311.patch
@@ -0,0 +1,45 @@
+From 232f671fd0a28d435550afc4e2a9fde63c9e0db2 Mon Sep 17 00:00:00 2001
+From: Riley Banks <waultah@gmail.com>
+Date: Sun, 11 Oct 2015 10:21:43 +0100
+Subject: [PATCH] Implement getargspec using inspect.Signature
+
+---
+ bottle.py | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/bottle.py b/bottle.py
+index 9806efd..18ed730 100644
+--- a/bottle.py
++++ b/bottle.py
+@@ -41,9 +41,27 @@ import base64, cgi, email.utils, functools, hmac, itertools, mimetypes,\
+ from datetime import date as datedate, datetime, timedelta
+ from tempfile import TemporaryFile
+ from traceback import format_exc, print_exc
+-from inspect import getargspec
+ from unicodedata import normalize
+ 
++# inspect.getargspec was removed in Python 3.6, use
++# Signature-based version where we can (Python 3.3+)
++try:
++    from inspect import signature
++    def getargspec(func):
++        params = signature(func).parameters
++        args, varargs, keywords, defaults = [], None, None, []
++        for name, param in params.items():
++            if param.kind == param.VAR_POSITIONAL:
++                varargs = name
++            elif param.kind == param.VAR_KEYWORD:
++                keywords = name
++            else:
++                args.append(name)
++                if param.default is not param.empty:
++                    defaults.append(param.default)
++        return (args, varargs, keywords, tuple(defaults) or defaults)
++except ImportError:
++    from inspect import getargspec
+ 
+ try: from simplejson import dumps as json_dumps, loads as json_lds
+ except ImportError: # pragma: no cover
+-- 
+2.35.1
+