4 files changed, 40 insertions, 22 deletions
diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD
index 0f19b2eaa..7a598d15c 100644
--- a/libre/acpi_call/PKGBUILD
+++ b/libre/acpi_call/PKGBUILD
@@ -5,11 +5,11 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-_kernelname=-lts
+_kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
   _basekernel=4.5
-  _archrel=45
+  _archrel=46
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.4
diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD
index 371460a21..6e9689854 100644
--- a/libre/bbswitch/PKGBUILD
+++ b/libre/bbswitch/PKGBUILD
@@ -5,11 +5,11 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-_kernelname=-lts
+_kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
   _basekernel=4.5
-  _archrel=47
+  _archrel=49
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.4
@@ -49,41 +49,41 @@ elif [[ ${_kernelname} == -xen ]]; then
   _parabolarel=1
 fi
 
-_pkgname=bbswitch
-pkgname=${_pkgname}${_kernelname}
+pkgbase=bbswitch
 pkgver=0.8
 pkgrel=${_archrel}.parabola${_parabolarel}.basekernel${_basekernel}
 _extramodules=extramodules-${_basekernel}${_kernelname}
 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre${_kernelname} kernel package)"
 arch=('i686' 'x86_64')
-url="http://github.com/Bumblebee-Project/${_pkgname}"
+url="http://github.com/Bumblebee-Project/${pkgbase}"
 license=('GPL')
 
 # Generic (you shouldn't have to modify any of these variables)
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
-makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
+makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}" "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 
-replaces=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
-conflicts=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
 if [[ ${_kernelname} != "" ]]; then
-  provides=("${_pkgname}")
+  provides=("${pkgbase}")
 fi
 
-install='kmod.install'
-source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
 md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807')
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
   make KDIR=/lib/modules/${_kernver}/build
 }
 
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+_package() {
+  depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
+  replaces=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
+  conflicts=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
+  install='kmod.install'
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   # Set the correct extramodules directory for install
   cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
@@ -91,6 +91,24 @@ package() {
   sed -i "s/^_EXTRAMODULES=.*/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}"
 
   # Actually install
-  install -Dm644 ${_pkgname}.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/${_pkgname}.ko
-  gzip "${pkgdir}/usr/lib/modules/${_extramodules}/${_pkgname}.ko"
+  install -Dm644 ${pkgbase}.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/${pkgbase}.ko
+  gzip "${pkgdir}/usr/lib/modules/${_extramodules}/${pkgbase}.ko"
 }
+
+_package-dkms() {
+  depends=('dkms')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  install -dm755 "${pkgdir}/usr/src/${pkgbase}-${pkgver}/"
+
+  install -Dm644 Makefile bbswitch.c dkms/dkms.conf "${pkgdir}/usr/src/${pkgbase}-${pkgver}/"
+}
+
+pkgname=("${pkgbase}${_kernelname}" "${pkgbase}${_kernelname}-dkms")
+for _p in ${pkgname[@]}; do
+  eval "package_${_p}() {
+    $(declare -f "_package${_p#${pkgbase}}")
+    _package${_p#${pkgbase}}
+  }"
+done
diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD
index 957c5d8dc..7f281027f 100644
--- a/libre/tp_smapi/PKGBUILD
+++ b/libre/tp_smapi/PKGBUILD
@@ -10,11 +10,11 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-_kernelname=-lts
+_kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
   _basekernel=4.5
-  _archrel=84
+  _archrel=85
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.4
diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD
index ea4150791..6894ce807 100644
--- a/libre/vhba-module/PKGBUILD
+++ b/libre/vhba-module/PKGBUILD
@@ -9,7 +9,7 @@ _kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
   _basekernel=4.5
-  _archrel=28
+  _archrel=29
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.4