Introduce "offlinehelp" use flag, if not set the LibreOffice Wiki will be used for help, reducing download size

quite a bit.

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

4 files changed, 24 insertions, 13 deletions

diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index a9b546a5d383..7bc260db22c9 100644
--- a/app-office/libreoffice-bin/ChangeLog
+++ b/app-office/libreoffice-bin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2011/01/27 10:25:00 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.5 2011/01/27 14:59:13 suka Exp $
+
+  27 Jan 2011; Andreas Proschofsky <suka@gentoo.org>
+  libreoffice-bin-3.3.0.ebuild, metadata.xml:
+  Introduce "offlinehelp" use flag, if not set the LibreOffice Wiki will be
+  used for help, reducing download size 
+  quite a bit.
 
   27 Jan 2011; Andreas Proschofsky <suka@gentoo.org>
   libreoffice-bin-3.3.0.ebuild:
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 2b6928ac7789..4fef2a56e830 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 6957 RMD160 756ae92875ab25617813c2202d4257ae0b3a1c03 SHA1 f979ae5b999e290293f8fef6da7fcbe9f599ad1d SHA256 1952032a0e4d009b2c9d13ffbacfda29a972bd3512edd6d75a925ad49bb64382
-MISC ChangeLog 1083 RMD160 90b3746de4ac20865f06653f88edd6b7a67565bc SHA1 eafb429f7cd8f1743831760f5ce4611cff23b8e9 SHA256 f0d0364d2fbdb1bead935d59970a67779c941fa05a3c422168cf326830a7b095
-MISC metadata.xml 345 RMD160 d907e7f84d4875bbd67b6206afdbe7ec8c03ee6e SHA1 300d717142203ecb45b6ec311836029ca61620a1 SHA256 3e8a6e421fd0d43ade9ecb3cb543b98538354c54ae8a6ff58581d92531b41859
+EBUILD libreoffice-bin-3.3.0.ebuild 7092 RMD160 379af223f31b1965319083b89ce3ce7aebfa06c5 SHA1 902a75f5d8de9602a9bb0e9d18e7d95859a91e43 SHA256 3e05fbdbede881b162e0a4afd2f0ad726e17fb2c9b8af84b176389a3c418b4db
+MISC ChangeLog 1315 RMD160 c83fd6f20d236805af93e4b7cc79215183796a5a SHA1 4740562fe4a4504eabf5a39b3a12a5020b7098bc SHA256 9d8430d7bcc81b0ea9f9809156c59b1e673993d51b8a9909ae4f9af3564f76eb
+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.ebuild
index e8cbf4b21194..343c5418eaa5 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild
@@ -1,12 +1,12 @@
 # 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.2 2011/01/27 10:25:00 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild,v 1.3 2011/01/27 14:59:13 suka Exp $
 
 EAPI="3"
 
 inherit eutils fdo-mime gnome2-utils rpm multilib
 
-IUSE="gnome java kde"
+IUSE="gnome java kde offlinehelp"
 
 MY_PV="${PV/_/-}"
 MY_PV2="${PV}rc4"
@@ -28,18 +28,18 @@ UP="LibO_${MY_PV2}_Linux_${LOARCH2}_install-rpm_en-US/RPMS"
 DESCRIPTION="LibreOffice productivity suite."
 
 SRC_URI="amd64? ( ${FILEPATH}/x86_64/LibO_${PV}_Linux_x86-64_install-rpm_en-US.tar.gz
-		${FILEPATH}/x86_64/LibO_${PV}_Linux_x86-64_helppack-rpm_en-US.tar.gz )
+		offlinehelp? ( ${FILEPATH}/x86_64/LibO_${PV}_Linux_x86-64_helppack-rpm_en-US.tar.gz ) )
 	x86? ( ${FILEPATH}/x86/LibO_${PV}_Linux_x86_install-rpm_en-US.tar.gz
-		${FILEPATH}/x86/LibO_${PV}_Linux_x86_helppack-rpm_en-US.tar.gz )"
+		offlinehelp? ( ${FILEPATH}/x86/LibO_${PV}_Linux_x86_helppack-rpm_en-US.tar.gz ) )"
 
 LANGS="af ar as ast be_BY bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el en en_GB en_ZA eo es et eu fa fi fr ga gd gl gu he hi hr hu id is it ja ka kk km kn ko kok ks ku ky lo lt lv mai mk ml mn mni mr ms my nb ne nl nn nr ns oc om or pa_IN pap pl ps pt pt_BR ro ru rw sa_IN sat sd sh si sk sl sq sr ss st sv sw_TZ ta te tg th ti tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu"
 
 for X in ${LANGS} ; do
 	[[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? (
 		amd64? ( "${FILEPATH}"/x86_64/LibO_${PV}_Linux_x86-64_langpack-rpm_${X/_/-}.tar.gz
-			"${FILEPATH}"/x86_64/LibO_${PV}_Linux_x86-64_helppack-rpm_${X/_/-}.tar.gz )
+			offlinehelp? ( "${FILEPATH}"/x86_64/LibO_${PV}_Linux_x86-64_helppack-rpm_${X/_/-}.tar.gz ) )
 		x86? ( "${FILEPATH}"/x86/LibO_${PV}_Linux_x86_langpack-rpm_${X/_/-}.tar.gz
-			"${FILEPATH}"/x86/LibO_${PV}_Linux_x86_helppack-rpm_${X/_/-}.tar.gz ) )"
+			offlinehelp? ( "${FILEPATH}"/x86/LibO_${PV}_Linux_x86_helppack-rpm_${X/_/-}.tar.gz ) ) )"
 	IUSE="${IUSE} linguas_${X}"
 done
 
@@ -110,7 +110,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 "./LibO_${MY_PV2}_Linux_${LOARCH2}_helppack-rpm_en-US/RPMS//${BASIS}-en-US-help-${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"
 	done
@@ -130,8 +130,10 @@ src_unpack() {
 				rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${n}-${BVER}.${LOARCH}.rpm"
 			done
 			# Help files
-			LANGDIR2="LibO_${MY_PV2}_Linux_${LOARCH2}_helppack-rpm_${m}/RPMS/"
-			rpm_unpack "./${LANGDIR2}/${BASIS}-${m}-help-${BVER}.${LOARCH}.rpm"
+			if use offlinehelp; then
+				LANGDIR2="LibO_${MY_PV2}_Linux_${LOARCH2}_helppack-rpm_${m}/RPMS/"
+				rpm_unpack "./${LANGDIR2}/${BASIS}-${m}-help-${BVER}.${LOARCH}.rpm"
+			fi
 		fi
 	done
 }
diff --git a/app-office/libreoffice-bin/metadata.xml b/app-office/libreoffice-bin/metadata.xml
index b6165efe4998..695ed551e4fb 100644
--- a/app-office/libreoffice-bin/metadata.xml
+++ b/app-office/libreoffice-bin/metadata.xml
@@ -4,4 +4,7 @@
 <herd>openoffice</herd>
 <longdescription>LibreOffice is a free office suite.
 This is the binary version of Libreoffice. Use this if you don't want to wait for the source version to build.</longdescription>
+<use>
+  <flag name='offlinehelp'>Download and install help files locally instead of using the LibreOffice Wiki</flag>
+</use>
 </pkgmetadata>