diff --git a/metadata/md5-cache/net-misc/nxplayer-8.2.3.4 b/metadata/md5-cache/net-misc/nxplayer-8.2.3.4
index 246b29a..a08e26c 100644
--- a/metadata/md5-cache/net-misc/nxplayer-8.2.3.4
+++ b/metadata/md5-cache/net-misc/nxplayer-8.2.3.4
@@ -1,10 +1,13 @@
 DEFINED_PHASES=install
-DESCRIPTION=Client for NoMachine remote servers
-EAPI=8
+DESCRIPTION=NoMachine Client
+EAPI=7
 HOMEPAGE=https://www.nomachine.com
-KEYWORDS=-* ~amd64 ~x86
+INHERIT=wrapper desktop
+KEYWORDS=~amd64
 LICENSE=nomachine
-RDEPEND=|| ( sys-libs/libxcrypt[compat] sys-libs/glibc[crypt(+)] ) dev-libs/glib:2 dev-libs/openssl:0
+RDEPEND=dev-libs/glib:2 sys-libs/libudev-compat virtual/libcrypt:0 dev-libs/openssl:0
+RESTRICT=strip
 SLOT=0
-SRC_URI=amd64? ( http://download.nomachine.com/download/8.2/Linux/nomachine-enterprise-client_8.2.3_4_x86_64.tar.gz ) x86? ( http://download.nomachine.com/download/8.2/Linux/nomachine-enterprise-client_8.2.3_4_i686.tar.gz )
-_md5_=31205432b25a2cc4dd54c9e593b141b9
+SRC_URI=https://download.nomachine.com/download/8.2/Linux/nxplayer_8.2.3_4_x86_64.tar.gz
+_eclasses_=wrapper	4a1902f969e5718126434fc35f3a0d9c	desktop	7eb20ad915a0a318176d51bc2508ff5c
+_md5_=4e6161e1f04fed1c04877f5742b979c2
diff --git a/net-misc/nxplayer/Manifest b/net-misc/nxplayer/Manifest
index 80772d0..1d0cb82 100644
--- a/net-misc/nxplayer/Manifest
+++ b/net-misc/nxplayer/Manifest
@@ -1,8 +1,7 @@
 AUX 50nxplayer 41 BLAKE2B 167a5992f3bc1df0a78297938e652d9413037e9398ae9787d425e07b4dfbefa1932ba18bc565f3eb7a14e61cb1f49c3810581b21e282d0e00009b70c21215b3f SHA512 2ca064c30ac4934403150e07488eb17469815d958056c7da913c5dbaf94f7b5cddfbda4c3b240ef62337960ccdba44b535f174f20c8a1643bb8a2738d92ee6b0
 DIST nomachine-enterprise-client_7.10.1_1_i686.tar.gz 35365174 BLAKE2B 1ef716653a7a6f86d1b699348f75ec925890f8a36481771513fc43ad873adfbebd5e6f0fcb56a6d026338bd29f5a06a425be5660c2bbf3b8bbb08710871b77f8 SHA512 e7cd96e7847b2573cc7b3070093820d903aca85b31d9662348d9ca2b1f9065c2ac065cd64a5c190543561189850e582bbc4a414757cce3feb55edb6c868e7dd5
 DIST nomachine-enterprise-client_7.10.1_1_x86_64.tar.gz 37052246 BLAKE2B d783355e75624ffe76c1ddbfcd6e3724c520d156e29c073d2db89752292c5435dd09f7df327466f856a63847657aeb246c11394334730f860b35f760ad8dbbf2 SHA512 fbb0ac0378dc4ae64aa7872e8302b8bc9b5f16a91b06a6bad2bae305b20e05f573b2bd945c8a4ba865203243f59694d102a02c2801cfb4850298c71ffcdc8d5d
-DIST nomachine-enterprise-client_8.2.3_4_i686.tar.gz 149522 BLAKE2B 1e9f103e779c62af567ab68ebb427209ef2fb05767f2ac0cf882ca3981ce1af5f9fa546ebc55ef5be211e104c2ffb203b9f4f65040a74e82b5dd55f00a42ae73 SHA512 e82d205bc54edf8d95a2ddca823a122fdb4ef50f52eb4fa91e5820bb098c84b0f0fc59fc5fc5f0422f60f4e37e950af665b3379d339b75996062eed59b92f715
-DIST nomachine-enterprise-client_8.2.3_4_x86_64.tar.gz 44395684 BLAKE2B b74dfc2ff35f10fdee811b8db578eaa2f047bf9397a8440071053b5739ecff20427df76490596b50deb018fcab9540c8d784862ff86993ebf025c5408d7b9a4a SHA512 4b53b13fa94f2b5812741e05a76d6baa7ffe6b3a6554045c347b9d278ce76b95e0ab3744c01a5ca42087dc84ddb9c00fc426f410c98be0b8d99397ada4f2e699
+DIST nxplayer_8.2.3_4_x86_64.tar.gz 149522 BLAKE2B 1e9f103e779c62af567ab68ebb427209ef2fb05767f2ac0cf882ca3981ce1af5f9fa546ebc55ef5be211e104c2ffb203b9f4f65040a74e82b5dd55f00a42ae73 SHA512 e82d205bc54edf8d95a2ddca823a122fdb4ef50f52eb4fa91e5820bb098c84b0f0fc59fc5fc5f0422f60f4e37e950af665b3379d339b75996062eed59b92f715
 EBUILD nxplayer-7.10.1.1.ebuild 896 BLAKE2B 93a6eaf317aa9abb61fca8a30e4afc68157acfa33d57907b03c6a25238e25dd74f6208e4a9de2481f47a66c01189b428de42c8f43a696e5844475df30077756e SHA512 6a7795da4b8ef521ef247c4aa9f73b3c6150c5aab028406e4d526ae5419889344c5d867a6b9133b3073ddab942e30b50397881dd7a8b6c08f75f1fe693a8f9eb
-EBUILD nxplayer-8.2.3.4.ebuild 896 BLAKE2B 93a6eaf317aa9abb61fca8a30e4afc68157acfa33d57907b03c6a25238e25dd74f6208e4a9de2481f47a66c01189b428de42c8f43a696e5844475df30077756e SHA512 6a7795da4b8ef521ef247c4aa9f73b3c6150c5aab028406e4d526ae5419889344c5d867a6b9133b3073ddab942e30b50397881dd7a8b6c08f75f1fe693a8f9eb
+EBUILD nxplayer-8.2.3.4.ebuild 898 BLAKE2B 908c92f3237f170f3566dfa1d2adcd8604ef9d8f8da118780b854450f79ddbb4952a795146e2435f2800cfe0ab0658e05237d6e986cdd393d46158856bebd664 SHA512 6bab1d26f256457c10683bf94f513fa68f20889f29c2f6e263be8eb1892dbfcfcb2c094194c368a14c61b77a7585c6e479cbb09b117279c605ce189fae817591
 MISC metadata.xml 666 BLAKE2B 766e00d8b6f8a58922bad5d60cd2f809814074e324d659b1f223670e149de79fec5591a595d31f128af724d79d4f5ec4be26c9ee9c3b322fcd324365f609effc SHA512 e065fc33af29b41de2ebecb8ddeadb04e5d6d9636e2303d6823ab7babcbc5a38b07a8eba05cebd083feef8dd6014102fe2cfe897facb84c2ed1c66b4556e0b47
diff --git a/net-misc/nxplayer/nxplayer-8.2.3.4.ebuild b/net-misc/nxplayer/nxplayer-8.2.3.4.ebuild
index 6c7c062..13159e1 100644
--- a/net-misc/nxplayer/nxplayer-8.2.3.4.ebuild
+++ b/net-misc/nxplayer/nxplayer-8.2.3.4.ebuild
@@ -1,36 +1,41 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=7
 
-MY_P="nomachine-enterprise-client_$(ver_cut 1-3)_$(ver_cut 4)"
+inherit wrapper desktop
 
-DESCRIPTION="Client for NoMachine remote servers"
+MY_V=$(ver_cut 1-2)
+MY_PV=$(ver_rs 3 '_')
+
+DESCRIPTION="NoMachine Client"
 HOMEPAGE="https://www.nomachine.com"
-SRC_URI="amd64? ( http://download.nomachine.com/download/$(ver_cut 1-2)/Linux/${MY_P}_x86_64.tar.gz )
-	x86? ( http://download.nomachine.com/download/$(ver_cut 1-2)/Linux/${MY_P}_i686.tar.gz )"
-S="${WORKDIR}"/NX/etc/NX/player/packages
+SRC_URI="https://download.nomachine.com/download/${MY_V}/Linux/${PN}_${MY_PV}_x86_64.tar.gz"
+S="${WORKDIR}/NX/etc/NX/player/packages"
 
 LICENSE="nomachine"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="strip"
 
-RDEPEND="
-	|| (
-		sys-libs/libxcrypt[compat]
-		sys-libs/glibc[crypt(+)]
-	)
-	dev-libs/glib:2
-	dev-libs/openssl:0
-"
+DEPEND=""
+BDEPEND=""
+RDEPEND="dev-libs/glib:2
+		sys-libs/libudev-compat
+		virtual/libcrypt:0
+		dev-libs/openssl:0"
 
 QA_PREBUILT="*"
 
 src_install() {
-	dodir /opt
-	tar xozf nxclient.tar.gz -C "${ED}"/opt || die
-	tar xozf nxplayer.tar.gz -C "${ED}"/opt || die
+	local NXROOT=/opt/NX
 
-	doenvd "${FILESDIR}"/50nxplayer
-	dosym -r /opt/NX/bin/nxplayer /opt/bin/nxplayer
+	doicon "${FILESDIR}/${PN}.png"
+	make_desktop_entry "nxplayer" "NoMachine Client" "" "Network"
+	dodir /opt
+	tar xzof nxclient.tar.gz -C "${D}"/opt
+	tar xzof nxplayer.tar.gz -C "${D}"/opt
+
+	make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin
 }