gentoo resync : 19.03.2019

4 files changed, 135 insertions, 8 deletions

diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest
index 8491c5791273..f0c7907bab7a 100644
--- a/media-libs/sdl-sound/Manifest
+++ b/media-libs/sdl-sound/Manifest
@@ -1,5 +1,7 @@
 AUX sdl-sound-1.0.3-automake-1.13.patch 231 BLAKE2B cc17a9d7a9f8ea42f84b6a65505d497c0f895d883692508a3ce366a6742533bf4d29b8eff4f09df1753b77819b71dec119950e3ff8a2059e3fb960bb63848be1 SHA512 aba96ba3d3027604d6fcb2f184db37c7ffd2e6204236cf114393e9f5e26acf4040856eb7e4354981f650875d5f991b3cf59c42ff723d75cf7a7e1dd5649f0845
+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
-MISC metadata.xml 329 BLAKE2B 48629ddb61e6a0f89abf5682da954f242d1215a10c7f65c2df2a39a99a55654772e204d09731df371a6fe1c10f97250da3da80470e402f8e8d5cef598fd107c3 SHA512 684d7fca1ea67c78831e6fbe416af3beb64eabcaec4772ac3ea72a48321b10b2090b73ef1ee9e914b903d8ff1fb2275bb9efee41d8bee1cefb7fcbeb57f85549
+EBUILD sdl-sound-1.0.3-r2.ebuild 1986 BLAKE2B fbf90a46bfed1706a5e7b67900b97509d6efe5fae787f93b034fa5d251ac31da3ff87d78a61b36d37d4d0689edc121071b92167f1cb09c31b6bfcc406310a799 SHA512 d85044e17dca33b336d8a80ee6f96524c1124f930a088a246c1623c5d915cae25e28112d2e8136d98e9f47d81e886f422e7ea84bfb4d82a32a4b528ca7ce68a1
+MISC metadata.xml 443 BLAKE2B 5ca8d53cd8244754cc018b9cc771a6c02d20613a6bcb79adc7a16ff869655dc2a54b7253f8bc16d0675a7536188729f913a03f5c0c5187eb604742a2d7ac4cbc SHA512 522c8dcd761d563136729cca7317ba139e36e85cb7f052113e7317ba0c2b8e8a2d207b1901def3d14b0d57602038d3d32b7091c2175a28709305e7c340de4933
diff --git a/media-libs/sdl-sound/files/sdl-sound-1.0.3-physfs-3.0.1.patch b/media-libs/sdl-sound/files/sdl-sound-1.0.3-physfs-3.0.1.patch
new file mode 100644
index 000000000000..1aa06d37f5cd
--- /dev/null
+++ b/media-libs/sdl-sound/files/sdl-sound-1.0.3-physfs-3.0.1.patch
@@ -0,0 +1,38 @@
+--- a/playsound/physfsrwops.h.ini	2008-04-17 13:56:21.000000000 -0400
++++ b/playsound/physfsrwops.h	2017-12-23 05:05:31.657371092 -0500
+@@ -39,7 +39,7 @@
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *           of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
++SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
+ 
+ /**
+  * Open a platform-independent filename for writing, and make it accessible
+@@ -51,7 +51,7 @@
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *           of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
++SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
+ 
+ /**
+  * Open a platform-independent filename for appending, and make it accessible
+@@ -63,7 +63,7 @@
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *           of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
++SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
+ 
+ /**
+  * Make a SDL_RWops from an existing PhysicsFS file handle. You should
+@@ -75,7 +75,7 @@
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *           of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
++SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
+ 
+ #ifdef __cplusplus
+ }
diff --git a/media-libs/sdl-sound/metadata.xml b/media-libs/sdl-sound/metadata.xml
index 1e8838a26618..b8a69a91b165 100644
--- a/media-libs/sdl-sound/metadata.xml
+++ b/media-libs/sdl-sound/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="physfs">Enable physfs support</flag>
-  </use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="physfs">Enable support for various formats through <pkg>dev-games/physfs</pkg>.</flag>
+	</use>
+	<upstream>
+		<bugs-to>mailto:sdlsound@icculus.org</bugs-to>
+	</upstream>
 </pkgmetadata>
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
new file mode 100644
index 000000000000..96b514fa29ea
--- /dev/null
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+MY_P="${P/sdl-/SDL_}"
+
+DESCRIPTION="A library for handling the decoding of various sound file formats"
+HOMEPAGE="https://icculus.org/SDL_sound/"
+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"
+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}] )
+	mpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )
+	physfs? ( >=dev-games/physfs-3.0.1[${MULTILIB_USEDEP}] )
+	speex? (
+		>=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}"-automake-1.13.patch
+	"${FILESDIR}"/"${P}"-physfs-3.0.1.patch
+	"${FILESDIR}"/"${P}"-underlinking.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-aiff
+		--enable-au
+		--enable-midi
+		--enable-raw
+		--enable-shn
+		--enable-voc
+		--enable-wav
+		$(use_enable flac)
+		$(use_enable mikmod)
+		$(use_enable modplug)
+		$(use_enable mp3 mpglib)
+		$(use_enable mpeg smpeg)
+		$(use_enable physfs)
+		$(use_enable speex)
+		$(use_enable static-libs static)
+		$(use_enable vorbis ogg)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}