Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/happy/PKGBUILD
	community-staging/haskell-quickcheck/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	core/mlocate/PKGBUILD
	core/procps-ng/PKGBUILD
	core/sysvinit/PKGBUILD
	elementary/gtk-engine-equinox/PKGBUILD
	extra/audacious/PKGBUILD
	extra/libsigc++/PKGBUILD
	extra/postgresql-old-upgrade/PKGBUILD
	extra/qt/PKGBUILD
	extra/tftp-hpa/PKGBUILD
	extra/transmission/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/atk/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/gjs/PKGBUILD
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-online-accounts/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/gvfs/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/nautilus/PKGBUILD
	gnome-unstable/vala/PKGBUILD
	gnome-unstable/webkitgtk3/PKGBUILD
	libre/libretools/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-util-linux/PKGBUILD
	testing/mlocate/PKGBUILD
	testing/openmpi/PKGBUILD
	testing/run-parts/PKGBUILD
	testing/systemd/PKGBUILD
	testing/transmission/PKGBUILD
	testing/transmission/transmission-cli.install
	testing/transmission/transmission.systemd

2 files changed, 17 insertions, 40 deletions

diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD
index 36702c2bc..44ced294f 100644
--- a/core/coreutils/PKGBUILD
+++ b/core/coreutils/PKGBUILD
@@ -1,43 +1,25 @@
-# $Id: PKGBUILD 163714 2012-07-18 02:16:52Z dreisner $
+# $Id: PKGBUILD 166962 2012-09-23 12:22:15Z tomegun $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=coreutils
-pkgver=8.17
-pkgrel=3
+pkgver=8.19
+pkgrel=1
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://www.gnu.org/software/coreutils"
 groups=('base')
 depends=('glibc' 'pam' 'acl' 'gmp' 'libcap')
-replaces=('mktemp')
-backup=('etc/pam.d/su')
 install=${pkgname}.install
-options=('!emptydirs')
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
-	coreutils-pam.patch
-	0001-ls-color-each-symlink-to-relative-name-in-properly.patch
-	su.pam)
-md5sums=('bbda656ce8ca2c6903948f9faa204ba3'
-         'ebecd29b095aa21b0b2f833f1ec20d70'
-         'aad79a2aa6d566c375d7bdd1b0767278'
-         'd7c691898a695a6284a927e6a9426fe4'
-         'fa85e5cce5d723275b14365ba71a8aad')
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
+md5sums=('1a01231a2f3ed37c0efc073ccdda9375'
+         '7f564749d834397aa67f0f05bacb62d5')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # added su wheel group pam patch (from fedora git)
-  patch -Np1 -i ${srcdir}/coreutils-pam.patch
-
-  # fix coloring for symlinks in /
-  # upstream commit 6124a3842dfa8484b52e067a8ab8105c3875a4f7
-  patch -Np1 -i $srcdir/0001-ls-color-each-symlink-to-relative-name-in-properly.patch
-
-  autoreconf -v
-  ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \
-              --enable-install-program=su \
+  ./configure --prefix=/usr --libexecdir=/usr/lib \
               --enable-no-install-program=groups,hostname,kill,uptime \
               --enable-pam
   make
@@ -53,14 +35,13 @@ package() {
   make DESTDIR=${pkgdir} install
 
   cd ${pkgdir}/usr/bin
-  install -dm755 ${pkgdir}/{bin,usr/sbin}
+  install -dm755 ${pkgdir}/bin
 
   # binaries required by FHS
   _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false'
-        'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'su' 'sync'
+        'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'sync'
         'true' 'uname')
-  mv ${_fhs[@]} ${pkgdir}/bin
-
-  mv chroot ${pkgdir}/usr/sbin
-  install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su
+  for i in ${_fhs[@]}; do
+    ln -s ../usr/bin/$i ${pkgdir}/bin/$i
+  done
 }
diff --git a/core/coreutils/coreutils.install b/core/coreutils/coreutils.install
index 8caae6686..22cfcb2a1 100644
--- a/core/coreutils/coreutils.install
+++ b/core/coreutils/coreutils.install
@@ -1,11 +1,9 @@
 infodir=usr/share/info
-filelist=(coreutils.info)
+file=coreutils.info
 
 post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
-    usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
 }
 
 post_upgrade() {
@@ -13,9 +11,7 @@ post_upgrade() {
 }
 
 pre_remove() {
- [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
 }