gentoo resync : 25.08.2020

4 files changed, 60 insertions, 9 deletions

diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 01560ebe896d..9074de986638 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -1,9 +1,10 @@
+AUX lame-3.100-pkgconfig.patch 1048 BLAKE2B 35ff69d3c6ed4d84cad0a021aa6538237ff07adc881d0195b252f518229eab289b5cd65fe6906ba2a08c27b388eabcc812288b6d1140c1e9ccbeaf1c54550ce8 SHA512 2c97e002918f7e62afe17d68947807c1260dd711694d0df89d7ef02acbde5dd89d31e97dae838443235283d6981e52eac6a6288fe2367ef4723529574d664cf6
 AUX lame-3.100-symbols.patch 400 BLAKE2B ebc8b6fdbb7a3f7f0ff2c2be78bf606d7e2251d1463cca7eb7aaa53fc3a8b682d5aed70bdf7d6521cb0fe715733cafb82aa76d8ce9f829933b5c55dc903a01e3 SHA512 ae7376cdaffbafecaa60dbaa08a7ebd73883935e65c7d7d408fb2cdf89ad04411940d2ab6313c80169a940207e9bed33917f88d1ca5bf6d35514e4c5313f330a
 AUX lame-3.96-ccc.patch 813 BLAKE2B 5a8b500555e9430c88487a75473989a37959ed93a30db5e90988648cfe80db2b30f3d4a87c86831033fae953d8b6fb58a0b2de2ec61d6d476cdb228e3aaf9ba5 SHA512 312cb62a6cfdb96c7bda6526f7a493088ec1053869306c4d292a31be80c5a271889348d41ae8681fcbcc11f61415b8029e8f8928e5949db8a28edb0b9657a7db
 AUX lame-3.98-gtk-path.patch 8523 BLAKE2B 9b5231402293a61f8366383a704056e60edbcbb38373ddab52781e9edafb344fce7d8e773e0eb0e59982362dec507f6f560cc18f7128da2d2772f27e79e54b28 SHA512 26e65b231a69142d6bc56bad268126985ed1bc9d14ff943a5374622184efeb78f2a1fd8bb5a3988c8ab8b4e8f10255ad3d91347276f5621d4adfeadc1230e301
 AUX lame-3.99.5-msse.patch 557 BLAKE2B 76b1201e0909ee408a9556ffeb3d41b4bd749407b17ab0dc98582c01b027d492ac6e2f09c8758a59a6bb2649fa1c7a55e96fccab0525b0dcb70b6ea44a034dc0 SHA512 9bf5a1b0f8955aeedff6effcab7f657961ad60ce00b5f455c05ce39ad5b03c2a809ba7225a3a33b61b84a36665fafac53e35b14e0d357289e66194a4f0ef9807
 AUX lame-3.99.5-tinfo.patch 768 BLAKE2B 3fbbd31b0b5752ee4c2dad573d053edcbfb80d24b68a876c2092cae37d3450ac6044ec14d26b180a46197093151d614be8400f33ff7b1f6968130412daacefa5 SHA512 504428e0a0b43c467848296c219ac855ffc9bd83fadb54107e8f6b99290b91bc36457635a092fc121972a3c89918f2d81b42f98f6d007f9b571c7bc3f9c2895e
 DIST lame-3.100.tar.gz 1524133 BLAKE2B 6954d30cfd3951ea07762ba5dd7ff27038b78455f423099a225ebf748abddf9970e444456ca5a6179bd381e2205b32293392cb757c203901674860710fe2c183 SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b
-EBUILD lame-3.100-r1.ebuild 2103 BLAKE2B 2700c52e786fca0167b7a63b64ef04ffbb0dcbc6a30cc724f760fdf5f297eadc0904c8163f28ff1cd897e78407e71f8ba06fa79c1794d5c8072c087dfe0764cb SHA512 614cbc675ab75b834e5bef4be30fb9ee52561bb88b058dc74a59e9ca305dfa2a0f94663e2840d7e2d50a17c44de8d9b20705cf7eda3699ddc194f3e465e9f004
-EBUILD lame-3.100-r2.ebuild 2216 BLAKE2B 41390606b3434bb75ed2b6125c5b4bd37737e4b15c4480448876a374dce0c9e036c14943d349fde94dae8d5d113bcf83493692d39acb9a25a21e17f44da7818f SHA512 ea537189e572e127396a57a21ab50d36d0356f95d11927f93785fd1491989603b1285d7dace5965899d4a51061acb93a18a8684fc2e445a71965ae2d830a75c5
+EBUILD lame-3.100-r2.ebuild 2205 BLAKE2B f1741d6dedb2b174cef82d7f79709f5d80a958c0d4fdfd07e429a89082fc4f44af9cccd7095524059cd50d36d795c8bce145df410f01d64bff14622674f3edff SHA512 5155a795b437c9036b45d718ce26442641367d2cfb6e16a0c7805edc883d58a96b8dedf203f138ae031375239a489c4c74f88431b8c996a3755ba2f01074edb5
+EBUILD lame-3.100-r3.ebuild 2265 BLAKE2B 93d99a086eeea8e21bd119cebfcc8d92cbc0f2c7d10fa69e9cea9e1765ae0066db8b5f2c695b31d97f0bca5c2055cb1ce3dac43f3b83da03a52d72d126fb1411 SHA512 d3ee873a77ceaad1d6ccdfde8d96263bede6c17a6d539f3bec03f596ee2bec2f970a30c0a5d387dc294d4c3428acb190b22d1c4d67bc82225335782cef3e9be5
 MISC metadata.xml 542 BLAKE2B 726f3dfefda9c1905739448f1a3124e05ddc90e261d147da12a7839185ef3eeb440678d185510a6bdd4bb71ab987b7a24f52ed108f7c646ca6b651434f9fade1 SHA512 8fc2e2658ae34d146894786f1c66800eecf818e2bd9bb807c6b32a8e132340c1568e9f47220be3daaabce2ab6e1e1d5aa817157f2c0131ed01944abbab6593fb
diff --git a/media-sound/lame/files/lame-3.100-pkgconfig.patch b/media-sound/lame/files/lame-3.100-pkgconfig.patch
new file mode 100644
index 000000000000..9cb52153e852
--- /dev/null
+++ b/media-sound/lame/files/lame-3.100-pkgconfig.patch
@@ -0,0 +1,45 @@
+Based on a Debian patch:
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829327
+
+--- lame-3.100/configure.in
++++ lame-3.100/configure.in
+@@ -1240,6 +1240,7 @@
+ 
+ AC_CONFIG_FILES([Makefile \
+ 		 libmp3lame/Makefile \
++		 libmp3lame/lame.pc \
+ 		 libmp3lame/i386/Makefile \
+ 		 libmp3lame/vector/Makefile \
+ 		 frontend/Makefile \
+--- lame-3.100/libmp3lame/Makefile.am
++++ lame-3.100/libmp3lame/Makefile.am
+@@ -31,6 +31,7 @@
+ 
+ EXTRA_DIST = \
+ 	lame.rc \
++	lame.pc.in \
+ 	vbrquantize.h \
+ 	logoe.ico
+ 
+@@ -100,3 +101,8 @@
+ #$(OBJECTS): libtool
+ #libtool: $(LIBTOOL_DEPS)
+ #	$(SHELL) $(top_builddir)/config.status --recheck
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = lame.pc
++
++DISTCLEANFILES = $(pkgconfig_DATA)
+--- lame-3.100/libmp3lame/lame.pc.in
++++ lame-3.100/libmp3lame/lame.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: @PACKAGE_NAME@
++Description: MP3 encoding library
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -lmp3lame
++Cflags: -I${includedir}/lame
diff --git a/media-sound/lame/lame-3.100-r2.ebuild b/media-sound/lame/lame-3.100-r2.ebuild
index 9aabf02c792a..1327dce92744 100644
--- a/media-sound/lame/lame-3.100-r2.ebuild
+++ b/media-sound/lame/lame-3.100-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/lame/lame-3.100-r1.ebuild b/media-sound/lame/lame-3.100-r3.ebuild
index b0e97432291e..c9d3e9ec8766 100644
--- a/media-sound/lame/lame-3.100-r1.ebuild
+++ b/media-sound/lame/lame-3.100-r3.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit autotools multilib-minimal
 
 DESCRIPTION="LAME Ain't an MP3 Encoder"
@@ -11,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
@@ -22,15 +21,20 @@ RDEPEND="
 		sndfile? ( >=media-libs/libsndfile-1.0.2 )
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
 	virtual/pkgconfig
-	cpu_flags_x86_mmx? ( dev-lang/nasm )"
+	cpu_flags_x86_mmx? ( dev-lang/nasm )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.96-ccc.patch
 	"${FILESDIR}"/${PN}-3.98-gtk-path.patch
 	"${FILESDIR}"/${PN}-3.99.5-tinfo.patch
 	"${FILESDIR}"/${PN}-3.99.5-msse.patch
+	"${FILESDIR}"/${PN}-3.100-symbols.patch #662752
+	"${FILESDIR}"/${PN}-3.100-pkgconfig.patch #735168
 )
 
 src_prepare() {
@@ -42,6 +46,7 @@ src_prepare() {
 
 	use cpu_flags_x86_mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
 
+	mv configure.{in,ac} || die
 	AT_M4DIR=. eautoreconf
 }
 
@@ -73,5 +78,5 @@ multilib_src_install_all() {
 	docinto html
 	dodoc misc/lameGUI.html Dll/LameDLLInterface.htm
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${ED}" -name '*.la' -type f -delete || die
 }