gentoo resync : 21.09.2018

4 files changed, 2 insertions, 163 deletions

diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 0a849c566678..65e3e0d5dee1 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,7 +1,4 @@
-AUX sdl2-mixer-2.0.1-mp3.patch 1169 BLAKE2B d6d4a30fe303adb71de29e297ea8ea2f250b3eaf3cb8285566ec061fcc2d2a737a461aac1df21cb870ab57f5cf43eaf65bac2148724bddc55449e0b5ba7229a2 SHA512 1c649be61ece8715b2a426a041fa548a8cf0d34cf75d3a0e0b37cec40b71637de954b12f0dcadf3cf632fa2897a2b91223ddca89dd863fadecc8ed055546933e
 AUX sdl2-mixer-2.0.2-smpeg.patch 698 BLAKE2B 04f58b64a190c22636c8d0f8218e3070707d9ce75e3be7846baafcbcc36223784c367da111f481377a319562c622d27a3b67b27a32bffc515a32c4e119e65f79 SHA512 78c02a15384e98f846ff9448205da3a43c1e1e39ae9ae33c14651076d5659a83ccd840d67b1044dc19a0da66a07fb98793a78044ae0afa089a26cfbf8951db82
-DIST SDL2_mixer-2.0.1.tar.gz 10213891 BLAKE2B 3f6889e7cf8e4e159bdf18f1e4e9543ffc9160d325c8011fa3b4e7e1903b2b8aa013ef180847c878fe71a8639a069af440c41ae165aeb67d5259338795347a30 SHA512 bdf2b4fc302f9c3b41d40bfdd5132081439e6021e915f191e478235b7b6565e7b4c43e1172d2055066ad505e2bc70876123c58f5a67218b207c829ee66a84b9d
 DIST SDL2_mixer-2.0.2.tar.gz 9620763 BLAKE2B 9257f7f3dc3453b600075011f1879391c4a4def2c67709a883a8803f752928d3883fbe11371609cd5e690647a33b43bfd38f152aa620f63af12e1b7b72fa0ec4 SHA512 c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7
-EBUILD sdl2-mixer-2.0.1.ebuild 3516 BLAKE2B c70450723d7ad51c24d386a1dd449ec8d3831a59b9c463c6dc57c284c4ace645b85fffc047270e2c4dc74f668206f10a1ab1f8601abf0317138294f0a03c60a4 SHA512 3a2b2b35717f83e4ee71b3c7c204529e3a76f37d39bc5413b5a852d9497cf619dec2b7be90405ef0200dedcb45f6bf95fe6b465aa42ba583f667e25feeec3cbd
-EBUILD sdl2-mixer-2.0.2-r1.ebuild 3259 BLAKE2B 08d851567897ddb597fd461f986f2fd5ef8258fad4827509962a4e583517e7069164c3fae0e4764bc306bb5e66a9d48e38a068f27f3259806affbb99044a74e1 SHA512 05944b81d37837b18ef9b166948ee970ff243e60ca7028d1a93bd42fa262fb5aaa8dc2c0f8afc2c6e1a8c9ce6a8d69e43d8bb9870ec12ae1171bea353646d359
+EBUILD sdl2-mixer-2.0.2-r1.ebuild 3258 BLAKE2B d5962eba570d4b2a42589d498118977cbfdb7baf83c1422c3614920612a7cc6fdb5c3d0623fc74c9a24b5120beffd3ee2409cf8b19380cee0f13c54f879f3fe4 SHA512 5de83350d6b84e8b2cc6db63a786a9495b6d5b4b864634916b69c18ecbb0c2b46dfd14d881a14755c4483f3b1eae5f0b15f5e2a420a7b4cef69d8f6115c4124a
 MISC metadata.xml 751 BLAKE2B 7bc41a1afbb031953f9621d7f9059fc27bb588fc813c4dc68fbc760824a0a1c301997803712b6bc96d9814439fd8274ad388d18d54c2b125b71002247253ea7e SHA512 2376560d848b86e6d3b1728f581cd43bd812b8bfa4e89eb839f2505dfd3f75cfbc3c82bd9a91e571f6021e6ce7ea39df99d964fd29d0159f241539e86d65ce4b
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch
deleted file mode 100644
index 6d617e046cb1..000000000000
--- a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-
-diff -r f095b3477c8e -r 6afe73e1e74b configure.in
---- a/configure.in	Sun Jan 03 09:25:52 2016 -0800
-+++ b/configure.in	Mon Jan 04 21:40:14 2016 -0800
-@@ -609,7 +609,6 @@
-                 smpeg_lib=[`find_lib "libsmpeg2*.so.*"`]
-                 ;;
-         esac
--        SOURCES="$SOURCES $srcdir/*_mp3.c"
-         EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MUSIC $SMPEG_CFLAGS"
-         if test x$enable_music_mp3_smpeg_shared = xyes && test x$smpeg_lib != x; then
-             echo "-- dynamic libsmpeg -> $smpeg_lib"
-@@ -637,11 +636,6 @@
-     AC_MSG_RESULT($have_libmad)
-     if test x$have_libmad = xyes; then
-         SOURCES="$SOURCES $srcdir/music_mad.c"
--        if echo "$SOURCES" | grep "load_mp3.c" >/dev/null; then
--            :
--        else
--            SOURCES="$SOURCES $srcdir/load_mp3.c"
--        fi
-         EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MAD_MUSIC"
-         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmad"
-     else
-@@ -649,7 +643,9 @@
-     fi
- fi
- 
--if test x$have_smpeg != xyes -a x$have_libmad != xyes; then
-+if test x$have_smpeg = xyes -o x$have_libmad = xyes; then
-+	SOURCES="$SOURCES $srcdir/*_mp3.c"
-+else
-     AC_MSG_WARN([MP3 support disabled])
- fi
- 
-
-
-
-
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
deleted file mode 100644
index 8fbeeb1f303a..000000000000
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib-minimal
-
-MY_P=SDL2_mixer-${PV}
-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"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~hppa 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.1-r1[${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++ )
-	)
-	mp3? (
-		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
-		smpeg? ( >=media-libs/smpeg2-2.0.0-r1[${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? (
-		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}
-
-src_prepare() {
-	# upstream patch to fix building with both smpeg and mad mp3 support (bug #570804)
-	epatch "${FILESDIR}"/${P}-mp3.patch
-	sed -i -e 's/configure.in/configure.ac/' Makefile.in || die
-	mv configure.{in,ac} || die
-	rm acinclude/l*.m4 || die
-	AT_M4DIR=acinclude eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(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
-}
-
-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
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	# bug 412035
-	# https://bugs.gentoo.org/show_bug.cgi?id=412035
-	if use midi ; then
-		if 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
-	fi
-}
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
index b2506f31b7c3..727a9d409ddf 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa x86"
+KEYWORDS="amd64 ~arm ~hppa x86"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity tremor vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )