Wed Aug 3 23:14:34 UTC 2011

3 files changed, 443 insertions, 198 deletions

diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 9dc386211..96155e9b3 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,8 +1,19 @@
-# $Id: PKGBUILD 130669 2011-07-07 16:34:03Z andyrtr $
+# $Id: PKGBUILD 134107 2011-08-01 16:13:27Z stephane $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
-pkgname=('libreoffice' 'libreoffice-sdk' 
+pkgname=('libreoffice-common'
+	'libreoffice-base'
+	'libreoffice-calc'
+	'libreoffice-draw'
+	'libreoffice-gnome'
+	'libreoffice-impress'
+	'libreoffice-kde4'
+	'libreoffice-math'
+	'libreoffice-sdk'
+	'libreoffice-sdk-doc'
+	'libreoffice-writer'
+	'libreoffice-en-US'
 	#'libreoffice-extension-barcode' # 
 	'libreoffice-extension-diagram'
 	'libreoffice-extension-google-docs'
@@ -24,9 +35,9 @@ pkgname=('libreoffice' 'libreoffice-sdk'
 	'libreoffice-extension-validator'
 	'libreoffice-extension-watch-window'
 	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.1.3
-pkgver=3.4.1
-pkgrel=2
+_LOver=3.4.2.3
+pkgver=3.4.2
+pkgrel=1
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
@@ -48,7 +59,7 @@ makedepends=( # makedepends
 # http://download.documentfoundation.org/mirrors/all.html
 # http://wiki.documentfoundation.org/Mirrors
 _mirror="http://download.documentfoundation.org/libreoffice/src"
-#_mirror="http://dev-builds.libreoffice.org/pre-releases/src/"
+#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://hg.services.openoffice.org/binaries"
 source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
@@ -74,14 +85,14 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions
 	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	http://download.go-oo.org/src/7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
+	http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
 	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 	http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
+	http://ooo.itc.hu/oxygenoffice/download/libreoffice/451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
@@ -92,10 +103,10 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions
 	buildfix_boost.diff
 	buildfix_ct2n.diff
 	vbahelper.visibility.patch
-	0001-fix-configure-without-the-optional-translations-modu.patch)
+	scp2-more-reasonable-file-access-rights.diff)
 noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
-	7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
+	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
@@ -131,67 +142,69 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
 	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2)
-md5sums=('10b3212002688e7ce49a276c68352b50'
-         'c6547ec8f971284ea1e58bb39375c500'
-         '26328364a0804dedab94818c15e76871'
-         'd26c6ab53c9404e82e04ea366d4db261'
-         '132aa87f2f3e7fff62d7211a86b769f3'
-         '801c254c28402df0c5fb5e2615817a6d'
-         'b94208fdae537f0b026ee26cede9a946'
-         '096e3071949d1eedf73faa13a2cf7b7e'
-         'e27e715b08cc6a35988aaa6efab6cc7f'
-         'e94d7adb79f38d3fd8119b712b04cc6e'
-         '1d2e7ca24b9fffafeaf236817fc8cbe9'
-         '69a9af6536607340a57b54b5562077f7'
-         '3b4e819497ba695f5c64a0107c2aac8d'
-         '5a7370a79e563f649f6bf506bc71928c'
-         'c480ed571703e68d851fbbcd4aa520be'
-         '222cec135152c108068baa4e370a3f68'
-         '93524298efb472503b12ae47c95de399'
-         '5420c40473f8bf8e5b400dd8a1e54f02'
-         '1516196f023bb1ae55fd1773a8db9d16'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '18f577b374d60b3c760a3a3350407632'
-         '7a0dcb3fe1e8c7229ab4fb868b7325e6'
-         '185d60944ea767075d27247c3162b3bc'
-         'b4cae0700aa1c2aef7eb7f345365e6f1'
-         '90401bca927835b6fbae4a707ed187c8'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
-         '41c9b65ad60af4b3255bbecdfef11736'
-         '451ccf439a36a568653b024534669971'
-         'bbdd5639ada63e3130761daaecae1a10'
-         '23bd75552206dfcd8fd4e29137dcac84'
-         'b8cbca7b3363e6ca2d02bc0ba2b63904'
-         'b632bdd25649cc4067bcb410bae23d2b'
-         '9d60b6cfa3ef1926848710bbcd11115b'
-         'dbaafd21de055e582d92d7d32fe9da13'
-         'b7b2d0e04e142f26dd96119c80757d1f'
-         'bc228237108cab7745897a9f466b6d39'
-         'eee273f501ff45dc5f1365e78c6d57c0'
-         '43b145db28e6c0d73578ae6fd35e510d'
-         'f8a8fdcc58f50560fbc266e28efdbbfe')
+
+md5sums=('1600ebf998ec7075bd0e96e7a49513dc' #libreoffice-artwork-3.4.2.3.tar.bz2
+         '0e12b4a03d14645dac1f073eb2f67423' #libreoffice-base-3.4.2.3.tar.bz2
+         'f106511220a2a0b2a45571cf7605953a' #libreoffice-bootstrap-3.4.2.3.tar.bz2
+         '20854b5961b8b0b38219376a93ecf362' #libreoffice-calc-3.4.2.3.tar.bz2
+         '5799be1571289b7c17bd8fd2020c00f6' #libreoffice-components-3.4.2.3.tar.bz2
+         '75ca9da214abe072e37fb4d19fc2c34f' #libreoffice-extensions-3.4.2.3.tar.bz2
+         '73aa766053ea8f4c84dd0a76c0888f18' #libreoffice-extras-3.4.2.3.tar.bz2
+         '4416cc18cfa84f61eae905ff441a18d0' #libreoffice-filters-3.4.2.3.tar.bz2
+         'ecfd57a3dfd0ce230e5837b5099a0d5a' #libreoffice-help-3.4.2.3.tar.bz2
+         '40e23531e95617c7fe91e7025f007a91' #libreoffice-impress-3.4.2.3.tar.bz2
+         'bd2027fc2160798728e49d0fd331d163' #libreoffice-libs-core-3.4.2.3.tar.bz2
+         '9a948012496fcd27c31f755314ff98e3' #libreoffice-libs-extern-3.4.2.3.tar.bz2
+         'a5a8d9080492968eef001314093cd82d' #libreoffice-libs-extern-sys-3.4.2.3.tar.bz2
+         '810aa9e69b96af0f4de2e6d74b7b1847' #libreoffice-libs-gui-3.4.2.3.tar.bz2
+         '45de04dcbb6f6ff7474110ee982da7b8' #libreoffice-postprocess-3.4.2.3.tar.bz2
+         '545d65e92b674d354dd6511ee552d23f' #libreoffice-sdk-3.4.2.3.tar.bz2
+         '99e306957e38ce5e68deed9568874be6' #libreoffice-testing-3.4.2.3.tar.bz2
+         '2e7277588ef610b7a06953c59dc77c9b' #libreoffice-ure-3.4.2.3.tar.bz2
+         '281973e517d3b5626f5eedd746378fcc' #libreoffice-writer-3.4.2.3.tar.bz2
+         '1f24ab1d39f4a51faf22244c94a6203f' #1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+         '35c94d2df8893241173de1d16b6034c0' #35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+         '798b2ffdc8bcfe7bca2cf92b62caf685' #798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+         'fdb27bfe2dbe2e7b57ae194d9bf36bab' #fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+         'ada24d37d8d638b3d8a9985e80bc2978' #ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+         '2a177023f9ea8ec8bd00837605c5df1b' #2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+         'a7983f859eafb2677d7ff386a023bc40' #a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+         '3c219630e4302863a9a83d0efde889db' #3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+         '2ae988b339daec234019a7066f96733e' #2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+         '2c9b0f83ed5890af02c0df1c1776f39b' #2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+         'af3c3acf618de6108d65fcdc92b492e1' #af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+         'eeb2c7ddf0d302fba4bfc6e97eac9624' #eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+         '39bb3fcea1514f1369fcfc87542390fd' #39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+         '3404ab6b1792ae5f16bbd603bd1e1d03' #3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+         '97b2d4dba862397f446b217e2b623e71' #97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+         'f94d9870737518e3b597f9265f4e9803' #f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+         '8ce2fcd72becf06c41f7201d15373ed9' #8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+         'd8bd5eed178db6e2b18eeed243f85aa8' #d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+         '3bdf40c0d199af31923e900d082ca2dd' #3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+         'ace6ab49184e329db254e454a010f56d' #ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+         'db60e4fde8dd6d6807523deb71ee34dc' #db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+         'ba2930200c9f019c2d93a8c88c651a0f' #ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+         '18f577b374d60b3c760a3a3350407632' #18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+         '0ff7d225d087793c8c2c680d77aac3e7' #0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+         '185d60944ea767075d27247c3162b3bc' #185d60944ea767075d27247c3162b3bc-unowinreg.dll
+         'b4cae0700aa1c2aef7eb7f345365e6f1' #b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
+         '90401bca927835b6fbae4a707ed187c8' #90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
+         'f02578f5218f217a9f20e9c30e119c6a' #f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+         '7e7efc5d4a03126bb9ae3ae9aa2c4e87' #7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
+         '41c9b65ad60af4b3255bbecdfef11736' #41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
+         '451ccf439a36a568653b024534669971' #451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt
+         'bbdd5639ada63e3130761daaecae1a10' #bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
+         '23bd75552206dfcd8fd4e29137dcac84' #23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
+         'b8cbca7b3363e6ca2d02bc0ba2b63904' #b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
+         'b632bdd25649cc4067bcb410bae23d2b' #b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
+         '9d60b6cfa3ef1926848710bbcd11115b' #9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
+         'dbaafd21de055e582d92d7d32fe9da13' #dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
+         'b7b2d0e04e142f26dd96119c80757d1f' #b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
+         'bc228237108cab7745897a9f466b6d39' #buildfix_boost.diff
+         'eee273f501ff45dc5f1365e78c6d57c0' #buildfix_ct2n.diff
+         '43b145db28e6c0d73578ae6fd35e510d' #vbahelper.visibility.patch
+         '37638431e7e40baf2e47966ebb9bc0e9' #scp2-more-reasonable-file-access-rights.diff
+         )
 
 build() {
 
@@ -205,6 +218,8 @@ build() {
 	for i in libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}; do #,translations
 	  mv ${srcdir}/$i/* .
 	done
+#	mv ${srcdir}/libreoffice-bootstrap-${_LOver}/* .
+#	./bin/unpack-sources ${srcdir}/build
 
 	# move external sources into place
 	mkdir ${srcdir}/ext_sources &&	cd ${srcdir}/ext_sources
@@ -218,8 +233,11 @@ build() {
 	patch -Np1 -i ${srcdir}/buildfix_boost.diff
 	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
 	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
-	patch -Np1 -i ${srcdir}/0001-fix-configure-without-the-optional-translations-modu.patch
+	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
 	
+	# Temporary workaround to avoid build failure in ct2n
+	mv ${srcdir}/451ccf439a36a568653b024534669971-ConvertTextToNumber{_,-}1.3.2.oxt
+
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
 #	unset CFLAGS
@@ -246,18 +264,20 @@ build() {
 #	      sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
 #	fi
 
-#	autoconf -v -f
+	# needed for 0003-distro-install-fix-en-US-only-installation.patch
+	autoconf -v -f
 
 	# non-SMP test build
 #	export MAKEFLAGS="-j1"
 	./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
 		--with-unix-wrapper="libreoffice" \
+		--enable-split-app-modules \
 		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
 		--with-external-tar="${srcdir}/ext_sources" \
 		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
 		--with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \
-		--with-lang="" \
 		--disable-verbose \
+		--with-lang="" \
 		--enable-cairo\
 		--enable-crashdump \
 		--enable-dbus \
@@ -326,6 +346,8 @@ build() {
 		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
 		$EXTRAOPTS || return 1
 
+#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
+
 #--with-system-graphite --enable-graohite ?
 #--with-servlet-api-jar=JARFILE 
 # see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
@@ -337,6 +359,10 @@ build() {
 	unset MAKEFLAGS
 	./bootstrap
 	make
+	
+	# fake installation to create split file lists
+	mkdir $srcdir/fakeinstall
+	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
 }
 
 #check() {
@@ -344,23 +370,23 @@ build() {
 #	make check
 #}
 
-package_libreoffice() {
+package_libreoffice-common() {
 
- pkgdesc="a productivity suite that is compatible with other major office suites"
+ pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
  install=${pkgbase}.install
- depends=("curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-          'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
-          'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat'
+ depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
+          'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6"
+          'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite'
           'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2') # keep gtk2 for install script 
 	  #'java-runtime' 
           #'saxon'
- optdepends=('java-runtime:     adds java support'
+ optdepends=('libreoffice-langpack: additional language support'
+             'java-runtime:     adds java support'
              'libcups:          adds printing support'
              'gconf:            adds additional gnome support'
              'nss:              adds support for signed files/macros'
              'pstoedit:         translates PostScript and PDF graphics into other vector formats'
              'poppler:          for shipped pdfimport extension'
-             'kdelibs:          for kde integration'
              'libmythes:        for use in thesaurus'
              'hsqldb-java:      default database format for OpenOffice.org'
              'beanshell:        interactive java -- good for prototyping /macros'
@@ -371,121 +397,302 @@ package_libreoffice() {
              'lucene:           full-text search engine library for Java needed in the help section'
              'sane:             for scanner access'
              'unixodbc:         adds ODBC database support'
-             'mesa:             for the OGLTrans extension'
              'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
  backup=(etc/libreoffice/sofficerc
          etc/libreoffice/bootstraprc
          etc/libreoffice/psprint.conf)
- provides=('go-openoffice')
+ groups=('libreoffice')
+ provides=('go-openoffice' 'libreoffice')
  conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' )
+ replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/common_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/common_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+ 
+ #	# remove version in menu entry and make it visible
+#	sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
+#	echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
+
+ # put configuration files into place
+ install -dm755 ${pkgdir}/etc/libreoffice
+ install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
+ install -m644 ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
+ # install dummy links to make them found by LibO
+ cd ${pkgdir}/usr/lib/libreoffice/program/
+ ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
+ cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/
+ ln -vsf /etc/libreoffice/psprint.conf .
+
+ #fix http://bugs.archlinux.org/task/17656
+ find ${pkgdir} -perm 444 -exec ls -lh {} \;
+ find ${pkgdir} -perm 444 -exec chmod 644 {} \;
+ find ${pkgdir} -perm 555 -exec ls -lh {} \;
+ find ${pkgdir} -perm 555 -exec chmod 755 {} \;
+}
 
-	cd ${srcdir}/build
-	make DESTDIR=${pkgdir} install
-	
-	# fix missing desktop integration
-	install -dm755 ${pkgdir}/usr/bin
-	pushd ${pkgdir}/usr/bin
-	ln -vs /usr/lib/libreoffice/program/soffice ./libreoffice
-	ln -vs /usr/lib/libreoffice/program/soffice ./soffice
-	ln -vs /usr/lib/libreoffice/program/sbase ./lobase
-	ln -vs /usr/lib/libreoffice/program/scalc ./localc
-	ln -vs /usr/lib/libreoffice/program/sdraw ./lodraw
-	ln -vs /usr/lib/libreoffice/program/simpress ./loimpress
-	ln -vs /usr/lib/libreoffice/program/smath ./lomath
-	ln -vs /usr/lib/libreoffice/program/swriter ./lowriter
-	ln -vs /usr/lib/libreoffice/program/unopkg ./unopkg
-	popd
-	
-	# move sysui desktop files into place we want to use - javafilter and qstarter, but not unneeded printeradmin
-	install -dm755 ${pkgdir}/usr/share/{applications,icons,mime/packages,pixmaps}
-	rm ${pkgdir}/usr/lib/libreoffice/share/xdg/printeradmin.desktop
-	for i in base calc draw impress javafilter math qstart startcenter writer; do
-	  cp ${pkgdir}/usr/lib/libreoffice/share/xdg/$i.desktop ${pkgdir}/usr/share/applications/libreoffice-$i.desktop
-	done
-	# remove version in menu entry and make it visible
-	sed -i -e "s/3.4//g" ${pkgdir}/usr/share/applications/*.desktop
-	sed -i -e "s/Icon=libreoffice34-/Icon=/g" ${pkgdir}/usr/share/applications/*.desktop
-	sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-	echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-	# remove unneeded .desktop files
-	rm -rf ${pkgdir}/usr/lib/libreoffice/share/xdg
-	
-	# add missing icon files
-	cp -R ${srcdir}/build/sysui/desktop/icons/{hi,lo}color ${pkgdir}/usr/share/icons/
-	pushd ${pkgdir}/usr/share/pixmaps
-	  for i in base calc draw impress main math printeradmin startcenter writer; do
-	    ln -vs /usr/share/icons/hicolor/48x48/apps/$i.png .
-	  done
-	popd
-	sed -i -e 's/Icon=libreoffice-/Icon=/' ${pkgdir}/usr/share/applications/*.desktop
-
-	# add missing mimetype file
-	install -m644 ${srcdir}/build/sysui/unxlng*/misc/libreoffice/openoffice.org.xml ${pkgdir}/usr/share/mime/packages/libreoffice.xml
-
-	# put configuration files into place
-	install -dm755 ${pkgdir}/etc/libreoffice
-	install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
-	install -m644 ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
-	# install dummy links to make them found by LibO
-	cd ${pkgdir}/usr/lib/libreoffice/program/
-	ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
-	cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/
-	ln -vsf /etc/libreoffice/psprint.conf .
+package_libreoffice-base() {
+ pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
+ depends=('libreoffice-common')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/base_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-calc() {
+ pkgdesc="Spreadsheet application for LibreOffice."
+ depends=('libreoffice-common' 'lpsolve' )
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
  
-	#fix http://bugs.archlinux.org/task/17656
-	find ${pkgdir} -perm 444 -exec ls -lh {} \;
-	find ${pkgdir} -perm 444 -exec chmod 644 {} \;
-	find ${pkgdir} -perm 555 -exec ls -lh {} \;
-	find ${pkgdir} -perm 555 -exec chmod 755 {} \;
-	
-	# split out extensions
-	mv ${pkgdir}/usr/lib/libreoffice/share/extensions ${srcdir}/extensions-install
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	install -m644 ${srcdir}/extensions-install/package.txt ${pkgdir}/usr/lib/libreoffice/share/extensions/
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/calc_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
 
-	# move SDK to separated package
-	mkdir -p ${srcdir}/sdk-install/usr/lib/libreoffice/basis3.4/sdk
-	mv ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk ${srcdir}/sdk-install/usr/lib/libreoffice/basis3.4/
+package_libreoffice-draw() {
+ pkgdesc="Drawing Application for LibreOffice."
+ depends=('libreoffice-common')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/draw_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
 
-	# cleanup gid_Module files
-	mkdir ${srcdir}/splitlist
-	mv -f ${pkgdir}/gid_Module* ${srcdir}/splitlist/
+package_libreoffice-gnome() {
+ pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
+ depends=('libreoffice-common' 'dbus-glib')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/gnome_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/gnome_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
 }
 
-package_libreoffice-sdk() {
+package_libreoffice-impress() {
+ pkgdesc="Presentation Application for LibreOffice."
+ depends=('libreoffice-common')
+ optdepends=('mesa:             for the OGLTrans extension')
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/impress_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-kde4() {
+ pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
+ depends=('libreoffice-common' 'kdelibs')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/kde4_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/kde4_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-math() {
+ pkgdesc="Equation Editor Applicationfor LibreOffice."
+ depends=('libreoffice-common')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/math_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
 
- pkgdesc="Software development kit for LibreOffice"
- depends=('libreoffice' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
+package_libreoffice-sdk() {
+ pkgdesc="Software Development Kit for LibreOffice."
+ depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+ 
+ # fix ArchLinux LibreOffice installation paths	
+ sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
+        -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \
+        -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
+        -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \
+        -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
+        -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
+        -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
+        -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
+        -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
+        -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
+        -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
+        -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in
+}
 
-	cd ${srcdir}/sdk-install
-	cp -r * ${pkgdir}
+package_libreoffice-sdk-doc() {
+ pkgdesc="Software Development Kit documentation for LibreOffice"
+ depends=('libreoffice-common' 'libreoffice-sdk')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_doc_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_doc_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+
+ #fix permissions
+ find ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/examples -type f -exec chmod -x {} \;
+}
 
-	cd ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk
-	cp setsdkenv_unix setsdkenv_unix.sh && chmod 755 setsdkenv_unix{,.sh}
+package_libreoffice-writer() {
+ pkgdesc="Word Processor Applicationfor LibreOffice."
+ depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
+ optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
+ backup=()
+ groups=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/writer_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
 
-	# fix ArchLinux LIbreOffice installation paths	
-        sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
-              -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \
-              -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
-              -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \
-              -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
-              -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
-              -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
-              -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
-              -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
-              -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
-              -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
-              -e "s,@SDK_AUTO_DEPLOYMENT@,NO," setsdkenv_unix.{csh,sh}.in
-	#fix permissions
-	find examples -type f -exec chmod -x {} \;
+package_libreoffice-en-US() {
+  pkgdesc="English (US) language pack for LibreOffice"
+  #arch=('any')
+  provides=('openoffice-en-US' 'libreoffice-langpack')
+  replaces=(openoffice-en-US)
+  conflicts=(openoffice-en-US)
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/lang_en_US_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/lang_en_US_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
 }
 
 package_libreoffice-extension-barcode() {
 
  pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw "
  #arch=('any')
- depends=('libreoffice')
+ depends=('libreoffice-common')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -497,7 +704,7 @@ package_libreoffice-extension-diagram() {
 
  pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks"
  #arch=('any')
- depends=('libreoffice')
+ depends=('libreoffice-common' 'java-environment')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -508,7 +715,7 @@ package_libreoffice-extension-google-docs() {
 
  pkgdesc="Google Documents extension for LibreOffice"
  #arch=('any')
- depends=('libreoffice')
+ depends=('libreoffice-common' 'java-environment')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -519,7 +726,7 @@ package_libreoffice-extension-hunart() {
 
  pkgdesc="Hungarian cross-reference toolbar extension"
  #arch=('any')
- depends=('libreoffice')
+ depends=('libreoffice-common')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -530,7 +737,7 @@ package_libreoffice-extension-hunart() {
 
 # pkgdesc="Lightproof extension for LibreOffice"
  #arch=('any')
-# depends=('libreoffice')
+# depends=('libreoffice-common')
 # groups=('libreoffice-extensions')
 
 #	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -541,7 +748,7 @@ package_libreoffice-extension-hunart() {
 
 # pkgdesc="MySQL Connector extension for LibreOffice"
  #arch=('any')
-# depends=('libreoffice')
+# depends=('libreoffice-common')
 # groups=('libreoffice-extensions')
 
 #	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -552,7 +759,7 @@ package_libreoffice-extension-nlpsolver() {
 
  pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
  #arch=('any')
- depends=('libreoffice')
+ depends=('libreoffice-common' 'java-environment')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -563,7 +770,7 @@ package_libreoffice-extension-ct2n() {
 
  pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates."
  #arch=('any')
- depends=('libreoffice')
+ depends=('libreoffice-common')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -574,7 +781,7 @@ package_libreoffice-extension-numbertext() {
 
  pkgdesc="NUMBERTEXT/MONEYTEXT extensions"
  #arch=('any')
- depends=('libreoffice')
+ depends=('libreoffice-common')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -585,7 +792,7 @@ package_libreoffice-extension-oooblogger() {
 
  pkgdesc="An extensions for blogging"
  #arch=('any')
- depends=('libreoffice' 'coreutils')
+ depends=('libreoffice-common' 'coreutils' 'python')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -595,7 +802,7 @@ package_libreoffice-extension-oooblogger() {
 package_libreoffice-extension-pdfimport() {
 
  pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice' 'poppler')
+ depends=('libreoffice-common' 'poppler')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -605,7 +812,7 @@ package_libreoffice-extension-pdfimport() {
 package_libreoffice-extension-presenter-screen() {
 
  pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice')
+ depends=('libreoffice-common' 'java-environment')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -615,7 +822,7 @@ package_libreoffice-extension-presenter-screen() {
 package_libreoffice-extension-presentation-minimizer() {
 
  pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice' 'gcc-libs')
+ depends=('libreoffice-common' 'gcc-libs')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -626,7 +833,7 @@ package_libreoffice-extension-report-builder() {
 
  pkgdesc="This extension creates smart-looking database reports"
  #arch=('any')
- depends=('libreoffice')
+ depends=('libreoffice-common' 'java-environment')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -636,7 +843,7 @@ package_libreoffice-extension-report-builder() {
 package_libreoffice-extension-scripting-beanshell() {
 
  pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
- depends=('libreoffice')
+ depends=('libreoffice-common' 'java-environment')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -646,7 +853,7 @@ package_libreoffice-extension-scripting-beanshell() {
 package_libreoffice-extension-scripting-javascript() {
 
  pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
- depends=('libreoffice')
+ depends=('libreoffice-common' 'java-environment')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -656,7 +863,7 @@ package_libreoffice-extension-scripting-javascript() {
 package_libreoffice-extension-scripting-python() {
 
  pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice')
+ depends=('libreoffice-common' 'python')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -667,19 +874,20 @@ package_libreoffice-extension-typo() {
 
  pkgdesc="Typography toolbar extension"
  #arch=('any')
- depends=('libreoffice')
+ depends=('libreoffice-common')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
 	unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-	chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
+	find ${pkgdir} -type d -exec chmod 755 {} \;
+	#chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
 }
 
 package_libreoffice-extension-validator() {
 
  pkgdesc="Validator extension for LibreOffice"
  #arch=('any')
- depends=('libreoffice')
+ depends=('libreoffice-common' 'java-environment')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -690,7 +898,7 @@ package_libreoffice-extension-wiki-publisher() {
 
  pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
  #arch=('any')
- depends=('libreoffice')
+ depends=('libreoffice-common' 'java-environment')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
@@ -701,7 +909,7 @@ package_libreoffice-extension-watch-window() {
 
  pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen."
  #arch=('any')
- depends=('libreoffice')
+ depends=('libreoffice-common' 'java-environment')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
diff --git a/extra/libreoffice/libreoffice.install b/extra/libreoffice/libreoffice.install
index 177f0d4e6..0bccb81f3 100644
--- a/extra/libreoffice/libreoffice.install
+++ b/extra/libreoffice/libreoffice.install
@@ -5,9 +5,20 @@ update-desktop-database -q
 update-mime-database usr/share/mime > /dev/null 2>&1
 
 echo " * see https://wiki.archlinux.org/index.php/LibreOffice"
+echo "-------------------------------------------------------------------"
+echo "LibreOffice has been split into several packages:"
+echo "- libreoffice-common"
+echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
+echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
+echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
+echo "                              the LibreOffice APIs and for creating"
+echo "                              extensions (UNO components)."
+echo "-------------------------------------------------------------------"
+echo " * you need to install at least one libreoffice-langpack"
 echo " * you may want to pacman -Ss libreoffice-extensions"
-echo "   to see what extensions are prepared to install"
-echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg for spell checking"
+echo "   to see what additional extensions are prepared to install"
+echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg
+         for spell checking"
 echo " * make sure you have installed some ttf font (ttf-dejavu recommended)"
 }
 
@@ -16,6 +27,17 @@ post_upgrade() {
 gtk-update-icon-cache -f -q /usr/share/icons/hicolor
 update-desktop-database -q
 update-mime-database usr/share/mime > /dev/null 2>&1
+  if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then
+    # important upgrade notice
+    echo "LibreOffice has been split into several packages:"
+    echo "- libreoffice-common"
+    echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
+    echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
+    echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
+    echo "                              the LibreOffice APIs and for creating"
+    echo "                              extensions (UNO components)."
+    echo "Now you need to install at least one libreoffice-langpack!"
+  fi
 }
 
 post_remove() {
diff --git a/extra/libreoffice/scp2-more-reasonable-file-access-rights.diff b/extra/libreoffice/scp2-more-reasonable-file-access-rights.diff
new file mode 100644
index 000000000..fd61cb4ca
--- /dev/null
+++ b/extra/libreoffice/scp2-more-reasonable-file-access-rights.diff
@@ -0,0 +1,15 @@
+--- scp2/inc/macros.inc.old	2011-05-18 17:51:47.000000000 +0200
++++ scp2/inc/macros.inc	2011-07-18 19:58:27.000000000 +0200
+@@ -92,10 +92,10 @@
+ #endif
+ 
+ #define BIN_FILE_BODY \
+-        UnixRights   = 555
++        UnixRights   = 755
+ 
+ #define TXT_FILE_BODY \
+-        UnixRights   = 444
++        UnixRights   = 644
+ 
+ #define USER_FILE_BODY \
+         UnixRights   = 644