Version bumped. Adds support for macmini and ttusbir. Removed special settings com? and lpt?, use serial und parallel instead, and set io-ports with module-parameters.

Package-Manager: portage-2.1.3_rc6

4 files changed, 325 insertions, 5 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 12d898fd096e..d678079de5f3 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.144 2007/06/27 17:12:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.145 2007/07/04 16:06:07 zzam Exp $
+
+*lirc-0.8.2 (04 Jul 2007)
+
+  04 Jul 2007; Matthias Schwarzott <zzam@gentoo.org> +lirc-0.8.2.ebuild:
+  Version bumped. Adds support for macmini and ttusbir. Removed special
+  settings com? and lpt?, use serial und parallel instead, and set io-ports
+  with module-parameters.
 
   27 Jun 2007; Raúl Porcel <armin76@gentoo.org> lirc-0.8.0-r8.ebuild,
   lirc-0.8.1.ebuild, lirc-0.8.2_pre2.ebuild:
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 406085922299..57106e08caf7 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX irexec-confd 280 RMD160 f669c7c98b9d7cac2010284ab6068d29d47ec811 SHA1 c6decc19a273d98d451de137a2ffbe16d5df28ae SHA256 c404ad3b624004cab25bd3a89593cdeb0abbc25771d6e52caf2f37cb4f7b2b79
 MD5 6abeb719007a883ff202cd75ffe922e8 files/irexec-confd 280
 RMD160 f669c7c98b9d7cac2010284ab6068d29d47ec811 files/irexec-confd 280
@@ -88,6 +91,7 @@ RMD160 844b08d504f5afb996f900d3d225cc855fbf4884 files/xbox-lircd.conf 784
 SHA256 03979bd658ed4a5705c358a1278b1565dd10463ab6eb14fa8d25b3d98e645008 files/xbox-lircd.conf 784
 DIST lirc-0.8.0.tar.bz2 514359 RMD160 045c95754820e77891bd0b3baa269ad3f04cba8c SHA1 e4016a038eb4fdc7a1a3b3ff599621e2b41d4b7c SHA256 cc8d7fb41a045278680ea530cffaf05181977f41244b9f0ed64075cd7630b5d2
 DIST lirc-0.8.1.tar.bz2 604524 RMD160 effba27a6aaa4a39d206d9d9e7cccc72edcd5fb5 SHA1 c26297b90bd0609c52d6f31062c3ecc13cb945f0 SHA256 86ea19a768e8b8a9ac19daf403ac8b017f7a20d2764e6e78267099094e4f9a1b
+DIST lirc-0.8.2.tar.bz2 634331 RMD160 e806608f8644a1d1f66689a40b2ed27b4cf43bd9 SHA1 84025603692836106714a2895e6201f6eb60ab37 SHA256 717e62ee763bad9c1ffc25dd096a8845d252eaa050f16f67c6fe3506194e7f62
 DIST lirc-0.8.2pre2.tar.bz2 620341 RMD160 fceef5aeec5a1fc8c3a0225ed165be3798ebeae9 SHA1 9bb041ddcc85effbba01e3a97d2d43c9516e5130 SHA256 c4fddca1f61234fbfd2517acadfbe85d99470d90132bf800bb324a9025b57f6a
 EBUILD lirc-0.8.0-r8.ebuild 8368 RMD160 ecd033e9b63044247b51d3066f56c2ea3c82501e SHA1 5db8b8c01e8002ff5547e416bfdbcb2bc5a422ce SHA256 43f0e8d3c4a1a62006f9bc83551961a39562dd99d17fffea7daffc518286b953
 MD5 3a7217f9f8b47b34450fe7c79737db52 lirc-0.8.0-r8.ebuild 8368
@@ -97,14 +101,18 @@ EBUILD lirc-0.8.1.ebuild 7636 RMD160 002cdb989e5f8229c992c354d169c924f57cb381 SH
 MD5 11afd5917056c1099b6881193aa9ac42 lirc-0.8.1.ebuild 7636
 RMD160 002cdb989e5f8229c992c354d169c924f57cb381 lirc-0.8.1.ebuild 7636
 SHA256 38eac8ca62229713165ec845c58606d6a6ac95d3a6dc2f432b03e976aee2b79c lirc-0.8.1.ebuild 7636
+EBUILD lirc-0.8.2.ebuild 7725 RMD160 2822e9bbb0b09bc5af1bb484636c9016a9b113ea SHA1 7a70507cb9d645e0d03426ab02a7f235a360946c SHA256 97c2dd7c7a11b23ca1d299a9e5b4e4c2fa0eb5750cc3dd58792ce109e2d5c768
+MD5 767175d569769bc301c689a74dafa6de lirc-0.8.2.ebuild 7725
+RMD160 2822e9bbb0b09bc5af1bb484636c9016a9b113ea lirc-0.8.2.ebuild 7725
+SHA256 97c2dd7c7a11b23ca1d299a9e5b4e4c2fa0eb5750cc3dd58792ce109e2d5c768 lirc-0.8.2.ebuild 7725
 EBUILD lirc-0.8.2_pre2.ebuild 7747 RMD160 3281ff4aed03e1f06d0f09eb0575c42fb3843140 SHA1 9b66dd0ff7a9971b72cacf1330b218add0d371d8 SHA256 0c97061b3e8a718364da8810bcdbb202adc6fe3d6efe9bcfdb5bbc05861b0d19
 MD5 164d7344d1df9e587ea86707bab469f5 lirc-0.8.2_pre2.ebuild 7747
 RMD160 3281ff4aed03e1f06d0f09eb0575c42fb3843140 lirc-0.8.2_pre2.ebuild 7747
 SHA256 0c97061b3e8a718364da8810bcdbb202adc6fe3d6efe9bcfdb5bbc05861b0d19 lirc-0.8.2_pre2.ebuild 7747
-MISC ChangeLog 22237 RMD160 0dfdbe3c63872481a2137f2ae1d88fc5e3da76ee SHA1 a3d83a31ac6e6c1f3defa68e3d7c726abed0c7b1 SHA256 35dc7d9f1c9e8589e43b0c1c3021ec08aa6a741eb3c4a372c5203ff02fcb87e7
-MD5 2a8de1432bfd777c3a349fc7fcbe1889 ChangeLog 22237
-RMD160 0dfdbe3c63872481a2137f2ae1d88fc5e3da76ee ChangeLog 22237
-SHA256 35dc7d9f1c9e8589e43b0c1c3021ec08aa6a741eb3c4a372c5203ff02fcb87e7 ChangeLog 22237
+MISC ChangeLog 22509 RMD160 9071d161e0dc3400480329574dec065a00a17128 SHA1 1692bc27093c6da1ec81c56d1d8185bc0864edce SHA256 a51450c9b6160f00d31d9076f8f44242f8ea934b67abd67391dd3d3b8908567f
+MD5 488673446f43b03edc25e59f19633fad ChangeLog 22509
+RMD160 9071d161e0dc3400480329574dec065a00a17128 ChangeLog 22509
+SHA256 a51450c9b6160f00d31d9076f8f44242f8ea934b67abd67391dd3d3b8908567f ChangeLog 22509
 MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
 MD5 dcc0143f6508e9fd068845f98b7bb403 metadata.xml 162
 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af metadata.xml 162
@@ -115,6 +123,16 @@ SHA256 e24d5fc3d5ed85823419cd88ebc5dfa9fd7fc924e746daf282885564aa84e8cc files/di
 MD5 570f33b570b59a825856007da3f3fd18 files/digest-lirc-0.8.1 235
 RMD160 1f11ae05892517002e2b10bcf42f00a1388651f5 files/digest-lirc-0.8.1 235
 SHA256 a417bf0f77bcebeb15d873c786344c9d7622dce02aa31f8f8fa1912ad673d301 files/digest-lirc-0.8.1 235
+MD5 fb37a01ebd0200c3e87b3a547e320bf9 files/digest-lirc-0.8.2 235
+RMD160 28c1fc930d2c77c787bf165f803c7232670ff4e5 files/digest-lirc-0.8.2 235
+SHA256 65c4eb9a309cecdbe32e8c7b884eb2759c4b43f79803a26fbe5f4428e78fb3ae files/digest-lirc-0.8.2 235
 MD5 cec1b53dce7002d7bc8ef3c9d42b1f3c files/digest-lirc-0.8.2_pre2 247
 RMD160 0ed56503665fd4cdeb764c4afb8f1405325ec86c files/digest-lirc-0.8.2_pre2 247
 SHA256 85178d370b86564aebac9b79c8215c97625e85dc187208f93b64f3c9cea0552c files/digest-lirc-0.8.2_pre2 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGi8WIt2vP6XvVdOcRAhDrAJ9uQrm6Pf+BftdLHwJb0BygX/NuqQCdEG4u
+uxbS8eoLo7sfxH1qVXIpkcg=
+=ZZgK
+-----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/digest-lirc-0.8.2 b/app-misc/lirc/files/digest-lirc-0.8.2
new file mode 100644
index 000000000000..a48314f94f8f
--- /dev/null
+++ b/app-misc/lirc/files/digest-lirc-0.8.2
@@ -0,0 +1,3 @@
+MD5 83e7060a6693b81075c178d7e3b215af lirc-0.8.2.tar.bz2 634331
+RMD160 e806608f8644a1d1f66689a40b2ed27b4cf43bd9 lirc-0.8.2.tar.bz2 634331
+SHA256 717e62ee763bad9c1ffc25dd096a8845d252eaa050f16f67c6fe3506194e7f62 lirc-0.8.2.tar.bz2 634331
diff --git a/app-misc/lirc/lirc-0.8.2.ebuild b/app-misc/lirc/lirc-0.8.2.ebuild
new file mode 100644
index 000000000000..954841dd7062
--- /dev/null
+++ b/app-misc/lirc/lirc-0.8.2.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.2.ebuild,v 1.1 2007/07/04 16:06:07 zzam Exp $
+
+inherit eutils linux-mod flag-o-matic autotools
+
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
+HOMEPAGE="http://www.lirc.org/"
+
+if [[ "${PV/_pre/}" = "${PV}" ]]; then
+	SRC_URI="mirror://sourceforge/lirc/${P/_/}.tar.bz2"
+else
+	SRC_URI="http://lirc.sourceforge.net/software/snapshots/${P/_/}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug doc X hardware-carrier transmitter"
+
+S=${WORKDIR}/${P/_pre/pre}
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libICE
+	)
+	lirc_devices_alsa_usb? ( media-libs/alsa-lib )
+	lirc_devices_audio? ( media-libs/portaudio )
+	lirc_devices_irman? ( media-libs/libirman )"
+
+# This are drivers with names matching the
+# parameter --with-driver=NAME
+IUSE_LIRC_DEVICES_DIRECT="
+	all userspace accent act200l act220l
+	adaptec alsa_usb animax asusdh atilibusb
+	atiusb audio audio_alsa avermedia avermedia_vdomate
+	avermedia98 bestbuy bestbuy2 breakoutbox
+	bte bw6130 caraca chronos cmdir
+	cph06x creative creative_infracd
+	devinput digimatrix dsp dvico ea65
+	exaudio flyvideo gvbctv5pci hauppauge
+	hauppauge_dvb hercules_smarttv_stereo
+	igorplugusb imon imon_pad imon_rsc
+	irdeo irdeo_remote irman irreal it87
+	knc_one kworld leadtek_0007 leadtek_0010
+	leadtek_pvr2000 livedrive_midi
+	livedrive_seq logitech macmini mceusb
+	mceusb2 mediafocusI mouseremote
+	mouseremote_ps2 mp3anywhere nslu2
+	packard_bell parallel pcmak pcmak_usb
+	pctv pixelview_bt878 pixelview_pak
+	pixelview_pro provideo realmagic
+	remotemaster sa1100 sasem sb0540 serial
+	silitek sir slinke streamzap tekram
+	tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2
+	uirt2_raw usb_uirt_raw usbx"
+
+# drivers that need special handling and
+# must have another name specified for
+# parameter --with-driver=NAME
+IUSE_LIRC_DEVICES_SPECIAL="
+	imon_pad2keys serial_igor_cesko
+	remote_wonder_plus xboxusb usbirboy inputlirc"
+
+IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
+
+#device-driver which use libusb
+LIBUSB_USED_BY_DEV="
+	all atiusb sasem igorplugusb imon imon_pad imon_pad2keys
+	imon_rsc streamzap mceusb mceusb2 xboxusb"
+
+for dev in ${LIBUSB_USED_BY_DEV}; do
+	RDEPEND="${RDEPEND} lirc_devices_${dev}? ( dev-libs/libusb )"
+done
+
+# adding only compile-time depends
+DEPEND="${RDEPEND}
+	virtual/linux-sources"
+
+# adding only run-time depends
+RDEPEND="${RDEPEND}
+	lirc_devices_usbirboy? ( app-misc/usbirboy )
+	lirc_devices_inputlirc? ( app-misc/inputlircd )"
+
+# add all devices to IUSE
+for dev in ${IUSE_LIRC_DEVICES}; do
+	IUSE="${IUSE} lirc_devices_${dev}"
+done
+
+add_device() {
+	((lirc_device_count++))
+
+	if [[ ${lirc_device_count} -eq 2 ]]; then
+		ewarn
+		ewarn "When selecting multiple devices for lirc to be supported,"
+		ewarn "it can not be garanteed that the drivers play nice together."
+		ewarn
+		ewarn "If this is not intended, then abort emerge now with Ctrl-C,"
+		ewarn "Set LIRC_DEVICES and restart emerge."
+		ewarn
+		epause
+	fi
+
+
+	local dev="${1}"
+	local desc="device ${dev}"
+	if [[ -n "${2}" ]]; then
+		desc="${2}"
+	fi
+
+	elog "Compiling support for ${desc}"
+	MY_OPTS="${MY_OPTS} --with-driver=${dev}"
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	# set default configure options
+	MY_OPTS=""
+	lirc_driver_count=0
+
+	LIRC_DRIVER_DEVICE="/dev/lirc/0"
+
+	local dev
+
+	if use lirc_devices_all; then
+		# compile in drivers for a lot of devices
+		add_device all "a lot of devices"
+	else
+		# compile in only requested drivers
+		for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
+			if use lirc_devices_${dev}; then
+				add_device ${dev}
+			fi
+		done
+
+		if use lirc_devices_remote_wonder_plus; then
+			add_device atiusb "device Remote Wonder Plus (atiusb-based)"
+		fi
+
+		if use lirc_devices_serial_igor_cesko; then
+			add_device serial "serial with Igor Cesko design"
+			MY_OPTS="${MY_OPTS} --with-igor"
+		fi
+
+		if use lirc_devices_imon_pad2keys; then
+			add_device imon_pad "device imon_pad (with converting pad input to keyspresses)"
+		fi
+
+		if use lirc_devices_xboxusb; then
+			add_device atiusb "device xboxusb"
+		fi
+
+		if use lirc_devices_usbirboy; then
+			add_device userspace "device usbirboy"
+			LIRC_DRIVER_DEVICE="/dev/usbirboy"
+		fi
+
+		if [[ "${MY_OPTS}" == "" ]]; then
+			if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
+				# on xbox: use special driver
+				add_device atiusb "device xboxusb"
+			else
+				# no driver requested
+				elog
+				elog "Compiling only the lirc-applications, but no drivers."
+				elog "Enable drivers with LIRC_DEVICES if you need them."
+				MY_OPTS="--with-driver=userspace"
+			fi
+		fi
+	fi
+
+	use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier"
+	use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter"
+
+
+	if [[ -n "${LIRC_OPTS}" ]] ; then
+		ewarn
+		ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on."
+		ewarn
+		ewarn "Please use LIRC_DEVICES from now on."
+		ewarn "e.g. LIRC_DEVICES=\"serial sir\""
+		ewarn
+		ewarn "Flags are now set per use-flags."
+		ewarn "e.g. transmitter, hardware-carrier"
+
+		local opt
+		local unsupported_opts=""
+
+		# test for allowed options for LIRC_OPTS
+		for opt in ${LIRC_OPTS}; do
+			case ${opt} in
+				--with-port=*|--with-irq=*|--with-timer=*|--with-tty=*)
+					MY_OPTS="${MY_OPTS} ${opt}"
+					;;
+				*)
+					unsupported_opts="${unsupported_opts} ${opt}"
+					;;
+			esac
+		done
+		if [[ -n ${unsupported_opts} ]]; then
+			ewarn "These options are no longer allowed to be set"
+			ewarn "with LIRC_OPTS: ${unsupported_opts}"
+			die "LIRC_OPTS is no longer recommended."
+		fi
+	fi
+
+
+	# Setup parameter for linux-mod.eclass
+	MODULE_NAMES="lirc(misc:${S})"
+	BUILD_TARGETS="all"
+
+	ECONF_PARAMS="	--localstatedir=/var
+			        --with-syslog=LOG_DAEMON
+			        --enable-sandboxed
+	    		    --with-kerneldir=${KV_DIR}
+			        --with-moduledir=/lib/modules/${KV_FULL}/misc
+	    		    $(use_enable debug)
+					$(use_with X x)
+					${MY_OPTS}"
+
+	einfo
+	einfo "lirc-configure-opts: ${MY_OPTS}"
+	elog  "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}"
+
+	filter-flags -Wl,-O1
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Rip out dos CRLF
+	edos2unix contrib/lirc.rules
+
+	# Apply patches needed for some special device-types
+	use lirc_devices_imon_pad2keys && epatch ${FILESDIR}/${PN}-0.8.1-imon-pad2keys.patch
+	use lirc_devices_remote_wonder_plus && epatch ${FILESDIR}/lirc-remotewonderplus.patch
+
+	# remove parallel driver on SMP systems
+	if linux_chkconfig_present SMP ; then
+		sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am
+	fi
+
+	# respect CFLAGS
+	sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.in
+
+	# setting default device-node
+	sed -i -e '/#define LIRC_DRIVER_DEVICE/d' acconfig.h
+	echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h
+
+	eautoreconf
+}
+
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	newinitd ${FILESDIR}/lircd lircd
+	newinitd ${FILESDIR}/lircmd lircmd
+	newconfd ${FILESDIR}/lircd.conf lircd
+
+	insinto /etc/modules.d/
+	newins ${FILESDIR}/modulesd.lirc lirc
+
+	newinitd ${FILESDIR}/irexec-initd irexec
+	newconfd ${FILESDIR}/irexec-confd irexec
+
+	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() {
+	linux-mod_pkg_preinst
+	[[ -f ${ROOT}/etc/lircd.conf ]] && cp "${ROOT}"/etc/lircd.conf "${D}"/etc/
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	echo
+	elog "The lirc Linux Infrared Remote Control Package has been"
+	elog "merged, please read the documentation at http://www.lirc.org"
+	echo
+}