Properly fix linguas stuff, also brings back templates integration

Package-Manager: portage-2.2_rc63/cvs/Linux i686

4 files changed, 55 insertions, 14 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/Manifest b/app-office/openoffice/Manifest
index c926ff4424d7..dcb2ca192a22 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -2,7 +2,7 @@ AUX Gentoo_ODK_install.patch 868 RMD160 62a69900ce2e0250b35277d36b84a2bd8913c88d
 AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03
 AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07
 AUX gentoo-3.1.1.diff 2229 RMD160 543824148af41cfcdeaf1198591679b6c366c61e SHA1 65602b7388e8754d6c33ea641d7622f5ede80e1b SHA256 93b4f41a59a3b79880db4c5aa6eb937c9a34f4a0de94ef28f1ea24534ca2ad4b
-AUX gentoo-3.2.0.diff 554 RMD160 9e226cf6dd9b2123685c3ca20e304eb0834f381b SHA1 8b45c342c7894e0b474efe87cce59bcbaa488e6b SHA256 2ccec0d96f8a5a260c449013f949ac544b959478e7c5931350422a8e45239ae2
+AUX gentoo-3.2.0.diff 1313 RMD160 48509f072a026ee29bcd02284e6c450bcd17f738 SHA1 47cad3c984629a1bc9d3fab38cd860a1ab5d20b1 SHA256 8dfd0ffc55f39b7b76dc6eadcd02b0c3b77126a5dd61d1a74f498d09ad85ff1b
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
 AUX nocairofonts.diff 437 RMD160 56d7929870c122b228a1e673f4743cf91958753b SHA1 6a7e0a92155ad33e255d17961a2121857bf8a1fe SHA256 8afc0dee4778a46198ae95699243749cc62ee943229e42f0b827b55aa52c89a9
 AUX npwrap-fix-nogtk.diff 382 RMD160 557fe38a19d9a0e4505af34bed4033884f1075ab SHA1 209f73c706adabb1e2b2b3e4bc706f9afbbee172 SHA256 ad64cea66e4e4d9b351a44b3ed2774484baaaebe5e37ebea3121f4a0981d231f
@@ -50,6 +50,6 @@ DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6c
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD openoffice-3.1.1.ebuild 13586 RMD160 f09fb2f1ae5b2692758bd148a0bd1ecaa9c261b7 SHA1 d60f323041fb5e6a46fa383f5d3325fd5ab448be SHA256 216a9487563b78614d57e6464cc3d493357d5b6bf34f23d84255611e6859f39c
-EBUILD openoffice-3.2.0.ebuild 12652 RMD160 fc32b1e06a41bc8d69059c6ccad3d87ca89adce5 SHA1 3175a2c921bbef728a0fe39d7a3aefc67c08551a SHA256 5e0ab72d4a09a829577823069ccb3ec6d256059ec64d654f118a31ff3f0c8a3f
-MISC ChangeLog 106320 RMD160 9e8051c3afc054f22b401c8400105b68db57adfe SHA1 c75f08aefe439fe182769023d76c7b72dcc98376 SHA256 4f5ee80c17da45e97b75c5a39f51e64fe738d05e23ee04a354c719b0fed27d87
+EBUILD openoffice-3.2.0.ebuild 13251 RMD160 6089abd87f5bea5ee50b687e676ce36b011d4cd1 SHA1 9a35cc27a68d26b7db1939dd2acc4a06145075d7 SHA256 cbab556885b7dd8d1f5ce382735c2996290c9b7abcbcb94301261a04aa9811d8
+MISC ChangeLog 106495 RMD160 45c2934d3df8b6e423b689848d5b223ad5eb606a SHA1 122a8745cf4e07ac937f713e6b73da9e1098996e SHA256 c91ea1d8d6761f593592738b2f95ef2f518edd066a6811da4da25695c3916d78
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
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 \