3 files changed, 39 insertions, 25 deletions
diff --git a/games-arcade/tetrio-desktop/Manifest b/games-arcade/tetrio-desktop/Manifest
index 7a9deafc638f..a83f91cd5fd3 100644
--- a/games-arcade/tetrio-desktop/Manifest
+++ b/games-arcade/tetrio-desktop/Manifest
@@ -1,4 +1,3 @@
-DIST tetrio-desktop-8.deb 51480890 BLAKE2B 641606cc29113098d3b686b17164669203e5c91801119e88a8cd7b4ef331bf25bfbed55d443bdb19d2a5b755919194861e4540489d85ebbdefd24b54c5c895cf SHA512 04841ac7186bb864d4b8dfc15fee287ecbe713b3971521f703dd054b61cbbba481b296228ac9d83b0b58dcdd6b715d827c03edac4a1c97c11a362d85e015bcdd
+DIST tetrio-desktop-10.deb 81961618 BLAKE2B d835f69d7b8e94aeea2fc70946e58d978d878d01995488800e3647736975acf4d6ebf9b866ac606447aea89097aea1b42637c1bf4b9293745cfe674560228333 SHA512 2073193144e26287f934c34dc00b8d83465aeb3df22d0998bc90f4f17df3d0ed9940ba7532f2697d1461847c9c793c67d4463e5caeedf33a6dda6e693f315e00
 DIST tetrio-desktop-9.deb 74732756 BLAKE2B d225276ec77c23a8b4a792cd7ef866563d29b71adb557566dd6a18be96d4789e3a84f661216feea2a63d235aabb625c489b7177dfd6ccc7993fad90fe58bd8ad SHA512 a8852ea847d12cac46d29a26c7793f4f1911d3336647392cfe16cd955c8e1175fe0ff77764452713c0498f6b1a3044aaf4d131a0ce3b58861be59fd60a8a6e8c
-DIST tetrio-plus-8.zip 4733782 BLAKE2B 493361cb92dbfa0f0ed47b8c132cb43f91941ed85f2127398c4eb52a7c3b6e9be8b38fa4dd6374930197cfe9dc423aa6b1dbd790fbfc3fe96f042487b44b6a1a SHA512 ab9402085b6ec5e37e70e2945300fa05902a6da82b5512931851cd08a3eff90604e835cef162c077ac703d570ed36886952a6d06a7906ed2a3601e71f361d083
 DIST tetrio-plus-9.zip 16999939 BLAKE2B 640e6957ee3edd8cdbb905ee6bbd0ff4c4843548b486762a6876a86d764d232a4625143aca9c5a4a0cd122d5f3d23564ffa891a41229a8517037f1427645ca96 SHA512 fdb5cf2f8bea86cea706c625c25b962ac733675fbccacba5003188766eaa4bf0a7c01df52edd99316b4be8b8122bfe95154182a153bf65c584ecf7daca47b966
diff --git a/games-arcade/tetrio-desktop/files/tetrio-desktop-10-application.patch b/games-arcade/tetrio-desktop/files/tetrio-desktop-10-application.patch
new file mode 100644
index 000000000000..a0ea14736706
--- /dev/null
+++ b/games-arcade/tetrio-desktop/files/tetrio-desktop-10-application.patch
@@ -0,0 +1,16 @@
+diff --git a/usr/share/applications/tetrio-desktop.desktop b/usr/share/applications/tetrio-desktop.desktop
+index 802f685..898b247 100644
+--- a/usr/share/applications/tetrio-desktop.desktop
++++ b/usr/share/applications/tetrio-desktop.desktop
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=TETR.IO
+-Exec=/opt/TETR.IO/TETR.IO %U
++Exec="/usr/bin/tetrio-desktop" %U
+ Terminal=false
+ Type=Application
+ Icon=TETR.IO
+ StartupWMClass=TETR.IO
+ Comment=Puzzle together in this modern yet familiar online stacker!
+ MimeType=x-scheme-handler/tetrio;
+ Categories=Game;BlocksGame;
diff --git a/games-arcade/tetrio-desktop/tetrio-desktop-8.ebuild b/games-arcade/tetrio-desktop/tetrio-desktop-10.ebuild
index 2edcaaa9717a..19324248bd2e 100644
--- a/games-arcade/tetrio-desktop/tetrio-desktop-8.ebuild
+++ b/games-arcade/tetrio-desktop/tetrio-desktop-10.ebuild
@@ -8,9 +8,7 @@ inherit unpacker desktop xdg
 DESCRIPTION="TETR.IO desktop client."
 HOMEPAGE="https://tetr.io/"
 
-SRC_URI="https://tetr.io/about/desktop/builds/${PV}/TETR.IO%20Setup.deb -> ${P}.deb
-	tetrio-plus?	( https://gitlab.com/UniQMG/tetrio-plus/uploads/\
-a7342b94f03d670b72235ab453c427a5/tetrio-plus_0.26.0_app.asar.zip -> tetrio-plus-${PV}.zip )"
+SRC_URI="https://tetr.io/about/desktop/builds/${PV}/TETR.IO%20Setup.deb -> ${P}.deb"
 
 S="${WORKDIR}"
 
@@ -26,12 +24,7 @@ BDEPEND="
 	app-arch/unzip
 "
 RDEPEND="
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libXScrnSaver
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXtst
+	x11-libs/libxkbcommon
 	app-accessibility/at-spi2-core:2
 	dev-libs/expat
 	dev-libs/glib:2
@@ -58,23 +51,31 @@ QA_PREBUILT=".*"
 
 PATCHES=(
 	"${FILESDIR}/${P}-application.patch"
-
 )
 
 src_unpack() {
 	unpack_deb "${P}.deb"
-	if use tetrio-plus; then
-		unpack "tetrio-plus-${PV}.zip"
-	fi
+
+	# No TETR.IO PLUS for v10 yet
+	#if use tetrio-plus; then
+	#	unpack "tetrio-plus-${PV}.zip"
+	#fi
 }
 
 src_prepare() {
+	mv "${S}/usr/share/applications/TETR.IO.desktop"\
+		"${S}/usr/share/applications/tetrio-desktop.desktop"
+
 	default
 
-	if use tetrio-plus;	then
-		mv "${S}/app.asar" "${S}/opt/TETR.IO/resources/app.asar" || die
+	if use tetrio-plus; then
+		ewarn "TETR.IO PLUS is not supported yet for v10"
 	fi
 
+	#if use tetrio-plus;	then
+	#	mv "${S}/app.asar" "${S}/opt/TETR.IO/resources/app.asar" || die
+	#fi
+
 	mv "${S}/opt/TETR.IO" "${S}/opt/${PN}" || die
 }
 
@@ -82,28 +83,26 @@ src_install() {
 	ICONDIR="usr/share/icons/hicolor"
 	DESTDIR="/opt/${PN}"
 
-	doicon -s 256 "${ICONDIR}/256x256/apps/tetrio-desktop.png"
-	doicon -s 512 "${ICONDIR}/512x512/apps/tetrio-desktop.png"
+	doicon -s 256 "${ICONDIR}/256x256/apps/TETR.IO.png"
+	doicon -s 512 "${ICONDIR}/512x512/apps/TETR.IO.png"
 
 	domenu "usr/share/applications/tetrio-desktop.desktop"
 
 	dodir /opt/${PN}
 
 	exeinto "${DESTDIR}"
-	doexe "opt/${PN}/tetrio-desktop" "opt/${PN}/chrome-sandbox" "opt/${PN}/libEGL.so" \
-		"opt/${PN}/libffmpeg.so" "opt/${PN}/libGLESv2.so" "opt/${PN}/libvk_swiftshader.so" "opt/${PN}/libvulkan.so"
+	doexe "opt/${PN}/TETR.IO" "opt/${PN}/chrome-sandbox" "opt/${PN}/libEGL.so" \
+		"opt/${PN}/libffmpeg.so" "opt/${PN}/libGLESv2.so" "opt/${PN}/libvk_swiftshader.so" "opt/${PN}/libvulkan.so.1"
 
 	insinto "${DESTDIR}"
 	doins "opt/${PN}/chrome_100_percent.pak" "opt/${PN}/chrome_200_percent.pak" "opt/${PN}/icudtl.dat" \
 		"opt/${PN}/resources.pak" "opt/${PN}/snapshot_blob.bin" "opt/${PN}/v8_context_snapshot.bin"\
 		"opt/${PN}/vk_swiftshader_icd.json"
 
-	doins -r "opt/${PN}/locales" "opt/${PN}/resources" "opt/${PN}/swiftshader"
-
-	fperms -R a+x "${DESTDIR}/swiftshader/"
+	doins -r "opt/${PN}/locales" "opt/${PN}/resources"
 
 	fowners root "${DESTDIR}/chrome-sandbox"
 	fperms 4711 "${DESTDIR}/chrome-sandbox"
 
-	dosym -r "/opt/${PN}/tetrio-desktop" "/usr/bin/${PN}"
+	dosym -r "/opt/${PN}/TETR.IO" "/usr/bin/${PN}"
 }