diff --git a/media-gfx/grafx2/Manifest b/media-gfx/grafx2/Manifest
index 2b4ca9b..48883dc 100644
--- a/media-gfx/grafx2/Manifest
+++ b/media-gfx/grafx2/Manifest
@@ -1,2 +1,3 @@
-DIST recoil-4.3.2.tar.gz 452706 BLAKE2B 4de1d2cd320768c80cd02f79353738df1f6e45f4ffb667c2c698df5b9861f86592a4704cf30f9d223592ecb9b07b65059bf8d33e9aad96d6818ed7a737ccd5a1 SHA512 24b5d60ff2673a521e1c87ee6d3ec8dd414e63b6749cb43e6ed3878d9a1ee661e3e93ab44c80b490a58eb70e633bb644ff87c3abe9bd82c2dfc60449f9138ed2
-EBUILD grafx2-9999.ebuild 1356 BLAKE2B 9fdfc0df8388cfc6a58a1009f2206054acf0cf2572a3ce4c015451a853a80e43c96b5adbe72ce8c22900a47e71111cfb39a75290489ab7a7def2e618dd879560 SHA512 f762b3165b9ab81276e16884800990246d2701f3bfed6cefab30080a55e0e17a2a41aac012ed76bcd683cd10139001b211ce34220e7718b8cfa8044871ff5e37
+AUX grafx2-desktop-file.patch 464 BLAKE2B d47b731692b893c51430010dbd34c415e91d59b4eb30d9f209e260a87a56d0ae17ef1b68c48894ae06720b72bd64fd43b8219775f788ec8c384052db0dd6217c SHA512 02fc22a24e229688b4dec48c1b9be1b907e4566893b49664ad9b88537aa39973b53c06687e0ac893dfbc1a0789c61c770129eaa8f3b0819955ae8c60ea7bf8db
+DIST grafx2-2.7.2978-src.tgz 1104727 BLAKE2B 7ae308ea7ce3dd10966e85353111c890931a56c9bc496c4d956d89db9609e4e472280df1202e85494929979ee080a7c5daf07b629ed7002291448c87a7547cf6 SHA512 ed8d92b51cf71ee139b7c21206a088ba056642debcbbc6e650bdab9547b53159251d842eb4c5ea46b18859c0f333bad66ed60e4b91d58bacd7f02022ead7a61e
+EBUILD grafx2-2.7.2978.ebuild 973 BLAKE2B 6c88f85efa8ddc5dd0d8064e2915aef304a2215f1cfc6f1b569bc787b16c2ec09a8f06b73b54c83906ea813753968e7b1c47906b517387ab52dea1a08709173b SHA512 242a7c6c518d1a1706858cde8c9f7e6ffe7adfe1a0f356b5cd0b7eda44e283373800d54da9f770f80e2433da9e12437b24a42617813705907fe674c006f7c576
diff --git a/media-gfx/grafx2/files/grafx2-desktop-file.patch b/media-gfx/grafx2/files/grafx2-desktop-file.patch
new file mode 100644
index 0000000..a08bb8a
--- /dev/null
+++ b/media-gfx/grafx2/files/grafx2-desktop-file.patch
@@ -0,0 +1,16 @@
+diff --git a/misc/unix/grafx2.desktop b/misc/unix/grafx2.desktop
+index 9718f06..892e7b2 100644
+--- a/misc/unix/grafx2.desktop
++++ b/misc/unix/grafx2.desktop
+@@ -1,9 +1,9 @@
+ [Desktop Entry]
+ Name=GrafX2
+ Comment=Deluxe Paint Clone
+-Exec=grafx2 %f
++Exec=grafx2-sdl %f
+ Terminal=false
+ Type=Application
+ Icon=grafx2
+-Categories=Application;Graphics;
++Categories=Graphics;
+ MimeType=image/lbm;image/iff;image/pcx;image/tga;image/gif;image/bmp;image/x-icon;image/png;
diff --git a/media-gfx/grafx2/grafx2-2.7.2978.ebuild b/media-gfx/grafx2/grafx2-2.7.2978.ebuild
new file mode 100644
index 0000000..7ca50f8
--- /dev/null
+++ b/media-gfx/grafx2/grafx2-2.7.2978.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="A pixelart-oriented painting program"
+HOMEPAGE="http://www.pulkomandy.tk/projects/GrafX2"
+SRC_URI="http://www.pulkomandy.tk/projects/GrafX2/downloads/${P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ttf lua"
+
+# Test phase fails: make: *** [Makefile:1146: ../bin/tests-sdl] Error 1
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-desktop-file.patch"
+)
+
+DEPEND="
+	media-libs/libsdl
+	media-libs/sdl-image[tiff]
+	media-libs/freetype
+	media-libs/libpng
+	ttf? ( media-libs/sdl-ttf )
+	lua? ( dev-lang/lua:5.4 )
+"
+
+S="${WORKDIR}/${PN}/src/"
+
+src_prepare() {
+	pushd ../
+	eapply ${PATCHES}
+	eapply_user
+	popd
+}
+
+src_compile() {
+	use ttf || MYCNF="NOTTF=1"
+	use lua || MYCNF="${MYCNF} NOLUA=1"
+
+	emake ${MYCNF} || die "emake failed"
+}
+
+src_install() {
+	emake ${MYCNF} DESTDIR="${D}" PREFIX="/usr" install || die "Install failed"
+}
diff --git a/media-gfx/grafx2/grafx2-9999.ebuild b/media-gfx/grafx2/grafx2-9999.ebuild
deleted file mode 100644
index ab4db77..0000000
--- a/media-gfx/grafx2/grafx2-9999.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=6
-
-inherit git-r3
-
-RECOIL_P="recoil-4.3.2"
-
-DESCRIPTION="Bitmap paint program inspired by Deluxe Paint and Brilliance"
-HOMEPAGE="http://grafx2.chez.com/"
-SRC_URI="mirror://sourceforge/recoil/${RECOIL_P}.tar.gz"
-EGIT_REPO_URI="https://gitlab.com/GrafX2/grafX2.git/"
-
-LICENSE="GNU GPL v2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="lua truetype"
-
-DEPEND=">=media-libs/libsdl-1.2
-	>=sys-devel/make-3.80
-	>=media-libs/sdl-image-1.2
-	>=media-libs/libpng-1.4
-	truetype? ( media-libs/sdl-ttf )
-	lua? ( >=dev-lang/lua-5.1 )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	git-r3_src_unpack
-	default
-	mv "${WORKDIR}"/${RECOIL_P} "${S}/3rdparty"
-}
-
-src_compile() {
-	cd src
-	make || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc doc/{COMPILING.txt,gpl-2.0.txt,PF_fonts.txt,quickstart.rtf,README.txt}
-	dodoc doc/original_docs/*
-	mv bin/grafx2-sdl bin/grafx2
-	dobin bin/grafx2
-
-	insinto /usr/share/${PN}/fonts
-	doins share/grafx2/fonts/*.{png,gif,ttf}
-
-	if use lua; then
-		for dirname in $(find share/grafx2/scripts -type d -print);
-		do
-			insinto /usr/${dirname}
-			doins ${dirname}/*.lua
-
-		done
-	fi
-
-	insinto /usr/share/${PN}/skins
-	doins share/grafx2/skins/*.{png,gif}
-	insinto /usr/share/${PN}
-	doins share/grafx2/*.{png,gif,ini}
-}