community/libreoffice: modernize

1 files changed, 89 insertions, 18 deletions

diff --git a/community/libreoffice/APKBUILD b/community/libreoffice/APKBUILD
index 94ec50cca3..c7f60ff13c 100644
--- a/community/libreoffice/APKBUILD
+++ b/community/libreoffice/APKBUILD
@@ -8,20 +8,90 @@ pkgdesc="LibreOffice - Meta package for the full office suite"
 url="https://www.libreoffice.org/"
 arch="all !s390x"
 license="MPL-2.0"
-depends_dev="cups-dev libjpeg-turbo-dev boost-dev clucene-dev libe-book-dev icu-dev icu
-	libetonyek-dev libwpd-dev libwpg-dev libmspub-dev libmwaw-dev libpagemaker-dev
-	libvisio-dev libcmis-dev lcms2-dev cppunit-dev freetype-dev libabw-dev libwps-dev
-	libxslt-dev postgresql-dev mariadb-dev mdds-dev glm-dev glu-dev glew-dev vigra-dev
-	unixodbc-dev openldap-dev openssl-dev nss-dev npapi-sdk hunspell-dev
-	libxrender-dev libxrandr-dev neon-dev apr-dev redland-dev libexttextcat-dev
-	bluez-dev gstreamer-dev gst-plugins-base-dev gtk+3.0-dev gtk+2.0-dev
-	poppler-dev cairo-dev hyphen-dev mythes-dev python3-dev harfbuzz-dev
-	libfreehand-dev libodfgen-dev libcdr-dev libzmf-dev libstaroffice-dev
-	liborcus-dev openjdk8 apache-ant junit xmlsec-dev gpgme-dev libepubgen-dev
-	libqxp-dev libnumbertext-dev"
-makedepends="$depends_dev autoconf automake tar coreutils findutils ucpp gperf
-	bison flex zip perl perl-archive-zip sed libxml2-utils doxygen paxmark
-	py-setuptools"
+makedepends="
+	apache-ant
+	apr-dev
+	autoconf
+	automake
+	bison
+	bluez-dev
+	boost-dev
+	cairo-dev
+	clucene-dev
+	coreutils
+	cppunit-dev
+	cups-dev
+	doxygen
+	findutils
+	flex
+	freetype-dev
+	glew-dev
+	glm-dev
+	glu-dev
+	gperf
+	gpgme-dev
+	gst-plugins-base-dev
+	gstreamer-dev
+	gtk+2.0-dev
+	gtk+3.0-dev
+	harfbuzz-dev
+	hunspell-dev
+	hyphen-dev
+	icu
+	icu-dev
+	junit
+	lcms2-dev
+	libabw-dev
+	libcdr-dev
+	libcmis-dev
+	libe-book-dev
+	libepubgen-dev
+	libetonyek-dev
+	libexttextcat-dev
+	libfreehand-dev
+	libjpeg-turbo-dev
+	libmspub-dev
+	libmwaw-dev
+	libnumbertext-dev
+	libodfgen-dev
+	liborcus-dev
+	libpagemaker-dev
+	libqxp-dev
+	libstaroffice-dev
+	libvisio-dev
+	libwpd-dev
+	libwpg-dev
+	libwps-dev
+	libxml2-utils
+	libxrandr-dev
+	libxrender-dev
+	libxslt-dev
+	libzmf-dev
+	mariadb-dev
+	mdds-dev
+	mythes-dev
+	neon-dev
+	npapi-sdk
+	nss-dev
+	openjdk8
+	openldap-dev
+	openssl-dev
+	paxmark
+	perl
+	perl-archive-zip
+	poppler-dev
+	postgresql-dev
+	py-setuptools
+	python3-dev
+	redland-dev
+	sed
+	tar
+	ucpp
+	unixodbc-dev
+	vigra-dev
+	xmlsec-dev
+	zip
+	"
 # GNU sed is needed for in i18npool/CustomTarget_localedata.mk
 subpackages="$pkgname-base $pkgname-calc $pkgname-common $pkgname-draw
 	$pkgname-gnome $pkgname-impress $pkgname-math $pkgname-connector-postgres $pkgname-writer
@@ -35,9 +105,9 @@ case $pkgver in
 esac
 
 # grep LIBXMLSEC_TARBALL download.lst
-source="https://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice-$pkgver.tar.xz
-	https://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice-dictionaries-$pkgver.tar.xz
-	https://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice-translations-$pkgver.tar.xz
+source="https://download.documentfoundation.org/libreoffice/src/$_v/libreoffice-$pkgver.tar.xz
+	https://download.documentfoundation.org/libreoffice/src/$_v/libreoffice-dictionaries-$pkgver.tar.xz
+	https://download.documentfoundation.org/libreoffice/src/$_v/libreoffice-translations-$pkgver.tar.xz
 	$_addsrcurl/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	$_addsrcurl/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
 	$_addsrcurl/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -81,10 +151,11 @@ source="https://download.documentfoundation.org/libreoffice/src/${_v}/libreoffic
 
 add_lang() {
 	local pkglang="${3:-$1}"
-	subpackages="$subpackages $pkgname-lang-${1}:_lang_${1}"
+	subpackages="$subpackages $pkgname-lang-$1:_lang_$1"
 	languages="$languages ${pkglang/_/-}"
 	eval "_lang_$1() { pkgdesc=\"LibreOffice - $2 language pack\"; depends=\"\"; _split lang_${pkglang}; }"
 }
+
 add_lang af "Afrikaans"
 add_lang am "Amharic"
 add_lang ar "Arabic"