From 7b0cdd65ac7bcd3c7597b528a10de58e4e0a430f Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 9 Nov 2011 23:14:53 +0000
Subject: Wed Nov  9 23:14:53 UTC 2011

---
 extra/lirc/PKGBUILD     | 15 ++++++++-------
 extra/lirc/lirc.install |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'extra/lirc')

diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD
index c5525ea12..23c2a1437 100644
--- a/extra/lirc/PKGBUILD
+++ b/extra/lirc/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 133620 2011-07-30 06:46:23Z ibiru $
+# $Id: PKGBUILD 142392 2011-11-08 22:38:56Z thomas $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=6
+pkgrel=8
 epoch=1
-_kernver=3.0-ARCH
+_extramodules=extramodules-3.1-ARCH
+_kernver="$(cat /lib/modules/${_extramodules}/version)"
 arch=('i686' 'x86_64')
 url="http://www.lirc.org/"
 license=('GPL')
-makedepends=('help2man' 'linux-headers>=3.0' 'linux-headers<3.1' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python')
+makedepends=('help2man' 'linux-headers>=3.1' 'linux-headers<3.2' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
@@ -60,15 +61,15 @@ build() {
 
 package_lirc() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'linux>=3.0' 'linux<3.1')
+  depends=('lirc-utils' 'linux>=3.1' 'linux<3.2')
   replaces=('lirc+pctv')
   install=lirc.install
 
   cd "${srcdir}/lirc-${pkgver}/drivers"
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install
 
   # set the kernel we've built for inside the install script
-  sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" "${startdir}/lirc.install"
+  sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install"
   # gzip -9 modules
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
 }
diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install
index 0d42e8a5c..1e7c4f4a1 100644
--- a/extra/lirc/lirc.install
+++ b/extra/lirc/lirc.install
@@ -1,9 +1,9 @@
-KERNEL_VERSION=3.0-ARCH
+EXTRAMODULES=extramodules-3.1-ARCH
 
 post_install() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  depmod $KERNEL_VERSION > /dev/null 2>&1
+  depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
 }
 
 post_upgrade() {
-- 
cgit v1.2.3-54-g00ecf