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

Conflicts:
	extra/kdebase/PKGBUILD
	extra/openal/PKGBUILD

2 files changed, 48 insertions, 3 deletions

diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD
new file mode 100644
index 000000000..5dc473aba
--- /dev/null
+++ b/community/processing/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 80996 2012-12-08 22:47:00Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+
+pkgname=processing
+pkgver=2.0b7
+pkgrel=1
+pkgdesc='Programming language and environment for creating images, animation, and interactions'
+arch=('x86_64' 'i686')
+url='http://www.processing.org/'
+license=('GPL' 'LGPL')
+depends=('libgl' 'libxxf86vm')
+makedepends=('gendesk')
+options=(!strip)
+#if [[ $CARCH == 'x86_64' ]]; then
+#  optdepends=('lib32-libxtst: resource extension library')
+#  source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux64.tgz"
+#          "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
+#  sha256sums=('844b4280b242176107f6c40fef47fa420695111cdb2b80294570297f63b1186f'
+#            '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
+#else
+  source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux32.tgz"
+          "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
+  sha256sums=('55db8370672f9e2658443a7fe577e23f06ca1ab2435719c865a059a0e65cdc83'
+            '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
+#fi
+
+build() {
+    cd "$srcdir"
+    gendesk
+}
+
+package() {
+    cd "$srcdir/$pkgname-$pkgver"
+
+    install -d "$pkgdir/usr/share/$pkgname/" "$pkgdir/usr/bin/"
+    cp -r ./* "$pkgdir/usr/share/$pkgname/"
+    chmod a+x "$pkgdir/usr/share/$pkgname/$pkgname"
+    ln -s /usr/share/$pkgname/$pkgname "$pkgdir/usr/bin/$pkgname"
+    install -Dm644 "$srcdir/$pkgname.png" \
+      "$pkgdir/usr/share/pixmaps/$pkgname.png"
+    install -Dm644 "$srcdir/$pkgname.desktop" \
+      "$pkgdir/usr/share/applications/$pkgname.desktop"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/tellico/PKGBUILD b/community/tellico/PKGBUILD
index c6f8cbe14..086b8b211 100644
--- a/community/tellico/PKGBUILD
+++ b/community/tellico/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74833 2012-08-06 23:08:46Z andrea $
+# $Id: PKGBUILD 80977 2012-12-08 10:56:37Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ray Rashif <schiv@archlinux.org
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,12 +6,12 @@
 
 pkgname=tellico
 pkgver=2.3.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A collection manager for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tellico-project.org/"
 license=('GPL')
-depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'libkcddb' 'poppler-qt' 'qjson')
+depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'libkcddb' 'poppler-qt')
 makedepends=('automoc4' 'cmake')
 install=$pkgname.install
 source=(http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2)