gentoo resync : 28.04.2021

4 files changed, 85 insertions, 4 deletions

diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index d649e5a68143..477c27a529a4 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -6,8 +6,9 @@ AUX libsdl-1.2.15-gamma.patch 1339 BLAKE2B 83e0d10fc4396ce992c8f59043e2380921a44
 AUX libsdl-1.2.15-joystick.patch 315 BLAKE2B e1adc864e4d660ef21ce2401f29c61c380be6503a62aa6baf82976511c53196ace378c9a259fd2196e8e3b47928a344943ec1704acfe58404bceac2591d8f077 SHA512 653e7d2e2dbc4c945e4e4e43dc53f569164c8bbb1e4e9d9c2421cd7da13849d04439ef9cbcf6736c6e5d2aa695a1b24d314045eb3f817dcb1b6f2e93fbfb2e1a
 AUX libsdl-1.2.15-resizing.patch 2098 BLAKE2B 6f8e7832262384b1c710f8353b0b0654b0a951a83e198ef7c8781a5d6ad20c806677f99da93f14e2731b3330662ac4506d687c594116651a148c2833d803dc0b SHA512 afa82d81e03fe974b2c1a4f3c9ed48a15472784548c8e88f988bb03ea992e8ce86bbad74f7e5980dd1476139cf82180eda72e77041e065925cb373cda47c268b
 AUX libsdl-1.2.15-sdl-config.patch 784 BLAKE2B d54d98ad6ddbea163fd4a0ce9d65ac77d832d68d611c1cd4fb20fa70b5bee641204a4ff7b51eff47f6a4e94193d1cad2f82bdb64a4d73582c932a3661870e3cb SHA512 95af8c3dac4fdea5bad92c044a311efaae02a46e1c5bfa84dadee7b3fab6b48f4dcf12ca6e581429decb479de21ec6167c59b215fb3a398fb82151aa4c3fb432
+AUX libsdl-1.2.15-slibtool.patch 2288 BLAKE2B 5018f714eb40320eb0d310de1553638d66c81a70e7ab7366cedc38d11641f7ab68699d5fa2ea466a2e99c5cd778bb949114a5c5a4190e37f8fc86060962a8bf4 SHA512 e020a8d9a4fe2e74884b0aa8e69778dbbf2b60c70181767f84404038a07ca55956794b19ad8d3a4e5211bf6ecf05ec65712a588076fe9467442f21b99baca4fe
 DIST SDL-1.2.15.tar.gz 3920622 BLAKE2B ecd4b82d7de6e4ca0de1317ad34bcd957a5a0d319e94c5b705f8b30aa53136ac08c88a6dcd90ad0ac84e607ba9483c2366921c4b25c8c53973cee62cfe97d204 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc
 DIST SDL-1.2.15_p20210224.tar.gz 3991106 BLAKE2B be0906950c80cddf15bc458f7734a3ebfa767b11e2f54bf9f771155f4420947900b95bbbebf01341d9dba4c1c7cfe9d54e43150e5f7781622b99668b3362adeb SHA512 3521fe996cf8a8ebb9beaa4802ac05cf5f3a2e7ed1c9b362a818d965b26ec8b3bbebfaac7c827feae44becf5bdd764378cb4282d129285f23a982b5c7474e006
-EBUILD libsdl-1.2.15-r9.ebuild 4080 BLAKE2B 3ce3e61ef81dadff7ce55cff055ace796e6697d87f2d62131fe2162d2146ff8a1a964fa79021d19db9171bd9bb19479e0208510c7d79d5f2eb4bd7a99d3142e3 SHA512 193e9823cbf1b3bcf89604b1983752408b90629490b2f68ba91d1bf433893bd5562550b627c83234927c9f17709951b230070078d319ab6f675e6f90d41b9c55
-EBUILD libsdl-1.2.15_p20210224.ebuild 4083 BLAKE2B a755125b25c7154906e96353ff7e6bac28a7a08eabb2f6c2bc77c875ee405ae7ad94a61a4ebdc83992f52da206f01dc23e546974035031d8f25d4d90fff1478c SHA512 1a4bb4c170604ad5fecde71bc2d4286ddb51c96cf97960b0b7bc5171d2e56c89df120f70180fe4f1eb86932b8a8f3ef1d93bac980860981cf2f51210b5b232a2
+EBUILD libsdl-1.2.15-r9.ebuild 4081 BLAKE2B 258b06714d6ee5783241833823da37a9a8785e96702c1de4b87c1ee7898b95137317f38784e7fd025b78462d7351ebcd25d0be122af7aff5586b9c279c5b497c SHA512 0a910fd44c84082b74b67037d6703765d50ff9d6fc36c9d5e3e3640b6b4099fcdf2d2ce9022d64fe213fb6c94af78d3871486598f1c335863928862ae2804750
+EBUILD libsdl-1.2.15_p20210224.ebuild 4956 BLAKE2B dc6c957471496eed2dbc8a60c2953d2871b3a5da8d650880d5c5bd84cf10daee89893c60b0a8f87da159057a48153a63dbe7bd4fa683b9b2fbed4338526772be SHA512 29ad2d8f6a9102a986f4a01be57065ba4709c8e09ec33df905e1db5995d7e781751cf6d6bf20b167f083b8c49fbedea7f15a91304817715f2a5122608d528e1b
 MISC metadata.xml 1415 BLAKE2B e1f07f85768757045a516c548dfb8c9a014e0291ca13d32b3e6164d38de389d718dc5d7e9dc4f98bc67cc16d043f92cafc2819fd02d18d72b17472500a8245dc SHA512 52c647d06adee1c595d45caf05e1781c692d700726c9c0ce182ce74796f2480fada765a2772d1679589dd7919d30edfcf5a0668e525cd8e30f78455c525d5446
diff --git a/media-libs/libsdl/files/libsdl-1.2.15-slibtool.patch b/media-libs/libsdl/files/libsdl-1.2.15-slibtool.patch
new file mode 100644
index 000000000000..3066e9fc8b03
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.15-slibtool.patch
@@ -0,0 +1,56 @@
+https://bugs.gentoo.org/779445
+
+commit ed1030d9b6a98e06aa293d18c49da18169918b8b
+Author: orbea <orbea@riseup.net>
+Date:   Tue Mar 30 18:57:37 2021 -0700
+
+    Fix the build with parallel make and slibtool.
+    
+    There is no dependency on the $(OBJECTS) files on the 'build'
+    directory which causes slibtool to fail when the directory
+    does not yet exist. GNU libtool avoids this by being slower
+    than mkdir(1).
+
+diff --git a/Makefile.in b/Makefile.in
+index ab51035..90940d4 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -51,7 +51,7 @@ LT_RELEASE  = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+ LT_LDFLAGS  = -no-undefined -rpath $(DESTDIR)$(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+-all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
++all: $(srcdir)/configure Makefile $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
+ 
+ $(srcdir)/configure: $(srcdir)/configure.in
+ 	@echo "Warning, configure.in is out of date"
+@@ -61,8 +61,9 @@ $(srcdir)/configure: $(srcdir)/configure.in
+ Makefile: $(srcdir)/Makefile.in
+ 	$(SHELL) config.status $@
+ 
+-$(objects):
+-	$(SHELL) $(auxdir)/mkinstalldirs $@
++$(objects)/.created:
++	$(SHELL) $(auxdir)/mkinstalldirs $(objects)
++	touch $@
+ 
+ .PHONY: all depend install install-bin install-hdrs install-lib install-data install-man uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man clean distclean dist
+ depend:
+@@ -71,6 +72,8 @@ depend:
+ 
+ include $(depend)
+ 
++$(OBJECTS) $(SDLMAIN_OBJECTS): $(objects)/.created
++
+ $(objects)/$(TARGET): $(OBJECTS)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+@@ -88,7 +91,7 @@ install-hdrs:
+ 	    $(INSTALL) -m 644 $(srcdir)/include/$$file $(DESTDIR)$(includedir)/SDL/$$file; \
+ 	done
+ 	$(INSTALL) -m 644 include/SDL_config.h $(DESTDIR)$(includedir)/SDL/SDL_config.h
+-install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
++install-lib: $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
+ 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
+ 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
+ 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
index e5706ac4f8db..f4b6d7b5d092 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools flag-o-matic ltprune multilib toolchain-funcs eutils multilib-minimal
+
+inherit autotools flag-o-matic ltprune multilib toolchain-funcs epatch multilib-minimal
 
 DESCRIPTION="Simple Direct Media Layer"
 HOMEPAGE="https://libsdl.org/"
diff --git a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
index 5e79c923cb07..65181ee97dc5 100644
--- a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
@@ -65,6 +65,7 @@ pkg_setup() {
 PATCHES=(
 	"${FILESDIR}"/${PN}-$(ver_cut 1-3)-sdl-config.patch
 	"${FILESDIR}"/${PN}-$(ver_cut 1-3)-gamma.patch
+	"${FILESDIR}"/${PN}-$(ver_cut 1-3)-slibtool.patch
 )
 
 DOCS=( BUGS CREDITS README-SDL.txt TODO WhatsNew )
@@ -73,11 +74,34 @@ HTML_DOCS=( {docs,VisualC}.html docs/{html,images,index.html} )
 
 src_prepare() {
 	default
+
+	if $(tc-is-gcc) && [[ ${CHOST} == *-darwin* ]] ; then
+		# GCC at least has no idea what -fpascal-strings is
+		sed -i -e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"/d' configure.ac || die
+		# We have trouble building against Frameworks with GCC for now (no Blocks support, etc)
+		# error: unknown type name ‘CGImageSourceAnimationBlock’
+		sed -i \
+			-e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_CARBON"/d' \
+			-e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_OSX"/d' \
+			configure.ac || die
+	fi
+
 	AT_M4DIR="${EPREFIX}/usr/share/aclocal acinclude" eautoreconf
 }
 
 multilib_src_configure() {
 	local myconf=
+
+	if $(tc-is-gcc) && [[ ${CHOST} == *-darwin* ]] ; then
+		# We can't build against Cocoa because we lack Blocks + Objective C++ support in
+		# GCC (for now)
+		use video && myconf="${myconf} --disable-video-cocoa"
+		# CD support drags in audio
+		myconf="${myconf} --disable-cdrom"
+	else
+		myconf="${myconf} --enable-cdrom"
+	fi
+
 	if use !x86 && use !x86-linux ; then
 		myconf="${myconf} --disable-nasm"
 	else
@@ -95,7 +119,6 @@ multilib_src_configure() {
 		--disable-arts \
 		--disable-esd \
 		--enable-events \
-		--enable-cdrom \
 		--enable-threads \
 		--enable-timers \
 		--enable-file \