lirc-utils: update to 0.8.7

ref #574
ref #647
ref #599

1 files changed, 51 insertions, 52 deletions

diff --git a/abs/core/lirc-utils/PKGBUILD b/abs/core/lirc-utils/PKGBUILD
index 9eff254..2a87688 100644
--- a/abs/core/lirc-utils/PKGBUILD
+++ b/abs/core/lirc-utils/PKGBUILD
@@ -1,79 +1,78 @@
-# $Id: PKGBUILD 56261 2009-10-20 19:13:10Z hugo $
-# Maintainer: Paul Mattal <paul@archlinux.org>
+# $Id: PKGBUILD 97719 2010-11-01 14:41:14Z tpowa $
+# Maintainer:
+# Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=lirc-utils
-pkgver=0.8.6
-pkgrel=4
+pkgver=0.8.7
+pkgrel=1
 pkgdesc="Linux Infrared Remote Control utils"
 arch=('i686' 'x86_64')
 url="http://www.lirc.org/"
 license=('GPL')
-_kernver=2.6.34-ARCH
-depends=('alsa-lib' 'libusb' 'libx11' 'libsm' 'python' 'libftdi')
-makedepends=('help2man')
+_kernver=2.6.36-LinHES
+depends=('alsa-lib' 'libusb' 'libx11' 'libsm' 'python2' 'libftdi')
+makedepends=('help2man' 'kernel26-headers')
 replaces=('lirc+pctv')
-backup=('etc/conf.d/lircd.conf' 'etc/conf.d/lircmd.conf' 'etc/lirc/lircd.conf')
+backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
 options=('!libtool' '!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/lirc/lirc-$pkgver.tar.bz2
-	lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd kernel-2.6.33.patch)
+source=("http://downloads.sourceforge.net/lirc/lirc-${pkgver}.tar.bz2"
+	lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
+md5sums=('fb1dcddbc8ca3d03c7f3a2d40cf28b71'
+         '680ea3732ab367c0b24a5acb566d5446'
+         '85f7fdac55e5256967241864049bf5e9'
+         '3deb02604b37811d41816e9b4385fcc3'
+         '5b1f8c9cd788a39a6283f93302ce5c6e'
+         'f0c0ac930326168035f0c8e24357ae55'
+         '618ca4f666341d6ade8c616ce59f4d1b')
 
 build() {
-	# configure
-	cd ${srcdir}/lirc-$pkgver || return 1
-
-	patch -p0 < ../kernel-2.6.33.patch || return 1
-
-      # Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+
-	sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am || return 1
+	cd "${srcdir}/lirc-${pkgver}"
 
-	autoreconf || return 1
-	libtoolize || return 1
+	autoreconf
+	libtoolize
 
-	./configure --enable-sandboxed --prefix=/usr \
-	--with-driver=all --with-kerneldir=/usr/src/linux-${_kernver} \
-	--with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
-	--with-transmitter \
-		|| return 1
+	./configure --enable-sandboxed \
+	  --prefix=/usr \
+	  --with-driver=all \
+	  --with-kerneldir=/usr/src/linux-${_kernver} \
+	  --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
+	  --with-transmitter
 	# disable parallel and bt829
         # because of incompatibility with smp systems
         sed -i -e "s:lirc_parallel::" -e "s:lirc_bt829::" \
-		Makefile drivers/Makefile drivers/*/Makefile tools/Makefile \
-                || return 1
+		Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
+	# lirc_i2c  lirc_igorplugusb  lirc_imon  lirc_it87  lirc_ite8709
+        # lirc_sasem  lirc_serial  lirc_sir lirc_ttusbir lirc_zilog
+        # because part of kernel 2.6.36 staging tree
+        sed -i -e "s:lirc_i2c::" -e "s:lirc_igorplugusb::" -e "s:lirc_imon::" \
+		-e "s:lirc_it87::" -e "s:lirc_ite8709::" -e "s:lirc_sasem::" \
+		-e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
+		-e "s:lirc_zilog::" Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
+	# Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+
+	sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am
 
-  	# build
-	make || return 1
-	make DESTDIR=${pkgdir} install || return 1
-	mkdir -p ${pkgdir}/usr/share/lirc ${pkgdir}/etc/rc.d \
-		|| return 1
-	cp ${srcdir}/{lircd,lircmd,irexecd} ${pkgdir}/etc/rc.d/ \
-		|| return 1
-	cp -rp remotes ${pkgdir}/usr/share/lirc || return 1
-	chmod -R go-w ${pkgdir}/usr/share/lirc/ || return 1
+	make
+}
 
+package() {
+	cd "${srcdir}/lirc-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
+	cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
+	cp -rp remotes "${pkgdir}/usr/share/lirc"
+	chmod -R go-w "${pkgdir}/usr/share/lirc/"
 
 	# install the logrotate config
-    	install -D -m644 ${srcdir}/lirc.logrotate \
-        	${pkgdir}/etc/logrotate.d/lirc || return 1
+    	install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
     
 	# install conf.d file
-	install -D -m644 ${srcdir}/lircd.conf \
-        	${pkgdir}/etc/conf.d/lircd.conf || return 1
+	install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf"
 
 	# install conf.d file
-        install -D -m644 ${srcdir}/irexec.conf \
-                ${pkgdir}/etc/conf.d/irexec.conf || return 1
+        install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf"
 
-	install -d -m755 ${pkgdir}/etc/lirc || return 1
-	install -d -m755 ${pkgdir}/var/run/lirc || return 1
+	install -d "${pkgdir}/etc/lirc"
 
 	# remove built modules
-	rm -r ${pkgdir}/lib/
+	rm -r "${pkgdir}/lib/"
 }
-md5sums=('4ca24da6f5e7c2dcea74878c27a4a3f7'
-         '310f718169b16b6afa6615fa53a0ef21'
-         '85f7fdac55e5256967241864049bf5e9'
-         '3deb02604b37811d41816e9b4385fcc3'
-         '5b1f8c9cd788a39a6283f93302ce5c6e'
-         'f0c0ac930326168035f0c8e24357ae55'
-         '618ca4f666341d6ade8c616ce59f4d1b'
-         'f029698154cf32bc51e5e69879d53a12')