17 files changed, 39 insertions, 34 deletions
diff --git a/office/LanguageTool/LanguageTool.info b/office/LanguageTool/LanguageTool.info
index 1bb3381b56f4..97406cf7dc01 100644
--- a/office/LanguageTool/LanguageTool.info
+++ b/office/LanguageTool/LanguageTool.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://www.languagetool.org/download/LanguageTool-3.5.zip"
 MD5SUM="b750011ec97d2fd94e41fc37899844d3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index 143d1db258de..f9c470122393 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -92,7 +92,6 @@ else
   HAVE_SRCS_TARBALL=0
 fi
 
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -110,24 +109,30 @@ jval="$(echo $MAKEFLAGS |grep -o "\-j *[0-9]*" | grep -o "[0-9]*")" || true
 # If PARALLEL environment variable is set, use that to override everything.
 [ "${PARALLEL:-0}" != "0" ] && parallel="--with-parallelism=$PARALLEL"
 
-JAVA=${JAVA:-jdk11}
-if [ "$JAVA" = "jdk11" ]; then
-  . /etc/profile.d/jdk11.sh
-  use_java="--with-jdk-home=$JAVA_HOME"
-elif [ "$JAVA" = "jdk12" ]; then
-  . /etc/profile.d/jdk12.sh
-  use_java="--with-jdk-home=$JAVA_HOME"
-elif [ "$JAVA" = "jdk13" ]; then
-  . /etc/profile.d/jdk13.sh
-  use_java="--with-jdk-home=$JAVA_HOME"
-elif [ "$JAVA" = "jdk14" ]; then
-  . /etc/profile.d/jdk14.sh
-  use_java="--with-jdk-home=$JAVA_HOME"
-elif [ "$JAVA" = "jdk15" ]; then
-  . /etc/profile.d/jdk15.sh
-  use_java="--with-jdk-home=$JAVA_HOME"
-elif [ "$JAVA" = "no" ]; then
+JAVA=${JAVA:-}
+if [ "$JAVA" = "no" ]; then
   use_java="--with-java=no"
+else
+  if [ -z "$JAVA_HOME" ]; then
+    # if JAVA_HOME isn't set, try to set it by sourcing the profile script
+    for i in /etc/profile.d/*jdk*.sh; do
+      if [ -x $i ]; then
+        source $i
+        break
+      fi
+    done
+  fi
+
+  if [ -z "$JAVA_HOME" ]; then
+    cat <<EOF
+!!! Java support requested, but JAVA_HOME is unset and I can't find
+!!! a /etc/profile.d script that sets it. Are you sure you have a JDK
+!!! package installed?
+EOF
+    exit 1
+  fi
+
+  use_java="--with-jdk-home=$JAVA_HOME"
 fi
 
 # General optional use of packages available from SBo. If not found, LibreOffice internal versions are used
diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info
index 23ad7e4e83c1..b29182643d4a 100644
--- a/office/LibreOffice/LibreOffice.info
+++ b/office/LibreOffice/LibreOffice.info
@@ -7,6 +7,6 @@ MD5SUM="8d7d3fb99d3680d58c92f42e20657965 \
         a0e69e73892c22d8f8417483df090c82"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk11 apache-ant perl-Archive-Zip"
+REQUIRES="zulu-openjdk11 apache-ant perl-Archive-Zip"
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"
diff --git a/office/ProjectLibre/ProjectLibre.info b/office/ProjectLibre/ProjectLibre.info
index e29265ce1200..8bbdcc989c21 100644
--- a/office/ProjectLibre/ProjectLibre.info
+++ b/office/ProjectLibre/ProjectLibre.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://downloads.sourceforge.net/projectlibre/projectlibre-1.9.3.tar.
 MD5SUM="00ba2b6f674fbdf781b04830c8d8a973"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/office/bookbinder/bookbinder.info b/office/bookbinder/bookbinder.info
index 89d1e018f7bd..85371fd969f6 100644
--- a/office/bookbinder/bookbinder.info
+++ b/office/bookbinder/bookbinder.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://www.quantumelephant.co.uk/bookbinder/bookbinder-3.0.zip"
 MD5SUM="4205fe88d4931a0e7e898c30a8069679"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Petr Kletecka"
 EMAIL="petr@kle.cz"
diff --git a/office/briss/briss.info b/office/briss/briss.info
index 9fbf17a39d94..4e0af3dd43dd 100644
--- a/office/briss/briss.info
+++ b/office/briss/briss.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://sourceforge.net/projects/briss/files/release%200.9/briss-0.9.ta
 MD5SUM="030380e0ca3ff05f2dff9590a2fa4ab7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Alan Alberghini"
 EMAIL="414N@slacky.it"
diff --git a/office/broffice.org/broffice.org.info b/office/broffice.org/broffice.org.info
index 4c1e74c2497e..73eebbed8efb 100644
--- a/office/broffice.org/broffice.org.info
+++ b/office/broffice.org/broffice.org.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://ponce.cc/slackware/sources/repo/BrOOo_3.2.1_Linux_x86_install-r
 MD5SUM="28f13819217e712432f7cdc30ae9701b"
 DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/BrOOo_3.2.1_Linux_x86-64_install-rpm-wJRE_pt-BR.tar.gz"
 MD5SUM_x86_64="d84e8e8827ad28672a006414e40382cb"
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Oda"
 EMAIL="edu.oda@gmail.com"
diff --git a/office/flowkeeper/flowkeeper.info b/office/flowkeeper/flowkeeper.info
index e11dfdc17d9c..c93a4534dfd4 100644
--- a/office/flowkeeper/flowkeeper.info
+++ b/office/flowkeeper/flowkeeper.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://flowkeeper.sourceforge.net/flowkeeper.jar"
 MD5SUM="f0266dacce69ceaca0c9668d6701a1ab"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="LukenShiro"
 EMAIL="lukenshiro@ngi.it"
diff --git a/office/freemind/freemind.info b/office/freemind/freemind.info
index 077c4b1e81cc..1d0aeded7e5a 100644
--- a/office/freemind/freemind.info
+++ b/office/freemind/freemind.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/freemind/freemind-bin-max-1.0.1.zip"
 MD5SUM="bb217c2566e1476f11f1a68ff88a5669"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Bruno T. Russo (BrunoRusso)"
 EMAIL="contato@brunorusso.eti.br"
diff --git a/office/ganttproject/ganttproject.info b/office/ganttproject/ganttproject.info
index 1bbdb9834b96..2fc28e781c56 100644
--- a/office/ganttproject/ganttproject.info
+++ b/office/ganttproject/ganttproject.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/bardsoftware/ganttproject/releases/download/ganttpr
 MD5SUM="a7b7c90c4e96b8995dd55fb314f103e1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Ekin Akoglu"
 EMAIL="ekinakoglu@gmail.com"
diff --git a/office/jpdfbookmarks/jpdfbookmarks.info b/office/jpdfbookmarks/jpdfbookmarks.info
index e81b779f0425..adae0b1441e9 100644
--- a/office/jpdfbookmarks/jpdfbookmarks.info
+++ b/office/jpdfbookmarks/jpdfbookmarks.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/sourceforge/jpdfbookmarks/jpdfbookmar
 MD5SUM="035c9cb2f828891cf0bea37323968f7a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/office/jstock/jstock.info b/office/jstock/jstock.info
index 70dcacec037f..07f1b78a5de9 100644
--- a/office/jstock/jstock.info
+++ b/office/jstock/jstock.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/yccheok/jstock/releases/download/release_1-0-7-56/j
 MD5SUM="4235f96acf9a1d61d79f6b81b96ae46c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Zhu Qun-Ying"
 EMAIL="zhu.qunying@gmail.com"
diff --git a/office/libreoffice/libreoffice.info b/office/libreoffice/libreoffice.info
index ed31f4a9e58a..6014413aa69a 100644
--- a/office/libreoffice/libreoffice.info
+++ b/office/libreoffice/libreoffice.info
@@ -5,6 +5,6 @@ DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
 DOWNLOAD_x86_64="https://download.documentfoundation.org/libreoffice/stable/7.3.0/rpm/x86_64/LibreOffice_7.3.0_Linux_x86-64_rpm.tar.gz"
 MD5SUM_x86_64="561eb7c226e96bd2140c996154fce3b2"
-REQUIRES="jdk avahi"
+REQUIRES="zulu-openjdk8 avahi"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/office/multivalent-tool-pdf/multivalent-tool-pdf.info b/office/multivalent-tool-pdf/multivalent-tool-pdf.info
index 728f20ef07ee..7b0bede66f23 100644
--- a/office/multivalent-tool-pdf/multivalent-tool-pdf.info
+++ b/office/multivalent-tool-pdf/multivalent-tool-pdf.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/multivale
 MD5SUM="688b085ec0ea36a416ae0e34dae1f7e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/office/pdfstudio/pdfstudio.info b/office/pdfstudio/pdfstudio.info
index c037064411b5..8fdd59f0a223 100644
--- a/office/pdfstudio/pdfstudio.info
+++ b/office/pdfstudio/pdfstudio.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://download.qoppa.com/pdfstudio/v2020/PDFStudio_v2020_4_0_linux.d
 MD5SUM="54b767608e88afdeeeb7292c278624c2"
 DOWNLOAD_x86_64="https://download.qoppa.com/pdfstudio/v2020/PDFStudio_v2020_4_0_linux64.deb"
 MD5SUM_x86_64="d4b8f062f90d191a7fca0b003101e772"
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/office/pdfstudioviewer/pdfstudioviewer.info b/office/pdfstudioviewer/pdfstudioviewer.info
index 2099167caef6..1045e7879730 100644
--- a/office/pdfstudioviewer/pdfstudioviewer.info
+++ b/office/pdfstudioviewer/pdfstudioviewer.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://download.qoppa.com/pdfstudioviewer/v2020/PDFStudioViewer_v2020
 MD5SUM="b00266ac215c57010652919cf5ecd997"
 DOWNLOAD_x86_64="https://download.qoppa.com/pdfstudioviewer/v2020/PDFStudioViewer_v2020_4_0_linux64.deb"
 MD5SUM_x86_64="915bf1db64f138d75c5bb314b44c6c07"
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/office/xmind/xmind.info b/office/xmind/xmind.info
index 26ae2bf053b3..7d24b890a95b 100644
--- a/office/xmind/xmind.info
+++ b/office/xmind/xmind.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://ponce.cc/slackware/sources/repo/xmind-8-update5-linux.zip"
 MD5SUM="1884b0bb8f520a480fc6af44da087277"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Panagiotis Nikolaou"
 EMAIL="hostmaster@slackonly.com"