gentoo resync : 03.03.2021

2 files changed, 48 insertions, 41 deletions

diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 0b6c7332c17c..85d7bdeec00f 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -4,5 +4,5 @@ AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 BLAKE2B b353de5432714f3968c5f69ff439
 AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf978a091c7786a3c5417c5efd911f80407d30c866c527400122866bcffea25ab645533ae8e972834a2085a4bd8563ef5e8607b SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704
 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 3208 BLAKE2B f950b8364eb337806b9abe4e408ef4a506b19f909c170d3d9598851172aa0723db740ad14826b6adc3cf762ba47c4c059c0176057235b20b1221d1c76437c1eb SHA512 42fdb78570cfaf776a3cbc16c5dcf12928a80c829e45972f961cdc411d6598b578a289efb6861f8c6dc5218b2079843e4249c9226d657762373c381ef5533350
+EBUILD sdl-mixer-1.2.12-r4.ebuild 3238 BLAKE2B e90817c91c696fe043183c3dcbdbc881ad57fb960f54d957dfdeedb9b35f75aad721a8c09c71deaff6abdc2fc24185bd9e3c1dde9ac1ab9cb46177f6bdf2304d SHA512 e3b7cf7a8ce8e728dd17cb93ebb384de0c313d5c2e131037ed44abacae28547fdcb68177226556cf04879d286c5c067943c6bf7067f49c1a7736b288efc39956
 MISC metadata.xml 663 BLAKE2B 5d86fe5c016f831f870da2f9b3d0192b6719bc6a98c0101c06c382d62e6100af314f46980ad5c246c8bea9db8ea99e9cd47afe2e5aee5b7887f5f6d529dddee2 SHA512 16a16403ac93fe964330da05038a0e904d0c6e895413994db9ef587170eaf7161f3cc2ce7fb0fe13ded675306b489837d96e837c1002f216b8ffe72d6fd49591
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 d9efb2a003f1..7757eec87498 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
@@ -1,18 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils ltprune multilib-minimal
+EAPI=7
 
 MY_P=${P/sdl-/SDL_}
+inherit multilib-minimal
+
 DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
-SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
+SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
+
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
 	timidity? ( midi )
@@ -23,60 +25,65 @@ REQUIRED_USE="
 	mod? ( || ( mikmod modplug ) )
 	mikmod? ( mod )
 	modplug? ( mod )
-	"
+"
 
-RDEPEND=">=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
 	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
 	midi? (
 		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
 		timidity? ( media-sound/timidity++ )
 	)
+	mod? (
+		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
+		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	)
 	mp3? (
 		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
 		smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )
 	)
-	mod? (
-		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
-	)
 	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
 		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)"
-DEPEND=${RDEPEND}
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}"/${P}-wav.patch
+	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch
+	"${FILESDIR}"/${P}-mikmod-r58{7,8}.patch # bug 445980
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-wav.patch \
-		"${FILESDIR}"/${P}-clang.patch \
-		"${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch \
-		"${FILESDIR}"/${P}-mikmod-r58{7,8}.patch #445980
-	sed -i \
-		-e '/link.*play/s/-o/$(LDFLAGS) -o/' \
-		Makefile.in || die
+	default
+	sed -e '/link.*play/s/-o/$(LDFLAGS) -o/' -i Makefile.in || die
 }
 
 multilib_src_configure() {
+	local myeconfargs=(
+		--disable-music-flac-shared
+		--disable-music-fluidsynth-shared
+		--disable-music-mod-shared
+		--disable-music-mp3-shared
+		--disable-music-ogg-shared
+		$(use_enable wav music-wave)
+		$(use_enable vorbis music-ogg)
+		$(use_enable mikmod music-mod)
+		$(use_enable modplug music-mod-modplug)
+		$(use_enable flac music-flac)
+		$(use_enable static-libs static)
+		$(use_enable smpeg music-mp3)
+		$(use_enable mad music-mp3-mad-gpl)
+		$(use_enable timidity music-timidity-midi)
+		$(use_enable fluidsynth music-fluidsynth-midi)
+		LIBMIKMOD_CONFIG="${EPREFIX}"/usr/bin/${CHOST}-libmikmod-config
+	)
 	ECONF_SOURCE=${S} \
-	econf \
-		--disable-music-flac-shared \
-		--disable-music-fluidsynth-shared \
-		--disable-music-mod-shared \
-		--disable-music-mp3-shared \
-		--disable-music-ogg-shared \
-		$(use_enable wav music-wave) \
-		$(use_enable vorbis music-ogg) \
-		$(use_enable mikmod music-mod) \
-		$(use_enable modplug music-mod-modplug) \
-		$(use_enable flac music-flac) \
-		$(use_enable static-libs static) \
-		$(use_enable smpeg music-mp3) \
-		$(use_enable mad music-mp3-mad-gpl) \
-		$(use_enable timidity music-timidity-midi) \
-		$(use_enable fluidsynth music-fluidsynth-midi) \
-		LIBMIKMOD_CONFIG=${EPREFIX}/usr/bin/${CHOST}-libmikmod-config
+		econf "${myeconfargs[@]}"
 }
 
 multilib_src_install() {
@@ -88,7 +95,7 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	dodoc CHANGES README
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {