gentoo resync : 28.04.2021

4 files changed, 4 insertions, 94 deletions

diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index e90e81284a02..8e69137f1036 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,7 +1,4 @@
-AUX rubberband-1.9.0-makefile.patch 339 BLAKE2B 93a60dde06e197578f8279b60551541bf69ac756fef348128bfbd3289ece20c98ccaebed6856cf7697588440c61bcfa6ac65b6480648cf63aed9f21ac642f270 SHA512 3921eb71daee708ace0c4f28075ac67a2b10af71ddeb85edea1cde0c2e0721d09ca590ce90255f49be0f284cc43a0cfda9b4805c82a09baeb4303cadb06ad3c3
 AUX rubberband-1.9.1-build.patch 6538 BLAKE2B 9387ebba5a8a06f6ea11dfa16c9b37fb2bc607a4982a6b77ad62e59fce597e7d4c358c0795c471a5e8b74cb553da31239cff50b2ac367e702e04262a66c462a0 SHA512 64677e108c17e35739a2e86a473c08b3d1e575daee14db124bec013e348120538e29e9a6829f7ec905998f7ba8f4386e8aea8591642bf45cf3be0f6e657b828f
-DIST rubberband-1.9.0.tar.bz2 192240 BLAKE2B dd97f80e01b05883645bf7c78730f8a3f873a60379cc209887591a28d0b6292e083c2f522db35ef9435c0a446eaa9b5acab8b5e2c9703514019491a939a804c9 SHA512 2226cfec98f280a12f874f60620c3bf09f7399a7808af5e9f5c9a5154b989cfbf3c4220e162d722e319a4ef046f81c6a07eac2b8c6035c8f6230f0a20b1577a8
 DIST rubberband-1.9.1.tar.bz2 164644 BLAKE2B 1bbbd0056b2131ac16bf427db93e19bdd6adb5433733e62523f4a04c8a74d1a48e82dbace09e7ffe6dddfeec699e3aeee8e84344c9e7cbe75067316dde6268d6 SHA512 cb20ef8fb717a9e6b5b0b921541bd701e94326e12cdb20d50bed344d12fa1b4fd731335c3a0a7f2d2a5ce96031d965b209e7667c4d55fd8494b8e20d3409f0d3
-EBUILD rubberband-1.9.0.ebuild 1790 BLAKE2B 24e0049a4d43e50ee0a6f7daa723649ee0eca5950d077a8346ebb52dfd9e27c32683c72bad74f052c599fcf7ee9719ad98dac584cd7288a84e97fe0871718cab SHA512 71a2a8c41387c86f250e5a69031c2a5c267daf24f5eb4b4b7f5e3d72014f5000ba5ee9620e249563b593bdef7509683693f9a52fcaef622894e094211e8e0e8f
-EBUILD rubberband-1.9.1-r1.ebuild 1442 BLAKE2B 42a5dcdd0c26fbebb29ff58cc1f5e0cc1e68e7d430da0c674b69fb55745cb9629d27c1113dd88c7e3b1333a6f0a455cf911485b56a1dd72c22084a7f516ab063 SHA512 2a38d074ead0493c2de9a6268c67c3865e0520fe872ebe2d728c40cea333b309b226ea582fe69fe09b987717043eb535ca40b1612d16b30629802bc1717aad6b
+EBUILD rubberband-1.9.1-r1.ebuild 1444 BLAKE2B 19ae91edaa90e5b586d5d21b03f7c86667790a152542e19fe8d95c8fd5ecb662718b46a41d4292db1b4ae156c6fc91fb9b8e04994b8cd585989447ac5b8c5fa9 SHA512 0b85d47949f7fa42e4f301faf9ae022e10cf1fa3b994dc1a390baf85bf7f682cb40366e09df773349d457cbf4f4951bfd8f685f8e34bfe9bb86e6ce28217a306
 MISC metadata.xml 490 BLAKE2B 849555ada519e1a558d37977b952b8338d4d19ac3a7e8523a15cc3924b7b7b5faca70df7782597e322c362af7d05b1a35dae64b8cd8f2a998cc5d074ee81f090 SHA512 a1e8673326887e5582aa7a948543341d3061a149e0232a01ef8aa3b6778a499393aae434d5f1c2181910aa309a3cd2f0d80820922dfe668745f75314e0526e31
diff --git a/media-libs/rubberband/files/rubberband-1.9.0-makefile.patch b/media-libs/rubberband/files/rubberband-1.9.0-makefile.patch
deleted file mode 100644
index 5539162dec29..000000000000
--- a/media-libs/rubberband/files/rubberband-1.9.0-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index fdddb72..86c0548 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -19,7 +19,7 @@ VAMP_PLUGIN_LIBS	:= @Vamp_LIBS@ $(LIBRARY_LIBS)
- LADSPA_PLUGIN_LIBS	:= $(LIBRARY_LIBS)
- 
- MKDIR			:= mkdir
--AR			:= ar
-+AR			?= ar
- 
- INSTALL_BINDIR		:= $(PREFIX)/bin
- INSTALL_INCDIR		:= $(PREFIX)/include/rubberband
diff --git a/media-libs/rubberband/rubberband-1.9.0.ebuild b/media-libs/rubberband/rubberband-1.9.0.ebuild
deleted file mode 100644
index 3a6cfca0a2c9..000000000000
--- a/media-libs/rubberband/rubberband-1.9.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
-HOMEPAGE="https://www.breakfastquay.com/rubberband/"
-SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="ladspa static-libs +programs vamp"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-CDEPEND="
-	media-libs/libsamplerate[${MULTILIB_USEDEP}]
-	media-libs/libsndfile
-	sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
-	ladspa? ( media-libs/ladspa-sdk )
-	vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-)
-
-src_prepare() {
-	default
-	if ! use static-libs ; then
-		sed -e '/^all:/s/$(STATIC_TARGET)//' \
-			-e '/^\tcp $(STATIC_TARGET)/d' \
-			-i Makefile.in || die
-	fi
-
-	sed -e '/cp -f.*JNI_TARGET/d' -i Makefile.in || die
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable programs ) \
-		$(use_enable ladspa ) \
-		$(use_enable vamp )
-}
-
-multilib_src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-multilib_src_install() {
-	# fix libdir in .pc file
-	sed -iE "s%/lib$%/$(get_libdir)%g" "${BUILD_DIR}/rubberband.pc.in" || die "Failed to fix .pc file"
-
-	emake INSTALL_BINDIR="${ED}/usr/bin" \
-		INSTALL_INCDIR="${ED}/usr/include/rubberband" \
-		INSTALL_LIBDIR="${ED}/usr/$(get_libdir)" \
-		INSTALL_VAMPDIR="${ED}/usr/$(get_libdir)/vamp" \
-		INSTALL_LADSPADIR="${ED}/usr/$(get_libdir)/ladspa" \
-		INSTALL_LRDFDIR="${ED}/usr/share/ladspa/rdf" \
-		INSTALL_PKGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
-		install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
diff --git a/media-libs/rubberband/rubberband-1.9.1-r1.ebuild b/media-libs/rubberband/rubberband-1.9.1-r1.ebuild
index 211b36068f7f..ab6b7eac6dc4 100644
--- a/media-libs/rubberband/rubberband-1.9.1-r1.ebuild
+++ b/media-libs/rubberband/rubberband-1.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="ladspa jni static-libs +programs vamp"
 
 BDEPEND="
@@ -20,7 +20,7 @@ BDEPEND="
 CDEPEND="
 	media-libs/libsamplerate[${MULTILIB_USEDEP}]
 	sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
-	jni? ( virtual/jdk:* )
+	jni? ( >=virtual/jdk-1.8:* )
 	ladspa? ( media-libs/ladspa-sdk )
 	programs? ( media-libs/libsndfile )
 	vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] )
@@ -58,6 +58,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	! use jni && find ${ED} -name "*.a" -delete
+	! use jni && find "${ED}" -name "*.a" -delete
 	einstalldocs
 }