Merge branch 'master' into i486

1 files changed, 4 insertions, 9 deletions

diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 407d9333..5521b6d6 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -15,16 +15,11 @@ eval "$(
     "
 )"
 
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # remove dependency on most things, we want only a simple interpreter
-  # a little bit smarter than a shell for building and code generation
-  makedepends=(${makedepends[@]//tk/})
-  makedepends=(${makedepends[@]//bluez-libs/})
-  makedepends=(${makedepends[@]//llvm/})
+makedepends=(${makedepends[@]//xorg-server-xvfb/})
+makedepends_i686=(xorg-server-xvfb)
 
-  # do not start X servers just for building software!
-  makedepends=(${makedepends[@]//xorg-server-xvfb/})
+# skip xvfb stuff on i486
+if [ "$CARCH" = 'i486' ]; then
   eval "$(
     declare -f build | \
       sed '