summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2014-12-09 17:18:48 +0000
committerMichael Palimaka <kensington@gentoo.org>2014-12-09 17:18:48 +0000
commite551428fef3b435d6f5fca852a70858f05268d97 (patch)
treea9e7b446503a710ebff05725e2539417ffe40561 /app-office
parentEnable rdesktop USE flag by default wrt bug #530968. (diff)
downloadhistorical-e551428fef3b435d6f5fca852a70858f05268d97.tar.gz
historical-e551428fef3b435d6f5fca852a70858f05268d97.tar.bz2
historical-e551428fef3b435d6f5fca852a70858f05268d97.zip
Fix GCC version check logic wrt bug #520102.
Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x06B1F38DCA45A1EC!
Diffstat (limited to 'app-office')
-rw-r--r--app-office/akonadi-server/ChangeLog6
-rw-r--r--app-office/akonadi-server/Manifest33
-rw-r--r--app-office/akonadi-server/akonadi-server-1.13.0.ebuild6
3 files changed, 25 insertions, 20 deletions
diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index eef204b8b1a4..3d009289890f 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/akonadi-server
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.152 2014/11/24 15:28:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.153 2014/12/09 17:18:39 kensington Exp $
+
+ 09 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+ akonadi-server-1.13.0.ebuild:
+ Fix GCC version check logic wrt bug #520102.
24 Nov 2014; Agostino Sarubbo <ago@gentoo.org> akonadi-server-1.13.0.ebuild:
Stable for ppc64, wrt bug #528754
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 8d30605cec28..427458c7b97b 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -7,23 +7,24 @@ DIST akonadi-1.13.0.tar.bz2 294198 SHA256 8c7f690002ea22c139f3a64394aef2e816e00c
DIST akonadi-server-1.11.0.tar.bz2 235101 SHA256 0cb257509d53927241b71d85c42efb0b5776efc37fc8dc732e75f6813b8a264d SHA512 366f0e4a86038af5eb6603653e599076c66e84f59db57f4c56a89ec265be7e335f3f5d14444030a6f398e2361969ad85bc73357359da7ab8c307ec3c5d80ea40 WHIRLPOOL b050f5e1d5220ec512ab6e57cd083b652f03ef1e391fb336a51888aede7b0faf2f2ab58db6f6e67ee3fd7ceea8efcb54d5c3b1a6c224adf3deb41cb10b3c91d2
EBUILD akonadi-server-1.11.0.ebuild 3117 SHA256 971aeafd1165f5886d81edd1335971de02b8ec9654ef62614411c1d7020b0e70 SHA512 8044d87c6b8ca75d7d4d9d2eb7673056ce16af6df56acf448e490d0fd1fc4e87e2bb914fb2cbbdada61e0db133c9c19bc7a55f870795f97e43ab93db82240723 WHIRLPOOL cb6da1ed1176d1dc070fdb020ab6a29347e9ad35fb97d8c509a8186e27243d614c25d794f8b321edd2c40423f00add7a68e2eb09b471b8b552f62050bf4cf05a
EBUILD akonadi-server-1.12.1-r1.ebuild 3173 SHA256 c5e616160390c3bc81475ed31e060a3c4c9fe6c9761fcefab25d90e9d281090f SHA512 423860e434797e041a7406f58f56f6571a687e721106b14261ab578c146c4409dbbb76959bffab14dfbbc8c60c7a02d260b2cf09c638a794346784242c286404 WHIRLPOOL 70df76489616ca5e66188bf5ac666ac3b178a1d2f4e6d3aaea9795eb9858998063720668bd4549fdc4296a1af11db16ac4a8903f4a816bfc93d93751ee95617e
-EBUILD akonadi-server-1.13.0.ebuild 3373 SHA256 c063bc33c907a70a4b500ca7c54edf87e85927ca709f839e92df93678cc54f1b SHA512 a9941b16b870affa8b25ff83804b81bc64335ac5c9ad78b024920015ad8720f613ecb34548cc30dae3ffc5d6737b325746032b07fcdf2b0c81b151a443a69a62 WHIRLPOOL 91563574623e7c93bfd8a5c2cdbb938528712ea25bb20f6f1dc7ea628a3c633e7eaa24559776afd7c5a9c3a54d06a2f9820fab2a8c7192c7414a763c91c2ceb0
-MISC ChangeLog 22414 SHA256 9d9c19b9e72d73ac13c0e79c45e0a5e1af9be6076f99427fbbd7d55d1cc64377 SHA512 565fc0c7ce52b96fc206d8d697b78a99a1cdfb9736c7be25a547689a5365f3d2d9bf34d59055715ab0ab4dafc55eb24f913195119e7b469bf1b4cbdeeac8569f WHIRLPOOL 55b55f2fc25319746081b0bf7b2852d07321ca0bcedea8e25819aacb6546923c6669f7ec28687629f0889f4374b0d566a65f6ccab01fba657924fdd35d49846d
+EBUILD akonadi-server-1.13.0.ebuild 3380 SHA256 4593c70a4b2d951563a2c336008f771ed3a84e0b4d7c1582bb9913dfb6a46684 SHA512 00e6f643482da4ee8db35f018cc982843c89bd2ce71f7f6ecf1a46a82bf07352a2935f8fdb75ad76a939467bb5c76b2cd23f2f0869a643c2696fdec2eebafca8 WHIRLPOOL 6c12bf270e31d5482c262fd3c3307d148e24f6fc6f24ec05bfe570d90fd70a22a57a3fd9d4ef474faa426a1eac907384665b3b67633c16e109b84f1652838ad7
+MISC ChangeLog 22557 SHA256 f39ed94ff69dbc8d755908b581f53110cf53218763c45f72e129d4ee5cc5d807 SHA512 7de29fa63fa10d22153562db7e806ceaaa26eb3ec699b29684ef77b99c950ee53fe29703734b7d0fa684edda5d45041016315f72fb9e3a4fff7d985d18fa12bc WHIRLPOOL f138d2aa0d2fea9fad8c2952d3fcf30548522737051c47b64dfcf904b40c48cf646a9f9670656f5684fc109a3e4ff448e024e41ca6b61fd7797f372d2d3778f7
MISC metadata.xml 275 SHA256 0602f046fd341806f78a5850c099f697359bcac7eb67327fafb3339bb44c3700 SHA512 18330303bd7767d1dfc9398a35fd59fea5337227056dba883f25f5624ab9fbebbe3bbee7a3f678f82033c07660f95da7c73325ac5a41fd7fed8db6950c2cfdbd WHIRLPOOL c7e9aa255e46fd3bacfa0a1a036673311fcf0dfdd03f28b7076c5c0361f635293095d2a9210750ece0755591ca3fd2d35a1e28bffa00b92c618a22403cec367b
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
-iQIcBAEBCAAGBQJUc06fAAoJELp701BxlEWfqBgP/i9e+4CNDG4lg4Eb38wPSovh
-ecgtDhiAJFAk452WduMs+NIF07HbVHWSBg/oKkFrjvtyctskIqsNfF8UFeqvz9XQ
-o5jlnkxCUmN4zgz48bX/qtq+ue6irQK/W93bNZIvI3T+PQ1Sm7+xig6ByCFDSAxl
-Gut0fsSzYkvrC4h4iIrwA/YMF1TfGIdxFjJhmVsFXy8KEDKnxRamfPGGkMyESyUK
-0I/752CdL7hkQnsdpQOuLCDCUWNBfPGOkk+3xLJ6qXVLOc5f1pNMp2473HIgXfHd
-+4s9NEoiiVuaVONN9rAC0eXwe1QtD3XxPMrvGtNto3BN6xDL3A9wTFGUct/MhqHN
-XZso3ZuwPjAPHilaqjZax7c5TEfC4KefJlZh+ynsykPcZW1VbnTU8Qxv+Q9O71KU
-ClrD2LDG4g6DvbjOAagt2kRS+z81C9iFpnHh2xsBkvdCLZNeM8iSE8UJz4J2mQfY
-FHSsl6w6MASdpZfsr8mxVjSEYiUGKhAIxuQtl+Q8WsKvB2/xFq5toSXnZZxbo0J8
-nzFXzzhQx/uk4Qh8LlbESF25b1xbL7TEavLydXq9k8xVVQ/D9bqgAbMkB8jjXF9j
-qrkvCKdo+iKzq8lKWVpXk//JkEgZQg6mUToqJ6fEFlJV6RjjlW82mfBMYHaHzTNv
-g+hS/vxcirduW7fjFFBn
-=mcLs
+iQJiBAEBCABMBQJUhy8ARRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7N5cD/9NBZ1wjNga1f38cLakCA5kQNINQcRjYHhAne0mWP/tNz6k6j4FskIXjm/f
+M7TUTg3B8QDvx8NNzN90GVZqBgrlVXfthdd42NHrJI8I3xLLmtdub94agPowRagG
+bGarUkV+vh//Xb1IqhdHc/cq6oBA3vb4JAgCg9kuhCAX/o9oFbm07jeClzSSfB+3
+6VhthDHyckSzsl+GfFgBrpl816dgw25FSEMtg/KfgugDODerhN1vaYJ3EZJMAuZe
+w/mr1ux1nhNdyLnZb2LUrGooum5T42pKWYx6i0NJf0n7/FhNp5J0owcExBx0x5Dd
+CWG4lydt+ETCAI8oINXnYi8sDtXD+/rdJy3lx73ZV6u7JLrLFvvOXE9HgPyekTN8
+93YurFm1ndEJbgPuOvn9Po6eydOXGOwYmuIdNNhGU3UmWBx554V3S3224NcvDlD8
+cWXdR/oFW8rfx1JcC8xeXemEWr9jVao9qGAG9qxLeWlaB0qaSF3/f826LgwCTU9D
+R692ycChtCrnPf+2e+eD0oTCepq6Dwj4lo/UYA+8Wr9FgT6eLh1SlG/GTk0u3ZBK
+hn9zX7R8xIDS/gHNvI882Pjrx3LlkdRZwRC2LcXGwyQJ6lVB3b121cOndmtL/hAB
+hAlNe3HLTomNp5LhlaRvI81GXZ/3B4QLI2GAtdU/0yTSPbu98A==
+=RJyO
-----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
index 1aa0e96a0909..6a3814950818 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild,v 1.7 2014/11/24 15:28:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild,v 1.8 2014/12/09 17:18:39 kensington Exp $
EAPI=5
@@ -64,8 +64,8 @@ RESTRICT="test"
pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
[[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 7 ]] ) \
- && die "Sorry, but gcc-4.7 and earlier won't work (see bug #520102)."
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \
+ && die "Sorry, but gcc-4.6 and earlier won't work (see bug #520102)."
fi
}