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

Conflicts:
	community/bitcoin/PKGBUILD
	community/bochs/PKGBUILD
	libre/p7zip-libre/PKGBUILD
	libre/psutils-libre/PKGBUILD

5 files changed, 78 insertions, 13 deletions

diff --git a/extra/efivar/PKGBUILD b/extra/efivar/PKGBUILD
new file mode 100644
index 000000000..fcbcca915
--- /dev/null
+++ b/extra/efivar/PKGBUILD
@@ -0,0 +1,65 @@
+# $Id: PKGBUILD 188788 2013-06-20 17:50:47Z tpowa $
+# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
+# Contributor : Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+
+_gitroot="git://github.com/vathpela/efivar.git"
+_gitname="efivar"
+_gitbranch="master"
+
+_pkgname="efivar"
+pkgname="${_pkgname}"
+
+pkgdesc="Library to manipulate EFI variables - GIT Version"
+
+pkgver=0.4_18_gb8c524c
+pkgrel=1
+arch=('x86_64' 'i686')
+url="https://github.com/vathpela/efivar"
+license=('LGPL2.1')
+depends=('popt')
+conflicts=("${_pkgname}" 'libefivar' 'libefivar-git')
+provides=("${_pkgname}" 'libefivar' 'libefivar-git')
+options=('strip' 'emptydirs' 'zipman' 'libtool' 'docs')
+
+source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}")
+sha1sums=('SKIP')
+
+pkgver() {
+	cd "${srcdir}/${_gitname}/"
+	echo "$(git describe --tags)" | sed 's|-|_|g'
+}
+
+build() {
+	
+	rm -rf "${srcdir}/${_gitname}_build/" || true
+	cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build"
+	
+	cd "${srcdir}/${_gitname}_build/"
+	
+	git clean -x -d -f
+	echo
+	
+	unset CFLAGS
+	unset CPPFLAGS
+	unset CXXFLAGS
+	unset LDFLAGS
+	unset MAKEFLAGS
+	
+	sed 's|-rpath=$(TOPDIR)/src/|-rpath=$(libdir)|g' -i "${srcdir}/${_gitname}_build/src/test/Makefile" || true
+	
+	make libdir="/usr/lib/" bindir="/usr/bin/" mandir="/usr/share/man/" includedir="/usr/include/" V=1 -j1
+	echo
+	
+}
+
+package() {
+	
+	cd "${srcdir}/${_gitname}_build/"
+	
+	make -j1 V=1 DESTDIR="${pkgdir}/" libdir="/usr/lib/" bindir="/usr/bin/" mandir="/usr/share/man/" includedir="/usr/include/" install
+	echo
+	
+	install -d "${pkgdir}/usr/bin"
+	install -D -m0755 "${srcdir}/${_gitname}_build/src/test/tester" "${pkgdir}/usr/bin/efivar-tester"
+	
+}
diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD
index cfde39745..ea77f1bff 100644
--- a/extra/evas_generic_loaders/PKGBUILD
+++ b/extra/evas_generic_loaders/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186339 2013-05-25 02:56:29Z foutrelis $
+# $Id: PKGBUILD 188785 2013-06-20 07:31:01Z bpiotrowski $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=evas_generic_loaders
 pkgver=1.7.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Additional generic loaders for Evas"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
diff --git a/extra/libdiscid/PKGBUILD b/extra/libdiscid/PKGBUILD
index 8e4ef4e50..c3dbd69e7 100644
--- a/extra/libdiscid/PKGBUILD
+++ b/extra/libdiscid/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182706 2013-04-13 00:27:30Z eric $
+# $Id: PKGBUILD 188777 2013-06-20 04:15:31Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Eric Gillingham <sysrq@sysrq.tk>
 
 pkgname=libdiscid
-pkgver=0.5.0
+pkgver=0.5.1
 pkgrel=1
 pkgdesc="A Library for creating MusicBrainz DiscIDs"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('glibc')
 options=('!libtool')
 source=("http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a029355e53db1c2c24cc34a6d3e3b626')
+md5sums=('7770e649929b378d4758f97f9937a3d5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libqmi/PKGBUILD b/extra/libqmi/PKGBUILD
index d3a6d6fd4..b3d1be2a5 100644
--- a/extra/libqmi/PKGBUILD
+++ b/extra/libqmi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183435 2013-04-21 22:11:28Z heftig $
+# $Id: PKGBUILD 188775 2013-06-20 03:53:16Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libqmi
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="QMI modem protocol helper library"
 arch=(i686 x86_64 mips64el)
 url="http://cgit.freedesktop.org/libqmi"
@@ -12,12 +12,12 @@ depends=(glib2 bash)
 makedepends=(gtk-doc python)
 options=('!libtool')
 source=($url/snapshot/$pkgname-$pkgver.tar.xz)
-sha256sums=('4c0fe5fedd33dffd60d845c571243a2f25834019c159377d8df2c7cf5ff3a515')
+sha256sums=('3a9d1359da703905147c173df4f6c0e5bb5dbca0a0fd3d0ce6efe26331bcafeb')
 
 build() {
   cd $pkgname-$pkgver
   ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static
+    --disable-static --with-tests
   make
 }
 
diff --git a/extra/xfce4-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD
index 8571f0b4c..cadb3d7c1 100644
--- a/extra/xfce4-xkb-plugin/PKGBUILD
+++ b/extra/xfce4-xkb-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185421 2013-05-14 08:06:15Z foutrelis $
+# $Id: PKGBUILD 188774 2013-06-20 03:52:24Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-xkb-plugin
-pkgver=0.5.5
+pkgver=0.5.6
 pkgrel=1
 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('xfce4-panel' 'libxklavier' 'librsvg')
 makedepends=('intltool')
 options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2)
-sha256sums=('c97306298b0c804d4797c431bb9b698f123c0437ec845930bf938dc5d24ea8c9')
+sha256sums=('09e4623033987ce7b711252609a17291b306cdf60863ee39677a4995a93318a5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"