| 1 |
commit: c89bc502532518bf7fc83351b833f066e8065030 |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 29 18:35:26 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 29 19:04:10 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c89bc502 |
| 7 |
|
| 8 |
games-util/lutris: add version 0.5.9.1 |
| 9 |
|
| 10 |
- We add a patch that avoids: |
| 11 |
importError (Requiring namespace 'Gtk' version '3.0', but '4.0' is already |
| 12 |
loaded) |
| 13 |
|
| 14 |
- And we remove the sed line that makes the application fail to find data_path |
| 15 |
during runtime, the test that this claims to fix works (for me) without this |
| 16 |
sed line anyway. |
| 17 |
Bug: https://bugs.gentoo.org/811285 |
| 18 |
|
| 19 |
- Bumped to EAPI 8 |
| 20 |
|
| 21 |
- Also update 9999 accordingly |
| 22 |
|
| 23 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 24 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
| 25 |
|
| 26 |
games-util/lutris/Manifest | 1 + |
| 27 |
...9.1-avoid-gtk-4.0-already-loaded-testerror.patch | 13 +++++++++++++ |
| 28 |
.../{lutris-9999.ebuild => lutris-0.5.9.1.ebuild} | 21 +++++++-------------- |
| 29 |
games-util/lutris/lutris-9999.ebuild | 21 ++++++--------------- |
| 30 |
4 files changed, 27 insertions(+), 29 deletions(-) |
| 31 |
|
| 32 |
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest |
| 33 |
index 788ed8e296f..04f4d813909 100644 |
| 34 |
--- a/games-util/lutris/Manifest |
| 35 |
+++ b/games-util/lutris/Manifest |
| 36 |
@@ -1,3 +1,4 @@ |
| 37 |
DIST lutris-0.5.9_beta1.tar.gz 836915 BLAKE2B 53133b202e45a2e68e5aca273cd591055d469a2ada39d2b75db92d45da45a53cf3425b1d36fea1a7f241b9336895ada8b8e4577374cd0b1fd996cbd3f5108b1b SHA512 48b433fcf03795874e6c7f0b4d310f7a779c831ea67e754a0c9bb0b919f9f050311b002d63fa34150be753c4de452c306db16cb43c00fa91b08775c68169b7e6 |
| 38 |
DIST lutris_0.5.8.3.tar.xz 942716 BLAKE2B f831c6ad6f67c3948f07e89f9caacd0d8aa3878b912fe987afea85eea549f41347044967255fa80e4e0c4544d148d9782dfe3c5bf08a123436e8a5ef7034901f SHA512 8f653d38a9a551298fa344cde67d53bf50cfd2a0a0667e344d04f6e17dda4ef358037755975d1a7f74ecd39824d58f9586e8a82b70dccc26619f22fee94d1144 |
| 39 |
DIST lutris_0.5.8.4.tar.xz 957004 BLAKE2B f3acce5d9ea7368063a3135c1f503e0644c1cbc7676e966c262c8e04c5e0d23b4882793fe2df1beab265ab4128e8a90b5bb69401f8e567b0cceeea3008ff4fa7 SHA512 f79a9fd06788bc28e59ad6d2c403b83f8bdeaee0116ae7fbf765e80e4e08bf760a462c71f75a2ff46739e5757cb8609f5110a51d83266d3aba2f0c91524b6df9 |
| 40 |
+DIST lutris_0.5.9.1.tar.xz 1046920 BLAKE2B 469e7707e74d957be3bb0f5f1caeaeaaf7c01dc3b998c16d8be4b4b780e408763bbe0df5c0b5f6a53ebcb3eb478aaaf25f9cf16437ae682dfcd1d2213222fa18 SHA512 a94e37d1a3f5b80353af38900f3e67763af9c0e3cc3013f7998e23ff70cb6f329730b1802f996866dac541af6e50388a5308c772e3a2ee97f87e5ae60878e7e7 |
| 41 |
|
| 42 |
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 |
| 43 |
new file mode 100644 |
| 44 |
index 00000000000..8c0d366926b |
| 45 |
--- /dev/null |
| 46 |
+++ b/games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch |
| 47 |
@@ -0,0 +1,13 @@ |
| 48 |
+diff --git a/lutris/util/test_config.py b/lutris/util/test_config.py |
| 49 |
+index b3feb87..01b9294 100644 |
| 50 |
+--- a/lutris/util/test_config.py |
| 51 |
++++ b/lutris/util/test_config.py |
| 52 |
+@@ -1,5 +1,8 @@ |
| 53 |
+ import os |
| 54 |
+ |
| 55 |
++import gi |
| 56 |
++gi.require_version('Gtk', '3.0') |
| 57 |
++ |
| 58 |
+ from lutris import startup |
| 59 |
+ from lutris.database import schema |
| 60 |
+ |
| 61 |
|
| 62 |
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-0.5.9.1.ebuild |
| 63 |
similarity index 79% |
| 64 |
copy from games-util/lutris/lutris-9999.ebuild |
| 65 |
copy to games-util/lutris/lutris-0.5.9.1.ebuild |
| 66 |
index 4ca63a7a2a1..683abd5de58 100644 |
| 67 |
--- a/games-util/lutris/lutris-9999.ebuild |
| 68 |
+++ b/games-util/lutris/lutris-0.5.9.1.ebuild |
| 69 |
@@ -1,9 +1,9 @@ |
| 70 |
# Copyright 1999-2021 Gentoo Authors |
| 71 |
# Distributed under the terms of the GNU General Public License v2 |
| 72 |
|
| 73 |
-EAPI=7 |
| 74 |
+EAPI=8 |
| 75 |
|
| 76 |
-PYTHON_COMPAT=( python3_{8..9} ) |
| 77 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 78 |
PYTHON_REQ_USE="sqlite,threads(+)" |
| 79 |
DISTUTILS_SINGLE_IMPL="1" |
| 80 |
|
| 81 |
@@ -54,26 +54,19 @@ RDEPEND=" |
| 82 |
x11-libs/libnotify[introspection] |
| 83 |
" |
| 84 |
|
| 85 |
-distutils_enable_tests nose |
| 86 |
+distutils_enable_tests pytest |
| 87 |
|
| 88 |
-src_prepare() { |
| 89 |
- default |
| 90 |
+DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst ) |
| 91 |
|
| 92 |
- # Avoid test failure: |
| 93 |
- # "ERROR: Failure: OSError (data_path can't be found at : /usr/share/lutris)" |
| 94 |
- sed -i -e "s:sys.path\[0\]:\"${S}/share\":" lutris/util/datapath.py || die |
| 95 |
- |
| 96 |
- distutils-r1_src_prepare |
| 97 |
-} |
| 98 |
+PATCHES=( "${FILESDIR}/${P}-avoid-gtk-4.0-already-loaded-testerror.patch" ) |
| 99 |
|
| 100 |
python_test() { |
| 101 |
- virtx nosetests -v |
| 102 |
+ virtx epytest |
| 103 |
} |
| 104 |
|
| 105 |
python_install_all() { |
| 106 |
- local DOCS=( AUTHORS README.rst docs/installers.rst ) |
| 107 |
distutils-r1_python_install_all |
| 108 |
- python_fix_shebang "${ED}"/usr/share/lutris/bin/lutris-wrapper #740048 |
| 109 |
+ python_fix_shebang "${ED}/usr/share/lutris/bin/lutris-wrapper" #740048 |
| 110 |
} |
| 111 |
|
| 112 |
pkg_postinst() { |
| 113 |
|
| 114 |
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild |
| 115 |
index 4ca63a7a2a1..fa2c19860a6 100644 |
| 116 |
--- a/games-util/lutris/lutris-9999.ebuild |
| 117 |
+++ b/games-util/lutris/lutris-9999.ebuild |
| 118 |
@@ -1,9 +1,9 @@ |
| 119 |
# Copyright 1999-2021 Gentoo Authors |
| 120 |
# Distributed under the terms of the GNU General Public License v2 |
| 121 |
|
| 122 |
-EAPI=7 |
| 123 |
+EAPI=8 |
| 124 |
|
| 125 |
-PYTHON_COMPAT=( python3_{8..9} ) |
| 126 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 127 |
PYTHON_REQ_USE="sqlite,threads(+)" |
| 128 |
DISTUTILS_SINGLE_IMPL="1" |
| 129 |
|
| 130 |
@@ -54,26 +54,17 @@ RDEPEND=" |
| 131 |
x11-libs/libnotify[introspection] |
| 132 |
" |
| 133 |
|
| 134 |
-distutils_enable_tests nose |
| 135 |
+distutils_enable_tests pytest |
| 136 |
|
| 137 |
-src_prepare() { |
| 138 |
- default |
| 139 |
- |
| 140 |
- # Avoid test failure: |
| 141 |
- # "ERROR: Failure: OSError (data_path can't be found at : /usr/share/lutris)" |
| 142 |
- sed -i -e "s:sys.path\[0\]:\"${S}/share\":" lutris/util/datapath.py || die |
| 143 |
- |
| 144 |
- distutils-r1_src_prepare |
| 145 |
-} |
| 146 |
+DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst ) |
| 147 |
|
| 148 |
python_test() { |
| 149 |
- virtx nosetests -v |
| 150 |
+ virtx epytest |
| 151 |
} |
| 152 |
|
| 153 |
python_install_all() { |
| 154 |
- local DOCS=( AUTHORS README.rst docs/installers.rst ) |
| 155 |
distutils-r1_python_install_all |
| 156 |
- python_fix_shebang "${ED}"/usr/share/lutris/bin/lutris-wrapper #740048 |
| 157 |
+ python_fix_shebang "${ED}/usr/share/lutris/bin/lutris-wrapper" #740048 |
| 158 |
} |
| 159 |
|
| 160 |
pkg_postinst() { |
Archives