diff --git a/media-gfx/grafx2/Manifest b/media-gfx/grafx2/Manifest
index f27ed01..3f92817 100644
--- a/media-gfx/grafx2/Manifest
+++ b/media-gfx/grafx2/Manifest
@@ -1,5 +1 @@
-DIST grafx2-2.4.2035-src.tgz 721482 SHA256 5818caea63cd3cf3318baf01dd20f81ec61e4514443000c80a41b68ab3f17a6b SHA512 f23a6b150b6b040226a34859b271fec5b4e0d8eb123b895d242ad5bcb11db2dcb5918040af62340fda30772e3d05a1e140c962e5566451993029f0111e757c57 WHIRLPOOL fa72dbd16e902d73bdfb44959be730b1b86ba69e5571ab316b0d181672a956b367bc71ae01ab6de39a8916e1f3810e66fba76693fd4478ec7eabd387a9a07350
-DIST grafx2-2.4.tar.gz 1632859 SHA256 938d53c6a1d6c2ee1edb989fbe98493ef5ba6dabf9b77a3abeac2955c27768c8 SHA512 357d3f9f6b1f2f05130686d57590f00e8327db2f6d04c8ea8e5879a2d9824f612d77123cbcb08788d6aac9effacf1aa96043000cf6b667952d738aaf69d78642 WHIRLPOOL 23d3b941e0ee20a98242fd1c0939b768806ab1174620403e9d54d605097cea37ef245969ca4a5f535afd275ebff57ffecba463d9712e2e3e65be7976b33caf12
-EBUILD grafx2-2.4.2035.ebuild 941 SHA256 0b83e615a6a24fa2dcd84d71d2dcdfadad8e535b6b62a72c21c33fce73c0f03a SHA512 068971f477e51b14314192cccde0914c88a62d5493adaf909ddc1c89e48a40718aa277e93a0e28359cd5af3f136fe511a87b5c71bb488b65d4b9efcf103471e1 WHIRLPOOL 2fe0079e967253136d42f20a49e00ed35b2a53473f99a37fe4ca0cd32dd5fde5010d1c117f962da8fc98e3bb25e085af893a8e963155ec5db9e9eb116b608762
-EBUILD grafx2-2.4.ebuild 971 SHA256 3ca7d6c3c7b8067adc637f62f40663ce5e60beec5a509cf15cdc6b49639ed8de SHA512 e3aa22cd620019580d00827a18e2ef0cd12c599b6bdcc759c16e95f8495de6c103d3f67debbb63069dcc91b044e461e01f49280e421c0f01e32ad0082e69a3d9 WHIRLPOOL 6f24f787263d6762e56fd104a4f71d7a528c9a12490770cab4972fe94df1ecc2c753237ff26332c73804a7782b5c11e69af94f5480db3fd5145cef53ecec6432
-EBUILD grafx2-9999.ebuild 1325 SHA256 eac5303c95d64967858292a634b56ddf56c30c49315d9f5815fb7533b0ed401c SHA512 6225342f88bdeacbcfc52a4979f2073f95e2f98d876d4f1e047a1619da5f02c03a7976a6f5c8e553a60782c37f70ce317f9aa46f1a79365d73f35a81c0b22a72 WHIRLPOOL f2a54c74abbdfaff61e7763beb5558cc7808bca888e6323983e584d386a8f7c0544cb2c947a51ba7dd2dcc7db7b795b0e4fb183880316d84efccbe52aa2c1ab2
+EBUILD grafx2-9999.ebuild 1285 BLAKE2B b288a131e0c3c15e03712d880671dc207c11d03d53f900f7eac89ac7ff30f8c047cf55213725726e2d02c7bbc8f40bd5b0ae8f0d3e1934d03d38262427ca7dbf SHA512 9fb325cbee4c19264682416dd5c6a67fa9adf439a9b35880dcba5793a72b958342061833d20b3fd60724b05b3bf227321b7494aacb8bad75c5297579e13a1fff
diff --git a/media-gfx/grafx2/grafx2-9999.ebuild b/media-gfx/grafx2/grafx2-9999.ebuild
index b5b99b5..5d88c80 100644
--- a/media-gfx/grafx2/grafx2-9999.ebuild
+++ b/media-gfx/grafx2/grafx2-9999.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=6
 
-inherit subversion
+inherit git-r3
 
 DESCRIPTION="Bitmap paint program inspired by Deluxe Paint and Brilliance"
 HOMEPAGE="https://code.google.com/p/grafx2/"
-ESVN_REPO_URI="svn://pulkomandy.tk/GrafX2/trunk"
+EGIT_REPO_URI="https://gitlab.com/GrafX2/grafX2.git"
 
 LICENSE="GNU GPL v2"
 SLOT="0"
@@ -24,8 +24,6 @@ DEPEND=">=media-libs/libsdl-1.2
 RDEPEND="${DEPEND}"
 
 src_compile() {
-	cd src
-	sed -i 's/-liconv//' Makefile 
 	make || die
 }