gentoo resync : 25.08.2020

3 files changed, 87 insertions, 10 deletions

diff --git a/dev-embedded/xa/Manifest b/dev-embedded/xa/Manifest
index d1c04b5ca604..5cff6c1447f8 100644
--- a/dev-embedded/xa/Manifest
+++ b/dev-embedded/xa/Manifest
@@ -1,4 +1,5 @@
+AUX xa-2.3.10-Makefile.patch 1840 BLAKE2B 1d8b4d7ed1ed97991dd611f77ff8daf6bb404e2892e271404d9b4b02e475b863e8ad3c45c79d07f5bbb9e69c19fd64f4b895a1868444729137ae97837e698b73 SHA512 b16462153b12604c6e3d8fba54e3d1fe19b5d907bed4141319d863d497582fe46fddfa15b0ab1c697ea4536e6fa3e5f86b68266a3b8da2c7d43f9577a10036e7
 AUX xa-2.3.10-fix-gcc10-fno-common.patch 203 BLAKE2B 9f503900b016956a02d2d9a1103884297e1545c624cb94c079abbc3e795ce803f35cf1c150ea233c2b78f9719ce2d15283a9ff5551c5adcbed55b6e98bf13747 SHA512 3862cad04136200447486fd6ac76298118d56a53c21f9db7aaf8f7ec248c10bd2f3ae610112a6dc5e99944da03ec52bc7cdb33879e6f1cb8fa6e9221f71472ea
 DIST xa-2.3.10.tar.gz 152433 BLAKE2B af9ab28e6596f6c96abd075779670955e7bfe79b3e9e18c5c75f35ffb166c705a0ebb60dcca1928c49a836eefcd7b15d12437579fbe645c0b5ce51e81da92d8d SHA512 08b9994e295495744d5252fa983b111f41d0447cdb32d0c065f8fbd942ffa0899476d6cfebe1162e4aa08b1d0a2d8df74c2a60987d2509b8bca45da670f4a67f
-EBUILD xa-2.3.10.ebuild 664 BLAKE2B fc1614a9f728112a4a1f902360a31f50a59db359aad8654b99cac9f6da3c068914c8cb50d85f0493d218a652fa3bbe41c27b8d5845e4c58242904b0531578963 SHA512 ef839f073e67f18395afb2970b6cfe7fa2e326484d220076136ded4d3228f9a61e03cf3fa7c395f905fe683ca00bf405393c853992363c27eb99a3ab464d2917
+EBUILD xa-2.3.10.ebuild 615 BLAKE2B 1a0286b2aeb631d56682c04d391b19c2dff7eefcbe590212f5dd0997030611e669fe20f90553a6f8cbc938b70a00626403c9386f6d00b998d1b1b31798765d7b SHA512 576da5cfb40cca0b8d4a4839bbf26bd9687a84677c9bcdf81722df7a1b7ea7a741942be9928c87b4615e2d2fe13df5662589c1aba5478abfc0f3c8df95731283
 MISC metadata.xml 547 BLAKE2B b527da76f0bb9f9ee7bb45a48f2f6ded265f296efb4babd2f74c3db9777071ebad2f733a45325115565b3e7932b9b3ec1d87129427aefe149f6871804ece5ffe SHA512 780c7e01126675e679037e97de4ddaaca26929326b5803068abbbf0a84218c02873a4db5bfa42704953a71164b62267f80227924edd3d46755a8d6238c0c94c3
diff --git a/dev-embedded/xa/files/xa-2.3.10-Makefile.patch b/dev-embedded/xa/files/xa-2.3.10-Makefile.patch
new file mode 100644
index 000000000000..cabc7b99beec
--- /dev/null
+++ b/dev-embedded/xa/files/xa-2.3.10-Makefile.patch
@@ -0,0 +1,77 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,11 +1,7 @@
+ # Unix gcc or DOS go32 cross-compiling gcc
+ #
+-CC = gcc
+-LD = gcc
+ # for testing. not to be used; build failures in misc/.
+ #CFLAGS = -O2 -W -Wall -pedantic -ansi
+-CFLAGS = -O2
+-LDFLAGS = -lc
+ 
+ # for DOS?
+ # CC = gcc-go32
+@@ -32,13 +28,13 @@
+ 	rm -f xa
+ 
+ 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})
+ 
+ dos: clean
+ 	(cd src && LD=gcc-go32 CC=gcc-go32 CFLAGS="-W -Wall -pedantic" ${MAKE})
+--- a/misc/Makefile
++++ b/misc/Makefile
+@@ -2,7 +2,6 @@
+ XCBMLIB = ..
+ 
+ # -Wall -ansi et al. cause compile problems.
+-CFLAGS =  -O2
+ 
+ LIBS = #-lncurses -ltermcap -lm
+ 
+@@ -10,19 +9,19 @@
+ all: ../mkrom.sh ../uncpk ../printcbm ../file65 ../reloc65 ../ldo65
+ 
+ ../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
+ 
+ ../mkrom.sh: mkrom.sh
+ 	cp mkrom.sh ../mkrom.sh
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -8,7 +8,7 @@
+ all: xa
+ 
+ xa: ${OBJ}
+-	${LD} -o ../xa ${OBJ} ${LDFLAGS}
++	${CC} ${CFLAGS} ${LDFLAGS} -o ../xa ${OBJ}
+ 
+ clean: 
+ 	rm -f *.o *.o65
diff --git a/dev-embedded/xa/xa-2.3.10.ebuild b/dev-embedded/xa/xa-2.3.10.ebuild
index c3803fcb811e..ea526d56aac6 100644
--- a/dev-embedded/xa/xa-2.3.10.ebuild
+++ b/dev-embedded/xa/xa-2.3.10.ebuild
@@ -13,14 +13,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.3.10-fix-gcc10-fno-common.patch )
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC) " \
-		CFLAGS="${CFLAGS} ${LDFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.10-Makefile.patch
+	"${FILESDIR}"/${PN}-2.3.10-fix-gcc10-fno-common.patch
+)
+
+src_configure() {
+	tc-export CC
 }
 
 src_test() {
@@ -28,6 +27,6 @@ src_test() {
 }
 
 src_install() {
-	emake install DESTDIR="${ED}/usr"
+	emake DESTDIR="${ED}"/usr install
 	einstalldocs
 }