Fix for build problem with not fully translated languages, closes bug #110340

Package-Manager: portage-2.0.53_rc7

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index b6f941fbf6b5f55aaf1b6ee2ee6f93b1033223df..304da95af9d8069f65145ba1ee12d3f7ad4732a8 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.151 2005/10/31 14:39:01 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.152 2005/11/01 21:44:50 suka Exp $
+
+  01 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/gentoo-2.0.0.diff:
+  Fix for build problem with not fully translated languages, closes bug #110340.
 
   31 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   openoffice-2.0.0.ebuild:

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 4db9ebfb6a7c7e0ec2b3be81345af329bfde9329..ff530438d8888ea0d00550fc94d7aa13bcbb75d3 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,53 +1,43 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561
-MD5 aeb3e27a51f0b87516210299457f93d6 openoffice-2.0.0.ebuild 7055
-MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
-MD5 1f76d06306bc5e72ede550dad5d34e7f ChangeLog 33374
-MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
-MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
-MD5 039f6964d10fd36776620f93b84705dd files/digest-openoffice-2.0.0 478
-MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
-MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.4/gcc34.patch.bz2 34342
-MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.4/pyunolink-fix.patch 475
-MD5 4045e7a45d5209ff0ac93c5c5db0114b files/1.1.4/ooffice-wrapper-1.3 6659
-MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
-MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.4/openoffice-java.patch 2092
-MD5 24035033f41d743378e16582c2e51469 files/1.1.4/javafix.patch 1382
-MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576
-MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.4/getcompver.awk.patch 418
+MD5 72a7edaec989416ce597adfdf939a595 ChangeLog 33538
+MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
-MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329
-MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.4/pthreadlink-fix.patch 1133
 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
-MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.4/nptl.patch 785
+MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
+MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329
 MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.4/gcc34-sal-link-to-libsupc++.diff 405
-MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
+MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.4/gcc34.patch.bz2 34342
+MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.4/getcompver.awk.patch 418
+MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576
+MD5 24035033f41d743378e16582c2e51469 files/1.1.4/javafix.patch 1382
 MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638
-MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.5/gcc34.patch.bz2 34342
-MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475
-MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659
+MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.4/nptl.patch 785
+MD5 4045e7a45d5209ff0ac93c5c5db0114b files/1.1.4/ooffice-wrapper-1.3 6659
+MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.4/openoffice-java.patch 2092
+MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.4/pthreadlink-fix.patch 1133
+MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.4/pyunolink-fix.patch 475
+MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.5/STLport-vector.patch 1472
+MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.5/build-new-xslt.diff 650
+MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.5/freetype-217.patch 766
 MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.5/gcc-instlib.patch 393
-MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092
-MD5 24035033f41d743378e16582c2e51469 files/1.1.5/javafix.patch 1382
-MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.5/hardened-link.patch 576
-MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.5/getcompver.awk.patch 418
 MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.5/gcc34-nojava-fix.patch 329
-MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133
-MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.5/freetype-217.patch 766
-MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.5/nptl.patch 785
-MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.5/build-new-xslt.diff 650
 MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.5/gcc34-sal-link-to-libsupc++.diff 405
-MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.5/STLport-vector.patch 1472
+MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.5/gcc34.patch.bz2 34342
+MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.5/getcompver.awk.patch 418
+MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.5/hardened-link.patch 576
+MD5 24035033f41d743378e16582c2e51469 files/1.1.5/javafix.patch 1382
 MD5 a9233bc0091b925de38145108267b949 files/1.1.5/newstlportfix.patch 3638
+MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.5/nptl.patch 785
+MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659
+MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092
+MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133
+MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475
 MD5 2871ab2688ee93c187ff98445e5ea0ca files/2.0.0/buildfix-new-xslt.diff 1336
-MD5 5195d165de1258a04fcf28d359b956a2 files/2.0.0/gentoo-2.0.0.diff 1442
+MD5 77216afa8932c17cbbc581728ea334b7 files/2.0.0/gentoo-2.0.0.diff 1937
 MD5 1aff6980adcc3f4704c3ef5959e0f165 files/2.0.0/nojava-fix-stringparam.diff 1682
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDZiyUKRy60XGEcJIRAkdiAJ9E3Fv//3IWx4jCo4X9pWbCBcX7WACglfkK
-LeN827jo6I9TJ5iF/veM5jE=
-=KHMK
------END PGP SIGNATURE-----
+MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
+MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
+MD5 039f6964d10fd36776620f93b84705dd files/digest-openoffice-2.0.0 478
+MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
+MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561
+MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
+MD5 aeb3e27a51f0b87516210299457f93d6 openoffice-2.0.0.ebuild 7055

diff --git a/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff b/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
index b7deaee8c11523069b3c95a07771d04d84ccc722..4f051187135a6e749b7a9d33c736c66aa5e31645 100644 (file)
--- a/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
+++ b/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
@@ -35,3 +35,16 @@
            add_version=
            test "z$VENDORNAME" = "zNovell" -a "z$BINSUFFIX" != "z" && add_version=" ($VERSION)" || :
            sed -e "s|@BINSUFFIX@|$BINSUFFIX|g
+@@ -215,8 +215,10 @@
+ 
+ echo "Done";
+ 
+-# Java-disabled builds do not create help
+-if test -d $OOINSTDIR/help; then
++# Check if the English help is installed and is in the main package (is first on the list)
++# Note that Java-disabled builds do not create help at all.
++if test -f $OOINSTDIR/help/en/sbasic.cfg -a \
++        "`for lang in $OOO_LANGS_LIST ; do echo $lang ; break ; done`" = "en-US" ; then
+     echo "Removing duplicated English help..."
+   
+     for lang in $OOO_LANGS_LIST ; do