gentoo resync : 28.04.2021

3 files changed, 101 insertions, 2 deletions

diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 85d7bdeec00f..56e4e7d77a0a 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -2,7 +2,8 @@ AUX sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch 553 BLAKE2B
 AUX sdl-mixer-1.2.12-clang.patch 276 BLAKE2B 242e261861bab476d7f83148fc265daee990965cad8c3247dcf7e9e28e6b3aa9b2f491ac51c3517e3db4ab043ac8f8a118ca18c170f826f200df757de303e8db SHA512 2f318a73991783c75b32d05c9f81a42a7fd145a9d78e1cef00d1f2184f7c498e4c0a5a578bd2866315a940af76d4296de660ee94488530815694b7524d1d452e
 AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 BLAKE2B b353de5432714f3968c5f69ff4397cd3fd284f2f39102879f5cf4956603075ba79cf0753822a8cbdcf4d1196ac9839f59211e0128bf97c0a1f36f00e70cc7682 SHA512 64ad577331eceea0eb060d0c2b333b664d4edb62cb3336f97b53e5c88f6b4ecdc4004136fef0461cdf999b282064b5809e79308591239bfafbdc3df8360bf123
 AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf978a091c7786a3c5417c5efd911f80407d30c866c527400122866bcffea25ab645533ae8e972834a2085a4bd8563ef5e8607b SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704
+AUX sdl-mixer-1.2.12-parallel-build-slibtool.patch 4288 BLAKE2B 3beaeddf4e3ff97dc2778dfc79f800b3749a0b0fa511872f353587a3e01ded1cdc9c57c3a89cb3e1a6a34d6848b19aaacba5a2a81c3129906f521c2afc71e2c0 SHA512 b6e42b2ee43b57a3a4f3e8b47b96aa5d94b37f0326cbecca7128eb8b34f0ac00dded506a4d5164156ca23cf1aeaca6aa92f40ec43991fa73a97274a2262fe679
 AUX sdl-mixer-1.2.12-wav.patch 796 BLAKE2B a0b310db2b789d24fd60927d23859582a8ab1449ba0934e10abdd1361a0d92fb5925625d9c3a0885f812dde12af9931cbae06c652b51e76d18759db03cacfc2a SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491
 DIST SDL_mixer-1.2.12.tar.gz 3707781 BLAKE2B b2fa822204fdaad860ff30307120bff7badbcc042d0b891563973794f715099aa961983e0dbf7e3d936179cbc615517c268f01f4619fcdcd48f18ff66dc49bd1 SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96
-EBUILD sdl-mixer-1.2.12-r4.ebuild 3238 BLAKE2B e90817c91c696fe043183c3dcbdbc881ad57fb960f54d957dfdeedb9b35f75aad721a8c09c71deaff6abdc2fc24185bd9e3c1dde9ac1ab9cb46177f6bdf2304d SHA512 e3b7cf7a8ce8e728dd17cb93ebb384de0c313d5c2e131037ed44abacae28547fdcb68177226556cf04879d286c5c067943c6bf7067f49c1a7736b288efc39956
+EBUILD sdl-mixer-1.2.12-r4.ebuild 3436 BLAKE2B 95a2a3a0389ec656f2e36cdac75378a82cdb85863a9a1d28ac1baac8df23a65fc8c6bc284426ecd12f804521a68aabd40e7287937c7cbc1be81185fbce987b07 SHA512 05cd8c12f237c85757c08f17e43761e7a4edf035018d8af5632106c1d5b463d8e160562e2d52964f8b31af1d9b7c17ea17c97c528223fe669f05697f272d61f8
 MISC metadata.xml 663 BLAKE2B 5d86fe5c016f831f870da2f9b3d0192b6719bc6a98c0101c06c382d62e6100af314f46980ad5c246c8bea9db8ea99e9cd47afe2e5aee5b7887f5f6d529dddee2 SHA512 16a16403ac93fe964330da05038a0e904d0c6e895413994db9ef587170eaf7161f3cc2ce7fb0fe13ded675306b489837d96e837c1002f216b8ffe72d6fd49591
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-parallel-build-slibtool.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-parallel-build-slibtool.patch
new file mode 100644
index 000000000000..a9996f9b10e7
--- /dev/null
+++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-parallel-build-slibtool.patch
@@ -0,0 +1,92 @@
+https://github.com/libsdl-org/SDL_mixer/pull/311
+
+This is the SDL 1 variant of the SDL 2 patch also in Gentoo.
+See: 36d63464d341868f0ba533188238c805710f16e0 (Gentoo)
+Bug: https://bugs.gentoo.org/777420
+
+From 0b3b8a5f886648c95ce5ed0abb3d4e9e181d7ca6 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 6 Apr 2021 07:32:27 -0700
+Subject: [PATCH] build: Fix parallel make with slibtool.
+
+---
+diff --git a/Makefile.in b/Makefile.in
+index 293608d..5d27df1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -47,7 +47,7 @@ LT_RELEASE  = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+ LT_LDFLAGS  = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+-all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
++all: $(srcdir)/configure Makefile $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
+ 
+ $(srcdir)/configure: $(srcdir)/configure.ac
+ 	@echo "Warning, configure is out of date, please re-run autogen.sh"
+@@ -55,8 +55,9 @@ $(srcdir)/configure: $(srcdir)/configure.ac
+ Makefile: $(srcdir)/Makefile.in
+ 	$(SHELL) config.status $@
+ 
+-$(objects):
+-	$(SHELL) $(auxdir)/mkinstalldirs $@
++$(objects)/.created:
++	$(SHELL) $(auxdir)/mkinstalldirs $(objects)
++	touch $@
+ 
+ .PHONY: all install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist
+ 
+@@ -78,7 +79,7 @@ install-hdrs:
+ 	done
+ 	$(SHELL) $(auxdir)/mkinstalldirs $(libdir)/pkgconfig
+ 	$(INSTALL) -m 644 SDL_mixer.pc $(libdir)/pkgconfig/
+-install-lib: $(objects) $(objects)/$(TARGET)
++install-lib: $(objects)/$(TARGET)
+ 	$(SHELL) $(auxdir)/mkinstalldirs $(libdir)
+ 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET)
+ install-bin:
+--- a/configure.in
++++ b/configure.in
+@@ -626,14 +626,14 @@ OBJECTS=`echo $SOURCES`
+ DEPENDS=`echo $SOURCES`
+ OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
+ DEPENDS=`echo "$DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\
+-$(objects)/\2.lo: \1/\2.c\\
++$(objects)/\2.lo: \1/\2.c \$(objects)/.created\\
+ 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
+ 
+ OBJECTS_CXX=`echo $SOURCES_CXX`
+ DEPENDS_CXX=`echo $SOURCES_CXX`
+ OBJECTS_CXX=`echo "$OBJECTS_CXX" | sed 's,[[^ ]]*/\([[^ ]]*\)\.cpp,$(objects)/\1.lo,g'`
+ DEPENDS_CXX=`echo "$DEPENDS_CXX" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.cpp,\\
+-$(objects)/\2.lo: \1/\2.cpp\\
++$(objects)/\2.lo: \1/\2.cpp \$(objects)/.created\\
+ 	\$(LIBTOOL) --mode=compile \$(CXX) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
+ OBJECTS="$OBJECTS $OBJECTS_CXX"
+ DEPENDS="$DEPENDS $DEPENDS_CXX"
+@@ -643,7 +643,7 @@ VERSION_OBJECTS=`echo $VERSION_SOURCES`
+ VERSION_DEPENDS=`echo $VERSION_SOURCES`
+ VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
+ VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.rc,\\
+-$(objects)/\2.o: \1/\2.rc\\
++$(objects)/\2.o: \1/\2.rc \$(objects)/.created\\
+ 	\$(WINDRES) \$< \$@,g'`
+ VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed 's,\\$,\\\\$,g'`
+ 
+@@ -652,7 +652,7 @@ PLAYWAVE_OBJECTS=`echo $PLAYWAVE_SOURCES`
+ PLAYWAVE_DEPENDS=`echo $PLAYWAVE_SOURCES`
+ PLAYWAVE_OBJECTS=`echo "$PLAYWAVE_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
+ PLAYWAVE_DEPENDS=`echo "$PLAYWAVE_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\
+-$(objects)/\2.lo: \1/\2.c\\
++$(objects)/\2.lo: \1/\2.c \$(objects)/.created\\
+ 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
+ PLAYWAVE_DEPENDS=`echo "$PLAYWAVE_DEPENDS" | sed 's,\\$,\\\\$,g'`
+ 
+@@ -661,7 +661,7 @@ PLAYMUS_OBJECTS=`echo $PLAYMUS_SOURCES`
+ PLAYMUS_DEPENDS=`echo $PLAYMUS_SOURCES`
+ PLAYMUS_OBJECTS=`echo "$PLAYMUS_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
+ PLAYMUS_DEPENDS=`echo "$PLAYMUS_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\
+-$(objects)/\2.lo: \1/\2.c\\
++$(objects)/\2.lo: \1/\2.c \$(objects)/.created\\
+ 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
+ PLAYMUS_DEPENDS=`echo "$PLAYMUS_DEPENDS" | sed 's,\\$,\\\\$,g'`
+ 
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index 7757eec87498..a5a0b15fce59 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 MY_P=${P/sdl-/SDL_}
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Simple Direct Media Layer Mixer Library"
 HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
@@ -56,11 +56,17 @@ PATCHES=(
 	"${FILESDIR}"/${P}-clang.patch
 	"${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch
 	"${FILESDIR}"/${P}-mikmod-r58{7,8}.patch # bug 445980
+	"${FILESDIR}"/${P}-parallel-build-slibtool.patch
 )
 
 src_prepare() {
 	default
 	sed -e '/link.*play/s/-o/$(LDFLAGS) -o/' -i Makefile.in || die
+
+	# Hack to get eautoconf working
+	# eautoreconf dies with gettext mismatch errors for now
+	cat acinclude/* >aclocal.m4 || die
+	eautoconf
 }
 
 multilib_src_configure() {