From 1c210063dbac33ed7a6581804399132a5ef0d2ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Thu, 21 Feb 2013 18:42:56 -0200
Subject: linux-libre-firmware-3.8-1: updating version

---
 libre/linux-libre-firmware/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index ebdca122c..9014b1723 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Márcio Silva <coadde@lavabit.com>
 
 pkgname=linux-libre-firmware
-pkgver=3.7
-pkgrel=4
+pkgver=3.8
+pkgrel=1
 pkgdesc='Free firmware files for Linux-libre'
 arch=('any')
 url='http://linux-libre.fsfla.org/'
@@ -36,7 +36,7 @@ replaces=('linux-firmware'
           'rt2x00-rt61-fw'
           'rt2x00-rt71w-fw')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
-md5sums=('06bf9601d859531e7378eb43d4ca7dd3')
+md5sums=('84c2a77910932ffc7d958744ac9cf2f5')
 
 package() {
   cd $srcdir/linux-$pkgver
-- 
cgit v1.2.3-2-g168b


From 36e9b84867364702c61ddecfe7d6fde1dc4b32ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Thu, 21 Feb 2013 18:44:44 -0200
Subject: lirc-libre-1:0.9.0-38: updating revision

* Rebuild against linux-libre 3.8
---
 libre/lirc-libre/PKGBUILD        | 20 +++++-----
 libre/lirc-libre/linux-3.8.patch | 80 ++++++++++++++++++++++++++++++++++++++++
 libre/lirc-libre/lirc.install    |  2 +-
 3 files changed, 92 insertions(+), 10 deletions(-)
 create mode 100644 libre/lirc-libre/linux-3.8.patch

diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 63097f460..a6d06ae5f 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 178373 2013-02-21 00:45:43Z foutrelis $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -6,24 +6,24 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=37
+pkgrel=38
 epoch=1
-_extramodules=extramodules-3.7-LIBRE
+_extramodules=extramodules-3.8-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org/"
 license=('GPL')
 ### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-libre-headers>=3.7' 'linux-libre-headers<3.8' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre-headers>=3.8' 'linux-libre-headers<3.9' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
         lircd-handle-large-config.patch
         lirc_atiusb-kfifo.patch
         kernel-2.6.39.patch
-	lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd
-	lirc.service lircm.service irexec.service
-	lirc.tmpfiles
-	)
+        linux-3.8.patch
+        lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd
+        lirc.service lircm.service irexec.service
+        lirc.tmpfiles)
 
 build() {
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
@@ -32,6 +32,7 @@ build() {
   patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
   patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
   patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
+  patch -Np1 -i "${srcdir}/linux-3.8.patch"
 
   sed -i '/AC_PATH_XTRA/d' configure.ac
   sed -e 's/@X_CFLAGS@//g' \
@@ -57,7 +58,7 @@ build() {
 }
 
 package_lirc-libre() {
-  pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package) "
+  pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)"
   depends=('lirc-utils-libre' 'linux-libre>=3.7' 'linux-libre<3.8')
   replaces=('lirc' 'lirc+pctv')
   conflicts=('lirc')
@@ -114,6 +115,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086'
          'b70cc9640505205446ec47b7d4779f38'
          '1f8b104a2365d9f93404b143f499059b'
          '087a7d102e1c96bf1179f38db2b0b237'
+         '9ee196bd03ea44af5a752fb0cc6ca96a'
          '8d0e238dc0eda95e340fe570605da492'
          '85f7fdac55e5256967241864049bf5e9'
          '3deb02604b37811d41816e9b4385fcc3'
diff --git a/libre/lirc-libre/linux-3.8.patch b/libre/lirc-libre/linux-3.8.patch
new file mode 100644
index 000000000..7b6378a83
--- /dev/null
+++ b/libre/lirc-libre/linux-3.8.patch
@@ -0,0 +1,80 @@
+diff -upr lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c lirc-0.9.0/drivers/lirc_serial/lirc_serial.c
+--- lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c	2013-02-21 02:36:25.000000000 +0200
++++ lirc-0.9.0/drivers/lirc_serial/lirc_serial.c	2013-02-21 02:39:55.000000000 +0200
+@@ -1103,12 +1103,12 @@ static struct lirc_driver driver = {
+ 
+ static struct platform_device *lirc_serial_dev;
+ 
+-static int __devinit lirc_serial_probe(struct platform_device *dev)
++static int lirc_serial_probe(struct platform_device *dev)
+ {
+ 	return 0;
+ }
+ 
+-static int __devexit lirc_serial_remove(struct platform_device *dev)
++static int lirc_serial_remove(struct platform_device *dev)
+ {
+ 	return 0;
+ }
+@@ -1159,7 +1159,7 @@ static int lirc_serial_resume(struct pla
+ 
+ static struct platform_driver lirc_serial_driver = {
+ 	.probe		= lirc_serial_probe,
+-	.remove		= __devexit_p(lirc_serial_remove),
++	.remove		= lirc_serial_remove,
+ 	.suspend	= lirc_serial_suspend,
+ 	.resume		= lirc_serial_resume,
+ 	.driver		= {
+diff -upr lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c lirc-0.9.0/drivers/lirc_sir/lirc_sir.c
+--- lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c	2013-02-21 02:36:25.000000000 +0200
++++ lirc-0.9.0/drivers/lirc_sir/lirc_sir.c	2013-02-21 02:38:24.000000000 +0200
+@@ -1290,19 +1290,19 @@ static int init_lirc_sir(void)
+ 	return 0;
+ }
+ 
+-static int __devinit lirc_sir_probe(struct platform_device *dev)
++static int lirc_sir_probe(struct platform_device *dev)
+ {
+ 	return 0;
+ }
+ 
+-static int __devexit lirc_sir_remove(struct platform_device *dev)
++static int lirc_sir_remove(struct platform_device *dev)
+ {
+ 	return 0;
+ }
+ 
+ static struct platform_driver lirc_sir_driver = {
+ 	.probe		= lirc_sir_probe,
+-	.remove		= __devexit_p(lirc_sir_remove),
++	.remove		= lirc_sir_remove,
+ 	.driver		=	{
+ 		.name	= "lirc_sir",
+ 		.owner	= THIS_MODULE,
+diff -upr lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+--- lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2013-02-21 02:36:25.000000000 +0200
++++ lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2013-02-21 02:39:39.000000000 +0200
+@@ -930,12 +930,12 @@ static int wpc8769l_acpi_detect(void)
+ #ifdef MODULE
+ static struct platform_device *lirc_wpc8769l_platform_dev;
+ 
+-static int __devinit lirc_wpc8769l_probe(struct platform_device *dev)
++static int lirc_wpc8769l_probe(struct platform_device *dev)
+ {
+ 	return 0;
+ }
+ 
+-static int __devexit lirc_wpc8769l_remove(struct platform_device *dev)
++static int lirc_wpc8769l_remove(struct platform_device *dev)
+ {
+ 	return 0;
+ }
+@@ -963,7 +963,7 @@ static int lirc_wpc8769l_resume(struct p
+ 
+ static struct platform_driver lirc_wpc8769l_platform_driver = {
+ 	.probe		= lirc_wpc8769l_probe,
+-	.remove		= __devexit_p(lirc_wpc8769l_remove),
++	.remove		= lirc_wpc8769l_remove,
+ 	.suspend	= lirc_wpc8769l_suspend,
+ 	.resume		= lirc_wpc8769l_resume,
+ 	.driver		= {
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index a6694836f..49a9dc601 100644
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.7-LIBRE
+EXTRAMODULES=extramodules-3.8-LIBRE
 
 post_install() {
   # updating module dependencies
-- 
cgit v1.2.3-2-g168b


From ea2f621385a8b1512f29d46de3c16925d9f1ca57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Thu, 21 Feb 2013 18:51:19 -0200
Subject: linux-libre-kmod-alx-3.8.1-1: updating version

---
 libre/linux-libre-kmod-alx/PKGBUILD                     | 14 +++++++-------
 libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install |  1 -
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 8567f9693..756507986 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.7.9
+_kernver=3.8
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
-_version=v3.8-rc7
-_pkgver=3.8-rc7-1-u
-pkgver=3.8rc7.1
-pkgrel=3
+_version=v3.8
+_pkgver=3.8-1-u
+pkgver=3.8.1
+pkgrel=1
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
@@ -19,12 +19,12 @@ provides=('alx' 'alx-driver' 'dkms-alx')
 conflicts=('alx' 'alx-driver' 'dkms-alx')
 source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz)
 
-md5sums=('3a1c7f870ff2fb96534b0d69245a4dab')
+md5sums=('557e3099c642455ec272d9ddf46de484')
 
 
 build() {
 	# current extramodules version
-	_extraver=extramodules-3.7-LIBRE
+	_extraver=extramodules-3.8-LIBRE
 
 	cd $srcdir/compat-drivers-$_pkgver
 
diff --git a/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install b/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install
index aad4270cd..069348192 100644
--- a/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install
+++ b/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install
@@ -30,4 +30,3 @@ post_remove() {
     rmmod compat
     echo "  Module unloaded!."
 }
-
-- 
cgit v1.2.3-2-g168b


From b7a8b89555b68f0e4c60902dce58204e4b161a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Thu, 21 Feb 2013 19:25:16 -0200
Subject: virtualbox-libre-4.2.6-4: updating revision

* Fix https://bugs.archlinux.org/task/33236
* Drop rc scripts - remove ft=sh from vim modeline in PKGBUILD
* Add patch for upcoming linux-libre 3.8
* Rebuild with qt4
* Rebuild against linux-libre 3.8
---
 libre/virtualbox-libre/003-linux-3.8.patch         | 15 ++++
 libre/virtualbox-libre/PKGBUILD                    | 32 ++------
 libre/virtualbox-libre/vboxservice.conf            |  2 -
 libre/virtualbox-libre/vboxservice.rc              | 39 ----------
 libre/virtualbox-libre/vboxweb.conf                | 11 ---
 libre/virtualbox-libre/vboxweb.rc                  | 86 ----------------------
 .../virtualbox-libre-guest-dkms.install            |  4 +-
 .../virtualbox-libre-host-dkms.install             |  4 +-
 libre/virtualbox-libre/virtualbox-libre.install    |  6 --
 9 files changed, 27 insertions(+), 172 deletions(-)
 create mode 100644 libre/virtualbox-libre/003-linux-3.8.patch
 delete mode 100644 libre/virtualbox-libre/vboxservice.conf
 delete mode 100644 libre/virtualbox-libre/vboxservice.rc
 delete mode 100644 libre/virtualbox-libre/vboxweb.conf
 delete mode 100644 libre/virtualbox-libre/vboxweb.rc

diff --git a/libre/virtualbox-libre/003-linux-3.8.patch b/libre/virtualbox-libre/003-linux-3.8.patch
new file mode 100644
index 000000000..0c6d9fbbf
--- /dev/null
+++ b/libre/virtualbox-libre/003-linux-3.8.patch
@@ -0,0 +1,15 @@
+--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c	(revision 43343)
++++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c	(revision 44317)
+@@ -196,7 +196,11 @@
+ 
+ 
+ /** PCI hotplug structure. */
+-static const struct pci_device_id __devinitdata g_VBoxGuestPciId[] =
++static const struct pci_device_id
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
++__devinitdata
++#endif
++g_VBoxGuestPciId[] =
+ {
+     {
+         vendor:     VMMDEV_VENDORID,
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index dc94a2a33..8f16e1ab9 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-sdk'
          'virtualbox-libre-guest-utils')
 pkgver=4.2.6
-pkgrel=1.1
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -39,7 +39,7 @@ makedepends=('alsa-lib'
              'mesa'
              'glu'
              'python2'
-             'qt'
+             'qt4'
              'sdl'
              'sdl_ttf'
              'vde2'
@@ -49,14 +49,11 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         '10-vboxdrv.rules'
         '60-vboxguest.rules'
         'LocalConfig.kmk'
-        'vboxservice.conf'
-        'vboxservice.rc'
         'vboxservice.service'
-        'vboxweb.conf'
-        'vboxweb.rc'
         'vboxweb.service'
         '001-vboxdrv-reference.patch'
         '002-change_default_driver_dir.patch'
+        '003-linux-3.8.patch'
         'os_blag_64.png'
         'os_blag.png'
         'os_dragora_64.png'
@@ -81,14 +78,11 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
          '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
-         '3c08ad30b89add47d3f45121200a5360'
-         '7d9823507206de9b8528a72af2f18d74'
          '07c5f6d86c4b7839d719c8ee0c53653b'
-         '7e9483b1069a54f181546083ac7e5469'
-         'c159d683ba1947290fc2ad2c64194150'
          'bc9efed88e0469cd7fc460d5a5cd7b4b'
          'f4e4c7895ede9c524109589bf16ae660'
          '97e193f050574dd272a38e5ee5ebe62b'
+         'e565ff0d028776d4f48e6e5b4d0b48e0'
          '8538dba8686d7449cb481c9bae9d722a'
          '545c925b46f2ac95e5f8ae407fad101a'
          'f6416f509c2e5460e4dc624e0a57f3c1'
@@ -166,7 +160,7 @@ build() {
 }
 
 package_virtualbox-libre() {
-    pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)'
+    pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets included and Oracle VM VirtualBox Extension Pack support removed)'
     depends=('curl'
              'libpng'
              'libxcursor'
@@ -176,12 +170,12 @@ package_virtualbox-libre() {
              'sdl'
              'shared-mime-info'
              'virtualbox-libre-host-modules')
-    optdepends=('qt: VirtualBox GUI support'
+    optdepends=('qt4: VirtualBox GUI support'
                 'vde2: Virtual Distributed Ethernet support'
                 'virtualbox-libre-sdk: Developer kit'
                 'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels'
                 'net-tools: Host-only or bridged networking support')
-    backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb')
+    backup=('etc/vbox/vbox.cfg')
     replaces=('virtualbox' 'virtualbox-ose')
     conflicts=('virtualbox' 'virtualbox-ose')
     provides=("virtualbox=$pkgver")
@@ -247,14 +241,9 @@ package_virtualbox-libre() {
     install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
         "$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules"
 
-    # install rc.d script
-    install -D -m755 "$srcdir/vboxweb.rc" "$pkgdir/etc/rc.d/vboxweb"
     # install systemd service
     install -D -m644 "$srcdir/vboxweb.service" \
         "$pkgdir/usr/lib/systemd/system/vboxweb.service"
-    # install sample config
-    install -D -m644 "$srcdir/vboxweb.conf" "$pkgdir/etc/conf.d/vboxweb"
-
 }
 
 package_virtualbox-libre-sdk() {
@@ -313,11 +302,10 @@ package_virtualbox-libre-guest-dkms() {
 package_virtualbox-libre-guest-utils(){
     pkgdesc='VirtualBox Guest userspace utilities'
     depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
-    optdepends=('virtualbox-guest-source: Guest kernel source modules for non-stock kernels')
+    optdepends=('virtualbox-libre-guest-dkms: Guest kernel source modules for non-stock kernels')
     provides=("virtualbox-guest-utils=$pkgver")
     replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
     conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
-    backup=('etc/conf.d/vboxservice')
     install=virtualbox-libre-guest-utils.install
 
     source "VirtualBox-$pkgver/env.sh"
@@ -339,10 +327,6 @@ package_virtualbox-libre-guest-utils(){
     # install udev rules
     install -D -m 0644 60-vboxguest.rules \
         "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
-    # install rc.d script
-    install -D -m755 vboxservice.rc "$pkgdir/etc/rc.d/vboxservice"
-    # install sample config
-    install -D -m644 vboxservice.conf "$pkgdir/etc/conf.d/vboxservice"
     # install systemd service file
     install -D -m644 vboxservice.service \
         "$pkgdir/usr/lib/systemd/system/vboxservice.service"
diff --git a/libre/virtualbox-libre/vboxservice.conf b/libre/virtualbox-libre/vboxservice.conf
deleted file mode 100644
index 9d4ec629f..000000000
--- a/libre/virtualbox-libre/vboxservice.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# VBoxService -h
-VBOX_SERVICE_OPTION=""
diff --git a/libre/virtualbox-libre/vboxservice.rc b/libre/virtualbox-libre/vboxservice.rc
deleted file mode 100644
index 5a62d69a3..000000000
--- a/libre/virtualbox-libre/vboxservice.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-name=VBoxService
-PID=$(pidof -o %PPID $name)
-
-case "$1" in
-  start)
-    stat_busy 'Starting VirtualBox Guest Service'
-    [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
-    && { add_daemon ${0##*/}; stat_done; } \
-    || { stat_fail; exit 1; }
-    ;;
-  stop)
-    stat_busy 'Stopping VirtualBox Guest Service'
-    [[ -n "$PID" ]] && kill $PID &>/dev/null \
-    && { rm_daemon ${0##*/}; stat_done; } \
-    || { stat_fail; exit 1; }
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  status)
-    stat_busy 'Checking VirtualBox Guest Service status'
-    ck_status ${0##*/}
-    ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|restart|status}" >&2
-    exit 1
-esac
-
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/vboxweb.conf b/libre/virtualbox-libre/vboxweb.conf
deleted file mode 100644
index c36f6a143..000000000
--- a/libre/virtualbox-libre/vboxweb.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# WebService Mandatory Variables
-#VBOXWEB_USER=
-
-# WebService Variables
-#VBOXWEB_LOGFILE=
-#VBOXWEB_HOST=
-#VBOXWEB_PORT=
-#VBOXWEB_TIMEOUT=
-#VBOXWEB_CHECK_INTERVAL=
-#VBOXWEB_THREADS=
-#VBOXWEB_KEEPALIVE=
diff --git a/libre/virtualbox-libre/vboxweb.rc b/libre/virtualbox-libre/vboxweb.rc
deleted file mode 100644
index 97273e3c7..000000000
--- a/libre/virtualbox-libre/vboxweb.rc
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/vbox/vbox.cfg
-. /etc/conf.d/vboxweb
-
-BINARY="$INSTALL_DIR/vboxwebsrv"
-
-start() {
-  stat_busy "Starting VirtualBox Web Service";
-  if ! pidof -o %PPID $BINARY >/dev/null; then
-      [[ "$VBOXWEB_USER" ]] || stat_die
-      lsmod | grep -q "vboxdrv[^_-]" || stat_die
-      PARAMS="--background"
-      [[ "$VBOXWEB_HOST" ]]           && PARAMS+=" -H $VBOXWEB_HOST"
-      [[ "$VBOXWEB_PORT" ]]           && PARAMS+=" -p $VBOXWEB_PORT"
-      [[ "$VBOXWEB_TIMEOUT" ]]        && PARAMS+=" -t $VBOXWEB_TIMEOUT"
-      [[ "$VBOXWEB_CHECK_INTERVAL" ]] && PARAMS+=" -i $VBOXWEB_CHECK_INTERVAL"
-      [[ "$VBOXWEB_THREADS" ]]        && PARAMS+=" -T $VBOXWEB_THREADS"
-      [[ "$VBOXWEB_KEEPALIVE" ]]      && PARAMS+=" -k $VBOXWEB_KEEPALIVE"
-      [[ "$VBOXWEB_LOGFILE" ]]        && PARAMS+=" -F $VBOXWEB_LOGFILE"
-      # prevent inheriting this setting to VBoxSVC
-      unset VBOX_RELEASE_LOG_DEST
-      su - $VBOXWEB_USER -c "$BINARY $PARAMS" &>/dev/null
-      # ugly: wait until the final process has forked
-      sleep .2
-      if pidof -o %PPID $BINARY >/dev/null; then
-          add_daemon vboxweb
-          stat_done
-      else
-          stat_die
-      fi
-  else
-    stat_die
-  fi
-}
-
-stop() {
-  stat_busy "Stopping VirtualBox Web Service"
-  PID=$(pidof -o %PPID $BINARY)
-  [[ $PID ]] && kill $PID &>/dev/null
-  if ! pidof -o %PPID $BINARY >/dev/null; then
-    rm_daemon vboxweb
-    stat_done
-  else
-    stat_die
-  fi
-}
-
-restart() {
-  stop && start
-}
-
-status() {
-  stat_busy "Checking for VirtualBox Web Service"
-  if pidof -o %PPID $BINARY >/dev/null; then
-      stat_done
-  else
-      stat_fail
-      false
-  fi
-}
-
-case "$1" in
-start)
-    start
-    ;;
-stop)
-    stop
-    ;;
-restart)
-    restart
-    ;;
-force-reload)
-    restart
-    ;;
-status)
-    status
-    ;;
-*)
-    echo "Usage: $0 {start|stop|restart|status}"
-    exit 1
-esac
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
index 2d62eae43..067c5b35e 100644
--- a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
+++ b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
@@ -4,8 +4,8 @@
 post_install() {
   dkms add vboxguest/${1%-*}
   cat << EOF
-==> To build and install your modules run dkms install vboxguest/${1%-*}
-==> To do this automatically at startup you can add dkms in your DAEMONS
+==> To build and install your modules run: dkms install vboxguest/${1%-*}
+==> To do this automatically at startup run: systemctl enable dkms.service
 EOF
 }
 
diff --git a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
index 8028cb7e0..8bc316e49 100644
--- a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
+++ b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
@@ -4,8 +4,8 @@
 post_install() {
   dkms add vboxhost/${1%-*}
   cat << EOF
-==> To build and install your modules run dkms install vboxhost/${1%-*}
-==> To do this automatically at startup you can add dkms in your DAEMONS
+==> To build and install your modules run: dkms install vboxhost/${1%-*}
+==> To do this automatically at startup run: systemctl enable dkms.service
 EOF
 }
 
diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install
index 90d8a8739..ad4f70f76 100644
--- a/libre/virtualbox-libre/virtualbox-libre.install
+++ b/libre/virtualbox-libre/virtualbox-libre.install
@@ -28,12 +28,6 @@ post_install() {
 # arg 2:  the old package version
 post_upgrade() {
   post_install "$1"
-  if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
-    cat << EOF
-===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-host-modules.
-===> Use virtualbox-libre-host-dkms package if you don't use our stock linux-libre package.
-EOF
-    fi
 }
 
 # arg 1:  the old package version
-- 
cgit v1.2.3-2-g168b


From 2a0776b4009167238bced66eaa8a6d925b37cc31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Thu, 21 Feb 2013 19:53:59 -0200
Subject: tp_smapi-libre-0.41-15: updating revision

* Rebuild against linux-libre 3.8
---
 libre/tp_smapi-libre/PKGBUILD         | 11 ++++++-----
 libre/tp_smapi-libre/tp_smapi.install |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 86e933e40..188f92b37 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id$
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: xduugu
 # Contributor: nh2
@@ -11,13 +12,13 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=14
+pkgrel=15
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
-depends=('linux-libre>=3.7' 'linux-libre<3.8')
-makedepends=('linux-libre-headers>=3.7' 'linux-libre-headers<3.8')
+depends=('linux-libre>=3.8' 'linux-libre<3.9')
+makedepends=('linux-libre-headers>=3.8' 'linux-libre-headers<3.9')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
@@ -51,13 +52,13 @@ package() {
   mv "${_kernver}/extra" "${_extramodules##*/}"
   rmdir "${_kernver}"
 
-  # compress kernel libre modules
+  # compress kernel modules
   find "${pkgdir}" -name "*.ko" -exec gzip -9 {} +
 
   # load module on startup
   echo tp_smapi > "${srcdir}/${_pkgname}.conf"
   install -Dm644 "${srcdir}/${_pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${_pkgname}.conf"
 
-  # update kernel libre version in install file
+  # update kernel version in install file
   sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/${_pkgname}.install"
 }
diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
index 3e1c13750..5474faf8e 100644
--- a/libre/tp_smapi-libre/tp_smapi.install
+++ b/libre/tp_smapi-libre/tp_smapi.install
@@ -1,4 +1,4 @@
-extramodules=/usr/lib/modules/extramodules-3.7-ARCH
+extramodules=/usr/lib/modules/extramodules-3.8-LIBRE
 
 post_install() {
   depmod -v $(< "$extramodules/version") &>/dev/null
-- 
cgit v1.2.3-2-g168b


From 17171fe9bf817a178a909350ec285ef1b52fefb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Thu, 21 Feb 2013 19:58:11 -0200
Subject: vhba-module-libre-20120422-18: updating revision

* Rebuild against linux-libre 3.8
---
 libre/vhba-module-libre/PKGBUILD            | 8 ++++----
 libre/vhba-module-libre/vhba-module.install | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index a9e23cc0a..ced6d2085 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -7,17 +7,17 @@
 _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20120422
-_extramodules=extramodules-3.7-LIBRE
-pkgrel=17
+_extramodules=extramodules-3.8-LIBRE
+pkgrel=18
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
-depends=('linux-libre>=3.7' 'linux-libre<3.8')
+depends=('linux-libre>=3.8' 'linux-libre<3.9')
 makedepends=('linux-libre-headers')
 options=(!makeflags)
 install=$_pkgname.install
-replaces=('vhba-module')  
+replaces=('vhba-module')
 conflicts=('vhba-module')
 provides=("vhba-module=$pkgver")
 source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2"
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
index 9f376f541..3e26e5438 100644
--- a/libre/vhba-module-libre/vhba-module.install
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -1,6 +1,6 @@
 _updatemod() {
   echo "  > Updating module dependencies..."
-  EXTRAMODULES='extramodules-3.7-LIBRE'
+  EXTRAMODULES='extramodules-3.8-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
-- 
cgit v1.2.3-2-g168b


From 299f37671318821e7bc2cbaf68638aff75e48cc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Thu, 21 Feb 2013 20:10:43 -0200
Subject: virtualbox-libre-modules-4.2.6-7: updating revision

* Rebuild against linux-libre 3.8
---
 libre/virtualbox-libre-modules/PKGBUILD | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 329ee26c4..b78d365db 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -7,7 +7,8 @@
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
 pkgver=4.2.6
-pkgrel=6
+_extramodules=extramodules-3.8-LIBRE
+pkgrel=7
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -18,7 +19,7 @@ makedepends=('linux-libre-headers'
              'bc')
 
 build() {
-  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
@@ -32,42 +33,38 @@ build() {
 }
 
 package_virtualbox-libre-host-modules(){
-  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
-  _extraver=extramodules-${_kernver%.*}-LIBRE
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
   pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)'
-#  depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)")
   depends=('linux-libre>=3.7' 'linux-libre<3.8')
   provides=("virtualbox-host-modules=${pkgver}")
   replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   install=virtualbox-libre-host-modules.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-host-modules.install"
+  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-libre-host-modules.install"
 }
 
 package_virtualbox-libre-guest-modules(){
-  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
-  _extraver=extramodules-${_kernver%.*}-LIBRE
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
   pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)'
   license=('GPL')
-#  depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)")
   depends=('linux-libre>=3.7' 'linux-libre<3.8')
   provides=("virtualbox-guest-modules=${pkgver}")
   replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   install=virtualbox-libre-guest-modules.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules.install"
+  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-libre-guest-modules.install"
 }
 
 # vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3-2-g168b


From 5744d0e696ce2349ee3fe08bb552010265ed901e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Thu, 21 Feb 2013 21:00:59 -0200
Subject: virtualbox-libre: regression revision due that qt4 was not
 implemented, qt is included on the repo yet

---
 libre/virtualbox-libre/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 8f16e1ab9..dc9e21490 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-sdk'
          'virtualbox-libre-guest-utils')
 pkgver=4.2.6
-pkgrel=4
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -39,7 +39,7 @@ makedepends=('alsa-lib'
              'mesa'
              'glu'
              'python2'
-             'qt4'
+             'qt'
              'sdl'
              'sdl_ttf'
              'vde2'
@@ -170,7 +170,7 @@ package_virtualbox-libre() {
              'sdl'
              'shared-mime-info'
              'virtualbox-libre-host-modules')
-    optdepends=('qt4: VirtualBox GUI support'
+    optdepends=('qt: VirtualBox GUI support'
                 'vde2: Virtual Distributed Ethernet support'
                 'virtualbox-libre-sdk: Developer kit'
                 'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels'
-- 
cgit v1.2.3-2-g168b