gentoo resync : 16.09.2020

5 files changed, 145 insertions, 13 deletions

diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index f4255816be0c..cd0cee4ef38a 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -1,6 +1,9 @@
 AUX libsamplerate-0.1.3-dontbuild-tests-examples.patch 1187 BLAKE2B e6acec51e3a8dcfaa50074734e55ba64d416882334e80e9fbf5a079d236e1ed358173efd84faf568c29962dc5655b11e8cf7adeb007159f8fdd0b0e14904c457 SHA512 93fce01981c831ced0fd83c315841660a7d194a706ba8b1fb775cc327d8e526c1b65abc8556dfde808672143d51b5e70f005f569034e6921e8af53af1ad45eee
 AUX libsamplerate-0.1.8-lm.patch 215 BLAKE2B 1123b4aab36476f89505daaa0d0ddf842819d8a70930469dc35140f648d71a29f3ed84eb36016c69a0738358a03d58930acc8381cacf3c047552b1fdcb7bae60 SHA512 acc63d2b6a547d9b480c4752864b474b478a753c88bd535833a5b1ca745c54d1e323bbe985f96430158307c0f1d1d1cf1171ec00bdbb31e9e888b3ed2c55019a
+AUX libsamplerate-0.1.9-htmldocdir.patch 1638 BLAKE2B 21cfc155520cdb1392925560a48317ba5850539e66544dc8c0ebf1a7d9eab0249e6ac98611695b169b4a0e984f6c4a9c1710d77cd99da53516c6bf8ec72e8c13 SHA512 859e94497d68470865f5dc198bdda8bc86135f84d67e1b06031e0acc67f10b88c354255fc6944a3c258934d71584c2cb72fbdf840cdd798a2e7712cf7cc3c9fd
+AUX libsamplerate-0.1.9-no-sndfile-resample.patch 1070 BLAKE2B b0e655e5162f8c77f66f57a54da132185d0f192d6e1def8aebb2ce389ed21e7460801bdacf096b7b71dcf0c067a585f4b7749680276ad28c75fd909532e93449 SHA512 d32fb092c593578060a58bab323aaad76c5a6f35a3e17a2617581f7d9309b4e2377753c13013637dc02f06343e082089b2ea229219d48a46dce2b138839f3eb4
 DIST libsamplerate-0.1.9.tar.gz 4336641 BLAKE2B f1cf4c669315ef6a93bfa0c5c73284187068b9b049299afbfd45da5c133372cfd6fdd00fda2dbb2a6740446219203ceda8b46385c844d9ef480e8578aa0b3928 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728
+EBUILD libsamplerate-0.1.9-r1.ebuild 1022 BLAKE2B 0a52fcb7d4c28de1938d43b190d625810ceb854d84301d6d5b3a24f759b849ad9cb9c7815f80b76c2cf5c4070b97525298f802dfd89bb8df9aee704d82f5f4fe SHA512 9e92f2cef4c3909911a740e1c28d86a2e7e8b360ea4a8e0e52e2a83af7b53554dbc2b88c9d96d57e7583238ec8d8899605cfd1b94fdd002002fff3291e39921d
 EBUILD libsamplerate-0.1.9.ebuild 1392 BLAKE2B cfbe8bf1262ea6dbe91ac64897508bade3202943c640f8038b3c496aa012b0050c961d9dc845b4addb712a8a488e9cd24dfafd5dec66d7b1d6c04a4735db2014 SHA512 9a37d903d811f3ee2c4ad9e71f1e6fd1b79deae88ee47d6970b588a882bafb7a8594a07f82e2ccb0586775f34024d3efc8669e3b03f2811e9f65fef55401f2ba
-EBUILD libsamplerate-9999.ebuild 1271 BLAKE2B f01abb9757fd39fee46543f3c61334b3453f3ca5fa706f5f0e1309ce45747c3e7db099aa487db0914997809d1b95492c387a4ac199443d8f164a87db3e92c32a SHA512 3c1bfc21f113083b19723e20e3237c711d17d6e76f440c1d80b7193ecf93d01b2c216802d0686acfb5e6e26b5b3153630f338595101917b03b7544ce3765f381
+EBUILD libsamplerate-9999.ebuild 1271 BLAKE2B 500d16139947b14a359eec9ab45bfd74ec2ddf6ecd746ecbce2381f7579b8863f44772f72473008bd50a0324c11f676d6be56c3779f16bf6d9ae900d1ab7fc8e SHA512 77961d3ccdfdfe9861d4c429e3fdef3f9bbda46c37f558fd13f49a92d04d358d8f192c5a1d8f48dffdff9d00b74305a270acb1e2f03067c83d045674c05718fb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libsamplerate/files/libsamplerate-0.1.9-htmldocdir.patch b/media-libs/libsamplerate/files/libsamplerate-0.1.9-htmldocdir.patch
new file mode 100644
index 000000000000..cedcd3124336
--- /dev/null
+++ b/media-libs/libsamplerate/files/libsamplerate-0.1.9-htmldocdir.patch
@@ -0,0 +1,53 @@
+From 06fea5c39b186955194e85ada50724465c39033d Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 10 Jun 2017 15:48:00 +0200
+Subject: [PATCH] Remove htmldocdir variable
+
+* Autoconf and Automake provide a variable (htmldir)
+  for this already.
+
+* asturm 2020-09-04: Rebased onto 0.1.9
+---
+ configure.ac    | 10 ----------
+ doc/Makefile.am |  6 +-----
+ 2 files changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0ce20e9..6d5e692 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -264,21 +264,11 @@ AS_CASE([$target_os],
+ 		;;
+ 	esac
+ 
+-htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
+-
+-if test $prefix = "NONE" ; then
+-	htmldocdir=/usr/local/share/doc/libsamplerate0-dev/html
+-else
+-	htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
+-	fi
+-
+ #====================================================================================
+ # Now use the information from the checking stage.
+ 
+ AC_DEFINE_UNQUOTED(OS_IS_WIN32, ${os_is_win32}, [Set to 1 if compiling for Win32])
+ 
+-AC_SUBST(htmldocdir)
+-
+ AC_SUBST(SHLIB_VERSION_ARG)
+ AC_SUBST(SHARED_VERSION_INFO)
+ AC_SUBST(OS_SPECIFIC_INCLUDES)
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index be86d64..cbc9963 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,3 @@
+-htmldir = $(htmldocdir)
+-html_DATA = SRC.png SRC.css index.html license.html history.html download.html \
++dist_html_DATA = SRC.png SRC.css index.html license.html history.html download.html \
+ 				lists.html quality.html win32.html faq.html api.html \
+ 				api_simple.html api_callback.html api_full.html api_misc.html
+-
+-EXTRA_DIST = $(html_DATA)
+-
diff --git a/media-libs/libsamplerate/files/libsamplerate-0.1.9-no-sndfile-resample.patch b/media-libs/libsamplerate/files/libsamplerate-0.1.9-no-sndfile-resample.patch
new file mode 100644
index 000000000000..ae515602d817
--- /dev/null
+++ b/media-libs/libsamplerate/files/libsamplerate-0.1.9-no-sndfile-resample.patch
@@ -0,0 +1,34 @@
+From bf39835df4eba7b2ec2d5c5e7d1d40397942c3b0 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 27 Jan 2018 14:12:35 +0100
+Subject: [PATCH] Move `sndfile-resample` to sndfile-tools package
+
+* Fixes https://bugs.gentoo.org/645258
+
+* asturm 2020-09-04: Rebased onto 0.1.9
+
+---
+ Makefile.am                 |   7 -
+ 1 file changed, 7 deletions(-)
+
+--- a/examples/Makefile.am	2014-11-30 11:44:50.000000000 +0100
++++ b/examples/Makefile.am	2020-09-04 17:30:07.824611967 +0200
+@@ -1,8 +1,6 @@
+ # This file was automatically generated
+ # DO NOT EDIT!
+ 
+-bin_PROGRAMS = sndfile-resample
+-
+ EXTRA_PROGRAMS = varispeed-play timewarp-file
+ 
+ SAMPLERATEDIR =../src
+@@ -15,9 +13,6 @@
+ 
+ #===============================================================================
+ 
+-sndfile_resample_SOURCES = sndfile-resample.c
+-sndfile_resample_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS)
+-
+ varispeed_play_SOURCES = varispeed-play.c audio_out.c audio_out.h
+ varispeed_play_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS) $(OS_SPECIFIC_LINKS)
+ 
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
new file mode 100644
index 000000000000..1fb03648cc2d
--- /dev/null
+++ b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio"
+HOMEPAGE="http://www.mega-nerd.com/SRC/"
+SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.1.3-dontbuild-tests-examples.patch"
+	"${FILESDIR}/${PN}-0.1.8-lm.patch"
+	"${FILESDIR}/${P}-htmldocdir.patch"
+	"${FILESDIR}/${P}-no-sndfile-resample.patch" # bugs 408849, 645256
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-fftw
+		--disable-sndfile
+		--disable-static
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/libsamplerate/libsamplerate-9999.ebuild b/media-libs/libsamplerate/libsamplerate-9999.ebuild
index 99d01539ddca..b763d7394fb2 100644
--- a/media-libs/libsamplerate/libsamplerate-9999.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit multilib-minimal
 
@@ -13,12 +13,12 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/erikd/libsamplerate.git"
 else
 	SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="static-libs test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 # Alsa/FFTW are only required for tests
@@ -29,25 +29,25 @@ DEPEND="
 		media-libs/libsndfile[${MULTILIB_USEDEP}]
 		sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
 	)
-	virtual/pkgconfig"
+"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
-
 	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable test alsa) \
-		$(use_enable test fftw) \
+	local myeconfargs=(
+		--disable-static
+		$(use_enable test alsa)
+		$(use_enable test fftw)
 		$(use_enable test sndfile)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
 	einstalldocs
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }