From a39f855200a32a855dcddf447df0ff2beaa09def Mon Sep 17 00:00:00 2001
From: "Liguros - Gitlab CI/CD [develop]" <gitlab@liguros.net>
Date: Sat, 15 Apr 2023 01:00:42 +0000
Subject: Adding metadata

---
 dev-python/dropbox/Manifest                        |  2 +-
 dev-python/dropbox/dropbox-11.36.0.ebuild          | 45 ----------------------
 dev-python/dropbox/dropbox-11.36.1.ebuild          | 43 +++++++++++++++++++++
 .../files/dropbox-11.36.0-setuptools-67.patch      | 25 ------------
 4 files changed, 44 insertions(+), 71 deletions(-)
 delete mode 100644 dev-python/dropbox/dropbox-11.36.0.ebuild
 create mode 100644 dev-python/dropbox/dropbox-11.36.1.ebuild
 delete mode 100644 dev-python/dropbox/files/dropbox-11.36.0-setuptools-67.patch

(limited to 'dev-python/dropbox')

diff --git a/dev-python/dropbox/Manifest b/dev-python/dropbox/Manifest
index b492e361299a..4ebd3603123d 100644
--- a/dev-python/dropbox/Manifest
+++ b/dev-python/dropbox/Manifest
@@ -1 +1 @@
-DIST dropbox-sdk-python-11.36.0.gh.tar.gz 1166682 BLAKE2B 46864c7d4143272a81a6e14c7430c153dc93dd0a82d8e78ef8bcf3c1a64919e2cccf725832fb794179f6eef953f172bc1dd579447ee2e8c36a141f9402807b3d SHA512 5dc30fabd0abe52de68d152300a5dbfc9e5fb55ed5799a3ceba5e0782914944d1ed915761f4ca3993913250608e3152234495abefff6f2b548cd11b7f2fe0e23
+DIST dropbox-sdk-python-11.36.1.gh.tar.gz 1166660 BLAKE2B ed2586c27e020cae38dafdee7367ea38ad191a6275ab677adef13cf3b3c2eec1fab204d6845a7108b33a925a41459053eb5d33bd5a5c0be771613e9f89f775d7 SHA512 29db18efa9059744d6e18f3f15eaee9161df0e26af947fac3fdf3d7e906380f499c1ecc4b2c14a5207c879cd282b73dea44a1dc664f27be99fbe2cd309b86f09
diff --git a/dev-python/dropbox/dropbox-11.36.0.ebuild b/dev-python/dropbox/dropbox-11.36.0.ebuild
deleted file mode 100644
index b52b5e4ea07d..000000000000
--- a/dev-python/dropbox/dropbox-11.36.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-GH_PN=dropbox-sdk-python
-
-DESCRIPTION="The offical Dropbox SDK for Python"
-HOMEPAGE="https://www.dropbox.com/developers"
-# pypi does not have tests, stick with gh
-SRC_URI="https://github.com/dropbox/${GH_PN}/archive/refs/tags/v${PV}.tar.gz -> ${GH_PN}-${PV}.gh.tar.gz"
-S="${WORKDIR}"/${GH_PN}-${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.16.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/stone-2.0.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}"/${P}-setuptools-67.patch )
-
-# disable tests that need SCOPED_USER_DROPBOX_TOKEN
-# and tests that fail
-EPYTEST_DESELECT=(
-	test/integration/test_dropbox.py
-	test/unit/test_dropbox_unit.py::TestClient
-	test/unit/test_dropbox_unit.py::TestOAuth::test_NoRedirect_whole_flow
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# this is wrong
-	sed -i -e "s/^import mock$/from unittest import mock/" test/unit/test_dropbox_unit.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/dropbox/dropbox-11.36.1.ebuild b/dev-python/dropbox/dropbox-11.36.1.ebuild
new file mode 100644
index 000000000000..0a1dd189c752
--- /dev/null
+++ b/dev-python/dropbox/dropbox-11.36.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+inherit distutils-r1
+
+GH_PN=dropbox-sdk-python
+
+DESCRIPTION="The offical Dropbox SDK for Python"
+HOMEPAGE="https://www.dropbox.com/developers"
+# pypi does not have tests, stick with gh
+SRC_URI="https://github.com/dropbox/${GH_PN}/archive/refs/tags/v${PV}.tar.gz -> ${GH_PN}-${PV}.gh.tar.gz"
+S="${WORKDIR}"/${GH_PN}-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.16.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/stone-2.0.0[${PYTHON_USEDEP}]
+"
+
+# disable tests that need SCOPED_USER_DROPBOX_TOKEN
+# and tests that fail
+EPYTEST_DESELECT=(
+	test/integration/test_dropbox.py
+	test/unit/test_dropbox_unit.py::TestClient
+	test/unit/test_dropbox_unit.py::TestOAuth::test_NoRedirect_whole_flow
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# this is wrong
+	sed -i -e "s/^import mock$/from unittest import mock/" test/unit/test_dropbox_unit.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/dropbox/files/dropbox-11.36.0-setuptools-67.patch b/dev-python/dropbox/files/dropbox-11.36.0-setuptools-67.patch
deleted file mode 100644
index 84d29befc635..000000000000
--- a/dev-python/dropbox/files/dropbox-11.36.0-setuptools-67.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This fails with setuptools-67
-
-Bug: https://bugs.gentoo.org/892569
-See also: https://github.com/dropbox/dropbox-sdk-python/issues/458
-
---- a/setup.py
-+++ b/setup.py
-@@ -27,7 +27,7 @@
- install_reqs = [
-     'requests >= 2.16.2',
-     'six >= 1.12.0',
--    'stone >= 2.*',
-+    'stone >= 2.0',
- ]
- 
- setup_requires = [
---- a/test/requirements.txt
-+++ b/test/requirements.txt
-@@ -2,4 +2,4 @@
- mock
- pytest-mock
- coverage
--stone>=2.*
-\ No newline at end of file
-+stone>=2.0
-- 
cgit v1.3.1