Apply patch to disable striping, we handle it by PM.

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

5 files changed, 71 insertions, 19 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index c7afc66b0252..31a4d9c41a45 100644
--- 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.128 2011/09/05 17:01:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.129 2011/09/06 13:07:55 scarabeus Exp $
+
+  06 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.9999-r1.ebuild,
+  +files/libreoffice-honor-strip.patch:
+  Apply patch to disable striping, we handle it by PM.
 
   05 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.9999-r1.ebuild,
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 262c5509b4e4..b2ec915926e0 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,6 +18,7 @@ AUX libreoffice-as-needed-gtk.patch 403 RMD160 c1c5733d282eb3b59b7fe03d5258e9c91
 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
 AUX libreoffice-gbuild-use-cxxflags.patch 353 RMD160 97f0c4cffe624ca8df71471cae61975176464847 SHA1 d1a2de4de89055fc4150f27022ea9f0fa5a34f20 SHA256 27ccd9ec886f2f6433969524860b3fa7199531b5f5d774f7643d6bc75883222a
+AUX libreoffice-honor-strip.patch 1110 RMD160 777e9da0265b9cb17ca124d55d55b26ff1c54b1e SHA1 8d0a10e3b0f6c12f996ec7191ca2a33e0d8be053 SHA256 9e85bb3a30a5ba3e1ee7441cd3965dc603ba33f02eb52857764498a5db08791d
 AUX libreoffice-installed-files-permissions.patch 374 RMD160 83d650b6b0e84a02e2ad0667b20d4dba72cf4ee2 SHA1 87345e895473a8bb209b0ad542670c5eb7717ab0 SHA256 a664796c27c69fe5119af5d82313dc65371eb873c1d15691d97745d9a1ee3e81
 AUX libreoffice-kill-cppunit.patch 555 RMD160 97655715899b1518b3c7935e6db504196f561d00 SHA1 05d28cbc51ca13b8f77c95e78a1810318a423afc SHA256 5d792f868f0dec1ee3147a1054e127ecbf07aa33a69132a5f60e3b692896543e
 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
@@ -169,25 +170,25 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c009f77 SHA1 572dee87269784bd1864e96e1eca820bfee2d513 SHA256 5452357751a154c65c126e4b3bdea17fd1c2d221734d5859d39808cae91d3599
 EBUILD libreoffice-3.3.4.ebuild 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69f61af SHA1 18c1211e8eaf8c587f52ee303dc264c941e7c045 SHA256 d602a3efffc23cb848b1fdc667a0d7b1c9dde2502dfae0fb537fecb9ee744cc2
-EBUILD libreoffice-3.4.3.2-r1.ebuild 18362 RMD160 09127b7a22033ba87dea7ad9cb3158694399dbef SHA1 2c19eabd8df4dff803c0db9cc32f4ed5fc80e6a3 SHA256 42b79d39eb66fd454b67bb92f8cf85cc87b9d936a069811f3792c8b53289a236
-EBUILD libreoffice-3.4.9999-r1.ebuild 18363 RMD160 bf0228a95af6fddeab3628a98eb2e10a13b82c0b SHA1 9a93ec4d90c045521a4a74cd086d8fc8594b426c SHA256 32f326a53b1941079d5a8d8695b003dced7d452f29518ebbe0a6cdc53b8fb1ff
+EBUILD libreoffice-3.4.3.2-r1.ebuild 18401 RMD160 987f42d5ef6017237dcd399ab0abf1d5fc9725ef SHA1 70e7de94a4c5fb6ca3c9e52433a2a5a5aefa11c5 SHA256 48a3cd1b90466bb2d822f89060ee4af52a4f84f859e9252f7994c8a34281a397
+EBUILD libreoffice-3.4.9999-r1.ebuild 18402 RMD160 0e2006f32e515250f1deffeb88f22b9d31bea3f7 SHA1 138f5bc17612a979006d26557e5416c680b3b11d SHA256 8aefee283e23fcbb21ae00812014f49a479b128ecbc35fe01d07ffb95b937fcf
 EBUILD libreoffice-9999-r1.ebuild 17710 RMD160 9c9620f10b31fb7d4482314183f5b4a1fc28ab42 SHA1 3cddc539b196bc8c9be9d3eab4d703d19dbb94c7 SHA256 697f380eec05833b322011b3ea1550e0faa31cc8b602893318e4547b761558d7
-MISC ChangeLog 25343 RMD160 3d8b6aefdf1f83e184881171d2c4121b5f2ee747 SHA1 7d2428c72258dcf5047d1f9e12e3d435c9e4a235 SHA256 d173f59b01eef74d5bbe6f8c6427dd63ec295a96942da5fcd96572363effb930
+MISC ChangeLog 25559 RMD160 13cd20a28935af8c77ae608d0b4853ce58b5e279 SHA1 34eea6f3f78dea67db3fca8566205e7d015583b1 SHA256 557c3980d3b2cc2100fcf76fe32dddd084ef50cebb8c5aea524e6e7866205d63
 MISC metadata.xml 980 RMD160 5201a4943c69632cf94cfaf309fba261ea5146ec SHA1 069a007c495275783c7a025f44e4f1ab59edb715 SHA256 191a40132b182e7dc3f504055341014664f42d74caa27ee8dda2b5edbbdac6c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOZQBjAAoJEOSiRoyO7jvomN8P/3Zy+EFZGrQdvev9zT6PtQ1Z
-6T91yVPtAgDsNxjV2j2vSh062oCybmIJ1rJ8hw5XQrf52KfILLcx1ApNqWTsuYPt
-eYaCXUDuTApUp3CJzVNrUb9JlFdOfewL2VDicilzTywhp9eygRMVTKFZI93ZN1kk
-3RKh2FCizDOk802F2jrXS7X6mvoZ58kK53ds14b4W7TbwV2ru0JSwrSBV6olsUWr
-wiJUKSR6Dkanz3C7TCyhkcTCvxGlqrqXWfkZQEqKDUwaXZvA1wcBehzWdWgC0EIs
-sgnBz6TCxDYXKkH0jtsORYnw6Qs2m+7BEvcQbiBFn8h3L0Q2zZL/G06i1qmSHi4E
-msATbxUmXhuKRoWOoS5M1Iuje7XPeYLeeH75MzMOFALRTBjMbNTkR4kO4A3b54B9
-X4Qvlgc6W2ZqF+hW8KeI39vD1BBuQZR+qjPFso6YU4MwXD6CY+w5TsU3E2j78BQX
-ZXSg4MovU7aVuJ5tlYe/OgwfzZ5Qnu/9wKd0yn8mmY+BwDG1snHHVZVfwnEcxvo5
-ImtOHP2AwfDXTC7wB02csJ2Hie3J/f231leYwwUgz8tjWYB98OpCQDIM3/B8tQd6
-aKMlBt21x9VlIxyWGCU4OcNSyQYhaop/P6eDM0OngkmHc7avTPBH0TgJ7u7iUTPa
-CFtr0nF2Y9IrsPbzGTKc
-=dYNR
+iQIcBAEBAgAGBQJOZhs6AAoJEOSiRoyO7jvoCQUP/j1arpmdN4VusYeGGHNO4y7S
+ZP5/MaAH9+A4nJKsuCf4lKyg61SDrXz/UqZ03VDeTskDknI8nSwk0+jOm8z4KU9I
+UMC5tFlAIjRWmu1bCoN8Aw2qSbWrdkIE6TRBVEyB4YW+j3cQG2FyWiPQoNb8Efy2
+vtArZszsKi7xLHII2N4zFlN5YlnmxOmNRGKWzlz2H7R2nRvlL+WGT/nu1F2z/Z2m
+bZYSsklNqxjnqyhYu4D3lOLkhIBXdIXvot2XOwFKvq3h0C+qQ+EiwigaUQ5beDIE
+FAlKXy59pt81qX8NrgGvnlxOK6v0sBcQLAislTn78kYcrMk5nk7fami3EBfmefbL
+sNteKJZ+sHkrEEnD5qVkp7pLME3PTmCFheKdADKBNhxM7SwgUALX2Q4iatiDFwon
+6SwJA/N/Myuxpno8SFiCjEyjF3kw07enT1JAs3tYP8qUSsmMLiRfoRJE4aUaoDnD
+R/LwwSMbHlBPyF40GPk0/viEZsp0Kn3OSA3l0+2CBTMfZY2HwFtoCHwCZw3x3tr3
+6EiK3sIJiNbA/ZRh8aICNPsliX/GsWXNkZ7aZ6avIq7QnvGQnkmjhtAsgZ28BrEp
+ZhPze1IcAq47ajb+x+cj4dfqW8Eo3up6n7J7pydsttJnIcloPQMSzqqPu7+3Ng/C
+1zeB00yFxxw266YjtBwG
+=7wdg
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-honor-strip.patch b/app-office/libreoffice/files/libreoffice-honor-strip.patch
new file mode 100644
index 000000000000..1d15802ede49
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-honor-strip.patch
@@ -0,0 +1,44 @@
+From dcdcc53e25fce09be486d4ea700f8a72895a1e69 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Tue, 06 Sep 2011 07:39:07 +0000
+Subject: Honor --disable-strip in gbuild.
+
+---
+diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
+index 48bebeb..329eefa 100644
+--- a/solenv/gbuild/gbuild.mk
++++ b/solenv/gbuild/gbuild.mk
+@@ -87,6 +87,12 @@ else
+ gb_SYMBOL := $(false)
+ endif
+ 
++ifeq ($(strip $(DISABLE_STRIP)$(disable_strip)),)
++gb_STRIP := $(true)
++else
++gb_STRIP := $(false)
++endif
++
+ gb_DEBUGLEVEL := 0
+ ifneq ($(strip $(DEBUG)$(debug)),)
+ gb_DEBUGLEVEL := 1
+diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
+index 4234c71..5c71bd4 100644
+--- a/solenv/gbuild/platform/unxgcc.mk
++++ b/solenv/gbuild/platform/unxgcc.mk
+@@ -163,9 +163,11 @@ gb_LinkTarget_LDFLAGS += \
+ endif
+ 
+ ifneq ($(gb_SYMBOL),$(true))
+-gb_LinkTarget_LDFLAGS += \
+-	-Wl,--strip-all \
+-
++ifeq ($(gb_STRIP),$(true))
++gb_LinkTarget_LDFLAGS += -Wl,--strip-all
++else
++gb_LinkTarget_LDFLAGS += -Wl,--strip-debug
++endif
+ endif
+ 
+ ifneq ($(gb_DEBUGLEVEL),0)
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
index eb13e002b5d7..cf6faf4fbfb0 100644
--- a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-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/libreoffice-3.4.3.2-r1.ebuild,v 1.5 2011/09/05 17:01:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.6 2011/09/06 13:07:55 scarabeus Exp $
 
 EAPI=3
 
@@ -226,6 +226,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-32b-qt4-libdir.patch"
 	"${FILESDIR}/${PN}-binfilter-as-needed.patch"
 	"${FILESDIR}/${PN}-kill-cppunit.patch"
+	"${FILESDIR}/${PN}-honor-strip.patch"
 )
 
 # Uncoment me when updating to eapi4
diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index 557fcbf7168f..53d7c26eda28 100644
--- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999-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/libreoffice-3.4.9999-r1.ebuild,v 1.5 2011/09/05 17:01:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.6 2011/09/06 13:07:55 scarabeus Exp $
 
 EAPI=3
 
@@ -226,6 +226,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-32b-qt4-libdir.patch"
 	"${FILESDIR}/${PN}-binfilter-as-needed.patch"
 	"${FILESDIR}/${PN}-kill-cppunit.patch"
+	"${FILESDIR}/${PN}-honor-strip.patch"
 )
 
 # Uncoment me when updating to eapi4