Port the lost automake-1.13 fix. Improve doc-issue comment. Prune all libtool files.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

3 files changed, 38 insertions, 30 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index e82e34c14c26..75de0d49fab8 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/flac
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.154 2013/05/01 21:40:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.155 2013/05/01 22:11:27 mgorny Exp $
+
+  01 May 2013; Michał Górny <mgorny@gentoo.org> flac-1.2.1-r5.ebuild:
+  Port the lost automake-1.13 fix. Improve doc-issue comment. Prune all libtool
+  files.
 
 *flac-1.2.1-r5 (01 May 2013)
 
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index cf4e5ed1a0c7..fd5532b5a7a3 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -12,25 +12,25 @@ DIST flac-1.2.1-embedded-m4.tar.bz2 8545 SHA256 a32bd229ba454be595e66fa257805951
 DIST flac-1.2.1.tar.gz 2009217 SHA256 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf SHA512 39b216239341fbfe210c3a2fc0d0531ecae26c425365c4b6d4fc1081e44e6dc7a9aba8d4c79cc8025386d0a7bb0d25c413c9b64cf7da9ab04ca34a56d2699787 WHIRLPOOL e38815e1c365f26a990752779bc1fb84a76d9d422cac9d66f1e55b5fcacad675006939a1d4ab72f20c36d8a80be4218a109317cc6e90f12abc9e1570dbe27319
 EBUILD flac-1.2.1-r3.ebuild 1720 SHA256 1e4bdd04c8abd7f1ddc791bb90d73f7db09eda58f2f73a7c4decd0ad70a9650d SHA512 e189d700c228cb91714de43879768672e00bef04f471d69bf98044ef670a3400c07a277c29c4c42b2a616b4de044babe6c915ff13a40a7e5792f9d509157901a WHIRLPOOL 1fe70a1ff54665068f80e229eeb6d0ce62c5bea13a3cbabd251c8ae90bfc11add29e3bab41420254fc83cf2bafc4a4e26df5188bdd170e44411188a6114227ad
 EBUILD flac-1.2.1-r4.ebuild 1863 SHA256 28bf826fb81a2244ddb6c4edf776068bf4d7b42824b4bd2ff6c51a9ba11284a2 SHA512 9a2e782e6a2fc330c80ded7af82b31ed1006230f112ee8b6e5cb02e78011690f90c137a5b90ec44ede429f9e74788bf41e361569a38f0ca1db3eb6d12a996a8c WHIRLPOOL 430d83d8aa75e4c7f71ab36c1d8946d561e4e7703aa3fff18f40a0ec26be480d6c2bf4b12284aceca00b3b917a127ffe05cb4eacfb5e904e77e53e8e65b459f6
-EBUILD flac-1.2.1-r5.ebuild 1943 SHA256 e2aacb02babc7c2e28021af005ec984c02410d35f2d062619352bbc26418322d SHA512 7703b8830ca2fea23917124bf8aadc587fb74946f3736a32efe12cbdf0eb387191c52fc94bccc65c5ef34d6401824831effbb4f9d591788dae5195f99d96294a WHIRLPOOL 6f340416ee0aad3cc6e70302dbed244471b0c1bdfa5b2608e0ebdf3343f2a47b9275fd59aa86b3829e912f6d53ba67495bb405d58b572cc7db5698fdce30b893
-MISC ChangeLog 22158 SHA256 d240d3bdf0257e7bddcedcef7b0a30a45ebd6187d7934aa20f992e790c6cdbda SHA512 8fabbefa0f92727dce0d59c681d897ed9410274b0e8cf1e3a5e7facd909028051e9000421ba9e2728d8aea944316c8983bad87dad9cfd2a9bcb8e2cc5d3fb589 WHIRLPOOL 31c83ebcd7e415a289c07c3d4fc583517a4add59d984fc0af879c69aa180b4064fd80f3a6cfe664d05daed6e080999373fe7286eb16c4fac6dee7bd7c4390efa
+EBUILD flac-1.2.1-r5.ebuild 2098 SHA256 41000b7211dc420c9ef992ef68779e76fa3386c79cb825f78acaa279d376e08d SHA512 3c0403ed12a0f0bded78053e7738ce2be5ffe744c1445805d2565731d568c41d5db8afda5a3f492a713e418826039d620aa7bf325df3e3ac44d478c490678c96 WHIRLPOOL 8d8c67aa5c0713bb4bc46304c846220cd7f6998d9e84f7035823029073f6158e06079dcb0856545caea1a211c7d678088e089475a21f7690a8f3ad6e1f72d5e2
+MISC ChangeLog 22320 SHA256 bfec1bb9805933b2f1079379a2bea0da3ba6372e76f8acfd4eb05309798f11b1 SHA512 a9bf5496e1145aa570c971fe157c5e0deaec60508bddddcb85f041c8d04efa5b7b667677b75f645a1266860c98da461e3159b0680a889e2232d4d7718976bf79 WHIRLPOOL d3dbacb411e9673f732983f72a0fc66f31f6df42ca813c10499eada8a0b12a0b0420df4014436e41346e2eb015d26bc8a0b54e10de235b9fcfb377607839dc29
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRgYu2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRgZMVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD8u8P/0Izaz6TjcAVKPE3pFnfpeIH
-ivIF/mXh5fPQW/y8sIGKb7gRgxM+yx+61irDmsGkBP5P8Rd9AujA9ROOo0YIJSo7
-Q/N0b1y7fN+S2+eX8CZXYFvGxtO42B9tsFwQNDx+OCjI+DuhOd4G1aTvbA7b7k+O
-8JT6Hc1DtO76fAqLTc130iffv5wMQQuD2jQM2jkBIsbpbupj0fuoCV91SGbCUr3b
-OfYs42l/+D29vFuIbYjUO0gCOTZMZHVpQ8JTqnshbqK0BQ65OAWLPy1ivJkSFOUR
-MwmMYEhEgTRq/L515h0FQjTOucrLOfIjrrFLp7l+bRzeaYYO1qKhQW4v84h0ytG/
-5ohDqEAQQNF0apPGlp9iaS2bJzhVx28+HOKoqHO1RsSJP8LxlQdUc7VhU9aCTRLz
-AE0FMIIBLl2YY2c1R5YsHLtuj1YSLVYmnHOTcQ8Q++OX42adP/spcEaMN6aoYpl3
-sriq7tqIhQ0x/wEBPRVU8CZs43Ki5ZatNvWAsJS2qnJUkOvRXAt0Mo8Xb0Y02KAC
-Bi3MP4hMYL69OGcJcqOcxxu5Vw77qDOX/pddJ7n7Nxnj0czM0bWezfFJkWMEOHnk
-WBxZsJkXECWo40elKKz6rB7QmPX9LkIpyEVPMlwL018FB7VMjVXI7rUA6vMRzhLG
-g86+wsRJEfoFtFPXolOK
-=JK3u
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDBHYP/j/EB72rbDuTxuf6GX/gTCjZ
+nhKV9cvC0H5o33bt64TIvlF1yFSsv2VPbkUgowGU8nq2I42NGtNcCcFZVwdHKIQf
+V0XuNTg+vnyXNCXGZ5ClylKp7yywb1nbiiuG9SY9nlDlrDacxjWtWVUeWKStx8nH
+pjJdxzzLSLPdeOS19roi6sfq+l5cBFxfQVMNKei35+1PhdSjgGHqMFye2ERCYqP8
+2hqNvPUIsiXqWWBH0kZuw9IWE5ZBip6VCFNgXEk4YHeYSbHHQiRXGhFxd2OO74iP
+8el34sdsfNwwbNrPQZvQbyAjZJjzJSR/VbIw9XznDjsfs793BX5YBmNsKR+KBrdp
+MwQxEnF0RdZFtrpSvva7k2kpb6wToL6jmIOAz2FukH3tyDdsE6IiK9FdfopqklP5
+AYDJeyG55564wUgcPX1kD/ff2VuP6vZz4UBvkdp+pv5SuUTxYd+qqbyWTTMTAnTs
+apt5YFRwKWk4LXmk/zUeohKEBE2SlUt0UEYZ31vQ5mat/lCzqkwjD3KzCbtwoXv7
+omqVv+URXoiMNq6GPM/A150vKMAArcHg8jw7gqerQ6DFfzeVPoIZOnkNmX74ol7s
+Id2vo4oOUvwpdLIritmdZqMcf7GFPZbXCTfchOtDAcebt0+H1ozbE5aK2T8UbUdF
+gfCyiDxy5e9VhuZYuHSb
+=Zycz
 -----END PGP SIGNATURE-----
diff --git a/media-libs/flac/flac-1.2.1-r5.ebuild b/media-libs/flac/flac-1.2.1-r5.ebuild
index 21cc6c45688c..db6c55206390 100644
--- a/media-libs/flac/flac-1.2.1-r5.ebuild
+++ b/media-libs/flac/flac-1.2.1-r5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r5.ebuild,v 1.1 2013/05/01 21:40:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r5.ebuild,v 1.2 2013/05/01 22:11:27 mgorny Exp $
 
 EAPI=5
 
 AUTOTOOLS_AUTORECONF=1
-WANT_AUTOMAKE=1.12
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
 inherit autotools-multilib
 
 DESCRIPTION="free lossless audio encoder and decoder"
@@ -25,20 +25,24 @@ DEPEND="${RDEPEND}
 	!elibc_uclibc? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-asneeded.patch
-	"${FILESDIR}"/${P}-cflags.patch
-	"${FILESDIR}"/${P}-asm.patch
-	"${FILESDIR}"/${P}-dontbuild-tests.patch
-	"${FILESDIR}"/${P}-dontbuild-examples.patch
-	"${FILESDIR}"/${P}-gcc-4.3-includes.patch
-	"${FILESDIR}"/${P}-ogg-m4.patch
-)
-
 src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-asneeded.patch
+		"${FILESDIR}"/${P}-cflags.patch
+		"${FILESDIR}"/${P}-asm.patch
+		"${FILESDIR}"/${P}-dontbuild-tests.patch
+		"${FILESDIR}"/${P}-dontbuild-examples.patch
+		"${FILESDIR}"/${P}-gcc-4.3-includes.patch
+		"${FILESDIR}"/${P}-ogg-m4.patch
+	)
+
 	cp "${WORKDIR}"/*.m4 m4 || die
 
-	# html docgen seems to cause trouble
+	# bug 466990
+	sed -i "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" configure.in || die
+
+	# html install fails with out-of-source build
+	# XXX: take a closer look at it
 	sed -i -e '/SUBDIRS/s:html::' doc/Makefile.am || die
 
 	AT_M4DIR="m4" \