Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

8 files changed, 67 insertions, 19 deletions

diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
new file mode 100644
index 000000000..4f4b5fd44
--- /dev/null
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: M0Rf30
+# Contributor: Samsagax <samsagax@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=bbswitch
+pkgname=bbswitch-libre
+pkgver=0.6
+_extramodules=extramodules-3.8-LIBRE # Don't forget to update bbswitch.install
+pkgrel=2
+pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
+arch=('i686' 'x86_64' 'mips64el')
+url=("http://github.com/Bumblebee-Project/bbswitch")
+license=('GPL')
+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
+install=bbswitch.install
+source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
+md5sums=('c5496e3225c8e70d02a24bfd8a50faf6')
+
+build() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+   
+  make KDIR=/usr/src/linux-${_kernver}
+}
+
+package() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+   
+  install -Dm644 bbswitch.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/bbswitch.ko
+  gzip "${pkgdir}/usr/lib/modules/${_extramodules}/bbswitch.ko"                      
+}
diff --git a/libre/bbswitch-libre/bbswitch.install b/libre/bbswitch-libre/bbswitch.install
new file mode 100644
index 000000000..ed6f7348d
--- /dev/null
+++ b/libre/bbswitch-libre/bbswitch.install
@@ -0,0 +1,12 @@
+post_install() {
+    EXTRAMODULES='extramodules-3.8-LIBRE'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 290eff882..c519fb4a1 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -6,15 +6,17 @@
 _pkgname=cdfs
 pkgname=cdfs-libre
 pkgver=2.6.27
-pkgrel=38
+_extramodules=extramodules-3.8-LIBRE # Don't forget to update cdfs.install
+pkgrel=39
 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)"
 arch=(i686 x86_64 mips64el)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
 license=('GPL')
+depends=('linux-libre>=3.8' 'linux-libre<3.9')
 makedepends=('linux-libre-headers')
-replaces=('cdfs')
-conflicts=('cdfs')
-provides=("cdfs=${pkgver}")
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
 install=cdfs.install
 source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$_pkgname-$pkgver.tar.bz2"
 	"cdfs-3.0.patch"
@@ -27,22 +29,19 @@ md5sums=('ac64c014a90e3c488394832ea29605b3'
          '9215e7bdac728bd2f889fb525e543454'
          'b036fd72b033294605bec2b60a73e3bd')
 
-_kernver=`pacman -Q linux-libre | cut -d . -f 2 | cut -f 1 -d -`
-_kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-LIBRE/version`
-
 build() {
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+
   cd $srcdir/$_pkgname-$pkgver
   patch -p1 <$srcdir/cdfs-3.0.patch
   patch -p1 <$srcdir/cdfs-3.2.patch
   patch -p1 <$srcdir/cdfs-3.4.patch
   patch -p1 <$srcdir/cdfs-3.8.patch
-  make KDIR=/usr/lib/modules/${_kernverfull}/build
-  sed -i "s|extramodules-.*-LIBRE|extramodules-3.${_kernver}-LIBRE|" $startdir/cdfs.install
+  make KDIR=/usr/lib/modules/${_kernver}/build
+  sed -i "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" $startdir/cdfs.install
 }
 
 package() {
-  depends=("linux-libre>=3.${_kernver}" "linux-libre<3.`expr ${_kernver} + 1`")
-
   cd $srcdir/$_pkgname-$pkgver
-  install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-LIBRE/cdfs.ko
+  install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/$_extramodules/cdfs.ko
 }
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index cd58ec570..f647e3913 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179608 2013-03-08 09:28:44Z foutrelis $
+# $Id: PKGBUILD 181035 2013-03-30 11:31:35Z foutrelis $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -6,7 +6,7 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=39
+pkgrel=40
 epoch=1
 _extramodules=extramodules-3.8-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 188f92b37..2fda312b6 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -12,7 +12,7 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=15
+pkgrel=16
 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'
diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD
index 85366a600..531f87a73 100644
--- a/libre/unar/PKGBUILD
+++ b/libre/unar/PKGBUILD
@@ -3,12 +3,12 @@
 
 pkgname=unar
 pkgver=1.5
-pkgrel=1
+pkgrel=3
 pkgdesc="An Objective-C application for uncompressing archive files"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://unarchiver.c3.cx/"
 license=('LGPL2.1')
-depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
+depends=('gnustep-base' 'openssl' 'bzip2' 'icu=51.1' 'gcc-libs' 'zlib')
 makedepends=('gcc-objc')
 replaces=("unarchiver")
 conflicts=("unarchiver")
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index ced6d2085..764beed0d 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -8,7 +8,7 @@ _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20120422
 _extramodules=extramodules-3.8-LIBRE
-pkgrel=18
+pkgrel=19
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 570a95b13..45bbfb86d 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
 pkgver=4.2.10
 _extramodules=extramodules-3.8-LIBRE
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')