gentoo auto-resync : 06:09:2022 - 22:33:57

5 files changed, 2 insertions, 142 deletions

diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index d0d63fc985b9..2fa4980ed6e7 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,7 +1,3 @@
-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.21.tar.gz 74229 BLAKE2B 88674389d2c087a7416443d031995ee923a98b790eb85d81b625f11b2fb0baee35d90a3ee2dba5b9d4744a343a34396a50edef0f85a2d6f4f0f4da95bae31b5b SHA512 3d621f6684f439a4a5718ad25e8b45eb0d1100cd565ec5b797adf67141e01d835cde671e687f5515cb6eab69bb465e9c7d004131634609266c2e1b69b0adbf43
 DIST bottle-0.12.23.tar.gz 73965 BLAKE2B ccd3dc3aad5c4c8b6899f55f03550cf9178e51788c27ece9808e1cff92693cc09dab145be16f814d29dae02ce53374a0470b2c4b032bc66a0ec2b1a11ec5ca44 SHA512 0550aa95680dd79d9c63c5de854845377183c86015893d9ee4e67126eca201582ef79d40ff0d1cbe79fe8a250118a775c63102475e337e18cfc1a65afe18f62a
-EBUILD bottle-0.12.21.ebuild 1417 BLAKE2B f5c8c1d9e0f9a45aef84a0a68b7117d955b31d78988a104a5b668f60c37c8c4e5b9c312cd6d92b83c4af6bbe9518df5432af76726fba05ed14c4a0b2e2b27a3e SHA512 b11d4a990ff0986af51d0b90513c41169f62c7af08b2af30a7762c70aa8b54b442ebf45d8424ac2a888caf16a30d634666bb36b99a3082d52ceaf52eec8add85
-EBUILD bottle-0.12.23.ebuild 1227 BLAKE2B a5fd579be6148f9fa931a1b6ac837b6f4e20d309757fcd8e9851bcf978b466befdf9ed14571b83b3bd6731e29697518118987edff4692b42fa9dc7d87cc42b49 SHA512 ca013100a4311a28448904db9a3f93117f5a3b3438ad4097e91253741400dca17f8d6ac669862f5111c5b1022314473747a94cc5c0a860412b1e820790ea3f68
+EBUILD bottle-0.12.23.ebuild 1219 BLAKE2B c4d228593e7530cc0888cede2ebd99ee2305dfd77741e8df6078f3da8064a70736c04b94034d4b3f81e91f996d1093b740dc359ab1de39a0a8101ae1b1b57d92 SHA512 334e0e07001c4e69d37de836e7426dcca4960acad3dd53d6ae6449e8dde68db0014aa50264a75b58a45e2d410936892963801d3cee233c14243a0fed1aa14f46
 MISC metadata.xml 345 BLAKE2B aef224dc08d75b22612e8f781673a84f4de7a50d2dd2af98c31286cbfbae19a1f4777f60c279b73a5291e7167581640c1bf9928884c95d8489f6f6c2045b9898 SHA512 62bdb54efd9580ecba9372b45973138202d7524bad742fd8752ef09149daa5f650c278aabaadec3de7c852595775ca7c858451a3dbf78a8f1f4df11379fe275e
diff --git a/dev-python/bottle/bottle-0.12.21.ebuild b/dev-python/bottle/bottle-0.12.21.ebuild
deleted file mode 100644
index 5f1690c5bbf0..000000000000
--- a/dev-python/bottle/bottle-0.12.21.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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://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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/bottle-0.12.8-py3.5-backport.patch
-	"${FILESDIR}"/bottle-0.12.19-py311.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() {
-	"${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`'
-}
diff --git a/dev-python/bottle/bottle-0.12.23.ebuild b/dev-python/bottle/bottle-0.12.23.ebuild
index 41a0b614f742..5839a4a80ef9 100644
--- a/dev-python/bottle/bottle-0.12.23.ebuild
+++ b/dev-python/bottle/bottle-0.12.23.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/bottle/files/bottle-0.12.19-py311.patch b/dev-python/bottle/files/bottle-0.12.19-py311.patch
deleted file mode 100644
index c7c36c3a37ee..000000000000
--- a/dev-python/bottle/files/bottle-0.12.19-py311.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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
-
diff --git a/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch b/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch
deleted file mode 100644
index 86e1ac04bc41..000000000000
--- a/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch
+++ /dev/null
@@ -1,36 +0,0 @@
- test/test_environ.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/test_environ.py b/test/test_environ.py
-old mode 100755
-new mode 100644
-index 2b8079b..2feebe3
---- a/test/test_environ.py
-+++ b/test/test_environ.py
-@@ -592,7 +592,7 @@ class TestResponse(unittest.TestCase):
-         r.set_cookie('name2', 'value', max_age=datetime.timedelta(days=1))
-         cookies = sorted([value for name, value in r.headerlist
-                    if name.title() == 'Set-Cookie'])
--        self.assertEqual(cookies[0], 'name1=value; Max-Age=5')
-+        self.assertEqual(cookies[0].lower(), 'name1=value; max-age=5')
-         self.assertEqual(cookies[1], 'name2=value; Max-Age=86400')
- 
-     def test_set_cookie_expires(self):
-@@ -602,7 +602,7 @@ class TestResponse(unittest.TestCase):
-         r.set_cookie('name2', 'value', expires=datetime.datetime(1970,1,1,0,0,43))
-         cookies = sorted([value for name, value in r.headerlist
-                    if name.title() == 'Set-Cookie'])
--        self.assertEqual(cookies[0], 'name1=value; expires=Thu, 01 Jan 1970 00:00:42 GMT')
-+        self.assertEqual(cookies[0].lower(), 'name1=value; expires=thu, 01 jan 1970 00:00:42 gmt')
-         self.assertEqual(cookies[1], 'name2=value; expires=Thu, 01 Jan 1970 00:00:43 GMT')
- 
-     def test_delete_cookie(self):
-@@ -611,7 +611,7 @@ class TestResponse(unittest.TestCase):
-         response.delete_cookie('name')
-         cookies = [value for name, value in response.headerlist
-                    if name.title() == 'Set-Cookie']
--        self.assertTrue('name=;' in cookies[0])
-+        self.assertTrue('Max-Age=-1' in cookies[0])
- 
-     def test_set_header(self):
-         response = BaseResponse()