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

Conflicts:
	community/libparserutils/PKGBUILD
	extra/kdevplatform/PKGBUILD
	extra/libfontenc/PKGBUILD

6 files changed, 48 insertions, 56 deletions

diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index 2548da534..126f175f5 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 88193 2013-04-13 15:39:41Z stativ $
+# $Id: PKGBUILD 89105 2013-04-26 19:07:54Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=intellij-idea-libs
-pkgver=12.1.1
-_pkgver=129.239
+pkgver=12.1.2
+_pkgver=129.354
 pkgrel=1
 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('apache')
 depends=('glibc')
 options=(!strip)
 source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('279905aa380822f8a72a01e2b4955b44')
+md5sums=('ad9f4bbd7c8c7a86a4708d3f4bb093ed')
 
 package() {
   cd "$srcdir"
diff --git a/community/lib32-turbojpeg/PKGBUILD b/community/lib32-turbojpeg/PKGBUILD
deleted file mode 100644
index 7da03783c..000000000
--- a/community/lib32-turbojpeg/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-pkgname=lib32-turbojpeg
-pkgver=1.2.1
-pkgrel=1
-pkgdesc="turbojpeg library from libjpeg-turbo (32-bit)"
-arch=('x86_64')
-url="http://www.libjpeg-turbo.org/About/TurboJPEG"
-license=('GPL' 'custom')
-depends=('lib32-glibc')
-makedepends=('nasm' 'gcc-multilib')
-options=('!libtool')
-source=(http://sourceforge.net/projects/libjpeg-turbo/files/$pkgver/libjpeg-turbo-$pkgver.tar.gz)
-sha1sums=('a4992e102c6d88146709e8e6ce5896d5d0b5a361')
-
-build() {
-  cd "$srcdir/libjpeg-turbo-$pkgver"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  sed -i "s|NAFLAGS='-felf64 -DELF -D__x86_64__'|NAFLAGS='-felf32 -DELF -D__x86_64__'|" configure
-  ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man --libdir=/usr/lib32 --without-simd
-  make
-}
-
-package() {
-  cd "$srcdir/libjpeg-turbo-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  # only distribute libturbojpeg
-  rm "$pkgdir"/usr/lib32/libj*
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
-
-  install -Dm644 README "$pkgdir/usr/share/licenses/$pkgname/README"
-  install -Dm644 README-turbo.txt "$pkgdir/usr/share/licenses/$pkgname/README-turbo.txt"
-}
diff --git a/community/libparserutils/PKGBUILD b/community/libparserutils/PKGBUILD
index 5dea780d8..8d9a6edc4 100644
--- a/community/libparserutils/PKGBUILD
+++ b/community/libparserutils/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 64884 2012-02-18 19:31:38Z arodseth $
+# $Id: PKGBUILD 89113 2013-04-26 21:37:10Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=libparserutils
-pkgver=0.1.1
-pkgrel=2
-pkgdesc="Library for building efficient parsers"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.netsurf-browser.org/projects/libparserutils"
+pkgver=0.1.2
+pkgrel=1
+pkgdesc='Library for building efficient parsers'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.netsurf-browser.org/projects/libparserutils'
 license=('MIT')
-source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz")
 depends=('glibc')
-sha256sums=('2d3f1887d3027b7df1fcacd5f74aba16d3c22a86c169816cd712857a1be0aaf3')
+makedepends=('netsurf-buildsystem')
+source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz")
+sha256sums=('0a21efd3882c19965f57161c4ecda85a363a71dbe090030dfa69f9aecd2160aa')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/netsurf-buildsystem/PKGBUILD b/community/netsurf-buildsystem/PKGBUILD
new file mode 100644
index 000000000..3787946b4
--- /dev/null
+++ b/community/netsurf-buildsystem/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 89110 2013-04-26 20:53:25Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+
+pkgname=netsurf-buildsystem
+pkgver=1.0
+pkgrel=1
+pkgdesc='The Netsurf buildsystem'
+arch=('x86_64' 'i686')
+url='http://www.netsurf-browser.org/'
+license=('MIT')
+source=("http://download.netsurf-browser.org/libs/releases/buildsystem-$pkgver.tar.gz")
+sha256sums=('4495e8e12faf0ace668ab80401064ce7f65a195efe63c924c066a109649ff146')
+
+build() {
+  cd "$srcdir/buildsystem-$pkgver"
+
+  sed -i 's:-Werror::' Makefile
+  make PREFIX=/usr COMPONENT_TYPE='lib-shared'
+  make PREFIX=/usr COMPONENT_TYPE='lib-static'
+}
+
+package() {
+  cd "$srcdir/buildsystem-$pkgver"
+
+  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE='lib-shared'   
+  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE='lib-static'
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/primus/PKGBUILD b/community/primus/PKGBUILD
index a705d38e0..8abcacf90 100644
--- a/community/primus/PKGBUILD
+++ b/community/primus/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Alexander Monakov <amonakov@gmail.com>
 
 pkgname=primus
-pkgver=20130414
+pkgver=20130425
 pkgrel=1
 pkgdesc="Faster OpenGL offloading for Bumblebee"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="https://github.com/amonakov/primus"
 license=('custom:ISC')
 depends=('bumblebee')
 makedepends=('git')
-source=(git://github.com/amonakov/primus.git)
+source=("git://github.com/amonakov/primus.git#commit=31ca47e644")
 sha1sums=('SKIP')
 
 build() {
diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD
index 01e7a7557..93233537f 100644
--- a/community/simple-scan/PKGBUILD
+++ b/community/simple-scan/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=simple-scan
-pkgver=3.6.0
+pkgver=3.8.0
 pkgrel=1
 pkgdesc='Simple scanning utility'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,8 @@ license=('GPL3')
 depends=('sane' 'dconf' 'gtk3' 'colord' 'hicolor-icon-theme')
 makedepends=('yelp-tools' 'intltool')
 install=simple-scan.install
-source=(https://launchpad.net/$pkgname/${pkgver:0:3}/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-sha256sums=('d00684d4697de6753b6633d7c87b9c067fdbf99b732da9007ea2bb6cbdad1cde')
+source=(https://launchpad.net/$pkgname/${pkgver:0:3}/$pkgver/+download/$pkgname-$pkgver.tar.xz)
+sha256sums=('8df71e5f9e5db5c53217cb56b0e23b58dfe65bc174e873ad3ee576fbeccadc22')
 
 build() {
   cd $pkgname-$pkgver