summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-util')
-rw-r--r--games-util/acc/Manifest1
-rw-r--r--games-util/acc/acc-1.57.ebuild30
-rw-r--r--games-util/deutex/deutex-5.2.2.ebuild5
-rw-r--r--games-util/dzip/metadata.xml3
-rw-r--r--games-util/game-device-udev-rules/Manifest2
-rw-r--r--games-util/game-device-udev-rules/files/60-game-input-20220311.rules (renamed from games-util/game-device-udev-rules/files/60-game-input-20201228.rules)0
-rw-r--r--games-util/game-device-udev-rules/game-device-udev-rules-20220311.ebuild (renamed from games-util/game-device-udev-rules/game-device-udev-rules-20201228.ebuild)6
-rw-r--r--games-util/higan-purify/Manifest1
-rw-r--r--games-util/higan-purify/files/higan-purify-03-QA.patch42
-rw-r--r--games-util/higan-purify/files/higan-purify-03-respect-CXX.patch28
-rw-r--r--games-util/higan-purify/higan-purify-03.ebuild50
-rw-r--r--games-util/joycond/Manifest1
-rw-r--r--games-util/joycond/files/joycond-systemd-paranoia.patch45
-rw-r--r--games-util/joycond/files/joycond-systemd-paths.patch32
-rw-r--r--games-util/joycond/files/joycond.initd7
-rw-r--r--games-util/joycond/joycond-0.1.0_p20210730-r1.ebuild43
-rw-r--r--games-util/joycond/metadata.xml (renamed from games-util/higan-purify/metadata.xml)3
-rw-r--r--games-util/joystick/Manifest2
-rw-r--r--games-util/joystick/files/joystick-1.6.0-build.patch34
-rw-r--r--games-util/joystick/files/joystick-1.8.1-optional-ffmvforce.patch22
-rw-r--r--games-util/joystick/joystick-1.8.1.ebuild (renamed from games-util/joystick/joystick-1.7.1.ebuild)30
-rw-r--r--games-util/lgogdownloader/Manifest2
-rw-r--r--games-util/lgogdownloader/lgogdownloader-3.9.ebuild (renamed from games-util/lgogdownloader/lgogdownloader-3.7-r1.ebuild)6
-rw-r--r--games-util/libstrangle/Manifest1
-rw-r--r--games-util/libstrangle/libstrangle-0.1.1_p20220222.ebuild56
-rw-r--r--games-util/libstrangle/metadata.xml11
-rw-r--r--games-util/lutris/Manifest4
-rw-r--r--games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch13
-rw-r--r--games-util/lutris/lutris-0.5.10.1.ebuild (renamed from games-util/lutris/lutris-0.5.9.1.ebuild)14
-rw-r--r--games-util/lutris/lutris-0.5.8.3.ebuild78
-rw-r--r--games-util/lutris/lutris-0.5.8.4.ebuild77
-rw-r--r--games-util/lutris/lutris-9999.ebuild3
-rw-r--r--games-util/lutris/metadata.xml4
-rw-r--r--games-util/nml/Manifest2
-rw-r--r--games-util/nml/nml-0.5.3.ebuild32
-rw-r--r--games-util/nml/nml-0.6.1.ebuild29
-rw-r--r--games-util/sc-controller/Manifest3
-rw-r--r--games-util/sc-controller/files/sc-controller-bluetooth-evdev.patch38
-rw-r--r--games-util/sc-controller/files/status-icon-click.patch28
-rw-r--r--games-util/sc-controller/sc-controller-0.4.8.1.ebuild33
-rw-r--r--games-util/sc-controller/sc-controller-0.4.8.2.ebuild29
-rw-r--r--games-util/sc-controller/sc-controller-0.4.8.6_p20211211.ebuild50
-rw-r--r--games-util/slade/Manifest2
-rw-r--r--games-util/slade/files/slade-3.2.0-bundled-libs.patch (renamed from games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch)47
-rw-r--r--games-util/slade/files/slade-3.2.0-wx3.0.patch66
-rw-r--r--games-util/slade/slade-3.2.0.ebuild (renamed from games-util/slade/slade-3.2.0_beta2.ebuild)9
-rw-r--r--games-util/springlobby/Manifest1
-rw-r--r--games-util/springlobby/metadata.xml26
-rw-r--r--games-util/springlobby/springlobby-0.269.ebuild54
49 files changed, 476 insertions, 629 deletions
diff --git a/games-util/acc/Manifest b/games-util/acc/Manifest
index 4836c2fde7e..903051f78c3 100644
--- a/games-util/acc/Manifest
+++ b/games-util/acc/Manifest
@@ -1,2 +1 @@
-DIST acc-1.57.tar.gz 70969 BLAKE2B 0c5d9f6778505881d9fa698da0958aea410a8d42f4b81c24277f59d0e9a601d44213e9399f0e693a210d0b935e57df4b6878fe1575005e5d573e19993404f570 SHA512 997bb6bb262743cacbf0606e7f6dcd00132a1f54eb24eddad92948c31ed552b3b678e72932150856fee57df2ab01fd25c29408f6c46a804614b883cf07532f3a
DIST acc-1.58.tar.gz 70326 BLAKE2B 327449b987b2675c4c16f0769c08f2093a0ee2db28e6fbba608f3de81a17d943f6dbfc6ed333ea25331ecf194bdd661d3cfaf0d02b1f5fa714e7f60e49aabca9 SHA512 6fb0302f47b6a4e7114f543ad654f71753fb4cec973c933fc28aa0737f1d68a07509b2eee22cee34422387635cc889882b897a27f782000a2c0b184c1867d650
diff --git a/games-util/acc/acc-1.57.ebuild b/games-util/acc/acc-1.57.ebuild
deleted file mode 100644
index ca25dbd7690..00000000000
--- a/games-util/acc/acc-1.57.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="ACS script compiler for use with ZDoom and Hexen"
-HOMEPAGE="https://zdoom.org/wiki/ACC"
-SRC_URI="https://github.com/rheit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Activision"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# The Activision EULA is inappropriate but this was never resolved. :(
-# https://doomwiki.org/wiki/Raven_source_code_licensing
-RESTRICT="bindist mirror"
-
-src_configure() {
- tc-export CC
- append-cflags -Wall -Wextra
-}
-
-src_install() {
- dobin ${PN}
- dodoc readme.md
-
- insinto /usr/share/${PN}
- doins *.acs
-}
diff --git a/games-util/deutex/deutex-5.2.2.ebuild b/games-util/deutex/deutex-5.2.2.ebuild
index 93a2e6e4e35..214f6d34483 100644
--- a/games-util/deutex/deutex-5.2.2.ebuild
+++ b/games-util/deutex/deutex-5.2.2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit unpacker
@@ -16,7 +16,8 @@ IUSE="man +png"
DEPEND="png? ( media-libs/libpng:0= )"
RDEPEND="${DEPEND}"
-BDEPEND="man? ( app-text/asciidoc )"
+BDEPEND="$(unpacker_src_uri_depends)
+ man? ( app-text/asciidoc )"
src_configure() {
econf \
diff --git a/games-util/dzip/metadata.xml b/games-util/dzip/metadata.xml
index 435a4091fa1..a926f78c073 100644
--- a/games-util/dzip/metadata.xml
+++ b/games-util/dzip/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>hanno@gentoo.org</email>
-</maintainer>
<maintainer type="project">
<email>games@gentoo.org</email>
<name>Gentoo Games Project</name>
diff --git a/games-util/game-device-udev-rules/Manifest b/games-util/game-device-udev-rules/Manifest
index 1b546c1d201..2bd07d900f7 100644
--- a/games-util/game-device-udev-rules/Manifest
+++ b/games-util/game-device-udev-rules/Manifest
@@ -1 +1 @@
-DIST steam-devices-ebc0f6a9e30bc0db2344df298c061c2c3b01776f.tar.gz 2171 BLAKE2B 01ef2371b13eca38419f90e4d1918370b6f2bdcb40264372e7cc1f8e858d7f5c9149f001c750a53f4c4435cf286fca1ab9f8869e5855eefbdb4d89acc95bb5c2 SHA512 08f2f411e8499469de747145bb159dd97c846a6329cf7aabe3445333fa8c9570c7de52d96c3e63d7e065464b9e4bbe2917a1a4a4f44a19454d3d707d524592f9
+DIST steam-devices-d87ef558408c5e7a1a793d738db4c9dc2cb5f8fa.tar.gz 2305 BLAKE2B 677cec02dfa1899b9bad9440a5810175b731234db271413c2027a5a1a81dbdaa8c5ccd922478c07304262d5c3bf16891875dcdab08341720b97953035d5ae93d SHA512 54a0a9f293ca03c01c5f3609c08e9e8cc1273a034b1164399623c55ec994414ecacff04d049bc4195da5f0601bb17de52c9e1770a0161caac9bb4b74d921b35b
diff --git a/games-util/game-device-udev-rules/files/60-game-input-20201228.rules b/games-util/game-device-udev-rules/files/60-game-input-20220311.rules
index be2c499891a..be2c499891a 100644
--- a/games-util/game-device-udev-rules/files/60-game-input-20201228.rules
+++ b/games-util/game-device-udev-rules/files/60-game-input-20220311.rules
diff --git a/games-util/game-device-udev-rules/game-device-udev-rules-20201228.ebuild b/games-util/game-device-udev-rules/game-device-udev-rules-20220311.ebuild
index a050aac120d..c846172a90d 100644
--- a/games-util/game-device-udev-rules/game-device-udev-rules-20201228.ebuild
+++ b/games-util/game-device-udev-rules/game-device-udev-rules-20220311.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit udev
@@ -9,7 +9,7 @@ inherit udev
# also has its own rules and more may be added later so we version it
# independently.
-STEAM_COMMIT="ebc0f6a9e30bc0db2344df298c061c2c3b01776f"
+STEAM_COMMIT="d87ef558408c5e7a1a793d738db4c9dc2cb5f8fa"
MY_P="steam-devices-${STEAM_COMMIT}"
DESCRIPTION="udev rules for various game hardware devices"
diff --git a/games-util/higan-purify/Manifest b/games-util/higan-purify/Manifest
deleted file mode 100644
index 2ebd9ee81d4..00000000000
--- a/games-util/higan-purify/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST purify_v03-source.tar.xz 196924 BLAKE2B f4d22ccc34d1c345a2dee20c14bab2614b71b0df2660f3f0883df1b56b5e5fc7fc99872f73ebe674faca8bb455f1a90e5bf79ce9b893f980e99b94546bbcf400 SHA512 095b62013f5a33e720b87c48f32c41239d8cef4c6ddc2b6d119d15b3f8b92bc15d744afa0b2bc8d7a49ef53f8f3fa7f2247be490499a9b194863534f9c1a4b3d
diff --git a/games-util/higan-purify/files/higan-purify-03-QA.patch b/games-util/higan-purify/files/higan-purify-03-QA.patch
deleted file mode 100644
index 5b2d1e6c3d3..00000000000
--- a/games-util/higan-purify/files/higan-purify-03-QA.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -2,8 +2,8 @@
- include phoenix/Makefile
-
- path := /usr/local/bin
--flags := -I. -O3 -fomit-frame-pointer
--link := -s
-+flags := -I. $(CXXFLAGS)
-+link := $(LDFLAGS)
- objects := obj/phoenix.o obj/purify.o
-
- ifeq ($(platform),x)
-@@ -22,7 +22,7 @@
-
- build: $(objects)
- ifeq ($(platform),x)
-- $(cpp) -pthread $(link) -o purify $(objects) $(phoenixlink)
-+ $(cpp) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink)
- else ifeq ($(platform),win)
- windres phoenix/windows/phoenix.rc obj/phoenix-resource.o
- $(cpp) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink)
---- a/phoenix/Makefile
-+++ b/phoenix/Makefile
-@@ -4,13 +4,13 @@
- endif
-
- ifeq ($(phoenix),gtk)
-- phoenixflags := -DPHOENIX_GTK `pkg-config --cflags gtk+-2.0`
-- phoenixlink := `pkg-config --libs gtk+-2.0`
-+ phoenixflags := -DPHOENIX_GTK `${PKG_CONFIG} --cflags gtk+-2.0 x11`
-+ phoenixlink := `${PKG_CONFIG} --libs gtk+-2.0 x11` -ldl
- endif
-
- ifeq ($(phoenix),qt)
-- phoenixflags := -DPHOENIX_QT `pkg-config --cflags QtCore QtGui`
-- phoenixlink := `pkg-config --libs QtCore QtGui`
-+ phoenixflags := -DPHOENIX_QT `${PKG_CONFIG} --cflags QtCore QtGui x11`
-+ phoenixlink := `${PKG_CONFIG} --libs QtCore QtGui x11` -ldl
- endif
- else ifeq ($(platform),win)
- phoenixflags := -DPHOENIX_WINDOWS
diff --git a/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch b/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch
deleted file mode 100644
index 00a6a1e4c69..00000000000
--- a/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 2a56366..59a3795 100755
---- a/Makefile
-+++ b/Makefile
-@@ -15,18 +15,18 @@ endif
- all: build;
-
- obj/phoenix.o: phoenix/phoenix.cpp
-- $(cpp) $(flags) -o obj/phoenix.o -c phoenix/phoenix.cpp $(phoenixflags)
-+ $(CXX) $(flags) -o obj/phoenix.o -c phoenix/phoenix.cpp $(phoenixflags)
-
- obj/purify.o: purify.cpp
-- $(cpp) $(flags) -o obj/purify.o -c purify.cpp
-+ $(CXX) $(flags) -o obj/purify.o -c purify.cpp
-
- build: $(objects)
- ifeq ($(platform),x)
-- $(cpp) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink)
-+ $(CXX) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink)
- else ifeq ($(platform),win)
- windres phoenix/windows/phoenix.rc obj/phoenix-resource.o
-- $(cpp) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink)
-- $(cpp) -o purify obj/purify.o obj/phoenix-resource.o $(link) -L. -lphoenix
-+ $(CXX) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink)
-+ $(CXX) -o purify obj/purify.o obj/phoenix-resource.o $(link) -L. -lphoenix
- endif
-
- resource: force
diff --git a/games-util/higan-purify/higan-purify-03.ebuild b/games-util/higan-purify/higan-purify-03.ebuild
deleted file mode 100644
index 7f5fcaa1f83..00000000000
--- a/games-util/higan-purify/higan-purify-03.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P=purify_v${PV}-source
-DESCRIPTION="Rom purifier for higan"
-HOMEPAGE="http://byuu.org/higan/"
-SRC_URI="https://higan.googlecode.com/files/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}/purify
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- dev-games/higan-ananke
- x11-libs/gtk+:2
- x11-libs/libX11"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-QA.patch
- "${FILESDIR}"/${PN}-03-respect-CXX.patch
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e "/handle/s#/usr/local/lib#/usr/$(get_libdir)#" \
- nall/dl.hpp || die
-}
-
-src_compile() {
- tc-export CXX
-
- emake \
- PKG_CONFIG="$(tc-getPKG_CONFIG)"
- platform="x" \
- compiler="$(tc-getCXX)" \
- phoenix="gtk"
-}
-
-src_install() {
- dobin purify
-}
diff --git a/games-util/joycond/Manifest b/games-util/joycond/Manifest
new file mode 100644
index 00000000000..8d055c0bbdd
--- /dev/null
+++ b/games-util/joycond/Manifest
@@ -0,0 +1 @@
+DIST joycond-0.1.0_p20210730.tar.gz 29947 BLAKE2B d151e9a798a358e142c44722ce5d9892bc63a7c2992aa6b962a02ab971a8aec9bd343bd56cc26ae36e63d5977d1d0a99c52c35aeb779d352f1bbe2d15010e43c SHA512 1d0a82bd9e2aeecef3215232ffb6acb77008845fe0e8094e81d2b81627cca1e5d581986fad6631c5efd2b29514370fbac8a65d9996df762543d050628327a564
diff --git a/games-util/joycond/files/joycond-systemd-paranoia.patch b/games-util/joycond/files/joycond-systemd-paranoia.patch
new file mode 100644
index 00000000000..f6803d074f1
--- /dev/null
+++ b/games-util/joycond/files/joycond-systemd-paranoia.patch
@@ -0,0 +1,45 @@
+From d39ce9de9420560494d92519f4e29a40d685a5b4 Mon Sep 17 00:00:00 2001
+From: Andrew Udvare <audvare@gmail.com>
+Date: Sun, 12 Dec 2021 22:02:00 -0500
+Subject: [PATCH] systemd service: paranoia mode
+
+---
+ systemd/joycond.service | 24 +++++++++++++++++++-----
+ 1 file changed, 19 insertions(+), 5 deletions(-)
+
+diff --git a/systemd/joycond.service b/systemd/joycond.service
+index cc8e408..5a8b045 100644
+--- a/systemd/joycond.service
++++ b/systemd/joycond.service
+@@ -4,12 +4,26 @@ After=network.target
+
+ [Service]
+ ExecStart=/usr/bin/joycond
+-WorkingDirectory=/root
+-StandardOutput=inherit
+-StandardError=inherit
+ Restart=always
+-User=root
++
++DeviceAllow=char-input
++DevicePolicy=closed
++LockPersonality=yes
++MemoryDenyWriteExecute=yes
++NoNewPrivileges=yes
++ProtectClock=yes
++PrivateTmp=yes
++ProtectHome=yes
++ProtectHostname=yes
++ProtectControlGroups=yes
++ProtectKernelModules=yes
++ProtectProc=noaccess
++ProtectSystem=strict
++RestrictAddressFamilies=AF_NETLINK
++RestrictNetworkInterfaces=
++RestrictRealtime=yes
++RestrictSUIDSGID=yes
++SocketBindDeny=any
+
+ [Install]
+ WantedBy=multi-user.target
+-
diff --git a/games-util/joycond/files/joycond-systemd-paths.patch b/games-util/joycond/files/joycond-systemd-paths.patch
new file mode 100644
index 00000000000..8b8288350a3
--- /dev/null
+++ b/games-util/joycond/files/joycond-systemd-paths.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f9d6e93..4e05976 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,12 +28,24 @@ add_subdirectory(src)
+ install(TARGETS joycond DESTINATION /usr/bin/
+ PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+-install(FILES udev/89-joycond.rules udev/72-joycond.rules DESTINATION /lib/udev/rules.d/
++
++pkg_get_variable(UDEV_RULES_PATH udev udevdir)
++install(FILES udev/89-joycond.rules udev/72-joycond.rules DESTINATION ${UDEV_RULES_PATH}/rules.d/
+ PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
+ )
+-install(FILES systemd/joycond.service DESTINATION /etc/systemd/system
++
++execute_process(COMMAND systemd-path systemd-system-unit OUTPUT_VARIABLE SYSTEMD_SYSTEM_UNIT_PATH OUTPUT_STRIP_TRAILING_WHITESPACE RESULT_VARIABLE UNIT_RETVAL)
++if(NOT "${UNIT_RETVAL}" EQUAL 0)
++ set(SYSTEMD_SYSTEM_UNIT_PATH "/usr/lib/systemd/system")
++endif()
++install(FILES systemd/joycond.service DESTINATION ${SYSTEMD_SYSTEM_UNIT_PATH}
+ PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
+ )
+-install(FILES systemd/joycond.conf DESTINATION /etc/modules-load.d
++
++execute_process(COMMAND systemd-path modules-load OUTPUT_VARIABLE SYSTEMD_MODULES_LOAD_PATH OUTPUT_STRIP_TRAILING_WHITESPACE RESULT_VARIABLE MODULES_RETVAL)
++if(NOT "${MODULES_RETVAL}" EQUAL 0)
++ set(SYSTEMD_MODULES_LOAD_PATH "/usr/lib/modules-load.d")
++endif()
++install(FILES systemd/joycond.conf DESTINATION ${SYSTEMD_MODULES_LOAD_PATH}
+ PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
+ )
diff --git a/games-util/joycond/files/joycond.initd b/games-util/joycond/files/joycond.initd
new file mode 100644
index 00000000000..f23e1131e75
--- /dev/null
+++ b/games-util/joycond/files/joycond.initd
@@ -0,0 +1,7 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/${RC_SVCNAME}.pid"
+command_background="true"
+command="joycond"
diff --git a/games-util/joycond/joycond-0.1.0_p20210730-r1.ebuild b/games-util/joycond/joycond-0.1.0_p20210730-r1.ebuild
new file mode 100644
index 00000000000..89a5d677444
--- /dev/null
+++ b/games-util/joycond/joycond-0.1.0_p20210730-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake linux-info
+
+COMMIT="f9a66914622514c13997c2bf7ec20fa98e9dfc1d"
+DESCRIPTION="Daemon that uses hid-nintendo evdev devices to implement joycon pairing"
+HOMEPAGE="https://github.com/DanielOgorchock/joycond"
+SRC_URI="https://github.com/DanielOgorchock/joycond/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+ dev-libs/libevdev
+ virtual/udev
+"
+
+RDEPEND="
+ ${DEPEND}
+"
+
+CONFIG_CHECK="
+ ~HID
+ ~HID_NINTENDO
+ ~HIDRAW
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-systemd-paths.patch
+ "${FILESDIR}"/${PN}-systemd-paranoia.patch
+)
+
+src_install() {
+ cmake_src_install
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ doman doc/${PN}.1
+}
diff --git a/games-util/higan-purify/metadata.xml b/games-util/joycond/metadata.xml
index 7c730d47817..c529738df19 100644
--- a/games-util/higan-purify/metadata.xml
+++ b/games-util/joycond/metadata.xml
@@ -5,4 +5,7 @@
<email>games@gentoo.org</email>
<name>Gentoo Games Project</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">DanielOgorchock/joycond</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
index 8eff0bee147..52205e499f8 100644
--- a/games-util/joystick/Manifest
+++ b/games-util/joystick/Manifest
@@ -1 +1 @@
-DIST linuxconsoletools-1.7.1.tar.bz2 53153 BLAKE2B e05d04454fefdd4009d0c75f1caf2e6675a8e5f494f6f2f491f4de3c57101a6323b4de5795fccb9fd6a557a1e7bf4befa312661b022ed0503da83ac4dd3ab7c5 SHA512 2ba97e6c5b57aa5d6b08369bae050256f4d039f5b8479ad03cef4a7c43bf772db312de54d9e70a8a92c9ed7933b524715f1ce5448ccf508e6ffe8646a9dbd349
+DIST linuxconsoletools-1.8.1.tar.bz2 53715 BLAKE2B a0fab44762d9f4edcc1e85037efada2dac617873548579a83c3e7791e5a047e1c88243978fee562992f363102a0cb415c75d1286a3eb46a42dfe6afc7e9a0594 SHA512 407fcba552a3e45c60fb4f08217fe17106bedd6fde2fbce84aa6f4fa68ffc032f1683c6154f79daacaf1dcaf484fe943dd7391e787f0290d5bf42c7089c7c20c
diff --git a/games-util/joystick/files/joystick-1.6.0-build.patch b/games-util/joystick/files/joystick-1.6.0-build.patch
deleted file mode 100644
index fa60ec71991..00000000000
--- a/games-util/joystick/files/joystick-1.6.0-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- linuxconsoletools-1.6.0/docs/Makefile
-+++ linuxconsoletools-1.6.0/docs/Makefile
-@@ -20,9 +20,13 @@
- # 02110-1301 USA.
-
- MANPAGES = inputattach.1 jstest.1 jscal.1 fftest.1 \
-- ffmvforce.1 ffset.1 ffcfstress.1 jscal-store.1 \
-+ ffset.1 ffcfstress.1 jscal-store.1 \
- jscal-restore.1 evdev-joystick.1
-
-+ifneq ($(USE_SDL),no)
-+MANPAGES += ffmvforce.1
-+endif
-+
- PREFIX ?= /usr/local
-
- install:
---- linuxconsoletools-1.6.0/utils/Makefile
-+++ linuxconsoletools-1.6.0/utils/Makefile
-@@ -27,9 +27,13 @@
-
- CFLAGS ?= -g -O2 -Wall
-
--PROGRAMS = inputattach jstest jscal fftest ffmvforce ffset \
-+PROGRAMS = inputattach jstest jscal fftest ffset \
- ffcfstress jscal-restore jscal-store evdev-joystick
-
-+ifneq ($(USE_SDL),no)
-+PROGRAMS += ffmvforce
-+endif
-+
- PREFIX ?= /usr/local
-
- compile: $(PROGRAMS)
diff --git a/games-util/joystick/files/joystick-1.8.1-optional-ffmvforce.patch b/games-util/joystick/files/joystick-1.8.1-optional-ffmvforce.patch
new file mode 100644
index 00000000000..62f85aea605
--- /dev/null
+++ b/games-util/joystick/files/joystick-1.8.1-optional-ffmvforce.patch
@@ -0,0 +1,22 @@
+Keep ffmvforce separately optional given it's the only one
+with an additional dependency (sdl)
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -31,3 +31,6 @@
+ ifndef DISABLE_FORCEFEEDBACK
+-MANPAGES += fftest.1 ffmvforce.1 ffset.1 ffcfstress.1
++MANPAGES += fftest.1 ffset.1 ffcfstress.1
++ifndef DISABLE_FFMVFORCE
++MANPAGES += ffmvforce.1
++endif
+ endif
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -39,3 +39,6 @@
+ ifndef DISABLE_FORCEFEEDBACK
+-PROGRAMS += fftest ffmvforce ffset ffcfstress
++PROGRAMS += fftest ffset ffcfstress
++ifndef DISABLE_FFMVFORCE
++PROGRAMS += ffmvforce
++endif
+ endif
diff --git a/games-util/joystick/joystick-1.7.1.ebuild b/games-util/joystick/joystick-1.8.1.ebuild
index 2f1e8014e50..95bfe672868 100644
--- a/games-util/joystick/joystick-1.7.1.ebuild
+++ b/games-util/joystick/joystick-1.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit toolchain-funcs
+inherit toolchain-funcs udev
MY_P="linuxconsoletools-${PV}"
@@ -15,32 +15,32 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="sdl udev"
+IUSE="sdl"
-DEPEND="sdl? ( media-libs/libsdl2[video] )"
-RDEPEND="
- ${DEPEND}
- udev? ( virtual/udev )"
+RDEPEND="sdl? ( media-libs/libsdl2[video] )"
+DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${PN}-1.6.0-build.patch
+ "${FILESDIR}"/${PN}-1.8.1-optional-ffmvforce.patch
)
src_configure() {
tc-export CC PKG_CONFIG
export PREFIX="${EPREFIX}"/usr
- export USE_SDL=$(usex sdl)
+ use sdl || export DISABLE_FFMVFORCE=1
}
src_install() {
default
- if ! use udev; then
- rm "${ED}"/usr/bin/jscal-{re,}store || die
- fi
+ [[ ! ${EPREFIX} ]] || mv {"${D}","${ED}"}/lib || die
+}
+
+pkg_postinst() {
+ udev_reload
+}
- if [[ ${EPREFIX} ]]; then
- mv {"${D}","${ED}"}/lib || die
- fi
+pkg_postrm() {
+ udev_reload
}
diff --git a/games-util/lgogdownloader/Manifest b/games-util/lgogdownloader/Manifest
index f330c2b186e..f9a2154fc2d 100644
--- a/games-util/lgogdownloader/Manifest
+++ b/games-util/lgogdownloader/Manifest
@@ -1,2 +1,2 @@
-DIST lgogdownloader-3.7.tar.gz 85653 BLAKE2B bb6fe56be291ca726b97cfb7ce83e87e855584da911839a9bc6a923c027e7ea67e83e62a5e8bb1a0c62dd053a7d6728c1e82896d19ba48a310574dc8c6a647f5 SHA512 2085b9c64008d790a28dcb9d22009340acac164db316523919dcf797255fd57a36160950fb222e82b9ee6262ef8c0e86193e2d9a4488ea2105f9f4bbe7db727b
DIST lgogdownloader-3.8.tar.gz 85271 BLAKE2B ff8e9f80dbec849649b4074ab5890f833a5bfaf120246e7ca5eae83f414af469da29302323dc22632eb0a7259e49e9cf3660ea8953adda75fc7a5308204767bd SHA512 ccc6116f22a5c0bff5e4ef650f6386d5bfc507cc667b7154b021ecdbd45e7553ac33ae6b81531e2cea52a5022ee9c810033518a07374d4e9f7c672344e7ccad3
+DIST lgogdownloader-3.9.tar.gz 86351 BLAKE2B 4ba1a39e2c040910cb3fdef908c229ce8a7def70ba430167977ab4eaa7fdcdfd132a314d256300904dd14052aecffceec92652cfa3eba3c2a54d83b1920ed2b7 SHA512 5ac15776c0ab7416013782652fead180f75e3bd075a3b67c9cb672122c13401ebc91e785daa9e7d332011474240dbb4d8383ddadea2abf0d3bddfc13d6892066
diff --git a/games-util/lgogdownloader/lgogdownloader-3.7-r1.ebuild b/games-util/lgogdownloader/lgogdownloader-3.9.ebuild
index 64fb82fe153..6e34f09c1bc 100644
--- a/games-util/lgogdownloader/lgogdownloader-3.7-r1.ebuild
+++ b/games-util/lgogdownloader/lgogdownloader-3.9.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
DESCRIPTION="Unofficial GOG.com downloader for Linux"
HOMEPAGE="https://sites.google.com/site/gogdownloader/"
-SRC_URI="https://sites.google.com/site/gogdownloader/${P}.tar.gz"
+SRC_URI="https://github.com/Sude-/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="WTFPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/games-util/libstrangle/Manifest b/games-util/libstrangle/Manifest
new file mode 100644
index 00000000000..970a75cf062
--- /dev/null
+++ b/games-util/libstrangle/Manifest
@@ -0,0 +1 @@
+DIST libstrangle-0.1.1_p20220222.tar.gz 947358 BLAKE2B 2222550e28d4af1dafc43691f3021fdac30445e3223673b74f69adfe681c9b1879925b3961dc9d086f2e5cadeeca7488e1a53bcdb6e302b2e4087a0f2a19a380 SHA512 5f6d7bc5acb95be4c0083a16134dfe7c6a95ab6a73cca69ec2d92cf75ebf5ecfaea08dda0d887e8e136fd410c988c0bd36289c2a17df3eb1698b453bb38c4011
diff --git a/games-util/libstrangle/libstrangle-0.1.1_p20220222.ebuild b/games-util/libstrangle/libstrangle-0.1.1_p20220222.ebuild
new file mode 100644
index 00000000000..cb3b102c7f5
--- /dev/null
+++ b/games-util/libstrangle/libstrangle-0.1.1_p20220222.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib multilib-minimal toolchain-funcs
+
+STRANGLE_COMMIT="0273e318e3b0cc759155db8729ad74266b74cb9b"
+
+DESCRIPTION="Frame rate limiter for OpenGL/Vulkan"
+HOMEPAGE="https://gitlab.com/torkel104/libstrangle/"
+SRC_URI="https://gitlab.com/torkel104/libstrangle/-/archive/${STRANGLE_COMMIT}/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${STRANGLE_COMMIT}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-apps/grep[pcre]"
+DEPEND="
+ media-libs/libglvnd
+ dev-util/vulkan-headers"
+
+QA_SONAME="usr/lib.*/libstrangle.*" # intended for dlopen()
+
+src_prepare() {
+ default
+
+ sed -ri '/^C(XX)?FLAGS=/s|=|+=$(CPPFLAGS) |' makefile || die
+
+ multilib_copy_sources
+}
+
+multilib_src_compile() {
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD{,XX}FLAGS="${LDFLAGS}" native
+}
+
+multilib_src_install() {
+ local emakeargs=(
+ DESTDIR="${D}"
+ prefix="${EPREFIX}"/usr
+ libdir="${EPREFIX}"/usr/$(get_libdir)
+ )
+
+ emake "${emakeargs[@]}" install-native
+}
+
+multilib_src_install_all() {
+ emake DESTDIR="${D}" prefix="${EPREFIX}"/usr install-common
+ einstalldocs
+}
+
+pkg_postinst() {
+ has_multilib_profile && use amd64 && use !abi_x86_32 &&
+ ewarn "Note that USE=abi_x86_32 is needed for 32bit games (common with steam / wine)"
+}
diff --git a/games-util/libstrangle/metadata.xml b/games-util/libstrangle/metadata.xml
new file mode 100644
index 00000000000..1af7db338ed
--- /dev/null
+++ b/games-util/libstrangle/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ionen@gentoo.org</email>
+ <name>Ionen Wolkens</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gitlab">torkel104/libstrangle</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 9ef4f7c84db..d112f3cf9de 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,3 +1 @@
-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
+DIST lutris_0.5.10.1.tar.xz 1230464 BLAKE2B 5ba913f5e37956344b59c47c1315cf277ce57b1b771279c8aa4243971ea9f0c5277ad19b18655731048e989f752d957216d055ac6c26bb8731e52b4345d30847 SHA512 f6443fa86d0b38e1b5ba51054e50776eea63d9adda5738a7e69f2fe6b196f99491894d5068d6cddfd35d1baafa4188bd1935598b84266e9e23bd1b58c16dde20
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
deleted file mode 100644
index 8c0d366926b..00000000000
--- a/games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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-0.5.9.1.ebuild b/games-util/lutris/lutris-0.5.10.1.ebuild
index 683abd5de58..f9735e9f61e 100644
--- a/games-util/lutris/lutris-0.5.9.1.ebuild
+++ b/games-util/lutris/lutris-0.5.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="sqlite,threads(+)"
DISTUTILS_SINGLE_IMPL="1"
-inherit distutils-r1 virtualx xdg
+inherit distutils-r1 optfeature virtualx xdg
DESCRIPTION="An open source gaming platform for GNU/Linux"
HOMEPAGE="https://lutris.net/"
@@ -22,12 +22,11 @@ else
else
SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
S="${WORKDIR}/${PN}"
-
KEYWORDS="~amd64 ~x86"
fi
fi
-LICENSE="GPL-3"
+LICENSE="GPL-3+ CC0-1.0"
SLOT="0"
RDEPEND="
@@ -36,6 +35,7 @@ RDEPEND="
app-arch/unzip
$(python_gen_cond_dep '
dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/python-evdev[${PYTHON_USEDEP}]
@@ -51,6 +51,7 @@ RDEPEND="
x11-apps/xgamma
x11-apps/xrandr
x11-libs/gtk+:3[introspection]
+ x11-libs/gdk-pixbuf[jpeg]
x11-libs/libnotify[introspection]
"
@@ -58,8 +59,6 @@ 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" )
-
python_test() {
virtx epytest
}
@@ -72,7 +71,10 @@ 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
+
# 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"
diff --git a/games-util/lutris/lutris-0.5.8.3.ebuild b/games-util/lutris/lutris-0.5.8.3.ebuild
deleted file mode 100644
index eb14c714095..00000000000
--- a/games-util/lutris/lutris-0.5.8.3.ebuild
+++ /dev/null
@@ -1,78 +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} )
-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} == *9999* ]] ; 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/unzip
- $(python_gen_cond_dep '
- dev-python/dbus-python[${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}]
- ')
- 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
- x11-apps/xrandr
- x11-libs/gtk+:3[introspection]
- x11-libs/libnotify[introspection]
-"
-
-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_test() {
- virtx nosetests -v
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- # Quote README.rst
- 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-0.5.8.4.ebuild b/games-util/lutris/lutris-0.5.8.4.ebuild
deleted file mode 100644
index b29f07d71d8..00000000000
--- a/games-util/lutris/lutris-0.5.8.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-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} == *9999* ]] ; 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/unzip
- $(python_gen_cond_dep '
- dev-python/dbus-python[${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}]
- ')
- 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
- x11-apps/xrandr
- x11-libs/gtk+:3[introspection]
- x11-libs/libnotify[introspection]
-"
-
-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_test() {
- virtx nosetests -v
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- # Quote README.rst
- 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 fa2c19860a6..1b9e6fc4d1d 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -22,7 +22,6 @@ else
else
SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
S="${WORKDIR}/${PN}"
-
KEYWORDS="~amd64 ~x86"
fi
fi
diff --git a/games-util/lutris/metadata.xml b/games-util/lutris/metadata.xml
index f01d6b5b5ad..69c8e038ecf 100644
--- a/games-util/lutris/metadata.xml
+++ b/games-util/lutris/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>andrewammerlaan@gentoo.org</email>
+ <name>Andrew Ammerlaan</name>
+ </maintainer>
<maintainer type="project">
<email>games@gentoo.org</email>
<name>Gentoo Games Project</name>
diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest
index ceca6269053..38c3835462a 100644
--- a/games-util/nml/Manifest
+++ b/games-util/nml/Manifest
@@ -1 +1 @@
-DIST nml-0.5.3.tar.gz 532842 BLAKE2B dbd775ca8b066fd60cd8fa1a377c95d337a61ba353fa527bb45f929d13b89a41c65156cff22f8ded6526444fdc74c82987da045e6355b411a30c0593a3a39edb SHA512 518be737273af6bfff23f223d07328312c4b7e070a334d4b0ecffc303aab8257ad8b26ff3b74e992db263d446fedc3e0080573b6670f0061ca78bb933c959c6a
+DIST nml-0.6.1.tar.gz 543048 BLAKE2B c602ad37cd6a321d8e5d0a1cbac22844b2cd2f182e768972db4eb171215a4fe67f9ffe632d50c85c55d00e437dff93bec17d65a3dff2e2912bc474ce9fcc4b6c SHA512 41b1f1c256543ef42067ef3bb81dbb10771498f3dc06e6ce1b328723710380b2a6dad52b2258716b6caab3e4f17d22d57992c76e0800440b9daff5811304e016
diff --git a/games-util/nml/nml-0.5.3.ebuild b/games-util/nml/nml-0.5.3.ebuild
deleted file mode 100644
index bf6acd0040b..00000000000
--- a/games-util/nml/nml-0.5.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Compiler of NML files into GRF/NFO files"
-HOMEPAGE="https://github.com/OpenTTD/nml"
-SRC_URI="https://github.com/OpenTTD/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
- dev-python/pillow[zlib,${PYTHON_USEDEP}]
- dev-python/ply[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( "README.md" "docs/changelog.txt" )
-
-src_install() {
- distutils-r1_src_install
-
- doman docs/nmlc.1
-}
diff --git a/games-util/nml/nml-0.6.1.ebuild b/games-util/nml/nml-0.6.1.ebuild
new file mode 100644
index 00000000000..a378873b7b0
--- /dev/null
+++ b/games-util/nml/nml-0.6.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Compiler of NML files into GRF/NFO files"
+HOMEPAGE="https://github.com/OpenTTD/nml/"
+SRC_URI="https://github.com/OpenTTD/nml/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_USEDEP},zlib]
+ dev-python/ply[${PYTHON_USEDEP}]')"
+
+src_install() {
+ local DOCS=( README.md docs/changelog.txt )
+ distutils-r1_src_install
+
+ doman docs/nmlc.1
+}
diff --git a/games-util/sc-controller/Manifest b/games-util/sc-controller/Manifest
index 38b205222bd..44645c2ec9c 100644
--- a/games-util/sc-controller/Manifest
+++ b/games-util/sc-controller/Manifest
@@ -1,2 +1 @@
-DIST sc-controller-0.4.8.1.tar.gz 2520167 BLAKE2B 40c8e366519ec2a6d80b31c2b342fba2664fa35f3a889e222665f8f5cd4d59dd912804f6cdf4ecd844ab94075f5f45f88a61138ac1c0cb528652c9fd9b710afa SHA512 bc57bd381c71e94c0771ecdb08f95326d0c1478e25cdf3955b71c203abe6cb78091ca977deb8a1e954b5b1b65a6df487f8b8921920b1eb672aa6f1f5554a4847
-DIST sc-controller-0.4.8.2.tar.gz 2520528 BLAKE2B 0c98e1fd49e846909ec0a78c5bbf48731de464ab79ebe3e1b0370e2a6f176e925e6f2b288c17358221b2e50be0cd783f31f05324ac585aec310967d148ce5011 SHA512 8d157e871fa519ebd3eee27dd1c0ff1afe6f79201df12578aa31f3cbc62974bd7ba47c8a097870b693a7abaacaadd1e502012c9664c0aecddbd982fa10c7f84d
+DIST sc-controller-0.4.8.6_p20211211.tar.gz 2527489 BLAKE2B e04e2a9d617b6cfb3b0709f37bbbbb7384ac0c516f1f30a23547f1132c562cafeb8972f23e9cc93967187c881fd78fe6e6d102451aa5afc4bf8fce619e86820b SHA512 9d1030ed2766b9a0984852eafc343e265768489f3d01833e6633019276c0559cb4265d72013c0bc2ecb57ac35c95791ee8e2285f8c45917695ea92826bca6dc3
diff --git a/games-util/sc-controller/files/sc-controller-bluetooth-evdev.patch b/games-util/sc-controller/files/sc-controller-bluetooth-evdev.patch
new file mode 100644
index 00000000000..6f5b6ae1856
--- /dev/null
+++ b/games-util/sc-controller/files/sc-controller-bluetooth-evdev.patch
@@ -0,0 +1,38 @@
+From 0b816d9fb06a325477961c50118db670e1cc15d2 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 12 Mar 2022 09:52:54 +0000
+Subject: [PATCH] Allow Bluetooth evdev and HID controllers to appear in the
+ list
+
+We currently check whether `dev.phys` is blank to work out whether the
+device is virtual or not. Unfortunately, this is also blank for
+Bluetooth-connected devices.
+
+I thought checking whether `dev.info.bustype` is `BUS_VIRTUAL` might
+help but our emulated gamepad has `BUS_USB`. Given that we deliberately
+make the emulated device look as real as possible, I can't find any
+other way to tell it apart from real USB devices. We should therefore
+only check whether `dev.phys` is blank when the bustype is `BUS_USB`.
+This will allow Bluetooth devices with `BUS_BLUETOOTH` to work.
+---
+ scc/gui/creg/dialog.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/scc/gui/creg/dialog.py b/scc/gui/creg/dialog.py
+index 76658e08..77a94dea 100644
+--- a/scc/gui/creg/dialog.py
++++ b/scc/gui/creg/dialog.py
+@@ -742,7 +742,9 @@ class ControllerRegistration(Editor):
+ for fname in evdev.list_devices():
+ dev = evdev.InputDevice(fname)
+ is_gamepad = ControllerRegistration.does_he_looks_like_a_gamepad(dev)
+- if not dev.phys:
++ # bustype 3 is BUS_USB, which is the type used for emulated
++ # gamepads. phys is blank for BUS_BLUETOOTH devices.
++ if dev.info.bustype == 3 and not dev.phys:
+ # Skipping over virtual devices so list doesn't show
+ # gamepads emulated by SCC
+ continue
+--
+2.34.1
+
diff --git a/games-util/sc-controller/files/status-icon-click.patch b/games-util/sc-controller/files/status-icon-click.patch
deleted file mode 100644
index 46b39553b48..00000000000
--- a/games-util/sc-controller/files/status-icon-click.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b1388d0e768f0bedd5704ffae9b13500ad325308 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sat, 17 Oct 2020 21:36:49 +0100
-Subject: [PATCH] Fix TypeError when clicking on the status icon
-
-The error was:
-
- TypeError: GObject.emit() argument 1 must be str, not bytes
----
- scc/gui/statusicon.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scc/gui/statusicon.py b/scc/gui/statusicon.py
-index 61ef9e96..83600492 100644
---- a/scc/gui/statusicon.py
-+++ b/scc/gui/statusicon.py
-@@ -322,7 +322,7 @@ class StatusIconProxy(StatusIcon):
- self._load_fallback()
-
- def _on_click(self, *args):
-- self.emit(b"clicked")
-+ self.emit("clicked")
-
- def _on_notify_active_gtk(self, *args):
- if self._status_fb:
---
-2.26.2
-
diff --git a/games-util/sc-controller/sc-controller-0.4.8.1.ebuild b/games-util/sc-controller/sc-controller-0.4.8.1.ebuild
deleted file mode 100644
index f5cb8a83901..00000000000
--- a/games-util/sc-controller/sc-controller-0.4.8.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 xdg
-
-DESCRIPTION="User-mode driver and GTK-based GUI for Steam Controllers and others"
-HOMEPAGE="https://github.com/Ryochan7/sc-controller/"
-SRC_URI="https://github.com/Ryochan7/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2 CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+udev"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/pygobject[${PYTHON_USEDEP},cairo]
- dev-python/pylibacl[${PYTHON_USEDEP}]
- dev-python/python-evdev[${PYTHON_USEDEP}]
- ')
- gnome-base/librsvg
- x11-libs/gtk+:3
- udev? ( games-util/game-device-udev-rules )
-"
-
-PATCHES=(
- "${FILESDIR}"/status-icon-click.patch
-)
diff --git a/games-util/sc-controller/sc-controller-0.4.8.2.ebuild b/games-util/sc-controller/sc-controller-0.4.8.2.ebuild
deleted file mode 100644
index fd7546b73bf..00000000000
--- a/games-util/sc-controller/sc-controller-0.4.8.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 xdg
-
-DESCRIPTION="User-mode driver and GTK-based GUI for Steam Controllers and others"
-HOMEPAGE="https://github.com/Ryochan7/sc-controller/"
-SRC_URI="https://github.com/Ryochan7/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2 CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+udev"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/pygobject[${PYTHON_USEDEP},cairo]
- dev-python/pylibacl[${PYTHON_USEDEP}]
- dev-python/python-evdev[${PYTHON_USEDEP}]
- ')
- gnome-base/librsvg
- x11-libs/gtk+:3
- udev? ( games-util/game-device-udev-rules )
-"
diff --git a/games-util/sc-controller/sc-controller-0.4.8.6_p20211211.ebuild b/games-util/sc-controller/sc-controller-0.4.8.6_p20211211.ebuild
new file mode 100644
index 00000000000..6f4d359c969
--- /dev/null
+++ b/games-util/sc-controller/sc-controller-0.4.8.6_p20211211.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 linux-info xdg
+
+COMMIT="3ce2d23c873f6f5ecc80ef90f153c14f744368f9"
+DESCRIPTION="User-mode driver and GTK-based GUI for Steam Controllers and others"
+HOMEPAGE="https://github.com/Ryochan7/sc-controller/"
+SRC_URI="https://github.com/Ryochan7/sc-controller/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 BSD CC-BY-3.0 CC0-1.0 LGPL-2.1 MIT PSF-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+udev"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/pygobject[${PYTHON_USEDEP},cairo]
+ dev-python/pylibacl[${PYTHON_USEDEP}]
+ dev-python/python-evdev[${PYTHON_USEDEP}]
+ dev-python/vdf[${PYTHON_USEDEP}]')
+ gnome-base/librsvg[introspection]
+ virtual/libusb
+ x11-libs/gtk+:3[introspection]
+ udev? ( games-util/game-device-udev-rules )"
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-bluetooth-evdev.patch
+)
+
+pkg_setup() {
+ local CONFIG_CHECK="~INPUT_UINPUT"
+
+ linux-info_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_install() {
+ distutils-r1_src_install
+ rm -r "${ED}"/usr/lib/udev/ || die
+}
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index 2ca180f1985..893f5cf476e 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1 +1 @@
-DIST slade-3.2.0_beta2.tar.gz 5999580 BLAKE2B 29cd515e4553fa1d74a43dc982b376b10d95ebbe2da4a25bc39329c15967466142c73ec134ada371b9aa65d8fc8d9f4a1820cece7fe8dca59fec039aaad32331 SHA512 e46d9664348233c7ee7fa8ed748d7e23914bb1bb6dd65d40aff7603b386e032e988e0990d4a435f597ba8a6416c7ec377c8334a66efacd55ebdd994d3fd11073
+DIST slade-3.2.0.tar.gz 6464839 BLAKE2B 8e13f153c64526784bd5fa3d03520942d9dbc1b0b0d1e4d0650fb91ed63a7f860655f5d580b4c0a04a52aa98f617b1f4448f47cd1e55c1b3f78fc552b8101654 SHA512 916be3b9556e76ca815514bb472335af80a72bfb8ecd0ae4287db2c0d6ad092a8ada1b335762f8589d300b1fd81adbdede3e6c315cfdc1d49b1624294b405b92
diff --git a/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch b/games-util/slade/files/slade-3.2.0-bundled-libs.patch
index 4474ab783d4..c4eae37f945 100644
--- a/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch
+++ b/games-util/slade/files/slade-3.2.0-bundled-libs.patch
@@ -1,4 +1,4 @@
-From a22553a612ade8a5e3f90c84166e9fdda16635c9 Mon Sep 17 00:00:00 2001
+From 5ecc80d27276ba978b8c0268aab722fe8f09b394 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sat, 20 Feb 2021 12:22:24 +0000
Subject: [PATCH] Unbundle the DUMB library
@@ -7,11 +7,11 @@ Subject: [PATCH] Unbundle the DUMB library
src/Application/App.cpp | 2 +-
src/Audio/ModMusic.cpp | 2 +-
src/CMakeLists.txt | 4 +++-
- thirdparty/CMakeLists.txt | 2 --
- 4 files changed, 5 insertions(+), 5 deletions(-)
+ thirdparty/CMakeLists.txt | 1 -
+ 4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/Application/App.cpp b/src/Application/App.cpp
-index 3d4dcc1d..d2c3e583 100644
+index 936a8212..2960ca1d 100644
--- a/src/Application/App.cpp
+++ b/src/Application/App.cpp
@@ -60,7 +60,7 @@
@@ -24,7 +24,7 @@ index 3d4dcc1d..d2c3e583 100644
using namespace slade;
diff --git a/src/Audio/ModMusic.cpp b/src/Audio/ModMusic.cpp
-index cb8eef8c..2d368fdb 100644
+index cc4b60cf..6d54516d 100644
--- a/src/Audio/ModMusic.cpp
+++ b/src/Audio/ModMusic.cpp
@@ -32,7 +32,7 @@
@@ -37,49 +37,48 @@ index cb8eef8c..2d368fdb 100644
using namespace slade;
using namespace audio;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 802598f6..222e6040 100644
+index fef3d009..5363802c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -110,6 +110,7 @@ endif()
- pkg_check_modules(fmt REQUIRED fmt>=6)
- include_directories(${fmt_INCLUDE_DIRS})
+@@ -107,6 +107,7 @@ if (NOT NO_LUA)
+ find_package(Lua REQUIRED)
+ endif()
find_package(MPG123 REQUIRED)
+pkg_check_modules(DUMB REQUIRED dumb>=1.0)
include_directories(
${FREEIMAGE_INCLUDE_DIR}
${SFML_INCLUDE_DIR}
-@@ -118,9 +119,9 @@ include_directories(
- ${CURL_INCLUDE_DIR}
+@@ -114,9 +115,9 @@ include_directories(
+ ${FTGL_INCLUDE_DIR}
${LUA_INCLUDE_DIR}
${MPG123_INCLUDE_DIR}
+ ${DUMB_INCLUDE_DIRS}
.
..
- ../thirdparty/dumb
+ ../thirdparty/glad/include
./Application
)
-
-@@ -200,6 +201,7 @@ target_link_libraries(slade
- ${CURL_LIBRARIES}
+@@ -201,6 +202,7 @@ target_link_libraries(slade
+ ${OPENGL_LIBRARIES}
${LUA_LIBRARIES}
${MPG123_LIBRARIES}
+ ${DUMB_LIBRARIES}
- ${fmt_LIBRARIES}
- -lstdc++fs
)
+
+ if(LINUX)
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index 6b0eb504..a3757c91 100644
+index f84cfc8a..2622852b 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
-@@ -12,8 +12,6 @@ set(EXTERNAL_SOURCES
+@@ -10,7 +10,6 @@ set(BZIP2_LIBRARIES ${BZIP2_LIBRARIES} PARENT_SCOPE)
+ set(EXTERNAL_SOURCES
+ )
file(GLOB_RECURSE EXTERNAL_SOURCES
- *.cpp
- *.cxx
- dumb/*.c
-- lua/*.c
lzma/C/LzmaDec.c
- fmt/*.cc
- ${SLADE_HEADERS}
+ mus2mid/mus2mid.cpp
+ zreaders/*.cpp
--
-2.30.0
+2.34.1
diff --git a/games-util/slade/files/slade-3.2.0-wx3.0.patch b/games-util/slade/files/slade-3.2.0-wx3.0.patch
new file mode 100644
index 00000000000..2e519b45181
--- /dev/null
+++ b/games-util/slade/files/slade-3.2.0-wx3.0.patch
@@ -0,0 +1,66 @@
+From 45537095187cb5b985713e7558a230651b599589 Mon Sep 17 00:00:00 2001
+From: Simon Judd <sirjuddington@gmail.com>
+Date: Thu, 14 Apr 2022 21:52:16 -0700
+Subject: [PATCH] Keep up wx3.0 compatibility
+
+I'd like to drop it ideally, but for now it'll stay
+
+Fix #1336
+---
+ src/Graphics/Icons.cpp | 15 +++++++++++++++
+ src/UI/SAuiTabArt.cpp | 5 ++++-
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/src/Graphics/Icons.cpp b/src/Graphics/Icons.cpp
+index 61d5475c..67147f7e 100644
+--- a/src/Graphics/Icons.cpp
++++ b/src/Graphics/Icons.cpp
+@@ -373,7 +373,22 @@ wxBitmap loadPNGIcon(const IconDef& icon, int size, Point2i padding)
+ bool icons::loadIcons()
+ {
+ // Check for dark mode
++#if wxMAJOR_VERSION >= 3 && wxMINOR_VERSION >= 1
+ ui_icons_dark = wxSystemSettings::GetAppearance().IsDark();
++#else
++ auto fg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
++ auto fg_r = fg.Red();
++ auto fg_g = fg.Green();
++ auto fg_b = fg.Blue();
++ auto bg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
++ auto bg_r = bg.Red();
++ auto bg_g = bg.Green();
++ auto bg_b = bg.Blue();
++ wxColour::MakeGrey(&fg_r, &fg_g, &fg_b);
++ wxColour::MakeGrey(&bg_r, &bg_g, &bg_b);
++ log::info("DARK MODE CHECK: FG {} BG {}", fg_r, bg_r);
++ ui_icons_dark = fg_r > bg_r;
++#endif
+
+ // Get slade.pk3
+ auto* res_archive = app::archiveManager().programResourceArchive();
+diff --git a/src/UI/SAuiTabArt.cpp b/src/UI/SAuiTabArt.cpp
+index 15aad09e..240de8b9 100644
+--- a/src/UI/SAuiTabArt.cpp
++++ b/src/UI/SAuiTabArt.cpp
+@@ -542,6 +542,7 @@ void SAuiDockArt::DrawCaption(wxDC& dc, wxWindow* window, const wxString& text,
+ int caption_offset = 0;
+ if (pane.icon.IsOk())
+ {
++#if wxMAJOR_VERSION >= 3 && wxMINOR_VERSION >= 1
+ // Ensure the icon fits into the title bar.
+ wxSize iconSize = pane.icon.GetSize();
+ if (iconSize.y > rect.height)
+@@ -554,7 +555,9 @@ void SAuiDockArt::DrawCaption(wxDC& dc, wxWindow* window, const wxString& text,
+ dc.DrawBitmap(pane.icon,
+ rect.x+xOffset, rect.y+(rect.height-pane.icon.GetHeight())/2,
+ true);
+-
++#else
++ DrawIcon(dc, rect, pane);
++#endif
+ caption_offset += pane.icon.GetWidth() + px3;
+ }
+
+--
+2.34.1
+
diff --git a/games-util/slade/slade-3.2.0_beta2.ebuild b/games-util/slade/slade-3.2.0.ebuild
index c11364215f0..76979d24ed4 100644
--- a/games-util/slade/slade-3.2.0_beta2.ebuild
+++ b/games-util/slade/slade-3.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-{1..3} )
WX_GTK_VER="3.0-gtk3"
@@ -46,8 +46,9 @@ BDEPEND="
S="${WORKDIR}/${PN^^}-${MY_PV}"
PATCHES=(
- "${FILESDIR}"/${P}-bundled-libs.patch
- "${FILESDIR}"/${P}-fluidsynth-driver.patch
+ "${FILESDIR}"/${PN}-3.2.0-bundled-libs.patch
+ "${FILESDIR}"/${PN}-3.2.0_beta2-fluidsynth-driver.patch
+ "${FILESDIR}"/${PN}-3.2.0-wx3.0.patch
)
src_prepare() {
diff --git a/games-util/springlobby/Manifest b/games-util/springlobby/Manifest
deleted file mode 100644
index 1905bf3a902..00000000000
--- a/games-util/springlobby/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST springlobby-0.269.tar.bz2 4576001 BLAKE2B bd55b480c98d74bc83f99bf32148ef2be5e1f59e1539fdb432430d5e36e653e1c3d550bc7a3c996e5df029a19ea729d456f34ae3522a2a6385a0d646697e537c SHA512 32e9b5bfc72bcfccd1487621e6035e7338977f7262702cd39ec2c43734bff5b8757a97428d1207f8e6721dd450c1cddd68e43cea416503dd1987596e61e126e1
diff --git a/games-util/springlobby/metadata.xml b/games-util/springlobby/metadata.xml
deleted file mode 100644
index 8c79a9e2c8e..00000000000
--- a/games-util/springlobby/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <longdescription lang="en">
-The official lobby client for SpringRTS community games: Balanced Annihilation; Journeywar; Metal Factions; Spring:1944 World War II; Star Wars: Imperial Winter; Tech Annihilation; The Cursed; Evolution RTS; ...
- </longdescription>
- <longdescription lang="fr">
-Le client officiel du lobby pour les jeux de la communauté SpringRTS : Balanced Annihilation; Journeywar; Metal Factions; Spring:1944 World War II; Star Wars: Imperial Winter; Tech Annihilation; The Cursed; Evolution RTS; ...
- </longdescription>
- <maintainer type="person" proxied="yes">
- <email>totocoq@yahoo.fr</email>
- <name>Thomas Coquelin</name>
- </maintainer>
- <maintainer type="person" proxied="yes">
- <email>fedja@protonmail.ch</email>
- <name>Fedja Beader</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <upstream>
- <remote-id type="github">springlobby/springlobby</remote-id>
- <bugs-to>https://github.com/springlobby/springlobby/issues</bugs-to>
- </upstream>
-</pkgmetadata>
diff --git a/games-util/springlobby/springlobby-0.269.ebuild b/games-util/springlobby/springlobby-0.269.ebuild
deleted file mode 100644
index d35dc36a2bb..00000000000
--- a/games-util/springlobby/springlobby-0.269.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0"
-inherit cmake xdg-utils wxwidgets
-
-DESCRIPTION="The official lobby client for SpringRTS community games"
-HOMEPAGE="https://springlobby.springrts.com"
-SRC_URI="https://springlobby.springrts.com/dl/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +libnotify +nls +sound"
-
-RDEPEND="
- dev-libs/openssl:0=
- net-misc/curl
- sys-libs/zlib[minizip]
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- libnotify? ( x11-libs/libnotify )
- sound? (
- media-libs/alure
- media-libs/openal
- )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_configure() {
- setup-wxwidgets
- local mycmakeargs=(
- -DOPTION_NOTIFY=$(usex libnotify)
- -DOPTION_SOUND=$(usex sound)
- -DOPTION_TRANSLATION_SUPPORT=$(usex nls)
- -DAUX_VERSION="(Gentoo,${ARCH})"
- )
- cmake_src_configure
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}