gentoo resync : 13.10.2019

3 files changed, 2 insertions, 65 deletions

diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest
index d364479e6b60..6757eb923689 100644
--- a/media-libs/sdl-sound/Manifest
+++ b/media-libs/sdl-sound/Manifest
@@ -2,6 +2,5 @@ AUX sdl-sound-1.0.3-automake-1.13.patch 231 BLAKE2B cc17a9d7a9f8ea42f84b6a65505d
 AUX sdl-sound-1.0.3-physfs-3.0.1.patch 1574 BLAKE2B 9829f6429041322c0eaa41d547dbebfe03bf730e80d76b5b15afc66c123a87e0ab1fd9819372e37ed505c1a9e214c27583cb56e12920b3fe0c88a211177c79bc SHA512 ac228520e1c8e682b58919335ea117289087962b4b98fae23e743830709d8dca60a3d22c7171ee13bdbf84f528cfddcad70231edbba64a7cec88c7dd77295eca
 AUX sdl-sound-1.0.3-underlinking.patch 413 BLAKE2B 594339dae9a0230ddc1b821ca90d1650800610b0a7904fc00e33f1e3ff183ece1c8715b1d27b0c80cecbf5bda9e7b15255fba00fdc293f5e0841452efde447ef SHA512 1f67d72313abc44080a47b70c210bd6c03b2a204e85e2f5d1eb95f40367470bab4f14956f0404c5025fb4af7d72731dd1df3196ee316a2c5d9bb775e27d58a8c
 DIST SDL_sound-1.0.3.tar.gz 1127100 BLAKE2B 6fff5ea22ae82f9692a51910d5415288d5a1ebc1c463b2c741f9ee9fabeabb385de12f781d4f40aaf0628598824758376c51b442f434d77d96d0376379908ff6 SHA512 3e60671777d804e6104d7d441f4a29866492c9412040eea3fd2283c0914a0a1ebc550260631c2bf500e7d982e05a6f9feeda81e9eeef8257303750c1be582824
-EBUILD sdl-sound-1.0.3-r1.ebuild 1859 BLAKE2B 34700a6ec4e72aaa5da68fcf7b6cfaf8be86e3d2d03b6efdd92f09243776972ecdf074b163bb5a84a41959ab850af6e567676915c1bb13d54e62ae8d559019a2 SHA512 65da9213c7657a44ebc0b8d2e54cc095b0338c2e8b9b53071f51cce4dbca096eee15267d5ab5c1377eafb7b7ab7226fb8be2090fed4364d1fbdb6221321a82e5
-EBUILD sdl-sound-1.0.3-r2.ebuild 1985 BLAKE2B bb8b5b653c96760522be04dd0ab462d9f87fd519767ba1edbca2af48efabf78c6594089c14ae1f3a29461a5ee001aa28b724b1774a264051d47335e471c09a7b SHA512 20c9a225e830b33a4eb2669e14c85ba284c191bc85e6126a038fb6b55d3bc13090dabcdfa59556fc73ec47a4ae4f3270897b29d97adc791724fe06a653564d8a
+EBUILD sdl-sound-1.0.3-r2.ebuild 1971 BLAKE2B b791129c6811ee4f85e04a4d56687473aa522a60e154d6a55783d8ba5b2c2116ba5e196d362f17b3726b4e3ab2d6969d9903df66dfd7cf467f7a706f8085f0c6 SHA512 99f4e2ebe8c7465a6a6ccd60cd5baabaae0ffa7f7a4a9b824d887142e190953275b56d71106117c2a855949918488f0abca70c010c0ab031e39d430dcc271346
 MISC metadata.xml 443 BLAKE2B 5ca8d53cd8244754cc018b9cc771a6c02d20613a6bcb79adc7a16ff869655dc2a54b7253f8bc16d0675a7536188729f913a03f5c0c5187eb604742a2d7ac4cbc SHA512 522c8dcd761d563136729cca7317ba139e36e85cb7f052113e7317ba0c2b8e8a2d207b1901def3d14b0d57602038d3d32b7091c2175a28709305e7c340de4933
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild
deleted file mode 100644
index ac7df0c6202b..000000000000
--- a/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib-minimal
-
-MY_P="${P/sdl-/SDL_}"
-DESCRIPTION="A library that handles the decoding of sound file formats"
-HOMEPAGE="http://icculus.org/SDL_sound/"
-SRC_URI="http://icculus.org/SDL_sound/downloads/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos"
-IUSE="flac mikmod modplug mp3 mpeg physfs speex static-libs vorbis"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
-	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
-	mikmod? ( >=media-libs/libmikmod-3.2.0[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	physfs? ( >=dev-games/physfs-2.0.3-r1[${MULTILIB_USEDEP}] )
-	mpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-{underlinking,automake-1.13}.patch
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-dependency-tracking \
-		--enable-midi \
-		$(use_enable mpeg smpeg) \
-		$(use_enable mp3 mpglib) \
-		$(use_enable flac) \
-		$(use_enable speex) \
-		$(use_enable static-libs static) \
-		$(use_enable mikmod) \
-		$(use_enable modplug) \
-		$(use_enable physfs) \
-		$(use_enable vorbis ogg)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc CHANGELOG CREDITS README TODO
-	if ! use static-libs ; then
-		find "${D}" -type f -name '*.la' -exec rm {} + \
-			|| die "la removal failed"
-	fi
-}
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
index 36b7858b9a62..02c6018c0b60 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://icculus.org/${MY_PN}/downloads/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="flac mikmod modplug mp3 mpeg physfs speex static-libs vorbis"
 
 RDEPEND="