Build fix in regard to setting "en" in LINGUAS

Package-Manager: portage-2.0.53_rc6

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index e513bef626bddd0cd2d84c262b69dcd5aa2f5a32..a9257b18c8836c897e0acaa2e772e6fbae8fa548 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.142 2005/10/25 05:21:58 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.143 2005/10/25 06:35:40 suka Exp $
+
+  25 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0.ebuild:
+  Build fix in regard to setting "en" in LINGUAS
 
   25 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
   +files/2.0.0/Filter.xcu, openoffice-2.0.0.ebuild:

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index ef8153bb51eeb597e164294e0f4a569659cb2ec3..f502f94181137ac1fcc206537b7d68a8b0eacc5f 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,4 @@
-MD5 7df0ae7eca96ca1a616dea9f69501f44 ChangeLog 31362
+MD5 5fbfbef77ac9f7d737254bfbf4bc5b0d ChangeLog 31492
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
@@ -38,4 +38,4 @@ MD5 c45a70a1b4109bc275d7e55083b85d44 files/digest-openoffice-2.0.0 476
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561
 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
-MD5 fa6a80e00004e1c28cc9c03db634caab openoffice-2.0.0.ebuild 7077
+MD5 c2ad744b08571c0378f341591cd3e4bf openoffice-2.0.0.ebuild 7129

diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild
index 8f7b6de7c45f00e39f13b4f49c269fc7b299ac07..29855ff6717ae485ed28d42874fdca7e3adc03d5 100644 (file)
--- a/app-office/openoffice/openoffice-2.0.0.ebuild
+++ b/app-office/openoffice/openoffice-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.6 2005/10/25 05:21:58 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.7 2005/10/25 06:35:40 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -98,8 +98,9 @@ pkg_setup() {
                ewarn " To get a localized build, set the according LINGUAS variable(s). "
                ewarn
        else
-               export LINGUAS_OOO="${LINGUAS//_/-}"
-               export LINGUAS_OOO="${LINGUAS_OOO//en /en-US }"
+               export LINGUAS_OOO="${LINGUAS//en/en_US}"
+               export LINGUAS_OOO="${LINGUAS_OOO//en_US_GB/en_GB}"
+               export LINGUAS_OOO="${LINGUAS_OOO//_/-}"
        fi
 
        if use !java; then