Install all the available dictionaries by default

Package-Manager: portage-2.2.0_alpha27/cvs/Linux x86_64

3 files changed, 32 insertions, 33 deletions

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index c992ae31213a..b0def3cb0db3 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.243 2011/03/18 22:58:10 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.244 2011/03/18 23:42:47 suka Exp $
+
+  18 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-3.3.0.ebuild:
+  Install all the available dictionaries by default
 
   18 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
   openoffice-bin-3.3.0.ebuild:
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index 91d67457c8d0..552728744584 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -269,6 +269,6 @@ DIST OOo_3.3.0rc10_20110118_Linux_x86_langpack-rpm_vi.tar.gz 13722960 RMD160 cde
 DIST OOo_3.3.0rc10_20110118_Linux_x86_langpack-rpm_zh-CN.tar.gz 14161654 RMD160 59faa4b4924bbcb5846b91f2c570d40583ea85ac SHA1 5bd8a26f45eaad7ffffdfa08fff988ca8c0218c4 SHA256 f9ad9abc8d40a232ec84cdf43eec10b9990ebc37b2a1a3bf8fa171a63ef0c9da
 DIST OOo_3.3.0rc10_20110118_Linux_x86_langpack-rpm_zh-TW.tar.gz 14348835 RMD160 361a325775726f77a6a4ce68d001908376a5cae1 SHA1 bbd3d1cd5c8ac8d65dd4c56797c99f684c009171 SHA256 996d69480db9f657ccfbe332ef7b297ebb7f57ab871e49a77dbc1e5f09d4a06b
 EBUILD openoffice-bin-3.2.1.ebuild 6787 RMD160 5d5c37608072a6e20862275d30d785503b8f0d6d SHA1 c8ff63dd9392d4a61478bf63411cba5dfae12b56 SHA256 5b54a4f03b67ab19dcad0688b387d1b96a75a5406ce67afbf912b73ff7660967
-EBUILD openoffice-bin-3.3.0.ebuild 6602 RMD160 b3338e95a4af41551f832f8f1a6758b0f517cbe4 SHA1 504ae0e06b0bf5d31e21c3960f9f7400dc2102db SHA256 6ace74e965903c057b6e260f1b8485ef0d98e4cf4c04d3317e68fb232133a7eb
-MISC ChangeLog 43364 RMD160 55fef87980d1e70b2c68b10a1bd7f6f8e1fd2c88 SHA1 aecb9db47ef6c49c50c0eb9e647ec5fa38b8e8b8 SHA256 29794def98e18ace7161995feb66b35f0ffb0b8734bac8f7c7d3eccab9aad20f
+EBUILD openoffice-bin-3.3.0.ebuild 6494 RMD160 95415d5dfa0189ad9df45e315e963a1fa24d56db SHA1 bfa2b89afd7f50624ffb28a6d940de9e3771aefe SHA256 41ecec8de13c6258cbf17a43f15dec2ff755e8739d6e76c9a2ed720bb5bbb86b
+MISC ChangeLog 43501 RMD160 1880199ba0cceb63ed7a04f2bcaf70b255b97722 SHA1 01922ee46aed5323b0fc9418e29ef5192b53498f SHA256 2d6fd69001a543e763a4b7ad62f2c41214907ec42b1df3c5ded435cb9e526807
 MISC metadata.xml 460 RMD160 acd4457511555ead7fbc5fe5297eff6a6e01bed7 SHA1 09559b952ad283bf009bb78cca9bc125c644a977 SHA256 9160d9de32e063130943805fe72d9bb196700524a54a54cf1769a740ecd9183d
diff --git a/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild b/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild
index 3019f719a594..8ff0f78e100c 100644
--- a/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.7 2011/03/18 22:58:10 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.8 2011/03/18 23:42:47 suka Exp $
 
 EAPI="3"
 
@@ -104,30 +104,35 @@ src_unpack() {
 	use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${BVER}.${XARCH}.rpm"
 	use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${BVER}.${XARCH}.rpm"
 
-	# Unpack provided dictionaries, unless there is a better solution...
+	# English support installed by default
+	rpm_unpack "./${UP}/${BASIS}-en-US-${BVER}.${XARCH}.rpm"
+	rpm_unpack "./${UP}/${NM2}-en-US-${BVER}.${XARCH}.rpm"
 	rpm_unpack "./${UP}/${NM2}-dict-en-${BVER}.${XARCH}.rpm"
-	rpm_unpack "./${UP}/${NM2}-dict-es-${BVER}.${XARCH}.rpm"
-	rpm_unpack "./${UP}/${NM2}-dict-fr-${BVER}.${XARCH}.rpm"
+	for s in base binfilter calc draw help impress math res writer ; do
+		rpm_unpack "./${UP}/${BASIS}-en-US-${s}-${BVER}.${XARCH}.rpm"
+	done
 
 	# Localization
 	strip-linguas ${LANGS}
-	if [[ -z "${LINGUAS}" ]]; then
-		export LINGUAS="en"
-	fi
-
-	for k in ${LINGUAS}; do
-		i="${k/_/-}"
-		if [[ ${i} = "en" ]] ; then
-			i="en-US"
-			LANGDIR="${PACKED}_${i}.${BUILDID}/RPMS/"
-		else
-			LANGDIR="${PACKED2}_${i}.${BUILDID}/RPMS/"
+	for l in ${LINGUAS}; do
+		m="${l/_/-}"
+		if [[ ${m} != "en" ]] ; then
+			LANGDIR="${PACKED2}_${m}.${BUILDID}/RPMS/"
+			rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${BVER}.${XARCH}.rpm"
+			rpm_unpack "./${LANGDIR}/${NM2}-${m}-${BVER}.${XARCH}.rpm"
+			for n in base binfilter calc draw help impress math res writer; do
+				rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${n}-${BVER}.${XARCH}.rpm"
+			done
+
+			for DICT_FILE in `find "./${LANGDIR}" -name "${NM2}-dict-*-${BVER}.${XARCH}.rpm"`; do
+				DICT_REGEX="s/${NM2}-dict-(.*?)-${BVER}.${XARCH}.rpm/\1/"
+				DICT_LOCALE=`basename "$DICT_FILE" | sed -E "${DICT_REGEX}"`
+				if [[ -n "${DICT_LOCALE}" && ! -d "${WORKDIR}/opt/${NM1}/share/extensions/dict-${DICT_LOCALE}" ]] ; then
+					rpm_unpack "${DICT_FILE}"
+				fi
+			done
+
 		fi
-		rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${BVER}.${XARCH}.rpm"
-		rpm_unpack "./${LANGDIR}/${NM2}-${i}-${BVER}.${XARCH}.rpm"
-		for j in base binfilter calc draw help impress math res writer; do
-			rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${j}-${BVER}.${XARCH}.rpm"
-		done
 	done
 
 }
@@ -196,16 +201,6 @@ pkg_postinst() {
 
 	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM}/program/soffice.bin
 
-	elog " openoffice-bin does not provide integration with system spell "
-	elog " dictionaries. Please install them manually through the Extensions "
-	elog " Manager (Tools > Extensions Manager) or use the source based "
-	elog " package instead. "
-	elog
-	elog " Dictionaries for English, French and Spanish are provided in "
-	elog " ${EPREFIX}/usr/$(get_libdir)/openoffice/share/extension/install "
-	elog " Other dictionaries can be found at Suns extension site. "
-	elog
-
 }
 
 pkg_postrm() {