Force proper variable usage. Just saw this in gekis overlay so adding to main tree...

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index d3df45da58e70df74147bb3e56ec23d064ec4fa9..ff9eb80218cafd7f3a533cbb130d2b9fbe27d74a 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.59 2011/07/26 20:39:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.60 2011/07/26 20:47:56 scarabeus Exp $
+
+  26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild, +files/libreoffice-gbuild-use-cxxflags.patch:
+  Force proper variable usage. Just saw this in gekis overlay so adding to main
+  tree too.
 
   26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild,

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 95d680d73ac394a1bf5b09ef86069b8d97034e61..eb67f953fb198a2dd5b908881784bcd8c41748d7 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -14,6 +14,7 @@ AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4
 AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7
 AUX libreoffice-as-needed-gtk.patch 619 RMD160 4fab1bec996f5f15da389de0cdfbb16b2323663d SHA1 541616c0376876e22411272ec48547eb9a4b6926 SHA256 f871f8d498271a58507bdbcfeefe056741166277f3ce31628d21fbfea9aa2de6
 AUX libreoffice-fix-sandbox-install.patch 1015 RMD160 3d5781b685958e106c745da0c94f33ebc097679c SHA1 2f5c3f9090e375e703cf19ef661e5743f2367075 SHA256 5890c3cbea327a930ede356e07c59096ce73941c4472b3d157b9f6542f3822de
+AUX libreoffice-gbuild-use-cxxflags.patch 353 RMD160 97f0c4cffe624ca8df71471cae61975176464847 SHA1 d1a2de4de89055fc4150f27022ea9f0fa5a34f20 SHA256 27ccd9ec886f2f6433969524860b3fa7199531b5f5d774f7643d6bc75883222a
 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
 AUX libreoffice-solenv-build-crash.patch 492 RMD160 b5220c76d90e785a5bb38548cad8d5d9d73de7d2 SHA1 a0571d2301ce9f03ff5b58326906fe2078ea39b5 SHA256 45276cdc69444a0542bac4e949ef92bac4286db58b824198a59f797bd71c81f6
 AUX libreoffice-svx.patch 1347 RMD160 91d5f142df33d119666252ecc319dc4e7ec70f6d SHA1 020db7d4e784a131acc63413ccc625715d44df70 SHA256 dbcd451e390c78102075b048e1472cb45c8d960608bef4ac0c0611c7aeaea736
@@ -210,13 +211,13 @@ EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf
 EBUILD libreoffice-3.3.2.ebuild 18122 RMD160 c8f363b391004652a2a3c7b1c2660df9d604a475 SHA1 7578952923caf5ed05a54c5cc2c951b86d7acbee SHA256 ebadb43837677bbcec00992718f67c6610c4d049d441f06d15814276c9c11207
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
 EBUILD libreoffice-3.4.1.ebuild 19176 RMD160 9f22a8c93f185f56dfaa37a291f194bc8f1972c8 SHA1 91eb7e4e285643d5c8da3acf1bf952fb68916efe SHA256 0b895bc9569a3b3ca84fe8d54fb861a4570ba8ec57317c0fcd8cf3b03e010274
-EBUILD libreoffice-3.4.2.2.ebuild 18050 RMD160 c7eaf0732da730dd2dc89518906db15d9be38f6d SHA1 90485c40255372fee997b2177f264e891801c550 SHA256 044ea7964051143f27358d6d11320b5be27955eaafa7d3176f8c24505ed008eb
-MISC ChangeLog 12373 RMD160 05e8cb6a539357acf24c90a53363ea1a2e72dddb SHA1 855530e10c6d835141252f1d8d2026934323f2ee SHA256 fe53d92aa7a1aac0f844d9b5c99d7dd85edc4f064c58ae5bc494694aa280583f
+EBUILD libreoffice-3.4.2.2.ebuild 18097 RMD160 0a1a1130766976dfe84bc969c12b4e50b4a3099a SHA1 1d6b1240f4564f59d7b7cac2643bc79f76a79013 SHA256 90c622448ac3dd49627e5076904aa6f9604dabb9aee941756815643cfac6ad4a
+MISC ChangeLog 12597 RMD160 25b821ef971ff9a7d30e8929326000a4041596ed SHA1 1265d5ef589c99e34573622871b4f8cecef7d22f SHA256 628bccad3b89f59f7c5ba910f7f3d11a0bac07cf7163160d7344a0adbd0ffd5f
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4vJZEACgkQHB6c3gNBRYdQ+ACgmD2TzgIqO4urVwTVqVjUXiid
-RygAoLfN+8tuUDeMu3A0udYtEj079Dqt
-=k9Pw
+iEYEARECAAYFAk4vJ5oACgkQHB6c3gNBRYf5AgCffjxTMksFktzoMake7CW3XlGa
+uvcAoLUqqOkMmPhG/SlGqzgVrrWupFht
+=IWyu
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/files/libreoffice-gbuild-use-cxxflags.patch b/app-office/libreoffice/files/libreoffice-gbuild-use-cxxflags.patch
new file mode 100644 (file)
index 0000000..e7ad122
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-gbuild-use-cxxflags.patch
@@ -0,0 +1,11 @@
+--- solenv/gbuild/gbuild.mk    2011-03-21 19:46:14.427883458 +0100
++++ solenv/gbuild/gbuild.mk    2011-03-21 19:46:37.019883448 +0100
+@@ -128,7 +128,7 @@
+ endif
+ endif
+ ifneq ($(strip $(CXXFLAGS)),)
+-gb__ENV_CXXFLAGS := $(CFLAGS)
++gb__ENV_CXXFLAGS := $(CXXFLAGS)
+ else
+ # TODO remove after the old build system is abolished
+ ifneq ($(strip $(ENVCFLAGSCXX)),)

diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index cab4980eb62ce6da89d1a60d2b46ce47aaa8d1ba..36eb8404f86da91af2e0fa3f95f3fbc07b7059eb 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.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/libreoffice-3.4.2.2.ebuild,v 1.18 2011/07/26 20:39:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.19 2011/07/26 20:47:56 scarabeus Exp $
 
 EAPI=3
 
@@ -222,6 +222,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-as-needed-gtk.patch"
        "${FILESDIR}/${PN}-fix-sandbox-install.patch"
        "${FILESDIR}/${PN}-translate-toolkit-parallel-solenv.patch"
+       "${FILESDIR}/${PN}-gbuild-use-cxxflags.patch"
 )
 
 # Uncoment me when updating to eapi4