Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

26 files changed, 194 insertions, 262 deletions

diff --git a/libre/acpi_call-parabola-lts/PKGBUILD b/libre/acpi_call-parabola-lts/PKGBUILD
deleted file mode 100644
index 681c3399e..000000000
--- a/libre/acpi_call-parabola-lts/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 116819 2014-08-04 07:10:28Z tpowa $
-# Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com>
-# Contributor (Arch): mortzu <me@mortzu.de>
-# Contributor (Arch): fnord0 <fnord0@riseup.net>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Márcio Silva <coadde@parabola.nu>
-
-# Kernel info
-_basekernel=3.14
-_kernelname=-lts
-
-# Source info
-_pkgname=acpi_call
-pkgver=1.1.0
-pkgdesc="A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre${_kernelname} kernel package)"
-url="http://github.com/mkottman/${_pkgname}"
-license=('GPL')
-source=("${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0')
-
-# Package info
-pkgrel=7
-arch=('i686' 'x86_64' 'mips64el')
-install='kmod.install'
-_replaces=("${_pkgname}" "${_pkgname}-libre")
-_provides=("${_pkgname}")
-
-# Generic (you shouldn't have to modify any of these variables)
-pkgname=${_pkgname}-parabola${_kernelname}
-_toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname}
-depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
-makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
-replaces=( "${_replaces[@]/%/${_kernelname}}")
-conflicts=("${_replaces[@]/%/${_kernelname}}")
-provides=( "${_provides[@]/%/${_kernelname}=${pkgver}}")
-if [[ -n "${_kernelname}" ]]; then
-  provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname
-fi
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
-  make KVERSION="${_kernver}"
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  # Set the correct extramodules directory for install
-  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
-  true && install=${install}.pkg
-  sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}"
-
-  # Actually install
-  install -dm 755 "${pkgdir}"/usr/lib/{modules/${_extramodules},modules-load.d}
-  install -m 644 ${_pkgname}.ko "${pkgdir}"/usr/lib/modules/${_extramodules}
-  gzip "${pkgdir}"/usr/lib/modules/${_extramodules}/${_pkgname}.ko
-  echo ${_pkgname} > "${pkgdir}"/usr/lib/modules-load.d/${pkgname}.conf
-
-  install -dm 755 "${pkgdir}"/usr/share/${pkgname}
-  cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${pkgname}/
-}
diff --git a/libre/acpi_call-parabola-lts/kmod.install b/libre/acpi_call-parabola-lts/kmod.install
deleted file mode 100644
index d4bd8cb34..000000000
--- a/libre/acpi_call-parabola-lts/kmod.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  _extramodules=THIS_IS_AUTOMATICALLY_SET_BY_PKGBUILD
-  depmod $(cat /usr/lib/modules/${_extramodules}/version)
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/libre/acpi_call-parabola/PKGBUILD b/libre/acpi_call-parabola/PKGBUILD
index e211d9ada..35fda1171 100644
--- a/libre/acpi_call-parabola/PKGBUILD
+++ b/libre/acpi_call-parabola/PKGBUILD
@@ -6,13 +6,37 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
+_kernelname=
 _basekernel=3.16
-_kernelname= # libre/linux-libre{,-lts}
+_pkgrel=1
+
+if [[ ${_kernelname} == "" ]]; then
+  _basekernel=${_basekernel}
+  _pkgrel=11.3
+elif [[ ${_kernelname} == -lts ]]; then
+  _basekernel=3.14
+  _pkgrel=7
+elif [[ ${_kernelname} == -grsec ]]; then
+  _basekernel=3.15
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -lts-knock ]]; then
+  _basekernel=3.10
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -rt ]]; then
+  _basekernel=3.14
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -pae ]]; then
+  _basekernel=${_basekernel}
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -xen ]]; then
+  _basekernel=${_basekernel}
+  _pkgrel=${_pkgrel}
+fi
 
 _pkgname=acpi_call
 pkgname=${_pkgname}${_kernelname}-parabola
 pkgver=1.1.0
-pkgrel=11.3 # linux-libre=11.3 | linux-libre-lts=7
+pkgrel=${_pkgrel}
 _extramodules=extramodules-${_basekernel}${_kernelname}
 pkgdesc="A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre${_kernelname} kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/bbswitch-parabola/PKGBUILD b/libre/bbswitch-parabola/PKGBUILD
index 9a664f09c..bdac305f6 100644
--- a/libre/bbswitch-parabola/PKGBUILD
+++ b/libre/bbswitch-parabola/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id: PKGBUILD 116821 2014-08-04 07:12:07Z tpowa $
 # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor (Arch): M0Rf30
 # Contributor (Arch): Samsagax <samsagax@gmail.com>
@@ -6,13 +5,37 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-_basekernel=3.16
 _kernelname=
+_basekernel=3.16
+_pkgrel=15.2
+
+if [[ ${_kernelname} == "" ]]; then
+  _basekernel=${_basekernel}
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -lts ]]; then
+  _basekernel=3.14
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -grsec ]]; then
+  _basekernel=3.15
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -lts-knock ]]; then
+  _basekernel=3.10
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -rt ]]; then
+  _basekernel=3.14
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -pae ]]; then
+  _basekernel=${_basekernel}
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -xen ]]; then
+  _basekernel=${_basekernel}
+  _pkgrel=${_pkgrel}
+fi
 
 _pkgname=bbswitch
 pkgname=${_pkgname}${_kernelname}-parabola
 pkgver=0.8
-pkgrel=15.2
+pkgrel=${_pkgrel}
 _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' 'mips64el')
diff --git a/libre/lirc-parabola/PKGBUILD b/libre/lirc-parabola/PKGBUILD
index e5d224805..f4136ff98 100644
--- a/libre/lirc-parabola/PKGBUILD
+++ b/libre/lirc-parabola/PKGBUILD
@@ -4,8 +4,32 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-_basekernel=3.16
 _kernelname=
+_basekernel=3.16
+_pkgrel=3.3
+
+if [[ ${_kernelname} == "" ]]; then
+  _basekernel=${_basekernel}
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -lts ]]; then
+  _basekernel=3.14
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -grsec ]]; then
+  _basekernel=3.15
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -lts-knock ]]; then
+  _basekernel=3.10
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -rt ]]; then
+  _basekernel=3.14
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -pae ]]; then
+  _basekernel=${_basekernel}
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -xen ]]; then
+  _basekernel=${_basekernel}
+  _pkgrel=${_pkgrel}
+fi
 
 pkgbase=lirc
 _pkgname=${pkgbase}${_kernelname}-parabola
@@ -16,7 +40,7 @@ else
 fi
 _pkgver=0.9.1a
 [[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver"
-pkgrel=3.3
+pkgrel=${_pkgrel}
 epoch=1
 _extramodules=extramodules-${_basekernel}${_kernelname}
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/tp_smapi-parabola-lts/PKGBUILD b/libre/tp_smapi-parabola-lts/PKGBUILD
deleted file mode 100644
index 99678a074..000000000
--- a/libre/tp_smapi-parabola-lts/PKGBUILD
+++ /dev/null
@@ -1,81 +0,0 @@
-# $Id: PKGBUILD 116831 2014-08-04 07:32:08Z tpowa $
-# Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor (Arch): xduugu
-# Contributor (Arch): nh2
-# Contributor (Arch): Steven Davidovitz <steviedizzle ð gmail đ com>
-# Contributor (Arch): Nick B <Shirakawasuna ð gmail đ com>
-# Contributor (Arch): Christof Musik <christof ð senfdax đ de>
-# Contributor (Arch): Stefan Rupp <archlinux ð stefanrupp đ de>
-# Contributor (Arch): Ignas Anikevicius <anikevicius ð gmail đ com>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Márcio Silva <coadde@parabola.nu>
-
-# Kernel info
-_basekernel=3.14
-_kernelname=-lts
-
-# Source info
-_pkgname=tp_smapi
-pkgver=0.41
-pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre${_kernelname} kernel package)"
-url='https://github.com/evgeni/tp_smapi'
-license=('GPL')
-source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
-md5sums=('63c683415c764568f6bf17c7eabe4752')
-
-# Package info
-pkgrel=29
-arch=('i686' 'x86_64' 'mips64el')
-install='kmod.install'
-
-# Generic (you shouldn't have to modify any of these variables)
-pkgname=${_pkgname}-parabola${_kernelname}
-_toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname}
-depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
-makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
-replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility
-conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility
-provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility
-if [[ -n "${_kernelname}" ]]; then
-  provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname
-fi
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
-  sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \
-	  -e "s#^(KBASE\s*:=).*\$#\1 /usr/lib/modules/${_kernver}#" Makefile
-
-  make HDAPS=1
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
-  # Set the correct extramodules directory for install
-  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
-  true && install=${install}.pkg
-  sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}"
-
-  # Actually install
-  make -C "/usr/lib/modules/${_kernver}/build" \
-    INSTALL_MOD_PATH="${pkgdir}/usr" \
-    M="${srcdir}/${_pkgname}-${pkgver}" modules_install
-
-  cd "${pkgdir}/usr/lib/modules"
-  mv "${_kernver}/extra" "${_extramodules}"
-  rmdir "${_kernver}"
-
-  # compress kernel modules
-  find "${pkgdir}" -name "*.ko" -exec gzip -9 {} +
-
-  # load module on startup
-  install -dm 755 "${pkgdir}/usr/lib/modules-load.d"
-  echo ${_pkgname} > "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf"
-}
diff --git a/libre/tp_smapi-parabola-lts/kmod.install b/libre/tp_smapi-parabola-lts/kmod.install
deleted file mode 100644
index d4bd8cb34..000000000
--- a/libre/tp_smapi-parabola-lts/kmod.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  _extramodules=THIS_IS_AUTOMATICALLY_SET_BY_PKGBUILD
-  depmod $(cat /usr/lib/modules/${_extramodules}/version)
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/libre/tp_smapi-parabola/PKGBUILD b/libre/tp_smapi-parabola/PKGBUILD
index 8f73ab13f..0a789ecb9 100644
--- a/libre/tp_smapi-parabola/PKGBUILD
+++ b/libre/tp_smapi-parabola/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id: PKGBUILD 116831 2014-08-04 07:32:08Z tpowa $
 # Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor (Arch): xduugu
 # Contributor (Arch): nh2
@@ -11,36 +10,55 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-# Kernel info
-_basekernel=3.16
 _kernelname=
+_basekernel=3.16
+_pkgrel=1
+
+if [[ ${_kernelname} == "" ]]; then
+  _basekernel=${_basekernel}
+  _pkgrel=52.2
+elif [[ ${_kernelname} == -lts ]]; then
+  _basekernel=3.14
+  _pkgrel=29.1
+elif [[ ${_kernelname} == -grsec ]]; then
+  _basekernel=3.15
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -lts-knock ]]; then
+  _basekernel=3.10
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -rt ]]; then
+  _basekernel=3.14
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -pae ]]; then
+  _basekernel=${_basekernel}
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -xen ]]; then
+  _basekernel=${_basekernel}
+  _pkgrel=${_pkgrel}
+fi
 
-# Source info
 _pkgname=tp_smapi
+pkgname=${_pkgname}${_kernelname}-parabola
 pkgver=0.41
+pkgrel=${_pkgrel}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre${_kernelname} kernel package)"
+arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
-source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
-md5sums=('63c683415c764568f6bf17c7eabe4752')
-
-# Package info
-pkgrel=52.1
-arch=('i686' 'x86_64' 'mips64el')
-install='kmod.install'
 
 # Generic (you shouldn't have to modify any of these variables)
-pkgname=${_pkgname}-parabola${_kernelname}
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname}
 depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
-replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility
-conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility
-provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility
-if [[ -n "${_kernelname}" ]]; then
-  provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname
-fi
+
+replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}")
+conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}")
+provides=("${_pkgname}${_kernelname}=${pkgver}")
+
+install='kmod.install'
+source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
+md5sums=('63c683415c764568f6bf17c7eabe4752')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
@@ -54,15 +72,8 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
-  # Set the correct extramodules directory for install
-  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
-  true && install=${install}.pkg
-  sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}"
-
   # Actually install
   make -C "/usr/lib/modules/${_kernver}/build" \
     INSTALL_MOD_PATH="${pkgdir}/usr" \
@@ -77,5 +88,10 @@ package() {
 
   # load module on startup
   install -dm 755 "${pkgdir}/usr/lib/modules-load.d"
-  echo ${_pkgname} > "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf"
+  echo ${_pkgname} > "${pkgdir}/usr/lib/modules-load.d/${_pkgname}${_kernelname}.conf"
+
+  # Set the correct extramodules directory for install
+  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+  true && install=${install}.pkg
+  sed -i "s/^_EXTRAMODULES=.*/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}"
 }
diff --git a/libre/tp_smapi-parabola/kmod.install b/libre/tp_smapi-parabola/kmod.install
index d4bd8cb34..40caa464f 100644
--- a/libre/tp_smapi-parabola/kmod.install
+++ b/libre/tp_smapi-parabola/kmod.install
@@ -1,14 +1,14 @@
+_EXTRAMODULES=
+
 post_install() {
-  _extramodules=THIS_IS_AUTOMATICALLY_SET_BY_PKGBUILD
-  depmod $(cat /usr/lib/modules/${_extramodules}/version)
+	echo ">>> Updating module dependencies. Please wait ..."
+	depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1
 }
 
 post_upgrade() {
-  post_install
+	post_install
 }
 
 post_remove() {
-  post_install
+	post_install
 }
-
-# vim: ts=2 sw=2 et:
diff --git a/libre/vhba-module-parabola/PKGBUILD b/libre/vhba-module-parabola/PKGBUILD
index aa392ecb8..18e863bf6 100644
--- a/libre/vhba-module-parabola/PKGBUILD
+++ b/libre/vhba-module-parabola/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id: PKGBUILD 116828 2014-08-04 07:19:43Z tpowa $
 # Maintainer (Arch): Ray Rashif <schiv@archlinux.org>
 # Contributor (Arch): Mateusz Herych <heniekk@gmail.com>
 # Contributor (Arch): Charles Lindsay <charles@chaoslizard.org>
@@ -6,39 +5,58 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-# Kernel info
-_basekernel=3.16
 _kernelname=
+_basekernel=3.16
+_pkgrel=6.2
+
+if [[ ${_kernelname} == "" ]]; then
+  _basekernel=${_basekernel}
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -lts ]]; then
+  _basekernel=3.14
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -grsec ]]; then
+  _basekernel=3.15
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -lts-knock ]]; then
+  _basekernel=3.10
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -rt ]]; then
+  _basekernel=3.14
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -pae ]]; then
+  _basekernel=${_basekernel}
+  _pkgrel=${_pkgrel}
+elif [[ ${_kernelname} == -xen ]]; then
+  _basekernel=${_basekernel}
+  _pkgrel=${_pkgrel}
+fi
 
-# Source info
 _pkgname=vhba-module
+pkgname=${_pkgname}${_kernelname}-parabola
 pkgver=20140629
+pkgrel=${_pkgrel}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre${_kernelname} kernel package)"
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
-source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2"
-        '60-vhba.rules')
-md5sums=('6b307a80df9c163768cc7ecb3ccebb71'
-         '4dc37dc348b5a2c83585829bde790dcc')
-
-# Package info
-pkgrel=6.1
-arch=('i686' 'x86_64' 'mips64el')
-options=(!makeflags)
-install=$_pkgname.install
 
 # Generic (you shouldn't have to modify any of these variables)
-pkgname=${_pkgname}-parabola${_kernelname}
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname}
 depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
-replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility
-conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility
-provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility
-if [[ -n "${_kernelname}" ]]; then
-  provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname
-fi
+
+replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}")
+conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}")
+provides=("${_pkgname}${_kernelname}=${pkgver}")
+
+options=(!makeflags)
+install='kmod.install'
+source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2"
+        '60-vhba.rules')
+md5sums=('6b307a80df9c163768cc7ecb3ccebb71'
+         '4dc37dc348b5a2c83585829bde790dcc')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
@@ -51,12 +69,14 @@ build() {
 package() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
-  # Set the correct extramodules directory for install
-  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
-  true && install=${install}.pkg
-  sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}"
-
   # Actually install
   install -Dm644 vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko"
   install -Dm644 ../60-vhba.rules "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
+
+  # Set the correct extramodules directory for install
+  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+  true && install=${install}.pkg
+  sed -i "s/^_EXTRAMODULES=.*/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/vhba-module-parabola/kmod.install b/libre/vhba-module-parabola/kmod.install
new file mode 100644
index 000000000..08ecfbfba
--- /dev/null
+++ b/libre/vhba-module-parabola/kmod.install
@@ -0,0 +1,20 @@
+_EXTRAMODULES=
+
+_post_install() {
+	echo ">>> Updating module dependencies. Please wait ..."
+	depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1
+}
+
+post_install() {
+	_post_install
+	getent group cdemu &>/dev/null || groupadd -r cdemu
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	_post_install
+	groupdel cdemu
+}
diff --git a/libre/vhba-module-parabola/vhba-module.install b/libre/vhba-module-parabola/vhba-module.install
deleted file mode 100644
index 04d26b27b..000000000
--- a/libre/vhba-module-parabola/vhba-module.install
+++ /dev/null
@@ -1,20 +0,0 @@
-_updatemod() {
-  _extramodules=THIS_IS_AUTOMATICALLY_SET_BY_PKGBUILD
-  depmod $(cat /usr/lib/modules/${_extramodules}/version)
-}
-
-post_install() {
-  getent group cdemu &>/dev/null || groupadd -r cdemu
-  _updatemod
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  _updatemod
-  groupdel cdemu
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/grub-legacy/040_all_grub-0.96-nxstack.patch b/pcr/grub-legacy/040_all_grub-0.96-nxstack.patch
index 121941c75..121941c75 100644
--- a/libre/grub-legacy/040_all_grub-0.96-nxstack.patch
+++ b/pcr/grub-legacy/040_all_grub-0.96-nxstack.patch
diff --git a/libre/grub-legacy/05-grub-0.97-initrdaddr.diff b/pcr/grub-legacy/05-grub-0.97-initrdaddr.diff
index ccf5f3e54..ccf5f3e54 100644
--- a/libre/grub-legacy/05-grub-0.97-initrdaddr.diff
+++ b/pcr/grub-legacy/05-grub-0.97-initrdaddr.diff
diff --git a/libre/grub-legacy/PKGBUILD b/pcr/grub-legacy/PKGBUILD
index f1527d61f..f1527d61f 100644
--- a/libre/grub-legacy/PKGBUILD
+++ b/pcr/grub-legacy/PKGBUILD
diff --git a/libre/grub-legacy/automake-pkglib.patch b/pcr/grub-legacy/automake-pkglib.patch
index a3fff27a1..a3fff27a1 100644
--- a/libre/grub-legacy/automake-pkglib.patch
+++ b/pcr/grub-legacy/automake-pkglib.patch
diff --git a/libre/grub-legacy/ext4.patch b/pcr/grub-legacy/ext4.patch
index 8a2f9bdb0..8a2f9bdb0 100644
--- a/libre/grub-legacy/ext4.patch
+++ b/pcr/grub-legacy/ext4.patch
diff --git a/libre/grub-legacy/grub-0.97-ldflags-objcopy-remove-build-id.patch b/pcr/grub-legacy/grub-0.97-ldflags-objcopy-remove-build-id.patch
index 2b7cc32d0..2b7cc32d0 100644
--- a/libre/grub-legacy/grub-0.97-ldflags-objcopy-remove-build-id.patch
+++ b/pcr/grub-legacy/grub-0.97-ldflags-objcopy-remove-build-id.patch
diff --git a/libre/grub-legacy/grub-inode-size.patch b/pcr/grub-legacy/grub-inode-size.patch
index f5ceb110b..f5ceb110b 100644
--- a/libre/grub-legacy/grub-inode-size.patch
+++ b/pcr/grub-legacy/grub-inode-size.patch
diff --git a/libre/grub-legacy/grub.install b/pcr/grub-legacy/grub.install
index c1f077d59..c1f077d59 100644
--- a/libre/grub-legacy/grub.install
+++ b/pcr/grub-legacy/grub.install
diff --git a/libre/grub-legacy/i2o.patch b/pcr/grub-legacy/i2o.patch
index 2af846c90..2af846c90 100644
--- a/libre/grub-legacy/i2o.patch
+++ b/pcr/grub-legacy/i2o.patch
diff --git a/libre/grub-legacy/install-grub b/pcr/grub-legacy/install-grub
index affc9c38a..affc9c38a 100644
--- a/libre/grub-legacy/install-grub
+++ b/pcr/grub-legacy/install-grub
diff --git a/libre/grub-legacy/intelmac.patch b/pcr/grub-legacy/intelmac.patch
index a3fabc733..a3fabc733 100644
--- a/libre/grub-legacy/intelmac.patch
+++ b/pcr/grub-legacy/intelmac.patch
diff --git a/libre/grub-legacy/menu.lst b/pcr/grub-legacy/menu.lst
index f405baa91..f405baa91 100644
--- a/libre/grub-legacy/menu.lst
+++ b/pcr/grub-legacy/menu.lst
diff --git a/libre/grub-legacy/more-raid.patch b/pcr/grub-legacy/more-raid.patch
index 39db23474..39db23474 100644
--- a/libre/grub-legacy/more-raid.patch
+++ b/pcr/grub-legacy/more-raid.patch
diff --git a/libre/grub-legacy/special-devices.patch b/pcr/grub-legacy/special-devices.patch
index 894f3e887..894f3e887 100644
--- a/libre/grub-legacy/special-devices.patch
+++ b/pcr/grub-legacy/special-devices.patch