Fix bool check on AVX patch.

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 91fa01244c690ea5a0828454d5397a21474fe8b7..4eb9878449ac2de5fae2a56a8a4db73ad3e8ac80 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.105 2011/08/12 09:57:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.106 2011/08/13 07:04:08 scarabeus Exp $
+
+  13 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  files/libreoffice-append-no-avx.patch:
+  Fix bool check on AVX patch.
 
   12 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.3.ebuild, libreoffice-3.4.9999.ebuild,

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index c1b66aca7d65301d9bd9f1384fbe036dc3f401a5..f108d388ecd7920fb3c940e6af0995734609e15b 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -13,7 +13,7 @@ AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a6
 AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b
 AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7
 AUX libreoffice-32b-qt4-libdir.patch 878 RMD160 5d1d90ca61106ac4962d7f70489910191f4347b6 SHA1 5be37237f9564613c893a7e486b2a1ebb24584c7 SHA256 9785fe9ae6c11f922b13941a5b60733a8bce70b08db71a9447e960191b210f0d
-AUX libreoffice-append-no-avx.patch 2415 RMD160 b1080696d5a77eff0997422f73ba10c2d2a6b09f SHA1 ca026ee7941002e340e12b1bff164841024ca2dc SHA256 2d7542645585af2f485d38bbdb23c4c2f369301139de8cb441417e9ae15f85b6
+AUX libreoffice-append-no-avx.patch 2418 RMD160 8c9a45ccb95425c13a2de5895761703022d99ac9 SHA1 f181c74bb600c9ecafc9d295148061cc0e0be701 SHA256 1720741dcfbd48345140029b405db68c25564245eaaa3b336113a59b005df611
 AUX libreoffice-as-needed-gtk.patch 403 RMD160 c1c5733d282eb3b59b7fe03d5258e9c917d9c6c4 SHA1 7516a3d554d96b7a27e5884ef124f9f5166a5939 SHA256 88609b6bac793423dee7af79110a05981669471170f9473a2bc591d35927117a
 AUX libreoffice-binfilter-as-needed.patch 1112 RMD160 334c7ee6109b4121dea78715fef00320c945a49e SHA1 ca816ea54146c574fd18d9b8f616c4ae17f04a4d SHA256 b922b27ee671bd936709500ff750a48bba4463ea11738b798f643e5a7ac545a6
 AUX libreoffice-check-for-avx.patch 1973 RMD160 49ec33a7a230886e59658000ff0469bdd7606df8 SHA1 08003e579eafaa09c2df211a27b36533cf5a90ca SHA256 3c31378033355efa499eafb0100d52dcd6b339b2fab067f6c159caf6d365fae8
@@ -174,12 +174,12 @@ EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 bd31b78ac9b3d4a0917f4d4ce824a7f82c8
 EBUILD libreoffice-3.4.2.3.ebuild 19627 RMD160 f85f5c23d253d754d876779a9e29fef934443958 SHA1 693a7c104af71f1a859ae6f4a96c7c287cbcef2a SHA256 f4d34636bbbec54302eebc99cd66becb370062ffd65dd232b0a1412ebed4a559
 EBUILD libreoffice-3.4.9999.ebuild 19548 RMD160 608c1c73a995bab23b94cea2a2c9953bfec143c9 SHA1 494bd138b5a2954c4db3918b5b934ab430031dfb SHA256 3958248b0b680c5efae05ac0c691f50ff17b8f5f54e5cc00abb03bb58f6cfe08
 EBUILD libreoffice-9999.ebuild 18975 RMD160 ade20095c351f895ac2226659101b1b9cdfde214 SHA1 219d6fcd66b49446919365a2a2c8591d1cdb901a SHA256 1b44164503d7d1a04e2acd8746359f5e91082c3baa081678e944fe9619313500
-MISC ChangeLog 20592 RMD160 cdc204c6f340b82e8451ce2316d64714076c525f SHA1 f640779d0789db0790583747abe9e7b1bfa9bd79 SHA256 1fa3c0ac9c3a79879526149a05c5d1f834988399587ef595110807db1dcb706a
+MISC ChangeLog 20720 RMD160 184bb9dcc38528fdc6504040208ea3ff1b2267ae SHA1 51f36b65b069a0e08f790e91d413dd2fe6d7153f SHA256 e1aedbfef533ca379590abf1002d34647dbdb5c08680d9e9ee0c7f90f06797c6
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5E+Q0ACgkQHB6c3gNBRYdf1ACgzCbyYBlHBlV6zw+BiH6cac86
-UNoAoIB1KfIR3ivf7hUdpG4Sn2Ohw1Mz
-=0mcR
+iEYEARECAAYFAk5GIgcACgkQHB6c3gNBRYfV0wCgqoMD4kpE5d7WbbKFuE5627hW
+/0kAn0dDd7IMqqzP7w4gLnEVOHVrwocG
+=aOaP
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/files/libreoffice-append-no-avx.patch b/app-office/libreoffice/files/libreoffice-append-no-avx.patch
index 76e3c3941db3430600d86cb1f263a25b9643ddc7..18563055f44bd0b0eb233747cbd3f200d395b0db 100644 (file)
--- a/app-office/libreoffice/files/libreoffice-append-no-avx.patch
+++ b/app-office/libreoffice/files/libreoffice-append-no-avx.patch
@@ -19,7 +19,7 @@ index beedf9d..609e09a 100644
  
 +# In case the compiler supports AVX this code segfaults so specifically turn
 +# it off.
-+.IF "$(HAVE_GCC_AVX)" == "YES"
++.IF "$(HAVE_GCC_AVX)" == "TRUE"
 +    CFLAGSCXX+= -mno-avx
 +.ENDIF
 +
@@ -36,7 +36,7 @@ index dd35432..e519105 100644
  
 +# In case the compiler supports AVX this code segfaults so specifically turn
 +# it off.
-+.IF "$(HAVE_GCC_AVX)" == "YES"
++.IF "$(HAVE_GCC_AVX)" == "TRUE"
 +    CFLAGSCXX+= -mno-avx
 +.ENDIF
 +
@@ -53,7 +53,7 @@ index 2c7a8da..d2b0809 100644
  
 +# In case the compiler supports AVX this code segfaults so specifically turn
 +# it off.
-+.IF "$(HAVE_GCC_AVX)" == "YES"
++.IF "$(HAVE_GCC_AVX)" == "TRUE"
 +    CFLAGSCXX+= -mno-avx
 +.ENDIF
 +