gentoo resync : 25.08.2020

4 files changed, 131 insertions, 9 deletions

diff --git a/media-sound/sexypsf/Manifest b/media-sound/sexypsf/Manifest
index b16a0b386f25..d449154c3999 100644
--- a/media-sound/sexypsf/Manifest
+++ b/media-sound/sexypsf/Manifest
@@ -1,3 +1,5 @@
+AUX sexypsf-0.4.8-Makefile.patch 198 BLAKE2B 9d3e07c15356465aef9810d2bd4bb3a8212b3aeaf829e64c02f26293a4c4f2eb042bd0c517836806cdfca28377c0516c2af38406d73532ea0157a91f38165596 SHA512 0e4b1db579bda33833912e05d2ac2705994dfaeb1949f8dee40fc86e0e23b66d257cff5507b6a866d052ebe6eb8ae7793fd3c81b5bb77cbfd8545edd46ccdbcf
+AUX sexypsf-0.4.8-fno-common.patch 1862 BLAKE2B 26dcce198f5df33118c0ab8b8ffc39696aafc8a20aec4a7461d1305f6e932c372672ecc905578ae4484df214ac8ad9d0f5c772eb32750ce5e7acfbd53a67939a SHA512 d06fefab54f643748dd50d50f0880d0236798210bb41e600ef90d05e7680d1391641836228a9b11d0d8d1200514aa82b075691de5da82d006434bbeef23113b7
 DIST sexypsf-0.4.8.tar.bz2 82954 BLAKE2B ce710cfe20372f81e5c4f18857b46e7eef1837b87469bdf999dd677f617802da0f7cb0ff9ff1a0ee78f6424b179b33cc111ba98619dde4a03b178c63397749a4 SHA512 bb95cdb40cf7172fdf815d6a2083adc4f684973534625d76c4fdb04752888acecfdd5ba329f9e2eed64311f30eb4400c8913ace13e4fa371c89c774905dc35d0
-EBUILD sexypsf-0.4.8.ebuild 503 BLAKE2B af80d45dc051c55562414f5c956a7e34f4246bc49ea5d2e2a1de01a9b11cdb4f5527a0fb9365e8b8d783d91956b902177350e33c1435c29cec18fc987aa0cbfd SHA512 2fe3a6dfec41d33f5148a05e87e811479065e2ad41e92fd5df61a22f204a8cf20bdcb96bbb352dbe7d4b858651cd5cc2e04bbc175cd15304f02a6988236e6741
+EBUILD sexypsf-0.4.8.ebuild 630 BLAKE2B cb885bf57fd74d97439b112577ed8909ef3565413361195343962716b9cb406e197bf01657d7886fe193053057f0277e7089602fd1472b28de756c910837d38e SHA512 7948fbe01ddbed97267eda57fdf7d6ce0711c336a0a0411a4be0b234074e7cce18a1d4e00c7fb12fd7c15fe86c104a6785118fffc2925ebb68880d0311c9aa6f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/sexypsf/files/sexypsf-0.4.8-Makefile.patch b/media-sound/sexypsf/files/sexypsf-0.4.8-Makefile.patch
new file mode 100644
index 000000000000..348c392f3574
--- /dev/null
+++ b/media-sound/sexypsf/files/sexypsf-0.4.8-Makefile.patch
@@ -0,0 +1,12 @@
+--- a/Linux/Makefile
++++ b/Linux/Makefile
+@@ -28,9 +28,3 @@
+ 
+ clean:
+ 	${RM} *.o ../*.o ../spu/*.o sexypsf
+-
+-../%.o: ../%.c
+-	${CC} ${CFLAGS} -c -o $@ $<
+-
+-%.o: %.c
+-	${CC} ${CFLAGS} -c -o $@ $<
diff --git a/media-sound/sexypsf/files/sexypsf-0.4.8-fno-common.patch b/media-sound/sexypsf/files/sexypsf-0.4.8-fno-common.patch
new file mode 100644
index 000000000000..fd0d96525b33
--- /dev/null
+++ b/media-sound/sexypsf/files/sexypsf-0.4.8-fno-common.patch
@@ -0,0 +1,102 @@
+--- a/PsxCounters.c
++++ b/PsxCounters.c
+@@ -20,6 +20,9 @@
+ 
+ #include "PsxCommon.h"
+ 
++psxCounter psxCounters[5];
++u32 psxNextCounter, psxNextsCounter;
++
+ static int cnts = 4;
+ static u32 last=0;
+ 
+--- a/PsxCounters.h
++++ b/PsxCounters.h
+@@ -24,9 +24,9 @@
+ 	u32 sCycle, Cycle, rate, interrupt;
+ } psxCounter;
+ 
+-psxCounter psxCounters[5];
++extern psxCounter psxCounters[5];
+ 
+-u32 psxNextCounter, psxNextsCounter;
++extern u32 psxNextCounter, psxNextsCounter;
+ 
+ void psxRcntInit();
+ void psxRcntUpdate();
+--- a/PsxMem.c
++++ b/PsxMem.c
+@@ -21,6 +21,12 @@
+ 
+ #include "PsxCommon.h"
+ 
++s8 *psxM;
++s8 *psxP;
++s8 *psxR;
++s8 *psxH;
++char **psxMemLUT;
++
+ void LoadPSXMem(u32 address, s32 length, char *data)
+ {
+  //printf("%08x %08x\n",address,length);
+--- a/PsxMem.h
++++ b/PsxMem.h
+@@ -41,21 +41,21 @@
+ }
+ #endif
+ 
+-s8 *psxM;
++extern s8 *psxM;
+ #define psxMu32(mem)	(*(u32*)&psxM[(mem) & 0x1fffff])
+ 
+-s8 *psxP;
+-s8 *psxR;
++extern s8 *psxP;
++extern s8 *psxR;
+ #define psxRu32(mem)	(*(u32*)&psxR[(mem) & 0x7ffff])
+ 
+-s8 *psxH;
++extern s8 *psxH;
+ 
+ #define psxHu8(mem)	(*(u8*) &psxH[(mem) & 0xffff])
+ 
+ #define psxHu16(mem)   	(*(u16*)&psxH[(mem) & 0xffff])
+ #define psxHu32(mem)   	(*(u32*)&psxH[(mem) & 0xffff])
+ 
+-char **psxMemLUT;
++extern char **psxMemLUT;
+ 
+ #define PSXM(mem)		(psxMemLUT[(mem) >> 16] == 0 ? NULL : (void*)(psxMemLUT[(mem) >> 16] + ((mem) & 0xffff)))
+ 
+--- a/R3000A.c
++++ b/R3000A.c
+@@ -22,6 +22,9 @@
+ 
+ #include "PsxCommon.h"
+ 
++R3000Acpu *psxCpu;
++psxRegisters psxRegs;
++
+ int psxInit() {
+ 
+ 	psxCpu = &psxInt;
+--- a/R3000A.h
++++ b/R3000A.h
+@@ -32,7 +32,7 @@
+ 	void (*Shutdown)();
+ } R3000Acpu;
+ 
+-R3000Acpu *psxCpu;
++extern R3000Acpu *psxCpu;
+ extern R3000Acpu psxInt;
+ 
+ typedef union {
+@@ -68,7 +68,7 @@
+ 	u32 interrupt;
+ } psxRegisters;
+ 
+-psxRegisters psxRegs;
++extern psxRegisters psxRegs;
+ 
+ #define _i32(x) (s32)x
+ #define _u32(x) (u32)x
diff --git a/media-sound/sexypsf/sexypsf-0.4.8.ebuild b/media-sound/sexypsf/sexypsf-0.4.8.ebuild
index 427a0518e2ca..7f7bf7f7e776 100644
--- a/media-sound/sexypsf/sexypsf-0.4.8.ebuild
+++ b/media-sound/sexypsf/sexypsf-0.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,19 +11,25 @@ SRC_URI="http://projects.raphnet.net/sexypsf/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-DEPEND="sys-libs/zlib"
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
 
-src_compile() {
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.8-Makefile.patch
+	"${FILESDIR}"/${PN}-0.4.8-fno-common.patch
+)
+
+src_configure() {
 	tc-export CC
-	cd Linux || die
-	emake
+}
+
+src_compile() {
+	emake -C Linux
 }
 
 src_install() {
 	dobin Linux/sexypsf
-	dodoc Docs/*
+	dodoc -r Docs/.
 }