Reworked the ebuild a little bit and hopefully fixed the problems people are having with it.

(Portage version: 2.1_pre3-r1)

4 files changed, 165 insertions, 12 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 262feaa9d711..178f0da938d6 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.75 2006/01/05 08:54:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.76 2006/01/10 21:05:40 cardoe Exp $
+
+*lirc-0.8.0_pre3 (10 Jan 2006)
+
+  10 Jan 2006; Doug Goldstein <cardoe@gentoo.org> +lirc-0.8.0_pre3.ebuild:
+  Reworked the ebuild a little bit and hopefully fixed the problems people are
+  having with it.
 
   05 Jan 2006; Jeremy Huddleston <eradicator@gentoo.org>
   lirc-0.8.0_pre1.ebuild:
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 830ab4ef2fa2..5ed397b66f3d 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3eec7d55e3f620d9d3d967a17769a021 ChangeLog 10828
+MD5 cb7c099d4a25775d0b956bead553259a ChangeLog 11033
 MD5 8b5ccb169d823795a11450a1c052da55 files/digest-lirc-0.7.0-r1 63
 MD5 07a6b9497abcb0ebf09b83699dd56b2c files/digest-lirc-0.7.1 63
 MD5 be588343f18b4d80100ecee0efd3870c files/digest-lirc-0.7.2 63
 MD5 ea9578d9140ce98418744cd8fbb4c613 files/digest-lirc-0.8.0_pre1 68
+MD5 621c040cbdf0df1bc424befe21eeeb35 files/digest-lirc-0.8.0_pre3 67
 MD5 6031968a1ddb51ff5265d1f22bd2d237 files/lirc-0.6.6-gentoo.diff.bz2 2215
 MD5 d874cf5e0b5c21cd211acea456f171d7 files/lirc-0.7.0-configure.in.patch 747
 MD5 8fd71f6a7c4842bfbad1e2bfb67f187f files/lirc-0.7.0-streamzap.patch.bz2 16868
@@ -21,11 +19,5 @@ MD5 e97f779f2875d98323b939c401321a8c lirc-0.7.0-r1.ebuild 4492
 MD5 eb7c38a7e1620656ffd7c9e2eb9ae951 lirc-0.7.1.ebuild 4422
 MD5 cb4d1fc7278b7357a6ca6aee2b1adc1c lirc-0.7.2.ebuild 4472
 MD5 5dab846a93e56a426ff636e18d608352 lirc-0.8.0_pre1.ebuild 4471
+MD5 058ad828dbe0b01d4a34e84c39ff0ef6 lirc-0.8.0_pre3.ebuild 4655
 MD5 40a6e0a06901a627d29f4c528e40c9ad metadata.xml 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDvN7pOpjtAl+gMRURAhePAKCNUDTXsLbfU1n4ka2wIh8JhRKNMQCeM//4
-QpopAvAsdssobpGCBuDzaVE=
-=+863
------END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/digest-lirc-0.8.0_pre3 b/app-misc/lirc/files/digest-lirc-0.8.0_pre3
new file mode 100644
index 000000000000..448c9c7cdb06
--- /dev/null
+++ b/app-misc/lirc/files/digest-lirc-0.8.0_pre3
@@ -0,0 +1 @@
+MD5 c20cf756b0b5cad96437bc25e81b166a lirc-0.8.0pre3.tar.bz2 487707
diff --git a/app-misc/lirc/lirc-0.8.0_pre3.ebuild b/app-misc/lirc/lirc-0.8.0_pre3.ebuild
new file mode 100644
index 000000000000..096bf1c57d66
--- /dev/null
+++ b/app-misc/lirc/lirc-0.8.0_pre3.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.0_pre3.ebuild,v 1.1 2006/01/10 21:05:41 cardoe Exp $
+
+inherit eutils linux-mod flag-o-matic autotools
+
+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"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="alsa debug doc X usb"
+KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64 ~ppc64"
+
+RDEPEND="virtual/libc
+	virtual/modutils
+	sys-apps/coreutils
+	alsa? ( media-libs/alsa-lib )
+	usb? ( dev-libs/libusb )
+	X? ( || ( (	x11-libs/libX11
+			x11-libs/libSM
+			x11-libs/libICE )
+	virtual/x11 ) )"
+
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	sys-devel/autoconf
+	sys-devel/libtool"
+
+#SRC_URI="mirror://sourceforge/lirc/${P/_pre/pre}.tar.bz2"
+SRC_URI="http://lirc.sourceforge.net/software/snapshots/lirc-0.8.0pre3.tar.bz2"
+
+S=${WORKDIR}/${P/_pre/pre}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	if [ "x${LIRC_OPTS}" = x ] ; then
+		echo
+		ewarn "By default this package will not compile a driver for your hardware"
+		ewarn "unless you specify LIRC_OPTS. The best place to save this is in"
+		ewarn "/etc/make.conf"
+		ewarn "For example, PVR-x50 users should add the following to /etc/make.conf"
+		ewarn "LIRC_OPTS=\"--with-driver=hauppauge\""
+		echo
+		ewarn "Possible options are listed below:"
+		echo
+		cat <<-EOF
+# You have to know, which driver you want;
+# --with-driver=X
+
+# where X is one of:
+# none, any, act200l, animax, atilibusb, atiusb, audio, avermedia, avermedia_vdomate,
+# avermedia98, bestbuy, bestbuy2, breakoutbox, bte, caraca, chronos, comX,
+# creative_infracd, dsp, cph03x, cph06x, creative, devinput, exaudio, flyvideo,
+# gvbctv5pci, hauppauge, hauppauge_dvb, hercules_smarttv_stereo, igorplugusb, irdeo,
+# irdeo_remote, irman, irreal, it87, knc_one, kworld, leadtek_0007, leadtek_0010,
+# livedrive_midi, livedrive_seq, logitech, lptX, mceusb, mediafocusI, mp3anywhere,
+# packard_bell, parallel, pcmak, pcmak_usb, pctv, pixelview_bt878, pixelview_pak,
+# pixelview_pro, provideo, realmagic, remotemaster, sa1100, sasem, serial,
+# silitek, sir, slinke, tekram, tekram_bt829, tira, tvbox, udp, uirt2, uirt2_raw
+# winfast_tv2000 is now leadtek_0010, streamzap
+
+# This could be useful 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-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
+		EOF
+		sleep 5
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	#epatch ${FILESDIR}/lirc-0.7.0-xbox.patch.bz2
+
+	filter-flags -Wl,-O1
+	sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.in
+
+	eautoreconf || "autoreconf failed"
+}
+
+
+src_compile() {
+	get_version
+
+	# set default configure options
+	[ "x${LIRC_OPTS}" = x ] && [ "${PROFILE_ARCH}" == "xbox" ] && \
+		LIRC_OPTS="--with-driver=xboxusb"
+	[ "x${LIRC_OPTS}" = x ] && LIRC_OPTS="--with-driver=none"
+
+	# remove parallel driver on SMP systems
+	if linux_chkconfig_present SMP ; then
+		sed -i -e "s:lirc_parallel::" drivers/Makefile.in
+	fi
+
+	unset ARCH
+	export WANT_AUTOCONF=2.5
+
+	econf \
+		--localstatedir=/var \
+		--with-syslog=LOG_DAEMON \
+		--enable-sandboxed \
+		--with-kerneldir=${ROOT}/usr/src/${KV_FULL} \
+		--with-moduledir=${ROOT}/lib/modules/${KV_FULL}/misc \
+		`use_enable debug` \
+		`use_with X` \
+		${LIRC_OPTS} || die "./configure failed"
+
+	emake || die "compile failed"
+
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	newinitd ${FILESDIR}/lircd lircd
+	newinitd ${FILESDIR}/lircmd lircmd
+	newconfd ${FILESDIR}/lircd.conf lircd
+
+	has_version sys-fs/udev && (
+		insinto /etc/udev/rules.d/;
+		newins ${S}/contrib/lirc.rules 10-lirc.rules )
+
+	if use doc ; then
+		dohtml doc/html/*.html
+		insinto /usr/share/doc/${PF}/images
+		doins doc/images/*
+	fi
+}
+
+pkg_preinst() {
+	[ -f "${ROOT}/etc/lircd.conf" ] && cp ${ROOT}/etc/lircd.conf ${IMAGE}/etc
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	echo
+	einfo "The lirc Linux Infrared Remote Control Package has been"
+	einfo "merged, please read the documentation at http://www.lirc.org"
+	echo
+}