Add fix for bug #379817. Sent upstream and will hopefully be even in 3.4.3.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64 OpenSUSE - Tumbleweed

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 56da505c330ed37628b9c659acbd074d8c0bfb6b..178b04d9792dacddc78ed8cf246871a7e2a17820 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.113 2011/08/19 09:56:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.114 2011/08/19 12:40:22 scarabeus Exp $
+
+  19 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.3.ebuild, libreoffice-3.4.3.1.ebuild,
+  +files/libreoffice-respect-destdir.patch:
+  Add fix for bug #379817. Sent upstream and will hopefully be even in 3.4.3.
 
   19 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.3.ebuild, libreoffice-3.4.3.1.ebuild,

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 687a164d76151f03ba7b49372cf2300afe6c2b18..73715b78d72c66fa2701370908848c8d879e6bbb 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,6 +19,7 @@ AUX libreoffice-gbuild-use-cxxflags.patch 353 RMD160 97f0c4cffe624ca8df71471cae6
 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
+AUX libreoffice-respect-destdir.patch 1122 RMD160 446e99d266f73bbebecf17527b72ce1d22b32f44 SHA1 b9f850e7d28e931447d69881f392a7eadbe9e267 SHA256 56193d20873bc7269d32bf102fe6606c5c5bbe1eb8d329fe30b93bdf77d26f88
 AUX libreoffice-solenv-build-crash.patch 492 RMD160 b5220c76d90e785a5bb38548cad8d5d9d73de7d2 SHA1 a0571d2301ce9f03ff5b58326906fe2078ea39b5 SHA256 45276cdc69444a0542bac4e949ef92bac4286db58b824198a59f797bd71c81f6
 AUX libreoffice-svx.patch 1347 RMD160 91d5f142df33d119666252ecc319dc4e7ec70f6d SHA1 020db7d4e784a131acc63413ccc625715d44df70 SHA256 dbcd451e390c78102075b048e1472cb45c8d960608bef4ac0c0611c7aeaea736
 AUX libreoffice-translate-toolkit-parallel-solenv.patch 439 RMD160 03aad89f6ee542243e599e80419a270b040916ca SHA1 c5c41c21881e6b6de7c7c784f66c640f6a06a1c6 SHA256 cf8ab3923825706d6607c7efc28c26eedac886a4678586129e75be1b689d1ea1
@@ -188,9 +189,9 @@ DIST libreoffice-writer-3.4.3.1.tar.bz2 7294202 RMD160 5f4029a78e7072ae317509c3f
 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 18141 RMD160 50ac48e5cc3206f2cfc35c69a098fba8e38da4b7 SHA1 a2bb549a0c6c66c477db08bae202d581ecfea5b4 SHA256 1233871084a7fb29500478bc3891f23c398d30811c06224c3da4344f3c4fd280
-EBUILD libreoffice-3.4.2.3.ebuild 19659 RMD160 aa0ac0b0dec9e1ef2ab68e4689a03d9e1fdd893f SHA1 6063a2f810e97258f95a96569e6fdd8de3f6c464 SHA256 2bd46885b5410d6dd35a925c7c12c748be1a5e2fcb85c6ab8c245cd6ba545eda
-EBUILD libreoffice-3.4.3.1.ebuild 19584 RMD160 1634057d4ae3a5535c203758b4ac5d6cebafb357 SHA1 901b3cbb3af35385851cf93e95415e18b4198a1b SHA256 e8dc52a46f09c8fe69dd195756f5aee8cfe9d2f6861d96dd403660f9b5b8fd04
+EBUILD libreoffice-3.4.2.3.ebuild 19702 RMD160 d227cd67ccaa56da97ff90fafd05518ce2f41175 SHA1 6e1e5473f92e677660b6e861aaa15c4141348ec9 SHA256 55b8d237745e825b3cedae134ea7a44e51849447129b0e78ce291f727ee69f33
+EBUILD libreoffice-3.4.3.1.ebuild 19627 RMD160 beaf02a3d6cd67cdcecd1e3321b22eec0dbeb112 SHA1 af78bff03004937064a745bc1b1a8293523a639e SHA256 3b82079f9607a7e88ba245b0f2304f58786eb312bb1e912f6e029e1566718824
 EBUILD libreoffice-3.4.9999.ebuild 19586 RMD160 4662503dfd2b12af541846d1a239cc9bc7193c56 SHA1 c656bd5904fa27b366462d8f79a021c05fa673ef SHA256 8e9092539648893e22838b2c9d51377b70427909e1a1d4f032db98f0838dd582
 EBUILD libreoffice-9999.ebuild 18956 RMD160 4dd6e3cd33eb4c7fc009e988ede1049f52eb41ee SHA1 1a932d2ea4cc48c933e347b965d9639556619ae1 SHA256 29190cc0584adbd9c3801b047bec160a7d40d9bc39a4999dfeb9e101ff91193f
-MISC ChangeLog 22017 RMD160 8290287a3280d319ffc8fd8be2113fe811f533aa SHA1 e61addf6799fc212339899a408d887a8b1b7e48b SHA256 f653f8688d3f17014dc4f7d8791a88cfcf25b89c26d0f7f35f3668029ad55619
+MISC ChangeLog 22253 RMD160 e68d6a6e15427e849e315242957eba95a4e66bd8 SHA1 8df029bea24cf3e36330d4f91b8d3d543314a580 SHA256 587aa72133e34bae5d461d6520b0d0ba63f35c15813a51b0e8660c4ab0410c0a
 MISC metadata.xml 1081 RMD160 df0ee3e614054cbd5f850530a17c0958b81a5d19 SHA1 8fc6d58e473f009d55a8876dc77135c0234d943b SHA256 2c90f32341f47586996dce605e83037a6759854a2871b8396f9832cb64f4db19

diff --git a/app-office/libreoffice/files/libreoffice-respect-destdir.patch b/app-office/libreoffice/files/libreoffice-respect-destdir.patch
new file mode 100644 (file)
index 0000000..5d6817d
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-respect-destdir.patch
@@ -0,0 +1,30 @@
+From 989934ab08a5ef9e6e95c87ea78db495f2abcee4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.cz>
+Date: Wed, 17 Aug 2011 11:33:55 +0200
+Subject: [PATCH] Fixup non-respecting DESTDIR for DOCDIR chmod.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Tomáš Chvátal <tchvatal@suse.cz>
+---
+ bin/distro-install-clean-up |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up
+index df7ac9d..229b7e8 100755
+--- a/bin/distro-install-clean-up
++++ b/bin/distro-install-clean-up
+@@ -59,7 +59,7 @@ if test -f $DESTDIR$INSTALLDIR/help/en/sbasic.cfg -a \
+ fi
+ 
+ echo "Fixing permissions..."
+-for dir in $DOCDIR $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/examples ; do
++for dir in $DESTDIR$DOCDIR $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/examples ; do
+     if test -d $dir -a -w $dir ; then
+       find "$dir" -type f \( -name "*.txt" -o -name "*.java" -o -name "*.xml"    -o \
+                              -name "*.xcu" -o -name "*.xcs"  -o -name "*.html"   -o \
+-- 
+1.7.6
+

diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
index b2d13769168b2dec5b0796e851ea24cddaf2f7d7..0bb32bbe6438423b5671843777f004a87c8459e5 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.3.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.3.ebuild,v 1.29 2011/08/19 09:56:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.30 2011/08/19 12:40:22 scarabeus Exp $
 
 EAPI=3
 
@@ -237,6 +237,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-32b-qt4-libdir.patch"
        "${FILESDIR}/${PN}-binfilter-as-needed.patch"
        "${FILESDIR}/${PN}-kill-cppunit.patch"
+       "${FILESDIR}/${PN}-respect-destdir.patch"
 )
 
 # Uncoment me when updating to eapi4

diff --git a/app-office/libreoffice/libreoffice-3.4.3.1.ebuild b/app-office/libreoffice/libreoffice-3.4.3.1.ebuild
index 134ee2dd588433f22b65846e17216d52cbe597f2..795549795082ec8bfdc23961d3b5865bdeb39cb4 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.3.1.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.1.ebuild,v 1.2 2011/08/19 09:56:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.1.ebuild,v 1.3 2011/08/19 12:40:22 scarabeus Exp $
 
 EAPI=3
 
@@ -236,6 +236,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-32b-qt4-libdir.patch"
        "${FILESDIR}/${PN}-binfilter-as-needed.patch"
        "${FILESDIR}/${PN}-kill-cppunit.patch"
+       "${FILESDIR}/${PN}-respect-destdir.patch"
 )
 
 # Uncoment me when updating to eapi4