From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- dev-python/httpbin/Manifest | 7 +-- .../httpbin/files/httpbin-0.7.0-brotlicffi.patch | 2 +- .../files/httpbin-0.7.0-optional-raven.patch | 12 ++++++ dev-python/httpbin/httpbin-0.7.0-r2.ebuild | 49 --------------------- dev-python/httpbin/httpbin-0.7.0-r3.ebuild | 49 +++++++++++++++++++++ dev-python/httpbin/httpbin-0.7.0-r4.ebuild | 50 ++++++++++++++++++++++ 6 files changed, 116 insertions(+), 53 deletions(-) delete mode 100644 dev-python/httpbin/httpbin-0.7.0-r2.ebuild create mode 100644 dev-python/httpbin/httpbin-0.7.0-r3.ebuild create mode 100644 dev-python/httpbin/httpbin-0.7.0-r4.ebuild (limited to 'dev-python/httpbin') diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest index 3e9dffd249c6..17a1f9de39b6 100644 --- a/dev-python/httpbin/Manifest +++ b/dev-python/httpbin/Manifest @@ -1,6 +1,7 @@ -AUX httpbin-0.7.0-brotlicffi.patch 1378 BLAKE2B b8a4ed9df72c8e031e8ee6fe02d1c8372a6114948de59ec0890e288cb2d52e5d08c4358648fdca4ee8319eebee05c4fe4dc2ed9aef36432f40bc82488b7fa7c9 SHA512 dd3538ed6373df0bf1bf648e2253fdc79737aa2abbe8780da0ad088d0438e266a4fa6e873e18a6b50fe56f9dde109f2a2755975740d990084f7b9ea1e4b2a95a -AUX httpbin-0.7.0-optional-raven.patch 841 BLAKE2B bdf8cd94706b08d6706349ad471212fbda7f78e7125378073e4db43af352b26778706b2c61ca51f6c1c44aae4fd250432793e0ffef463102324ed39069da20bd SHA512 757bbe80463b332571e9d6e2e3266d2db3df519a180a7d3840b6f4813c2373382519e322547feb522c59ec3893d4721e42463d8231b4f5904725b9547af407bd +AUX httpbin-0.7.0-brotlicffi.patch 1362 BLAKE2B 524973fe131181c6601ea7b973c25e55a3b195988ca56ba46debb80f44f6111c1bfe734abe659bee11caef36c322366d2c78b3a5798da54ce8bcc3ffaf20f313 SHA512 d0eda00e90904b090a43fb3504d0bbb4284837ecce1865ab87151e5661f0daa84dff81bfeb816181ee0e9f963114ff0fc46cec59b9b5de86ba322671abee4e56 +AUX httpbin-0.7.0-optional-raven.patch 1218 BLAKE2B 010a13db882711af3cd74175b87371d0c9c6e279168653836ce4a445357f4ca3fbd77fc262a57de5cbfccbc4da514e1e89253595b4fdab03553ed9adffddbc57 SHA512 2feb379c4b888560f825f5fce0130999705bfe83cff190da1651ffb9842243036ecb28d1f54cc92d7a855f73b45f0cf5164df75732f4ac2c9035b583941a9560 AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b31fb80c01cf97f19948f9d208d77289f829d3ef24f4cbdde74cc87d2d640b61a51994292fcdf5058f94b8768fd4c37a3cc1 SHA512 3556b921a6daed3dc561d78912b41ca9a3cea1274384f849bba1d7cd7e7014798ce5c9e93491351ca5225e26762be03c73cd0d09c60c90b8a55ff6e6ce0bf81f DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63 -EBUILD httpbin-0.7.0-r2.ebuild 1447 BLAKE2B 074c87e9bd31c6b582344479a040122f9c035cca0e87507c2f0283c221565ce290b9dbc73b78ba3ffaf533cf95e6fd40e28d92a8b0761c937240ee2562c692db SHA512 e9b2d0dc75238a016562c5039099e930c341d860142bf6309545a0d2c671815f1fe4c4e6b45826c4519b5d3938e87ef162a4b4bf0e1225d9066b0d5d5407cf0c +EBUILD httpbin-0.7.0-r3.ebuild 1447 BLAKE2B 23daabb436681521559ffcf07f1e7eacadfb3ec4eceec3c135606725fb036ff0025444e0202bb94ba1d9c35210eb61faf8584287865df01c47c27f7a34e555f2 SHA512 7e992cadf4038d63795bb1d78d6106a89ca396db508d52eaf376b3fd3a50ae0fb0faee8d185245c2957ec61628af5adf0d7087c169e9f7c81e8c529d1d0b123a +EBUILD httpbin-0.7.0-r4.ebuild 1487 BLAKE2B 0eea48a0d90924df2b77f1fe34baf8273b22e4a206c41d3511707603080c6bea470f596cfb15ed6ed214ead4733256c9209ff56edc63c747f6ac41784a9aea15 SHA512 34f635860b5cc49b2e06cdc63d6fc27113b192c308ea46df5a8c69a9c526a0166312f362abf59e5a078d70a6767ad9ee39f63f9f22eb74b2662af540c5968d61 MISC metadata.xml 394 BLAKE2B 73c2d6f27f957cfeaddc8c69cc0d7a7bf68514f1d840a982de1eaf9a62be8cf066d7b77b4b5f69fc42806979934e26d497ddf9d66d8f18dcaa32168fd83f7a0e SHA512 70c529e2d1b716a1997773f999902547010bd9406cfde38408a5941a70400e13c949f1a8fb20a53e0f0da4da91742cc259910e97cce8917dc029f3cb84d72bdd diff --git a/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch b/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch index f74474a70aa1..8031ad72de5b 100644 --- a/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch +++ b/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch @@ -35,7 +35,7 @@ index 7f9956b..8e17ef3 100644 install_requires=[ - 'Flask', 'MarkupSafe', 'decorator', 'itsdangerous', 'six', 'brotlipy', + 'Flask', 'MarkupSafe', 'decorator', 'itsdangerous', 'six', 'brotlicffi', - 'raven[flask]', 'werkzeug>=0.14.1' + 'werkzeug>=0.14.1' ], ) -- diff --git a/dev-python/httpbin/files/httpbin-0.7.0-optional-raven.patch b/dev-python/httpbin/files/httpbin-0.7.0-optional-raven.patch index 8602ed7641be..5d626768bd27 100644 --- a/dev-python/httpbin/files/httpbin-0.7.0-optional-raven.patch +++ b/dev-python/httpbin/files/httpbin-0.7.0-optional-raven.patch @@ -17,3 +17,15 @@ diff -dupr a/httpbin/core.py b/httpbin/core.py sentry = Sentry(app, dsn=os.environ['SENTRY_DSN']) # Set up Bugsnag exception tracking, if desired. To use Bugsnag, install the +diff --git a/setup.py b/setup.py +index 7f9956b..3cab2ae 100644 +--- a/setup.py ++++ b/setup.py +@@ -35,6 +35,6 @@ setup( + include_package_data = True, # include files listed in MANIFEST.in + install_requires=[ + 'Flask', 'MarkupSafe', 'decorator', 'itsdangerous', 'six', 'brotlipy', +- 'raven[flask]', 'werkzeug>=0.14.1' ++ 'werkzeug>=0.14.1' + ], + ) diff --git a/dev-python/httpbin/httpbin-0.7.0-r2.ebuild b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild deleted file mode 100644 index 8c04217f15d8..000000000000 --- a/dev-python/httpbin/httpbin-0.7.0-r2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="HTTP Request and Response Service" -HOMEPAGE="https://github.com/postmanlabs/httpbin - https://pypi.org/project/httpbin/" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" - -RDEPEND=" - dev-python/brotlicffi[${PYTHON_USEDEP}] - dev-python/decorator[${PYTHON_USEDEP}] - dev-python/flask[${PYTHON_USEDEP}] - dev-python/itsdangerous[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=dev-python/werkzeug-0.14.1[${PYTHON_USEDEP}]" - -PATCHES=( - # do not import raven if it's not going to be used - # (upstream removed it completely in git anyway) - "${FILESDIR}"/httpbin-0.7.0-optional-raven.patch - # fix tests with new versions of werkzeug - "${FILESDIR}"/httpbin-0.7.0-test-werkzeug.patch - # use brotlicffi instead of brotlipy - "${FILESDIR}"/httpbin-0.7.0-brotlicffi.patch -) - -distutils_enable_tests unittest - -src_prepare() { - # a new version of flask or whatever converts relative redirects - # to absolute; this package is dead anyway, so just skip - # the relevant tests - sed -e 's:test_redirect:_&:' \ - -e 's:test_relative:_&:' \ - -i test_httpbin.py || die - - distutils-r1_src_prepare -} diff --git a/dev-python/httpbin/httpbin-0.7.0-r3.ebuild b/dev-python/httpbin/httpbin-0.7.0-r3.ebuild new file mode 100644 index 000000000000..99f8b0295ddd --- /dev/null +++ b/dev-python/httpbin/httpbin-0.7.0-r3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="HTTP Request and Response Service" +HOMEPAGE="https://github.com/postmanlabs/httpbin + https://pypi.org/project/httpbin/" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + +RDEPEND=" + dev-python/brotlicffi[${PYTHON_USEDEP}] + dev-python/decorator[${PYTHON_USEDEP}] + dev-python/flask[${PYTHON_USEDEP}] + dev-python/itsdangerous[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + >=dev-python/werkzeug-0.14.1[${PYTHON_USEDEP}]" + +PATCHES=( + # do not import raven if it's not going to be used + # (upstream removed it completely in git anyway) + "${FILESDIR}"/httpbin-0.7.0-optional-raven.patch + # fix tests with new versions of werkzeug + "${FILESDIR}"/httpbin-0.7.0-test-werkzeug.patch + # use brotlicffi instead of brotlipy + "${FILESDIR}"/httpbin-0.7.0-brotlicffi.patch +) + +distutils_enable_tests unittest + +src_prepare() { + # a new version of flask or whatever converts relative redirects + # to absolute; this package is dead anyway, so just skip + # the relevant tests + sed -e 's:test_redirect:_&:' \ + -e 's:test_relative:_&:' \ + -i test_httpbin.py || die + + distutils-r1_src_prepare +} diff --git a/dev-python/httpbin/httpbin-0.7.0-r4.ebuild b/dev-python/httpbin/httpbin-0.7.0-r4.ebuild new file mode 100644 index 000000000000..f684abd4f2b0 --- /dev/null +++ b/dev-python/httpbin/httpbin-0.7.0-r4.ebuild @@ -0,0 +1,50 @@ +# 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..10} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="HTTP Request and Response Service" +HOMEPAGE="https://github.com/postmanlabs/httpbin + https://pypi.org/project/httpbin/" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +RDEPEND=" + dev-python/brotlicffi[${PYTHON_USEDEP}] + dev-python/decorator[${PYTHON_USEDEP}] + dev-python/flask[${PYTHON_USEDEP}] + dev-python/itsdangerous[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + >=dev-python/werkzeug-0.14.1[${PYTHON_USEDEP}]" + +PATCHES=( + # do not import raven if it's not going to be used + # (upstream removed it completely in git anyway) + "${FILESDIR}"/httpbin-0.7.0-optional-raven.patch + # fix tests with new versions of werkzeug + "${FILESDIR}"/httpbin-0.7.0-test-werkzeug.patch + # use brotlicffi instead of brotlipy + "${FILESDIR}"/httpbin-0.7.0-brotlicffi.patch +) + +distutils_enable_tests unittest + +src_prepare() { + # a new version of flask or whatever converts relative redirects + # to absolute; this package is dead anyway, so just skip + # the relevant tests + sed -e 's:test_redirect:_&:' \ + -e 's:test_relative:_&:' \ + -i test_httpbin.py || die + + distutils-r1_src_prepare +} -- cgit v1.2.3