version bump for 251703 and fix for 251522

Package-Manager: portage-2.1.6.7/cvs/Linux i686

3 files changed, 344 insertions, 2 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 860bb66d21d5..5304797f641c 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.192 2009/01/10 13:21:54 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.193 2009/02/28 14:14:36 fauli Exp $
+
+*lirc-0.8.4a (28 Feb 2009)
+
+  28 Feb 2009; Christian Faulhammer <fauli@gentoo.org> +lirc-0.8.4a.ebuild:
+  version bump for 251703 and fix for 251522
 
   10 Jan 2009; Steve Dibb <beandog@gentoo.org> lirc-0.8.3-r1.ebuild,
   lirc-0.8.3-r2.ebuild, lirc-0.8.4.ebuild:
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 7fef78520be1..941ad0a89483 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
 AUX irexec-initd 808 RMD160 06b02232f892ab032e2bf8b35bb2945a623a2610 SHA1 5c5630e5434c2430b9a74b725fc5350e29adaede SHA256 9325419aa45d80c205bc1cd47fe839b178da74bca5dd928cbe3ae17423b92493
 AUX lirc-0.8.0-conf-pixelview_bt878.diff 378 RMD160 e70daba96eb7097b20b73807a76ebd562ebb09dc SHA1 96b1976089c7a4e63d9435fb4f8bf8a19c53f4c6 SHA256 343c473210ad6fed27df49d8a93ced7e91fe0d5fc8d652b45b1ef7a7c3125ed6
@@ -42,6 +45,7 @@ DIST lirc-0.8.3.tar.bz2 667882 RMD160 8948efc3e9dc34426ea32a3c63da63c0efa7dce2 S
 DIST lirc-0.8.3pre1.tar.bz2 656112 RMD160 b83f7c3222d0a8f6aa9924c7bd60013f29b7917c SHA1 ef5f3bd60ed10d4d1ab57931f8871cf9f8735630 SHA256 435e5f5301fb0d4488a5b9c8340b686a21dc542c2fbf97910c8d0f1350667192
 DIST lirc-0.8.3pre3.tar.bz2 668214 RMD160 01a5028ea0563626904f0e49644b81f9cbb85850 SHA1 9cb1a7e666e5a4c4db4f8ca1f08b173ecfb42bfd SHA256 a799ce95d1a09db040c7781bcaa5ffe839eb987e56858ebc54f73e609b827029
 DIST lirc-0.8.4.tar.bz2 694420 RMD160 bc72c59f2ac3087b9c5918796f3c202cb1437e67 SHA1 0de0bae3ea0b4cc36365f5c6d79b4e204a353401 SHA256 a803ae84b81e6c145bafc880835df44501d75d5e572d8a92d45209df15b581c0
+DIST lirc-0.8.4a.tar.bz2 695650 RMD160 da334fc74c45ea81d22d26b1687692b4a1267888 SHA1 2f1d26c83a9f1ca876949bff80e1529e03618779 SHA256 22ce4239b3446c3f312643d83f5ccb22d549241272acebbac164f7b651608827
 EBUILD lirc-0.8.0-r8.ebuild 8304 RMD160 f9c80700235f8c04cdb00a4de95224c08da86167 SHA1 53d0c4b0546f9ea2a5e7450fbbde8cd8342a0073 SHA256 a5142648b2adf736d326730b24503b624a509c047f57bd1271a9a4788a9f973a
 EBUILD lirc-0.8.1.ebuild 7647 RMD160 a7684d11027410ba97ed42d1656f2285f195d10f SHA1 511cb592ec15bc02ca5d5912831b3cdbe812f4df SHA256 5037b921220e2c1fcd5fe67d13382ea41dddb866ef766092f4b8fa8d97651f3c
 EBUILD lirc-0.8.2-r1.ebuild 8282 RMD160 9b9d86196447c1e4fce2ecaeaa2ed7366a74f427 SHA1 cf49dffe618c96b61611c3ce750caf83153153a7 SHA256 eb2769d7bb8646a66188ebce339e7cf037146d343260b3b2cf178a6fb3be22ce
@@ -54,5 +58,13 @@ EBUILD lirc-0.8.3.ebuild 8652 RMD160 fdc60c58f390233998f6ec6e1d6fd6086816f270 SH
 EBUILD lirc-0.8.3_pre1.ebuild 8413 RMD160 5c1aad354c21af1c0e59a7664a618b4f845e4807 SHA1 b60cfb14611ba87df67cde41070f7c3b90e467a5 SHA256 aa2c154981ed8998d701e74744a73f84a758c2cfb69b2a4a07e2b6d42d75e932
 EBUILD lirc-0.8.3_pre3.ebuild 8326 RMD160 126919dbe2680331d22682df852b5e5636c8709b SHA1 77751b8e0dc6b5661e4def741c7118aeef19baf8 SHA256 6669f8b4a107c1952c28bc56173540a4e2075eb652d8b7c81e7c99afac11dd2c
 EBUILD lirc-0.8.4.ebuild 8885 RMD160 04d3691fed66d3cbe078d713dd4dea095b0093d0 SHA1 483dd269cf9c1f5527a349ecccf63210d3e52eb4 SHA256 3006c17eaae1a26ad18cdbf8b0b097c1040ecd0335e4178de3ad1e6244798735
-MISC ChangeLog 30087 RMD160 f79466ab4dad0576b0ade1679a3f25a16285d685 SHA1 046686a6ea74a6da452b3363e51f47833baa9fe2 SHA256 5427d1bfd929da7f5475957be9e12b87251b6e4b59e2e5a1f8034c85a848f30f
+EBUILD lirc-0.8.4a.ebuild 8865 RMD160 bc7585d4726f88ce58f1461a79c0ab8a51246195 SHA1 a5d7a8abd88576564127f2becb05f685190b1789 SHA256 0de71aa1cfd87bcfa2adace3cf33534603ca3cc067376eed674b3645c762df10
+MISC ChangeLog 30235 RMD160 50e52acdfc9dddcd8008b7e6f12a22239ed10769 SHA1 9687d6645e79909ae887679c65f44d9d90a12bf7 SHA256 9dc40e581a1e13c6d8569774e15fc52de0b1cdf1403f899c90da6840d0b1f625
 MISC metadata.xml 376 RMD160 7b854dad1999c38592eabe928aab80615ba1f1e5 SHA1 17dc9c9591c77aa4ec2d98b9bc1f34ff68da31ad SHA256 e3b4637a67a93eb4b9457fa5941e8a6a891adca11a1ebc80c21a59650eac93aa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmpRu8ACgkQNQqtfCuFneP+3gCeNrjtbF3ZIfHhhT5jQ1w+Rnfj
+JlMAoIlhra2vtBYWnFVI8xTqcG7SDuNL
+=yObv
+-----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/lirc-0.8.4a.ebuild b/app-misc/lirc/lirc-0.8.4a.ebuild
new file mode 100644
index 000000000000..08abade3f713
--- /dev/null
+++ b/app-misc/lirc/lirc-0.8.4a.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.4a.ebuild,v 1.1 2009/02/28 14:14:36 fauli 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/"
+
+MY_P=${PN}-${PV/_/}
+
+if [[ "${PV/_pre/}" = "${PV}" ]]; then
+	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
+else
+	SRC_URI="http://lirc.sourceforge.net/software/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug doc X hardware-carrier transmitter"
+
+S="${WORKDIR}/${MY_P}"
+
+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-18 )
+	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_knob imon_lcd 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
+	irlink commandir ite8709 samsung"
+
+# 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 atilibusb sasem igorplugusb imon imon_lcd imon_pad imon_pad2keys
+	imon_rsc streamzap mceusb mceusb2 xboxusb irlink commandir"
+
+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:=0}
+	((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() {
+
+	ewarn "If your LIRC device requires modules, you'll need MODULE_UNLOAD"
+	ewarn "support in your kernel."
+
+	linux-mod_pkg_setup
+
+	# set default configure options
+	MY_OPTS=""
+	LIRC_DRIVER_DEVICE="/dev/lirc0"
+
+	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
+		local dev
+		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)"
+			ewarn "You need to set the option pad2keys_active=1"
+			ewarn "when loading the module lirc_imon"
+		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
+
+	# force non-parallel make, Bug 196134
+	MAKEOPTS="${MAKEOPTS} -j1"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Rip out dos CRLF
+	edos2unix contrib/lirc.rules
+
+	# Apply patches needed for some special device-types
+	epatch "${FILESDIR}"/${PN}-0.8.4-imon-pad2keys.patch
+	use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-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
+
+	# Bug #187418
+	if kernel_is ge 2 6 22 ; then
+		ewarn "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
+	fi
+
+	# respect CFLAGS
+	sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac
+
+	# setting default device-node
+	local f
+	for f in configure.ac acconfig.h; do
+		[[ -f "$f" ]] && sed -i -e '/#define LIRC_DRIVER_DEVICE/d' "$f"
+	done
+	echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	newinitd "${FILESDIR}"/lircd-0.8.3 lircd
+	newinitd "${FILESDIR}"/lircmd lircmd
+	newconfd "${FILESDIR}"/lircd.conf.2 lircd
+
+	insinto /etc/modprobe.d/
+	newins "${FILESDIR}"/modprobed.lirc lirc
+
+	newinitd "${FILESDIR}"/irexec-initd irexec
+	newconfd "${FILESDIR}"/irexec-confd irexec
+
+	if use doc ; then
+		dohtml doc/html/*.html
+		insinto /usr/share/doc/${PF}/images
+		doins doc/images/*
+	fi
+
+	insinto /usr/share/lirc/remotes
+	doins -r remotes/*
+}
+
+pkg_preinst() {
+	linux-mod_pkg_preinst
+
+	# stop portage from deleting this file
+	if [[ -f ${ROOT}/etc/lircd.conf && ! -f ${D}/etc/lircd.conf ]]; then
+		cp "${ROOT}"/etc/lircd.conf "${D}"/etc/lircd.conf
+	fi
+}
+
+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
+
+	if kernel_is ge 2 6 22 ; then
+		# Bug #187418
+		ewarn
+		ewarn "The lirc_gpio driver will not work with Kernels 2.6.22+"
+		ewarn "You need to switch over to /dev/input/event? if you need gpio"
+		ewarn "This device can than then be used via lirc's dev/input driver."
+		ewarn
+	fi
+
+	elog
+	elog "lirc now uses normal config-protection for lircd.conf."
+	elog "If you need any other lircd.conf you may have a look at"
+	elog "the directory /usr/share/lirc/remotes"
+}