gentoo resync : 29.10.2017

2 files changed, 113 insertions, 0 deletions

diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index c17ef5367d43..dd8259bd463b 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,6 +1,8 @@
 AUX sdl2-mixer-2.0.1-mp3.patch 1169 SHA256 9c9495c7438dcb2ecdfe8b8416ffeca30693a9442b8387ff881d292066b0b50f SHA512 1c649be61ece8715b2a426a041fa548a8cf0d34cf75d3a0e0b37cec40b71637de954b12f0dcadf3cf632fa2897a2b91223ddca89dd863fadecc8ed055546933e WHIRLPOOL a2206ac44030243f3294e1910a93247077710a167e2fdbf3801a198b2776a54b346d3ef3c3c5271c10e9c75576e7af297a6565b2cf244261b00c4da124ff3b7a
 DIST SDL2_mixer-2.0.1.tar.gz 10213891 SHA256 5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f SHA512 bdf2b4fc302f9c3b41d40bfdd5132081439e6021e915f191e478235b7b6565e7b4c43e1172d2055066ad505e2bc70876123c58f5a67218b207c829ee66a84b9d WHIRLPOOL b9ebeaad35ed92e8de111872d17ceefdc996ebbbb91f3b35fa9ab62573fae972e1a1626cc86141260c69af87a53a0880230ec399fe06fa3c5a98b20d82be8515
+DIST SDL2_mixer-2.0.2.tar.gz 9620763 SHA256 4e615e27efca4f439df9af6aa2c6de84150d17cbfd12174b54868c12f19c83bb SHA512 c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7 WHIRLPOOL a7723fe6d0bd99022465491191e164d1bd7a8b81c13ae6e5217fafe649d75333f6a0e3bbc1a8f541cc48428319aaf88ac814a5704faf562570de1c2df45ae692
 EBUILD sdl2-mixer-2.0.1.ebuild 3510 SHA256 e1a9b8f94496a7ac3fec49c1e742257885f6efdd3a31b95d73a107998d8ec5c4 SHA512 5278be9bccece87ae64304d6b498a07276be540c0b2f2364fb3de98b3a8e16661e9d6962e6bdf46939428d0a2f6ea68383021f36c513ab56e41f9d240544be23 WHIRLPOOL fd4d95e65dee2517a53bbd1dc5b1b859424c19454830879654c5dc7324328012d382200b2bf04e1c7cb0c0dad8bd2494877502f7137f8e3af69808fa65220e53
+EBUILD sdl2-mixer-2.0.2.ebuild 3214 SHA256 7fba2647f5a77322c44545910f70d0fe30fe42b744e4a61aa848ff0ec6d9b196 SHA512 dced4d10984b5c658447c2add19dcc34a733f934c07b441d4e6d93daac20e2edac8cb36fcf0514d29f3419d42ff6ed054bb162bb67e54a5c76d0ae598bb220f1 WHIRLPOOL db361b262ca9c71e3883951c3b240289f92c901a6eb0d4563eb774d13b2da5486232df9fcd4f13f1765b4afcb93b6186e4640801191478a3d3c3e7d335be8ed1
 MISC ChangeLog 4629 SHA256 5748d9ff7d5ed0bf27223d5d308baae567bb309d10f3fc524e2dc2ee7a158c06 SHA512 8b63afe1aaf103310f0e09e5aef04f37dc2b117b01dcea5b186c4e70ca5e86275f3f0f6843e38c300dc98205c22d8addf13a7b483befde2896d84990266d6cd9 WHIRLPOOL 953f104c6a21ce18d68388bdcb9d065c496add32beaa20ff4ff823cadba3110ea0efba7ba550a15486ac73d638efb730533dc6346fabc8abe95ebdb5fac36852
 MISC ChangeLog-2015 1350 SHA256 11ce685f498ebe30088af64d6dac0af70ab770317836d1f013c1ff7520bf92c2 SHA512 2db91d52f88014ab4bec7a392fc96dab2176243ee69491e998b9c3af5c29af572a4a240450fc2681b4d78304c7f5a1adbf64a41d7b9777e7ae97059c477f75fa WHIRLPOOL 2282a661d07be7b84a5eb056abf1a90363746d542cb503f7e5fe72d7bc09ed1a8a4bd87c5ba8e3a87ce4b635fe8944078b5683997b5f2246026cdb131bb2400b
 MISC metadata.xml 751 SHA256 9a3f24166cb6d419004fc9ae812f2ed2737b41d1d72243fd66fccba417ae79fe SHA512 2376560d848b86e6d3b1728f581cd43bd812b8bfa4e89eb839f2505dfd3f75cfbc3c82bd9a91e571f6021e6ce7ea39df99d964fd29d0159f241539e86d65ce4b WHIRLPOOL 143ddfdefc60cb3f55b905c1a5275fcf89c831ef696859ba9e3805e865013b9b27f2e7492aed9d1c3357cfc0a591f11795985e60053e54c6b42d9d9ba59ec844
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild
new file mode 100644
index 000000000000..d818f3bf9bb1
--- /dev/null
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ltprune 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 ~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}"
+
+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
+	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
+}