Added patch to solve Bug #138532. Install udev-rules-file conditionally by use-flag udev and not based on existance of sys-fs/udev.

(Portage version: 2.1.1_pre1-r5)
 (Signed Manifest commit)

3 files changed, 22 insertions, 290 deletions

diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 730c4d48d4e0..e71a0d519015 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -17,6 +17,10 @@ AUX lirc-0.8.0pre4-xbox-remote.diff 7632 RMD160 5eb2095df76136270e827c686671c943
 MD5 2a27a2540f0a87847d932f1651cd2e86 files/lirc-0.8.0pre4-xbox-remote.diff 7632
 RMD160 5eb2095df76136270e827c686671c94304d4820d files/lirc-0.8.0pre4-xbox-remote.diff 7632
 SHA256 0cd73451b1310ca6abd377d4098e7bb6f18555d176cf11aab992766f6e3fc0ec files/lirc-0.8.0pre4-xbox-remote.diff 7632
+AUX lirc-udev-094.diff 192 RMD160 dd7063bba9993b652d6252e861cf8eb2309610e0 SHA1 682ffa82b7f40df87cee3c5309f6efaa94d5cd3a SHA256 05c24a907934efdd90c1f1c8bfaaa1d5b156958451355b9cefdde21fc8977120
+MD5 76ea374cc5507eead20404620aa42caf files/lirc-udev-094.diff 192
+RMD160 dd7063bba9993b652d6252e861cf8eb2309610e0 files/lirc-udev-094.diff 192
+SHA256 05c24a907934efdd90c1f1c8bfaaa1d5b156958451355b9cefdde21fc8977120 files/lirc-udev-094.diff 192
 AUX lircd 450 RMD160 73cf3057f420632e90e80eeb30e79cdbb3390b5d SHA1 e43d500a672bf89b7dc5e6bdedc9ed8e90dac3b3 SHA256 a9d6d2cc0abd0efe3267c1477fac012378e63e26aa021cfce7a0e25b27f196df
 MD5 ab341c2bcfd5c4f94560dc256e32a70c files/lircd 450
 RMD160 73cf3057f420632e90e80eeb30e79cdbb3390b5d files/lircd 450
@@ -46,22 +50,22 @@ EBUILD lirc-0.7.2.ebuild 4472 RMD160 c9fef11718083b8cb2358a224b506e027ae34dc2 SH
 MD5 cb4d1fc7278b7357a6ca6aee2b1adc1c lirc-0.7.2.ebuild 4472
 RMD160 c9fef11718083b8cb2358a224b506e027ae34dc2 lirc-0.7.2.ebuild 4472
 SHA256 a4edfe95537b344e988525e50ef64c918299618ab8b150b7690c537f28482bd1 lirc-0.7.2.ebuild 4472
-EBUILD lirc-0.8.0-r1.ebuild 6747 RMD160 a351f82a9e40e1548476e2a9b2108095123c61f5 SHA1 24352bf5d96a04905db008e25d1d73daa92a60c7 SHA256 1151553abc5b85b61eab6b8388caf68f07ec69b15a0480bc9e53b62d879fe676
-MD5 f1c25a1e06093a203964f59942783358 lirc-0.8.0-r1.ebuild 6747
-RMD160 a351f82a9e40e1548476e2a9b2108095123c61f5 lirc-0.8.0-r1.ebuild 6747
-SHA256 1151553abc5b85b61eab6b8388caf68f07ec69b15a0480bc9e53b62d879fe676 lirc-0.8.0-r1.ebuild 6747
-EBUILD lirc-0.8.0-r2.ebuild 6952 RMD160 74cb8147ba18fcd97f7900d042566a8117c62d08 SHA1 92df595681161849b3136f31b3a09ac8f85830da SHA256 dc39334ac123ecd4dbf28da7352bb4610b0c005451976828aab32d028041284a
-MD5 386931f34aed75e7624a88e11ccc5302 lirc-0.8.0-r2.ebuild 6952
-RMD160 74cb8147ba18fcd97f7900d042566a8117c62d08 lirc-0.8.0-r2.ebuild 6952
-SHA256 dc39334ac123ecd4dbf28da7352bb4610b0c005451976828aab32d028041284a lirc-0.8.0-r2.ebuild 6952
+EBUILD lirc-0.8.0-r1.ebuild 6783 RMD160 0696c0f2ec389011a8f2dbf7e12f8de8206dafd2 SHA1 c8957d11e037c69aee3787be4d9b87c5821e51fd SHA256 690a873ab4e544f4c2c43d4d433b5c89085bbf6daff70e147c39f8b67b7604cf
+MD5 13f68d87ecb1212781825eb905fd84d1 lirc-0.8.0-r1.ebuild 6783
+RMD160 0696c0f2ec389011a8f2dbf7e12f8de8206dafd2 lirc-0.8.0-r1.ebuild 6783
+SHA256 690a873ab4e544f4c2c43d4d433b5c89085bbf6daff70e147c39f8b67b7604cf lirc-0.8.0-r1.ebuild 6783
+EBUILD lirc-0.8.0-r3.ebuild 6989 RMD160 d5cdbb788ddaeb83734b05163afc8619a5b7103c SHA1 71cb0ca296e65062b7926770b649405a12b31767 SHA256 4855a4f20995f9a974e115f0d36e59d8910c6e9be8a7b8f8b8d5e3f5a67d1dff
+MD5 ef0ef40db81c33ddafc13cc834e91f05 lirc-0.8.0-r3.ebuild 6989
+RMD160 d5cdbb788ddaeb83734b05163afc8619a5b7103c lirc-0.8.0-r3.ebuild 6989
+SHA256 4855a4f20995f9a974e115f0d36e59d8910c6e9be8a7b8f8b8d5e3f5a67d1dff lirc-0.8.0-r3.ebuild 6989
 EBUILD lirc-0.8.0.ebuild 4639 RMD160 45459bad24c39b109d3c50639be6f5196ceeaedc SHA1 f0fbe4800286039e52c5f4f2f6f1a0331472e543 SHA256 87e95b818aa03c3b15547a43c5c1c44f2b691a70323304b62f0625ba7394ab04
 MD5 c731e1674b70379dfd7e1357b919180d lirc-0.8.0.ebuild 4639
 RMD160 45459bad24c39b109d3c50639be6f5196ceeaedc lirc-0.8.0.ebuild 4639
 SHA256 87e95b818aa03c3b15547a43c5c1c44f2b691a70323304b62f0625ba7394ab04 lirc-0.8.0.ebuild 4639
-MISC ChangeLog 14232 RMD160 62ce04e8e982b3fbc47bb7d14658bc7649892bc2 SHA1 26d6c9187eee1c6b1b5f949c15ed86c7e8b252ed SHA256 dbfaa8f220d61eb897a5ceeb0c2fa7871225cfece423902effd6c301b3ffa958
-MD5 2bd8494411429f46e1da138d12f03115 ChangeLog 14232
-RMD160 62ce04e8e982b3fbc47bb7d14658bc7649892bc2 ChangeLog 14232
-SHA256 dbfaa8f220d61eb897a5ceeb0c2fa7871225cfece423902effd6c301b3ffa958 ChangeLog 14232
+MISC ChangeLog 14551 RMD160 209eed3fdf67300aa216ad5b1ad1acdf1eb840b6 SHA1 30f02e1b15727f28beaa7763a5757c9bc5ea1819 SHA256 b9be28c1ba081f6d98046a7317dc708c8d60f8b50a8be9409c809123dd751667
+MD5 6ea95b6ea3c57ac9e1adb3514b5ac98f ChangeLog 14551
+RMD160 209eed3fdf67300aa216ad5b1ad1acdf1eb840b6 ChangeLog 14551
+SHA256 b9be28c1ba081f6d98046a7317dc708c8d60f8b50a8be9409c809123dd751667 ChangeLog 14551
 MISC metadata.xml 252 RMD160 e1c170c221f61fa9787a04feac90fab777639d88 SHA1 9fdd5da8466c39d7ff3b40412c4dfa77dd2446b7 SHA256 4e8b5c34b3e50b781a18c9be9e6199442f1b0299e00d66ba35024f8b743b9c32
 MD5 abf8a9c4b96bc3bb50f04a48349dae34 metadata.xml 252
 RMD160 e1c170c221f61fa9787a04feac90fab777639d88 metadata.xml 252
@@ -78,13 +82,13 @@ SHA256 e24d5fc3d5ed85823419cd88ebc5dfa9fd7fc924e746daf282885564aa84e8cc files/di
 MD5 17322bfb3604e1c6663bbc5a6fb80e96 files/digest-lirc-0.8.0-r1 235
 RMD160 efdbebbf9c02e761392c245f3ee1df0938778785 files/digest-lirc-0.8.0-r1 235
 SHA256 e24d5fc3d5ed85823419cd88ebc5dfa9fd7fc924e746daf282885564aa84e8cc files/digest-lirc-0.8.0-r1 235
-MD5 17322bfb3604e1c6663bbc5a6fb80e96 files/digest-lirc-0.8.0-r2 235
-RMD160 efdbebbf9c02e761392c245f3ee1df0938778785 files/digest-lirc-0.8.0-r2 235
-SHA256 e24d5fc3d5ed85823419cd88ebc5dfa9fd7fc924e746daf282885564aa84e8cc files/digest-lirc-0.8.0-r2 235
+MD5 17322bfb3604e1c6663bbc5a6fb80e96 files/digest-lirc-0.8.0-r3 235
+RMD160 efdbebbf9c02e761392c245f3ee1df0938778785 files/digest-lirc-0.8.0-r3 235
+SHA256 e24d5fc3d5ed85823419cd88ebc5dfa9fd7fc924e746daf282885564aa84e8cc files/digest-lirc-0.8.0-r3 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEpUfFZfSl1Kp5KmoRAlSzAJ9ihJGNMJb1iXYUQ+C7oRcObUiYcgCgsnJT
-avW0F9LYMLHFhxy+bndTDWQ=
-=to2C
+iD8DBQFEpUxKZfSl1Kp5KmoRAj6CAJ0cEQTnRlkRJvF8k/MKn5PijHEYtgCff66G
+GZL17YdRnnCDUVY72uHWWh8=
+=wgJu
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/digest-lirc-0.8.0-r2 b/app-misc/lirc/files/digest-lirc-0.8.0-r2
deleted file mode 100644
index 403b24365ee4..000000000000
--- a/app-misc/lirc/files/digest-lirc-0.8.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0bf28bf82c7766a462f90927b6bf3af1 lirc-0.8.0.tar.bz2 514359
-RMD160 045c95754820e77891bd0b3baa269ad3f04cba8c lirc-0.8.0.tar.bz2 514359
-SHA256 cc8d7fb41a045278680ea530cffaf05181977f41244b9f0ed64075cd7630b5d2 lirc-0.8.0.tar.bz2 514359
diff --git a/app-misc/lirc/lirc-0.8.0-r2.ebuild b/app-misc/lirc/lirc-0.8.0-r2.ebuild
deleted file mode 100644
index 73737bc79f1e..000000000000
--- a/app-misc/lirc/lirc-0.8.0-r2.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# 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-r2.ebuild,v 1.3 2006/06/30 15:48:08 zzam 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 hardware-carrier transmitter"
-KEYWORDS="~ppc64 ~x86"
-SRC_URI="mirror://sourceforge/lirc/${P/_pre/pre}.tar.bz2"
-
-S=${WORKDIR}/${P/_pre/pre}
-
-
-IUSE_LIRC_DEVICES_DIRECT="
-	all userspace act200l act220l
-	adaptec alsa_usb animax atilibusb
-	atiusb audio audio_alsa avermedia avermedia_vdomate
-	avermedia98 bestbuy bestbuy2 breakoutbox
-	bte bw6130 caraca chronos cmdir com1 com2 com3 com4
-	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 lpt1 lpt2 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 serial
-	silitek sir slinke streamzap tekram
-	tekram_bt829 tira tvbox udp uirt2
-	uirt2_raw"
-
-IUSE_LIRC_DEVICES_SPECIAL="imon_pad2keys serial_igor_cesko xboxusb usbirboy"
-IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
-
-
-
-RDEPEND="virtual/libc
-	sys-apps/coreutils
-	X? ( || ( (	x11-libs/libX11
-			x11-libs/libSM
-			x11-libs/libICE )
-	virtual/x11 ) )
-	lirc_devices_alsa_usb? ( media-libs/alsa-lib )
-	lirc_devices_audio? ( media-libs/portaudio )
-	lirc_devices_irman? ( media-libs/libirman )"
-
-
-#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
-	sys-devel/autoconf
-	sys-devel/libtool"
-
-
-# adding only run-time depends
-RDEPEND="${RDEPEND}
-	lirc_devices_usbirboy? ( app-misc/usbirboy )"
-
-
-
-# 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 "lirc does at the moment support only one driver be compiled at a time."
-		ewarn "Please reduce LIRC_DEVICES to one item."
-		die "Multiple drivers selected for lirc."
-	fi
-
-
-	local dev="${1}"
-	local desc="device ${dev}"
-	if [[ -n "${2}" ]]; then
-		desc="${2}"
-	fi
-
-	einfo "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
-
-	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_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"
-		fi
-
-		if [[ "${MY_OPTS}" == "" ]]; then
-			if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
-				# on xbox: use special driver
-				add_device atiusb "device xboxusb"
-			else
-				# no driver requested
-				einfo
-				einfo "Compiling only the lirc-applications, but no drivers."
-				einfo "Enable drivers with LIRC_DEVICES if you need them."
-				MY_OPTS="--with-driver=none"
-			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
-
-	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)
-					${MY_OPTS}
-					CPPFLAGS=-DLIRC_HAVE_DEVFS"
-
-	einfo
-	einfo "lirc-configure-opts: ${MY_OPTS}"
-
-	export WANT_AUTOCONF=2.5
-	filter-flags -Wl,-O1
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-kernel-2.6.16.diff
-	epatch ${FILESDIR}/${P}-kernel-2.6.17.diff
-
-	use lirc_devices_xboxusb && epatch ${FILESDIR}/lirc-0.8.0pre4-xbox-remote.diff
-	use lirc_devices_imon_pad2keys && epatch ${FILESDIR}/${P}-imon-pad2keys.patch
-
-	# remove parallel driver on SMP systems
-	if linux_chkconfig_present SMP ; then
-		sed -i -e "s:lirc_parallel::" drivers/Makefile.in
-	fi
-
-	sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.in
-
-	eautoreconf || die "autoreconf 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() {
-	linux-mod_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
-}
-