gentoo resync : 19.10.2017

5 files changed, 91 insertions, 9 deletions

diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 1f40a3f27584..822cf4726b9f 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -1,9 +1,11 @@
-AUX lame-3.96-ccc.patch 809 SHA256 2322bdc40007993d77a31f5c9c0edf8af550de48b1ee3a2dbb0f6acea6c27197 SHA512 3ca09cde933763a06c5ccc25ae24d0ecfe471a56358d1bdec2a157c50342f099fff8760e11528d840a68cd8d68260b0916fa4781325f526573760abf96dfb962 WHIRLPOOL dd9ecd8344ed4256a703f6f4dc4f3bb93d8865a3fa5b8f67a3a79e685387500cbcdb59ba63a804e04a977ace8ab4892288fe6fd6c7e4ffd500b260e497dd94e4
-AUX lame-3.98-gtk-path.patch 8519 SHA256 65e345a2af2547592910aaf02775b2fb091c23801a4e1bc50d2d872cc414656b SHA512 015e82755c24f7ff2b643bb1b9fc7cf400b2b48c5210253b3109c090bd852f7d2ce7a44cd1a3d117900b2d1c9e09059042077c9cef258ba1b2387bf1a11d9585 WHIRLPOOL 59354f93da9adc86a11cae0793e0491126029d227e6aa8846bf70e431e4aba9420fc13910268ac52c8f9b1e3c65813b2fe31f8afe8de64ebeeb791b1360db512
+AUX lame-3.96-ccc.patch 813 SHA256 cd781184549d156e3340190bcad9e221b956145ed84ba10a6755a4c603da10a8 SHA512 312cb62a6cfdb96c7bda6526f7a493088ec1053869306c4d292a31be80c5a271889348d41ae8681fcbcc11f61415b8029e8f8928e5949db8a28edb0b9657a7db WHIRLPOOL a150b92a4f19f583a9f8889ce42c351c94849bc57184881ca3c063e7213f4f0fbd03ee3c60c605aafbb69ffbc51ae042fca5adb81fc3bd4a2de269f90551a746
+AUX lame-3.98-gtk-path.patch 8523 SHA256 5f04c96ff88ab4f04b1c234160363d2ee622ac5d027c69cdccca60c439a1dcb2 SHA512 26e65b231a69142d6bc56bad268126985ed1bc9d14ff943a5374622184efeb78f2a1fd8bb5a3988c8ab8b4e8f10255ad3d91347276f5621d4adfeadc1230e301 WHIRLPOOL 37837e020e395feed7f7a5dc762d71627512dd3fa965e44b310ac5f63d6a19b1c3c0087f398ffc4ac7cdd9c6494c8e4d8a21cc0204a8f12a59d9c2fa2881b68d
 AUX lame-3.99.5-msse.patch 557 SHA256 c0401b7d238f01e918186f42791c9224bb49e1557ed93956c2f7e1fd87e6558d SHA512 9bf5a1b0f8955aeedff6effcab7f657961ad60ce00b5f455c05ce39ad5b03c2a809ba7225a3a33b61b84a36665fafac53e35b14e0d357289e66194a4f0ef9807 WHIRLPOOL b430a88a382fcf1beca86eacb12f7cf7e13d4eeda6025c62db18f6d1985c244b50ba38af5bc0d19ead33395a14918defdc361c4595b461af94e0797df3f0cd63
-AUX lame-3.99.5-tinfo.patch 764 SHA256 559e6635c7fd2d45b499e20713c7764a7b53076f6c38e40c25bb0f7dd67eebee SHA512 4a25887c55a23f07dd2cad68699c64d8273a83648a09a209968959eb7aa405b8c2ab64e004c1c4c52f9be2cd2652a5be51683594011736963dfe0073d5569cee WHIRLPOOL 3ccf27de3507f93500eb091a26790ddbf2143e4999f6ab8aaa15e87daa1d91dfb9528aa0ec95a7d497f174e8aa89ad171df5e27a2ab9f76cc2a4de63d19b312a
+AUX lame-3.99.5-tinfo.patch 768 SHA256 75e5f5be5a18bf5f436ab9622113502a889b90b6b433f1ccc1c7d885deeb8279 SHA512 504428e0a0b43c467848296c219ac855ffc9bd83fadb54107e8f6b99290b91bc36457635a092fc121972a3c89918f2d81b42f98f6d007f9b571c7bc3f9c2895e WHIRLPOOL a12b054a2191761d969ca866c18b043067db1c0ee00d7d4849fa2f599a36231c2d797e483b4567fceee558987987d76f2c1c1c09fc8463d43e4ac2e92a4cf295
+DIST lame-3.100.tar.gz 1524133 SHA256 ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b WHIRLPOOL 6e940e2995dec8d1f6b73b87fc5441f9d85bdccfb3faf670ca06f9001ce752e9efbad17dc8fb5641e0e14e4e27aa2ff33f4c2c9df2fafd5e522ca0894e4c8efb
 DIST lame-3.99.5-automake-2.12.patch.gz 536 SHA256 49833b952d846405fdcc8d87de55f60dda5fb2268e1b36861c53dfd39dbd275d SHA512 9d6211e257d573ced5c29c43ba5d5cc98a231b213d6e0cfc352b14776c06c9e656ed1873d5caae466afb27dfe753eeac0842c7221a8538ccecea8f4ba0f8bfe2 WHIRLPOOL 506e505cbf8659c3f67084565fc581e4dee3ba2016db3d835e3e63d9eca0d4383443e7596229f51b349c1f8c53ef42a581761d27778de4c1e5b698c85418b401
 DIST lame-3.99.5.tar.gz 1445348 SHA256 24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff SHA512 ce62d7eb9fc8c53c343374ded30f11153a296910f0be7e649197bca7412c6660aad1aa6143d56b750f866229eb492cf7bb4f682535c383fb4aa57d7077d8b4d8 WHIRLPOOL c238107bfb824c67c639875547e24b64ceeeb22125800af753ca42de129138f480574a6cfe132bc2c9cffeb39e54b6d57059be69cb41bdc164cdbf29bd95afe9
+EBUILD lame-3.100.ebuild 2233 SHA256 3280b37ad642b0a237449a5d652685d071d76e8ec9bf33d5e71dc050d67ce00e SHA512 268442710208f82fc8e600fd7b7fa8327dcae6d026eb26c72517ca223aa9f88c31303b775bf858dcfc84587f47bec2977c3193d3e7ada73e6654a8fd8af60201 WHIRLPOOL a408a75519a0037fb6c08a653f0b03924163b720862d682cdff0a009e5436d07a40d4948de9829e2a1ce76a5875b1d1e56c49b372a344046240cc3ac9a90784c
 EBUILD lame-3.99.5-r1.ebuild 2385 SHA256 f922424473a124a8da58c4b7f53b80c3481252fade01e94fa0a096977b5a7a9e SHA512 1556b27959f39d8a324922be3ce0a472803b8eab4bd47311f7e3ff7a567df3d65a654b51310597f3f7e27fec25a24715fe0fbac0a8f68c608acfeab8e29ae9bf WHIRLPOOL b0b6cd13ea1c0db9407ecb2245e6f143176dca6fab5a9fb4ad234b213624220ec27bbd13b1f3a794a46d998b10a20fa0463c37f53faa95e7c07a0b72594f22d3
 MISC ChangeLog 3967 SHA256 cba2a8250a14dfce2a88981f3d162228874e5d8dc150396f8b87d4fca7faa99a SHA512 3075cc97e089a57fe4cb8149cfe11602cf2bddafc628f26702502b71104bdc8669ca43f637053bf51bdd2343b605bda8e6567e8504a1a63d063d6004f16d95ce WHIRLPOOL 9ba9c5dcadd19974fab507ed2c906b065e97a8dd0529b37cdeab839b5906edd85e33fad0394e272791c29a280902d74a6ef510dc5ae2dda7b47e3f5d251297a5
 MISC ChangeLog-2015 23341 SHA256 d275b2762420a52827eaafcd4fea3c4c3ec52f32d0c06ec62aba48d408cf6817 SHA512 084b9e0d4ffc5eedcffe35239d1632232755f2f6604d9e6b12763f380eb06aa8886a5787143d3570f5846845a2cd91654ae2e20dfbd24faa11ca8738aaf9d931 WHIRLPOOL 951a28e8a998711e9c340f129b32ad75122bca2090d25e894d7c92cab90cca2b610baabb5ce708a755c7e6e15782c9e68bdb83df8ddeba5820c6e8729e4b75f1
diff --git a/media-sound/lame/files/lame-3.96-ccc.patch b/media-sound/lame/files/lame-3.96-ccc.patch
index 4d3491ae4256..1ef2fadc58a3 100644
--- a/media-sound/lame/files/lame-3.96-ccc.patch
+++ b/media-sound/lame/files/lame-3.96-ccc.patch
@@ -3,8 +3,8 @@ configure is broken, fix it to respect CC.  This is only
 directly broken for ARCH=alpha but would affect anybody with a
 ccc binary in their PATH.  Bug #41908  (26 Jul 2004 agriffis)
 
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -915,11 +915,9 @@
  alpha*-*-linux*)
  
diff --git a/media-sound/lame/files/lame-3.98-gtk-path.patch b/media-sound/lame/files/lame-3.98-gtk-path.patch
index a5843597485a..98925c01a30b 100644
--- a/media-sound/lame/files/lame-3.98-gtk-path.patch
+++ b/media-sound/lame/files/lame-3.98-gtk-path.patch
@@ -1,5 +1,5 @@
---- gtk.m4
-+++ gtk.m4
+--- a/gtk.m4
++++ b/gtk.m4
 @@ -0,0 +1,194 @@
 +# Configure paths for GTK+
 +# Owen Taylor     97-11-3
diff --git a/media-sound/lame/files/lame-3.99.5-tinfo.patch b/media-sound/lame/files/lame-3.99.5-tinfo.patch
index cb570e7880f0..29d386d01bd3 100644
--- a/media-sound/lame/files/lame-3.99.5-tinfo.patch
+++ b/media-sound/lame/files/lame-3.99.5-tinfo.patch
@@ -5,8 +5,8 @@ like used in debian and gentoo
 
 http://bugs.gentoo.org/454322
 
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -372,9 +372,10 @@
  
  AC_CHECK_HEADERS(termcap.h)
diff --git a/media-sound/lame/lame-3.100.ebuild b/media-sound/lame/lame-3.100.ebuild
new file mode 100644
index 000000000000..1c19043df7a3
--- /dev/null
+++ b/media-sound/lame/lame-3.100.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="LAME Ain't an MP3 Encoder"
+HOMEPAGE="http://lame.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-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
+# libmp3lame for multilib and these deps apply to the lame frontend executable.
+RDEPEND="
+	frontend? (
+		>=sys-libs/ncurses-5.7-r7:0=
+		sndfile? ( >=media-libs/libsndfile-1.0.2 )
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	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
+)
+
+src_prepare() {
+	default
+
+	mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm
+
+	sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die
+
+	use cpu_flags_x86_mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
+
+	AT_M4DIR=. eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable static-libs static)
+		$(use_enable debug debug norm)
+		--disable-mp3x
+		--enable-dynamic-frontends
+	)
+	use cpu_flags_x86_mmx && myconf+=( --enable-nasm ) #361879
+
+	# Only build the frontend for the default ABI.
+	if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
+		myconf+=( $(use_enable mp3rtp) $(use_enable frontend) )
+		use sndfile && myconf+=( --with-fileio=sndfile )
+	else
+		myconf+=( --disable-frontend --disable-mp3rtp )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
+}
+
+multilib_src_install_all() {
+	cd "${S}"
+	dobin misc/mlame
+
+	dodoc API ChangeLog HACKING README STYLEGUIDE TODO USAGE
+	dohtml misc/lameGUI.html Dll/LameDLLInterface.htm
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}