Fix possible lack of _FORTIFY_SOURCE definition, bug 523144. proxy for maintainer

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

8 files changed, 70 insertions, 54 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 8c518a04430e..e9f1c822035e 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.923 2014/12/18 13:41:39 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.924 2015/01/26 13:45:35 dlan Exp $
+
+  26 Jan 2015; Yixun Lan <dlan@gentoo.org> vlc-2.1.2.ebuild, vlc-2.1.4.ebuild,
+  vlc-2.1.5.ebuild, vlc-2.1.9999.ebuild, vlc-2.2.9999.ebuild, vlc-9999.ebuild:
+  Fix possible lack of _FORTIFY_SOURCE definition, bug 523144. proxy for
+  maintainer
 
   18 Dec 2014; Michael Palimaka <kensington@gentoo.org> vlc-2.1.9999.ebuild:
   Don't try to reference USE flag that doesn't exist, again.
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 846a7f0d8e49..457a9b096285 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,30 +9,29 @@ AUX vlc-9999-libva-1.2.1-compat.patch 291 SHA256 54eb34b32afe6876fa40abac2cb9709
 DIST vlc-2.1.2.tar.xz 19609868 SHA256 219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4 SHA512 24ea51befb30ec2e4f796866bf086d36e809cb97bf04203a4637518c91a3035fa38a8e778aaf6fb3481db49d19236ae88bcbf31e1e4f7ae79b9d7bcc3cf037af WHIRLPOOL 7e4576370ea4a0d74d29b936f7c554c4fa22ca6b5d9260ce76d0e2bddf50826a2472c77746de61c81bd4601bead49f85c5c76a2f7ca309601c7a684c7091d09a
 DIST vlc-2.1.4.tar.xz 19560884 SHA256 3e566c7525478167e18cc53dc75d621e4af91eb40aabb6231e47db25d682d5d3 SHA512 da09744d0da1742a89747a34f749b83a30b18ddfc84ed9ee1a59a1c16cfa4ce0e7d4ddd66e9dfd13d5309b7ff66f72a7d3b2c3837ec740a193656ce6f8b04845 WHIRLPOOL 4929a66f4f1afc44726bb2d88e2e5e9b770811f57d21ee2258ccf84d7f5997c29b5b07bbb41cfc165b78339e4b070eadd5be958059f68d8f6e57b565eb977396
 DIST vlc-2.1.5.tar.xz 19574208 SHA256 6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72 SHA512 37c6b82b4e89f4a14ed391cc677d9325a032e04bcc51a3e0d7d2ccf9e17a7a0deb90d9129e9dc3baf05a1ea9dae9c05e3177ab17a31098aafa6a2cb23388fa32 WHIRLPOOL c13098f922c7b24f3c718e88807a7dcb656af21bcf2be63d2ec7401583680658bd371e3935ba22537857861e0b1b0c4f0e693c87ed20999c679b4a04cddf7008
-EBUILD vlc-2.1.2.ebuild 14268 SHA256 5115c8ab7d11efe4888e5e82bbf30b947e9f522c6844ba1e2655ce1d6ffef601 SHA512 76605bd8e638aea825660e4524de460b7e8d8d4620870a657e9c420596a11d40738c8597a0799b5cbbb306fcd08fa2ddb49c5fe6fcde6eba75112205120fce80 WHIRLPOOL 6633da016d78d1854dc0d83698cd322237eb7e61b7ea70caeadfa3fbc35eec2dcc2218a06f058feea1b7f98fd11d1579d6cad294e71be0b5a3d26627f60f3a92
-EBUILD vlc-2.1.4.ebuild 14634 SHA256 4282c317b9249cf5df28be4d5c4761dfa327248b0fe45329d56074bea5619614 SHA512 b94abc464901a11fd8e5530a5a5e2be25e65f2199f0961ab506ab6281ce03c0558f0f4b4ace6e81accaf8e3b346e18126fa77517e6dfe8ebe81c89f5b7aca780 WHIRLPOOL 0c940e6b46eb70567f910c4017f07bca7d3d48b557c1759eb7c68824b0d7ce915369ab2824c520d1df05d4d906e4290de847a4b40558b91f90c1025ef8b2ac44
-EBUILD vlc-2.1.5.ebuild 14725 SHA256 81ef391e7b7587d31c3108c33b2cb51d175d66efc27c017896c1a1f5250be641 SHA512 bf988d705975c1a671bfa7483a0f894ec3015fd7684600e37a984f7c31bd12089e6fef1ccb97bdde4535435047fbebcad507146d6162889b940b7c5b03f0c721 WHIRLPOOL 8dbccd0bc5d2ed5cc1843081b58fc4d6bd12645a8984e05b8e85f4f994ad9e4ca7062b61299d342bbff98162c4b513ee6aeeae843c080684e260b092397ae815
-EBUILD vlc-2.1.9999.ebuild 14637 SHA256 fff963678cfbc12237423cf04f1cf5ebcae12b1e7f4d46f9d2f0538de56f5dcb SHA512 18a5572ca7169f039f18e6d1cba87c2e700a5e3328d6187c737a84dac60965ff7b22d90a8e39fc65eaee5360db9ca9eda7066f08fb87b2bcf18193d76700e6de WHIRLPOOL 818816c38bf6270a0f3ca15e910baa1c22e226e9741d2e1ffdd16a19103e82994259c683f557df0f73d9697593b7adebae853b1b6ed21e8f47e2a1c727d17a43
-EBUILD vlc-2.2.9999.ebuild 14908 SHA256 5734d38108fac9940b8b0f356216c2d96230bfe1daeb972c7b6ba472562b01ba SHA512 8e7e6b0664f5e4e5c8c2cc28696212eb5e48dd927305dc84f9511d057925b9fe043a3ab85b9e99deb2e440af9cc8644cac9b65b09476ca383f34bcdaf18b776b WHIRLPOOL b6f480d04418ad4e563f44a59bd6266b0620bbd93167fded32fa346166220fcc97eeb68f70810da02eea2d6a3dd3c14655e7e59faed52df2aed1f01c20798c31
-EBUILD vlc-9999.ebuild 14900 SHA256 594bf0891e886092c20a6f923dd548b96c9015f32e7c00f2fca0b3e704ebc610 SHA512 b4a99acf6d492efc9132eb540cb455e4ade07e9e29005de9a4309465c8bb0931e3891215f224b1634626a4cd802bd3cfb7e8286751759eb5b0c34ed0d8295151 WHIRLPOOL 404de31144e692c67802c05d48281cc55674b4d4fcbc2bf04df84badee24884c286142ceaeeefc87d494d5a367d93e45c527b3e06737408c7dac15a44d3b13cd
-MISC ChangeLog 32508 SHA256 5776f0b73f8e42cd1f6c2f657d0b58b053a9e8aaa226480533c4d2b7a45c3e59 SHA512 f21a6d883a3411fe1a00a9ea6a679703b2eb9f531dd156644328df088d9bf2c429dea0b00d11d9efef3bc275815944f16b4b91a9a785f10f53c3d8150c877633 WHIRLPOOL 1a72bc73420fa77c69dade862443bd1da2df908760645d116956b4c32b5d972960755efae78607753580911ac60a6fbe49c2a6e889c95ab910773389fd2bdbcb
+EBUILD vlc-2.1.2.ebuild 14491 SHA256 29d9608e85674a866f59c9a7218b9e29787407adf46c70796d930c67d1a2c1f8 SHA512 67075875ad549d0b898897aea983a901e4577cd8a1f1249d596b4ad5132ee34364a1d76a94a3432bc7e20134cd4d7bf7879a7d324824fec340a74483e0a81322 WHIRLPOOL 6ac3000023c5fda8238fe9e10adc0d40f13def32ab7519d639c76b9957325a5510667fe730f814b2509df2ec460855c17ded08ebfbeb7cb8ecfb977e3013458d
+EBUILD vlc-2.1.4.ebuild 14857 SHA256 e0d7ed6de8dfd25f08d2c17f2aec2465ab25a3a7964ef265d727a2d7f256895b SHA512 8e5cd02a9250572c07f37378cc708474938b024c1581f9ead56c27caaa31cbbb1b0cff193c9bacaac11c5b95e5fa288c593a170764c9c7401e43219455ff6943 WHIRLPOOL 63070018898994e3e4926f1aaf3d0518a5a83155a01a83cf25c4f1fcf5f076a8f9dc8aeb2752e42cd15890a74437461258c0c4e1339293729419cbac43d5d73c
+EBUILD vlc-2.1.5.ebuild 14948 SHA256 a3b58e6e5dda8933105ff9067a11357221bc35805c26c0d737eaef8a21e3a3e7 SHA512 c46dc5f67dbe4f46c7a4eae4f73040800ca0443c8f56354b7e4c2ffd45be024f7fbeb76f0e046af3aa09c0407137a88ca11492bcef512f01420f99865c001037 WHIRLPOOL 179bdd28f07a4dda01fc4b16242d3ce416b465101ffd6a65188b53d955e89e6f4d26842ddb7281690153f878e115b44f8b5aca6c3dfcfc60e3b974f7e348c1da
+EBUILD vlc-2.1.9999.ebuild 14860 SHA256 46766727c42fe94b5a6e409663b778b6d1252f5c49ec20f492e5f01dbacad5f1 SHA512 13a947078ce695e4113cbe383541f21ed22085b584a51d785ed7c9465243c015acf6487dcc0328153b67572f0602a5cbd468fc8de52725066ef166305779ff3a WHIRLPOOL e5c89e247561d532f3a7674fccd79f9c996fdf77d293fda331e3d917a3e9fbe9d5a3bea1ed862351d507133c73fec0e78e9f776351e5877014bfa775f308921a
+EBUILD vlc-2.2.9999.ebuild 15137 SHA256 c3517e4aff423fce6d6cdce79dbf862799cdd96b311b4b7181c8da11a323efff SHA512 25bda6f696771c128ccabaafc511a9742b9d2ce3ba702e8d81fc82fc3ed1594943ade1817e96ea8e1c8d36571d3b1654663ab048f2da0f03b26eda894f309494 WHIRLPOOL 88da0e9f248c5349f1e1f055af8cdccceef0ee38342c51ac8c13899268b0bb81a68466f144ff3e750be90841099f1038bbe88286259f3cc2d392577d2cbbafc1
+EBUILD vlc-9999.ebuild 15129 SHA256 5d4d8689ff82cd10f9de5a12a183aab98b8b6a934d2ccf44c6d706f4c5576f91 SHA512 e12c4074d88a22bf970e482ccfa97373b13ec79a3ef76643535f6e7a80a4eefe180faeb0ade7b45a62f9816dd9eede9550e2b1ed4388d22bc9a1a181acadcd5e WHIRLPOOL 4f064c2199fc28753c4f2092bc15178a9e7098a215dcde1bdfa94db6619ad7e4c6e859734335115a08cb5cf2ffdd320a2229ac478ecd2e223b3e09eda6d65f16
+MISC ChangeLog 32747 SHA256 f2a2c414da334728a388bba793ba774d7b2815f190656306df29562b9241f842 SHA512 910755fce68d4949a81fad0114822f728d4aefdc5588270a089a5f53e9aa7bcd034bb265c104016e0581ffe45276d918818fd08ba95fb52d4e10c6830d8421fa WHIRLPOOL 83488c90c1a4d9a164ec50602ccd9c9a915018a79bc4eb17bf6269bfb195d6a3dd90309303dd4254d8b19779c6bdfe142facc94c42355a844c29cbd959284407
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 6542 SHA256 e0e3e42a1d4154a172ab9b484a53e51765a47334f4380b3dd9319140e48e29f5 SHA512 986b6088cf654051271249ac3779473410be06e97aee45a69842e33af3b63dbbdb4c475b7c35e6cbbdf8f7589bd0bf4f0bc520f295274332ceb0d8a3ec3dd6fe WHIRLPOOL f58561b53d63f5ead7142a7297ae17176b0889c3f8d30d4b300b3747a5891c8ed6b6b5b3df056add768eb7cac81196cc8ca5b9fdf737ff2dab48b3487b31bf26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJUktmjRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7Is5D/9eEbgQBtaUECa779jLjQY/5U9oWwEZBVuF0mNFrC3stGXix/27GS3SxI/a
-TLOMDRMP7tO7HzzCYSfdf5ZqbLNb0I+YOjc41J2uUqnR/1SsokOO7vycDgQm1F7j
-/KWKHausL676y+w4TCBTfS5hTyThvE43Zur2YuN8iACH8cuUCkIyJ649P+gtAJw7
-hb+F23LVNAMmRaSyEYuAEK+IhUaYf2Qe4g0DXV0K22ICi6HWN4kDyBp+bd+VIv/9
-32dp10lL/j5NSEs34Xe6B7VJOdffkpwgslm1bmTY/ycOlwxck4fJqo/a6KGrlaR+
-EjDxa2w1kgVjqaHVInBsyRZn6mn3o9u5pzPixUjhmGBIMnewvuKur08ySgS2K9vE
-cwSVpcuKY0kXAxVGsL755ZbLHh2wfE7ho34teqGL80oJ7rmTNyMCI1ebRawdQ5Im
-wcBYlCcNuO9x+8Z1//am/Jvsv55d0SzXQYHq5SxJ7nEYD7Ehm/I5pllgc+c5KZ/8
-hbvKrlJRKERpbEzjAGTB7bTj5LIYwovswvKZ/NCI8MKMlG0/4kCaY1xLAXOVxmco
-bVGa99CoumkMer2CYHsZja1JbdkP0ttrTiIKuWDBelWS4kRIyrEnwzY0krRer0cj
-n3dWLv04/sV4FZIWe7DEfijBQq03Ux7mv8FnXVe6dammeTfRrg==
-=Tjd4
+iQIcBAEBCAAGBQJUxkUiAAoJEJIMDbyqvv1VJvUP/R4OmLi2+AGspXM/QPG0g8z/
+GT/kCVELTtyrx2XerCkWQfBDwZqGC9WXNqLbtT0Ib/wOWWXOr/eoc8wPFZ2dTuCi
+rgYqDZPW0FFj3G/JyrdA+8Kp/AhXy63EGB7vX2Y/b6aWNLbQH7IipZvH0YTGqyg/
+Dg1KVDINYOPnd7WdUZgm3qBBKaEXETl+wn1C1sYJHBpk0RehqfyMTu9NxsHQSgeY
+ZKMSfl5uvRz8cOam6FNYcDREn9+OFOWOHYPxsT11ZAev3DFK5d9Qccw3fPYEM0rR
+cxU5MEOZNxqS+Mrs6JQf1cOaQRpGb7OFNjJkNJLowTqXuavo6CbHdW3m/NoJNFiA
+3yg8khX0esyQsXh6j8b7tkdIKE2bbe/uVnPqfN7lJG19kopSEd/su0BCfSBIywfk
+74GSWkT7wQzpHtwQhfQXlhdptEy5lLMdY2QUD5nAFLTR5s3Wvy/2twDQTvLrVWWM
+gQJguVd3PFrMseqWVeaslnOSPCT5I8HEirVcWxfpR2EYl8A+bRHgQ+vKuqJjQjrC
+JOYQp9UnXhdasGvuMTU5g+JaqDs/soEjktADYWFlM4PnVaZlYeym4l8ByI4C961r
+VLBkuhETawV722JUUfuGGg6zeswXeAOMMWscKNO+jw7UgTXlQ8mNZErg/2tjsUjw
+NY1dTL3FkZ2PmeeAVw7C
+=+hDu
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-2.1.2.ebuild b/media-video/vlc/vlc-2.1.2.ebuild
index ba0fea2ef758..bee5c2948e1b 100644
--- a/media-video/vlc/vlc-2.1.2.ebuild
+++ b/media-video/vlc/vlc-2.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.18 2014/12/18 13:36:50 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.19 2015/01/26 13:45:35 dlan Exp $
 
 EAPI="5"
 
@@ -211,9 +211,6 @@ src_prepare() {
 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
 	fi
 
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
 	# Bootstrap when we are on a git checkout.
 	if [[ "${PV%9999}" != "${PV}" ]] ; then
 		./bootstrap
@@ -409,6 +406,11 @@ src_configure() {
 		--disable-vsxu
 
 		# ^ We don't have these disables libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' ${S}/config.h || die
 }
 
 src_test() {
diff --git a/media-video/vlc/vlc-2.1.4.ebuild b/media-video/vlc/vlc-2.1.4.ebuild
index 63ca76cc95df..762a7b2e5567 100644
--- a/media-video/vlc/vlc-2.1.4.ebuild
+++ b/media-video/vlc/vlc-2.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.13 2014/12/18 13:36:50 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.14 2015/01/26 13:45:35 dlan Exp $
 
 EAPI="5"
 
@@ -212,9 +212,6 @@ src_prepare() {
 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
 	fi
 
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
 	# Bootstrap when we are on a git checkout.
 	if [[ "${PV%9999}" != "${PV}" ]] ; then
 		./bootstrap
@@ -424,6 +421,11 @@ src_configure() {
 		--disable-wasapi
 
 		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' ${S}/config.h || die
 }
 
 src_test() {
diff --git a/media-video/vlc/vlc-2.1.5.ebuild b/media-video/vlc/vlc-2.1.5.ebuild
index a29c011841ee..6cf8e150c462 100644
--- a/media-video/vlc/vlc-2.1.5.ebuild
+++ b/media-video/vlc/vlc-2.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.6 2014/12/18 13:36:50 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.7 2015/01/26 13:45:35 dlan Exp $
 
 EAPI="5"
 
@@ -212,9 +212,6 @@ src_prepare() {
 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
 	fi
 
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
 	# Bootstrap when we are on a git checkout.
 	if [[ "${PV%9999}" != "${PV}" ]] ; then
 		./bootstrap
@@ -427,6 +424,11 @@ src_configure() {
 		--disable-wasapi
 
 		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' ${S}/config.h || die
 }
 
 src_test() {
diff --git a/media-video/vlc/vlc-2.1.9999.ebuild b/media-video/vlc/vlc-2.1.9999.ebuild
index 486c2f8d6b01..509a93b2040e 100644
--- a/media-video/vlc/vlc-2.1.9999.ebuild
+++ b/media-video/vlc/vlc-2.1.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.28 2014/12/18 13:41:39 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.29 2015/01/26 13:45:35 dlan Exp $
 
 EAPI="5"
 
@@ -212,9 +212,6 @@ src_prepare() {
 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
 	fi
 
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
 	# Bootstrap when we are on a git checkout.
 	if [[ "${PV%9999}" != "${PV}" ]] ; then
 		./bootstrap
@@ -424,6 +421,11 @@ src_configure() {
 		--disable-wasapi
 
 		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' ${S}/config.h || die
 }
 
 src_test() {
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 5d1d49d3b84d..279573554558 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild,v 1.5 2014/12/15 05:50:48 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild,v 1.6 2015/01/26 13:45:35 dlan Exp $
 
 EAPI="5"
 
@@ -223,9 +223,6 @@ src_prepare() {
 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
 	fi
 
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
 	# Bootstrap when we are on a git checkout.
 	if [[ "${PV%9999}" != "${PV}" ]] ; then
 		./bootstrap
@@ -439,6 +436,11 @@ src_configure() {
 		--disable-wasapi
 
 		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' ${S}/config.h || die
 }
 
 src_test() {
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 2fa47ba213a7..2d1c8d5b0438 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.228 2014/12/15 05:50:48 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.229 2015/01/26 13:45:35 dlan Exp $
 
 EAPI="5"
 
@@ -223,9 +223,6 @@ src_prepare() {
 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
 	fi
 
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
 	# Bootstrap when we are on a git checkout.
 	if [[ "${PV%9999}" != "${PV}" ]] ; then
 		./bootstrap
@@ -439,6 +436,11 @@ src_configure() {
 		--disable-wasapi
 
 		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' ${S}/config.h || die
 }
 
 src_test() {