attempt to split epsxe into two packages

2 files changed, 56 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b54e15d2746d..84fb1df362b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,7 +14,6 @@ pkgbase = epsxe
 	depends = sdl_ttf
 	depends = ncurses
 	depends = openssl-1.0
-	replaces = bin32-epsxe
 	noextract = shaders.zip
 	options = !strip
 	source = epsxe.desktop
@@ -27,8 +26,19 @@ pkgbase = epsxe
 	md5sums = 8d47875ba4f51943cdb6e09c2f25e4b5
 	md5sums = a863740899adb064b8a28c3fa47d5280
 	md5sums = 79fefeb4bff26bf1d374befb35b390df
-	depends_x86_64 = libxt
-	depends_x86_64 = libcanberra
 
 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
+	conflicts = epsxe
 
diff --git a/PKGBUILD b/PKGBUILD
index 93601586dce0..5a1051ade6bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,8 @@
 # Contributor: Raphaël Doursenaud <rdoursenaud@gmail.com>
 #
 
-pkgname=epsxe
+pkgbase=epsxe
+pkgname=('epsxe' 'bin32-epsxe')
 _pkgname=ePSXe
 pkgver=2.0.5
 pkgrel=26
@@ -12,32 +13,32 @@ 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)
+# depends_x86_64=(libxt libcanberra)
 makedepends=(unzip)
 license=('unknown')
 install=${pkgname}.install
 options=(!strip)
-replaces=(bin32-epsxe)
-source=(${pkgname}.desktop ${pkgname}.png ${pkgname}.sh http://www.epsxe.com/files/shaders.zip)
+# 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 [[ $CARCH == 'x86_64' ]]; then
-  source+=("http://www.epsxe.com/files/${_pkgname}${pkgver//./}linux_x64.zip")
-  md5sums+=(79fefeb4bff26bf1d374befb35b390df)
-else
+if [[ $pkgname =~ 32 ]]; then
   source+=("http://www.epsxe.com/files/${_pkgname}${pkgver//./}linux.zip")
   md5sums+=(3e1976822eb260722b31c9f24cb1d6e1)
+else
+  source+=("http://www.epsxe.com/files/${_pkgname}${pkgver//./}linux_x64.zip")
+  md5sums+=(79fefeb4bff26bf1d374befb35b390df)
 fi
 
 prepare()
 {
   cd "$srcdir"
 
-  if [[ $CARCH == 'x86_64' ]]; then
-    mv "${pkgname}_x64" "$pkgname"
-  else
+  if [[ $pkgname =~ 32 ]]; then
     mv e???e "$pkgname"
+  else
+    mv "${pkgname}_x64" "$pkgname"
   fi
 
   ## process shaders ##
@@ -47,17 +48,22 @@ prepare()
   mv tmp/shaders "$srcdir"
 }
 
-package()
+package_epsxe()
 {
+  depends+=(libxt libcanberra)
+  conflicts=(bin32-epsxe)
+  arch=('x86_64')
+
   cd "$srcdir"
   install -d "$pkgdir"/{usr/share/doc/$pkgname,/opt/$pkgname/shaders}
 
   find docs -name 'e???e_*.txt' -execdir install -m 644 -t "$pkgdir/usr/share/doc/$pkgname" \{\} +
   find shaders -maxdepth 1 -mindepth 1 -type d | xargs -I: cp -r : "$pkgdir/opt/$pkgname/shaders"
+  chmod 644 -R "$pkgdir/opt/$pkgname/shaders"
+  find "$pkgdir/opt/$pkgname/shaders" -maxdepth 1 -type d | xargs -I: chmod 645 :
 
   install -Dm 755 "$pkgname" "$pkgdir/opt/$pkgname/$pkgname"
 
-  # cd "$srcdir"
   install -Dm 755 "${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
   install -Dm 644 "$srcdir/epsxe.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
   install -Dm 644 "$srcdir/epsxe.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
@@ -66,3 +72,27 @@ package()
   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)
+
+  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"
+  ln -sf /usr/lib/libncursesw.so "$pkgdir/opt/$pkgbase/libncurses.so.5"
+  ln -sf /usr/lib/libncursesw.so "$pkgdir/opt/$pkgbase/libtinfo.so.5"
+}