Merge branch 'master' into i486

1 files changed, 15 insertions, 11 deletions

diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 45a93ff5..72ebfd3a 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,7 +1,7 @@
 eval "$(
   declare -f package_doxygen | \
     sed '
-      2 a arch=('"${arch[@]}"')
+      2 a arch=('"${arch[*]}"')
     '
   declare -f package_doxygen-doc | \
     sed '
@@ -9,20 +9,24 @@ eval "$(
     '
 )"
 
-if [ "${CARCH}" = "i486" ]; then
-  # no qt5
-  makedepends=(${makedepends[@]//qt5-base/})
+# no qt5 on i486
+makedepends=(${makedepends[@]//qt5-base/})
+makedepends_i686+=(qt5-base)
 
-  # no TeX
-  makedepends=(${makedepends[@]//texlive-core/})
-  makedepends=(${makedepends[@]//texlive-latexextra/})
+# no TeX on i486
+makedepends=(${makedepends[@]//texlive-core/})
+makedepends=(${makedepends[@]//texlive-latexextra/})
+makedepends_i686+=(texlive-core texlive-latexextra)
 
-  # no Graphviz
-  makedepends=(${makedepends[@]//graphviz/})
+# no Graphviz on i486
+makedepends=(${makedepends[@]//graphviz/})
+makedepends_i686+=(graphviz)
 
-  # no ghostscript
-  makedepends=(${makedepends[@]//ghostscript/})
+# no ghostscript on i486
+makedepends=(${makedepends[@]//ghostscript/})
+makedepends_i686+=(ghostscript)
 
+if [ "${CARCH}" = "i486" ]; then
   eval "$(
     declare -f build | \
       sed '