gentoo resync : 29.01.2021

4 files changed, 1 insertions, 140 deletions

diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 097b2fc96a45..fa4dd90b46d7 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,6 +1,3 @@
-AUX sdl2-mixer-2.0.2-smpeg.patch 698 BLAKE2B 04f58b64a190c22636c8d0f8218e3070707d9ce75e3be7846baafcbcc36223784c367da111f481377a319562c622d27a3b67b27a32bffc515a32c4e119e65f79 SHA512 78c02a15384e98f846ff9448205da3a43c1e1e39ae9ae33c14651076d5659a83ccd840d67b1044dc19a0da66a07fb98793a78044ae0afa089a26cfbf8951db82
-DIST SDL2_mixer-2.0.2.tar.gz 9620763 BLAKE2B 9257f7f3dc3453b600075011f1879391c4a4def2c67709a883a8803f752928d3883fbe11371609cd5e690647a33b43bfd38f152aa620f63af12e1b7b72fa0ec4 SHA512 c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7
 DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491 SHA512 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
-EBUILD sdl2-mixer-2.0.2-r1.ebuild 3249 BLAKE2B ff30f57b11499173c22b57a1b7319b17d9f64e7a3b282baed32ab9865fd5a078cea091fadfc21e56c4c9a70f30e85e6236f36aee4d27312dc434bc711a5a0b25 SHA512 6d99441d992531f4e75b11b9e3021a8991ced88809ac6181fd89eb2fbb61823ddffd1b95db41dfbb993b204d433620670abd3a73cc39a1b7509eb7cf2ef07630
 EBUILD sdl2-mixer-2.0.4.ebuild 3271 BLAKE2B 24d03746b5995df9a03daf1ffc137fea289775a849af5fe6209b309d6b72b8b46c1f21eb7a74a2d647ac0e61f086e99e705fef20a7e4b1ec87380d46dee54cc9 SHA512 ee857d55b233a8af78240c6a90da53b9e4a0dd7e005cadd4bbf886f4785aa7272f1977328e408fb7dc1e8cb5c3b3286f33cbf2f6984459e85757b602e15dd4c3
-MISC metadata.xml 751 BLAKE2B 7bc41a1afbb031953f9621d7f9059fc27bb588fc813c4dc68fbc760824a0a1c301997803712b6bc96d9814439fd8274ad388d18d54c2b125b71002247253ea7e SHA512 2376560d848b86e6d3b1728f581cd43bd812b8bfa4e89eb839f2505dfd3f75cfbc3c82bd9a91e571f6021e6ce7ea39df99d964fd29d0159f241539e86d65ce4b
+MISC metadata.xml 672 BLAKE2B deb686ba387b3a1be2b2584f95c1058f5b94fc31f323b03c9e42868c4b06ebb13d40b94195e4791c7ca6ca5a36d757135cee3aeba422d24ed48d04269919010c SHA512 33a98a133bd53201fceba43b54dc44eb5ed83a3015f8d9729ffbd2a9fa400e75510a0e7b31ccd8bf21e430b7b843a6634637beba179ff724cd6b50536ecfe4ab
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch
deleted file mode 100644
index 1377feddb39c..000000000000
--- a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- SDL2_mixer-2.0.2/music_smpeg-orig.c	2017-12-06 20:47:21.691153833 -0500
-+++ SDL2_mixer-2.0.2/music_smpeg.c	2017-12-06 20:47:30.032153222 -0500
-@@ -138,7 +138,7 @@
-         SDL_free(music);
-         return NULL;
-     }
--    smpeg.SMPEG_actualSpec(mp3, &music_spec);
-+    smpeg.SMPEG_actualSpec(music->mp3, &music_spec);
- 
-     music->freesrc = freesrc;
-     return music;
---- SDL2_mixer-2.0.2/music_smpeg-orig.c	2017-12-06 21:03:44.907081811 -0500
-+++ SDL2_mixer-2.0.2/music_smpeg.c	2017-12-06 23:34:36.696418752 -0500
-@@ -174,6 +174,7 @@
-     int left = (len - smpeg.SMPEG_playAudio(music->mp3, stream, len));
-     if (left > 0) {
-         stream += (len - left);
-+    }
-     return left;
- }
- 
diff --git a/media-libs/sdl2-mixer/metadata.xml b/media-libs/sdl2-mixer/metadata.xml
index 2049a3a33969..21a39d764434 100644
--- a/media-libs/sdl2-mixer/metadata.xml
+++ b/media-libs/sdl2-mixer/metadata.xml
@@ -12,8 +12,6 @@
 		<flag name="mod">basic support for MOD files</flag>
 		<flag name="playtools">Install playwave and playmus tools (useful
 			for testing)</flag>
-		<flag name="smpeg">Use <pkg>media-libs/smpeg</pkg> for MP3 support
-		</flag>
 		<flag name="tremor">enable OGG Vorbis music via libtremor</flag>
 		<flag name="wav">support WAVE files</flag>
 	</use>
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
deleted file mode 100644
index 9c910178b0a3..000000000000
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="SDL2_mixer-${PV}"
-inherit multilib-minimal
-
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-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="amd64 ~arm x86"
-IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity tremor vorbis +wav"
-REQUIRED_USE="
-	midi? ( || ( timidity fluidsynth ) )
-	timidity? ( midi )
-	fluidsynth? ( midi )
-	mp3? ( || ( smpeg mad ) )
-	smpeg? ( mp3 )
-	mad? ( mp3 )
-	mod? ( || ( mikmod modplug ) )
-	mikmod? ( mod )
-	modplug? ( mod )
-	tremor? ( vorbis )
-"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.7[${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/smpeg2-2.0.0-r1[${MULTILIB_USEDEP}] )
-	)
-	vorbis? (
-		tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
-		!tremor? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${P}-smpeg.patch )
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--disable-sdltest
-		--enable-music-cmd
-		$(use_enable wav music-wave)
-		$(use_enable mod music-mod)
-		$(use_enable modplug music-mod-modplug)
-		--disable-music-mod-modplug-shared
-		$(use_enable mikmod music-mod-mikmod)
-		--disable-music-mod-mikmod-shared
-		$(use_enable midi music-midi)
-		$(use_enable timidity music-midi-timidity)
-		$(use_enable fluidsynth music-midi-fluidsynth)
-		--disable-music-midi-fluidsynth-shared
-		$(use_enable vorbis music-ogg)
-		$(use_enable tremor music-ogg-tremor)
-		--disable-music-ogg-shared
-		$(use_enable flac music-flac)
-		--disable-music-flac-shared
-		$(use_enable mp3 music-mp3)
-		$(use_enable smpeg music-mp3-smpeg)
-		--disable-music-mp3-smpeg-shared
-		--disable-smpegtest
-		$(use_enable mad music-mp3-mad-gpl)
-		LIBMIKMOD_CONFIG=${EPREFIX}/usr/bin/${CHOST}-libmikmod-config
-	)
-	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use playtools ; then
-		emake DESTDIR="${D}" install-bin
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# bug 412035
-	# https://bugs.gentoo.org/show_bug.cgi?id=412035
-	if use midi && use fluidsynth; then
-		ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
-		ewarn "environment variable to the location of a SoundFont file"
-		ewarn "unless the game or application happens to do this for you."
-		if use timidity; then
-			ewarn "Failing to do so will result in Timidity being used instead."
-		else
-			ewarn "Failing to do so will result in silence."
-		fi
-	fi
-}