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

Conflicts:
	community-testing/dee/PKGBUILD
	community-testing/openttd/PKGBUILD
	extra/llvm/PKGBUILD
	testing/calligra/PKGBUILD
	testing/gdk-pixbuf2/PKGBUILD
	testing/gdk-pixbuf2/gdk-pixbuf2.install
	testing/gdm/PKGBUILD
	testing/gnome-screensaver/PKGBUILD
	testing/gnome-screensaver/gnome-screensaver.install
	testing/xf86-video-ati/PKGBUILD

14 files changed, 163 insertions, 48 deletions

diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
index 66537479d..53ff54a87 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68371 2012-03-23 10:07:50Z seblu $
+# $Id: PKGBUILD 69396 2012-04-15 17:01:41Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
 # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=2.0.15
+pkgver=2.0.16
 pkgrel=1
 pkgdesc='A daemon for delivering ACPI power management events with netlink support'
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz"
         'anything'
         'handler.sh'
         'acpid.conf.d')
-md5sums=('1b1c8775adab6a994a386c45af6b86dc'
+md5sums=('d59fc02c9c34f0d5c137495302e2c074'
          'd69203a032c4583f9abaafcf21a7ed84'
          '2d37b98d6e74bab815604b8b48c6cfd4'
          '615439f4a89716c747907d4fc3c8df75'
diff --git a/community/assimp/PKGBUILD b/community/assimp/PKGBUILD
new file mode 100644
index 000000000..8dc5bff69
--- /dev/null
+++ b/community/assimp/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: jepaan <jepaan at hotmail dot com>
+
+pkgname=assimp
+pkgver=2.0.863
+pkgrel=1
+pkgdesc="Portable Open Source library to import various well-known 3D model formats in an uniform manner"
+arch=('i686' 'x86_64')
+license=('BSD')
+makedepends=('cmake' 'boost')
+url=('http://assimp.sourceforge.net/index.html')
+source=("http://downloads.sourceforge.net/assimp/assimp--${pkgver}-sdk.zip")
+md5sums=('9f41662501bd9d9533c4cf03b7c25d5b')
+
+build() {
+	cd ${srcdir}
+	mkdir build
+    cd build
+	cmake ../${pkgname}--${pkgver}-sdk \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	make 
+}
+
+package()  {
+	cd ${srcdir}/build
+
+	make DESTDIR=$pkgdir install
+	install -Dm644 ${srcdir}/${pkgname}--${pkgver}-sdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
new file mode 100644
index 000000000..00d2cc85f
--- /dev/null
+++ b/community/bitcoin/PKGBUILD
@@ -0,0 +1,62 @@
+# $Id: PKGBUILD 69400 2012-04-15 20:25:26Z tredaelli $
+# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
+# Contributor: shahid <helllamer@gmail.com>
+
+pkgbase=bitcoin
+pkgname=('bitcoin-daemon' 'bitcoin-qt')
+pkgver=0.6.0
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.bitcoin.org/"
+makedepends=('boost' 'automoc4' 'miniupnpc')
+conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
+replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
+license=('MIT')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}-linux.tar.gz")
+sha256sums=('13faa8b7c8c9ce3518ebe31ff2d97920f4feb4f06c1d08455b272fdaaeeb1f97')
+
+build() {
+  cd "$srcdir/$pkgbase-$pkgver-linux/src"
+
+  # FIXME GCC 4.7.0 is too strict
+  echo "QMAKE_CXXFLAGS += $CXXFLAGS -fpermissive" >> bitcoin-qt.pro
+
+  # and make qt gui
+  qmake
+  make
+
+  # make bitcoind
+  make -f makefile.unix -C src CXXFLAGS="$CXXFLAGS -fpermissive" USE_UPNP=1
+}
+
+
+package_bitcoin-qt() {
+  pkgdesc="Bitcoin is a peer-to-peer network based digital currency - QT"
+  depends=(boost-libs qt miniupnpc)
+  install=bitcoin-qt.install
+
+  cd "$srcdir/$pkgbase-$pkgver-linux/src"
+  install -Dm755 bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt
+  install -Dm644 contrib/debian/bitcoin-qt.desktop \
+    "$pkgdir"/usr/share/applications/bitcoin.desktop
+  install -Dm644 share/pixmaps/bitcoin80.xpm \
+    "$pkgdir"/usr/share/pixmaps/bitcoin80.xpm
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+package_bitcoin-daemon() {
+  pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon"
+  depends=(boost-libs miniupnpc openssl)
+
+  cd "$srcdir/$pkgbase-$pkgver-linux/src"
+  install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind
+  install -Dm644 contrib/debian/examples/bitcoin.conf \
+    "$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf"
+  install -Dm644 contrib/debian/manpages/bitcoind.1 \
+    "$pkgdir"/usr/share/man/man1/bitcoind.1
+  install -Dm644 contrib/debian/manpages/bitcoin.conf.5 \
+    "$pkgdir"/usr/share/man/man5/bitcoin.conf.5
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
diff --git a/community/bitcoin/bitcoin-qt.install b/community/bitcoin/bitcoin-qt.install
new file mode 100644
index 000000000..f98ba7338
--- /dev/null
+++ b/community/bitcoin/bitcoin-qt.install
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}
diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD
index 5138954fd..187177a00 100644
--- a/community/desmume/PKGBUILD
+++ b/community/desmume/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67526 2012-03-13 10:38:03Z giovanni $
+# $Id: PKGBUILD 69392 2012-04-15 16:03:24Z schuay $
 # Maintainer: Jonathan Conder <jonno dot conder at gmail dot com>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Arkham <arkham at archlinux dot us>
@@ -11,27 +11,22 @@
 # Contributor: Asher256 <achrafcherti at gmail dot com>
 
 pkgname=desmume
-pkgver=0.9.7
-pkgrel=4
+pkgver=0.9.8
+pkgrel=1
 pkgdesc="Nintendo DS emulator"
 arch=('i686' 'x86_64')
 url="http://desmume.org/"
 license=('GPL')
-depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap')
+depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap'
+         'soundtouch' 'alsa-lib' 'zziplib')
 makedepends=('intltool')
-replaces=('desmume-core' 'desmume-cli' 'desmume-gtk' 'desmume-glade')
 install=desmume.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-        'desmume-0.9.7-zlib.1.2.6-fix.patch')
-sha256sums=('0a0f7ef3cc76ff0bbc6f3df47c3689653617074ea7ffc354e9fa1240c5336523'
-            'baaf68be32f09690975d6309af6988c038e708ef322ed7e4b370d87087c7b6ba')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "${srcdir}/desmume-0.9.7-zlib.1.2.6-fix.patch" 
 
-  ./configure --prefix=/usr \
-              --enable-wifi
+  ./configure --prefix=/usr --enable-wifi
   make
 }
 
@@ -40,3 +35,5 @@ package() {
 
   make DESTDIR="$pkgdir/" install
 }
+
+sha256sums=('f405b44e2d7ab3578d6be91a6546bbaa0afc60b2a8d193e4415fea5c5332d585')
diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD
index 452f0cb2e..dda84c6ff 100644
--- a/community/glfw/PKGBUILD
+++ b/community/glfw/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68357 2012-03-22 23:04:26Z svenstaro $
+# $Id: PKGBUILD 69414 2012-04-16 00:32:44Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: philefou <tuxication AT gmail DOT com>
 # Contributor: lindquist <tomas@famolsen.dk>
@@ -7,7 +7,7 @@
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=glfw
-pkgver=2.7.4
+pkgver=2.7.5
 pkgrel=1
 pkgdesc="A free, open source, portable framework for OpenGL application development"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ license=('custom:ZLIB')
 depends=('libgl' 'libxrandr')
 makedepends=('mesa')
 source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('cf3843ff6b4324a3e8003252f6b20cd0')
+md5sums=('b9ef11d08b6283b1b4a274fcf995fd79')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD
index de185bc66..22da899e8 100644
--- a/community/midori/PKGBUILD
+++ b/community/midori/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67337 2012-03-09 05:57:19Z bpiotrowski $
+# $Id: PKGBUILD 69383 2012-04-15 05:22:45Z bpiotrowski $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: rabyte <rabyte.at.gmail.dot.com>
 # Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
 
 pkgname=midori
-pkgver=0.4.4
+pkgver=0.4.5
 pkgrel=1
 pkgdesc="A lightweight web browser based on Gtk WebKit"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-util
 makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git'
 optdepends=('vala: for use in extensions')
 source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-md5sums=('a6578ebfd237c0f22cce49113b95f70c')
+md5sums=('14288197a1e2251b7c0803e1448daa0e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD
index 37a58eecd..108d6605c 100644
--- a/community/mythtv/PKGBUILD
+++ b/community/mythtv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69262 2012-04-11 06:53:29Z jconder $
+# $Id: PKGBUILD 69416 2012-04-16 01:26:19Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=mythtv
 pkgver=0.25
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
@@ -24,6 +24,8 @@ optdepends=('glew: for GPU commercial flagging'
 	    'libxml2: to read blu-ray metadata'
 	    'openssl: for AirTunes (RAOP) support'
             'xmltv: to download tv listings')
+conflicts=('myththemes')
+replaces=('myththemes')
 backup=('etc/conf.d/mythbackend')
 install='mythtv.install'
 source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
@@ -33,7 +35,7 @@ source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
 md5sums=('e49c81de40e279c83dcb1b2aa9a45748'
          '6090f5f22a8584db80b76cf19869ee41'
          '62fd98347c56b1d9b795792f83269d25'
-         '1f72db0586f97a7c3fd3155dfa9a6c6f')
+         'ab962d83614cbd0ac11ce3fcc929829d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/mythtv/mythbackend.conf b/community/mythtv/mythbackend.conf
index 15a248450..49bbca877 100644
--- a/community/mythtv/mythbackend.conf
+++ b/community/mythtv/mythbackend.conf
@@ -1,4 +1,3 @@
-#!/bin/bash
 #
 # Copyright (c) by the MythTV Development Team.
 #
diff --git a/community/naev/PKGBUILD b/community/naev/PKGBUILD
index d16836288..b5b065b6e 100644
--- a/community/naev/PKGBUILD
+++ b/community/naev/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 68487 2012-03-26 07:00:35Z svenstaro $
+# $Id: PKGBUILD 69406 2012-04-15 22:34:54Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Johan Rehnberg <cleanrock@gmail.com>
 
 pkgname=naev
-pkgver=0.5.2
+pkgver=0.5.3
 pkgrel=1
 pkgdesc='2D action/rpg space game'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL3')
 depends=('openal' 'libvorbis' 'sdl_image' 'sdl_mixer' 'libgl' 'libxml2' 'freetype2' 'libpng' 'naev-data')
 makedepends=('freeglut')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('c23a2ca80553a7d1d75497dc6672e61b')
+md5sums=('bec719b3daa33ec190d785120a7b0159')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD
index 2f882aa11..297188a87 100644
--- a/community/sslh/PKGBUILD
+++ b/community/sslh/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id$
-# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# $Id: PKGBUILD 69412 2012-04-15 23:37:55Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
 # Contributor: Jason Rodriguez <jason-aur@catloaf.net>
 
 pkgname=sslh
 pkgver=1.10
-pkgrel=5
+pkgrel=6
 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.rutschle.net/tech/sslh.shtml'
 license=('GPL2')
 backup=('etc/conf.d/sslh')
-source=("http://www.rutschle.net/tech/${pkgname}-${pkgver}.tar.gz"
+source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz"
         'sslh.rc'
-        'sslh.conf')
+        'sslh.conf'
+        'sslh.service')
 md5sums=('bc34e9a4770d634633e70589c72708cc'
-         '0680f09267c33205acf16ac6d4adf926'
-         '808199410bd6ab67421bf3544f805d1a')
+         'f64da291e97f1a99c33cb6ebf939b95b'
+         '808199410bd6ab67421bf3544f805d1a'
+         'ee8a4fcfc1f6839f7c93deb6f59f7fd6')
 
 build() {
   cd $pkgname-$pkgver
@@ -27,10 +29,17 @@ build() {
 }
 
 package() {
-  install -D -m 755 sslh.rc "${pkgdir}/etc/rc.d/sslh"
-  install -D -m 644 sslh.conf "${pkgdir}/etc/conf.d/sslh"
+  # install initscripts
+  install -Dm 755 sslh.rc "$pkgdir/etc/rc.d/sslh"
+  install -Dm 644 sslh.conf "$pkgdir/etc/conf.d/sslh"
+  # install systemd service
+  install -Dm 644 sslh.service "$pkgdir/usr/lib/systemd/system/sslh.service"
+  # manually install to have both ssl-fork and ssl-select
   cd $pkgname-$pkgver
-  make PREFIX="$pkgdir/usr" install
+  install -Dm 0755 sslh-fork "$pkgdir/usr/bin/sslh-fork"
+  install -Dm 0755 sslh-select "$pkgdir/usr/bin/sslh-select"
+  ln -s sslh-fork "$pkgdir/usr/bin/sslh"
+  install -Dm 0644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/sslh/sslh.rc b/community/sslh/sslh.rc
index 05b03bc3e..9c31435a0 100644
--- a/community/sslh/sslh.rc
+++ b/community/sslh/sslh.rc
@@ -5,7 +5,7 @@
 . /etc/conf.d/${0##*/}
 
 NAME=sslh
-DAEMON=/usr/sbin/sslh
+DAEMON=/usr/bin/sslh
 PID=$(pidof -o %PPID $DAEMON)
 
 case "$1" in
@@ -24,7 +24,7 @@ case "$1" in
 		$0 start
 		exit 0
 	;;
-  *) 
+  *)
 		echo "usage: ${0##*/} {start|stop|restart}" >&2
 	;;
 esac
diff --git a/community/sslh/sslh.service b/community/sslh/sslh.service
new file mode 100644
index 000000000..7ccad70e9
--- /dev/null
+++ b/community/sslh/sslh.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=SSL/SSH multiplexer
+
+[Service]
+EnvironmentFile=/etc/conf.d/sslh
+ExecStart=/usr/bin/sslh --foreground $DAEMON_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/uget/PKGBUILD b/community/uget/PKGBUILD
index 01eb6df30..bf103729d 100644
--- a/community/uget/PKGBUILD
+++ b/community/uget/PKGBUILD
@@ -1,26 +1,23 @@
-# $Id: PKGBUILD 68396 2012-03-24 05:49:50Z bgyorgy $
+# $Id: PKGBUILD 69404 2012-04-15 22:27:21Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=uget
-pkgver=1.8.0
-pkgrel=3
+pkgver=1.8.1
+pkgrel=1
 pkgdesc="GTK+ download manager featuring download classification and HTML import"
 arch=('i686' 'x86_64')
 url="http://urlget.sourceforge.net/"
-license=('GPL')
+license=('LGPL')
 depends=('libnotify' 'gtk3' 'gstreamer0.10' 'curl' 'hicolor-icon-theme' 'xdg-utils')
 makedepends=('intltool')
 optdepends=('aria2: alternative backend')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/urlget/$pkgname-$pkgver.tar.gz)
-md5sums=('2e0ad66ecdd0104b8fb27b29fdb44df1')
+md5sums=('e3fc14042820f0496f12c85c3847c6f8')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Fix aria2 arguments
-  sed -i 's/\"--enable-xml-rpc\"/"--enable-rpc"/' uget-gtk/UgSetting.c
-
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-appindicator --with-gtk3
   make