From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7B4F6158086 for ; Fri, 29 Oct 2021 19:04:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B8BEE087E; Fri, 29 Oct 2021 19:04:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 072E2E087E for ; Fri, 29 Oct 2021 19:04:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC06834330D for ; Fri, 29 Oct 2021 19:04:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81128144 for ; Fri, 29 Oct 2021 19:04:18 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1635534250.c89bc502532518bf7fc83351b833f066e8065030.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/, games-util/lutris/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-util/lutris/Manifest games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch games-util/lutris/lutris-0.5.9.1.ebuild games-util/lutris/lutris-9999.ebuild X-VCS-Directories: games-util/lutris/ games-util/lutris/files/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: c89bc502532518bf7fc83351b833f066e8065030 X-VCS-Branch: master Date: Fri, 29 Oct 2021 19:04:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6f4d399f-5718-4111-89f5-a29d1d257de6 X-Archives-Hash: caaf30bc380c6dfe3dff956b75522251 commit: c89bc502532518bf7fc83351b833f066e8065030 Author: Andrew Ammerlaan gentoo org> AuthorDate: Fri Oct 29 18:35:26 2021 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Fri Oct 29 19:04:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c89bc502 games-util/lutris: add version 0.5.9.1 - We add a patch that avoids: importError (Requiring namespace 'Gtk' version '3.0', but '4.0' is already loaded) - And we remove the sed line that makes the application fail to find data_path during runtime, the test that this claims to fix works (for me) without this sed line anyway. Bug: https://bugs.gentoo.org/811285 - Bumped to EAPI 8 - Also update 9999 accordingly Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan gentoo.org> games-util/lutris/Manifest | 1 + ...9.1-avoid-gtk-4.0-already-loaded-testerror.patch | 13 +++++++++++++ .../{lutris-9999.ebuild => lutris-0.5.9.1.ebuild} | 21 +++++++-------------- games-util/lutris/lutris-9999.ebuild | 21 ++++++--------------- 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest index 788ed8e296f..04f4d813909 100644 --- a/games-util/lutris/Manifest +++ b/games-util/lutris/Manifest @@ -1,3 +1,4 @@ DIST lutris-0.5.9_beta1.tar.gz 836915 BLAKE2B 53133b202e45a2e68e5aca273cd591055d469a2ada39d2b75db92d45da45a53cf3425b1d36fea1a7f241b9336895ada8b8e4577374cd0b1fd996cbd3f5108b1b SHA512 48b433fcf03795874e6c7f0b4d310f7a779c831ea67e754a0c9bb0b919f9f050311b002d63fa34150be753c4de452c306db16cb43c00fa91b08775c68169b7e6 DIST lutris_0.5.8.3.tar.xz 942716 BLAKE2B f831c6ad6f67c3948f07e89f9caacd0d8aa3878b912fe987afea85eea549f41347044967255fa80e4e0c4544d148d9782dfe3c5bf08a123436e8a5ef7034901f SHA512 8f653d38a9a551298fa344cde67d53bf50cfd2a0a0667e344d04f6e17dda4ef358037755975d1a7f74ecd39824d58f9586e8a82b70dccc26619f22fee94d1144 DIST lutris_0.5.8.4.tar.xz 957004 BLAKE2B f3acce5d9ea7368063a3135c1f503e0644c1cbc7676e966c262c8e04c5e0d23b4882793fe2df1beab265ab4128e8a90b5bb69401f8e567b0cceeea3008ff4fa7 SHA512 f79a9fd06788bc28e59ad6d2c403b83f8bdeaee0116ae7fbf765e80e4e08bf760a462c71f75a2ff46739e5757cb8609f5110a51d83266d3aba2f0c91524b6df9 +DIST lutris_0.5.9.1.tar.xz 1046920 BLAKE2B 469e7707e74d957be3bb0f5f1caeaeaaf7c01dc3b998c16d8be4b4b780e408763bbe0df5c0b5f6a53ebcb3eb478aaaf25f9cf16437ae682dfcd1d2213222fa18 SHA512 a94e37d1a3f5b80353af38900f3e67763af9c0e3cc3013f7998e23ff70cb6f329730b1802f996866dac541af6e50388a5308c772e3a2ee97f87e5ae60878e7e7 diff --git a/games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch b/games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch new file mode 100644 index 00000000000..8c0d366926b --- /dev/null +++ b/games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch @@ -0,0 +1,13 @@ +diff --git a/lutris/util/test_config.py b/lutris/util/test_config.py +index b3feb87..01b9294 100644 +--- a/lutris/util/test_config.py ++++ b/lutris/util/test_config.py +@@ -1,5 +1,8 @@ + import os + ++import gi ++gi.require_version('Gtk', '3.0') ++ + from lutris import startup + from lutris.database import schema + diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-0.5.9.1.ebuild similarity index 79% copy from games-util/lutris/lutris-9999.ebuild copy to games-util/lutris/lutris-0.5.9.1.ebuild index 4ca63a7a2a1..683abd5de58 100644 --- a/games-util/lutris/lutris-9999.ebuild +++ b/games-util/lutris/lutris-0.5.9.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="sqlite,threads(+)" DISTUTILS_SINGLE_IMPL="1" @@ -54,26 +54,19 @@ RDEPEND=" x11-libs/libnotify[introspection] " -distutils_enable_tests nose +distutils_enable_tests pytest -src_prepare() { - default +DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst ) - # Avoid test failure: - # "ERROR: Failure: OSError (data_path can't be found at : /usr/share/lutris)" - sed -i -e "s:sys.path\[0\]:\"${S}/share\":" lutris/util/datapath.py || die - - distutils-r1_src_prepare -} +PATCHES=( "${FILESDIR}/${P}-avoid-gtk-4.0-already-loaded-testerror.patch" ) python_test() { - virtx nosetests -v + virtx epytest } python_install_all() { - local DOCS=( AUTHORS README.rst docs/installers.rst ) distutils-r1_python_install_all - python_fix_shebang "${ED}"/usr/share/lutris/bin/lutris-wrapper #740048 + python_fix_shebang "${ED}/usr/share/lutris/bin/lutris-wrapper" #740048 } pkg_postinst() { diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild index 4ca63a7a2a1..fa2c19860a6 100644 --- a/games-util/lutris/lutris-9999.ebuild +++ b/games-util/lutris/lutris-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="sqlite,threads(+)" DISTUTILS_SINGLE_IMPL="1" @@ -54,26 +54,17 @@ RDEPEND=" x11-libs/libnotify[introspection] " -distutils_enable_tests nose +distutils_enable_tests pytest -src_prepare() { - default - - # Avoid test failure: - # "ERROR: Failure: OSError (data_path can't be found at : /usr/share/lutris)" - sed -i -e "s:sys.path\[0\]:\"${S}/share\":" lutris/util/datapath.py || die - - distutils-r1_src_prepare -} +DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst ) python_test() { - virtx nosetests -v + virtx epytest } python_install_all() { - local DOCS=( AUTHORS README.rst docs/installers.rst ) distutils-r1_python_install_all - python_fix_shebang "${ED}"/usr/share/lutris/bin/lutris-wrapper #740048 + python_fix_shebang "${ED}/usr/share/lutris/bin/lutris-wrapper" #740048 } pkg_postinst() {