don't use architecture-dependent arrays + rm deprecated 'pacman>=4.2.0' requirement

2 files changed, 25 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07efad8245f3..6e671c304c42 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,6 +6,23 @@ pkgbase = bin32-jdk
 	install = bin32-jdk.install
 	arch = x86_64
 	license = custom
+	depends = ca-certificates-java
+	depends = desktop-file-utils
+	depends = hicolor-icon-theme
+	depends = java32-environment-common
+	depends = java32-runtime-common
+	depends = lib32-glibc
+	depends = lib32-libjpeg-turbo
+	depends = lib32-lcms2
+	depends = lib32-libxrender
+	depends = lib32-libxtst
+	depends = lib32-nss
+	depends = shared-mime-info
+	depends = xdg-utils
+	optdepends = eclipse: "Oracle Java Mission Control" plugins for Eclipse
+	optdepends = lib32-alsa-lib: for basic sound support
+	optdepends = lib32-gtk2: for Gtk+ look and feel (desktop)
+	optdepends = ttf-font: fonts
 	provides = java32-runtime=8
 	provides = java32-runtime-headless=8
 	provides = java32-web-start=8
@@ -43,24 +60,6 @@ pkgbase = bin32-jdk
 	md5sums = 9dfed511010a54eb377b692638d17585
 	md5sums = 915f23fd70bb5a6bbfbd7160a35ab035
 	md5sums = 65d3a4147634b7cf0923caafed7edda4
-	depends_x86_64 = ca-certificates-java
-	depends_x86_64 = desktop-file-utils
-	depends_x86_64 = hicolor-icon-theme
-	depends_x86_64 = java32-environment-common
-	depends_x86_64 = java32-runtime-common
-	depends_x86_64 = lib32-glibc
-	depends_x86_64 = lib32-libjpeg-turbo
-	depends_x86_64 = lib32-lcms2
-	depends_x86_64 = lib32-libxrender
-	depends_x86_64 = lib32-libxtst
-	depends_x86_64 = lib32-nss
-	depends_x86_64 = shared-mime-info
-	depends_x86_64 = xdg-utils
-	optdepends_x86_64 = eclipse: "Oracle Java Mission Control" plugins for Eclipse
-	optdepends_x86_64 = lib32-alsa-lib: for basic sound support
-	optdepends_x86_64 = lib32-gtk2: for Gtk+ look and feel (desktop)
-	optdepends_x86_64 = ttf-font: fonts
-	makedepends_x86_64 = pacman>=4.2.0
 
 pkgname = bin32-jdk
 
diff --git a/PKGBUILD b/PKGBUILD
index fb7161bb4c3a..53a27fe1df6b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,16 +10,15 @@ pkgver=${_major}u${_minor}
 pkgrel=1
 pkgdesc="Oracle Java Development Kit (32-bit)"
 arch=('x86_64')
-url=http://www.oracle.com/technetwork/java/javase/downloads/index.html
+url='http://www.oracle.com/technetwork/java/javase/downloads/index.html'
 license=('custom')
-depends_x86_64=('ca-certificates-java' 'desktop-file-utils' 'hicolor-icon-theme' 'java32-environment-common' 
-                'java32-runtime-common' 'lib32-glibc' 'lib32-libjpeg-turbo' 'lib32-lcms2' 'lib32-libxrender'
-                'lib32-libxtst' 'lib32-nss' 'shared-mime-info' 'xdg-utils')
-optdepends_x86_64=('eclipse: "Oracle Java Mission Control" plugins for Eclipse'
-                   'lib32-alsa-lib: for basic sound support'
-                   'lib32-gtk2: for Gtk+ look and feel (desktop)'
-                   'ttf-font: fonts')
-makedepends_x86_64=('pacman>=4.2.0')
+depends=('ca-certificates-java' 'desktop-file-utils' 'hicolor-icon-theme' 'java32-environment-common' 
+         'java32-runtime-common' 'lib32-glibc' 'lib32-libjpeg-turbo' 'lib32-lcms2' 'lib32-libxrender'
+         'lib32-libxtst' 'lib32-nss' 'shared-mime-info' 'xdg-utils')
+optdepends=('eclipse: "Oracle Java Mission Control" plugins for Eclipse'
+            'lib32-alsa-lib: for basic sound support'
+            'lib32-gtk2: for Gtk+ look and feel (desktop)'
+            'ttf-font: fonts')
 provides=("java32-runtime=$_major" "java32-runtime-headless=$_major" "java32-web-start=$_major" "java32-environment=$_major"
           "java32-runtime-jre=$_major" "java32-runtime-headless-jre=$_major" "java32-web-start-jre=$_major" "java32-environment-jdk=$_major"
           "java32-openjfx=$_major")