Update debug CFLAGS check, bug #545630

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x00F7AB331B0F097F

9 files changed, 45 insertions, 40 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index ba79048a7676..5f23b58dc492 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.237 2015/04/08 18:25:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.238 2015/04/16 11:55:18 voyageur Exp $
+
+  16 Apr 2015; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.3-r3.ebuild,
+  llvm-3.4.2.ebuild, llvm-3.5.0.ebuild, llvm-3.5.1.ebuild, llvm-3.5.2.ebuild,
+  llvm-3.6.0.ebuild, llvm-9999.ebuild:
+  Update debug CFLAGS check, bug #545630
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> llvm-3.2.ebuild,
   llvm-3.3-r3.ebuild:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 4be87dce6956..529e9e5ac75e 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -81,31 +81,31 @@ EBUILD llvm-2.9-r2.ebuild 6380 SHA256 e95d4d6c0fefb602a04197b10d31fff3c4ef997ff7
 EBUILD llvm-3.0-r2.ebuild 5767 SHA256 62fca1169c63516f29102a3a1bb4ea74408dfd151d97a9edbfb165a2def317c3 SHA512 f7ee2bbf8b31d86c11ab07f530278e3240ec21f3c58144a9e627aef3c1fb7690935786f33368a6f56062b5daf501adebfc164fd6712985a91076897b89cdd85f WHIRLPOOL be1a6edd697e2504df033705c2cb8e37f6c17a13d77558d231172c00f91ec247785469b6e1265e25c42eb3f6f394614cf516e0e422cb54094d9ba25669c8406c
 EBUILD llvm-3.1-r2.ebuild 6089 SHA256 6148fa11a349ef7eda2d966c27f238cccb0b553bab22e490e6752213aba0969a SHA512 3fae66a5d4b51000e978551ab21633e34eb7acf6f91967b03420d94ef3db48235176a7db0f8e4c316ef688540e2171a4f874c865098568b61ada914a932c02d1 WHIRLPOOL d71a3ebe544fd1c2bcacd1f9150a3f036feb83e28c2fe8a8df38bd2919713bbbd1888d2ab6f6fa041cd4d6d3eb543d8f74acccecbedde055760234e675721a5f
 EBUILD llvm-3.2.ebuild 6529 SHA256 2c4e65ae3fc36c9f98906e62d3b33c6cac6a0bf7e74482ec0cda27b623bfa166 SHA512 0950611bda6086f94c2dc0d50b11fd71befa7cb0e36febae147014361473cec35b6dda749b3633fc4d29fb1c879a5d08c2956185f61471d3d17b662017ed8f1b WHIRLPOOL cc8c94c8cd53a5477731ad74cd9a66ea0f27ff5db70cfd5ff7ddf1d4530fba4175a6db84ec8ae79e3def0153211399eaf9dd62e2d55f71c5ba03bee29fae5eac
-EBUILD llvm-3.3-r3.ebuild 14179 SHA256 a490f7c7794339fa51100b22b0dd8f850a23bf21abd77671538a55be6cefcae8 SHA512 e41892e3d1d266e00497751157bff9c895dd9a177b2cff9e04cfc48e836a5669576c5fe54c6824fa8b651aecc6ef8ab8066d52cbc816c4af5e4935a5ef174c81 WHIRLPOOL 2328a56c6e02b6ac715166cf5f59310d54f89086f3e689117b4242dfdf1cf6ee37f48efbd7747223a4c8300ff9ed7404ccbd81813735b718a2844121cc41a255
-EBUILD llvm-3.4.2.ebuild 15757 SHA256 da50eccf544bcd0bd03d960f6bcb3acebec7d65560e8c7f87834153586b663b0 SHA512 4350371e6a34ac0dd23d119ee98686440a1568a97a76ce7f51f9bf8bba78fd3949e6dd6284d938f7078ee0698cdae6a22417c620fe3fd09d41f47029de4cbc4e WHIRLPOOL 74d5cbc807c33a84a1fb49527b6ab7c1af2600f78549300afd50d915981f22fdd0c8a8e32040bfb135670d3c8b49e0f0fd15e13595db5288dbb9470b05ffe5b6
-EBUILD llvm-3.5.0.ebuild 15230 SHA256 5bd54d9d06ae712a5dc7aba83f86702cb07710603e5e542021ca681757b730d0 SHA512 414744797085ddfd2d83d960dfa4257e02004aa1c4d778a81dc02c90b643ce49b9c0fbb0ae4df9ad008c76f64941eb2abccfbda3d7690f67c7cc7d4374673de8 WHIRLPOOL b3d40770fbf6f8e8ba9809df649351b2c414abfdac34ab44831c3e07c65fa575cf9de10dfbeb5113a43e611cf5521e8467128907388e9d17f06963fbeddde975
-EBUILD llvm-3.5.1.ebuild 15321 SHA256 2b98273203216c42549499e1e094203638536699ca4e1c8b393e1ce4e6534ed7 SHA512 0d770076555d5cdb4fd252d843164cf34feff2d114a19eb7f0f58a2fabbf7d5b9e04107662aac9c5e697b122e8a0dee12397ff62ad7608798b5e762efab6d72d WHIRLPOOL c652cbe76ecb09c77e3fc46e3054dabfbd78a3185f28b6c41edcb614e8cd3490896d04cce2686b0f4a9e8a77ceba7e746b81aa726c7b7716724f3f3ef20024ff
-EBUILD llvm-3.5.2.ebuild 15325 SHA256 5ef108e09f4853936323d4906f5cee278bde30a82b244326f5610982a6a8f003 SHA512 fbd1c7a3e8a6f21e90fdf60e3c7de1e8cc4b4d3c7df7be0384236a2bd339938720e931bc3f740d5db245a9ed0edf7374f6999b37b1cc2964495ec669aff65307 WHIRLPOOL 807476dfce2d13e8e18b3404dadd2b44824d5c413085319e929ead141d42f81475fc93e6a0c5e5f37764e35776a32984596771d1e73ceb27828a152baec64eeb
-EBUILD llvm-3.6.0.ebuild 15305 SHA256 19985cd50c3fe6235975ec473b3dcd6b8c3415138cc87ce43753554a70057ca2 SHA512 6ab0907287008eb7a37fd2335261e88dd455acbafd7cbcf2df51f603fbcdfc09948d77d5d73a242b90e86fad560487039f2cb568b887de8439d161ff73beed1b WHIRLPOOL 0849ea2790dab8ccc05f4151dc7b6114a95114574892aa0fee6f7d4b88fd8c6b9658ecc6a2e4d30918e930bdd24eb1b96d649e810a82caf88845349c45cb050f
-EBUILD llvm-9999.ebuild 14404 SHA256 2a96f1cfca7d5b0085ff5451d37bc872f174f77c36f047d18052fbfeb1416bcf SHA512 96aa5d558090772306c7cd277320094c5a1a34fd97716ae473fe8fc6238c4eb44dd85a0d8d639c49b917fc8113fef1b2c26c6806d864f3c09e5c08601309a87b WHIRLPOOL ad902937b0373fa8458b413b585ef8d7d0cc6a1a4fe57de67f622750c2d50913a01ca7591f857e2d565ca2048e80b5536f893004c63bec6f7196b4b64d8d73be
-MISC ChangeLog 39625 SHA256 cbd8bd3e52af50a8353e48140ea224aceda0ec45222a1af05dfae0e239a473fe SHA512 c9aa76f80b4b9e7fbba6fb69070b6063e8a02769487b025d6a55e3388b2e3b81f82a93e7fc926c042fce5b205e4889fe9e926828d6150b5bd7a168758bb98845 WHIRLPOOL 11c59cc610fcd09863b787358a1c6a44ca378c35f9ec1825596e7abd0172abb220693d52ae84a2bd74e61e56cd4f64baf3311b2dc2c23be9149a202949f23531
+EBUILD llvm-3.3-r3.ebuild 14179 SHA256 8e2db1b1b1a83df84f53cc9cd6ef2567536744f27ff5d3dfb8849bbad476a40e SHA512 78794fd92ca3d94ad2ccf1a9ac2d7a22e46635bcc524a439538acfd079de507d46d587fc39e3bb4770cc4ff57e34b6b239d393a8008910dc07320702823f4b8d WHIRLPOOL d08309a16fcb58a3a5449bd0cfe3c24eb3594bf20c35a681c4a05792fc9117d557cd9a4a9abd85f92c4fa26edeb95edb8e379c9e57791008d73b453124c625f1
+EBUILD llvm-3.4.2.ebuild 15757 SHA256 8815fafa32237c2987bcb9a8037d7fa5bc497c46a2d8118a07a5e353fffa8af6 SHA512 cc4bff5bc49f7b03cf5c37d4d80c06265ac8ced7d9f1dcc534ad7836a11a10cf306f129fa6dae0f9cb39fcac91d0fd327ff687d6847f75bdffe94051144e19a6 WHIRLPOOL 71b9109c811bcd9d4e100163d3bc233e842e2c66041a5c4a02af636af1afe7ea9fd199a38564187a32596a9339d78fa16991d0aa33fea6125fb7ac9d513aa873
+EBUILD llvm-3.5.0.ebuild 15233 SHA256 dc10d2328a002697e1dc3aa20e9b2fcf17f2254f69d2c7a6a538c6031e7e3aed SHA512 9a3c1e4b26f04feecba86c2767803638424b2a70a8c3cf780940b8c91a71e0ccb0a61b04182b51f58b67f3dc4774ee6414447565649391350cc516d30f427442 WHIRLPOOL 8fa4f910b0cd23edb97a1afabbf0622dc442fc660d7b7377d661281dbaedf0b9091938ed10f2ae9962820f8fa826a18d8553bbe88e7e756576e653c52387e4e4
+EBUILD llvm-3.5.1.ebuild 15323 SHA256 3b673170e10b2cbad34d877eeaa870f7d26d777b855019a4a01e06dd339d1909 SHA512 135e621ece0d5897efd22413f2654d5257b1c6b5d559bd5ed87b69cdf7e63c8631d74e01a1cf81e5763fb012d01318c99f601da32c894ab5303f0f21c6fb643a WHIRLPOOL dbda09e5c18c8beb2078d146a478c410be855473666623ccf8e555915d24e315d2f5a497b04db0f440594453505fe63701f34b1c6fe4fe1e0f1cad4d71cc88ba
+EBUILD llvm-3.5.2.ebuild 15323 SHA256 85d49b60b47ae2b626b6911b208a3660e5a882a34b78d878efa7ca521b5ee867 SHA512 77a80f78d376f56c6b2f0894e08a1c5dd841730c5bc79f15f32ce803ed9085da7c698ec42012ba49fe33ce00601ec766a24659224f6ebcc0f26e2177455a62a8 WHIRLPOOL 82035a26779b202269efe1023c860e246cfc8b1dc12e78f682d9c02362b6af6b3c0b6c8c1852ba4abc80d69198d3aac994f4204400fef7be17bd8c24f044723c
+EBUILD llvm-3.6.0.ebuild 15310 SHA256 213f00e1aeb57bed52823f43025c63a820a0aa92421de7ec2d539d61bb212577 SHA512 13be6ca07c5c90dd28656261b4585aa3810ab86024949d5865892bbd58508d9f77eab390aa5a5288c84aa3e2ce8d0ed5aeb9b2b84f28a77fb22b1dc5abf24d44 WHIRLPOOL 0b3f9778f8d3ca8417e7943ad49c236446de927ddcb80bd5b5fb62fc6accd63663666db716104dd6eb27552f288999a7191842b6fc0c4ccb9d810152b78f4659
+EBUILD llvm-9999.ebuild 14402 SHA256 f3956d84186c81d5f577ee72843bc13e02a3b1c55f3809d4030e714e7b804d35 SHA512 6873b7163408b9d0f71f62c2b041719791f0e887dc338f93ffcf06ee9065491302ef33c63d1bf383856e84f41ad275fc81ea5ec013797459216753e29f5eec94 WHIRLPOOL b07e0cfdb7b75174eec169d0fb159cfce2eb88ae6337f2c853687e98bc696d656c621ef7f58b70cc8ec288be8aa838f7eeac62177583d909babe01d18264224f
+MISC ChangeLog 39861 SHA256 80767357354f2c5e072faded03c6f89aad6694ca596ce1c56b52086b3ffcddb2 SHA512 b9c4a0901ab3f6b76658b41969e0a68e974a9a4502d6a809d20677bae07f29af86475a88f74d56fb7410c423587a7aefbc9dfab3285705bf006d8786622e2c86 WHIRLPOOL 738d0abe0df0a1fd246894c95e7d828dfd3a287f262247bb5c46b24592f2b4add4101dddc1f051821eff7728f5e526187f4d3ff9ee98f5f9bd456e879c64b21f
 MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVJXKwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOMQcQAMV0FediqtboEpPDD6S5K3Sr
-YmnmHH9czKzeGiEh/MtgKJBJVrt7CQv7300D79VM/1A9zUUWtS24bP+KftlxNVN7
-q54MlKOyAT/mkOCCATglvWuWIU0PZpp8siQm7s232xPkQ19q6JcXELjgSVNZgnNJ
-PXmAHqYtjHxk1VdsWWjVQKMG6jK99Y0IlowpYjtOcGcLDcUpweP9HizjMpJJgjPH
-c0uIJs1o4cd/o+mvL/EIqdAyCzdcU6wHIXspggAVuSc9fwD9WZvIL3noC+R0k/sf
-3kI9EYFpQB2c1jtTeqnPOpdbXEblkukk3YWKt1KTSFcztKhOsxfU0VIy66NiTIAv
-q5g3132ps2bv2gTYEk1tFVD13NWWszW95S4c08t+F5Hksm+BylORcAqvvdvVRX1R
-WtbdocQhcMWzxg92zZkLq26ItQ1gPYpDcv55oM9uqQRnG3NBR5ezZEARMdX5l/LF
-3PlsnV+RXnubBUQrUr7gX9JJyEJpUgy/EiYf/sIEnyw5DE1yOz43hFzBxvl/LvyF
-k9mke6CVXi+V2iRVv2u+ViSZ6b9ArG2p7V4AlRP+7q0AMrrL8jfYcwz230P6u5XB
-xAwKCzpkEMm62G7n8WAEjJSV9B1ytQPKlQFWnV4bHEiBbLxW4YFwBT1fDlizg3a+
-EiClXSSn3mT0zuSDem7u
-=oRHZ
+iQJ8BAEBCABmBQJVL6MpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw
+MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/JDsP/2PXz37n2MqoeGb2a5chguxJ
+LVD4Z/waGD5YW/tfXUZ0kPDWr4eFk2wM6HBT/kKZmT072wJyoVHt7kgQ9sFhsG8R
+hRjyGKwRhjxGsSMX5kX1BVrDDRybQe+Tw/xJCpaXxuOMRQ1BOFH3/xHl5FRu6/1S
+TSPs2Izgp2cs6pDH7PBgImF1mChgBzvA+khryYy9mjBwssZ69C0/BPHdow10NMlx
+x+FSte76+JjyB8CUiBCRJGaf/rvFNZ8e7RrMY8ZR4ckT8DMiOTIQmS/sVI+X0TEG
+hd9iB2V5Z/9gbWQ93kVIZvnApwZ2Nlg+VameR4ng+Ns9k1oIbk4zMR1hG3bV3Nzm
+0er4onMwyKT0e2qgD4ivCo3LdD9Mx6CvhxHoT8zxTIF45aRTOp9MIrZaF4gwHCce
+xiqPAPXiXUE5T2mHXXxyg6K4kEuy0TSisaLS+Yo+0a+ndKPcVI9bgVTRxBgx0Tj8
+cZvjGvvzB5VeAjuwIu7Nx0hqYFc+sYmuYxJwY7rEsbeSYzIXRcKcu9qnQ3tmxx/R
+qsz5m/WNzbTweSzBluQKGl7lNA1TDMmo2MXdygro9ZUwcHeK/+Wpq1CXhxy9/det
+Q50vuB9umQeFxJFbGS0xM5HzXMq/ZA6p0SERZhzp9EM6N8S325JXYUjIEdEZs1FA
+bLImkw7oifpcAEYZOX7B
+=HFb8
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-3.3-r3.ebuild b/sys-devel/llvm/llvm-3.3-r3.ebuild
index db348181da8e..b9bd74f5061b 100644
--- a/sys-devel/llvm/llvm-3.3-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r3.ebuild,v 1.13 2015/04/08 18:25:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r3.ebuild,v 1.14 2015/04/16 11:55:18 voyageur Exp $
 
 EAPI=5
 
@@ -88,7 +88,7 @@ pkg_pretend() {
 		ewarn
 
 		(( build_size *= 14 ))
-	elif is-flagq -g || is-flagq -ggdb; then
+	elif is-flagq '-g?(gdb)?([1-9])'; then
 		ewarn "The C++ compiler -g option is known to increase the size of the package"
 		ewarn "considerably. If you run out of space, please consider removing it."
 		ewarn
diff --git a/sys-devel/llvm/llvm-3.4.2.ebuild b/sys-devel/llvm/llvm-3.4.2.ebuild
index 17bf89dd8ecf..200255d140bf 100644
--- a/sys-devel/llvm/llvm-3.4.2.ebuild
+++ b/sys-devel/llvm/llvm-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v 1.9 2015/01/31 19:48:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v 1.10 2015/04/16 11:55:18 voyageur Exp $
 
 EAPI=5
 
@@ -98,7 +98,7 @@ pkg_pretend() {
 		ewarn
 
 		(( build_size *= 14 ))
-	elif is-flagq -g || is-flagq -ggdb; then
+	elif is-flagq '-g?(gdb)?([1-9])'; then
 		ewarn "The C++ compiler -g option is known to increase the size of the package"
 		ewarn "considerably. If you run out of space, please consider removing it."
 		ewarn
diff --git a/sys-devel/llvm/llvm-3.5.0.ebuild b/sys-devel/llvm/llvm-3.5.0.ebuild
index 96a4a05df2ce..2ef3bff56195 100644
--- a/sys-devel/llvm/llvm-3.5.0.ebuild
+++ b/sys-devel/llvm/llvm-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v 1.14 2015/02/21 10:07:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v 1.15 2015/04/16 11:55:18 voyageur Exp $
 
 EAPI=5
 
@@ -94,7 +94,7 @@ pkg_pretend() {
 		ewarn
 
 		(( build_size *= 14 ))
-	elif is-flagq -g || is-flagq -ggdb; then
+	elif is-flagq '-g?(gdb)?([1-9])'; then
 		ewarn "The C++ compiler -g option is known to increase the size of the package"
 		ewarn "considerably. If you run out of space, please consider removing it."
 		ewarn
diff --git a/sys-devel/llvm/llvm-3.5.1.ebuild b/sys-devel/llvm/llvm-3.5.1.ebuild
index 0ee9e1abe7b7..347e73182048 100644
--- a/sys-devel/llvm/llvm-3.5.1.ebuild
+++ b/sys-devel/llvm/llvm-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild,v 1.7 2015/03/03 10:00:26 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild,v 1.8 2015/04/16 11:55:18 voyageur Exp $
 
 EAPI=5
 
@@ -94,7 +94,7 @@ pkg_pretend() {
 		ewarn
 
 		(( build_size *= 14 ))
-	elif is-flagq -g || is-flagq -ggdb; then
+	elif is-flagq '-g?(gdb)?([1-9])'; then
 		ewarn "The C++ compiler -g option is known to increase the size of the package"
 		ewarn "considerably. If you run out of space, please consider removing it."
 		ewarn
diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild
index 4b2c6147b2b9..7e8f4ca0bc73 100644
--- a/sys-devel/llvm/llvm-3.5.2.ebuild
+++ b/sys-devel/llvm/llvm-3.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.2.ebuild,v 1.1 2015/04/03 08:59:51 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.2.ebuild,v 1.2 2015/04/16 11:55:18 voyageur Exp $
 
 EAPI=5
 
@@ -94,7 +94,7 @@ pkg_pretend() {
 		ewarn
 
 		(( build_size *= 14 ))
-	elif is-flagq -g || is-flagq -ggdb; then
+	elif is-flagq '-g?(gdb)?([1-9])'; then
 		ewarn "The C++ compiler -g option is known to increase the size of the package"
 		ewarn "considerably. If you run out of space, please consider removing it."
 		ewarn
diff --git a/sys-devel/llvm/llvm-3.6.0.ebuild b/sys-devel/llvm/llvm-3.6.0.ebuild
index e66aa11144ff..b045d61b4921 100644
--- a/sys-devel/llvm/llvm-3.6.0.ebuild
+++ b/sys-devel/llvm/llvm-3.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.6.0.ebuild,v 1.1 2015/02/28 09:38:22 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.6.0.ebuild,v 1.2 2015/04/16 11:55:18 voyageur Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
 
 LICENSE="UoI-NCSA"
 SLOT="0/3.6"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="clang debug doc gold libedit +libffi multitarget ncurses ocaml python
 	+static-analyzer test xml video_cards_radeon
 	kernel_Darwin kernel_FreeBSD"
@@ -94,7 +94,7 @@ pkg_pretend() {
 		ewarn
 
 		(( build_size *= 14 ))
-	elif is-flagq -g || is-flagq -ggdb; then
+	elif is-flagq '-g?(gdb)?([1-9])'; then
 		ewarn "The C++ compiler -g option is known to increase the size of the package"
 		ewarn "considerably. If you run out of space, please consider removing it."
 		ewarn
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 5e3962e15efa..51a3ff251dc6 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.103 2015/04/02 15:05:26 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.104 2015/04/16 11:55:18 voyageur Exp $
 
 EAPI=5
 
@@ -88,7 +88,7 @@ pkg_pretend() {
 		ewarn
 
 		(( build_size *= 14 ))
-	elif is-flagq -g || is-flagq -ggdb; then
+	elif is-flagq '-g?(gdb)?([1-9])'; then
 		ewarn "The C++ compiler -g option is known to increase the size of the package"
 		ewarn "considerably. If you run out of space, please consider removing it."
 		ewarn