From bcb5133554da96e552b4d74fe48d336a80efebed Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 9 Nov 2018 13:53:18 +0100
Subject: "if [ $CARCH = ... ]; then depends=..; fi" => "depends_...=..."

---
 extra/subversion/PKGBUILD | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to 'extra/subversion/PKGBUILD')

diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 941792d7..da86150e 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,17 +1,25 @@
+# no Java bindings on i486
+makedepends=(${makedepends[@]//java-environment<10/})
+makedepends_i686+=(java-environment<10)
+
+# no Ruby bindings on i486
+makedepends=(${makedepends[@]//ruby/})
+checkdepends=(${checkdepends[@]//ruby-test-unit/})
+makedepends_i686+=(ruby)
+checkdepends_i686+=(ruby-test-unit)
+
+# no KDE gui on i486
+makedepends=(${makedepends[@]//kdelibs4support/})
+makedepends=(${makedepends[@]//kwallet/})
+makedepends_i686+=(kdelibs4support kwallet)
+
+# no Gnome gui on i486
+makedepends=(${makedepends[@]//libgnome-keyring/})
+makedepends_i686+=(libgnome-keyring)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
-  # no Apache server integration
-  makedepends=(${makedepends[@]//apache/})
-  eval "$(
-    declare -f build | \
-      sed '
-        s@--with-apxs@@
-        s@--with-apache-libexecdir=/usr/lib/httpd/modules@@
-      '
-  )"
-
   # no Java bindings
-  makedepends=(${makedepends[@]//java-environment<10/})
   eval "$(
     declare -f build | \
       sed '
@@ -28,8 +36,6 @@ if [ "${CARCH}" = "i486" ]; then
   )"
 
   # no Ruby bindings
-  makedepends=(${makedepends[@]//ruby/})
-  checkdepends=(${checkdepends[@]//ruby-test-unit/})
   eval "$(
     declare -f build | \
       sed '
@@ -51,8 +57,6 @@ if [ "${CARCH}" = "i486" ]; then
   )"
 
   # no KDE gui
-  makedepends=(${makedepends[@]//kdelibs4support/})
-  makedepends=(${makedepends[@]//kwallet/})
   eval "$(
     declare -f build | \
       sed '
@@ -61,7 +65,6 @@ if [ "${CARCH}" = "i486" ]; then
   )"
 
   # no Gnome gui
-  makedepends=(${makedepends[@]//libgnome-keyring/})
   eval "$(
     declare -f build | \
       sed '
-- 
cgit v1.2.3-54-g00ecf


From b1ee02b9f16cd9b7c3f254193c005a14acb02cf0 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 9 Nov 2018 15:28:35 +0100
Subject: extra/subversion: quote "<"

---
 extra/subversion/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'extra/subversion/PKGBUILD')

diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index da86150e..56a0d262 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,6 +1,6 @@
 # no Java bindings on i486
 makedepends=(${makedepends[@]//java-environment<10/})
-makedepends_i686+=(java-environment<10)
+makedepends_i686+=('java-environment<10')
 
 # no Ruby bindings on i486
 makedepends=(${makedepends[@]//ruby/})
-- 
cgit v1.2.3-54-g00ecf