gentoo auto-resync : 19:10:2022 - 13:58:24

4 files changed, 181 insertions, 3 deletions

diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 226cc6914f16..b072f04a8599 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,6 +1,9 @@
+AUX lutris-0.5.12_beta1-webkit-gtk-4.1.patch 3214 BLAKE2B b602a1c07cef37d298b69e002282d6794a0a227456196c59f56c20d95966f8860c69e477dc92df1d1bc505c7304acbd3c0418e4c4be94baf4ddb3d9b5d1acb78 SHA512 c51a18a060643100b08ae7056a6ff2a1fb693ab45c56b5aa116f5057ef335988eca57334ceb2dfd214f598484370f33b0a09b93f5a5ec2f4f8ff4e438ad9bcdb
+DIST lutris-0.5.12_beta1.tar.gz 1138991 BLAKE2B 8bf47e49058690e4e42c6700b00daa7585787087f742dcaf9eab691a19ee9b230baaee6a7cde1f0b111104e750052afffd30b324e4b9aeb506b0851b7793d842 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
 EBUILD lutris-0.5.10.1.ebuild 2190 BLAKE2B 3d1fb2034e0aa73f36c27341a14c18a996787f1133876e3e49cf7fb2e952b03eadfd2e15427c5aa07ef52267f14f2a1821900905b744f1ae2b35be26b0213b16 SHA512 7e3c78b211f21a5817b27e626e50e2bacbb62bb1e55b71bbd75ad6f8cb140227dda1ed1c1f9d0f1d37d3def80d8a71d9690721bf5dabef3ad587f417af811ce2
 EBUILD lutris-0.5.11.ebuild 2228 BLAKE2B b75bf5f2670ab5a914354d3f3c8efc01f0ded1c561209ea19d8b98d460e93d58f1549349fb7aaf914504ba975cca006c79df97e86c6375a4d82bc6c9838c95f4 SHA512 78df7b7dea5b8c7acc1938107d95fd57861cb56c1ff373e0643d1b4b9628351b0e94748e4db9f873fe0d4880fc7189a6df3399478261da04c3c3fde2b4cb57fa
-EBUILD lutris-9999.ebuild 2190 BLAKE2B 3d1fb2034e0aa73f36c27341a14c18a996787f1133876e3e49cf7fb2e952b03eadfd2e15427c5aa07ef52267f14f2a1821900905b744f1ae2b35be26b0213b16 SHA512 7e3c78b211f21a5817b27e626e50e2bacbb62bb1e55b71bbd75ad6f8cb140227dda1ed1c1f9d0f1d37d3def80d8a71d9690721bf5dabef3ad587f417af811ce2
+EBUILD lutris-0.5.12_beta1.ebuild 2234 BLAKE2B f65568baf1d24bcbad0964e2e505b31dabf76013017ef9596cd518461ba31457bb38f44f36ce089265cdcf6235b2bfcd090e2e8131010cceb9909bab6984d2cc SHA512 55df30ebea6055932c78be9e4c40ed71edd8fcea894dd18e5115533f7ea427c5ece7bc2643fd8af7eaff9dc0bf8891e2c0dbc6a0920eaabc049355946d67d403
+EBUILD lutris-9999.ebuild 2129 BLAKE2B 929e65c31d2de2d57f64539b5b5317f118c41f8b2e4063fd98166336a722eb0ca62fc7dc254c0b4295c38a252747ab1849fd2877ebe04f64d8d3afe15a3e27ac SHA512 0963171f80de264a547884956ead87d9e7ce58c2629f238e8b00c9b9752e22700a4c2ce2c7028ebd8663d0de480be6d1f160d172665b2a8c58181b7e847165ba
 MISC metadata.xml 781 BLAKE2B 4f125f51efebe519dab960da879b988cc1d5675449b288a344df7647a660e190ac393d9195daee17fc4e181f1b07f6ffed17c7d1d222217a0afad44c0e15fe59 SHA512 83a29e9fad3e474ef81aa4c07bb6f1f8b77456eaf17f3aad4f34c12c2101cfd55fbd0b1ac8e2c1f682a2ab859c266f920a311aaa01cf9e53b762bd883a65b66f
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 000000000000..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")
+ 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
diff --git a/games-util/lutris/lutris-0.5.12_beta1.ebuild b/games-util/lutris/lutris-0.5.12_beta1.ebuild
new file mode 100644
index 000000000000..1d11a444efbf
--- /dev/null
+++ b/games-util/lutris/lutris-0.5.12_beta1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="sqlite,threads(+)"
+DISTUTILS_SINGLE_IMPL="1"
+
+inherit distutils-r1 optfeature virtualx xdg
+
+DESCRIPTION="An open source gaming platform for GNU/Linux"
+HOMEPAGE="https://lutris.net/"
+
+if [[ ${PV} == *9999* ]] ; 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/_/-}
+	else
+		SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
+		S="${WORKDIR}/${PN}"
+		KEYWORDS="~amd64 ~x86"
+	fi
+fi
+
+LICENSE="GPL-3+ CC0-1.0"
+SLOT="0"
+
+RDEPEND="
+	app-arch/cabextract
+	app-arch/p7zip
+	app-arch/unzip
+	$(python_gen_cond_dep '
+		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/python-evdev[${PYTHON_USEDEP}]
+		dev-python/python-magic[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-sound/fluid-soundfont
+	net-libs/webkit-gtk:4.1[introspection]
+	x11-apps/mesa-progs
+	x11-apps/xgamma
+	x11-apps/xrandr
+	x11-libs/gtk+:3[introspection]
+	x11-libs/gdk-pixbuf[jpeg]
+"
+
+DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
+
+PATCHES=(
+	# https://github.com/lutris/lutris/pull/4554
+	"${FILESDIR}/${P}-webkit-gtk-4.1.patch"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	virtx epytest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	python_fix_shebang "${ED}/usr/share/lutris/bin/lutris-wrapper" #740048
+}
+
+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
+
+	# Quote README.rst
+	elog ""
+	elog "Lutris installations are fully automated through scripts, which can"
+	elog "be written in either JSON or YAML. The scripting syntax is described"
+	elog "in ${EROOT}/usr/share/doc/${PF}/installers.rst.bz2, and is also"
+	elog "available online at lutris.net."
+}
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index 8808cea2f845..f40afd7448f1 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -43,9 +43,7 @@ RDEPEND="
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 	')
-	gnome-base/gnome-desktop:3[introspection]
 	media-sound/fluid-soundfont
-	net-libs/libsoup
 	net-libs/webkit-gtk:4[introspection]
 	x11-apps/mesa-progs
 	x11-apps/xgamma