From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- app-emulation/protontricks/Manifest | 5 +- .../protontricks-1.5.0_no-setuptools-scm.patch | 36 ++++++++++++++ .../protontricks/protontricks-1.4.4.ebuild | 57 ---------------------- .../protontricks/protontricks-1.5.0.ebuild | 57 ++++++++++++++++++++++ 4 files changed, 96 insertions(+), 59 deletions(-) create mode 100644 app-emulation/protontricks/files/protontricks-1.5.0_no-setuptools-scm.patch delete mode 100644 app-emulation/protontricks/protontricks-1.4.4.ebuild create mode 100644 app-emulation/protontricks/protontricks-1.5.0.ebuild (limited to 'app-emulation/protontricks') diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest index 00aad1804837..9a00574df2ad 100644 --- a/app-emulation/protontricks/Manifest +++ b/app-emulation/protontricks/Manifest @@ -1,6 +1,7 @@ AUX protontricks-1.4.3_no-setuptools-scm.patch 1174 BLAKE2B 16ad14073457431d388e295d5004874a8b7bc74aa5762c3f4a950c35ad485d9dc60312acaa511541ff4f2d2e826c31e5c74d1f51d80721bb5ffaa23903714283 SHA512 99349a830eba3e248db3f67f5cd842764700fff51788db1fc649ba9dbef3f356c6ec4a66e4608a74eb67b919d53700b5c501e55a98f78e67e9c63e6f851aa18d +AUX protontricks-1.5.0_no-setuptools-scm.patch 1321 BLAKE2B d96472bf9b0827cbc6bb9debf6c8da9f27773da4587d5b5c663180913ef4595fe21c5edd4798a8e98ee0a00dad75acec41dd0776e3dfaa6ff0aa186167e70c6b SHA512 9fce0b3ddd34801b7af8adcce2990c875ce68ed9289717f08f1f1653d447887b67b65d5c35de14a126dfbd4d1143fdef8fb8399f55aa59c498a68b0bc0480bad DIST protontricks-1.4.3.tar.gz 43573 BLAKE2B 3a3050ba6e940182d81d98498a5558433ceaa4282f5a23fb93b3cfc299699381493eb2912c5f03bb6a8092be5c50b94bf7181208cda3d4c0f4c90c0f438f7f1b SHA512 7ca8c7c273d92f7c4526caaa8c9db6988c642913c33c6b6188d285d5cfbe30924533a9f024135865cdc1a25bd867ac00bd915b0a61417d17fe0e5ee451417e64 -DIST protontricks-1.4.4.tar.gz 45204 BLAKE2B 3fc66acae79a39e8dc7a5d507e4abcdad24da13a03e10954b667769a801ac42addb55980e3de413e71ad5395e773b065f8f1dca2e694c835a07b8993b4fb5f0e SHA512 4c61da27e97f1b46150f2808c27d1fcf7394f2cc4f272eada54abc4fdd9229443405f7466d3a1ba5603e3c40a025dbbd8fde512334c6007a64687867625abc4c +DIST protontricks-1.5.0.tar.gz 46957 BLAKE2B 622affd9a1bfff3a5cd76fa8e279f25b5c91a6f040b6cc4e5f42e58be08a232fad2be179a47e063b45b1b1bb11b6ae9ce26cce499f4c1dae460be0bb8247e619 SHA512 6df3e0dd638684e70a8d40b7440e2340765109e31dd47fa5e33e4959bc34d3ff4cfa70c8689cafdcce82f1d97ba6d25de724ca7439e5d1ffd634b729ab222716 EBUILD protontricks-1.4.3.ebuild 1442 BLAKE2B a1656810ec6810c0899349e7a03835a45a92183799d0a39e4257c551208a4a589211127e6b3087d4a7c68024eebd6a54be841a13e6c25c1b0a51e0b755a1e90e SHA512 9b9a9d1de030e9e7e2574295e3ed054c90a36237c462024e2a8996082e088a903a535d27a8f45742345bba6edc84ee476d0639ff60e1411045ef165dfc4c6374 -EBUILD protontricks-1.4.4.ebuild 1443 BLAKE2B 8e618ffbeb08d2eacd054c034a7b56f4c737fca62bd9957cb8b25d052f3c1cc384e95923990f49a5aca2a7dbadf246cc393f4fc006af7a0d4d888f3eb303d58a SHA512 3c985a558ac8d63bf32a3d5754f78e207029e19a2d99fc7c5c09ebe272116338ec492d40e84df721f906a2a3798aeef4bae7ccdab794b4ddb6856e1276449728 +EBUILD protontricks-1.5.0.ebuild 1443 BLAKE2B bf0b69a3d9e1dcd6c6a790b39110ee85da1a2cd9008acf2c734c929bd1c9506c9f5af43212e949932ddbb1cf72fd3c260fa5dfaa43eff64af59e0890663a80d3 SHA512 46385bc29c1d958e16eb6c65901bdcf073312a5e2d03add2148bce5c4817d513177b433459a69808cef9baba5c0b181ca3be2063bef46af7671190870b373301 MISC metadata.xml 808 BLAKE2B 9abbb6d1689e04026c239dc2bde4a2d975bb260473178e68c0ec3e37a3e4c3e6db701ece9e8551d5ba071db14effc7e59a15a5e13c2049a6cd9d0709562bf709 SHA512 21452c10fe698d461aa814bc1bddb6350fcd8f60b7c84d8949f1eb8a1932ae3f9214c123451334ac2108f6ad930d5e6f5b522eac477ed6f6af1c916326254c32 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 new file mode 100644 index 000000000000..a19d8494657b --- /dev/null +++ b/app-emulation/protontricks/files/protontricks-1.5.0_no-setuptools-scm.patch @@ -0,0 +1,36 @@ +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.4.4.ebuild b/app-emulation/protontricks/protontricks-1.4.4.ebuild deleted file mode 100644 index 8aa78e9acad1..000000000000 --- a/app-emulation/protontricks/protontricks-1.4.4.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} pypy3 ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -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" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+gui" - -RDEPEND="app-emulation/winetricks - $(python_gen_cond_dep ' - dev-python/vdf[${PYTHON_USEDEP}] - ') - gui? ( gnome-extra/zenity - || ( - app-emulation/winetricks[gtk] - app-emulation/winetricks[kde] - ) - )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.3_no-setuptools-scm.patch -) - -DOCS=( CHANGELOG.md README.md ) - -distutils_enable_tests pytest - -python_prepare_all() { - distutils-r1_python_prepare_all - echo "version = '${PV}'" > "${S}"/src/${PN}/_version.py || die "Failed to generate the version file" -} - -pkg_postinst() { - elog - - if ! use gui; then - ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option," - ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed." - ewarn - fi - - elog "Protontricks can only find games for which a Proton prefix already exists." - elog "Make sure to run a Proton game at least once before trying to use protontricks on it." - elog -} diff --git a/app-emulation/protontricks/protontricks-1.5.0.ebuild b/app-emulation/protontricks/protontricks-1.5.0.ebuild new file mode 100644 index 000000000000..2540f44fa284 --- /dev/null +++ b/app-emulation/protontricks/protontricks-1.5.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} pypy3 ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +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" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+gui" + +RDEPEND="app-emulation/winetricks + $(python_gen_cond_dep ' + dev-python/vdf[${PYTHON_USEDEP}] + ') + gui? ( gnome-extra/zenity + || ( + app-emulation/winetricks[gtk] + app-emulation/winetricks[kde] + ) + )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.0_no-setuptools-scm.patch +) + +DOCS=( CHANGELOG.md README.md ) + +distutils_enable_tests pytest + +python_prepare_all() { + distutils-r1_python_prepare_all + echo "version = '${PV}'" > "${S}"/src/${PN}/_version.py || die "Failed to generate the version file" +} + +pkg_postinst() { + elog + + if ! use gui; then + ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option," + ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed." + ewarn + fi + + elog "Protontricks can only find games for which a Proton prefix already exists." + elog "Make sure to run a Proton game at least once before trying to use protontricks on it." + elog +} -- cgit v1.2.3