diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-10-19 09:26:01 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-10-19 09:26:01 +0000 |
| commit | d7ec9d7172e05472a096a54e2a81a1fbc8801927 (patch) | |
| tree | 23a3dec1cb68571b0b706b21c7b680c87186b33f /app-office | |
| parent | Stable for HPPA (bug #387521). (diff) | |
| download | historical-d7ec9d7172e05472a096a54e2a81a1fbc8801927.tar.gz historical-d7ec9d7172e05472a096a54e2a81a1fbc8801927.tar.bz2 historical-d7ec9d7172e05472a096a54e2a81a1fbc8801927.zip | |
Fix the gcc checking to avoid bug 387515.
Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice-bin/Manifest | 30 | ||||
| -rw-r--r-- | app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild | 8 |
3 files changed, 27 insertions, 17 deletions
diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog index f5cd2e75e6f0..d111182f7edd 100644 --- a/app-office/libreoffice-bin/ChangeLog +++ b/app-office/libreoffice-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice-bin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.36 2011/10/19 07:55:54 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.37 2011/10/19 09:26:01 scarabeus Exp $ + + 19 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-bin-3.4.3.2-r1.ebuild: + Fix the gcc checking to avoid bug 387515. 19 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-bin-3.4.3.2-r1.ebuild: diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest index 2f00c016aaca..8b324d1fe84c 100644 --- a/app-office/libreoffice-bin/Manifest +++ b/app-office/libreoffice-bin/Manifest @@ -429,23 +429,23 @@ DIST libreoffice-kde-3.4.3.2-r1.tbz2 108344861 RMD160 9d40ba4ed8b755a5035baed0c3 DIST libreoffice-kde-java-3.4.3.2-r1.tbz2 112102862 RMD160 83a0e9685a0cd63fd2a66748172ffb5854a05fe0 SHA1 71e4dcfeab65912692efdba88d5054833ed410d0 SHA256 9f6fdd5b0764d180df488fd37472a8ee00ba212423d0e73c23794dcfabf2049e EBUILD libreoffice-bin-3.3.4.ebuild 6973 RMD160 77e5b05e09157fa15b075ff26005dc79f40857ee SHA1 d0f295697dcfbc94cd4562a722370c0bd15de04e SHA256 f1a82b62e0cdccb061df37923f9cf2fe7045cb5f5d7bf82d274510a640d00f85 EBUILD libreoffice-bin-3.4.3-r2.ebuild 4850 RMD160 65a4136b47fd6ed94eed5c1931cf5ded11914163 SHA1 56dc479112ee5b5c0035dfb99eab31e7cdeded0b SHA256 b33aa8dcf00cd6124ecc7dafc564de20404dc3b1f0d7ed748772e19b93564539 -EBUILD libreoffice-bin-3.4.3.2-r1.ebuild 2836 RMD160 6d85c3c1f91a22d13a76a04e4f85d45ed0e9eb84 SHA1 6b82a1b6624f5901aed8c4459f752a85d5711ff0 SHA256 3716c55388909eb6f9d7087af54f514b88916ce061bffdf1bd7fd24c50775645 -MISC ChangeLog 6675 RMD160 eee767a96b45fe684f764b90c3d793e9be730ad3 SHA1 6218254c51c5142db53e660cde146e6919432291 SHA256 86f953ea3c6a74404ee22b3efe1594363ffcef05272274d7da093eacda26026b +EBUILD libreoffice-bin-3.4.3.2-r1.ebuild 3066 RMD160 46dc9c615d1551802d1a278c0b9736cd06fd13e7 SHA1 0cb0c10b0be5d775c1263c9fb643f60b3915e8ca SHA256 a93bff65de3ddda0f17679e736423297d9170ff97361c698ed98fea993ee39a2 +MISC ChangeLog 6812 RMD160 4e2a39f734ccf00cf27d06d9b0ec77fde1a9533f SHA1 237cf00b222e32b415f7ed6347c901a4fa0f4712 SHA256 efc9d2b0c93e0ef52857966d729f51bafff56bf75407f57599594ecb7ed597f6 MISC metadata.xml 474 RMD160 7104bf15d70449529df6259b71620443392a14e9 SHA1 a4055e99444213fea16f282b2fa7c25ec0b21be6 SHA256 b92b55b2aec0028aaac8afdb01f4b9ea416c8e00a2207dd8d0db317e4fad48b8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOnoMMAAoJEOSiRoyO7jvovmUQAJI4Q286UOI1GrGgyJF3l0g+ -79lbtT3b8DffR1YyPmD4LzLvHYsGpWfFIf4+tVPzdYEBG7QcKja+YwESV28BWSsw -QOsBLHQiED91+LgDxH/NVSgvGudKzFmJIG71T1EIhR5YuAJM/liP2Fr5ALgzkaW+ -qNg2L9Avql/OZniad+OYxs1rnIVgLpPn6jNMDrQGLmoP/SURnUCE+i8YxZc0xho5 -kMK/pb/cuYp7Y+f5AxtUhsVtwkjwy6hPJYLvZYmm+J3TQp6OrCSisP/sMAcArG4V -Ufb2wMunVSZDQckheJ13E21cKU3chIRGK16KI0p4S8xER29ypjNwD0sNWRDjcfet -ih7JCx3KOuQLwruJB8Hjql4otJ8wKhVGqYpXrU7B91l04ZziA+nHFz9RmWdxrukg -9QryZsL8JjuR9zFWg5MYrP7NsKu1xDNZBaA6qeNJ8qw61vdtweFy05rD8So182ul -M6/BnG0iCZ+uWgZkw/3SaMFkVQWqmTWRj3fOBztn/s/02iZtzAYSLFIM1AjVpyxg -dJyLHLb2RAsWLCxknA0rKSpejNReZ9REtYisgeqwcjA66Kl9xIRK4aHOfPtoe7Vz -ZYb5GB79F7icv9dLLcPJWo9QLuDr+epG5FwL/S5gYnemmx/W4AOY/DmJslL9Dyev -rc0gHv3UAVpfiQBI5tw4 -=EWwB +iQIcBAEBAgAGBQJOnpdXAAoJEOSiRoyO7jvoMOAP/A8Y7pM/S/7WdsRIHt0zTB9G +HOP8wxATWqnDGsUbvV48KEjjIGEug88P5wMMWdy5xUJe7ccx/6hw9x+CkKCgsLIs +JBqSmu/mgkNvPEJiyFPGMZwSMHZj4HqWc9XCJErlDGqmW5Ojbp7/HhBE6LsWxXCA +lojIb3gdLhyMIXvTv8KKYW8XsT9mdspb74k4/OtduAFbENvxyn9XM28V5sd8Nbjz +cXIKUIGJqFAlLLQdMA1fMLL5FhvpfBbP1CPVB2z8r0rNCIWjy6lmm6RDEFVBR+jE +OwG+PLHdab49IwRbEOm06rm2q1Glx4iTZCdMoYdGTcwT5V2EOPqmAxzFJt34DP5A +6jFOKFwsL2ZLgodPlwSv8xl0r8d11UPfhdcALx+cSBxo/+tRuJ9NjvGTk3+vl2wt +bYXUkEF3FWIiITRBKEQoEyveii43AqFZuMa7+aBOh4HIQJly/24PbcPkwV8brsV3 +pyzGeB7E8mR/SzLRU+d4iM4vE9U2cfbol1EI5IjrRFjnrqmFuLj85Lm4Hk4LZG93 +Lg5i9Vk6L/g3UbbJul4r4KaBBCA/jYmN4YQaGpzRSrfh5a/lRv0z8cnebeROerTV +thqw7VCZR9sId+QLbE33JQegLH0ZxeAgVXzQ5NV2WndQCY/4JNQvo0VWdeNX+EGs +2Ov5f4R0MqEpVifrq9/x +=H5Ew -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild index cdbe35cf61b2..438ece59ae16 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild,v 1.2 2011/10/19 07:55:54 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild,v 1.3 2011/10/19 09:26:01 scarabeus Exp $ EAPI=4 @@ -103,6 +103,12 @@ RESTRICT="test strip" S="${WORKDIR}" +pkg_pretend() { + [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \ + && die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)." +} + pkg_setup() { kde4-base_pkg_setup } |