"if [ $CARCH = ... ]; then depends=..; fi" => "depends_...=..."

10 files changed, 33 insertions, 32 deletions

diff --git a/core/automake/PKGBUILD b/core/automake/PKGBUILD
index af9256a9..e1221ed5 100644
--- a/core/automake/PKGBUILD
+++ b/core/automake/PKGBUILD
@@ -1,5 +1,4 @@
 # 486-specific: we have no Vala or Java at the moment
-if [ "${CARCH}" = "i486" ]; then
-  checkdepends=(${checkdepends[@]//vala/})
-  checkdepends=(${checkdepends[@]//java-environment/})
-fi
+checkdepends=(${checkdepends[@]//vala/})
+checkdepends=(${checkdepends[@]//java-environment/})
+checkdepends_i686+=(vala java-environment)
diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD
index 41a96d38..835abb54 100644
--- a/core/dbus/PKGBUILD
+++ b/core/dbus/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # no graphviz generated graphs in documentation
-  makedepends=(${makedepends[@]//graphviz/})
-fi
+# no graphviz generated graphs in documentation on i486
+makedepends=(${makedepends[@]//graphviz/})
+makedepends_i686+=(graphviz)
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 7e0ce35f..02dbf6e4 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -27,7 +27,7 @@ eval "$(
 
 # no gd for memory profiles
 makedepends=(${makedepends[@]//gd/})
-makedepends_i686=('gd')
+makedepends_i686+=('gd')
 
 if [ "${CARCH}" = "i486" ]; then
 
diff --git a/core/groff/PKGBUILD b/core/groff/PKGBUILD
index 6bda4b0c..f06aaa84 100644
--- a/core/groff/PKGBUILD
+++ b/core/groff/PKGBUILD
@@ -1,2 +1,2 @@
 makedepends=(${makedepends[@]//psutils/})
-makedepends_i686=(psutils)
+makedepends_i686+=(psutils)
diff --git a/core/libidn2/PKGBUILD b/core/libidn2/PKGBUILD
index 4bd3a316..23ba1170 100644
--- a/core/libidn2/PKGBUILD
+++ b/core/libidn2/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # remove dependency on ruby-ronn 
-  makedepends=(${makedepends[@]//ruby-ronn/})
-fi
+# remove dependency on ruby-ronn on i486
+makedepends=(${makedepends[@]//ruby-ronn/})
+makedepends_i686+=(ruby-ronn)
diff --git a/core/libsecret/PKGBUILD b/core/libsecret/PKGBUILD
index d2a68fe8..9aab2048 100644
--- a/core/libsecret/PKGBUILD
+++ b/core/libsecret/PKGBUILD
@@ -1,8 +1,9 @@
+# no Vala on i486
+makedepends=(${makedepends[@]//vala/})
+makedepends_i686+=(vala)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
-  # no Vala
-  makedepends=(${makedepends[@]//vala/})
-
   # no Gnome (gjs), no dbus-glib
   unset check
 fi
diff --git a/core/links/PKGBUILD b/core/links/PKGBUILD
index bbe7457e..b30ed33e 100644
--- a/core/links/PKGBUILD
+++ b/core/links/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # no librsvg, has a cycle with half of gtk
-  makedepends=(${makedepends[@]//librsvg/})  
-fi
+# no librsvg on i486, requires rust - yuck
+makedepends=(${makedepends[@]//librsvg/})
+makedepends_i686+=(librsvg)
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index 5f021765..8ca51dd2 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -11,7 +11,7 @@ for ((i=0; i<${#sha256sums[@]}; i++)); do
 done
 
 makedepends=(${makedepends[@]/graphviz/})
-makedepends_i686=(graphviz)
+makedepends_i686+=(graphviz)
 
 eval "$(
   declare -f prepare | \
diff --git a/core/pinentry/PKGBUILD b/core/pinentry/PKGBUILD
index 9c1f0644..a36a140d 100644
--- a/core/pinentry/PKGBUILD
+++ b/core/pinentry/PKGBUILD
@@ -1,8 +1,15 @@
+# no GUI stuff on i486
+makedepends=(${makedepends[@]//gtk2/})
+makedepends=(${makedepends[@]//qt5-base/})
+makedepends_i686+=(gtk2 qt5-base)
+
+# no gcr on i486
+makedepends=(${makedepends[@]//gcr/})
+makedepends_i686+=(gcr)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
   # no GUI stuff
-  makedepends=(${makedepends[@]//gtk2/})
-  makedepends=(${makedepends[@]//qt5-base/})
   eval "$(
     declare -f build | \
       sed '
@@ -11,7 +18,4 @@ if [ "${CARCH}" = "i486" ]; then
         s/--enable-pinentry-qt/--disable-pinentry-qt/
       '
   )"
-
-  # no gcr
-  makedepends=(${makedepends[@]//gcr/})
 fi
diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD
index ef3f908c..b625f595 100644
--- a/core/shadow/PKGBUILD
+++ b/core/shadow/PKGBUILD
@@ -1,9 +1,12 @@
+# remove dependency on Gnome's xml2po on i486 (needed for building the
+# man pages, draws in far too many dependencies)
+makedepends=(${makedepends[@]//gnome-doc-utils/})
+makedepends_i686+=(gnome-doc-utils)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
   # remove dependency on Gnome's xml2po (needed for building the man pages,
   # draws in far too many dependencies)
-  makedepends=(${makedepends[@]//gnome-doc-utils/})
-  
   eval "$(
     declare -f prepare | \
       sed '