diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-11-01 21:44:50 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-11-01 21:44:50 +0000 |
| commit | 35c6724bbd275a54b5852fae6434691b6544517f (patch) | |
| tree | db02428e9c7c4d818f1eb1239b78363cd7c5c97b /app-office | |
| parent | mark version 2.1.30 as stable, remove obsolete releases (2.0.x) (diff) | |
| download | gentoo-2-35c6724bbd275a54b5852fae6434691b6544517f.tar.gz gentoo-2-35c6724bbd275a54b5852fae6434691b6544517f.tar.bz2 gentoo-2-35c6724bbd275a54b5852fae6434691b6544517f.zip | |
Fix for build problem with not fully translated languages, closes bug #110340
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index b6f941fbf6b5..304da95af9d8 100644 --- 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/files/2.0.0/gentoo-2.0.0.diff b/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff index b7deaee8c115..4f051187135a 100644 --- 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 |