splits bin32 and bin64 packages into separate PKGBUILD files

2 files changed, 17 insertions, 77 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8ba7b049fd8..d4777ff8bc59 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,22 @@
 pkgbase = epsxe
 	pkgdesc = Enhanced PSX emulator
 	pkgver = 2.0.5
-	pkgrel = 28
+	pkgrel = 29
 	url = http://epsxe.com
 	install = epsxe.install
-	arch = i686
 	arch = x86_64
 	license = unknown
 	makedepends = unzip
+	makedepends = tar
 	depends = bash
 	depends = libcurl-compat
 	depends = gtk3
 	depends = sdl_ttf
 	depends = ncurses
 	depends = openssl-1.0
+	depends = libxt
+	depends = libcanberra
+	conflicts = bin32-epsxe
 	noextract = shaders.zip
 	noextract = ncurses-5.9_20141101-1-x86_64.pkg.tar.xz
 	options = !strip
@@ -31,17 +34,3 @@ pkgbase = epsxe
 	md5sums = d435d3e9481e5786b9e377abe63ce325
 
 pkgname = epsxe
-	arch = x86_64
-	depends = bash
-	depends = libcurl-compat
-	depends = gtk3
-	depends = sdl_ttf
-	depends = ncurses
-	depends = openssl-1.0
-	depends = libxt
-	depends = libcanberra
-	conflicts = bin32-epsxe
-
-pkgname = bin32-epsxe
-	provides = epsxe
-	conflicts = epsxe
diff --git a/PKGBUILD b/PKGBUILD
index 96a72061c15c..b4e78c69bd1f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,36 +4,22 @@
 # Contributor: Raphaël Doursenaud <rdoursenaud@gmail.com>
 #
 
-pkgbase=epsxe
-pkgname=('epsxe' 'bin32-epsxe')
+pkgname=epsxe
 _pkgname=ePSXe
 pkgver=2.0.5
-pkgrel=28
+pkgrel=29
 pkgdesc="Enhanced PSX emulator"
 url="http://epsxe.com"
-arch=('i686' 'x86_64')
-depends=(bash libcurl-compat gtk3 sdl_ttf ncurses openssl-1.0)
-# depends_x86_64=(libxt libcanberra)
-makedepends=(unzip)
+arch=('x86_64')
+depends=(bash libcurl-compat gtk3 sdl_ttf ncurses openssl-1.0 libxt libcanberra)
+makedepends=(unzip tar)
 license=('unknown')
 install=${pkgname}.install
 options=(!strip)
-# replaces=(bin32-epsxe)
-source=(${pkgbase}.desktop ${pkgbase}.png ${pkgbase}.sh http://www.epsxe.com/files/shaders.zip)
-noextract=(shaders.zip)
-md5sums=(aeb34e2ca34f968630ca133ea821c61c eb0c46b8ae1355c589792f6be1835e47 8d47875ba4f51943cdb6e09c2f25e4b5 a863740899adb064b8a28c3fa47d5280)
-
-if [[ $pkgname =~ 32 ]]; then
-  source+=("http://www.epsxe.com/files/${_pkgname}${pkgver//./}linux.zip")
-  source+=("https://archive.org/download/archlinux_pkg_ncurses/ncurses-5.9_20141101-1-i686.pkg.tar.xz")
-  md5sums+=(3e1976822eb260722b31c9f24cb1d6e1 22c4695856a1e8b7968d4b1e86956fa7)
-  noextract+=("ncurses-5.9_20141101-1-i686.pkg.tar.xz")
-else
-  source+=("http://www.epsxe.com/files/${_pkgname}${pkgver//./}linux_x64.zip")
-  source+=("https://archive.org/download/archlinux_pkg_ncurses/ncurses-5.9_20141101-1-x86_64.pkg.tar.xz")
-  md5sums+=(79fefeb4bff26bf1d374befb35b390df d435d3e9481e5786b9e377abe63ce325)
-  noextract+=("ncurses-5.9_20141101-1-x86_64.pkg.tar.xz")
-fi
+source=(${pkgname}.desktop ${pkgname}.png ${pkgname}.sh http://www.epsxe.com/files/shaders.zip "http://www.epsxe.com/files/${_pkgname}${pkgver//./}linux_x64.zip" "https://archive.org/download/archlinux_pkg_ncurses/ncurses-5.9_20141101-1-x86_64.pkg.tar.xz")
+conflicts=(bin32-epsxe)
+noextract=(shaders.zip ncurses-5.9_20141101-1-$CARCH.pkg.tar.xz)
+md5sums=(aeb34e2ca34f968630ca133ea821c61c eb0c46b8ae1355c589792f6be1835e47 8d47875ba4f51943cdb6e09c2f25e4b5 a863740899adb064b8a28c3fa47d5280 79fefeb4bff26bf1d374befb35b390df d435d3e9481e5786b9e377abe63ce325)
 
 prepare()
 {
@@ -45,7 +31,6 @@ prepare()
     mv "${pkgname}_x64" "$pkgname"
   fi
 
-
   tar xf ncurses*.tar.xz usr/lib/libncursesw.so.5.9 2> /dev/null
   mv usr/lib/libncursesw.so.5.9 .
   rm -rf usr
@@ -57,12 +42,8 @@ prepare()
   mv tmp/shaders "$srcdir"
 }
 
-package_epsxe()
+package()
 {
-  depends+=(libxt libcanberra)
-  conflicts=(bin32-epsxe)
-  arch=('x86_64')
-
   cd "$srcdir"
   install -d "$pkgdir"/{usr/share/doc/$pkgname,/opt/$pkgname/shaders}
 
@@ -77,41 +58,11 @@ package_epsxe()
   install -Dm 644 "$srcdir/epsxe.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
   install -Dm 644 "$srcdir/epsxe.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
 
+  ## NCURSES
+
   # ln -sf "$HOME/.${pkgname}/${pkgname}rc "$pkgdir/opt/$pkgname/.${pkgname}rc"
   install -m 644 "$srcdir/libncursesw.so.5.9" "$pkgdir/opt/$pkgname/libncursesw.so.5.9"
   cd "$pkgdir/opt/$pkgname"
   ln -sf libncursesw.so.5.9 libncurses.so.5
   ln -sf libncursesw.so.5.9 libtinfo.so.5
-  #ln -sf /usr/lib/libncursesw.so "$pkgdir/opt/$pkgname/libncurses.so.5"
-  #ln -sf /usr/lib/libncursesw.so "$pkgdir/opt/$pkgname/libtinfo.so.5"
-}
-
-package_bin32-epsxe()
-{
-  conflicts=(epsxe)
-  provides=(epsxe)
-
-  cd "$srcdir"
-  install -d "$pkgdir"/{usr/share/doc/$pkgbase,/opt/$pkgbase/shaders}
-
-  find docs -name 'e???e_*.txt' -execdir install -m 644 -t "$pkgdir/usr/share/doc/$pkgbase" \{\} +
-  find shaders -maxdepth 1 -mindepth 1 -type d | xargs -I: cp -r : "$pkgdir/opt/$pkgbase/shaders"
-  chmod 644 -R "$pkgdir/opt/$pkgbase/shaders"
-  find "$pkgdir/opt/$pkgbase/shaders" -maxdepth 1 -type d | xargs -I: chmod 645 :
-
-  install -Dm 755 "$pkgbase" "$pkgdir/opt/$pkgbase/$pkgbase"
-
-  # cd "$srcdir"
-  install -Dm 755 "${pkgbase}.sh" "${pkgdir}/usr/bin/${pkgbase}"
-  install -Dm 644 "$srcdir/epsxe.png" "$pkgdir/usr/share/pixmaps/$pkgbase.png"
-  install -Dm 644 "$srcdir/epsxe.desktop" "$pkgdir/usr/share/applications/$pkgbase.desktop"
-  # ln -sf "$HOME/.${pkgbase}/${pkgbase}rc "$pkgdir/opt/$pkgbase/.${pkgbase}rc"
- 
-  install -m 644 "$srcdir/libncursesw.so.5.9" "$pkgdir/opt/$pkgbase/libncursesw.so.5.9"
-  cd "$pkgdir/opt/$pkgbase"
-  ln -sf libncursesw.so.5.9 libncurses.so.5
-  ln -sf libncursesw.so.5.9 libtinfo.so.5
-
-  #ln -sf /usr/lib/libncursesw.so "$pkgdir/opt/$pkgbase/libncurses.so.5"
-  #ln -sf /usr/lib/libncursesw.so "$pkgdir/opt/$pkgbase/libtinfo.so.5"
 }