Revision bump for automatic spell dictionary installation, bug #353010

Package-Manager: portage-2.1.9.39/cvs/Linux x86_64

3 files changed, 21 insertions, 10 deletions

diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index 713b15366d66..2f2da29b9419 100644
--- a/app-office/libreoffice-bin/ChangeLog
+++ b/app-office/libreoffice-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/libreoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.7 2011/02/05 11:07:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.8 2011/02/09 08:20:50 suka Exp $
+
+*libreoffice-bin-3.3.0-r1 (09 Feb 2011)
+
+  09 Feb 2011; Andreas Proschofsky <suka@gentoo.org>
+  -libreoffice-bin-3.3.0.ebuild, +libreoffice-bin-3.3.0-r1.ebuild:
+  Revision bump for automatic spell dictionary installation, thanks to Matthew
+  Turnbull <sparky@bluefang-logic.com> for the patch, bug #353010
 
   05 Feb 2011; Andreas Proschofsky <suka@gentoo.org> files/50-libreoffice-bin,
   libreoffice-bin-3.3.0.ebuild, files/wrapper.in:
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 112f6947f782..385b61b1e1fd 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -440,6 +440,6 @@ DIST LibO_3.3.0_Linux_x86_langpack-rpm_xh.tar.gz 8409332 RMD160 ef621f4a67ddae08
 DIST LibO_3.3.0_Linux_x86_langpack-rpm_zh-CN.tar.gz 1980273 RMD160 eb75c2f55e0b75346242ef61ffbdcbd27bab7e0c SHA1 f3dd3fb28e99dca9fd6cb289ac478be4d9f7e2b1 SHA256 9dee2b712e8bdd7e4d620cd859e8230acf2ff2e7608c332f6adef6aa8ba9108f
 DIST LibO_3.3.0_Linux_x86_langpack-rpm_zh-TW.tar.gz 1970628 RMD160 1f0b3142608e7dfe635ae9353557890925c21c0e SHA1 ceeaaf0831368b01b1a8a1230173d3d4ec3093a3 SHA256 fbcd0daee08b16a654bfa8f63742743a6111d41859fad7d8f96802bda12020e7
 DIST LibO_3.3.0_Linux_x86_langpack-rpm_zu.tar.gz 1909565 RMD160 6eb9a0b09761bdea237bbcb4bc265813248a2242 SHA1 0ed7713cc8a439f0b3ac93eb76cf195d2cac93c4 SHA256 ccc106c1c46371fcb7c63afd1389687b08d45b25fb3c09a415a146ae2ba0c9bc
-EBUILD libreoffice-bin-3.3.0.ebuild 7168 RMD160 acc0e4996e4c9724579ae7c24aa02687c2892b96 SHA1 fc3d0650d98d7473b7cd932593da3baa5da6352b SHA256 7605bf8843d80ec3d4c4d028585f9d1919dd393469fb81d2b44ef970dc2424f1
-MISC ChangeLog 1585 RMD160 bc0e2c6f15badaa0ee26aaa0f32e1967f5f3aae3 SHA1 5dd45002a55bbd05c646d9799f25bee3ebd1dd6c SHA256 4de2f03928879377161f69a1b717a511d86df2795c6fb3e02d06559a39cfd6af
+EBUILD libreoffice-bin-3.3.0-r1.ebuild 7374 RMD160 21867d8354bf371d22ef9fca452cb956535ef5f8 SHA1 c7cdcf9b0a07b64c0a3496ec48d64744f86e00b2 SHA256 060992bfb794573b91412a926facfb11bcbd7ec423e1327d7dea84513c5e2472
+MISC ChangeLog 1892 RMD160 a6b5a939d45b04685b5c48da75edfd0fcedd0bd0 SHA1 03b4f150959521fef015d1e324c9bb813ebb1ce3 SHA256 ea752a7625a78f66a95c71adcb69e18b5b5f27d8c0c0e21a96e287528c130ee0
 MISC metadata.xml 470 RMD160 252033a0fe2dea9ea521587808f2403870f961c0 SHA1 8dd15d8cb9fa113656a5f77de79d9fbee5fe58ed SHA256 d455809468711d16b0a1401b67b676876f5f7b6cc59affbc63c0a889a4ba103e
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.3.0-r1.ebuild
index 41e7c767116b..2248f7f7cd96 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.3.0-r1.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/libreoffice-bin/libreoffice-bin-3.3.0.ebuild,v 1.5 2011/02/05 11:07:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.0-r1.ebuild,v 1.1 2011/02/09 08:20:50 suka Exp $
 
 EAPI="3"
 
@@ -113,6 +113,7 @@ src_unpack() {
 	# English support installed by default
 	rpm_unpack "./${UP}/${BASIS}-en-US-${BVER}.${LOARCH}.rpm"
 	rpm_unpack "./${UP}/libreoffice3-en-US-${BVER}.${LOARCH}.rpm"
+	rpm_unpack "./${UP}/libreoffice3-dict-en-${BVER}.${LOARCH}.rpm"
 	use offlinehelp && rpm_unpack "./LibO_${MY_PV2}_Linux_${LOARCH2}_helppack-rpm_en-US/RPMS//${BASIS}-en-US-help-${BVER}.${LOARCH}.rpm"
 	for s in base binfilter calc math res writer ; do
 		rpm_unpack "./${UP}/${BASIS}-en-US-${s}-${BVER}.${LOARCH}.rpm"
@@ -132,6 +133,15 @@ src_unpack() {
 			for n in base binfilter calc math res writer; do
 				rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${n}-${BVER}.${LOARCH}.rpm"
 			done
+
+			for DICT_FILE in `find "./${LANGDIR}" -name "libreoffice3-dict-*-${BVER}.${LOARCH}.rpm"`; do
+				DICT_REGEX="s/libreoffice3-dict-(.*?)-${BVER}.${LOARCH}.rpm/\1/"
+				DICT_LOCALE=`basename "$DICT_FILE" | sed -E "${DICT_REGEX}"`
+				if [[ -n "${DICT_LOCALE}" && ! -d "${WORKDIR}/opt/libreoffice/share/extensions/dict-${DICT_LOCALE}" ]] ; then
+					rpm_unpack "${DICT_FILE}"
+				fi
+			done
+
 			# Help files
 			if use offlinehelp; then
 				LANGDIR2="LibO_${MY_PV2}_Linux_${LOARCH2}_helppack-rpm_${m}/RPMS/"
@@ -199,12 +209,6 @@ pkg_postinst() {
 
 	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
 
-	elog " libreoffice-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
-
 }
 
 pkg_postrm() {