Properly fix linguas stuff, also brings back templates integration

(Portage version: 2.2_rc63/cvs/Linux i686)

3 files changed, 52 insertions, 11 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 07faf3d85717..00d34948e6f3 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.516 2010/02/23 16:25:50 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.517 2010/02/25 09:51:29 suka Exp $
+
+  25 Feb 2010; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-3.2.0.ebuild, files/gentoo-3.2.0.diff:
+  Properly fix linguas stuff, also brings back templates integration
 
   23 Feb 2010; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.2.0.ebuild:
diff --git a/app-office/openoffice/files/gentoo-3.2.0.diff b/app-office/openoffice/files/gentoo-3.2.0.diff
index b3d2f547f4f9..864400705d9a 100644
--- a/app-office/openoffice/files/gentoo-3.2.0.diff
+++ b/app-office/openoffice/files/gentoo-3.2.0.diff
@@ -17,4 +17,31 @@
  vcl-xinerama-clone-fix.diff, n#578730, thorsten
  
  [ HyphenFix ]
+--- configure.in 
++++ configure.in 
+@@ -1326,12 +1326,18 @@
+ 	done
+     fi
+     SUNTEMPLATES_LANG=
+-    # check whether the langs are requested at all
+-    for lang in $wanted_sun_templates ; do
+-	if test -n "`echo $with_lang | grep "$lang"`" ; then
+-		SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
+-	fi
+-    done
++
++    # --with-lang="" now used for en-US
++    if test "z$with_lang" = "z" ; then
++        SUNTEMPLATES_LANG="en-US"
++    else
++        # check whether the langs are requested at all
++        for lang in $wanted_sun_templates ; do
++	    if test -n "`echo $with_lang | grep "$lang"`" ; then
++		  SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
++	    fi
++        done
++    fi
+     AC_MSG_RESULT([$SUNTEMPLATES_LANG])
+ fi
+ AC_SUBST(SUNTEMPLATES_LANG)
 
diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild
index 4f2da29e2433..32858a87cdb0 100644
--- a/app-office/openoffice/openoffice-3.2.0.ebuild
+++ b/app-office/openoffice/openoffice-3.2.0.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.10 2010/02/23 16:25:50 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.11 2010/02/25 09:51:29 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
 KDE_REQUIRED="optional"
 CMAKE_REQUIRED="false"
 
-inherit bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base mono multilib toolchain-funcs
+inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base mono multilib toolchain-funcs
 
-IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam"
+IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
 
 MY_PV=3.2.0.6
 PATCHLEVEL=OOO320
@@ -28,6 +28,12 @@ SRC_URI="${DEVPATH}_core.tar.bz2
 	${DEVPATH}_system.tar.bz2
 	${DEVPATH}_testautomation.tar.bz2
 	binfilter? ( ${DEVPATH}_binfilter.tar.bz2 )
+	templates? ( http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt
+		http://extensions.services.openoffice.org/files/295/1/Sun_ODF_Template_Pack_de.oxt
+		http://extensions.services.openoffice.org/files/299/0/Sun_ODF_Template_Pack_it.oxt
+		http://extensions.services.openoffice.org/files/297/0/Sun_ODF_Template_Pack_fr.oxt
+		http://extensions.services.openoffice.org/files/301/1/Sun_ODF_Template_Pack_es.oxt
+		ftp://ftp.devall.hu/kami/go-oo//Sun_ODF_Template_Pack_hu.oxt )
 	http://download.go-oo.org/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
 	odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
 	http://download.go-oo.org/SRC680/extras-3.tar.bz2
@@ -37,7 +43,7 @@ SRC_URI="${DEVPATH}_core.tar.bz2
 	http://download.go-oo.org/DEV300/ooo_oxygen_images-2009-06-17.tar.gz
 	http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz"
 
-LANGS1="af ar as_IN be_BY bg bn br brx bs ca cs cy da de dgo dz el en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi_IN hr hu id it ja ka kk km kn_IN ko kok ks ku lt mai mk ml_IN mn mni mr_IN nb ne nl nn nr ns oc or_IN pa_IN pl pt pt_BR ru rw sa_IN sat sd sh sk sl sr ss st sv sw_TZ ta ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN uz ve vi xh zh_CN zh_TW zu"
+LANGS1="af ar as_IN be_BY bg bn br brx bs ca cs cy da de dgo dz el en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi_IN hr hu id it ja ka kk km kn_IN ko kok ks ku lt mai mk ml_IN mn mni mr_IN nb ne nl nn nr ns oc or_IN pa_IN pl pt pt_BR ru rw sa_IN sat sd sh sk sl sr ss st sv sw_TZ ta ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN uz ve vi xh zh_CN zh_TW zu"
 LANGS="${LANGS1} en en_US"
 
 for X in ${LANGS} ; do
@@ -156,13 +162,14 @@ pkg_setup() {
 
 	strip-linguas ${LANGS}
 
-	if [ -z "${LINGUAS}" ] || [[ "${LINGUAS}" == en ]] || [[ "${LINGUAS}" == en_US ]] || [[ "${LINGUAS}" == "en en_US" ]] || [[ "${LINGUAS}" == "en_US en" ]]; then
+	# en_US is built by default, upstream needs us to use --with-lang="" in this case though, so strip it out
+	export LINGUAS_TEMP=$(echo ${LINGUAS} | sed -e 's/\ben_US\b//g;s/en//g')
+
+	if [[ -z "${LINGUAS_TEMP}" ]] || [[ ${LINGUAS_TEMP} == " " ]]; then
 		export LINGUAS_OOO=""
-	elif [[ ${LINGUAS} =~ en([^_]|$) ]]; then
-		export LINGUAS_OOO="$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/;s/_/-/g')"
-	# case: en-US lingua not set, add
 	else
-		export LINGUAS_OOO="en-US ${LINGUAS//_/-}"
+		# always build en-US as a fallback (needed for broken code / translations)
+		export LINGUAS_OOO="en-US ${LINGUAS_TEMP//_/-}"
 	fi
 
 	if use !java; then
@@ -268,6 +275,9 @@ src_prepare() {
 	# Upstream this
 	echo "--with-system-redland" >> ${CONFFILE}
 
+	# needed for sun-templates patch
+	eautoreconf
+
 }
 
 src_configure() {
@@ -324,7 +334,7 @@ src_configure() {
 		$(use_enable odk) \
 		$(use_enable pam) \
 		$(use_with java) \
-		--without-sun-templates \
+		$(use_with templates sun-templates) \
 		--disable-access \
 		--disable-post-install-scripts \
 		--enable-extensions \