Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/gtk-engine-unico/PKGBUILD
	community/libfm/PKGBUILD
	community/lxlauncher/PKGBUILD
	community/lxpanel/PKGBUILD
	community/ncmpcpp/PKGBUILD
	community/sshguard/PKGBUILD

5 files changed, 39 insertions, 11 deletions

diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index 7f3292210..944d72d0b 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169770 2012-10-28 11:11:44Z allan $
+# $Id: PKGBUILD 171025 2012-11-15 12:26:41Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=binutils
-pkgver=2.23
+pkgver=2.23.1
 pkgrel=1
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,9 +15,9 @@ depends=('glibc>=2.16' 'zlib')
 checkdepends=('dejagnu' 'bc')
 options=('!libtool' '!distcc' '!ccache')
 install=binutils.install
-source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz{,.sig})
-md5sums=('ed58f50d8920c3f1d9cb110d5c972c27'
-         '5293d43d444852f71f7c96c6295ba66d')
+source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig})
+md5sums=('33adb18c3048d057ac58d07a3f1adb38'
+         '1869b37216e7d7eff7e335a69e0882fd')
 
 build() {
   cd ${srcdir}
@@ -76,6 +76,9 @@ package() {
   # Remove Windows/Novell specific man pages
   rm ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
 
+  # why are these distributed with binutils?
+  rm ${pkgdir}/usr/share/info/{configure,standards}.info
+
   # Remove these symlinks, they are not ABI stable.
   # Programs should compile static to the .a file.
   rm ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
diff --git a/core/binutils/binutils.install b/core/binutils/binutils.install
index 8bf9f3a47..9de0533ee 100644
--- a/core/binutils/binutils.install
+++ b/core/binutils/binutils.install
@@ -1,5 +1,5 @@
 infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
+filelist=(as.info bfd.info binutils.info gprof.info ld.info)
 
 post_upgrade() {
   [ -x usr/bin/install-info ] || return 0
diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD
index 3f8fefe84..9eb84ddd3 100644
--- a/core/rfkill/PKGBUILD
+++ b/core/rfkill/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 165479 2012-08-20 14:46:54Z bisson $
+# $Id: PKGBUILD 171055 2012-11-16 01:20:16Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rfkill
 pkgver=0.4
-pkgrel=5
+pkgrel=6
 pkgdesc='Tool for enabling and disabling wireless devices'
 url='http://linuxwireless.org/en/users/Documentation/rfkill'
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
 source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'service.unblock'
+        'service.block'
         'rules.d'
-        'service'
         'conf.d'
         'rc.d')
 sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b'
+          '8b4f0effcad564e929cf65c50773881d1209e54b'
+          '10febfa26656bc395aeca477d4d44a1e0482375c'
           '6390eaa793b473098aaa11b13c5254d611a4c13a'
-          'cadc563f967c5ac680e7cdfd764718b412201f8a'
           'd969fe927a9fb2926af43a311a7c1fa126fe59a9'
           '380af0b002f51543557306ed68a27f0059fd5a6f')
 
@@ -33,7 +35,8 @@ package() {
 	make DESTDIR="${pkgdir}" install
 	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
-	install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/rfkill.service"
+	install -Dm644 ../service.block "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
+	install -Dm644 ../service.unblock "${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service"
 	install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill"
 	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill"
 }
diff --git a/core/rfkill/service.block b/core/rfkill/service.block
new file mode 100644
index 000000000..443c62526
--- /dev/null
+++ b/core/rfkill/service.block
@@ -0,0 +1,11 @@
+[Unit]
+Description=RFKill-Block %I
+After=rfkill-unblock@all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/rfkill block %I
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/rfkill/service.unblock b/core/rfkill/service.unblock
new file mode 100644
index 000000000..fb8776653
--- /dev/null
+++ b/core/rfkill/service.unblock
@@ -0,0 +1,11 @@
+[Unit]
+Description=RFKill-Unblock %I
+After=rfkill-block@all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/rfkill unblock %I
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target