diff --git a/dev-python/desktop-notifier/desktop-notifier-3.4.3.ebuild b/dev-python/desktop-notifier/desktop-notifier-3.4.3.ebuild index 8cfb28447c..08b21c0bb3 100644 --- a/dev-python/desktop-notifier/desktop-notifier-3.4.3.ebuild +++ b/dev-python/desktop-notifier/desktop-notifier-3.4.3.ebuild @@ -23,8 +23,7 @@ KEYWORDS="~amd64 ~x86" RDEPEND=" dev-python/wheel[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] - dev-python/python-dbus-next[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8) + dev-python/dbus-next[${PYTHON_USEDEP}] " BDEPEND=" dev-python/build[${PYTHON_USEDEP}] diff --git a/dev-python/dropbox-sdk-python/Manifest b/dev-python/dropbox/Manifest similarity index 100% rename from dev-python/dropbox-sdk-python/Manifest rename to dev-python/dropbox/Manifest diff --git a/dev-python/dropbox-sdk-python/dropbox-sdk-python-11.36.0.ebuild b/dev-python/dropbox/dropbox-11.36.0.ebuild similarity index 87% rename from dev-python/dropbox-sdk-python/dropbox-sdk-python-11.36.0.ebuild rename to dev-python/dropbox/dropbox-11.36.0.ebuild index 6ad53d17ef..c088da3c80 100644 --- a/dev-python/dropbox-sdk-python/dropbox-sdk-python-11.36.0.ebuild +++ b/dev-python/dropbox/dropbox-11.36.0.ebuild @@ -7,9 +7,12 @@ DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 +GH_PN=dropbox-sdk-python + DESCRIPTION="The offical Dropbox SDK for Python" HOMEPAGE="https://www.dropbox.com/developers" -SRC_URI="https://github.com/dropbox/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" +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" diff --git a/dev-python/dropbox-sdk-python/files/dropbox-sdk-python-11.36.0-setuptools-67.patch b/dev-python/dropbox/files/dropbox-11.36.0-setuptools-67.patch similarity index 100% rename from dev-python/dropbox-sdk-python/files/dropbox-sdk-python-11.36.0-setuptools-67.patch rename to dev-python/dropbox/files/dropbox-11.36.0-setuptools-67.patch diff --git a/dev-python/dropbox-sdk-python/metadata.xml b/dev-python/dropbox/metadata.xml similarity index 100% rename from dev-python/dropbox-sdk-python/metadata.xml rename to dev-python/dropbox/metadata.xml diff --git a/dev-python/python-dbus-next/Manifest b/dev-python/python-dbus-next/Manifest deleted file mode 100644 index 9b3346732f..0000000000 --- a/dev-python/python-dbus-next/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST python-dbus-next-0.2.3.gh.tar.gz 81711 BLAKE2B 6acc38a05511b3de7e13893d82dd1ecd55f9a6124b4d859574294602b921ff012776c12ddb02e1be437b258c7bd5120a3a9625fc5b06bbbe02915dcc4c14897b SHA512 7836d855c755c8ac6cbbb251ca0cbd2f4df9b573f31b1ea1cab480e47896d36b4cb0d479b2469b0bf0b5c700068361a18874b4a087f73020cdcb4e04a2d7dbe7 diff --git a/dev-python/python-dbus-next/metadata.xml b/dev-python/python-dbus-next/metadata.xml deleted file mode 100644 index 0548fa3046..0000000000 --- a/dev-python/python-dbus-next/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - ceamac@gentoo.org - Primary maintainer - - - altdesktop/python-dbus-next - dbus-next - - diff --git a/dev-python/python-dbus-next/python-dbus-next-0.2.3.ebuild b/dev-python/python-dbus-next/python-dbus-next-0.2.3.ebuild deleted file mode 100644 index d75c7a6374..0000000000 --- a/dev-python/python-dbus-next/python-dbus-next-0.2.3.ebuild +++ /dev/null @@ -1,29 +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_{9..11} ) -inherit distutils-r1 - -DESCRIPTION="python-dbus-next is a Python library for DBus" -HOMEPAGE=" - https://github.com/altdesktop/python-dbus-next - https://pypi.org/project/dbus-next/ -" -SRC_URI="https://github.com/altdesktop/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -BDEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )" - -distutils_enable_tests pytest - -# some tests fail with: -# dbus_next.errors.InvalidAddressError: -# DBUS_SESSION_BUS_ADDRESS not set and could not get DISPLAY environment variable to get bus addres -# or require certain services to be installed (like org.freedesktop.DBus.Debug.Stats) -RESTRICT="test" diff --git a/net-misc/maestral/maestral-1.5.3.ebuild b/net-misc/maestral/maestral-1.5.3.ebuild index 178fe7ac2b..d2d7a2902c 100644 --- a/net-misc/maestral/maestral-1.5.3.ebuild +++ b/net-misc/maestral/maestral-1.5.3.ebuild @@ -19,8 +19,7 @@ KEYWORDS="~amd64" RDEPEND=" >=dev-python/click-8.0.2[${PYTHON_USEDEP}] >=dev-python/desktop-notifier-3.3.0[${PYTHON_USEDEP}] - >=dev-python/dropbox-sdk-python-11.26.0[${PYTHON_USEDEP}] - =dev-python/fasteners-0.15[${PYTHON_USEDEP}] >=dev-python/keyring-22.0.0[${PYTHON_USEDEP}] >=dev-python/keyrings-alt-3.1.0[${PYTHON_USEDEP}] diff --git a/net-misc/maestral/maestral-1.6.5.ebuild b/net-misc/maestral/maestral-1.6.5.ebuild index bca96dbc61..ef1159aae2 100644 --- a/net-misc/maestral/maestral-1.6.5.ebuild +++ b/net-misc/maestral/maestral-1.6.5.ebuild @@ -22,8 +22,7 @@ fi RDEPEND=" >=dev-python/click-8.0.2[${PYTHON_USEDEP}] >=dev-python/desktop-notifier-3.3.0[${PYTHON_USEDEP}] - >=dev-python/dropbox-sdk-python-11.28.0[${PYTHON_USEDEP}] - =dev-python/fasteners-0.15[${PYTHON_USEDEP}] >=dev-python/keyring-22.0.0[${PYTHON_USEDEP}] >=dev-python/keyrings-alt-3.1.0[${PYTHON_USEDEP}] diff --git a/net-misc/maestral/maestral-1.7.0_rc0.ebuild b/net-misc/maestral/maestral-1.7.0_rc0.ebuild index bca96dbc61..ef1159aae2 100644 --- a/net-misc/maestral/maestral-1.7.0_rc0.ebuild +++ b/net-misc/maestral/maestral-1.7.0_rc0.ebuild @@ -22,8 +22,7 @@ fi RDEPEND=" >=dev-python/click-8.0.2[${PYTHON_USEDEP}] >=dev-python/desktop-notifier-3.3.0[${PYTHON_USEDEP}] - >=dev-python/dropbox-sdk-python-11.28.0[${PYTHON_USEDEP}] - =dev-python/fasteners-0.15[${PYTHON_USEDEP}] >=dev-python/keyring-22.0.0[${PYTHON_USEDEP}] >=dev-python/keyrings-alt-3.1.0[${PYTHON_USEDEP}] diff --git a/profiles/updates/1Q-2023 b/profiles/updates/1Q-2023 new file mode 100644 index 0000000000..28fe100ac4 --- /dev/null +++ b/profiles/updates/1Q-2023 @@ -0,0 +1 @@ +move dev-python/dropbox-sdk-python dev-python/dropbox