Apply upstream patch wrt #512432 by Jason Miller

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 98 insertions, 17 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index cb8a4b9e5997..fa774816375d 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/flac
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.178 2014/06/18 19:27:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.179 2014/09/27 22:16:21 ssuominen Exp $
+
+*flac-1.3.0-r1 (27 Sep 2014)
+
+  27 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/flac-1.3.0-metaflac_strcat.patch, +flac-1.3.0-r1.ebuild:
+  Apply upstream patch wrt #512432 by Jason Miller
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> flac-1.2.1-r5.ebuild,
   flac-1.3.0.ebuild:
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index eab6f5ce4493..eb1f08fb876a 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -11,31 +11,25 @@ AUX flac-1.2.1-ogg-m4.patch 2852 SHA256 7c8c2c4685894d429472cff0630a3873b7654fa0
 AUX flac-1.3.0-asneeded.patch 644 SHA256 cc00133b8916f29e750b7eb80b9b3180a8f7c4b6cba9cf59540edbac3d1e21d5 SHA512 0fcf92e98b7ac03d5e4ecddfb0827591837bae4f8b3cb03027d1220f06d6422fec3636317c5229e6e0c086bc924e4d0780050abb2de65697b883e6cbf4bec85f WHIRLPOOL 6652f0ec8bf19dd854eb1992fa108dc3c243938574a75f8a12d6b16809759902177be28556d9c9e2117421ead90cf13383a9f05285859be890e113e96ec74bf5
 AUX flac-1.3.0-dontbuild-examples.patch 723 SHA256 8330ab837796cf94eb5c62c8ef787018b10c6a0e27cdb51a34953faffc653b7a SHA512 f5e8414956a3aab75f512c4dd5c28fa173198d28fec93ffd289f55d5ba5f604fed116854a1347f8bbfb6c0cfc59912707869177465cde346add97e485993e5a7 WHIRLPOOL 830f991657e9c816a2a19e70a674f11e57da03cbd985729e0e7b47e57da05f008f2f90f01208b4715ced2a69024677dc18a45fc96bf730973edc439076484b61
 AUX flac-1.3.0-dontbuild-tests.patch 2111 SHA256 31d1a8bb80d623db4cbac8182e3b2027b8498f9bf77d5baf38acea9558dea970 SHA512 50329cdb766111dbda41856363cbba74dc92e7348605e086697778e7004cce514ff9452c1d5bd72e327c9d7182af218e74d82625f6cdcb977a7dad1cf3d07995 WHIRLPOOL 4ab0ea936c6d4f9e28684f806c86dbe94bd082892ecdf4c5b4917cf3a738ad544e9f2336b678f904c2614b8e8c33aadf1326583605e5a6917e7fd87f1f5f4b00
+AUX flac-1.3.0-metaflac_strcat.patch 503 SHA256 0a2efaa33e933d2fb3b8aca8cba7704e222edf68552ec283bf2c4f40e513a5a9 SHA512 461e0f11dd5e04e4ba05e535ff38fc8ae7a085686945b809715de232a1c14ff5721d6e7fb70f40025c2740789d90cda464ff008dda7880e1f147c936d0e41903 WHIRLPOOL 906503c9a8702c6e5d08efd6a0389648e4845b498e6db8fb4f7b959a53370777a2816ec85a91e008128f7bd9baafb80f9dd62b4470356fa518fc31abca3c4762
 DIST flac-1.2.1-embedded-m4.tar.bz2 8545 SHA256 a32bd229ba454be595e66fa257805951c4484aff9f8ec2116727ca2b8a48fea9 SHA512 e0aee18748ad5d47dd637597a30824fab81b70def18184471a61c5a6315df0b3dfdaa0e12f22b69ac88d0c52ec848e15b488e345a5e2920369b85c0666051c0f WHIRLPOOL c72b485a023c45643e13e2c640157a62140cb25dd09e7f646050073ec90e6ec74dc1ba93031dcce9552b55f5bdf6faab88bffb326babec2f2867317194b86030
 DIST flac-1.2.1.tar.gz 2009217 SHA256 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf SHA512 39b216239341fbfe210c3a2fc0d0531ecae26c425365c4b6d4fc1081e44e6dc7a9aba8d4c79cc8025386d0a7bb0d25c413c9b64cf7da9ab04ca34a56d2699787 WHIRLPOOL e38815e1c365f26a990752779bc1fb84a76d9d422cac9d66f1e55b5fcacad675006939a1d4ab72f20c36d8a80be4218a109317cc6e90f12abc9e1570dbe27319
 DIST flac-1.3.0.tar.xz 1084256 SHA256 fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc SHA512 9f62a83c2041ec6f02c0df65b796a920a0cd6ba6c2c034bb69535bca5df57ed69f96fe4bb41c0d5ccc229241d90efd2c7ec3785662b5a582a8e20e2e991e6477 WHIRLPOOL e328f41db3aa7f6404a1596ac2fddd437fefc031fc9f1ea91420104054d338029120d526ac58b2a6994811a8f2f7cc107e120789113340e48dec842ea9013196
 EBUILD flac-1.2.1-r3.ebuild 1727 SHA256 4dcca775581535ad7083186296931e090bccd4971978d977fb89c3f2695eac47 SHA512 7081ff361cd75c2d470ee693175539272871e437d890f2a6a5aa8abbf2d175fdfa600f119b771ae47c8dbd27f3449771ce47d21f75f78ec58be61b4db089a5c5 WHIRLPOOL 46f7a003161241836b91cf8e3829cf9f8cba6844d4ee64e42f305a4059e624043730ea121c17b61b63d8ba8e6ed43780951d2ff5e1f9562f4c5e5791cb89039d
 EBUILD flac-1.2.1-r4.ebuild 1853 SHA256 410b029efcc50e0ca4a75210adaab4043408e0fdf8f2f98783c89493cd35da5b SHA512 57ce7a8aefb2bd00618c68190e0e886571fbdfd4b436714deb1e47825d4c3cdfc32ccf7364662d2f9985e2e6080e9bd2acedd55349a845c9e7ebbf43002d2099 WHIRLPOOL 0984eb79950b63714555d082d85acbb2fca91bbf69ededfd5be6ef7cc865d0a24d7037d36bfd84f0d272329add083b2347533d747b800df826829050eca41fd2
 EBUILD flac-1.2.1-r5.ebuild 2099 SHA256 1ea1082ea6e3831f18a7c965fa5a16cb591e543c1d1318acb37eb308feecd01c SHA512 1887550da9da6e927b039bc2b8695affe526b06d72ae1ca42f38362f710a751e5b5aa0b1301b1709640e08d8d940e5691f53014bf9c30ef0a38659ec7af94e2a WHIRLPOOL 6109d2d0d6e6f85f2baf358f83ce0828e72b6bd0816d4f3d1447e23c72ef5ed965f7fd62c1515f415818c2d8c12f9662545eef7ce9b742bef5b64ebab272437e
+EBUILD flac-1.3.0-r1.ebuild 1760 SHA256 90c3097f525c69b998a3463aa92c78ba972d2b3a939a2c529786b30cb6be5d21 SHA512 8a07b8bb8ec269249ac2f35e076405b90cffddbf8fe9acc93bc0dd09c7658abb75d8a55866374562145cda59d5ec3409381cd99a5d12ab8571b36b487187eb4a WHIRLPOOL c1493ed6f539604b1691d719aed6bd326dd592b91a51e1707517baba4961508e9230c21f744a8f197af6097989f25500b8967e6c18e30d6df15f6d9e45ace6b4
 EBUILD flac-1.3.0.ebuild 1703 SHA256 594e99afaf11466a1ed44cbdceced56fd7dda08b41d216795bbe51cabe0fdb53 SHA512 d9c1dfa07702188f292aadfeb07fe7b8240494c6969c94caf0fdaf1dfeb20733338e88fb39754d9c511eed60f4502264ab65c0bdbd5faf7fd9ef50265cfcc93e WHIRLPOOL b8fbf4175ca4fec9e2ef084a28fc49493c832ac1b28d4a00b8fa51b673131bc0639bce86133975964440cb5a5eb8d70ef814bfa583da80f346300a8c0a54eecc
-MISC ChangeLog 25119 SHA256 6cb5a87f92517e596c7ec3541bc3a03b302173c408b11662459f38bc9a3de69c SHA512 ced581716ac4ffce8196c59ec92dc558ec955148947e000ec87a656d5000ee9838084bbcbb9652c79e1b72c44d1a7620986e020ab9e27c0b958d650418728339 WHIRLPOOL b41699e01143629b458bdbfa5966e668a388447200e4d1cf76134792e4f602a7d1685842d2b357541a14760d5399ce7f21ce049f64e0da0787f8501da22bd1af
+MISC ChangeLog 25324 SHA256 e4818c3564b04fc07c100ab730a03c16eaaaac3c425faf631b18ffdcf427c61f SHA512 f7d2bbd013e0086ccf187de6a74d4738f15f6da665fb8a4f5e7588617af1dd8c8be4e7b20550a37c404043e6ac76d4e5e1194735d0ef9ec78d864840aab143e5 WHIRLPOOL 0a4cd04a76947f932bb15c8445db3737051471dd91b52bb5c2395722e91ed7d7213329212368060108822ae1aece3e1c10f178bef7ba16eb9a92d57e31db302a
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJToegbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOxYoP/AwmbS+Zx3eL3AzrKcsWnilD
-TG3YuQS5NRRyYA/z/Hvp3Wy2NkQrW1KvZxIr6JbjE2yMGkO/lotI3AL1cEPVKHw5
-U/kJ9ownsBK3vdM+yTW2aFvHB+hVUPk73zkVcJxOVWuuJeeCiF15HgNg8el+Lj05
-NW/crzshwHIeXM+Sdv64bEOy9FzIYGbHvfeBxyYhJkdtKpvaetWtt7iwoXh+WxEl
-9i+au7KJ9YyiSXwpuxaDfvq4idy49Z1Uig+qx81Unk1RPlf+VKLt4EdKkuuWe6Hg
-yc6Xt7m4pZTkdxrHE6S08aa4XV9rSkrTkL8xLTlXA7CLVxGrPE4OMTw8c0wEYEmb
-Gjgjj5LThyc4sPMNCcMbCmKf+V3f6+qNTwDt6JYAHSlY1qGaowTjqBfb/88l3XcR
-0qmnB/0k8Ui69s8q3bB9yP10EhN0xUH8RYV5e/NDkUg/ZJyh1TH9L92rU5vN2Gda
-bW9dkT4+OrYqVSFj8o+o6ccQbszc8WBrs+UF+7Ezz+D9/BoMUq/ijF6nzeck/o0x
-vRBQ0jq//fWerDe2s9MFfT7pPqOTUBbxF8oL7eN1ILH6iGURmKB7iZapKDbYN3bi
-5vVhTr9tb0FTZ8wILtRxHKx374rXO6kDfMu9X+dWqajcmEE8smZHWC69djwGeGAm
-t3cwMyBrjs+Fp4iF3nhu
-=XljF
+iQEcBAEBCAAGBQJUJzcuAAoJEEdUh39IaPFNxPwH/iczJcvtzEf5N7xCJRwUPUi4
+BFkwZl8RmGD5NeFc1zfcoSW85epB69zWjdYVzmPVL6pvlLIKPGj9eRNppGw07bo7
+uTHpsauRLYy20/5pNsCNhid6Ev8fjwROnn/ooigq/13xochd1ZPDAilqWXTtS+jS
+SDWtTCnmntxLv47wsgYIYgVFcQK537zI5kcUf/9tOuhASgCqu9wfuO5mAqGEzfDN
+KZ+7NkeX3wWlyDJARJ/1fRlZuZFtpW5omVSKx0Zs5FmcizL81ylFwMtxZy8o6e96
+MDcTne3RW0dsefdF3AFv0qDTnAKZp9usEKE57RmAppyt93pPd8Qwji+zZpzTTyY=
+=l6KP
 -----END PGP SIGNATURE-----
diff --git a/media-libs/flac/files/flac-1.3.0-metaflac_strcat.patch b/media-libs/flac/files/flac-1.3.0-metaflac_strcat.patch
new file mode 100644
index 000000000000..848130173cb6
--- /dev/null
+++ b/media-libs/flac/files/flac-1.3.0-metaflac_strcat.patch
@@ -0,0 +1,15 @@
+From upstream:
+
+http://git.xiph.org/?p=flac.git;a=commit;h=606fdfcaece19d3e05434bde57c289102a369069
+
+--- src/metaflac/utils.c
++++ src/metaflac/utils.c
+@@ -75,7 +75,7 @@ void local_strcat(char **dest, const char *source)
+ 	*dest = safe_realloc_add_3op_(*dest, ndest, /*+*/nsource, /*+*/1);
+ 	if(0 == *dest)
+ 		die("out of memory growing string");
+-	safe_strncpy((*dest)+ndest, source, ndest + nsource + 1);
++	safe_strncpy((*dest)+ndest, source, nsource + 1);
+ }
+ 
+ static inline int local_isprint(int c)
diff --git a/media-libs/flac/flac-1.3.0-r1.ebuild b/media-libs/flac/flac-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..7222ac3dea47
--- /dev/null
+++ b/media-libs/flac/flac-1.3.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.3.0-r1.ebuild,v 1.1 2014/09/27 22:16:21 ssuominen Exp $
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+
+inherit autotools-multilib
+
+DESCRIPTION="free lossless audio encoder and decoder"
+HOMEPAGE="http://flac.sourceforge.net"
+SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
+
+LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="3dnow altivec +cxx debug ogg sse static-libs"
+
+RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	abi_x86_32? ( dev-lang/nasm )
+	!elibc_uclibc? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-asneeded.patch
+		"${FILESDIR}"/${P}-dontbuild-tests.patch
+		"${FILESDIR}"/${P}-dontbuild-examples.patch
+		"${FILESDIR}"/${P}-metaflac_strcat.patch
+	)
+
+	AT_M4DIR="m4" autotools-multilib_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable sse)
+		$(use_enable 3dnow)
+		$(use_enable altivec)
+		--disable-doxygen-docs
+		--disable-xmms-plugin
+		$(use_enable cxx cpplibs)
+		$(use_enable ogg)
+		--disable-examples
+	)
+	autotools-multilib_src_configure
+}
+
+src_test() {
+	if [[ ${UID} != 0 ]]; then
+		autotools-multilib_src_test -j1
+	else
+		ewarn "Tests will fail if ran as root, skipping."
+	fi
+}
+
+src_install() {
+	autotools-multilib_src_install \
+		docdir=/usr/share/doc/${PF}/html
+}