Now uses LINGUAS to determine which language support to build, closes a number of bugs

(Portage version: 2.0.51-r14)

4 files changed, 152 insertions, 102 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 9bda5e210381..c3b1ef704c02 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.99 2005/01/21 15:29:25 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.100 2005/01/22 16:01:18 suka Exp $
+
+  22 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.7.ebuild:
+  The ebuild now uses the LINGUAS environment variable to determine for which
+  language to build, the first one in your LINGUAS-settings that is supported
+  is used for this. Please note, that the old LANGUAGE=ENUS|PORT... way does
+  NOT work anymore. While doing this added some more languages to the
+  supported list, see the ebuild for more infos. Also added some dependencies
+  for japanese and chinese builds.
+  
+  This closes a number of bugs: #40896, #44209. #51331, #70302, #71216 and
+  #77128
 
   21 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
   files/1.1.3/gentoo-1.3.7.patch:
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild
index c7a95db66b04..1110e1715139 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.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-ximian/openoffice-ximian-1.3.7.ebuild,v 1.12 2005/01/20 11:53:57 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild,v 1.13 2005/01/22 16:01:18 suka Exp $
 
 # Notes:
 #
@@ -74,8 +74,10 @@ RDEPEND="!app-office/openoffice-ximian-bin
 	app-arch/unzip
 	dev-libs/expat
 	java? ( >=virtual/jre-1.4.1 )
-	ppc? ( >=sys-libs/glibc-2.2.5-r7
-	>=sys-devel/gcc-3.2.1 )"
+	ppc? ( >=sys-devel/gcc-3.2.1 )
+	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
+	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
+	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/findutils-4.1.20-r1
@@ -104,86 +106,97 @@ pkg_setup() {
 		fi
 	fi
 
+	ewarn
 	ewarn " It is important to note that OpenOffice.org is a very fragile  "
 	ewarn " build when it comes to CFLAGS.  A number of flags have already "
 	ewarn " been filtered out.  If you experience difficulty merging this  "
 	ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to  "
 	ewarn " merge again.					               "
+	ewarn
+	ewarn " Please note that this package now uses the LINGUAS environment "
+	ewarn " variable to provide localization. The old LANGUAGE=ENUS|PORT..."
+	ewarn " system does NOT work anymore."
+	ewarn
 
 	set_languages
 }
 
 set_languages () {
 
-	if [ -z "$LANGUAGE" ]; then
-		LANGUAGE=01
+	strip-linguas en pt ru el nl fr es fi hu ca it cs sk da sv nb no pl de sl pt_BR th et ja ko zh_CN zh_TW tr hi_IN ar he
+	if [ -n "${LINGUAS}" ] ; then
+		# use the leftmost value
+		temp_lang=( ${LINGUAS} )
+		primary_lang=${temp_lang[0]}
+	else
+		primary_lang="en"
 	fi
 
-	case "$LANGUAGE" in
-		01 | ENUS ) LANGNO=01; LANGNAME=ENUS; LFULLNAME="US English (default)"
+	case "${primary_lang}" in
+		en ) OOLANGNO=01; OOLANGNAME=ENUS; OOLFULLNAME="US English (default)"
+			;;
+		pt ) OOLANGNO=03; OOLANGNAME=PORT; OOLFULLNAME=Portuguese
+			;;
+		ru ) OOLANGNO=07; OOLANGNAME=RUSS; OOLFULLNAME=Russian
 			;;
-		03 | PORT ) LANGNO=03; LANGNAME=PORT; LFULLNAME=Portuguese
+		el ) OOLANGNO=30; OOLANGNAME=GREEK; OOLFULLNAME=Greek
 			;;
-		07 | RUSS ) LANGNO=07; LANGNAME=RUSS; LFULLNAME=Russian
+		nl ) OOLANGNO=31; OOLANGNAME=DTCH; OOLFULLNAME=Dutch
 			;;
-		30 | GREEK ) LANGNO=30; LANGNAME=GREEK; LFULLNAME=Greek
+		fr ) OOLANGNO=33; OOLANGNAME=FREN; OOLFULLNAME=French
 			;;
-		31 | DTCH ) LANGNO=31; LANGNAME=DTCH; LFULLNAME=Dutch
+		es ) OOLANGNO=34; OOLANGNAME=SPAN; OOLFULLNAME=Spanish
 			;;
-		33 | FREN ) LANGNO=33; LANGNAME=FREN; LFULLNAME=French
+		fi ) OOLANGNO=35; OOLANGNAME=FINN; OOLFULLNAME=Finnish
 			;;
-		34 | SPAN ) LANGNO=34; LANGNAME=SPAN; LFULLNAME=Spanish
+		hu ) OOLANGNO=36; OOLANGNAME=HUNG; OOLFULLNAME=Hungarian
 			;;
-		35 | FINN ) LANGNO=35; LANGNAME=FINN; LFULLNAME=Finnish
+		ca ) OOLANGNO=37; OOLANGNAME=CAT; OOLFULLNAME=Catalan
 			;;
-		37 | CAT ) LANGNO=37; LANGNAME=CAT; LFULLNAME=Catalan
+		it ) OOLANGNO=39; OOLANGNAME=ITAL; OOLFULLNAME=Italian
 			;;
-		39 | ITAL ) LANGNO=39; LANGNAME=ITAL; LFULLNAME=Italian
+		cs ) OOLANGNO=42; OOLANGNAME=CZECH; OOLFULLNAME=Czech
 			;;
-		42 | CZECH ) LANGNO=42; LANGNAME=CZECH; LFULLNAME=Czech
+		sk ) OOLANGNO=43; OOLANGNAME=SLOVAK; OOLFULLNAME=Slovak
 			;;
-		43 | SLOVAK ) LANGNO=43; LANGNAME=SLOVAK; LFULLNAME=Slovak
+		da ) OOLANGNO=45; OOLANGNAME=DAN; OOLFULLNAME=Danish
 			;;
-		45 | DAN ) LANGNO=45; LANGNAME=DAN; LFULLNAME=Danish
+		sv ) OOLANGNO=46; OOLANGNAME=SWED; OOLFULLNAME=Swedish
 			;;
-		46 | SWED ) LANGNO=46; LANGNAME=SWED; LFULLNAME=Swedish
+		no ) OOLANGNO=47; OOLANGNAME=NORBOK; OOLFULLNAME="Norwegian"
 			;;
-		48 | POL ) LANGNO=48; LANGNAME=POL; LFULLNAME=Polish
+		pl ) OOLANGNO=48; OOLANGNAME=POL; OOLFULLNAME=Polish
 			;;
-		49 | GER ) LANGNO=49; LANGNAME=GER; LFULLNAME=German
+		de ) OOLANGNO=49; OOLANGNAME=GER; OOLFULLNAME=German
 			;;
-		55 | PORTBR ) LANGNO=55; LANGNAME=PORTBR; LFULLNAME="Portuguese brazilian"
+		sl ) OOLANGNO=50; OOLANGNAME=SLOVENIAN; OOLFULLNAME=Slovenian
 			;;
-		66 | THAI ) LANGNO=66; LANGNAME=THAI; LFULLNAME=Thai
+		pt_BR ) OOLANGNO=55; OOLANGNAME=PORTBR; OOLFULLNAME="Portuguese brazilian"
 			;;
-		77 | ESTONIAN ) LANGNO=77; LANGNAME=ESTONIAN; LFULLNAME=Estonian
+		th ) OOLANGNO=66; OOLANGNAME=THAI; OOLFULLNAME=Thai
 			;;
-		81 | JAPN ) LANGNO=81; LANGNAME=JAPN; LFULLNAME="Japanese"
+		et ) OOLANGNO=77; OOLANGNAME=ESTONIAN; OOLFULLNAME=Estonian
 			;;
-		82 | KOREAN ) LANGNO=82; LANGNAME=KOREAN; LFULLNAME=Korean
+		ja ) OOLANGNO=81; OOLANGNAME=JAPN; OOLFULLNAME="Japanese"
 			;;
-		86 | CHINSIM ) LANGNO=86; LANGNAME=CHINSIM; LFULLNAME="Simplified Chinese (PRC)"
+		ko ) OOLANGNO=82; OOLANGNAME=KOREAN; OOLFULLNAME=Korean
 			;;
-		88 | CHINTRAD ) LANGNO=88; LANGNAME=CHINTRAD; LFULLNAME="Traditional Chinese (taiwan)"
+		zh_CN ) OOLANGNO=86; OOLANGNAME=CHINSIM; OOLFULLNAME="Simplified Chinese (PRC)"
 			;;
-		90 | TURK ) LANGNO=90; LANGNAME=TURK; LFULLNAME=Turkish
+		zh_TW ) OOLANGNO=88; OOLANGNAME=CHINTRAD; OOLFULLNAME="Traditional Chinese (taiwan)"
 			;;
-		91 | HINDI ) LANGNO=91; LANGNAME=HINDI; LFULLNAME=Hindi
+		tr ) OOLANGNO=90; OOLANGNAME=TURK; OOLFULLNAME=Turkish
 			;;
-		96 | ARAB ) LANGNO=96; LANGNAME=ARAB; LFULLNAME=Arabic
+		hi_IN ) OOLANGNO=91; OOLANGNAME=HINDI; OOLFULLNAME=Hindi
 			;;
-		97 | HEBREW ) LANGNO=97; LANGNAME=HEBREW; LFULLNAME=Hebrew
+		ar ) OOLANGNO=96; OOLANGNAME=ARAB; OOLFULLNAME=Arabic
 			;;
-		* )
-			eerror "Unknown LANGUAGE setting!"
-			eerror
-			eerror "Known LANGUAGE settings are:"
-			eerror "  ENUS | PORT | RUSS | GREEK | DTCH | FREN | SPAN | FINN | CAT | ITAL |"
-			eerror "  CZECH | SLOVAK | DAN | SWED | POL | GER | PORTBR | THAI | ESTONIAN |"
-			eerror "  JAPN | KOREAN | CHINSIM | CHINTRAD | TURK | HINDI | ARAB | HEBREW"
-			die
+		he ) OOLANGNO=97; OOLANGNAME=HEBREW; OOLFULLNAME=Hebrew
 			;;
 	esac
+
+	einfo "Installing OpenOffice.org for ${OOLFULLNAME} environment."
+
 }
 
 oo_setup() {
@@ -359,19 +372,18 @@ src_compile() {
 	# Do NOT compile with a external STLport, as gcc-2.95.3 users will
 	# get linker errors due to the ABI being different (STLport will be
 	# compiled with 2.95.3, while OO is compiled with 3.x). (Az)
-	einfo "Configuring OpenOffice.org with language support for ${LFULLNAME}..."
 	cd ${S}/config_office
 	rm -f config.cache || die
 	autoconf || die
 
-	if [ "LANGNAME" != "ENUS" ]; then
-		LANGNAME="${LANGNAME},ENUS"
+	if [ "OOLANGNAME" != "ENUS" ]; then
+		OOLANGNAME="${OOLANGNAME},ENUS"
 	fi
 
 	MYCONF="${MYCONF} --enable-libart \
 		--enable-libsn \
 		--enable-crashdump=no \
-		--with-lang=${LANGNAME} \
+		--with-lang=${OOLANGNAME} \
 		--without-fonts \
 		--disable-rpath \
 		--enable-fontconfig \
@@ -385,14 +397,14 @@ src_compile() {
 	get_EnvSet
 
 	# unpack help files if present
-	if [ -f ${DISTDIR}/helpcontent_${LANGNO}_unix.tgz ]; then
-		einfo "Using helpcontent for ${LFULLNAME}"
+	if [ -f ${DISTDIR}/helpcontent_${OOLANGNO}_unix.tgz ]; then
+		einfo "Using helpcontent for ${OOLFULLNAME}"
 		mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/pck
-		tar -xzf ${DISTDIR}/helpcontent_${LANGNO}_unix.tgz -C ${S}/solver/${SOLVER}/${SOLPATH}/pck
+		tar -xzf ${DISTDIR}/helpcontent_${OOLANGNO}_unix.tgz -C ${S}/solver/${SOLVER}/${SOLPATH}/pck
 	fi
 
 	# Build as minimal as possible
-	export BUILD_MINIMAL="${LANGNO}"
+	export BUILD_MINIMAL="${OOLANGNO}"
 
 	# Embedded python dies without Home set
 	if test "z${HOME}" = "z"; then
@@ -510,7 +522,7 @@ src_install() {
 
 	einfo "Installing Ximian-OpenOffice.org into build root..."
 	dodir ${INSTDIR}
-	cd ${S}/instsetoo/${SOLPATH}/${LANGNO}/normal
+	cd ${S}/instsetoo/${SOLPATH}/${OOLANGNO}/normal
 	./setup -v -noexit -nogui -r:${T}/autoresponse || die "Setup failed"
 
 	#Fix for parallel install
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index cd66a800e8e5..65088d4cbff2 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,18 @@
 # 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.106 2005/01/18 17:57:09 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.107 2005/01/22 16:03:20 suka Exp $
+
+  22 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4.ebuild:
+  The ebuild now uses the LINGUAS environment variable to determine for which
+  language to build, the first one in your LINGUAS-settings that is supported
+  is used for this. Please note, that the old LANGUAGE=ENUS|PORT... way does
+  NOT work anymore. While doing this added some more languages to the
+  supported list, see the ebuild for more infos. Also added some dependencies
+  for japanese and chinese builds.
+  
+  This closes a number of bugs: #40896, #44209. #51331, #70302, #71216 and
+  #77128
 
   18 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-1.1.4.ebuild, -files/1.1.4/gcc34-nptl-fix.patch,
diff --git a/app-office/openoffice/openoffice-1.1.4.ebuild b/app-office/openoffice/openoffice-1.1.4.ebuild
index 7df0fc42cfe0..f07a1f0e9b57 100644
--- a/app-office/openoffice/openoffice-1.1.4.ebuild
+++ b/app-office/openoffice/openoffice-1.1.4.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-1.1.4.ebuild,v 1.14 2005/01/18 17:57:09 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.15 2005/01/22 16:03:20 suka Exp $
 
 # Notes:
 #
@@ -56,7 +56,10 @@ RDEPEND="!app-office/openoffice-bin
 	app-arch/unzip
 	dev-libs/expat
 	java? ( >=virtual/jre-1.4.1 )
-	ppc? ( >=sys-devel/gcc-3.2.1 )"
+	ppc? ( >=sys-devel/gcc-3.2.1 )
+	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
+	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
+	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/findutils-4.1.20-r1
@@ -84,86 +87,97 @@ pkg_setup() {
 		fi
 	fi
 
+	ewarn
 	ewarn " It is important to note that OpenOffice.org is a very fragile  "
 	ewarn " build when it comes to CFLAGS.  A number of flags have already "
 	ewarn " been filtered out.  If you experience difficulty merging this  "
 	ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to  "
 	ewarn " merge again.					               "
+	ewarn
+	ewarn " Please note that this package now uses the LINGUAS environment "
+	ewarn " variable to provide localization. The old LANGUAGE=ENUS|PORT..."
+	ewarn " system does NOT work anymore."
+	ewarn
 
 	set_languages
 }
 
 set_languages () {
 
-	if [ -z "$LANGUAGE" ]; then
-		LANGUAGE=01
+	strip-linguas en pt ru el nl fr es fi hu ca it cs sk da sv nb no pl de sl pt_BR th et ja ko zh_CN zh_TW tr hi_IN ar he
+	if [ -n "${LINGUAS}" ] ; then
+		# use the leftmost value
+		temp_lang=( ${LINGUAS} )
+		primary_lang=${temp_lang[0]}
+	else
+		primary_lang="en"
 	fi
 
-	case "$LANGUAGE" in
-		01 | ENUS ) LANGNO=01; LANGNAME=ENUS; LFULLNAME="US English (default)"
+	case "${primary_lang}" in
+		en ) OOLANGNO=01; OOLANGNAME=ENUS; OOLFULLNAME="US English (default)"
+			;;
+		pt ) OOLANGNO=03; OOLANGNAME=PORT; OOLFULLNAME=Portuguese
+			;;
+		ru ) OOLANGNO=07; OOLANGNAME=RUSS; OOLFULLNAME=Russian
 			;;
-		03 | PORT ) LANGNO=03; LANGNAME=PORT; LFULLNAME=Portuguese
+		el ) OOLANGNO=30; OOLANGNAME=GREEK; OOLFULLNAME=Greek
 			;;
-		07 | RUSS ) LANGNO=07; LANGNAME=RUSS; LFULLNAME=Russian
+		nl ) OOLANGNO=31; OOLANGNAME=DTCH; OOLFULLNAME=Dutch
 			;;
-		30 | GREEK ) LANGNO=30; LANGNAME=GREEK; LFULLNAME=Greek
+		fr ) OOLANGNO=33; OOLANGNAME=FREN; OOLFULLNAME=French
 			;;
-		31 | DTCH ) LANGNO=31; LANGNAME=DTCH; LFULLNAME=Dutch
+		es ) OOLANGNO=34; OOLANGNAME=SPAN; OOLFULLNAME=Spanish
 			;;
-		33 | FREN ) LANGNO=33; LANGNAME=FREN; LFULLNAME=French
+		fi ) OOLANGNO=35; OOLANGNAME=FINN; OOLFULLNAME=Finnish
 			;;
-		34 | SPAN ) LANGNO=34; LANGNAME=SPAN; LFULLNAME=Spanish
+		hu ) OOLANGNO=36; OOLANGNAME=HUNG; OOLFULLNAME=Hungarian
 			;;
-		35 | FINN ) LANGNO=35; LANGNAME=FINN; LFULLNAME=Finnish
+		ca ) OOLANGNO=37; OOLANGNAME=CAT; OOLFULLNAME=Catalan
 			;;
-		37 | CAT ) LANGNO=37; LANGNAME=CAT; LFULLNAME=Catalan
+		it ) OOLANGNO=39; OOLANGNAME=ITAL; OOLFULLNAME=Italian
 			;;
-		39 | ITAL ) LANGNO=39; LANGNAME=ITAL; LFULLNAME=Italian
+		cs ) OOLANGNO=42; OOLANGNAME=CZECH; OOLFULLNAME=Czech
 			;;
-		42 | CZECH ) LANGNO=42; LANGNAME=CZECH; LFULLNAME=Czech
+		sk ) OOLANGNO=43; OOLANGNAME=SLOVAK; OOLFULLNAME=Slovak
 			;;
-		43 | SLOVAK ) LANGNO=43; LANGNAME=SLOVAK; LFULLNAME=Slovak
+		da ) OOLANGNO=45; OOLANGNAME=DAN; OOLFULLNAME=Danish
 			;;
-		45 | DAN ) LANGNO=45; LANGNAME=DAN; LFULLNAME=Danish
+		sv ) OOLANGNO=46; OOLANGNAME=SWED; OOLFULLNAME=Swedish
 			;;
-		46 | SWED ) LANGNO=46; LANGNAME=SWED; LFULLNAME=Swedish
+		no ) OOLANGNO=47; OOLANGNAME=NORBOK; OOLFULLNAME="Norwegian"
 			;;
-		48 | POL ) LANGNO=48; LANGNAME=POL; LFULLNAME=Polish
+		pl ) OOLANGNO=48; OOLANGNAME=POL; OOLFULLNAME=Polish
 			;;
-		49 | GER ) LANGNO=49; LANGNAME=GER; LFULLNAME=German
+		de ) OOLANGNO=49; OOLANGNAME=GER; OOLFULLNAME=German
 			;;
-		55 | PORTBR ) LANGNO=55; LANGNAME=PORTBR; LFULLNAME="Portuguese brazilian"
+		sl ) OOLANGNO=50; OOLANGNAME=SLOVENIAN; OOLFULLNAME=Slovenian
 			;;
-		66 | THAI ) LANGNO=66; LANGNAME=THAI; LFULLNAME=Thai
+		pt_BR ) OOLANGNO=55; OOLANGNAME=PORTBR; OOLFULLNAME="Portuguese brazilian"
 			;;
-		77 | ESTONIAN ) LANGNO=77; LANGNAME=ESTONIAN; LFULLNAME=Estonian
+		th ) OOLANGNO=66; OOLANGNAME=THAI; OOLFULLNAME=Thai
 			;;
-		81 | JAPN ) LANGNO=81; LANGNAME=JAPN; LFULLNAME="Japanese"
+		et ) OOLANGNO=77; OOLANGNAME=ESTONIAN; OOLFULLNAME=Estonian
 			;;
-		82 | KOREAN ) LANGNO=82; LANGNAME=KOREAN; LFULLNAME=Korean
+		ja ) OOLANGNO=81; OOLANGNAME=JAPN; OOLFULLNAME="Japanese"
 			;;
-		86 | CHINSIM ) LANGNO=86; LANGNAME=CHINSIM; LFULLNAME="Simplified Chinese (PRC)"
+		ko ) OOLANGNO=82; OOLANGNAME=KOREAN; OOLFULLNAME=Korean
 			;;
-		88 | CHINTRAD ) LANGNO=88; LANGNAME=CHINTRAD; LFULLNAME="Traditional Chinese (taiwan)"
+		zh_CN ) OOLANGNO=86; OOLANGNAME=CHINSIM; OOLFULLNAME="Simplified Chinese (PRC)"
 			;;
-		90 | TURK ) LANGNO=90; LANGNAME=TURK; LFULLNAME=Turkish
+		zh_TW ) OOLANGNO=88; OOLANGNAME=CHINTRAD; OOLFULLNAME="Traditional Chinese (taiwan)"
 			;;
-		91 | HINDI ) LANGNO=91; LANGNAME=HINDI; LFULLNAME=Hindi
+		tr ) OOLANGNO=90; OOLANGNAME=TURK; OOLFULLNAME=Turkish
 			;;
-		96 | ARAB ) LANGNO=96; LANGNAME=ARAB; LFULLNAME=Arabic
+		hi_IN ) OOLANGNO=91; OOLANGNAME=HINDI; OOLFULLNAME=Hindi
 			;;
-		97 | HEBREW ) LANGNO=97; LANGNAME=HEBREW; LFULLNAME=Hebrew
+		ar ) OOLANGNO=96; OOLANGNAME=ARAB; OOLFULLNAME=Arabic
 			;;
-		* )
-			eerror "Unknown LANGUAGE setting!"
-			eerror
-			eerror "Known LANGUAGE settings are:"
-			eerror "  ENUS | PORT | RUSS | GREEK | DTCH | FREN | SPAN | FINN | CAT | ITAL |"
-			eerror "  CZECH | SLOVAK | DAN | SWED | POL | GER | PORTBR | THAI | ESTONIAN |"
-			eerror "  JAPN | KOREAN | CHINSIM | CHINTRAD | TURK | HINDI | ARAB | HEBREW"
-			die
+		he ) OOLANGNO=97; OOLANGNAME=HEBREW; OOLFULLNAME=Hebrew
 			;;
 	esac
+
+	einfo "Installing OpenOffice.org for ${OOLFULLNAME} environment."
+
 }
 
 oo_setup() {
@@ -302,19 +316,19 @@ src_compile() {
 	# Do NOT compile with a external STLport, as gcc-2.95.3 users will
 	# get linker errors due to the ABI being different (STLport will be
 	# compiled with 2.95.3, while OO is compiled with 3.x). (Az)
-	einfo "Configuring OpenOffice.org with language support for ${LFULLNAME}..."
 	cd ${S}/config_office
 	rm -f config.cache || die
+	autoconf || die
 
-	if [ "LANGNAME" != "ENUS" ]; then
-		LANGNAME="${LANGNAME},ENUS"
+	if [ "OOLANGNAME" != "ENUS" ]; then
+		OOLANGNAME="${OOLANGNAME},ENUS"
 	fi
 
 	use sparc && MYCONF="${MYCONF} --disable-mozilla"
 
 	MYCONF="${MYCONF} --enable-libart \
 		--enable-libsn \
-		--with-lang=${LANGNAME} \
+		--with-lang=${OOLANGNAME} \
 		--without-fonts \
 		--with-system-freetype"
 
@@ -324,14 +338,14 @@ src_compile() {
 	get_EnvSet
 
 	# unpack help files if present
-	if [ -f ${DISTDIR}/helpcontent_${LANGNO}_unix.tgz ]; then
-		einfo "Using helpcontent for ${LFULLNAME}"
+	if [ -f ${DISTDIR}/helpcontent_${OOLANGNO}_unix.tgz ]; then
+		einfo "Using helpcontent for ${OOLFULLNAME}"
 		mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/pck
-		tar -xzf ${DISTDIR}/helpcontent_${LANGNO}_unix.tgz -C ${S}/solver/${SOLVER}/${SOLPATH}/pck
+		tar -xzf ${DISTDIR}/helpcontent_${OOLANGNO}_unix.tgz -C ${S}/solver/${SOLVER}/${SOLPATH}/pck
 	fi
 
 	# Build as minimal as possible
-	export BUILD_MINIMAL="${LANGNO}"
+	export BUILD_MINIMAL="${OOLANGNO}"
 
 	# Embedded python dies without Home set
 	if test "z${HOME}" = "z"; then
@@ -453,7 +467,7 @@ src_install() {
 
 	einfo "Installing OpenOffice.org into build root..."
 	dodir ${INSTDIR}
-	cd ${S}/instsetoo/${SOLPATH}/${LANGNO}/normal
+	cd ${S}/instsetoo/${SOLPATH}/${OOLANGNO}/normal
 	./setup -v -noexit -nogui -r:${T}/autoresponse || die "Setup failed"
 
 	einfo "Removing build root from registry..."
@@ -480,7 +494,7 @@ src_install() {
 	doexe ${T}/ooffice
 
 	# Component symlinks
-	for app in calc draw impress math writer web setup padmin; do
+	for app in calc draw impress math web writer setup padmin; do
 		dosym ooffice /usr/bin/oo${app}
 	done