Bump patchset with patch to fix bug #134666. Thanks to cuicui for reporting.

Package-Manager: portage-2.1_rc3

3 files changed, 15 insertions, 95 deletions

diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 65044a6a7baa..a8d19eb122c2 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -14,7 +14,7 @@ DIST flac-1.1.1.tar.gz 1467204 RMD160 2bf336514bf76d7d12279a896deb919a4194b36c S
 DIST flac-1.1.2.tar.gz 1516235 RMD160 58656837b02e211eaed5010d84c4ed59841c82d3 SHA1 65501f3547df99b153951edb2ee7bfc13dd56946 SHA256 ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0
 DIST flac-patches-1.tar.bz2 4083 RMD160 859ec8552b285a7e1eb21692c423b0f5c4262b7d SHA256 96f8a55fb220164c3d0a09467947a50b5d6ab475fdd7304c099e6416d37963d7
 DIST flac-patches-3.tar.bz2 5210 RMD160 44992428e32a31abace836d6a7d3b58513fbefef SHA1 878dc1d649a10ece5ae6eb23e7bb0b52636101c5 SHA256 a4e5f7146f8f7ba75ea6a9e760890c1fbc378c77415a5f8e7a87f3afc5055436
-DIST flac-patches-5.tar.bz2 6786 RMD160 e122aaffe65fa5dcb3416063844947457a28a7fb SHA1 23a6454e373d1b383c458658ce0eb7ae5b639660 SHA256 f21ad693d93d50136ffab832dcdb99bf2c0106e890e485b03fd646be75a264a8
+DIST flac-patches-6.tar.bz2 6902 RMD160 bdceb952a30a28729cf0400516c209d0b99e03fb SHA1 8cbe60b7717329a626d919b354b2fea8fc094f2a SHA256 65c71e294ac521c5f1b6cb7dfc9df7a69e716711d79ea3a58bbbeaa43862b419
 EBUILD flac-1.1.1.ebuild 1688 RMD160 3598eb48f04ae1a175638ea098b601005112bf24 SHA1 810009a56a7d865ecc51d89c5e5148a60f16e87b SHA256 6e6841883977b43220c2e583631026d89ec12e56b7a680313bd9d141d91ebf8b
 MD5 362483021f51dc2248f95b0ffda1aaf4 flac-1.1.1.ebuild 1688
 RMD160 3598eb48f04ae1a175638ea098b601005112bf24 flac-1.1.1.ebuild 1688
@@ -27,14 +27,14 @@ EBUILD flac-1.1.2-r4.ebuild 1807 RMD160 7b0cedb8784a603e3bf2dd0e8e2a014b700d29b9
 MD5 4e34838e16cc684bc320e0a3234594d6 flac-1.1.2-r4.ebuild 1807
 RMD160 7b0cedb8784a603e3bf2dd0e8e2a014b700d29b9 flac-1.1.2-r4.ebuild 1807
 SHA256 4241e620af7f041958c81f0b6e5dcbed377cfa25504549a48c7cf7d9d9197273 flac-1.1.2-r4.ebuild 1807
-EBUILD flac-1.1.2-r5.ebuild 1956 RMD160 d30150df7e610c714ad79b509092ba9023e30b0f SHA1 65c11b302348badfd20727baac2145ee97bba4ed SHA256 c5213bbea4a20b0aecf7184af992645c36c9fab90f448a71aec3f4c38d49a3bd
-MD5 bacf6f0b214be8e36c81e729bcd81df8 flac-1.1.2-r5.ebuild 1956
-RMD160 d30150df7e610c714ad79b509092ba9023e30b0f flac-1.1.2-r5.ebuild 1956
-SHA256 c5213bbea4a20b0aecf7184af992645c36c9fab90f448a71aec3f4c38d49a3bd flac-1.1.2-r5.ebuild 1956
-MISC ChangeLog 12196 RMD160 a2b06125238c3f164f35bfcd10fc00f6381969ea SHA1 a2ea468adcc48b198570bf3a7addabd79786cd9e SHA256 aedcccf0504a22a5133028b3b1019d36ed8fd6d65645a27c54d6139b7691b97d
-MD5 26243de789a7bf170c9306802458c0a3 ChangeLog 12196
-RMD160 a2b06125238c3f164f35bfcd10fc00f6381969ea ChangeLog 12196
-SHA256 aedcccf0504a22a5133028b3b1019d36ed8fd6d65645a27c54d6139b7691b97d ChangeLog 12196
+EBUILD flac-1.1.2-r6.ebuild 1956 RMD160 bd23d996ae5e2d779bc0fd5ffb209bee78b39a3e SHA1 14c85c4d364651b66ea72c45a085b3d999f5b1da SHA256 92dcbad099db052b6e80083376ed4be36a6e6b4becda6eeb1139636cf7b4c714
+MD5 ba892d6322947f4e3bb373643b8f1b49 flac-1.1.2-r6.ebuild 1956
+RMD160 bd23d996ae5e2d779bc0fd5ffb209bee78b39a3e flac-1.1.2-r6.ebuild 1956
+SHA256 92dcbad099db052b6e80083376ed4be36a6e6b4becda6eeb1139636cf7b4c714 flac-1.1.2-r6.ebuild 1956
+MISC ChangeLog 12407 RMD160 391151f121c6d3d10e32bf42ee766336243a0a6a SHA1 3f162c1969dfce8abc5088fbbda088bf6cdb7a78 SHA256 fb33e482acb0cd7667789864ab5c496980831518e9393d1e978a0a263c6f24c3
+MD5 4161024dfc3f8a3363904e8c78fefa09 ChangeLog 12407
+RMD160 391151f121c6d3d10e32bf42ee766336243a0a6a ChangeLog 12407
+SHA256 fb33e482acb0cd7667789864ab5c496980831518e9393d1e978a0a263c6f24c3 ChangeLog 12407
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -48,13 +48,13 @@ SHA256 396d9bdb5eba67bf7f988987bb9ba317315f61ed33f14c0f9cfd0fb04095521f files/di
 MD5 d8454b5b6b0774213bd25822250a7e9d files/digest-flac-1.1.2-r4 476
 RMD160 ed539ac12e4bbc0bfac7d336e68ff4e45c95e62e files/digest-flac-1.1.2-r4 476
 SHA256 7c4fedcf63476ab168d8ca96abdf7c8e50cf8be873fb4a85f2e12185fdbc8549 files/digest-flac-1.1.2-r4 476
-MD5 4caf6b0d3e78755c9abef199f7312396 files/digest-flac-1.1.2-r5 476
-RMD160 9bf5f0f53a2e3f5f71478d78038fbd701fd18c84 files/digest-flac-1.1.2-r5 476
-SHA256 5a44c46a07a93f7410604243660c848b5438ee188bf8380d78620f5f2572200d files/digest-flac-1.1.2-r5 476
+MD5 da0013e62175cb5892ee96097825842d files/digest-flac-1.1.2-r6 476
+RMD160 f32afe6f8dd6b648cd5b9b5206c66af7c0727455 files/digest-flac-1.1.2-r6 476
+SHA256 46ef7bc46233aa1a54d707db6f95c12e6fc529d1efc56a381af68b13c82e8c94 files/digest-flac-1.1.2-r6 476
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEeQfwAiZjviIA2XgRApZ6AKCayKHCSPB9dZNEOE7hpABxPT3ZsgCg17+O
-sKU7bSfq2sRgE0+08bJLPv4=
-=RbjJ
+iD8DBQFEejz0AiZjviIA2XgRAuUkAJ9GEF0JfErBg/N7vzmjQ6EE3YvF0ACeJXT3
+2S0dq+KPOgqvP1gKYY2weNo=
+=KpEd
 -----END PGP SIGNATURE-----
diff --git a/media-libs/flac/files/digest-flac-1.1.2-r5 b/media-libs/flac/files/digest-flac-1.1.2-r5
deleted file mode 100644
index e3f5a13b492b..000000000000
--- a/media-libs/flac/files/digest-flac-1.1.2-r5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 2bfc127cdda02834d0491ab531a20960 flac-1.1.2.tar.gz 1516235
-RMD160 58656837b02e211eaed5010d84c4ed59841c82d3 flac-1.1.2.tar.gz 1516235
-SHA256 ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0 flac-1.1.2.tar.gz 1516235
-MD5 51e57632cee97e1f0d91067606a4ec18 flac-patches-5.tar.bz2 6786
-RMD160 e122aaffe65fa5dcb3416063844947457a28a7fb flac-patches-5.tar.bz2 6786
-SHA256 f21ad693d93d50136ffab832dcdb99bf2c0106e890e485b03fd646be75a264a8 flac-patches-5.tar.bz2 6786
diff --git a/media-libs/flac/flac-1.1.2-r5.ebuild b/media-libs/flac/flac-1.1.2-r5.ebuild
deleted file mode 100644
index ec48b4f28aef..000000000000
--- a/media-libs/flac/flac-1.1.2-r5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2-r5.ebuild,v 1.2 2006/05/28 02:16:10 flameeyes Exp $
-
-inherit libtool eutils flag-o-matic autotools
-
-PATCHLEVEL="5"
-DESCRIPTION="free lossless audio encoder which includes an XMMS plugin"
-HOMEPAGE="http://flac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flac/${P}.tar.gz
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="3dnow debug doc ogg sse xmms"
-
-RDEPEND="ogg? ( >=media-libs/libogg-1.0_rc2 )
-	xmms? ( media-sound/xmms )"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	sys-apps/gawk
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Enable only for GCC 4.1 and later
-	[[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] || \
-		export EPATCH_EXCLUDE="130_all_visibility.patch"
-
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}/patches"
-	AT_M4DIR="m4" eautoreconf
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		$(use_enable ogg) \
-		$(use_enable sse) \
-		$(use_enable 3dnow) \
-		$(use_enable debug) \
-		$(use_enable doc) \
-		--disable-dependency-tracking || die
-
-	# the man page ebuild requires docbook2man... yick!
-	sed -i -e 's:include man:include:g' Makefile
-
-	# FIXME parallel make seems to mess up the building of the xmms input plugin
-	local makeopts
-	use xmms && makeopts="-j1"
-
-	emake ${makeopts} || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" docdir="/usr/share/doc/${PF}" \
-		install || die "make install failed"
-	dodoc AUTHORS README
-
-	doman man/{flac,metaflac}.1
-}
-
-pkg_postinst() {
-	ewarn "If you've upgraded from a previous version of flac, you may need to re-emerge"
-	ewarn "packages that linked against flac by running:"
-	ewarn "revdep-rebuild"
-}
-
-# see #59482
-src_test() { :; }