[kde-base/kdelibs] Only check for gcc version if we actually compile something

(Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with key 7887F787)

6 files changed, 50 insertions, 20 deletions

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 37171310c7d..0fd2bdcc709 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX dist/01_gentoo_set_xdg_menu_prefix-1.patch 592 RMD160 80ac0ae419f0f721a044053cdaeaf2f1f982f74e SHA1 80e9a70b108cab0b05efc50d6fa66665b711f149 SHA256 dea20e8a0e8f0ecc1aec1b38cec994312514aa1e88ba25fede01e1953623f341
 AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 RMD160 aa41988215dc8ede62c5f1e685eb24d597c1ec46 SHA1 b715c25a4bbfbaafaba2275057071efbb187523c SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9
 AUX kdelibs-4.3.2-solaris-fileunix.patch 1703 RMD160 6a221210bb0660781dfaa8c0102ae86cc678f97f SHA1 36b525e32c1b86892a9975a69ca8467e595e85d7 SHA256 162cc6e14570f90e69811241ce07a4968e786cbed017fd22a8347371cdd7ffb8
@@ -12,9 +15,26 @@ AUX kdelibs-4.6.3-bytecode.patch 3511 RMD160 a91034b19ad7eef7bf37aebdd0149371f9d
 AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 RMD160 d1570291799f3b87963da05ddaa949ad19b67814 SHA1 8536664b5d46f2dfd32828a4a0523f280ebe6bdf SHA256 2d0ab01c1e495e77f911a073310615d1f57b2d6981a23c9349d45be5e133d8bb
 DIST kdelibs-4.6.5.tar.bz2 12917554 RMD160 cd167d17c4c090b21f7271c84d52bfa6401b8f6c SHA1 9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120 SHA256 d7b0de699f6db29a6309053719a523f2516a08e77b951d15610aeb11ea9d5ba0
 DIST kdelibs-4.6.90.tar.bz2 12028277 RMD160 f2c147f8d2f42cd9ba3daf8d825a867cd6f9bff1 SHA1 e04a0ecdb83a2cb086e13c9a2541b264dce00993 SHA256 c6a0daf836355c83f4becc5f5e085450b66473751f9b7ba817e1a940597b2166
-EBUILD kdelibs-4.6.49.9999.ebuild 9971 RMD160 da4fd5750e587edef9d43d26032a57bc8f871d7a SHA1 dcacf4849661bc2940ad9e6922416e5318eefa91 SHA256 5500395b59c1ac96e058037e5083bd32a474f44127467321c275bea33be6f4f1
-EBUILD kdelibs-4.6.5.ebuild 10033 RMD160 ce551b28155330d9857f5156eda2dc75087f9d10 SHA1 da1f40f5f72563272c1f8f0bcc9a18e49e4774c1 SHA256 6867bdc51efd02d1c53746376e99b323c2c512f8c80fda0acef95f2b7613b1c9
-EBUILD kdelibs-4.6.90.ebuild 9550 RMD160 ad85bc8b4879c750012f2fbb82416d0aa743356a SHA1 86650b8c1bdc0a4dbf9a576f89600fe74bac4162 SHA256 e58856adb922f20a36bf9bed5e4f273e7e54f3f6238bb85d61721db2eb689a81
-EBUILD kdelibs-4.7.49.9999.ebuild 9515 RMD160 6b39c5db6b16953b569eb42f52315dd2ef5eaa36 SHA1 9182f910169a53f3d924aedfcfaf94affcf66490 SHA256 1b9523c310b691bcd80725c272a23006a42f27952562c8a75e652410f9f18933
-EBUILD kdelibs-9999.ebuild 9515 RMD160 6b39c5db6b16953b569eb42f52315dd2ef5eaa36 SHA1 9182f910169a53f3d924aedfcfaf94affcf66490 SHA256 1b9523c310b691bcd80725c272a23006a42f27952562c8a75e652410f9f18933
+EBUILD kdelibs-4.6.49.9999.ebuild 10018 RMD160 e4c77c013566b39e75dfe4a9f69db29021dac191 SHA1 53a4410d32a85d7dcb9dfd055a3934f56a16b9f9 SHA256 51cc53395fc6ea0b84bc10151daa67ecf75d2cfda7d1ac3f68e03aa2c0b75ad4
+EBUILD kdelibs-4.6.5.ebuild 10080 RMD160 53b9b8b2ada72045b18c2851c3a17ca4e38bfd85 SHA1 ef32a362ae7a87fdd1134f521c59337cbec5b977 SHA256 7a308f3afe060bb17e9d605cc124fd76a5ec520e403bf89b0d5e3df6db3edcef
+EBUILD kdelibs-4.6.90.ebuild 9597 RMD160 56e428cc4e652a23ed483f7c0deb8c98ce05b1ce SHA1 630f44d2f6cc02b51dd2142e1883b83fd4bf2196 SHA256 f953572ca781d7689a7a0a5d15490331aadfc3cb8b0abdbc447bd48a78149386
+EBUILD kdelibs-4.7.49.9999.ebuild 9562 RMD160 3411863c505b1c2d48c49491bc44920cd9f5b666 SHA1 867f5645ad3ce2411b2c823f848b5ceb6545b8be SHA256 959743a53cff9a562ef9b4bde03e8c78e0b040a036c15049031ac610a00573ce
+EBUILD kdelibs-9999.ebuild 9562 RMD160 3411863c505b1c2d48c49491bc44920cd9f5b666 SHA1 867f5645ad3ce2411b2c823f848b5ceb6545b8be SHA256 959743a53cff9a562ef9b4bde03e8c78e0b040a036c15049031ac610a00573ce
 MISC metadata.xml 400 RMD160 2464c52adb57c7f5949a31aea4b1e5e2e10a5081 SHA1 487530dfca818a8ff2b2583b808303778c19b6da SHA256 a5ce1ca62fd98100220bea78ba6b85c7b086b07a2b93ec153020ba06ec9f4e80
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOFLYIAAoJEEb+UGWnxTyHeYoP/00h4btbTgTgiwS/0APaKe6N
+saZ1Kdz40RPG3iGcKA+IlUg/cIOO53h+c8A9ccRLKbXynpg4MDOV5nZIQSdnQQ7D
+xH8HzydGUJ9v2bMAOP37ebUQ06ucpSmIsgj/ZsT9xnfUyTWvJg13Tac6/EMv0qhV
+pfDaa3Y/mpOKFKtb5xdznXagyX4UewHwrytJJWxNJqpGeNIZolq/dhmyVelZYhmO
+ZVooT2RQZ+2nLViXP4p9fnkF+6BMrJWFTgcZbBcxfv1+3UDaMkuNKL0MxqX9saHO
+hM+CmFcYTqjDR0d5xRLimi3sx/00PWUBIykOCXBoXGKfw7dc1G2KNmnfUrhzm+Vf
+GzZTlASw+KEe90vOXPveHMrYIuO6wljs3YmvZNpoErZEnFB8dgoQ/DRkpQroNx2V
+M43cvPdUKuK3KYHUEyPj5KQRSipw3Xlz4UpX318jhqxHM7Par73+idbCV/FnYLWg
+Gi1rS8KKn3O3g9QnPX6oyCyabW8DK9QnSmHY6h1NKPggDkSx8uqlfUimzLazGouO
+JkK7azqms2ZmYxnh8GLR9wyPpP18r95ExgQbUZJA2kv1SH0/2y/9skoNxzRaQQ5U
+gu5Wyf4QFnvc0pNaDojnsybrwErGH77+L/iLrM+XEVI8jmGTj7aWdAyRS06Nsat3
+3/lJosvhuP/FMmjGMqSI
+=pDMs
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild
index 8e72ab21af1..29d25fbe8f5 100644
--- a/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild
@@ -142,9 +142,11 @@ PATCHES=(
 )
 
 pkg_pretend() {
-	[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
-		&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	fi
 }
 
 src_prepare() {
diff --git a/kde-base/kdelibs/kdelibs-4.6.5.ebuild b/kde-base/kdelibs/kdelibs-4.6.5.ebuild
index 8f879944402..58c109bac73 100644
--- a/kde-base/kdelibs/kdelibs-4.6.5.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.5.ebuild
@@ -142,9 +142,11 @@ PATCHES=(
 )
 
 pkg_pretend() {
-	[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
-		&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	fi
 }
 
 src_prepare() {
diff --git a/kde-base/kdelibs/kdelibs-4.6.90.ebuild b/kde-base/kdelibs/kdelibs-4.6.90.ebuild
index 17dfacbedfb..0affb50b920 100644
--- a/kde-base/kdelibs/kdelibs-4.6.90.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.90.ebuild
@@ -142,9 +142,11 @@ PATCHES=(
 )
 
 pkg_pretend() {
-	[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
-		&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	fi
 }
 
 src_prepare() {
diff --git a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
index 1df0e134774..e401de87c6a 100644
--- a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
@@ -142,9 +142,11 @@ PATCHES=(
 )
 
 pkg_pretend() {
-	[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
-		&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	fi
 }
 
 src_prepare() {
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index 1df0e134774..e401de87c6a 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -142,9 +142,11 @@ PATCHES=(
 )
 
 pkg_pretend() {
-	[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
-		&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	fi
 }
 
 src_prepare() {