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

Conflicts:
	community/ettercap/PKGBUILD
	community/gmic/PKGBUILD
	extra/lm_sensors/PKGBUILD
	extra/lua/PKGBUILD

11 files changed, 199 insertions, 17 deletions

diff --git a/community/addinclude/PKGBUILD b/community/addinclude/PKGBUILD
new file mode 100644
index 000000000..edb5f73d8
--- /dev/null
+++ b/community/addinclude/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 87598 2013-04-03 23:28:26Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+
+pkgname=addinclude
+pkgver=0.9
+pkgrel=8
+pkgdesc='Utility to add includes to C header- and sourcefiles'
+arch=('x86_64' 'i686')
+url='http://addinclude.roboticoverlords.org/'
+license=('GPL')
+makedepends=('go')
+source=("http://$pkgname.roboticoverlords.org/$pkgname-$pkgver.tbz2")
+sha256sums=('8d88014b4b166d808892f433ce12e3ee683101af5e31886faa52a44cc6f7b451')
+options=('zipman')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  source /etc/profile.d/go.sh
+  go build -o "$pkgname"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  install -Dm755 "$pkgname" \
+    "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 "$pkgname.1.gz" \
+    "$pkgdir/usr/share/man/man1/$pkgname.1.gz"
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/bumblebee/PKGBUILD b/community/bumblebee/PKGBUILD
new file mode 100644
index 000000000..ce7c6231b
--- /dev/null
+++ b/community/bumblebee/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+
+pkgname=bumblebee
+pkgver=3.1
+pkgrel=5
+pkgdesc="NVIDIA Optimus support for Linux through VirtualGL"
+arch=('i686' 'x86_64')
+depends=('virtualgl' 'libbsd' 'glib2' 'mesa-libgl')
+optdepends=('xf86-video-nouveau: nouveau driver'
+            'nouveau-dri: 3D acceleration features fo nouveau'
+            'bbswitch: switch on/off discrete card' 
+            'nvidia: NVIDIA kernel driver'
+            'primus: faster back-end for optirun')
+if [ "$CARCH" = "x86_64" ]; then
+     optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun'
+     optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun'
+fi
+conflicts=('nvidia-libgl')
+provides=('nvidia-libgl')
+url="http://www.bumblebee-project.org"
+license=("GPL3")
+install='bumblebee.install'
+backup=('etc/bumblebee/bumblebee.conf' 
+        'etc/bumblebee/xorg.conf.nouveau' 
+        'etc/bumblebee/xorg.conf.nvidia')
+source=("http://www.bumblebee-project.org/${pkgname}-${pkgver}.tar.gz")
+md5sums=('de515ef51b1e0714c2f1b2a95f83e77e')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+
+    ./configure \
+        CONF_DRIVER_MODULE_NVIDIA=nvidia \
+        CONF_LDPATH_NVIDIA=/usr/lib/nvidia:/usr/lib32/nvidia \
+        CONF_MODPATH_NVIDIA=/usr/lib/nvidia/xorg/,/usr/lib/xorg/modules \
+        --prefix=/usr \
+        --sysconfdir=/etc
+
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+
+    make install DESTDIR="$pkgdir"
+
+    # Install systemd unit
+    install -D -m644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service"    
+
+    # Make bash_completion work
+    mv -v "${pkgdir}/etc/bash_completion.d/bumblebee" "${pkgdir}/etc/bash_completion.d/optirun"
+}
diff --git a/community/bumblebee/bumblebee.install b/community/bumblebee/bumblebee.install
new file mode 100644
index 000000000..57aed6cc5
--- /dev/null
+++ b/community/bumblebee/bumblebee.install
@@ -0,0 +1,16 @@
+_notice() {
+    echo "Don't forget to add yourself to the 'bumblebee' group to use Bumblebee"
+}
+
+post_upgrade() {
+    getent group "bumblebee" &>/dev/null || groupadd -r bumblebee
+}
+
+post_remove() {
+    getent group "bumblebee" &>/dev/null && groupdel bumblebee 1>/dev/null
+}
+
+post_install() {
+    post_upgrade
+    _notice
+}
diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD
index 39a11fc28..a24c74cda 100644
--- a/community/ettercap/PKGBUILD
+++ b/community/ettercap/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 84410 2013-02-18 19:27:41Z jelle $
+# $Id: PKGBUILD 87630 2013-04-04 10:17:39Z jelle $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=ettercap
 pkgname=('ettercap' 'ettercap-gtk')
-pkgver=0.7.5.3
-pkgrel=2
+pkgver=0.7.6
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ettercap.github.com/ettercap/"
 license=('GPL')
+depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
 makedepends=('ghostscript' 'cmake' 'libpcap' 'libltdl' 'libnet' 'gtk2')
 options=('!libtool' '!makeflags' '!emptydirs')
-source=("http://sourceforge.net/projects/ettercap/files/ettercap/0.7.5-Assimilation/$pkgname-$pkgver.tar.gz")
-md5sums=('784b5cf2493246e95943179b21f70645')
+source=("https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz" "ettercap.desktop" "org.archlinux.pkexec.ettercap.policy")
+md5sums=('7c5f5e1fd4002afdfd13765ef92866e1')
 build() {
   cd "${srcdir}"
 
@@ -33,7 +34,6 @@ build() {
 
 package_ettercap() {
   pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
-  depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
   backup=('etc/ettercap/etter.conf')
   conflicts=('ettercap-gtk')
 
@@ -47,7 +47,27 @@ package_ettercap-gtk() {
   backup=('etc/ettercap/etter.conf')
   conflicts=('ettercap')
   provides=('ettercap')
+#install='ettercap-gtk.install'
 
+  install -d $pkgdir/usr/share/polkit-1/actions/
   cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build
   make DESTDIR="${pkgdir}" install
+
+#  install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop"
+#  install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg"
+
+  # Install policy file
+#  install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy"
+
+  # We need rename the original script
+#  mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf"
+
+  # Install launcher script
+#  echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap
+#echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap
+#  chmod 755 ${pkgdir}/usr/bin/ettercap
+
 }
+md5sums=('7c5f5e1fd4002afdfd13765ef92866e1'
+         '21fe8aee8c7eb34bd5757a4de485ca06'
+         'd20a6137008edd3fae01757cb193b870')
diff --git a/community/ettercap/ettercap-gtk.install b/community/ettercap/ettercap-gtk.install
index 0b09f5904..100a94efe 100644
--- a/community/ettercap/ettercap-gtk.install
+++ b/community/ettercap/ettercap-gtk.install
@@ -1,4 +1,8 @@
 post_install() {
+      gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+      echo 'If you use a lightweight windowmanager, remember to run'
+      echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable'
+      echo 'graphical authentication, which may be needed for pkexec to work.'
 }
 
 post_upgrade() {
diff --git a/community/ettercap/ettercap.desktop b/community/ettercap/ettercap.desktop
index e2345d91a..7ea54b7c7 100644
--- a/community/ettercap/ettercap.desktop
+++ b/community/ettercap/ettercap.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Ettercap
 Comment=Nework sniffer/analyser
-Exec=ettercap-gtk
+Exec=ettercap
 Icon=ettercap
 Terminal=false
 Type=Application
diff --git a/community/ettercap/org.archlinux.pkexec.ettercap.policy b/community/ettercap/org.archlinux.pkexec.ettercap.policy
new file mode 100644
index 000000000..101b11a0f
--- /dev/null
+++ b/community/ettercap/org.archlinux.pkexec.ettercap.policy
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+<action id="com.archlinux.pkexec.ettercap">
+<message gettext-domain="ettercap"> Authentication is required to run the Ettercap</message>
+<icon_name>ettercap</icon_name>
+<defaults>
+<allow_any > auth_admin < /allow_any>
+<allow_inactive>auth_admin</allow_inactive>
+<allow_active>auth_admin</allow_active>
+</defaults>
+<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/ettercap.elf</annotate>
+<annotate key="org.freedesktop.policykit.exec.allow_gui">true< /annotate>
+</action>
+</policyconfig>
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index f918caa5a..43bd69d2f 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85351 2013-03-01 10:31:49Z andrea $
+# $Id: PKGBUILD 87641 2013-04-04 13:30:22Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: farid <farid at archlinuc-br.org>
@@ -6,8 +6,8 @@
 
 pkgbase=gmic
 pkgname=("gmic" "gimp-plugin-gmic" "zart")
-pkgver=1.5.4.0
-pkgrel=2
+pkgver=1.5.5.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gmic.sourceforge.net"
 license=("custom:CeCILL")
@@ -15,7 +15,7 @@ makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
 #options=('!emptydirs')
 source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz"
         "opencv-buildfix.patch")
-md5sums=('a686719a663b856d4a8b1611d2c90df5'
+md5sums=('ec68076448166ea18d15c0a69489dd25'
          '120319b0d6c81c5af186abe2281b79ca')
 
 build() {
@@ -23,6 +23,7 @@ build() {
   patch -p1 -i "${srcdir}/opencv-buildfix.patch"
   find "${srcdir}/gmic-${pkgver}/zart" -type f -execdir chmod 644 '{}' \;
   find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \;
+  sed -i 's|qmake zart.pro|qmake-qt4 zart.pro|' src/Makefile
   make -C src all
 }
 
diff --git a/community/macchanger/PKGBUILD b/community/macchanger/PKGBUILD
index 4d9b37ea1..a42f7aa87 100644
--- a/community/macchanger/PKGBUILD
+++ b/community/macchanger/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 82851 2013-01-25 02:08:04Z kkeen $
+# $Id: PKGBUILD 87606 2013-04-04 02:46:04Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=macchanger
-pkgver=1.5.0
-pkgrel=6
+pkgver=1.6.0
+pkgrel=1
 pkgdesc="A small utility to change your NIC's MAC address"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ftp.gnu.org/gnu/macchanger"
 license=('GPL')
 source=(http://ftp.gnu.org/gnu/macchanger/${pkgname}-${pkgver}.tar.gz)
-md5sums=('79b7cdaeca3d8ebafa764c4b0dd03ab7')
+md5sums=('1257b18e9067a8192c9747da52aabdda')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/primus/PKGBUILD b/community/primus/PKGBUILD
new file mode 100644
index 000000000..85408e472
--- /dev/null
+++ b/community/primus/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Alexander Monakov <amonakov@gmail.com>
+
+pkgname=primus
+pkgver=20130404
+pkgrel=1
+pkgdesc="Faster OpenGL offloading for Bumblebee"
+arch=('i686' 'x86_64')
+url="https://github.com/amonakov/primus"
+license=('custom:ISC')
+depends=('bumblebee')
+makedepends=('git')
+source=(git://github.com/amonakov/primus.git)
+sha1sums=('SKIP')
+
+build() {
+  cd primus
+
+  make
+}
+
+package() {
+  cd primus
+
+  install -D "lib/libGL.so.1" "$pkgdir/usr/lib/primus/libGL.so.1"
+  sed -e "s#^PRIMUS_libGL=.*#PRIMUS_libGL='/usr/\$LIB/primus'#" primusrun > primusrun.dist
+  install -D "primusrun.dist" "$pkgdir/usr/bin/primusrun"
+
+  install -D "primus.bash-completion" "$pkgdir/etc/bash_completion.d/primusrun"
+
+  gzip -9 "primusrun.1"
+  install -D "primusrun.1.gz" "$pkgdir/usr/share/man/man1/primusrun.1.gz"
+
+  install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 97f40159f..70e11b45c 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86481 2013-03-18 07:55:54Z tpowa $
+# $Id: PKGBUILD 87621 2013-04-04 06:32:48Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
@@ -6,7 +6,7 @@ pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
 pkgver=4.2.10
 _extramodules=extramodules-3.8-ARCH
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')