gentoo resync : 20.03.2022

4 files changed, 19 insertions, 50 deletions

diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index 499e397cb2a3..9bcccc733018 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,6 +1,5 @@
-AUX protontricks-1.5.0_no-setuptools-scm.patch 1321 BLAKE2B d96472bf9b0827cbc6bb9debf6c8da9f27773da4587d5b5c663180913ef4595fe21c5edd4798a8e98ee0a00dad75acec41dd0776e3dfaa6ff0aa186167e70c6b SHA512 9fce0b3ddd34801b7af8adcce2990c875ce68ed9289717f08f1f1653d447887b67b65d5c35de14a126dfbd4d1143fdef8fb8399f55aa59c498a68b0bc0480bad
-DIST protontricks-1.6.0.tar.gz 61220 BLAKE2B 8a9af6f8cc134ad0e74b4c5e6c35bc8344687e65cc9811ca54402b16f723264cef8def6e733a532fd412db51d0ec63533baec52699ae994a97ecad0a25ebe847 SHA512 7276d7de1f0c18afc5c67552290888e3851bd5f073bbbf684000be66c2e65abac84b079373b120ff0ab6e4f4919caf8ee1288a2320de6c37629cb1185dfbea29
 DIST protontricks-1.7.0.tar.gz 139203 BLAKE2B d93bbb672286d32743da1473e132508084bae527159911367c51e88686c38d3bad0a2f72a2c0f0feb09412e31e6d5bb20dfe113b9e71e4e655693bfbe663a968 SHA512 c12f211051bc23c8eb03c5385e8245361d72dcce1e641a7da1f87f344db5fdc7d698bd7691e0855ae025c1d94944db89b380805664d87123b6252d06259480ff
-EBUILD protontricks-1.6.0.ebuild 1443 BLAKE2B 5f85c7b2f5a01e6a59fb8cb91ae9c894f10176066daa8cdf23e1ad52e9a86d54f2df79c27dddfd4017f982f6c471b89882ecc86d6bbf253274ed3410dfa5c9a5 SHA512 cdf43dc566f66b85282f44b51153e5c9991f7a9b6efb0935edd0f15ef1857055dab2abfc9b9bb632deb6e2b5f2277bdd162476f86913cd35f51db1d1a3cf80d6
-EBUILD protontricks-1.7.0.ebuild 1562 BLAKE2B 2d1f12f2aaf762aa6ce807a25cda700ae81bf886ee18aff7c510e4caddb284403d16a94468e0288ab20e487363c69c276143e6b64569ea8128d1c3d5cfe96358 SHA512 a8603cb1daca3d04f068b66794c8bfb7fb50536dcb59d82422b47293ce13332ed04efc409c13fbd5044084f503455d793d968dbaf68cd883ceec2e0f162082fc
+DIST protontricks-1.8.0.tar.gz 145619 BLAKE2B 5a7e5040c646838574abd06ac628d6c004f26ad8406bfefd8f24dc5a8438c4ba19bd5b848911141b58faf7431e3ee88e3f5f82735154eeaf7179f7ec4643634e SHA512 db688663b0e82089ea218c256c7fae6b9222572e7213cecb26bfa68de59eb0c6c95bb0b39b138e180f7bcda27d8d0c33bcd8a3ff3c4009815dcfe1c73be702c6
+EBUILD protontricks-1.7.0.ebuild 1561 BLAKE2B e9d4a3c2b48ce79f6639d2c6efc146797fdfee1ce6d0dd68d61381e19c9ef3c6643b0737f0b982e5f2e395ef8668c01e49e5cb4de22c77e646caeac9fe9e2966 SHA512 5fbd53dd0a4ddcc4ef760225231fecd12603135aa4a4fda2cf5ae7f956bbb849c6fa2e4747fd4d1153a5c9772dd64f90b4b065b05361b49e9ba82f81842e7da6
+EBUILD protontricks-1.8.0.ebuild 1562 BLAKE2B 2d1f12f2aaf762aa6ce807a25cda700ae81bf886ee18aff7c510e4caddb284403d16a94468e0288ab20e487363c69c276143e6b64569ea8128d1c3d5cfe96358 SHA512 a8603cb1daca3d04f068b66794c8bfb7fb50536dcb59d82422b47293ce13332ed04efc409c13fbd5044084f503455d793d968dbaf68cd883ceec2e0f162082fc
 MISC metadata.xml 809 BLAKE2B dc0506e6f3224adc867438699359c4eafc389041846c644818732036e04bcb9c789e358a08effdb4b9ff4430521f7fe8ff6800b75aa93d6313e3d85395467741 SHA512 351bb79dc7921e6c62100b3354546185d31578b044393ea5e5b5fea089eb47164882ff4ede30d8a575dea31ec9d0927793f8109d9e63ca4ad6954c1affdbe6f4
diff --git a/app-emulation/protontricks/files/protontricks-1.5.0_no-setuptools-scm.patch b/app-emulation/protontricks/files/protontricks-1.5.0_no-setuptools-scm.patch
deleted file mode 100644
index a19d8494657b..000000000000
--- a/app-emulation/protontricks/files/protontricks-1.5.0_no-setuptools-scm.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Since version 1.4.1 upstream has used setuptools-scm to determine the
-current version number. Unfortunately the package in question does not
-support GitHub release archives, using GitHub VCS snapshots would require
-retrieving and updating commit hashes corresponding to release tags, and
-PyPI tarballs do not contain tests. setuptools_scm_git_archive does not
-help because it requires extra files to be included in the repository,
-which upstream has not done.
-
-Seeing as we already know the version number, bypass setuptools_scm
-altogether and create the version file ourselves. For obvious reasons the
-latter has to be done in ebuilds themselves.
-
---- a/setup.py
-+++ b/setup.py
-@@ -16,9 +16,6 @@
- 
- setup(
-     name="protontricks",
--    use_scm_version={
--        "write_to": "src/protontricks/_version.py"
--    },
-     description=DESCRIPTION,
-     long_description=LONG_DESCRIPTION,
-     author=AUTHOR,
-@@ -28,11 +25,6 @@
-     packages=["protontricks"],
-     package_data={"": ["LICENSE"]},
-     package_dir={"protontricks": "src/protontricks"},
--    setup_requires=[
--        # setuptools-scm v6 requires Python 3.6+
--        "setuptools_scm<6 ; python_version <= '3.5'",
--        "setuptools_scm ; python_version > '3.5'"
--    ],
-     install_requires=["vdf>=3.2"],
-     entry_points={
-         "console_scripts": [
diff --git a/app-emulation/protontricks/protontricks-1.7.0.ebuild b/app-emulation/protontricks/protontricks-1.7.0.ebuild
index cfb253df8379..de3ff69eee31 100644
--- a/app-emulation/protontricks/protontricks-1.7.0.ebuild
+++ b/app-emulation/protontricks/protontricks-1.7.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+gui"
 
 RDEPEND="app-emulation/winetricks
diff --git a/app-emulation/protontricks/protontricks-1.6.0.ebuild b/app-emulation/protontricks/protontricks-1.8.0.ebuild
index 2f2c167b9165..cfb253df8379 100644
--- a/app-emulation/protontricks/protontricks-1.6.0.ebuild
+++ b/app-emulation/protontricks/protontricks-1.8.0.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 xdg-utils
 
 DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
 HOMEPAGE="https://github.com/Matoking/protontricks"
-SRC_URI="https://github.com/Matoking/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="+gui"
 
 RDEPEND="app-emulation/winetricks
 	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/vdf[${PYTHON_USEDEP}]
 	')
 	gui? ( gnome-extra/zenity
@@ -28,10 +29,9 @@ RDEPEND="app-emulation/winetricks
 			app-emulation/winetricks[kde]
 		)
 	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0_no-setuptools-scm.patch
-)
+BDEPEND="$(python_gen_cond_dep '
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+')"
 
 DOCS=( CHANGELOG.md README.md )
 
@@ -43,6 +43,8 @@ python_prepare_all() {
 }
 
 pkg_postinst() {
+	xdg_desktop_database_update
+
 	elog
 
 	if ! use gui; then
@@ -55,3 +57,7 @@ pkg_postinst() {
 	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
 	elog
 }
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}