Merge branch 'master' into i486

3 files changed, 17 insertions, 24 deletions

diff --git a/core/bzip2/PKGBUILD b/core/bzip2/PKGBUILD
deleted file mode 100644
index abe949ba..00000000
--- a/core/bzip2/PKGBUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-# reported as FS#59289 
-source[0]="bzip2_1.0.6.tar.bz2::http://http.debian.net/debian/pool/main/b/bzip2/bzip2_1.0.6.orig.tar.bz2"
-sha1sums[0]="3725a0554fa6bb654ef2728fef36bc06aed4e388"
-sha1sums[2]="3318e71b4a6d9d350a61f47de495301a937fad8a"
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 73360a5e..fecb7d16 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -14,6 +14,7 @@ eval "$(
   declare -f build | \
     sed '
       s/--enable-multilib/--disable-multilib/
+      s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/,
     '
   declare -f package_gcc-libs | \
     sed '
@@ -47,19 +48,13 @@ eval "$(
   done
 )"
 
-# fix bug url
-eval "$(
-  declare -f build | \
-    sed '
-      s,--with-bugurl=https://bugs.archlinux.org/,--with-bugurl=https://bugs.archlinux32.org/,
-      '
-)"
-
 # i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # disable doxygen documentation
-  makedepends=(${makedepends[@]//doxygen/})  
 
+# disable doxygen documentation
+makedepends=(${makedepends[@]//doxygen/})
+makedepends_i686+=('doxygen')
+
+if [ "${CARCH}" = "i486" ]; then
   eval "$(
     declare -f build | \
       sed '
@@ -74,11 +69,16 @@ if [ "${CARCH}" = "i486" ]; then
         /make.*doc-install-man/d
       '
   )"
+fi
 
-  # no ADA
-  makedepends=(${makedepends[@]//gcc-ada/})  
+# no ADA
+makedepends=(${makedepends[@]//gcc-ada/})
+makedepends_i686+=('gcc-ada')
 
-  pkgname=(${pkgname[@]//gcc-ada/})
+if [ "${CARCH}" = "i486" ]; then
+  package_gcc-ada() {
+    touch "$pkgdir/this-is-a-dummy-package"
+  }
 
   eval "$(
     declare -f build | \
@@ -114,8 +114,5 @@ if [ "${CARCH}" = "i486" ]; then
         s/--enable-cet=auto/--disable-cet/
       '
   )"
-  
-fi
-
-
 
+fi
diff --git a/extra/flashplugin/PKGBUILD b/extra/flashplugin/PKGBUILD
index da0b6cc6..2eb35f20 100644
--- a/extra/flashplugin/PKGBUILD
+++ b/extra/flashplugin/PKGBUILD
@@ -1,4 +1,4 @@
 # bring back the i686 specific stuff
 source=("${source[@]//x86_64/i386}")
-sha256sums=('5d986d67db7a46ac92fbcd62d28ad6744b45039b78b6cdf62397b1544c3c8d66'
-            '6ee89ba267eb8fea9e84c3739228cbab1ac7e41055015f58f23da108b01ef397')
+sha256sums=('aa919124f1a3c7fe5cd290f95e540c526d911bc65c7efcdcfc3ffda131e7387a'
+            'ff51c3a0b7abdd5be3fc7bef36fd8f8edf8b983b8985ee743b1d99721fd7920a')