4 files changed, 30 insertions, 62 deletions
diff --git a/dev-embedded/xa/Manifest b/dev-embedded/xa/Manifest
index 483ed5ecd16b..e9fd114f1bad 100644
--- a/dev-embedded/xa/Manifest
+++ b/dev-embedded/xa/Manifest
@@ -1 +1 @@
-DIST xa-2.3.14.tar.gz 156876 BLAKE2B 3dd4f369d69cd85c7c545e4aba7698deb9402946c755ac2709c43cb4a795d1cde730286a4a0df2615c39367443788cd4314bf526def863fa57bc85d36ca2dc60 SHA512 71d4631cb3e698b6522ca76c4b34078ded0632533bdaaa8b8d584eb27f0958ed288a6765136ff0ad03cd861a2dccbb76c6d8db0abf277a61ae864ad23212653d
+DIST xa-2.4.0.tar.gz 197862 BLAKE2B 27f8b41dafee9c1c4158681d57f971297a0a63e09df164469f665528cffae0cdd78441c0a939d742463e851f32a73ee30a95f2b2b41e2fe42137041a03041255 SHA512 eebaf67715324735203405016df7311bf2ed568ab0e609c0fec7d9d803c173cde5dea161b7f713cb5215454d1ce69acbde43372016dfe9866ed99acecb9aafb1
diff --git a/dev-embedded/xa/files/xa-2.3.14-make.patch b/dev-embedded/xa/files/xa-2.3.14-make.patch
deleted file mode 100644
index b62c1cc05261..000000000000
--- a/dev-embedded/xa/files/xa-2.3.14-make.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://bugs.gentoo.org/722600
---- a/Makefile
-+++ b/Makefile
-@@ -2,4 +2,2 @@
- #
--CC = gcc
--LD = gcc
- # for testing. not to be used; build failures in misc/.
-@@ -7,4 +5,2 @@
- #CFLAGS = -O2 -g
--CFLAGS = -O2 
--LDFLAGS = -lc
- 
-@@ -37,9 +33,9 @@
- xa:
--	(cd src && LD=${LD} CC="${CC} ${CFLAGS}" ${MAKE})
-+	(cd src && ${MAKE})
- 
- load:	
--	(cd loader && CC="${CC} ${CFLAGS}" ${MAKE})
-+	(cd loader && ${MAKE})
- 
- uncpk:
--	(cd misc && CC="${CC} ${CFLAGS}" ${MAKE})
-+	(cd misc && ${MAKE})
- 
---- a/misc/Makefile
-+++ b/misc/Makefile
-@@ -4,3 +4,2 @@
- # -Wall -ansi et al. cause compile problems.
--CFLAGS =  -O2
- 
-@@ -12,15 +11,15 @@
- ../uncpk: uncpk.c
--	${CC} ${CFLAGS} uncpk.c -o $(XCBMLIB)/uncpk
-+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} uncpk.c -o $(XCBMLIB)/uncpk
- 
- ../printcbm: printcbm.c
--	${CC} ${CFLAGS} printcbm.c -o $(XCBMLIB)/printcbm
-+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} printcbm.c -o $(XCBMLIB)/printcbm
- 
- ../file65: file65.c
--	${CC} ${CFLAGS} file65.c -o $(XCBMLIB)/file65
-+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} file65.c -o $(XCBMLIB)/file65
- 
- ../ldo65: ldo65.c
--	${CC} ${CFLAGS} ldo65.c -o $(XCBMLIB)/ldo65
-+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ldo65.c -o $(XCBMLIB)/ldo65
- 
- ../reloc65: reloc65.c
--	${CC} ${CFLAGS} reloc65.c -o $(XCBMLIB)/reloc65
-+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} reloc65.c -o $(XCBMLIB)/reloc65
- 
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -10,3 +10,3 @@
- xa: ${OBJ}
--	${LD} -o ../xa ${OBJ} ${LDFLAGS}
-+	${CC} ${LDFLAGS} -o ../xa ${OBJ}
- 
diff --git a/dev-embedded/xa/files/xa-2.4.0-make.patch b/dev-embedded/xa/files/xa-2.4.0-make.patch
new file mode 100644
index 000000000000..a71ceef23bd7
--- /dev/null
+++ b/dev-embedded/xa/files/xa-2.4.0-make.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/722600
+--- a/Makefile
++++ b/Makefile
+@@ -4,2 +3,0 @@
+-CC = gcc
+-LD = gcc
+@@ -9,2 +6,0 @@
+-CFLAGS = -O2 
+-LDFLAGS = -lc
+@@ -33 +29 @@
+-all: killxa xa uncpk
++all: xa uncpk
+@@ -39 +35 @@
+-	(cd src && LD=${LD} CC="${CC} ${CFLAGS}" ${MAKE})
++	(cd src && ${MAKE})
+@@ -45 +41 @@
+-	(cd misc && CC="${CC} ${CFLAGS}" ${MAKE})
++	(cd misc && ${MAKE})
+--- a/misc/Makefile
++++ b/misc/Makefile
+@@ -5 +5 @@
+-CFLAGS =  -O2 -g
++CFLAGS := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -12 +12 @@
+-	${LD} -o ../xa ${OBJ} ${LDFLAGS}
++	${CC} ${LDFLAGS} -o ../xa ${OBJ}
diff --git a/dev-embedded/xa/xa-2.3.14.ebuild b/dev-embedded/xa/xa-2.4.0.ebuild
index 02cdaec6c406..df008580717d 100644
--- a/dev-embedded/xa/xa-2.3.14.ebuild
+++ b/dev-embedded/xa/xa-2.4.0.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.14-make.patch
+	"${FILESDIR}"/${PN}-2.4.0-make.patch
 )
 
 src_configure() {