[upd] r27→r28

5 files changed, 47 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a223ac07bdda..14381428cd40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = devkitppc-bin
-	pkgdesc = PowerPC toolchain for Nintendo Gamecube/Wii homebrew development (precompiled)
-	pkgver = r27
+	pkgdesc = PowerPC toolchain for Nintendo Gamecube/Wii/Wii U homebrew development (precompiled)
+	pkgver = r28
 	pkgrel = 1
 	url = http://www.devkitpro.org/
 	install = devkitppc.install
@@ -9,16 +9,22 @@ pkgbase = devkitppc-bin
 	license = GPL
 	depends = gcc-libs
 	depends = sh
-	optdepends = libtinfo: for powerpc-eabi-gdb
+	depends = zlib
+	optdepends = ncurses5-compat-libs: for powerpc-eabi-gdb
+	optdepends = expat: for powerpc-eabi-gdb
 	provides = devkitppc
 	conflicts = devkitppc
 	options = !strip
 	options = libtool
 	options = staticlibs
-	source = http://downloads.sourceforge.net/sourceforge/devkitpro/devkitPPC_r27--linux.tar.bz2
 	source = devkitppc.sh
-	sha256sums = 50454704fc530de91989507e9ec748bbf54345baaab800e4bb58b9b08c3e8853
-	sha256sums = a7bb9f8050601cf1fad4a8bcb04c2bf24b1d29f93c7dc567ddb7e610388a04a0
+	source = devkitppc.fish
+	sha256sums = 3e7ab84e123f76c65a92c27932b4f80df598b9da6b0f44745d8d465120449d1d
+	sha256sums = ab0c74e766fab7ada98541c530593b9f717a72d386f9bb9dad2779a080c66b9d
+	source_i686 = http://downloads.sourceforge.net/sourceforge/devkitpro/devkitPPC_r28-i686-linux.tar.bz2
+	sha256sums_i686 = 49e92701da4c5602d3d17869eb4477eb9588a43d724082f35526f6c11f65a41b
+	source_x86_64 = http://downloads.sourceforge.net/sourceforge/devkitpro/devkitPPC_r28-x86_64-linux.tar.bz2
+	sha256sums_x86_64 = 018840ed42185ae811b8614b4f53e7e95a4e2b1605b67586050a4b2108110056
 
 pkgname = devkitppc-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 15eae3b93f0f..7deb44a444a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,37 @@
-# Maintainer: carstene1ns <url/mail: arch carsten-teibes de>
+# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 # Contributor: Aaron Lindsay <aaron@aaronlindsay.com>
 # Contributor: Tiago Camargo <tcamargo@gmail.com>
 
 pkgname=devkitppc-bin
-pkgver=r27
+pkgver=r28
 pkgrel=1
-pkgdesc='PowerPC toolchain for Nintendo Gamecube/Wii homebrew development (precompiled)'
+pkgdesc='PowerPC toolchain for Nintendo Gamecube/Wii/Wii U homebrew development (precompiled)'
 arch=('i686' 'x86_64')
 url="http://www.devkitpro.org/"
 license=('GPL')
 options=(!strip libtool staticlibs)
 provides=("devkitppc")
 conflicts=("devkitppc")
-depends=('gcc-libs' 'sh')
-optdepends=('libtinfo: for powerpc-eabi-gdb')
-if [ "$CARCH" == "x86_64" ]; then
-  optdepends+=('expat: for powerpc-eabi-gdb'
-              'python2=2.7: for powerpc-eabi-gdb'
-              'xz: for powerpc-eabi-gdb'
-              'zlib: for powerpc-eabi-gdb')
-fi
+depends=('gcc-libs' 'sh' 'zlib')
+optdepends=('ncurses5-compat-libs: for powerpc-eabi-gdb'
+            'expat: for powerpc-eabi-gdb')
 install=devkitppc.install
-source=("http://downloads.sourceforge.net/sourceforge/devkitpro/devkitPPC_$pkgver-$CARCH-linux.tar.bz2"
-        "devkitppc.sh")
-sha256sums=('50454704fc530de91989507e9ec748bbf54345baaab800e4bb58b9b08c3e8853'
-            'a7bb9f8050601cf1fad4a8bcb04c2bf24b1d29f93c7dc567ddb7e610388a04a0')
-[ "$CARCH" == "i686" ] && sha256sums[0]='379e81958dee04d1bbcd446c89d8f089d4072f695eaf3623112efd23b0d0466f'
+source=("devkitppc.sh"
+        "devkitppc.fish")
+source_x86_64=("http://downloads.sourceforge.net/sourceforge/devkitpro/devkitPPC_$pkgver-x86_64-linux.tar.bz2")
+source_i686=("http://downloads.sourceforge.net/sourceforge/devkitpro/devkitPPC_$pkgver-i686-linux.tar.bz2")
+sha256sums=('3e7ab84e123f76c65a92c27932b4f80df598b9da6b0f44745d8d465120449d1d'
+            'ab0c74e766fab7ada98541c530593b9f717a72d386f9bb9dad2779a080c66b9d')
+sha256sums_x86_64=('018840ed42185ae811b8614b4f53e7e95a4e2b1605b67586050a4b2108110056')
+sha256sums_i686=('49e92701da4c5602d3d17869eb4477eb9588a43d724082f35526f6c11f65a41b')
 
 package() {
   install -d "$pkgdir"/opt/devkitpro
   cp -r devkitPPC "$pkgdir"/opt/devkitpro
+  # gzip manually, as makepkg only cares for standard directories
+  gzip "$pkgdir"/opt/devkitpro/devkitPPC/share/man/man*/*
+  gzip "$pkgdir"/opt/devkitpro/devkitPPC/share/info/*
   # export environment variables
   install -Dm755 devkitppc.sh "$pkgdir"/etc/profile.d/devkitppc.sh
+  install -Dm644 devkitppc.fish "$pkgdir"/etc/fish/conf.d/devkitppc.fish
 }
diff --git a/devkitppc.fish b/devkitppc.fish
new file mode 100644
index 000000000000..92fda327b587
--- /dev/null
+++ b/devkitppc.fish
@@ -0,0 +1,6 @@
+# set needed variables
+set -gx DEVKITPRO /opt/devkitpro
+set -gx DEVKITPPC $DEVKITPRO/devkitPPC
+
+# add to path
+set -gx PATH $PATH $DEVKITPPC/bin
diff --git a/devkitppc.install b/devkitppc.install
index 629595a1ac2f..fc16a3a92f94 100644
--- a/devkitppc.install
+++ b/devkitppc.install
@@ -1,8 +1,11 @@
  
 post_install() {
-  echo "To use the toolchain right away, you have to set the environment variables in"
-  echo "your currently running shells by executing 'source /etc/profile.d/devkitppc.sh'!"
-  echo "This is done automatically for every shell opened from now on."
+  echo "To use the toolchain, environment variables have to be set in your shell."
+  echo "Files setting them for POSIX compatible shells (bash, zsh, ...) and fish are"
+  echo "provided and should be used automatically for shells opened from now on."
+  echo "To use the toolchain right away, use"
+  echo "  $ source /etc/profile.d/devkitppc.sh     # (for POSIX compatible)"
+  echo "  $ source /etc/fish/conf.d/devkitppc.fish # (for fish shell)"
 }
 
 post_upgrade() {
diff --git a/devkitppc.sh b/devkitppc.sh
index b63e72f6664b..a4ae1d95e887 100644
--- a/devkitppc.sh
+++ b/devkitppc.sh
@@ -1,10 +1,6 @@
+# set needed variables
+export DEVKITPRO=/opt/devkitpro
+export DEVKITPPC=${DEVKITPRO}/devkitPPC
 
-# allow per-user override
-if [ -z $DEVKITPRO ]; then
-  export DEVKITPRO=/opt/devkitpro
-fi
-export DEVKITPPC=$DEVKITPRO/devkitPPC
-
-# add to paths
-export PATH=$PATH:$DEVKITPPC/bin
-export MANPATH=$MANPATH:$DEVKITPPC/man
+# add to path
+export PATH=${PATH}:${DEVKITPPC}/bin