3 files changed, 21 insertions, 18 deletions
diff --git a/libre/acpi_call-parabola/PKGBUILD b/libre/acpi_call-parabola/PKGBUILD
index 251e856f5..e211d9ada 100644
--- a/libre/acpi_call-parabola/PKGBUILD
+++ b/libre/acpi_call-parabola/PKGBUILD
@@ -10,9 +10,9 @@ _basekernel=3.16
 _kernelname= # libre/linux-libre{,-lts}
 
 _pkgname=acpi_call
-pkgname=${_pkgname}-parabola${_kernelname}
+pkgname=${_pkgname}${_kernelname}-parabola
 pkgver=1.1.0
-pkgrel=11.2
+pkgrel=11.3 # linux-libre=11.3 | linux-libre-lts=7
 _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')
@@ -24,12 +24,11 @@ _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}")
 
-_replaces=("${_pkgname}" "${_pkgname}-libre")
-_provides=("${_pkgname}")
-
-replaces=( "${_replaces[@]/%/${_kernelname}}")
-conflicts=("${_replaces[@]/%/${_kernelname}}")
-provides=( "${_provides[@]/%/${_kernelname}=${pkgver}}")
+replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}")
+[[ -n ${_kernelname} ]] && replaces+=("${_pkgname}-parabola${_kernelname}")
+conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}")
+[[ -n ${_kernelname} ]] && conflicts+=("${_pkgname}-parabola${_kernelname}")
+provides=("${_pkgname}${_kernelname}=${pkgver}")
 
 install='kmod.install'
 source=("${url}/archive/v${pkgver}.tar.gz")
@@ -55,10 +54,10 @@ package() {
   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
+  echo ${_pkgname} > "${pkgdir}"/usr/lib/modules-load.d/${_pkgname}${_kernelname}.conf
 
-  install -dm 755 "${pkgdir}"/usr/share/${pkgname}
-  cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${pkgname}/
+  install -dm 755 "${pkgdir}"/usr/share/${_pkgname}${_kernelname}
+  cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${_pkgname}${_kernelname}/
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/libre/bbswitch-parabola/PKGBUILD b/libre/bbswitch-parabola/PKGBUILD
index 209f58cec..9a664f09c 100644
--- a/libre/bbswitch-parabola/PKGBUILD
+++ b/libre/bbswitch-parabola/PKGBUILD
@@ -10,13 +10,13 @@ _basekernel=3.16
 _kernelname=
 
 _pkgname=bbswitch
-pkgname=${_pkgname}-parabola${_kernelname}
+pkgname=${_pkgname}${_kernelname}-parabola
 pkgver=0.8
+pkgrel=15.2
 _extramodules=extramodules-${_basekernel}${_kernelname}
-pkgrel=15.1
 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')
-url="http://github.com/Bumblebee-Project/bbswitch"
+url="http://github.com/Bumblebee-Project/${_pkgname}"
 license=('GPL')
 
 # Generic (you shouldn't have to modify any of these variables)
@@ -46,9 +46,9 @@ package() {
   # 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}"
+  sed -i "s/^_EXTRAMODULES=.*/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}"
 
   # Actually install
-  install -Dm644 bbswitch.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/bbswitch.ko
-  gzip "${pkgdir}/usr/lib/modules/${_extramodules}/bbswitch.ko"                      
+  install -Dm644 ${_pkgname}.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/${_pkgname}.ko
+  gzip "${pkgdir}/usr/lib/modules/${_extramodules}/${_pkgname}.ko"
 }
diff --git a/libre/lirc-parabola/PKGBUILD b/libre/lirc-parabola/PKGBUILD
index 0a5ac892e..e5d224805 100644
--- a/libre/lirc-parabola/PKGBUILD
+++ b/libre/lirc-parabola/PKGBUILD
@@ -9,7 +9,11 @@ _kernelname=
 
 pkgbase=lirc
 _pkgname=${pkgbase}${_kernelname}-parabola
-pkgname=("$_pkgname" "${pkgbase}-utils-parabola")
+if [[ -z ${_kernelname} ]]; then
+  pkgname=("$_pkgname" "${pkgbase}-utils-parabola")
+else
+  pkgname=("$_pkgname")
+fi
 _pkgver=0.9.1a
 [[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver"
 pkgrel=3.3