gentoo resync : 29.06.2020

3 files changed, 22 insertions, 15 deletions

diff --git a/media-sound/muse/Manifest b/media-sound/muse/Manifest
index 3eb14df40463..9a39ec0a6946 100644
--- a/media-sound/muse/Manifest
+++ b/media-sound/muse/Manifest
@@ -1,4 +1,4 @@
-AUX muse-0.9.2_p20161002-fix-build-system.patch 2589 BLAKE2B 0deac04559921842826ff713ebae8c60fc5f6a3b0e5648e99f3490a569f5a7f7d9f6713026e77a4c43c4ef83bdd8556b0099fe77e0eb5ea2e9df5a13f20c2e20 SHA512 c0711f1e265721e7395605282d69d0c7d620c46a5fef05a9afdd2ca82c115ef67c442d8a92411902881ac4c632beb85dba9ed5f8dc16f87c7004dc3e378330c4
+AUX muse-0.9.2_p20161002-fix-build-system.patch 2757 BLAKE2B 70b040cb30d71f303313411980e02214c0979a9555e39260edc883945e9d36a6f4dec41287a7a1f5f5a308096bc98d2671886a69fd855ee1684b884a8d7c02b5 SHA512 e4df70777579eb42d93038bf9437c36ca3a0944050186316bb9ce94a00e34492c4fc502aed26aeb64f283a7b73e1d9448105a33838819a0f0086b90768ed37ff
 DIST muse-0.9.2_p20161002.tar.gz 996253 BLAKE2B 7f86698fa60719235e68ad3766d9dbb19e57e55e94cab8b4c97da5be5990d132e8aa7f63034c5945d74fe3bef4c4945435791648c064be6fe65bb0d25d39d04e SHA512 7d5b35c64b1ccae14330bb35ba0e32661f6f7445055e1854c7e5e530a7645405da03836e919b6151872f254c754d99d045b9c80938148454f521d3d117332208
-EBUILD muse-0.9.2_p20161002.ebuild 1082 BLAKE2B f6d7e40dcd20fadb38b0e5224cd7b40c2ced3905263550ad0ffb9c3891974e708e2a3394c75744ec88c0171a8d559ca9264cea44c0e1b382f46b004c20241588 SHA512 74cf464d463a617835b9c809de2194e6543395a245443f8971f9e6539497cd36520184504184371199ff4549d39b183feef56dde97afeef262904e85270c50d7
+EBUILD muse-0.9.2_p20161002.ebuild 1092 BLAKE2B 9c8b12c90034f20b84173d0ec468f026f024f150512e5f4b9d71bde00a1465f39ce75c7ef1af23590b6ade80fc4bffe1615c77ada17bf2030cfd1f503dfaa299 SHA512 73a6f7953ceadb0e6d5b5ad9e7071737a1b73d44fc683bbb94a19b4fd12e17aef407bff9a69e30d0502dae762010e996524b2c114643e4b3c5e8361ed39c1c96
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch b/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch
index 7ca30e6da689..456dca9b9dee 100644
--- a/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch
+++ b/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch
@@ -20,7 +20,15 @@ Fix build system to properly install files and prevent underlinking.
  
  
  dnl ==============================================================
-@@ -178,19 +178,12 @@
+@@ -67,6 +67,7 @@
+ AC_PROG_CPP
+ AC_SEARCH_LIBS([strerror],[cposix])
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ 
+ dnl ==============================================================
+@@ -178,19 +179,12 @@
  # this is really libcdk's configuration, needs to be reviewed if correct
  # see src/ncursesgui/libcdk
  if test x$want_ncurses_gui = xyes; then
@@ -46,7 +54,7 @@ Fix build system to properly install files and prevent underlinking.
  
    if test x$have_ncurses_h = xyes; then
      AC_DEFINE([GUI_RUBIK], 1, [Have ncurses GUI])
-@@ -326,8 +319,13 @@
+@@ -326,8 +320,13 @@
  
  
  dnl documentation
@@ -62,7 +70,7 @@ Fix build system to properly install files and prevent underlinking.
  
  
  dnl ==============================================================
-@@ -402,6 +400,7 @@
+@@ -402,6 +401,7 @@
  
  AC_CONFIG_FILES([
  Makefile
diff --git a/media-sound/muse/muse-0.9.2_p20161002.ebuild b/media-sound/muse/muse-0.9.2_p20161002.ebuild
index 89771e227748..e296b01d6582 100644
--- a/media-sound/muse/muse-0.9.2_p20161002.ebuild
+++ b/media-sound/muse/muse-0.9.2_p20161002.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -14,24 +14,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc gtk jack ncurses portaudio"
 
-RDEPEND="media-sound/lame
+RDEPEND="
+	media-sound/lame
 	media-libs/libvorbis
-	media-libs/libsndfile
+	media-libs/libsndfile:=
 	media-libs/libogg
 	media-libs/libshout
 	media-libs/libsamplerate
 	gtk? ( x11-libs/gtk+:2 )
 	jack? ( media-sound/jack-audio-connection-kit )
 	ncurses? ( sys-libs/ncurses:0= )
-	portaudio? ( media-libs/portaudio )
-"
-DEPEND="${RDEPEND}
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.2_p20161002-fix-build-system.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-0.9.2_p20161002-fix-build-system.patch )
 
 src_prepare() {
 	default