diff --git a/srcpkgs/libreoffice-base b/srcpkgs/libreoffice-base
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-base
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-calc b/srcpkgs/libreoffice-calc
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-calc
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-common b/srcpkgs/libreoffice-common
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-common
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-draw b/srcpkgs/libreoffice-draw
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-draw
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-gnome b/srcpkgs/libreoffice-gnome
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-gnome
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-af b/srcpkgs/libreoffice-i18n-af
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-af
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-am b/srcpkgs/libreoffice-i18n-am
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-am
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ar b/srcpkgs/libreoffice-i18n-ar
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ar
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-as b/srcpkgs/libreoffice-i18n-as
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-as
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ast b/srcpkgs/libreoffice-i18n-ast
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ast
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-be b/srcpkgs/libreoffice-i18n-be
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-be
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-bg b/srcpkgs/libreoffice-i18n-bg
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-bg
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-bn b/srcpkgs/libreoffice-i18n-bn
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-bn
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-bn-IN b/srcpkgs/libreoffice-i18n-bn-IN
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-bn-IN
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-bo b/srcpkgs/libreoffice-i18n-bo
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-bo
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-br b/srcpkgs/libreoffice-i18n-br
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-br
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-brx b/srcpkgs/libreoffice-i18n-brx
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-brx
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-bs b/srcpkgs/libreoffice-i18n-bs
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-bs
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ca b/srcpkgs/libreoffice-i18n-ca
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ca
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ca-valencia b/srcpkgs/libreoffice-i18n-ca-valencia
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ca-valencia
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-cs b/srcpkgs/libreoffice-i18n-cs
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-cs
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-cy b/srcpkgs/libreoffice-i18n-cy
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-cy
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-da b/srcpkgs/libreoffice-i18n-da
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-da
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-de b/srcpkgs/libreoffice-i18n-de
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-de
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-dgo b/srcpkgs/libreoffice-i18n-dgo
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-dgo
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-dz b/srcpkgs/libreoffice-i18n-dz
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-dz
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-el b/srcpkgs/libreoffice-i18n-el
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-el
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-en-GB b/srcpkgs/libreoffice-i18n-en-GB
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-en-GB
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-en-US b/srcpkgs/libreoffice-i18n-en-US
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-en-US
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-en-ZA b/srcpkgs/libreoffice-i18n-en-ZA
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-en-ZA
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-eo b/srcpkgs/libreoffice-i18n-eo
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-eo
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-es b/srcpkgs/libreoffice-i18n-es
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-es
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-et b/srcpkgs/libreoffice-i18n-et
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-et
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-eu b/srcpkgs/libreoffice-i18n-eu
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-eu
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-fa b/srcpkgs/libreoffice-i18n-fa
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-fa
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-fi b/srcpkgs/libreoffice-i18n-fi
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-fi
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-fr b/srcpkgs/libreoffice-i18n-fr
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-fr
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ga b/srcpkgs/libreoffice-i18n-ga
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ga
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-gd b/srcpkgs/libreoffice-i18n-gd
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-gd
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-gl b/srcpkgs/libreoffice-i18n-gl
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-gl
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-gu b/srcpkgs/libreoffice-i18n-gu
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-gu
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-gug b/srcpkgs/libreoffice-i18n-gug
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-gug
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-he b/srcpkgs/libreoffice-i18n-he
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-he
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-hi b/srcpkgs/libreoffice-i18n-hi
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-hi
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-hr b/srcpkgs/libreoffice-i18n-hr
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-hr
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-hu b/srcpkgs/libreoffice-i18n-hu
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-hu
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-id b/srcpkgs/libreoffice-i18n-id
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-id
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-is b/srcpkgs/libreoffice-i18n-is
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-is
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-it b/srcpkgs/libreoffice-i18n-it
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-it
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ja b/srcpkgs/libreoffice-i18n-ja
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ja
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ka b/srcpkgs/libreoffice-i18n-ka
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ka
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-kk b/srcpkgs/libreoffice-i18n-kk
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-kk
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-km b/srcpkgs/libreoffice-i18n-km
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-km
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-kmr-Latn b/srcpkgs/libreoffice-i18n-kmr-Latn
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-kmr-Latn
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-kn b/srcpkgs/libreoffice-i18n-kn
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-kn
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ko b/srcpkgs/libreoffice-i18n-ko
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ko
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-kok b/srcpkgs/libreoffice-i18n-kok
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-kok
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ks b/srcpkgs/libreoffice-i18n-ks
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ks
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-lb b/srcpkgs/libreoffice-i18n-lb
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-lb
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-lo b/srcpkgs/libreoffice-i18n-lo
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-lo
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-lt b/srcpkgs/libreoffice-i18n-lt
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-lt
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-lv b/srcpkgs/libreoffice-i18n-lv
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-lv
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-mai b/srcpkgs/libreoffice-i18n-mai
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-mai
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-mk b/srcpkgs/libreoffice-i18n-mk
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-mk
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ml b/srcpkgs/libreoffice-i18n-ml
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ml
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-mn b/srcpkgs/libreoffice-i18n-mn
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-mn
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-mni b/srcpkgs/libreoffice-i18n-mni
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-mni
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-mr b/srcpkgs/libreoffice-i18n-mr
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-mr
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-my b/srcpkgs/libreoffice-i18n-my
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-my
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-nb b/srcpkgs/libreoffice-i18n-nb
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-nb
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ne b/srcpkgs/libreoffice-i18n-ne
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ne
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-nl b/srcpkgs/libreoffice-i18n-nl
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-nl
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-nn b/srcpkgs/libreoffice-i18n-nn
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-nn
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-nr b/srcpkgs/libreoffice-i18n-nr
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-nr
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-nso b/srcpkgs/libreoffice-i18n-nso
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-nso
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-oc b/srcpkgs/libreoffice-i18n-oc
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-oc
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-om b/srcpkgs/libreoffice-i18n-om
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-om
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-or b/srcpkgs/libreoffice-i18n-or
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-or
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-pa-IN b/srcpkgs/libreoffice-i18n-pa-IN
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-pa-IN
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-pl b/srcpkgs/libreoffice-i18n-pl
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-pl
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-pt b/srcpkgs/libreoffice-i18n-pt
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-pt
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-pt-BR b/srcpkgs/libreoffice-i18n-pt-BR
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-pt-BR
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ro b/srcpkgs/libreoffice-i18n-ro
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ro
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ru b/srcpkgs/libreoffice-i18n-ru
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ru
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-rw b/srcpkgs/libreoffice-i18n-rw
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-rw
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-sa-IN b/srcpkgs/libreoffice-i18n-sa-IN
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-sa-IN
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-sat b/srcpkgs/libreoffice-i18n-sat
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-sat
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-sd b/srcpkgs/libreoffice-i18n-sd
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-sd
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-si b/srcpkgs/libreoffice-i18n-si
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-si
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-sid b/srcpkgs/libreoffice-i18n-sid
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-sid
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-sk b/srcpkgs/libreoffice-i18n-sk
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-sk
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-sl b/srcpkgs/libreoffice-i18n-sl
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-sl
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-sq b/srcpkgs/libreoffice-i18n-sq
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-sq
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-sr b/srcpkgs/libreoffice-i18n-sr
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-sr
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-sr-Latn b/srcpkgs/libreoffice-i18n-sr-Latn
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-sr-Latn
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ss b/srcpkgs/libreoffice-i18n-ss
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ss
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-st b/srcpkgs/libreoffice-i18n-st
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-st
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-sv b/srcpkgs/libreoffice-i18n-sv
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-sv
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-sw-TZ b/srcpkgs/libreoffice-i18n-sw-TZ
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-sw-TZ
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ta b/srcpkgs/libreoffice-i18n-ta
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ta
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-te b/srcpkgs/libreoffice-i18n-te
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-te
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-tg b/srcpkgs/libreoffice-i18n-tg
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-tg
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-th b/srcpkgs/libreoffice-i18n-th
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-th
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-tn b/srcpkgs/libreoffice-i18n-tn
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-tn
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-tr b/srcpkgs/libreoffice-i18n-tr
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-tr
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ts b/srcpkgs/libreoffice-i18n-ts
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ts
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-tt b/srcpkgs/libreoffice-i18n-tt
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-tt
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ug b/srcpkgs/libreoffice-i18n-ug
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ug
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-uk b/srcpkgs/libreoffice-i18n-uk
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-uk
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-uz b/srcpkgs/libreoffice-i18n-uz
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-uz
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-ve b/srcpkgs/libreoffice-i18n-ve
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ve
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-vi b/srcpkgs/libreoffice-i18n-vi
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-vi
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-xh b/srcpkgs/libreoffice-i18n-xh
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-xh
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-zh-CN b/srcpkgs/libreoffice-i18n-zh-CN
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-zh-CN
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-zh-TW b/srcpkgs/libreoffice-i18n-zh-TW
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-zh-TW
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-zu b/srcpkgs/libreoffice-i18n-zu
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-zu
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-impress b/srcpkgs/libreoffice-impress
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-impress
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-kit b/srcpkgs/libreoffice-kit
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-kit
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-math b/srcpkgs/libreoffice-math
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-math
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-postgresql b/srcpkgs/libreoffice-postgresql
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-postgresql
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-writer b/srcpkgs/libreoffice-writer
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-writer
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index c3fa1c03653..6e531f3ec93 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,32 +1,49 @@
+#!/bin/sh
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=6.0.3.2
-revision=3
-build_style=gnu-configure
-configure_args="--disable-werror"
+version=6.0.4.2
+revision=1
+build_style=meta
+make_build_args="build-nocheck"
 nocross=yes
 
 #
 # XXX: mit-krb5-devel nasm firebird3 hamcrest iwyu ogl-math
 # Missing, required libraries are downloaded and built internally
 #
-hostmakedepends="automake libtool pkg-config bison flex gperf icu
- perl-Archive-Zip hyphen openldap sane ucpp unzip zip wget"
-makedepends="apr-devel gst-plugins-base1-devel gtk+-devel gtk+3-devel
- libatomic_ops-devel librsvg-devel nss-devel python3-devel libgcrypt-devel
- gpgmepp-devel poppler-cpp-devel postgresql-libs-devel redland-devel
- liborcus-devel lpsolve-devel unixodbc-devel libXt-devel neon-devel
- avahi-libs-devel hunspell-devel hyphen-devel libabw-devel libcdr-devel
- CoinMP-devel libbluetooth-devel libcmis-devel libe-book-devel libfreehand-devel
- libexttextcat-devel libgltf-devel libldap-devel libmspub-devel libmwaw-devel
- glew-devel glyphy-devel gst-plugins-base1-devel libodfgen-devel
- libpagemaker-devel libvisio-devel libetonyek-devel libwpg-devel telepathy-glib-devel
- libepubgen-devel libqxp-devel libwps-devel glm mdds0 mythes-devel
- sane-devel vigra-devel vlc-devel"
-depends="hyphen openldap sane"
-short_desc="Productivity suite, formerly OpenOffice.org"
+hostmakedepends="automake flex git gperf hyphen icu libtool openldap
+ perl-Archive-Zip pkg-config sane ucpp unzip wget zip"
+makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel glyphy-devel
+ gpgmepp-devel gst-plugins-base1-devel gtk+-devel gtk+3-devel hunspell-devel
+ hyphen-devel libXt-devel libabw-devel libatomic_ops-devel libbluetooth-devel
+ libcdr-devel libcmis-devel libe-book-devel libepubgen-devel libetonyek-devel
+ libexttextcat-devel libfreehand-devel libgcrypt-devel libgltf-devel
+ libldap-devel libmariadbclient-devel libmspub-devel libmwaw-devel
+ libodfgen-devel liborcus-devel libpagemaker-devel libqxp-devel librsvg-devel
+ libvisio-devel libwpg-devel libwps-devel lpsolve-devel mdds0 mythes-devel
+ neon-devel nss-devel poppler-cpp-devel postgresql-libs-devel python3-devel
+ redland-devel sane-devel telepathy-glib-devel unixodbc-devel vigra-devel
+ vlc-devel"
+depends+=" libreoffice-common>=${version}_${revision}"
+depends+=" libreoffice-base>=${version}_${revision}"
+depends+=" libreoffice-calc>=${version}_${revision}"
+depends+=" libreoffice-draw>=${version}_${revision}"
+depends+=" libreoffice-gnome>=${version}_${revision}"
+depends+=" libreoffice-impress>=${version}_${revision}"
+depends+=" libreoffice-math>=${version}_${revision}"
+depends+=" libreoffice-postgresql>=${version}_${revision}"
+depends+=" libreoffice-writer>=${version}_${revision}"
+# Add the previously installed default languages as well
+depends+=" libreoffice-i18n-en-US>=${version}_${revision}"
+depends+=" libreoffice-i18n-de>=${version}_${revision}"
+depends+=" libreoffice-i18n-es>=${version}_${revision}"
+depends+=" libreoffice-i18n-fr>=${version}_${revision}"
+depends+=" libreoffice-i18n-it>=${version}_${revision}"
+depends+=" libreoffice-i18n-pl>=${version}_${revision}"
+depends+=" libreoffice-i18n-pt>=${version}_${revision}"
+short_desc="Productivity suite"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="LGPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.libreoffice.org/"
 
 # Additional zip archives
@@ -61,6 +78,7 @@ distfiles="
  ${_addurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
  ${_addurl}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
  ${_addurl}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${_addurl}/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
  ${_addurl}/Firebird-3.0.0.32483-0.tar.bz2
  ${_addurl}/libstaroffice-0.0.5.tar.xz
  ${_addurl}/libzmf-0.0.2.tar.xz
@@ -82,6 +100,7 @@ distfiles="
  ${_addurl}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
  ${_addurl}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
  ${_addurl}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${_addurl}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
  ${_addurl}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
  ${_addurl}/ltm-1.0.zip
  ${_addurl}/xmlsec1-1.2.25.tar.gz
@@ -105,10 +124,10 @@ distfiles="
  ${_addurl}/Scheherazade-2.100.zip
 "
 checksum="
- 12b8a2f57d797ad51b7661e2302babfe73c0d23b52ddac9f4c7eb1b82472859b
- f6628c8108660e8540f7bd9a05abe2cdc7df87a25a608ae06fa211b843c0ad7f
- 06999eac776c4fcf7339732bf988d2b85b7193283d4be622f848706e278e4701
- 8aa651266b701b17e78aaca77db394bec3da07faf62546496484c63dd519a5b3
+ 9081fb132090e9fe1ed8896ba4085e6f7ceef145f3a76889caeaed6c032510f7
+ 8d757b8cb865f249ab3d09325099be51932060fc7ca95919d8ab135d87015150
+ cef0f0d54da925bb9a69725177ba8594683f5f7500f226bdeeaf344ecb5c41fc
+ 865f78003114c9333d8df63ee64197b25f1894c5dd1038f563abb4c91a1c542e
  cf21b8a0a58c0f0af562869846ce2af4c68b13a7178b9b74ee7be7480a87c84c
  c95f6c398e81ee7def378e51e4c7b5bdeba526f28ff281e79ca3795e6d467159
  1834aa0632499134f98ce85057d6d67604b9ed3b7efa7f13e76046f5886a3a2d
@@ -120,6 +139,7 @@ checksum="
  d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
  1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
  233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
+ 48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
  6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
  315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982
  27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
@@ -141,6 +161,7 @@ checksum="
  abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095
  05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
  7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
+ a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
  085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
  083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
  967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2
@@ -178,6 +199,7 @@ skip_extraction="
  17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
  d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
  ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
  Firebird-3.0.0.32483-0.tar.bz2
  libstaroffice-0.0.5.tar.xz
  libzmf-0.0.2.tar.xz
@@ -199,6 +221,7 @@ skip_extraction="
  8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
  f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
  ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
  39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
  ltm-1.0.zip
  xmlsec1-1.2.25.tar.gz
@@ -230,6 +253,10 @@ if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" libmariadbclient-devel"
 fi
 
+if [ -n "$XBPS_CHECK_PKGS" ]; then
+	make_build_args="build"
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	i686)	# Broken unit tests
 		CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
@@ -237,8 +264,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 	*-musl)	# use shipped clucene, because CLucene/analysis/cjk/CJKAnalyzer.h
 		# is missing in the musl clucene-devel files
-		# make no checks because they fail on the builder
-		make_build_args="build-nocheck"
 		;;
 	x86_64)	build_options_default="java"
 		makedepends+=" apache-ant openjdk "
@@ -248,26 +273,170 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+# Move files listed in a <name>_list.txt into $PKGDESTDIR
+_split() {
+	local list file dir destdir
+	destdir="${DESTDIR}/all"
+	for list in ${wrksrc}/file-lists/${1}_list.txt; do
+		# skip non-existing file lists
+		! [ -f ${list} ] && msg_error "There is no ${1}_list.txt file!\n"
+		for file in $(grep -v ^%dir ${list} | sort | uniq); do
+			dir="${file%/*}"
+			! [ -d "${PKGDESTDIR}/${dir}" ] && vmkdir "${dir}"
+			mv ${destdir}/${file} ${PKGDESTDIR}/${dir}/
+		done
+	done
+}
+
+_languages=""
+_add_lang() {
+	local pkglang="${3:-$1}"
+	_languages="$_languages ${pkglang//_/-}"
+	eval "libreoffice-i18n-${1}_package() {
+		short_desc+=\"- ${2} language pack\"
+		noarch=yes
+		pkg_install() {
+			_split lang_${pkglang}
+		}
+	}"
+}
+
+_add_lang af		"Afrikaans"
+_add_lang am		"Amharic"
+_add_lang ar		"Arabic"
+_add_lang as		"Assamese"
+_add_lang ast		"Asturian"
+_add_lang be		"Belarusian"
+_add_lang bg		"Bulgarian"
+_add_lang bn		"Bengali"
+_add_lang bn-IN		"Bengali (India)" bn_IN
+_add_lang bo		"Tibetan"
+_add_lang br		"Breton"
+_add_lang brx		"Bodo"
+_add_lang bs		"Bosnian"
+_add_lang ca		"Catalan"
+_add_lang ca-valencia	"Catalan (Valencian)" ca_valencia
+_add_lang cs		"Czech"
+_add_lang cy		"Welsh (Cymraeg)"
+_add_lang da		"Danish"
+_add_lang de		"German"
+_add_lang dgo		"Dogri proper"
+_add_lang dz		"Dzongkha"
+_add_lang el		"Greek"
+_add_lang en-GB		"English (UK)" en_GB
+_add_lang en-US		"English (US)" en_US
+_add_lang en-ZA		"English (South Africa)" en_ZA
+_add_lang eo		"Esperanto"
+_add_lang es		"Spanish"
+_add_lang et		"Estonian"
+_add_lang eu		"Basque"
+_add_lang fa		"Persian (Farsi)"
+_add_lang fi		"Finnish"
+_add_lang fr		"French"
+_add_lang ga		"Irish"
+_add_lang gd		"Scottish Gaelic"
+_add_lang gl		"Galician"
+_add_lang gu		"Gujarati"
+_add_lang gug		"Guaraní (Paraguay)"
+_add_lang he		"Hebrew"
+_add_lang hi		"Hindi"
+_add_lang hr		"Croatian"
+_add_lang hu		"Hungarian"
+_add_lang id		"Indonesian"
+_add_lang is		"Icelandic"
+_add_lang it		"Italian"
+_add_lang ja		"Japanese"
+_add_lang ka		"Georgian"
+_add_lang kk		"Kazakh"
+_add_lang km		"Khmer"
+_add_lang kmr-Latn	"Kurmanji Kurdish (Latin)" kmr_Latn
+_add_lang kn		"Kannada"
+_add_lang ko		"Korean"
+_add_lang kok		"Konkani"
+_add_lang ks		"Kashmiri"
+_add_lang lb		"Luxembourgish"
+_add_lang lo		"Lao"
+_add_lang lt		"Lithuanian"
+_add_lang lv		"Latvian"
+_add_lang mai		"Maithili"
+_add_lang mk		"Macedonian"
+_add_lang ml		"Malayalam"
+_add_lang mn		"Mongolian"
+_add_lang mni		"Meithei (Manipuri)"
+_add_lang mr		"Marathi"
+_add_lang my		"Burmese"
+_add_lang nb		"Norwegian (Bokmal)"
+_add_lang ne		"Nepali"
+_add_lang nl		"Dutch"
+_add_lang nn		"Nynorsk"
+_add_lang nr		"Ndebele (South)"
+_add_lang nso		"Northern Sotho"
+_add_lang oc		"Occitan"
+_add_lang om		"Oromo"
+_add_lang or		"Oriya"
+_add_lang pa-IN		"Punjabi (India)" pa_IN
+_add_lang pl		"Polish"
+_add_lang pt		"Portuguese"
+_add_lang pt-BR		"Portuguese (Brazil)" pt_BR
+_add_lang ro		"Romanian"
+_add_lang ru		"Russian"
+_add_lang rw		"Kinyarwanda"
+_add_lang sa-IN		"Sanskrit (India)" sa_IN
+_add_lang sat		"Santali"
+_add_lang sd		"Sindhi"
+_add_lang si		"Sinhala"
+_add_lang sid		"Sidamo"
+_add_lang sk		"Slovak"
+_add_lang sl		"Slovenian"
+_add_lang sq		"Albanian"
+_add_lang sr		"Serbian"
+_add_lang sr-Latn	"Serbian (Latin)" sr_Latn
+_add_lang ss		"Swati"
+_add_lang st		"Southern Sotho"
+_add_lang sv		"Swedish"
+_add_lang sw-TZ		"Swahili (Tanzania)" sw_TZ
+_add_lang ta		"Tamil"
+_add_lang te		"Telugu"
+_add_lang tg		"Tajik"
+_add_lang th		"Thai"
+_add_lang tn		"Tswana"
+_add_lang tr		"Turkish"
+_add_lang ts		"Tsonga"
+_add_lang tt		"Tatar"
+_add_lang ug		"Uyghur"
+_add_lang uk		"Ukrainian"
+_add_lang uz		"Uzbek"
+_add_lang ve		"Venda"
+_add_lang vi		"Vietnamese"
+_add_lang xh		"Xhosa"
+_add_lang zh-CN		"Simplified Chinese (Peoples Republic of China)" zh_CN
+_add_lang zh-TW		"Traditional Chinese (Taiwan)" zh_TW
+_add_lang zu		"Zulu"
+
 post_fetch() {
 	local srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version} pkg
 	mkdir -p ${wrksrc}/external/tarballs
 	for pkg in ${skip_extraction}; do
 		if [ "${pkg%.dll}" != "${pkg}" ]; then
-			cp ${srcdistdir}/${pkg} ${wrksrc}/external/tarballs/
+			# The dll needs to be copied instead of symlinked
+			cp -v ${srcdistdir}/${pkg} ${wrksrc}/external/tarballs/
 		else
+			# ... the other files can be symlinked
 			ln -svf ${srcdistdir}/${pkg} ${wrksrc}/external/tarballs/
 		fi
 	done
 }
 
-pre_configure() {
-	sed -e "/gzip -f/d" \
-		-e "s|.1.gz|.1|g" \
-		-i bin/distro-install-desktop-integration
-	sed -e "/distro-install-file-lists/d" -i Makefile.in
+do_configure() {
+	local opts
+
+	sed -i bin/distro-install-desktop-integration \
+		-e "/gzip -f/d" \
+		-e "s|.1.gz|.1|g"
 	chmod +x bin/unpack-sources
+
+	# Add musl patch for firebird
 	mkdir -p external/firebird
-	# Add musl patch
 	cp ${FILESDIR}/musl-os_utils_h.patch external/firebird/
 	sed -i external/firebird/UnpackedTarball_firebird.mk \
 		-e's;\(.*external/firebird\)/libc++.patch\(.*\)$;\1/libc++.patch\2\n\1/musl-os_utils_h.patch\2;'
@@ -277,13 +446,8 @@ pre_configure() {
 		i686*)	# Don't run broken tests
 			sed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk
 			sed -i "/CPPUNIT_TEST(testTdf111798);/d" sd/qa/unit/export-tests-ooxml2.cxx
-			make_build_args="build-nocheck"
 			;;
 	esac
-}
-
-do_configure() {
-	local incdir="${XBPS_CROSS_BASE}/usr/include"
 
 	# Separate autogen.sh and configure because we need
 	# to patch configure for musl support
@@ -292,77 +456,83 @@ do_configure() {
 	# Add linux-musl* as host OS to lines containing linux-gnu*
 	sed -i configure -e 's;linux-gnu\*;linux-gnu*|linux-musl*;g'
 
-	configure_args+=" --with-vendor='VoidLinux'"
-	configure_args+=" --with-help"
-	configure_args+=" --with-alloc=system"
-	configure_args+=" --without-system-dicts"
-	configure_args+=" --disable-odk"
-	configure_args+=" --enable-python=system"
-	configure_args+=" --enable-gtk3"
-	configure_args+=" --enable-vlc"
-	configure_args+=" --disable-dependency-tracking"
-	configure_args+=" --enable-release-build=yes"
-	configure_args+=" --disable-dconf"
+	# standard options
+	opts="--prefix=/usr"
+	opts+=" --sysconfdir=/etc"
+	opts+=" --sbindir=/usr/bin"
+	opts+=" --bindir=/usr/bin"
+	opts+=" --mandir=/usr/share/man"
+	opts+=" --infodir=/usr/share/info"
+	opts+=" --localstatedir=/var"
+	# libreoffice options
+	opts+=" --with-vendor='VoidLinux'"
+	opts+=" --with-help"
+	opts+=" --with-alloc=system"
+	opts+=" --disable-odk"
+	opts+=" --disable-online-update"
+	opts+=" --enable-python=system"
+	opts+=" --enable-gtk3"
+	opts+=" --enable-vlc"
+	opts+=" --disable-dependency-tracking"
+	opts+=" --enable-release-build"
+	opts+=" --enable-split-app-modules"
+	opts+=" --disable-dconf"
 	# New strategy: enable all libs and headers, then disable what's missing
-	configure_args+=" --with-system-libs"
-	configure_args+=" --with-system-headers"
+	opts+=" --with-system-libs"
+	opts+=" --with-system-headers"
 	case "$XBPS_TARGET_MACHINE" in
 	i686*|*-musl)
 		# Can't use system clucence
-		configure_args+=" --without-system-clucene"
+		opts+=" --without-system-clucene"
 		;;
-	x86_64)	configure_args+=" --enable-ext-mariadb-connector"
-		configure_args+=" --enable-ext-ct2n"
-		configure_args+=" --enable-ext-numbertext"
-		configure_args+=" --enable-ext-nlpsolver"
-		configure_args+=" --enable-ext-languagetool"
+	x86_64)	# opts+=" --enable-ext-mariadb-connector"
+		opts+=" --enable-ext-ct2n"
+		opts+=" --enable-ext-numbertext"
+		opts+=" --enable-ext-nlpsolver"
+		# opts+=" --enable-ext-languagetool"
 		;;
 	esac
 
 	if [ "$build_option_java" ]; then
-		configure_args+=" --with-java"
-		configure_args+=" --with-jdk-home=/usr/lib/jvm/openjdk"
-		configure_args+=" --without-junit"
+		opts+=" --with-java"
+		opts+=" --with-jdk-home=/usr/lib/jvm/openjdk"
+		opts+=" --without-junit"
 	else
-		configure_args+=" --without-java"
+		opts+=" --without-java"
 	fi
-	configure_args+=" --with-tls=nss"
+	opts+=" --with-tls=nss"
 	# xmlsec1-nss is missing, thus don't use system-xmlsec
-	configure_args+=" --without-system-xmlsec"
-	configure_args+=" --without-system-libzmf"
-	configure_args+=" --without-system-libstaroffice"
-	configure_args+=" --without-system-mysql-cppconn"
-	# libreoffice want's firebird3
-	configure_args+=" --without-system-firebird"
-	configure_args+=" --without-system-libtommath"
-	configure_args+=" --without-system-jfreereport"
-	configure_args+=" --without-system-apache-commons"
-	configure_args+=" --without-system-beanshell"
-	# configure_args+=" --without-system-glm"
-	configure_args+=" --with-myspell-dicts"
-	configure_args+=" --with-system-icu-for-build=yes"
-	configure_args+=" --with-external-dict-dir=${XBPS_CROSS_BASE}/usr/share/hunspell"
-	configure_args+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"
-	configure_args+=" --with-external-thes-dir=${XBPS_CROSS_BASE}/usr/share/mythes"
-	configure_args+=" --with-parallelism=${XBPS_MAKEJOBS}"
+	opts+=" --without-system-xmlsec"
+	opts+=" --without-system-libzmf"
+	opts+=" --without-system-libstaroffice"
+	opts+=" --without-system-mysql-cppconn"
+	# without firebird-sdbc (as it is not packaged correctly)
+	opts+=" --disable-firebird-sdbc"
+	opts+=" --without-system-libtommath"
+	opts+=" --without-system-jfreereport"
+	opts+=" --without-system-apache-commons"
+	opts+=" --without-system-beanshell"
+	# opts+=" --without-system-glm"
+	opts+=" --with-myspell-dicts"
+	opts+=" --with-system-icu-for-build=yes"
+	opts+=" --with-external-dict-dir=${XBPS_CROSS_BASE}/usr/share/hunspell"
+	opts+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"
+	opts+=" --with-external-thes-dir=${XBPS_CROSS_BASE}/usr/share/mythes"
+	opts+=" --with-parallelism=${XBPS_MAKEJOBS}"
 
-	# In theory we could use --with-lang=ALL but building the package then takes ages.
-	./configure ${configure_args} --with-lang='en-US de es fr it pl pt'
+	./configure ${opts} --with-lang="${_languages}"
 
 	# Disable slowchecks target
 	sed -i Makefile -e "/gb_Top_MODULE_CHECK_TARGETS /s/ slowchecks//"
 }
 
+do_build() {
+	make ${makejobs} ${make_build_args}
+	make ${makejobs} -C libreofficekit
+}
+
 do_install() {
-	local f
-
-	make DESTDIR="${DESTDIR}" PREFIXDIR="/usr" distro-pack-install
-
-	mkdir -p ${INSTDIR}/share/appdata
-	cp -p sysui/desktop/appstream-appdata/*.xml ${INSTDIR}/share/appdata/
-
-	# Remove unwanted libreoffice packaging files from the root directory
-	rm -f ${DESTDIR}/gid_Module*
+	make DESTDIR="${DESTDIR}/all" PREFIXDIR="/usr" distro-pack-install
 
 	# Remove useless directory usr/lib32
 	rm -rf ${DESTDIR}/usr/lib32
@@ -374,4 +544,94 @@ post_install() {
 			sed -i "s/libreoffice5.4/libreoffice/" ${DESTDIR}/usr/lib/libreoffice/share/xdg/*.desktop
 			;;
 	esac
+	# Remove any remains from not packaged files
+	rm -rf ${DESTDIR}/all
+}
+
+libreoffice-common_package() {
+	short_desc+=" - Common files"
+	depends="hunspell hyphen mythes openldap"
+	pkg_install() {
+		_split common
+	}
+}
+
+libreoffice-base_package() {
+	short_desc+=" - Database frontend"
+	depends="libreoffice-common>=${version}_${revision}"
+	noverifyrdeps=yes
+	pkg_install() {
+		_split base
+	}
+}
+
+libreoffice-calc_package() {
+	short_desc+=" - Spreadsheet"
+	depends="libreoffice-common>=${version}_${revision}"
+	noverifyrdeps=yes
+	pkg_install() {
+		_split calc
+	}
+}
+
+libreoffice-draw_package() {
+	short_desc+=" - Drawing application"
+	depends="sane libreoffice-common>=${version}_${revision}"
+	noverifyrdeps=yes
+	pkg_install() {
+		_split draw
+	}
+}
+
+libreoffice-gnome_package() {
+	short_desc+=" - GNOME integration"
+	depends="libreoffice-common>=${version}_${revision}"
+	noverifyrdeps=yes
+	pkg_install() {
+		_split gnome
+	}
+}
+
+libreoffice-impress_package() {
+	short_desc+=" - Presentation application"
+	depends="libreoffice-common>=${version}_${revision}"
+	noverifyrdeps=yes
+	pkg_install() {
+		_split impress
+	}
+}
+
+libreoffice-math_package() {
+	short_desc+=" - Equation editor"
+	depends="libreoffice-common>=${version}_${revision}"
+	noverifyrdeps=yes
+	pkg_install() {
+		_split math
+	}
+}
+
+libreoffice-postgresql_package() {
+	short_desc+=" - Connector for PostgreSQL"
+	depends="libreoffice-base>=${version}_${revision} libreoffice-common>=${version}_${revision}"
+	noverifyrdeps=yes
+	pkg_install() {
+		_split postgresql
+	}
+}
+
+libreoffice-writer_package() {
+	short_desc+=" - Word processor"
+	depends="libreoffice-common>=${version}_${revision}"
+	noverifyrdeps=yes
+	pkg_install() {
+		_split writer
+	}
+}
+
+libreoffice-kit_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmkdir usr/include
+		vcopy ${wrksrc}/include/LibreOfficeKit usr/include
+	}
 }