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

Conflicts:
	community-staging/performous/PKGBUILD
	community-testing/oss/PKGBUILD
	community-testing/picard/PKGBUILD
	community/deadbeef/PKGBUILD
	community/gnash/PKGBUILD
	community/mplayer2/PKGBUILD
	community/radvd/PKGBUILD
	community/tinc/PKGBUILD
	core/glibc/PKGBUILD
	core/lvm2/PKGBUILD
	core/util-linux/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/boost/PKGBUILD
	extra/cppunit/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/kdemultimedia/PKGBUILD
	extra/kradio/PKGBUILD
	extra/opal/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postfix/PKGBUILD
	extra/ptlib/PKGBUILD
	extra/xine-lib/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase-workspace/kdm.service
	kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
	libre/virtualbox-libre/PKGBUILD
	libre/virtualbox-modules-lts/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	multilib/binutils-multilib/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/lib32-dbus-core/PKGBUILD
	multilib/lib32-e2fsprogs/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
	multilib/lib32-gnutls/PKGBUILD
	multilib/lib32-libidn/PKGBUILD
	multilib/lib32-libjpeg-turbo/PKGBUILD
	multilib/lib32-pixman/PKGBUILD
	staging/ekiga/PKGBUILD
	staging/kdeedu-kig/PKGBUILD
	staging/kdeedu-rocs/PKGBUILD
	testing/glibc/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebase-workspace/kdm.service
	testing/nilfs-utils/PKGBUILD
	testing/systemd/PKGBUILD

3 files changed, 17 insertions, 17 deletions

diff --git a/libre/virtualbox-modules-lts/PKGBUILD b/libre/virtualbox-modules-lts/PKGBUILD
index 80caec248..2daecb990 100644
--- a/libre/virtualbox-modules-lts/PKGBUILD
+++ b/libre/virtualbox-modules-lts/PKGBUILD
@@ -1,13 +1,13 @@
 # $Id$
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
+# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
 
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-modules-lts' 'virtualbox-parabola-modules-lts')
 pkgver=4.1.18
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://virtualbox.org'
 license=('GPL')
@@ -20,9 +20,9 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          'ed1341881437455d9735875ddf455fbe')
 
 _extramodules=extramodules-3.0-LIBRE-LTS
-_kernver=$(pacman -Ss linux-libre-lts | awk 'NR==1{print $2}')-LIBRE-LTS
+_kernver=$(pacman -Q linux-libre-lts | awk '{ printf "%s-LIBRE-LTS", $2; exit }')
 
-export KERN_DIR=/lib/modules/${_kernver}/build
+export KERN_DIR=/usr/lib/modules/${_kernver}/build
 export KERN_INCL=/usr/src/linux-${_kernver}/include/
 
 build() {
@@ -65,7 +65,7 @@ package_virtualbox-parabola-modules-lts(){
 
     for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do
         install -D -m644 ${module} \
-            "$pkgdir/lib/modules/${_extramodules}/${module}"
+            "$pkgdir/usr/lib/modules/${_extramodules}/${module}"
     done
 
     install -D -m 0644 "$srcdir/60-vboxguest.rules" \
@@ -86,16 +86,16 @@ package_virtualbox-modules-lts(){
     cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
 
     install -D -m644 vboxdrv.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko"
+        "$pkgdir/usr/lib/modules/${_extramodules}/vboxdrv.ko"
 
     install -D -m644 vboxnetadp.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko"
+        "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetadp.ko"
 
     install -D -m644 vboxnetflt.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko"
+        "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetflt.ko"
 
     install -D -m644 vboxpci.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko"
+        "$pkgdir/usr/lib/modules/${_extramodules}/vboxpci.ko"
 
-    find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+    find "${pkgdir}" -name '*.ko' -exec gzip -9 {} +
 }
diff --git a/libre/virtualbox-modules-lts/virtualbox-modules-lts.install b/libre/virtualbox-modules-lts/virtualbox-modules-lts.install
index 014fa0b88..5387563a6 100644
--- a/libre/virtualbox-modules-lts/virtualbox-modules-lts.install
+++ b/libre/virtualbox-modules-lts/virtualbox-modules-lts.install
@@ -5,14 +5,14 @@ post_install() {
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install b/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install
index 80d966a9d..54a052390 100644
--- a/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install
+++ b/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install
@@ -4,13 +4,13 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }