gentoo resync : 13.06.2020

4 files changed, 88 insertions, 3 deletions

diff --git a/media-libs/alure/Manifest b/media-libs/alure/Manifest
index 3ce0893952df..700efc415cdc 100644
--- a/media-libs/alure/Manifest
+++ b/media-libs/alure/Manifest
@@ -1,4 +1,6 @@
 AUX alure-1.2-include-unistd.patch 192 BLAKE2B 61cfebb2c2f8d2ea0e228d81f37d25b6b59445711658a04e7e85c20624099aeb86c065e6d7ab4f3cdc65b5ba35248cde4c93104c971fd008c1aba19de259bd9f SHA512 ebb1f841ea28f7e7690f1cdf6991af6bd97486473b63ffd11d79b05d66faf44b8ee590e45b0b1ede69af99a3f817103e8e444885834defd4ccbc76e2104649e8
+AUX alure-1.2-new-dumb.patch 954 BLAKE2B e136519eb210cc003f8e66a02a1023cd5c169998dfef99b2dcf3d46b6259a04c3c7094bd4bd892f92b4a53a48cd3ca6028da4163d418b31eb5ae5a9380270582 SHA512 27000ad19dbd9278fea67c40e037745b182c4b067b30d5853274b1cc4216813ba0d9f3e292e4d997d93b870cfc0117cfd1a9a2f5adfc77defb908765f3fd03ea
 DIST alure-1.2.tar.bz2 65210 BLAKE2B 6e99e5bb56c96db27b2ab5ff67c98406636e5b1fc9e446356234c332edf0a4c167707068edf380f99a3744cf0f26a76c1c0325401977d1b3fe8bc989c4a1129c SHA512 f1a2dbbe6870c9d34da724e49cad993cabdca393482bf6476adc925ba5da2a34dc26d86e612e6ed829183c6df595d46921766f46063d0d478ddb18deeb8878a6
-EBUILD alure-1.2-r1.ebuild 1233 BLAKE2B 6c7febe0888310b765139da60ddc573af59a64f82c168ca47cdada18827abfc4f7105743edda7eee6ff9dac43b9b976e195013038a5d8e9494250dd63a2b33a2 SHA512 0baf16125f4753b41bd4e7c76260d9acfbc3b1f709ea6017c720313cd86c317596e4248763d57a886821c99f37ba2c9a05bc8ad088e961c629ff437c7b3338cb
+EBUILD alure-1.2-r1.ebuild 1241 BLAKE2B fe9fd13925d2b52aaab8f145052db33486b132b7117e6a327f77d4943dad4ef5265014551fb9c4a9dd79cfc85793f5a8fc937e22438e74c78062caacd8529e36 SHA512 1c33711b317515a95dee8c1f18020982b27465a801c06b72f0a33c514885838f6ec959e0ffc226f855f19bcf77435c9d5d928e18cd9c4e91280ed26050cb10a5
+EBUILD alure-1.2-r2.ebuild 1273 BLAKE2B d7d8e3d8607c13543951a765db73cbb74c3c9ec497eb99c3cde399961deefe3b1728896111bbb0f468eefbf25453801f078e3246b36df98a6acd26161a87944a SHA512 67fcb3eec6625f6a5fcf344589c76819731d6b00b2df57aa20370fdf5496ff6d95288143a38cd206a26a8418adca5f56b53a1e739b61ac7a40f5a7ad99a06f51
 MISC metadata.xml 440 BLAKE2B dbe7f0e580e3b0c1b28237654dc06f8c3945ddc42ec690a254add4f5d2855fd1e60d0cfc91cf9ed62c6edd39bfdf9d2d75e3fc7fb6cbdfae3bac1e7e07026f3f SHA512 5b6106088e98c6676d01e02b99a93dc661eb24909ee8aa235e9506c18175fbac7d765c05ce95dbe085c8aa772d45a4f8f717657f281694f40ddc10dd83f1e58e
diff --git a/media-libs/alure/alure-1.2-r1.ebuild b/media-libs/alure/alure-1.2-r1.ebuild
index 69166861c89a..3053fbc78e10 100644
--- a/media-libs/alure/alure-1.2-r1.ebuild
+++ b/media-libs/alure/alure-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE="dumb examples flac fluidsynth mp3 sndfile static-libs vorbis"
 
 RDEPEND="
 	>=media-libs/openal-1.1
-	dumb? ( media-libs/dumb )
+	dumb? ( =media-libs/dumb-0.9*:= )
 	flac? ( media-libs/flac )
 	fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= )
 	mp3? ( media-sound/mpg123 )
diff --git a/media-libs/alure/alure-1.2-r2.ebuild b/media-libs/alure/alure-1.2-r2.ebuild
new file mode 100644
index 000000000000..49baf11fcec3
--- /dev/null
+++ b/media-libs/alure/alure-1.2-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="The OpenAL Utility Toolkit"
+HOMEPAGE="https://kcat.strangesoft.net/alure.html"
+SRC_URI="https://kcat.strangesoft.net/alure-releases/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="dumb examples flac fluidsynth mp3 sndfile static-libs vorbis"
+
+RDEPEND="
+	>=media-libs/openal-1.1
+	dumb? ( media-libs/dumb:= )
+	flac? ( media-libs/flac )
+	fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= )
+	mp3? ( media-sound/mpg123 )
+	sndfile? ( media-libs/libsndfile )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-include-unistd.patch
+	"${FILESDIR}"/${P}-new-dumb.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e "/DESTINATION/s:doc/alure:doc/${PF}:" CMakeLists.txt || die
+}
+
+src_configure() {
+	# FIXME: libmodplug/sndfile.h from libmodplug conflict with sndfile.h from libsndfile
+	local mycmakeargs=(
+		-DMODPLUG=OFF
+		-DDUMB=$(usex dumb)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DFLAC=$(usex flac)
+		-DFLUIDSYNTH=$(usex fluidsynth)
+		-DMPG123=$(usex mp3)
+		-DSNDFILE=$(usex sndfile)
+		-DBUILD_STATIC=$(usex static-libs)
+		-DVORBIS=$(usex vorbis)
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/alure/files/alure-1.2-new-dumb.patch b/media-libs/alure/files/alure-1.2-new-dumb.patch
new file mode 100644
index 000000000000..97b8f71b7024
--- /dev/null
+++ b/media-libs/alure/files/alure-1.2-new-dumb.patch
@@ -0,0 +1,30 @@
+# Already fixed upstream:
+# https://repo.or.cz/alure.git/commitdiff/9939cdfbf9c6c7a2690db7fb8dd2892389adcd5f
+
+diff -Naur a/src/codec_dumb.cpp b/src/codec_dumb.cpp
+--- a/src/codec_dumb.cpp	2011-07-29 09:37:48.000000000 +0100
++++ b/src/codec_dumb.cpp	2020-05-10 15:59:48.502632496 +0100
+@@ -272,7 +272,11 @@
+ 
+ private:
+     // DUMBFILE iostream callbacks
++#if DUMB_VERSION >= 2*10000
++    static int skip(void *user_data, dumb_off_t offset)
++#else
+     static int skip(void *user_data, long offset)
++#endif
+     {
+         std::istream *stream = static_cast<dumbStream*>(user_data)->fstream;
+         stream->clear();
+@@ -282,7 +286,11 @@
+         return -1;
+     }
+ 
++#if DUMB_VERSION >= 2*10000
++    static dumb_ssize_t read(char *ptr, size_t size, void *user_data)
++#else
+     static long read(char *ptr, long size, void *user_data)
++#endif
+     {
+         std::istream *stream = static_cast<dumbStream*>(user_data)->fstream;
+         stream->clear();