Version bump, ARCH fix, xbox support

5 files changed, 246 insertions, 14 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 4cf9f74fec07..a76e44920816 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -3,6 +3,11 @@
 # /home/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.21 2004/03/08 14:56:09
 # lanius Exp $
 
+*lirc-0.7.0_pre6 (30 Jun 2004)
+
+  30 Jun 2004; Chris Bainbridge <chrb@gentoo.org> +lirc-0.7.0_pre6.ebuild:
+  Version bump,  fix ARCH and xbox config support
+
   26 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> lirc-0.7.0_pre4.ebuild:
   Marked stable on amd64.
 
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 71321d029a9d..6aba89967d8c 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b36eeb45cd217783a08d5c5e5347b903 ChangeLog 4083
 MD5 256d7c801b667be2e7d9618697d3e6a1 lirc-0.6.6-r1.ebuild 3869
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 9dec01b704006290727d5bf8d5c7fb3b lirc-0.7.0_pre3.ebuild 4430
 MD5 d7e65d3e5d5055f4abb377135c873589 lirc-0.7.0_pre4.ebuild 4491
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 de6c42545057a4673d60f85c7a7d7d16 lirc-0.7.0_pre6.ebuild 4614
+MD5 ee2b49c33fb3b2a65122cfc698d9e100 files/xbox-lircd.conf 784
 MD5 eb1d5f40e0d59edbc1ac2a097cea5850 files/digest-lirc-0.6.6-r1 63
+MD5 cec75bc2acbedddba62b71993bf9981c files/digest-lirc-0.7.0_pre3 67
+MD5 03a0569271c2917b330754938b62cae7 files/digest-lirc-0.7.0_pre4 67
 MD5 6031968a1ddb51ff5265d1f22bd2d237 files/lirc-0.6.6-gentoo.diff.bz2 2215
-MD5 6be29381442461f310f47cb0552e6950 files/lircd 483
 MD5 d0d865cbe48f328fb4cfb41e22d4407b files/lirc-0.7.0_pre2-i2c.patch.gz 705
+MD5 f275b602a7ec5ed176e7db5597205bcb files/lircd 482
 MD5 ce31954d209c4e81861d7e3c76aaa91e files/lircd.conf 71
-MD5 cec75bc2acbedddba62b71993bf9981c files/digest-lirc-0.7.0_pre3 67
-MD5 03a0569271c2917b330754938b62cae7 files/digest-lirc-0.7.0_pre4 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA35bjHTu7gpaalycRAnuJAKDQRBcQAG4KFf2WkafWwp88h21hvQCgjMbb
-IlPcXcUBDbt+pNw3xkFhkuo=
-=8SGr
------END PGP SIGNATURE-----
+MD5 9d17cef262495b7318c8929900877365 files/digest-lirc-0.7.0_pre6 67
diff --git a/app-misc/lirc/files/digest-lirc-0.7.0_pre6 b/app-misc/lirc/files/digest-lirc-0.7.0_pre6
new file mode 100644
index 000000000000..38727ef2208b
--- /dev/null
+++ b/app-misc/lirc/files/digest-lirc-0.7.0_pre6
@@ -0,0 +1 @@
+MD5 d1b6f241673cc7404b1a11eaf137bcfc lirc-0.7.0pre6.tar.bz2 448090
diff --git a/app-misc/lirc/files/xbox-lircd.conf b/app-misc/lirc/files/xbox-lircd.conf
new file mode 100644
index 000000000000..d16e9931034e
--- /dev/null
+++ b/app-misc/lirc/files/xbox-lircd.conf
@@ -0,0 +1,55 @@
+#
+# LIRCD configuration file for Xbox DVD Kit
+#
+# Marko Friedemann <mfr@bmx-chemnitz.de>
+#
+#
+# brand:             Microsoft
+# model:             Xbox DVD Remote
+# supported devices: Xbox DVD Remote via xpad-ir driver
+#
+# comment:           EXPERIMENTAL 
+#
+
+begin remote
+
+    name  XboxDVDDongle
+    bits           8
+
+    begin codes
+      
+        SELECT		0x0b
+	UP		0xa6
+        DOWN		0xa7
+	RIGHT		0xa8
+        LEFT		0xa9
+	INFO		0xc3
+	
+        9		0xc6
+	8		0xc7
+        7		0xc8
+	6		0xc9
+        5		0xca
+	4		0xcb
+        3		0xcc
+	2		0xcd
+        1		0xce
+	0		0xcf
+	
+        DISPLAY		0xd5
+	BACK		0xd8
+        SKIP+		0xdd
+	SKIP-		0xdf
+        STOP		0xe0
+	REVERSE		0xe2
+        FORWARD		0xe3
+	TITLE		0xe5
+        PAUSE		0xe6
+	PLAY		0xea
+        MENU		0xf7
+	  
+      end codes
+
+end remote
+
+
diff --git a/app-misc/lirc/lirc-0.7.0_pre6.ebuild b/app-misc/lirc/lirc-0.7.0_pre6.ebuild
new file mode 100644
index 000000000000..9724d1465a31
--- /dev/null
+++ b/app-misc/lirc/lirc-0.7.0_pre6.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.7.0_pre6.ebuild,v 1.1 2004/06/30 18:26:03 chrb Exp $
+
+inherit eutils kernel-mod
+
+DESCRIPTION="LIRC is a package that allows you to decode and send infra-red \
+	signals of many (but not all) commonly used remote controls."
+HOMEPAGE="http://www.lirc.org"
+
+# LIRC_OPTS = ???? v
+# This are the defaults. With this support for all supported remotes
+# will be build.
+# If you want other options then set the Environment variable to your needs.
+
+# Note: If you don't specify the driver configure becomes interactiv.
+
+# You have to know, which driver you want;
+# --with-driver=X
+
+# where X is one of:
+# none, any, animax, avermedia, avermedia98,
+# bestbuy, bestbuy2, caraca, chronos, comX,
+# cph03x, cph06x, creative, fly98, flyvideo,
+# hauppauge,hauppauge_dvb, ipaq, irdeo,
+# irdeo_remote, irman, irreal, it87, knc_one,
+# logitech, lptX, mediafocusI, packard_bell,
+# parallel, pctv, pixelview_bt878,
+# pixelview_pak, pixelview_pro, provideo,
+# realmagic, remotemaster, serial, silitek,
+# sir, slinke, tekram, winfast_tv2000
+
+# This could be usefull too
+
+# --with-port=port	# port number for the lirc device.
+# --with-irq=irq	# irq line for the lirc device.
+# --with-timer=value	# timer value for the parallel driver
+# --with-tty=file	# tty to use (Irman, RemoteMaster, etc.)
+# --without-soft-carrier	# if your serial hw generates carrier
+# --with-transmitter	# if you use a transmitter diode
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+KEYWORDS="~x86 ~ppc ~alpha ~ia64 amd64"
+
+DEPEND="virtual/linux-sources"
+
+MY_P=${P/_/}
+
+SRC_URI="http://lirc.sourceforge.net/software/snapshots/${MY_P}.tar.bz2"
+
+S=${WORKDIR}/${MY_P}
+
+is_SMP() {
+	# We have a SMP enabled kernel?
+	if [ ! -z "`uname -v | grep SMP`" ]
+	then
+		return 0
+	else
+		return 1
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed	-i -e "s:-O2 -g:${CFLAGS}:" configure configure.in
+}
+
+src_compile() {
+	ewarn "If you are using a 2.6 kernel you have to patch it for lirc support."
+	ewarn "There are several patches floating around, one of them can be found at "
+	ewarn "http://flameeyes.web.ctonet.it/."
+
+	# Let portage tell us where to put our modules
+	check_KV
+
+	[ "x${LIRC_OPTS}" = x ] && LIRC_OPTS="--with-driver=serial \
+		--with-port=0x3f8 --with-irq=4"
+
+	unset ARCH
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--with-kerneldir="/usr/src/linux" \
+		--with-moduledir="/lib/modules/${KV}/misc" \
+		--disable-manage-devices \
+		--enable-sandboxed \
+		--with-syslog=LOG_DAEMON \
+		${LIRC_OPTS} || die "./configure failed"
+
+	if kernel-mod_is_2_6_kernel; then
+		(cd daemons; emake) || die
+		(cd tools; emake) || die
+		(cd doc; emake) || die
+	else
+		emake || die
+
+		case ${LIRC_OPTS}
+		in
+		  *"any"*)
+			if is_SMP; then
+				# The parallel driver will not work with SMP kernels
+				# so we need to compile without it
+				emake -C drivers "SUBDIRS=lirc_dev lirc_serial \
+				lirc_sir lirc_it87 lirc_i2c lirc_gpio" || die
+			else
+				emake -C drivers "SUBDIRS=lirc_dev lirc_serial \
+				lirc_parallel lirc_sir lirc_it87 lirc_i2c \
+				lirc_gpio" || die
+			fi
+		;;
+		esac
+	fi
+}
+
+src_install() {
+	if kernel-mod_is_2_6_kernel; then
+		(cd daemons; make DESTDIR=${D} install) || die
+		(cd tools; make DESTDIR=${D} install) || die
+		(cd doc; make DESTDIR=${D} install) || die
+	else
+		emake || die
+		make DESTDIR=${D} install || die
+
+		case ${LIRC_OPTS}
+		in
+		  *"any"*)
+			insinto /lib/modules/${KV}/misc
+			if is_SMP; then
+				for i in lirc_dev lirc_serial \
+					lirc_sir lirc_it87 lirc_i2c lirc_gpio
+				do
+				doins drivers/${i}/${i}.o
+				done
+			else
+				for i in lirc_dev lirc_serial \
+					lirc_parallel lirc_sir lirc_it87 lirc_i2c lirc_gpio
+				do
+				doins drivers/${i}/${i}.o
+				done
+			fi
+		;;
+		esac
+	fi
+
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/lircd
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/lircd.conf lircd
+
+	if [ "${PROFILE_ARCH}" == "xbox" ]; then
+		insinto /etc
+		newins ${FILESDIR}/xbox-lircd.conf lircd.conf
+	fi
+
+	dohtml doc/html/*.html
+}
+
+pkg_postinst() {
+	if kernel-mod_is_2_4_kernel; then
+		/usr/sbin/update-modules
+	fi
+
+	einfo
+	einfo "The lirc Linux Infrared Remote Control Package has been"
+	einfo "merged, please read the documentation, and if necessary"
+	einfo "add what is needed to /etc/modules.autoload or"
+	einfo "/etc/modules.d.  If you need special compile options"
+	einfo "then read the comments at the begin of this"
+	einfo "ebuild (source) and set the LIRC_OPTS environment"
+	einfo "variable to your needs."
+	einfo
+}