[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/

2023-02-22 Thread Andrew Ammerlaan 
commit: 27e99c8e283d34b7abc8943046d5750d0557f5af
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Feb 22 16:42:26 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Feb 23 07:37:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27e99c8e

games-util/lutris: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29726
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch | 17 -
 1 file changed, 17 deletions(-)

diff --git a/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch 
b/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch
deleted file mode 100644
index 9685a826878b..
--- a/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/lutris/gui/dialogs/webconnect_dialog.py 
b/lutris/gui/dialogs/webconnect_dialog.py
-index 12fbbdc..a6cd838 100644
 a/lutris/gui/dialogs/webconnect_dialog.py
-+++ b/lutris/gui/dialogs/webconnect_dialog.py
-@@ -3,7 +3,11 @@ import os
- from gettext import gettext as _
- 
- import gi
--gi.require_version("WebKit2", "4.0")
-+try:
-+gi.require_version("WebKit2", "4.1")
-+except (ImportError, ValueError):
-+gi.require_version("WebKit2", "4.0")
-+
- from gi.repository import WebKit2
- 
- from lutris.gui.dialogs import ModalDialog

[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/, games-util/lutris/

2023-01-28 Thread Andrew Ammerlaan 
commit: a1e58c8f1e9b34d8f7b76969a4df5a33e2a47bf9
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Jan 28 10:00:34 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Jan 28 10:01:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e58c8f

games-util/lutris: update  ebuild in preparation of 0.5.13 release

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch| 17 +
 games-util/lutris/lutris-.ebuild   | 18 ++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch 
b/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch
new file mode 100644
index ..9685a826878b
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch
@@ -0,0 +1,17 @@
+diff --git a/lutris/gui/dialogs/webconnect_dialog.py 
b/lutris/gui/dialogs/webconnect_dialog.py
+index 12fbbdc..a6cd838 100644
+--- a/lutris/gui/dialogs/webconnect_dialog.py
 b/lutris/gui/dialogs/webconnect_dialog.py
+@@ -3,7 +3,11 @@ import os
+ from gettext import gettext as _
+ 
+ import gi
+-gi.require_version("WebKit2", "4.0")
++try:
++gi.require_version("WebKit2", "4.1")
++except (ImportError, ValueError):
++gi.require_version("WebKit2", "4.0")
++
+ from gi.repository import WebKit2
+ 
+ from lutris.gui.dialogs import ModalDialog

diff --git a/games-util/lutris/lutris-.ebuild 
b/games-util/lutris/lutris-.ebuild
index e1ea8bd1147a..0b268cfd6c78 100644
--- a/games-util/lutris/lutris-.ebuild
+++ b/games-util/lutris/lutris-.ebuild
@@ -5,7 +5,8 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="sqlite,threads(+)"
-DISTUTILS_SINGLE_IMPL="1"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 optfeature virtualx xdg
 
@@ -34,18 +35,23 @@ RDEPEND="
app-arch/p7zip
app-arch/unzip
$(python_gen_cond_dep '
+   dev-python/certifi[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/distro[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
+   dev-python/pypresence[${PYTHON_USEDEP}]
dev-python/python-evdev[${PYTHON_USEDEP}]
-   dev-python/python-magic[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/moddb[${PYTHON_USEDEP}]
')
media-sound/fluid-soundfont
-   net-libs/webkit-gtk:4.1[introspection]
+   || (
+   net-libs/webkit-gtk:4[introspection]
+   net-libs/webkit-gtk:4.1[introspection]
+   )
x11-apps/mesa-progs
x11-apps/xgamma
x11-apps/xrandr
@@ -57,6 +63,10 @@ distutils_enable_tests pytest
 
 DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
 
+PATCHES=(
+   "${FILESDIR}/${PN}-0.5.13-webkit-gtk-4-1.patch"
+)
+
 python_test() {
virtx epytest
 }
@@ -69,7 +79,7 @@ python_install_all() {
 pkg_postinst() {
xdg_pkg_postinst
 
-   optfeature "running windows games through wine+DXVK/proton or other 
Vulkan games (plus ICD for your hardware)" media-libs/vulkan-loader
+   optfeature "running MS Windows games through wine+DXVK/proton or other 
Vulkan games (plus ICD for your hardware)" media-libs/vulkan-loader
 
# Quote README.rst
elog ""

[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/

2022-12-06 Thread Andrew Ammerlaan 
commit: 80cebc0f63d2bff3e554b5e41b3200a0d5ec28e7
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Dec  6 18:38:54 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Dec  6 18:45:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80cebc0f

games-util/lutris: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28573
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../files/lutris-0.5.12_beta1-webkit-gtk-4.1.patch | 92 --
 1 file changed, 92 deletions(-)

diff --git a/games-util/lutris/files/lutris-0.5.12_beta1-webkit-gtk-4.1.patch 
b/games-util/lutris/files/lutris-0.5.12_beta1-webkit-gtk-4.1.patch
deleted file mode 100644
index 3cc4a2a0eeea..
--- a/games-util/lutris/files/lutris-0.5.12_beta1-webkit-gtk-4.1.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/.travis.yml b/.travis.yml
-index ec50a82bbe..858a6105b2 100644
 a/.travis.yml
-+++ b/.travis.yml
-@@ -28,8 +28,7 @@ addons:
-   - gir1.2-glib-2.0
-   - libgirepository1.0-dev
-   - gir1.2-gnomedesktop-3.0
--  - gir1.2-webkit2-4.0
--  - gir1.2-notify-0.7
-+  - gir1.2-webkit2-4.1
-   - at-spi2-core
- before_install:
-   - "export DISPLAY=:99.0"
-diff --git a/INSTALL.rst b/INSTALL.rst
-index 94d5cc756a..a83cc0b629 100644
 a/INSTALL.rst
-+++ b/INSTALL.rst
-@@ -12,7 +12,7 @@ Lutris manually, it requires the following components:
- 
- * Python >= 3.7
- * PyGObject
--* PyGObject bindings for: Gtk, Gdk, GnomeDesktop, Webkit2, Notify
-+* PyGObject bindings for: Gtk, Gdk, GnomeDesktop, Webkit2
- * python3-requests
- * python3-pillow
- * python3-yaml
-@@ -41,8 +41,8 @@ To install all those dependencies (except for Wine and 
graphics drivers)
- on Ubuntu based systems, you can run::
- 
- sudo apt install python3-yaml python3-requests python3-pil python3-gi \
--  gir1.2-gtk-3.0 gir1.2-gnomedesktop-3.0 gir1.2-webkit2-4.0 \
--  gir1.2-notify-0.7 psmisc cabextract unzip p7zip curl fluid-soundfont-gs 
\
-+  gir1.2-gtk-3.0 gir1.2-gnomedesktop-3.0 gir1.2-webkit2-4.1 \
-+  psmisc cabextract unzip p7zip curl fluid-soundfont-gs \
-   x11-xserver-utils python3-evdev libc6-i386 lib32gcc1 
libgirepository1.0-dev \
-   python3-setproctitle python3-distro
- 
-diff --git a/debian/control b/debian/control
-index bf0eb2121f..c74a523fed 100644
 a/debian/control
-+++ b/debian/control
-@@ -26,8 +26,7 @@ Depends: ${misc:Depends},
-  python3-distro,
-  python3-dbus,
-  gir1.2-gtk-3.0,
-- gir1.2-webkit2-4.0,
-- gir1.2-notify-0.7,
-+ gir1.2-webkit2-4.1,
-  psmisc,
-  cabextract,
-  unzip,
-diff --git a/lutris.spec b/lutris.spec
-index 13763266b0..fb430ef206 100644
 a/lutris.spec
-+++ b/lutris.spec
-@@ -43,7 +43,7 @@ BuildRequires:  hicolor-icon-theme
- BuildRequires:  python3-setuptools
- Requires:   (python3-gobject-Gdk or python3-gobject)
- Requires:   python3-PyYAML, cabextract, typelib-1_0-Gtk-3_0
--Requires:   typelib-1_0-GnomeDesktop-3_0, typelib-1_0-WebKit2-4_0, 
typelib-1_0-Notify-0_7
-+Requires:   typelib-1_0-GnomeDesktop-3_0, typelib-1_0-WebKit2-4_1
- Requires:   fluid-soundfont-gm, python3-Pillow, python3-requests
- %endif
- 
-diff --git a/lutris/gui/dialogs/webconnect_dialog.py 
b/lutris/gui/dialogs/webconnect_dialog.py
-index a7c5aa653a..195e1f6788 100644
 a/lutris/gui/dialogs/webconnect_dialog.py
-+++ b/lutris/gui/dialogs/webconnect_dialog.py
-@@ -3,7 +3,7 @@
- from gettext import gettext as _
- 
- import gi
--gi.require_version("WebKit2", "4.0")
-+gi.require_version("WebKit2", "4.1")
- from gi.repository import WebKit2
- 
- from lutris.gui.dialogs import ModalDialog
-diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
-index babf66ff9c..515981f250 100644
 a/snap/snapcraft.yaml
-+++ b/snap/snapcraft.yaml
-@@ -90,8 +90,7 @@ parts:
-   - gir1.2-glib-2.0
-   - gir1.2-gnomedesktop-3.0
-   - gir1.2-gtk-3.0
--  - gir1.2-notify-0.7
--  - gir1.2-webkit2-4.0
-+  - gir1.2-webkit2-4.1
-   - libgnutls30
-   - libvulkan1
-   - libxrandr2

[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/, games-util/lutris/

2022-10-19 Thread Andrew Ammerlaan 
commit: 91761cd36c49c499aa1143feb45f6a2a7cf8b7d1
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Oct 19 08:57:23 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Oct 19 08:59:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91761cd3

games-util/lutris: add version 0.5.12_beta1

Closes: https://bugs.gentoo.org/876807
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 games-util/lutris/Manifest |  1 +
 .../files/lutris-0.5.12_beta1-webkit-gtk-4.1.patch | 92 ++
 ...tris-.ebuild => lutris-0.5.12_beta1.ebuild} | 15 ++--
 games-util/lutris/lutris-.ebuild   |  2 -
 4 files changed, 102 insertions(+), 8 deletions(-)

diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 278e4b2fbff7..a1aaa1ff023f 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,2 +1,3 @@
+DIST lutris-0.5.12_beta1.tar.gz 1138991 BLAKE2B 
8bf47e49058690e4e42c6700b00daa7585787087f742dcaf9eab691a19ee9b230baaee6a7cde1f0b04e750052afffd30b324e4b9aeb506b0851b7793d842
 SHA512 
24ac4c0f3ebadb2aca956604479c2a3ce5fb305c47be432a86b5db7ca30696550f138c8e9afd931ceb859c7f9145782cb86fe88850ddce5d95e4fe9e54cbf167
 DIST lutris_0.5.10.1.tar.xz 1230464 BLAKE2B 
5ba913f5e37956344b59c47c1315cf277ce57b1b771279c8aa4243971ea9f0c5277ad19b18655731048e989f752d957216d055ac6c26bb8731e52b4345d30847
 SHA512 
f6443fa86d0b38e1b5ba51054e50776eea63d9adda5738a7e69f2fe6b196f99491894d5068d6cddfd35d1baafa4188bd1935598b84266e9e23bd1b58c16dde20
 DIST lutris_0.5.11.tar.xz 1337572 BLAKE2B 
9baeaa078483812c25754691cde80324155a69fde7edc1aec043df806ceb0cbe05e04c71c73d9ff355d2aaa2f21d9e53871a1752b02022ae8527b69ed31cf47c
 SHA512 
16b06f6a3377bfa8db5c3b1e1b3872cbfbd5e7ff27975b51083142dce9931c90a9827f8da7b2d9ba7b21e65bc4ca1759f6a720c142a01f99532274e152cfde0a

diff --git a/games-util/lutris/files/lutris-0.5.12_beta1-webkit-gtk-4.1.patch 
b/games-util/lutris/files/lutris-0.5.12_beta1-webkit-gtk-4.1.patch
new file mode 100644
index ..3cc4a2a0eeea
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.12_beta1-webkit-gtk-4.1.patch
@@ -0,0 +1,92 @@
+diff --git a/.travis.yml b/.travis.yml
+index ec50a82bbe..858a6105b2 100644
+--- a/.travis.yml
 b/.travis.yml
+@@ -28,8 +28,7 @@ addons:
+   - gir1.2-glib-2.0
+   - libgirepository1.0-dev
+   - gir1.2-gnomedesktop-3.0
+-  - gir1.2-webkit2-4.0
+-  - gir1.2-notify-0.7
++  - gir1.2-webkit2-4.1
+   - at-spi2-core
+ before_install:
+   - "export DISPLAY=:99.0"
+diff --git a/INSTALL.rst b/INSTALL.rst
+index 94d5cc756a..a83cc0b629 100644
+--- a/INSTALL.rst
 b/INSTALL.rst
+@@ -12,7 +12,7 @@ Lutris manually, it requires the following components:
+ 
+ * Python >= 3.7
+ * PyGObject
+-* PyGObject bindings for: Gtk, Gdk, GnomeDesktop, Webkit2, Notify
++* PyGObject bindings for: Gtk, Gdk, GnomeDesktop, Webkit2
+ * python3-requests
+ * python3-pillow
+ * python3-yaml
+@@ -41,8 +41,8 @@ To install all those dependencies (except for Wine and 
graphics drivers)
+ on Ubuntu based systems, you can run::
+ 
+ sudo apt install python3-yaml python3-requests python3-pil python3-gi \
+-  gir1.2-gtk-3.0 gir1.2-gnomedesktop-3.0 gir1.2-webkit2-4.0 \
+-  gir1.2-notify-0.7 psmisc cabextract unzip p7zip curl fluid-soundfont-gs 
\
++  gir1.2-gtk-3.0 gir1.2-gnomedesktop-3.0 gir1.2-webkit2-4.1 \
++  psmisc cabextract unzip p7zip curl fluid-soundfont-gs \
+   x11-xserver-utils python3-evdev libc6-i386 lib32gcc1 
libgirepository1.0-dev \
+   python3-setproctitle python3-distro
+ 
+diff --git a/debian/control b/debian/control
+index bf0eb2121f..c74a523fed 100644
+--- a/debian/control
 b/debian/control
+@@ -26,8 +26,7 @@ Depends: ${misc:Depends},
+  python3-distro,
+  python3-dbus,
+  gir1.2-gtk-3.0,
+- gir1.2-webkit2-4.0,
+- gir1.2-notify-0.7,
++ gir1.2-webkit2-4.1,
+  psmisc,
+  cabextract,
+  unzip,
+diff --git a/lutris.spec b/lutris.spec
+index 13763266b0..fb430ef206 100644
+--- a/lutris.spec
 b/lutris.spec
+@@ -43,7 +43,7 @@ BuildRequires:  hicolor-icon-theme
+ BuildRequires:  python3-setuptools
+ Requires:   (python3-gobject-Gdk or python3-gobject)
+ Requires:   python3-PyYAML, cabextract, typelib-1_0-Gtk-3_0
+-Requires:   typelib-1_0-GnomeDesktop-3_0, typelib-1_0-WebKit2-4_0, 
typelib-1_0-Notify-0_7
++Requires:   typelib-1_0-GnomeDesktop-3_0, typelib-1_0-WebKit2-4_1
+ Requires:   fluid-soundfont-gm, python3-Pillow, python3-requests
+ %endif
+ 
+diff --git a/lutris/gui/dialogs/webconnect_dialog.py 
b/lutris/gui/dialogs/webconnect_dialog.py
+index a7c5aa653a..195e1f6788 100644
+--- a/lutris/gui/dialogs/webconnect_dialog.py
 b/lutris/gui/dialogs/webconnect_dialog.py
+@@ -3,7 +3,7 @@
+ from gettext import gettext as _
+ 
+ import gi
+-gi.require_version("WebKit2", "4.0")
++gi.require_version("WebKit2", "4.1")
+

[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/, games-util/lutris/

2022-04-12 Thread Andrew Ammerlaan 
commit: 0b6a34b0e5a405e241df5af0aec3f90c3c81d8d5
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Apr 12 08:55:00 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Apr 12 09:08:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6a34b0

games-util/lutris: drop 0.5.9.1-r1, 0.5.10_beta2-r1

Closes: https://bugs.gentoo.org/835897
Closes: https://bugs.gentoo.org/822969
Closes: https://bugs.gentoo.org/820860
Closes: https://bugs.gentoo.org/706432
Closes: https://bugs.gentoo.org/837863
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 games-util/lutris/Manifest |  2 -
 .../lutris-0.5.10_beta2-fix-install-requires.patch | 13 
 .../lutris-0.5.10_beta2-fix-launching-steam.patch  | 22 --
 games-util/lutris/lutris-0.5.10_beta2-r1.ebuild| 86 --
 games-util/lutris/lutris-0.5.9.1-r1.ebuild | 83 -
 5 files changed, 206 deletions(-)

diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index ba0e25bdd735..54e3e3aaeb28 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,3 +1 @@
-DIST lutris-0.5.10_beta2.tar.gz 1006201 BLAKE2B 
39a87735408639070ef21182adf23ae816a14aeb0d6acf6e36f67bc213ca21559374cc02f0ca696b65eda20b76f33240a7f15d74bca6c3852641d0827737e96c
 SHA512 
0dd0896be70c8902aa09b8bb0e45e516c8631f82a5451e15b3eaf932a5881bccd1189b5564c4cc544fb4eb1ec902cbae887618f5edda0e13d23a19dd0b71dba7
 DIST lutris_0.5.10.tar.xz 1225880 BLAKE2B 
bd46531695860c60a4b94c7bc1f4366bb6f5a9d4a098e0eff69f85e9edee0d551b6f55276a4ae48fb28e75a706da526dfaf7fbcf17af8ebbee6e809f6f39825f
 SHA512 
cb77afe40f1ceb053edf8aaa4f97fd44f0c8ecc33450a16b83373408807891d99bd409cf26d98543a0789a5dc38475d584790de1d48e0e56762945a7b6ca63e3
-DIST lutris_0.5.9.1.tar.xz 1046920 BLAKE2B 
469e7707e74d957be3bb0f5f1caeaeaaf7c01dc3b998c16d8be4b4b780e408763bbe0df5c0b5f6a53ebcb3eb478aaaf25f9cf16437ae682dfcd1d2213222fa18
 SHA512 
a94e37d1a3f5b80353af38900f3e67763af9c0e3cc3013f7998e23ff70cb6f329730b1802f996866dac541af6e50388a5308c772e3a2ee97f87e5ae60878e7e7

diff --git 
a/games-util/lutris/files/lutris-0.5.10_beta2-fix-install-requires.patch 
b/games-util/lutris/files/lutris-0.5.10_beta2-fix-install-requires.patch
deleted file mode 100644
index 8a61d987cece..
--- a/games-util/lutris/files/lutris-0.5.10_beta2-fix-install-requires.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 0388119..51bc8e1 100755
 a/setup.py
-+++ b/setup.py
-@@ -57,7 +57,7 @@ setup(
- 'evdev',
- 'requests',
- 'python-magic',
--"distro>=1.7.0;platform_system='Linux'",
-+'distro>=1.7.0',
- 'lxml'
- ],
- url='https://lutris.net',

diff --git 
a/games-util/lutris/files/lutris-0.5.10_beta2-fix-launching-steam.patch 
b/games-util/lutris/files/lutris-0.5.10_beta2-fix-launching-steam.patch
deleted file mode 100644
index 2edd6569ce75..
--- a/games-util/lutris/files/lutris-0.5.10_beta2-fix-launching-steam.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 072e72a4aefd91101b79dd05d8ce9f100a4b6b0c Mon Sep 17 00:00:00 2001
-From: Mathieu Comandon 
-Date: Fri, 25 Feb 2022 14:02:12 -0800
-Subject: [PATCH] contentstatsid key might not be present
-

- lutris/util/steam/config.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lutris/util/steam/config.py b/lutris/util/steam/config.py
-index 237cb36f24..bae2ec22da 100644
 a/lutris/util/steam/config.py
-+++ b/lutris/util/steam/config.py
-@@ -158,7 +158,7 @@ def get_entry_case_insensitive(library_dict, path):
- with open(library_filename, "r", encoding='utf-8') as steam_library_file:
- library = vdf_parse(steam_library_file, {})
- # The contentstatsid key is unused and causes problems when looking 
for library paths.
--library["libraryfolders"].pop("contentstatsid")
-+library["libraryfolders"].pop("contentstatsid", None)
- try:
- return get_entry_case_insensitive(library, ["libraryfolders"])
- except KeyError as ex:

diff --git a/games-util/lutris/lutris-0.5.10_beta2-r1.ebuild 
b/games-util/lutris/lutris-0.5.10_beta2-r1.ebuild
deleted file mode 100644
index f130672bb4a9..
--- a/games-util/lutris/lutris-0.5.10_beta2-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite,threads(+)"
-DISTUTILS_SINGLE_IMPL="1"
-
-inherit distutils-r1 virtualx xdg
-
-DESCRIPTION="An open source gaming platform for GNU/Linux"
-HOMEPAGE="https://lutris.net/;
-
-if [[ ${PV} == ** ]] ; then
-   EGIT_REPO_URI="https://github.com/lutris/lutris.git;
-   inherit git-r3
-else
-   if [[ ${PV} == *_beta* ]] ; then
-   
SRC_URI="https://github.com/lutris/lutris/archive/refs/tags/v${PV/_/-}.tar.gz 
-> ${P}.tar.gz"
-

[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/, games-util/lutris/

2022-04-07 Thread Sam James 
commit: c413439b8f12f65d35bbd1ce9a377b7539edd5d2
Author: Adel KARA SLIMANE  zegrapher  com>
AuthorDate: Sat Apr  2 14:53:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  7 19:28:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c413439b

games-util/lutris: add patch to chose amdgpu-pro-vulkan driver

GURU amdvlk (orphaned for now) will be detected as the open source version

Signed-off-by: Adel KARA SLIMANE  zegrapher.com>
Closes: https://github.com/gentoo/gentoo/pull/24867
Signed-off-by: Sam James  gentoo.org>

 ...ris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch | 46 ++
 ..._beta2.ebuild => lutris-0.5.10_beta2-r1.ebuild} |  1 +
 ...ris-0.5.9.1.ebuild => lutris-0.5.9.1-r1.ebuild} |  5 ++-
 games-util/lutris/lutris-.ebuild   |  1 +
 4 files changed, 52 insertions(+), 1 deletion(-)

diff --git 
a/games-util/lutris/files/lutris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch 
b/games-util/lutris/files/lutris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch
new file mode 100644
index ..5ff491486d5a
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch
@@ -0,0 +1,46 @@
+diff --git a/lutris/sysoptions.py b/lutris/sysoptions.py
+index 8896b7d..565bbab 100644
+--- a/lutris/sysoptions.py
 b/lutris/sysoptions.py
+@@ -82,6 +82,7 @@ def get_vk_icd_choices():
+ amdradv = []
+ nvidia = []
+ amdvlk = []
++amdvlkpro = []
+ choices = [(_("Auto: WARNING -- No Vulkan Loader detected!"), "")]
+ icd_files = defaultdict(list)
+ # Add loaders
+@@ -96,13 +97,17 @@ def get_vk_icd_choices():
+ amdradv.append(loader)
+ elif "nvidia" in loader:
+ nvidia.append(loader)
+-elif "amd_icd" in loader:
+-amdvlk.append(loader)
++elif "amd" in loader:
++if "pro" in loader:
++amdvlkpro.append(loader)
++else:
++amdvlk.append(loader)
+ 
+ intel_files = ":".join(intel)
+ amdradv_files = ":".join(amdradv)
+ nvidia_files = ":".join(nvidia)
+ amdvlk_files = ":".join(amdvlk)
++amdvlkpro_files = ":".join(amdvlkpro)
+ 
+ glxinfocmd = get_gpu_vendor_cmd(0)
+ if nvidia_files:
+@@ -125,7 +130,12 @@ def get_vk_icd_choices():
+ if nvidia_files:
+ choices.append(("Nvidia Proprietary", nvidia_files))
+ if amdvlk_files:
+-choices.append(("AMDVLK/AMDGPU-PRO Proprietary", amdvlk_files))
++if not amdvlkpro_files:
++choices.append(("AMDVLK/AMDGPU-PRO Proprietary", amdvlk_files))
++else:
++choices.append(("AMDVLK Open source", amdvlk_files))
++if amdvlkpro_files:
++choices.append(("AMDGPU-PRO Proprietary", amdvlkpro_files))
+ return choices
+ 
+ 

diff --git a/games-util/lutris/lutris-0.5.10_beta2.ebuild 
b/games-util/lutris/lutris-0.5.10_beta2-r1.ebuild
similarity index 97%
rename from games-util/lutris/lutris-0.5.10_beta2.ebuild
rename to games-util/lutris/lutris-0.5.10_beta2-r1.ebuild
index aea04d0dd550..f130672bb4a9 100644
--- a/games-util/lutris/lutris-0.5.10_beta2.ebuild
+++ b/games-util/lutris/lutris-0.5.10_beta2-r1.ebuild
@@ -63,6 +63,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch"
"${FILESDIR}/${P}-fix-install-requires.patch"
"${FILESDIR}/${P}-fix-launching-steam.patch"
+   "${FILESDIR}/${PN}-0.5.9-choose-amdgpu-pro-vulkan-driver.patch"
 )
 
 python_test() {

diff --git a/games-util/lutris/lutris-0.5.9.1.ebuild 
b/games-util/lutris/lutris-0.5.9.1-r1.ebuild
similarity index 93%
rename from games-util/lutris/lutris-0.5.9.1.ebuild
rename to games-util/lutris/lutris-0.5.9.1-r1.ebuild
index 683abd5de58b..06be0ac26a76 100644
--- a/games-util/lutris/lutris-0.5.9.1.ebuild
+++ b/games-util/lutris/lutris-0.5.9.1-r1.ebuild
@@ -58,7 +58,10 @@ distutils_enable_tests pytest
 
 DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
 
-PATCHES=( "${FILESDIR}/${P}-avoid-gtk-4.0-already-loaded-testerror.patch" )
+PATCHES=(
+   "${FILESDIR}/${P}-avoid-gtk-4.0-already-loaded-testerror.patch"
+   "${FILESDIR}/${PN}-0.5.9-choose-amdgpu-pro-vulkan-driver.patch"
+)
 
 python_test() {
virtx epytest

diff --git a/games-util/lutris/lutris-.ebuild 
b/games-util/lutris/lutris-.ebuild
index fa2c19860a63..1a0b499e7b23 100644
--- a/games-util/lutris/lutris-.ebuild
+++ b/games-util/lutris/lutris-.ebuild
@@ -57,6 +57,7 @@ RDEPEND="
 distutils_enable_tests pytest
 
 DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
+PATCHES=( "${FILESDIR}/${PN}-0.5.9-choose-amdgpu-pro-vulkan-driver.patch" )
 
 python_test() {
virtx epytest

[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/, games-util/lutris/

2022-03-30 Thread Andrew Ammerlaan 
commit: 5bdc866c6fd38850f8feb9561054e523b607dd6f
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Mar 30 10:18:23 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Mar 30 11:50:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdc866c

games-util/lutris: add 0.5.10_beta2

Bug: https://github.com/lutris/lutris/issues/4175
Bug: https://bugs.gentoo.org/835897
Bug: https://bugs.gentoo.org/822969
Bug: https://bugs.gentoo.org/836332
Bug: https://bugs.gentoo.org/820860
Signed-off-by: Andrew Ammerlaan  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/24815
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 games-util/lutris/Manifest |  1 +
 .../lutris-0.5.10_beta2-fix-install-requires.patch | 13 
 .../lutris-0.5.10_beta2-fix-launching-steam.patch  | 22 ++
 games-util/lutris/lutris-0.5.10_beta2.ebuild   | 88 ++
 4 files changed, 124 insertions(+)

diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 61166b09c69a..c2c55885295b 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1 +1,2 @@
+DIST lutris-0.5.10_beta2.tar.gz 1006201 BLAKE2B 
39a87735408639070ef21182adf23ae816a14aeb0d6acf6e36f67bc213ca21559374cc02f0ca696b65eda20b76f33240a7f15d74bca6c3852641d0827737e96c
 SHA512 
0dd0896be70c8902aa09b8bb0e45e516c8631f82a5451e15b3eaf932a5881bccd1189b5564c4cc544fb4eb1ec902cbae887618f5edda0e13d23a19dd0b71dba7
 DIST lutris_0.5.9.1.tar.xz 1046920 BLAKE2B 
469e7707e74d957be3bb0f5f1caeaeaaf7c01dc3b998c16d8be4b4b780e408763bbe0df5c0b5f6a53ebcb3eb478aaaf25f9cf16437ae682dfcd1d2213222fa18
 SHA512 
a94e37d1a3f5b80353af38900f3e67763af9c0e3cc3013f7998e23ff70cb6f329730b1802f996866dac541af6e50388a5308c772e3a2ee97f87e5ae60878e7e7

diff --git 
a/games-util/lutris/files/lutris-0.5.10_beta2-fix-install-requires.patch 
b/games-util/lutris/files/lutris-0.5.10_beta2-fix-install-requires.patch
new file mode 100644
index ..8a61d987cece
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.10_beta2-fix-install-requires.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 0388119..51bc8e1 100755
+--- a/setup.py
 b/setup.py
+@@ -57,7 +57,7 @@ setup(
+ 'evdev',
+ 'requests',
+ 'python-magic',
+-"distro>=1.7.0;platform_system='Linux'",
++'distro>=1.7.0',
+ 'lxml'
+ ],
+ url='https://lutris.net',

diff --git 
a/games-util/lutris/files/lutris-0.5.10_beta2-fix-launching-steam.patch 
b/games-util/lutris/files/lutris-0.5.10_beta2-fix-launching-steam.patch
new file mode 100644
index ..2edd6569ce75
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.10_beta2-fix-launching-steam.patch
@@ -0,0 +1,22 @@
+From 072e72a4aefd91101b79dd05d8ce9f100a4b6b0c Mon Sep 17 00:00:00 2001
+From: Mathieu Comandon 
+Date: Fri, 25 Feb 2022 14:02:12 -0800
+Subject: [PATCH] contentstatsid key might not be present
+
+---
+ lutris/util/steam/config.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lutris/util/steam/config.py b/lutris/util/steam/config.py
+index 237cb36f24..bae2ec22da 100644
+--- a/lutris/util/steam/config.py
 b/lutris/util/steam/config.py
+@@ -158,7 +158,7 @@ def get_entry_case_insensitive(library_dict, path):
+ with open(library_filename, "r", encoding='utf-8') as steam_library_file:
+ library = vdf_parse(steam_library_file, {})
+ # The contentstatsid key is unused and causes problems when looking 
for library paths.
+-library["libraryfolders"].pop("contentstatsid")
++library["libraryfolders"].pop("contentstatsid", None)
+ try:
+ return get_entry_case_insensitive(library, ["libraryfolders"])
+ except KeyError as ex:

diff --git a/games-util/lutris/lutris-0.5.10_beta2.ebuild 
b/games-util/lutris/lutris-0.5.10_beta2.ebuild
new file mode 100644
index ..0f6bb9cf095a
--- /dev/null
+++ b/games-util/lutris/lutris-0.5.10_beta2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite,threads(+)"
+DISTUTILS_SINGLE_IMPL="1"
+
+inherit distutils-r1 virtualx xdg
+
+DESCRIPTION="An open source gaming platform for GNU/Linux"
+HOMEPAGE="https://lutris.net/;
+
+if [[ ${PV} == ** ]] ; then
+   EGIT_REPO_URI="https://github.com/lutris/lutris.git;
+   inherit git-r3
+else
+   if [[ ${PV} == *_beta* ]] ; then
+   
SRC_URI="https://github.com/lutris/lutris/archive/refs/tags/v${PV/_/-}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}"/${P/_/-}
+
+   KEYWORDS="~amd64 ~x86"
+   else
+   SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz;
+   S="${WORKDIR}/${PN}"
+
+   KEYWORDS="~amd64 ~x86"
+   fi
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+   app-arch/cabextract
+   app-arch/p7zip
+

[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/, games-util/lutris/

2021-10-29 Thread Andrew Ammerlaan 
commit: c89bc502532518bf7fc83351b833f066e8065030
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Oct 29 18:35:26 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Oct 29 19:04:10 2021 +
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  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-.ebuild => lutris-0.5.9.1.ebuild}   | 21 +++--
 games-util/lutris/lutris-.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 000..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-.ebuild 
b/games-util/lutris/lutris-0.5.9.1.ebuild
similarity index 79%
copy from games-util/lutris/lutris-.ebuild
copy to games-util/lutris/lutris-0.5.9.1.ebuild
index 4ca63a7a2a1..683abd5de58 100644
--- a/games-util/lutris/lutris-.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-.ebuild 
b/games-util/lutris/lutris-.ebuild
index 4ca63a7a2a1..fa2c19860a6 100644
--- a/games-util/lutris/lutris-.ebuild
+++

[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/

2021-02-17 Thread Conrad Kostecki 
commit: d00f89b8fe0f572d61b4c5a769a4dc9880582de4
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Feb 17 16:12:06 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Feb 17 19:32:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d00f89b8

games-util/lutris: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/19502
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../lutris/files/lutris-0.5.7-copy_paste_fix.patch | 38 --
 1 file changed, 38 deletions(-)

diff --git a/games-util/lutris/files/lutris-0.5.7-copy_paste_fix.patch 
b/games-util/lutris/files/lutris-0.5.7-copy_paste_fix.patch
deleted file mode 100644
index 3e278561aa3..000
--- a/games-util/lutris/files/lutris-0.5.7-copy_paste_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9603da9d4eda1656219a4c79e1f9d1a958165151 Mon Sep 17 00:00:00 2001
-From: Austin Pua 
-Date: Wed, 1 Jul 2020 21:48:09 +0800
-Subject: [PATCH] Fix copy paste issue in auth webviews
-

- lutris/services/gog.py  | 3 ++-
- lutris/services/humblebundle.py | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/lutris/services/gog.py b/lutris/services/gog.py
-index 0eed7778c..099f9083d 100644
 a/lutris/services/gog.py
-+++ b/lutris/services/gog.py
-@@ -279,7 +279,8 @@ def connect(parent=None):
- """Connect to GOG"""
- logger.debug("Connecting to GOG")
- dialog = WebConnectDialog(SERVICE, parent)
--dialog.run()
-+dialog.set_modal(True)
-+dialog.show()
- 
- 
- def disconnect():
-diff --git a/lutris/services/humblebundle.py b/lutris/services/humblebundle.py
-index 6dcfe6911..056ef9460 100644
 a/lutris/services/humblebundle.py
-+++ b/lutris/services/humblebundle.py
-@@ -152,7 +152,8 @@ def is_connected():
- def connect(parent=None):
- """Connect to Humble Bundle"""
- dialog = WebConnectDialog(SERVICE, parent)
--dialog.run()
-+dialog.set_modal(True)
-+dialog.show()
- 
- 
- def disconnect():

[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/, games-util/lutris/

2020-09-11 Thread Lars Wendler 
commit: e8e44a458728cd9f71145cfad6b71a791409bdf3
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Sep 11 08:08:50 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Sep 11 08:09:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8e44a45

games-util/lutris: Removed old

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Lars Wendler  gentoo.org>

 games-util/lutris/Manifest |  2 -
 games-util/lutris/files/lutris-0.5.4-gtk.patch | 29 --
 games-util/lutris/lutris-0.5.4-r1.ebuild   | 79 --
 games-util/lutris/lutris-0.5.6.ebuild  | 78 -
 4 files changed, 188 deletions(-)

diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 678e040beda..fe7a800819b 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,4 +1,2 @@
-DIST lutris_0.5.4.tar.xz 1843880 BLAKE2B 
f286d62df3bf5a5eadd634d2d177a5b69b5fa5d897e70f58a19be4148609e56ba33c29ce4218ae833dbdf9dded1e9be869f9ed4d84ba2b435a09981219d74438
 SHA512 
81669f2021063229bad78ebc49b54075058266716279695c53c43a5a06a8c1d4e5a9dcbcb20a1becfe0d243aa6e812f5a30b4d90f418d4cffcff18daefb09c50
-DIST lutris_0.5.6.tar.xz 1747440 BLAKE2B 
e39206d8245d99a0424537cd9d9ed860c4e0d9fd373afe61d7e19eb2672bee621d541060af74f1197242e49a846e70fe16eb28e0c57370d2e11634d7035ab1fe
 SHA512 
3ac9f7095c30044990e42f671d6e1e5cac6cd921cdf93e175400335cb6e9ae5b1bf8101dc0805838f3c5bf9713b891c62960c80a1a20aef1e4f896a74af97a01
 DIST lutris_0.5.7.1.tar.xz 2145584 BLAKE2B 
eb766d5e36aca63af7af8f2e85f51b4e3e37b8372b13a59702c545a0c697fa5feb1403cd9589d22c2bdff6593f69ed39e1bcb7ecb28ecc24b7a77b09ed1b2f89
 SHA512 
9efff4d92ae4d9051a7253324047dfa57f463188ebdbcede5feba2c0268494e8fa7929d2ef30bfe85e52824bbb9c05b1f1688b6658376597cc4cc35c26a19da3
 DIST lutris_0.5.7.tar.xz 2133524 BLAKE2B 
d27191668f582a5cd50941ca227d6121f1bfdb4824c490dd54cc513fda523712af9480451b0e5503404aba8d083c94ce91b928ed3faf4e94ea9f0bbf28b764c1
 SHA512 
f751be82dd5550dc882932980a3a04a62f183e5f0dddc9939154025408da081392917834324875a80ae8b354906e04835c2df56c23f1d6d29cd9fbdc514e1c57

diff --git a/games-util/lutris/files/lutris-0.5.4-gtk.patch 
b/games-util/lutris/files/lutris-0.5.4-gtk.patch
deleted file mode 100644
index a2c5d71d998..000
--- a/games-util/lutris/files/lutris-0.5.4-gtk.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a97150b78954e176cb0f825f0c201f54d5da613e Mon Sep 17 00:00:00 2001
-From: Stefan Strogin 
-Date: Tue, 31 Dec 2019 03:22:26 +0200
-Subject: [PATCH] Call the correct method for creating TreeModelSort (Closes
- #2554)
-
-Upstream-Status: Accepted
-[https://github.com/lutris/lutris/commit/a99b17f00dfc4cdab80c237752cc3167d64194eb]
-Signed-off-by: Stefan Strogin 

- lutris/gui/views/store.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lutris/gui/views/store.py b/lutris/gui/views/store.py
-index ba331313..4d5f372e 100644
 a/lutris/gui/views/store.py
-+++ b/lutris/gui/views/store.py
-@@ -130,7 +130,7 @@ class GameStore(GObject.Object):
- self.prevent_sort_update = False  # prevent recursion with signals
- self.modelfilter = self.store.filter_new()
- self.modelfilter.set_visible_func(self.filter_view)
--self.modelsort = 
Gtk.TreeModelSort.sort_new_with_model(self.modelfilter)
-+self.modelsort = Gtk.TreeModelSort.new_with_model(self.modelfilter)
- self.modelsort.connect("sort-column-changed", 
self.on_sort_column_changed)
- self.modelsort.set_sort_func(sort_col, sort_func, sort_col)
- self.sort_view(sort_key, sort_ascending)
--- 
-2.24.1
-

diff --git a/games-util/lutris/lutris-0.5.4-r1.ebuild 
b/games-util/lutris/lutris-0.5.4-r1.ebuild
deleted file mode 100644
index c6f225494ee..000
--- a/games-util/lutris/lutris-0.5.4-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,threads(+)"
-
-inherit distutils-r1 virtualx xdg
-
-DESCRIPTION="An open source gaming platform for GNU/Linux"
-HOMEPAGE="https://lutris.net/;
-
-if [[ ${PV} == ** ]] ; then
-   EGIT_REPO_URI="https://github.com/lutris/lutris.git;
-   inherit git-r3
-else
-   SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz;
-   KEYWORDS="~amd64 ~x86"
-   S="${WORKDIR}/${PN}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-   app-arch/cabextract
-   app-arch/p7zip
-   app-arch/unrar
-   app-arch/unzip
-   dev-python/pillow[${PYTHON_USEDEP}]
-   dev-python/pygobject:3[${PYTHON_USEDEP}]
-   dev-python/python-evdev[${PYTHON_USEDEP}]
-   dev-python/pyyaml[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-   gnome-base/gnome-desktop:3[introspection]
-

[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/, games-util/lutris/

2020-09-11 Thread Lars Wendler 
commit: 29b588944a03fb6f123226952666c5b0a3f99d86
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Sep 11 08:04:55 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Sep 11 08:08:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29b58894

games-util/lutris: Bump to version 0.5.7.1

Converted to only use a single python implementation in order to
avoid bug #740048

Thanks-to: Arfrever Frehtes Taifersar Arahesis  Apache.Org>

Closes: https://bugs.gentoo.org/733828
Closes: https://bugs.gentoo.org/740048
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Lars Wendler  gentoo.org>

 games-util/lutris/Manifest |  1 +
 .../lutris/files/lutris-0.5.7-copy_paste_fix.patch | 38 ++
 games-util/lutris/lutris-0.5.7.1.ebuild| 82 ++
 3 files changed, 121 insertions(+)

diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 0e52c75c49c..678e040beda 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,3 +1,4 @@
 DIST lutris_0.5.4.tar.xz 1843880 BLAKE2B 
f286d62df3bf5a5eadd634d2d177a5b69b5fa5d897e70f58a19be4148609e56ba33c29ce4218ae833dbdf9dded1e9be869f9ed4d84ba2b435a09981219d74438
 SHA512 
81669f2021063229bad78ebc49b54075058266716279695c53c43a5a06a8c1d4e5a9dcbcb20a1becfe0d243aa6e812f5a30b4d90f418d4cffcff18daefb09c50
 DIST lutris_0.5.6.tar.xz 1747440 BLAKE2B 
e39206d8245d99a0424537cd9d9ed860c4e0d9fd373afe61d7e19eb2672bee621d541060af74f1197242e49a846e70fe16eb28e0c57370d2e11634d7035ab1fe
 SHA512 
3ac9f7095c30044990e42f671d6e1e5cac6cd921cdf93e175400335cb6e9ae5b1bf8101dc0805838f3c5bf9713b891c62960c80a1a20aef1e4f896a74af97a01
+DIST lutris_0.5.7.1.tar.xz 2145584 BLAKE2B 
eb766d5e36aca63af7af8f2e85f51b4e3e37b8372b13a59702c545a0c697fa5feb1403cd9589d22c2bdff6593f69ed39e1bcb7ecb28ecc24b7a77b09ed1b2f89
 SHA512 
9efff4d92ae4d9051a7253324047dfa57f463188ebdbcede5feba2c0268494e8fa7929d2ef30bfe85e52824bbb9c05b1f1688b6658376597cc4cc35c26a19da3
 DIST lutris_0.5.7.tar.xz 2133524 BLAKE2B 
d27191668f582a5cd50941ca227d6121f1bfdb4824c490dd54cc513fda523712af9480451b0e5503404aba8d083c94ce91b928ed3faf4e94ea9f0bbf28b764c1
 SHA512 
f751be82dd5550dc882932980a3a04a62f183e5f0dddc9939154025408da081392917834324875a80ae8b354906e04835c2df56c23f1d6d29cd9fbdc514e1c57

diff --git a/games-util/lutris/files/lutris-0.5.7-copy_paste_fix.patch 
b/games-util/lutris/files/lutris-0.5.7-copy_paste_fix.patch
new file mode 100644
index 000..3e278561aa3
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.7-copy_paste_fix.patch
@@ -0,0 +1,38 @@
+From 9603da9d4eda1656219a4c79e1f9d1a958165151 Mon Sep 17 00:00:00 2001
+From: Austin Pua 
+Date: Wed, 1 Jul 2020 21:48:09 +0800
+Subject: [PATCH] Fix copy paste issue in auth webviews
+
+---
+ lutris/services/gog.py  | 3 ++-
+ lutris/services/humblebundle.py | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/lutris/services/gog.py b/lutris/services/gog.py
+index 0eed7778c..099f9083d 100644
+--- a/lutris/services/gog.py
 b/lutris/services/gog.py
+@@ -279,7 +279,8 @@ def connect(parent=None):
+ """Connect to GOG"""
+ logger.debug("Connecting to GOG")
+ dialog = WebConnectDialog(SERVICE, parent)
+-dialog.run()
++dialog.set_modal(True)
++dialog.show()
+ 
+ 
+ def disconnect():
+diff --git a/lutris/services/humblebundle.py b/lutris/services/humblebundle.py
+index 6dcfe6911..056ef9460 100644
+--- a/lutris/services/humblebundle.py
 b/lutris/services/humblebundle.py
+@@ -152,7 +152,8 @@ def is_connected():
+ def connect(parent=None):
+ """Connect to Humble Bundle"""
+ dialog = WebConnectDialog(SERVICE, parent)
+-dialog.run()
++dialog.set_modal(True)
++dialog.show()
+ 
+ 
+ def disconnect():

diff --git a/games-util/lutris/lutris-0.5.7.1.ebuild 
b/games-util/lutris/lutris-0.5.7.1.ebuild
new file mode 100644
index 000..fb54a72d2b4
--- /dev/null
+++ b/games-util/lutris/lutris-0.5.7.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite,threads(+)"
+DISTUTILS_SINGLE_IMPL="1"
+
+inherit distutils-r1 virtualx xdg
+
+DESCRIPTION="An open source gaming platform for GNU/Linux"
+HOMEPAGE="https://lutris.net/;
+
+if [[ ${PV} == ** ]] ; then
+   EGIT_REPO_URI="https://github.com/lutris/lutris.git;
+   inherit git-r3
+else
+   SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz;
+   KEYWORDS="~amd64 ~x86"
+   S="${WORKDIR}/${PN}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   test? (
+   $(python_gen_cond_dep '
+   dev-python/nose[${PYTHON_USEDEP}]
+   ')
+   )
+"
+RDEPEND="
+   app-arch/cabextract
+   app-arch/p7zip
+   app-arch/unrar
+   app-arch/unzip
+   $(python_gen_cond_dep '
+