Revision bump that will fix some new and some old issues:

* Merge mceusb and mceusb2 driver (bug 286269 by candrews AT
integralblue DOT com)
* New init.d file that will keep the old socket location so we don't
break all applications (thanks to Oldrich Jedlicka <oldium DOT pro AT
seznam DOT
cz> in bug 286451)
* Add new ene0100 device
* Correct entry for iguanaIR device (bug 208785 by MasterC
  <MasterCLC AT gmail DOT com>)
* Fix DEPEND and RDEPEND relations
Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 91 insertions, 50 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 3e89307cead3..f9c52877b8a5 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,9 +1,24 @@
 # ChangeLog for app-misc/lirc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.208 2009/10/04 13:41:14 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.209 2009/10/04 18:48:28 fauli Exp $
+
+*lirc-0.8.6-r1 (04 Oct 2009)
+
+  04 Oct 2009; Christian Faulhammer <fauli@gentoo.org> +files/lircd-0.8.6,
+  -lirc-0.8.6.ebuild, +lirc-0.8.6-r1.ebuild:
+  Revision bump that will fix some new and some old issues:
+  * Merge mceusb and mceusb2 driver (bug 286269 by candrews AT integralblue
+  DOT com)
+  * New init.d file that will keep the old socket location so we don't break
+  all applications (thanks to Oldrich Jedlicka <oldium DOT pro AT seznam DOT
+  cz> in bug 286451)
+  * Add new ene0100 device
+  * Correct entry for iguanaIR device (bug 208785 by MasterC <MasterCLC AT
+  gmail DOT com>)
+  * Fix DEPEND and RDEPEND relations
 
   04 Oct 2009; Christian Faulhammer <fauli@gentoo.org> lirc-0.8.5.ebuild:
-  read stable keywords that have been accidentally removed
+  readd stable keywords that have been accidentally removed
 
   03 Oct 2009; Christian Faulhammer <fauli@gentoo.org> lirc-0.8.5.ebuild:
   Rework dependencies:
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 1df12c3cb740..d836ad581692 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,6 +1,3 @@
------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.3-imon-pad2keys.patch 11556 RMD160 89a050f7099593000a40b15c46de6137f3b10dfa SHA1 019b1aa3d72df9e4b28796c173fb4fa1fc3e457d SHA256 347c6195d971f8d1a3f4c29a1ff4750d04cea297d16679aeda7529ac1720d42e
@@ -14,6 +11,7 @@ AUX lirc-0.8.3_pre3-imon-pad2keys.patch 11556 RMD160 96137f08691e341844d7ebc8603
 AUX lirc-0.8.4-portaudio_check.patch 769 RMD160 d83b1a167da5b0c4e09ef716a4fc80f7261f7665 SHA1 81537dc12f897756d24fcf2cf4d178dc8169e360 SHA256 01e2034aaa6a7eb039e5c0e6c3b4a6ed38860614d3d0b0005d99a4aac2b3827e
 AUX lircd 450 RMD160 73cf3057f420632e90e80eeb30e79cdbb3390b5d SHA1 e43d500a672bf89b7dc5e6bdedc9ed8e90dac3b3 SHA256 a9d6d2cc0abd0efe3267c1477fac012378e63e26aa021cfce7a0e25b27f196df
 AUX lircd-0.8.3 581 RMD160 162a54bb19df7b97aa982355a6d009ddc82580eb SHA1 c0f7a0a65169d02bdc7003d574d8610694241a5d SHA256 9ba3c5a8c0ca5966729dc5e2c7a5960bbf12b443d91e9e319a0277f153df1b1f
+AUX lircd-0.8.6 941 RMD160 e26898ef4660b2a23cad190e224270181900181a SHA1 ee2f5422f259b4ee486baa1ae88019948fed5a40 SHA256 753957bc06a851388c71b6c98ec3463e61a26308c8643ed8c0257cb1757efdae
 AUX lircd.conf.2 314 RMD160 895fd43ce98f478e6ef8d3375c2be86f7b22f0dd SHA1 4edb23d7f14c8d92bc19d59734f8f3ebe9f30e75 SHA256 bf62f0985e97b4bd8828d609bb0daa543b7c158f457d597712752d50e2265adb
 AUX lircmd 466 RMD160 32f2b2411afc60522944f5c3dff9f53aac242a9c SHA1 79939de790d20704009643bd810e3186090d0e36 SHA256 d47f22a33a83c14a4a0c333d6a445c40e550c491899fb0c6d323e23fe1eac7b7
 AUX modprobed.lirc 549 RMD160 89edfd587932959df9e521d146cef7c67cf97b18 SHA1 f59d8f031859eb6b6dccd1faf15d7ed2251288b1 SHA256 b4951252321ea326d3ec401e5ff1112716c5aaf5b2ca94d9f5e187e22ad35c44
@@ -29,14 +27,7 @@ EBUILD lirc-0.8.3-r2.ebuild 9021 RMD160 6ddd9235fb94f9ccfebe0aec33d164555836ef2f
 EBUILD lirc-0.8.3_pre1.ebuild 8413 RMD160 5c1aad354c21af1c0e59a7664a618b4f845e4807 SHA1 b60cfb14611ba87df67cde41070f7c3b90e467a5 SHA256 aa2c154981ed8998d701e74744a73f84a758c2cfb69b2a4a07e2b6d42d75e932
 EBUILD lirc-0.8.4.ebuild 8942 RMD160 19d3fea9b5dedb272a640c30ee10d4a22dbf8b58 SHA1 f473243a365096732971a49ea8f20fde3fac913b SHA256 429ce5f9fd73a743676afa665f335e9dec0b8a73d528d45cc83a0d1d736fa2d6
 EBUILD lirc-0.8.4a.ebuild 9136 RMD160 cbf9c0b69fadb9fd113d4be6fe766a1a52810939 SHA1 2a82ebe8e8c02f73b7fc49789cf6c2fd7a77ca17 SHA256 d5ff273afd5ebdc7eba7091dbd18846abfe658352189fd49df803237705934b7
-EBUILD lirc-0.8.5.ebuild 9463 RMD160 96bc65d6ea6a477e80ae53b75844f9196677b773 SHA1 f252e24558e47a8e1e518b114c6c8112f4d59e68 SHA256 1284c96ceabc43ec59c8c42c556a87519f8727678cbc690d641f8fcdae706b26
-EBUILD lirc-0.8.6.ebuild 9408 RMD160 290201d2471ba2b5e4b3dd5e19024694736db2c1 SHA1 946732f5c7b8a61c6e076fb4bdfb8be9b9ad6a7c SHA256 68bf99ef10a117b4a8eb410ef91d07155c0fe9cf3ac888143b77714bf2ce404d
-MISC ChangeLog 33244 RMD160 14386ef85309a6c38626b0f6c45b65317cdcad35 SHA1 48e76e25dcfbfddd3f806bb7a5bc0f9f02565fc2 SHA256 d04da611720975dc98ab5396fff1e352858f08bc7ed868e9f1880345c39b652e
+EBUILD lirc-0.8.5.ebuild 9465 RMD160 d708cca074a03c8331ff4d837392e4a6d65f9cf5 SHA1 9e8e0e95e14cb940cdc9e4d753a7cb466a5bf3c9 SHA256 e58785aa9152489b207f8214e1026dc2baa215eb946f7e37489c40102903c08e
+EBUILD lirc-0.8.6-r1.ebuild 9288 RMD160 c8a49be6cb76e9d8c89d399ba96299005f265451 SHA1 f60714e8ed5ba5720c074a8fc68450d037015bac SHA256 831ee3906c2d1a23b945c8ba71d7ba5f943d3642046d73919ce1f76c0c1bf2a1
+MISC ChangeLog 33875 RMD160 b2513df0a2661fd5010019ff584bc6ad37be8bd9 SHA1 d092b212d461d345eccc23646b687279891183b1 SHA256 2977149b9fc538d08dbc9cc61462fc1eb42bc226fd162059b3f87dc18ac0b37a
 MISC metadata.xml 376 RMD160 7b854dad1999c38592eabe928aab80615ba1f1e5 SHA1 17dc9c9591c77aa4ec2d98b9bc1f34ff68da31ad SHA256 e3b4637a67a93eb4b9457fa5941e8a6a891adca11a1ebc80c21a59650eac93aa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrIphMACgkQNQqtfCuFneMurwCfQFbTEfGtUcS2b0nKzPpEzeMA
-wJoAn051J1hiVxCPuMeabXIUMy7qWKiG
-=3EtP
------END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/lircd-0.8.6 b/app-misc/lirc/files/lircd-0.8.6
new file mode 100644
index 000000000000..0a775a5e4b2e
--- /dev/null
+++ b/app-misc/lirc/files/lircd-0.8.6
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/files/lircd-0.8.6,v 1.1 2009/10/04 18:48:29 fauli Exp $
+
+PIDFILE=/var/run/lirc/${SVCNAME}.pid
+LIRCD_SYMLINKFILE=/dev/lircd
+LIRCD_SOCKET=/var/run/lirc/lircd
+
+depend() {
+	provide lirc
+}
+
+start() {
+	local retval
+	ebegin "Starting lircd"
+	rm -f ${LIRCD_SOCKET} && ln -s ${LIRCD_SOCKET} ${LIRCD_SYMLINKFILE}
+	if [ $? -ne 0 ]; then
+		eend $? "Unable to create symbolic link ${LIRCD_SYMLINKFILE}"
+		return 1
+	fi
+
+	start-stop-daemon --start --quiet --pidfile "${PIDFILE}" --exec /usr/sbin/lircd -- \
+		-P "${PIDFILE}" ${LIRCD_OPTS}
+	retval=$?
+
+	if [ ${retval} -ne 0 ]; then
+		rm -f ${LIRCD_SOCKET}
+	fi
+
+	eend ${retval}
+}
+
+stop() {
+	ebegin "Stopping lircd"
+	rm -f ${LIRCD_SYMLINKFILE}
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" --exec /usr/sbin/lircd
+	eend $?
+}
diff --git a/app-misc/lirc/lirc-0.8.5.ebuild b/app-misc/lirc/lirc-0.8.5.ebuild
index e045ea0e2519..b29026946a33 100644
--- a/app-misc/lirc/lirc-0.8.5.ebuild
+++ b/app-misc/lirc/lirc-0.8.5.ebuild
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.7 2009/10/04 13:41:14 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.5.ebuild,v 1.8 2009/10/04 18:48:28 fauli Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -44,7 +44,7 @@ IUSE_LIRC_DEVICES_DIRECT="
 	devinput digimatrix dsp dvico ea65
 	exaudio flyvideo ftdi gvbctv5pci hauppauge
 	hauppauge_dvb hercules_smarttv_stereo i2cuser
-	igorplugusb iguana imon imon_24g imon_knob
+	igorplugusb iguanaIR imon imon_24g imon_knob
 	imon_lcd imon_pad imon_rsc irdeo irdeo_remote
 	irlink irman irreal it87 ite8709
 	knc_one kworld leadtek_0007 leadtek_0010
diff --git a/app-misc/lirc/lirc-0.8.6.ebuild b/app-misc/lirc/lirc-0.8.6-r1.ebuild
index 254c243bf405..67519e10c066 100644
--- a/app-misc/lirc/lirc-0.8.6.ebuild
+++ b/app-misc/lirc/lirc-0.8.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.1 2009/09/23 14:45:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.6-r1.ebuild,v 1.1 2009/10/04 18:48:28 fauli Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -17,7 +17,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug doc X hardware-carrier transmitter"
 
 S="${WORKDIR}/${MY_P}"
@@ -41,16 +41,16 @@ IUSE_LIRC_DEVICES_DIRECT="
 	avermedia98 awlibusb bestbuy bestbuy2 breakoutbox
 	bte bw6130 caraca chronos commandir
 	cph06x creative creative_infracd
-	devinput digimatrix dsp dvico ea65
+	devinput digimatrix dsp dvico ea65 ene0100
 	exaudio flyvideo ftdi gvbctv5pci hauppauge
 	hauppauge_dvb hercules_smarttv_stereo i2cuser
-	igorplugusb iguana imon imon_24g imon_knob
+	igorplugusb iguanaIR imon imon_24g imon_knob
 	imon_lcd imon_pad imon_rsc irdeo irdeo_remote
 	irlink irman irreal it87 ite8709
 	knc_one kworld leadtek_0007 leadtek_0010
 	leadtek_pvr2000 livedrive_midi
 	livedrive_seq logitech macmini mceusb
-	mceusb2 mediafocusI mouseremote
+	mediafocusI mouseremote
 	mouseremote_ps2 mp3anywhere mplay nslu2
 	packard_bell parallel pcmak pcmak_usb
 	pctv pixelview_bt878 pixelview_pak
@@ -72,25 +72,23 @@ IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
 #device-driver which use libusb
 LIBUSB_USED_BY_DEV="
 	all atilibusb awlibusb sasem igorplugusb imon imon_lcd imon_pad
-	imon_rsc streamzap mceusb mceusb2 xboxusb irlink commandir"
+	imon_rsc streamzap mceusb xboxusb irlink commandir"
 
 for dev in ${LIBUSB_USED_BY_DEV}; do
-	RDEPEND="${RDEPEND} lirc_devices_${dev}? ( dev-libs/libusb )"
+	DEPEND="${DEPEND} lirc_devices_${dev}? ( dev-libs/libusb )"
 done
 
-RDEPEND="${RDEPEND}
-	lirc_devices_ftdi? ( dev-embedded/libftdi )"
-
 # adding only compile-time depends
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND} ${DEPEND}
 	virtual/linux-sources
+	lirc_devices_ftdi? ( dev-embedded/libftdi )
 	lirc_devices_all? ( dev-embedded/libftdi )"
 
 # adding only run-time depends
 RDEPEND="${RDEPEND}
 	lirc_devices_usbirboy? ( app-misc/usbirboy )
 	lirc_devices_inputlirc? ( app-misc/inputlircd )
-	lirc_devices_iguana? ( app-misc/iguanaIR )"
+	lirc_devices_iguanaIR? ( app-misc/iguanaIR )"
 
 # add all devices to IUSE
 for dev in ${IUSE_LIRC_DEVICES}; do
@@ -124,6 +122,12 @@ add_device() {
 
 pkg_setup() {
 
+	if use lirc_devices_mceusb2
+	then
+		ewarn "The mceusb2 driver has been merged into the mceusb."
+		ewarn "Please only use the latter now."
+	fi
+
 	ewarn "If your LIRC device requires modules, you'll need MODULE_UNLOAD"
 	ewarn "support in your kernel."
 
@@ -280,7 +284,7 @@ src_unpack() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	newinitd "${FILESDIR}"/lircd-0.8.3 lircd
+	newinitd "${FILESDIR}"/lircd-0.8.6 lircd
 	newinitd "${FILESDIR}"/lircmd lircmd
 	newconfd "${FILESDIR}"/lircd.conf.2 lircd
 
@@ -298,41 +302,33 @@ src_install() {
 
 	insinto /usr/share/lirc/remotes
 	doins -r remotes/*
+
+	keepdir /var/run/lirc
 }
 
 pkg_preinst() {
 	linux-mod_pkg_preinst
 
 	local dir="${ROOT}/etc/modprobe.d"
-	if [[ -a ${dir}/lirc && ! -a ${dir}/lirc.conf ]]; then
+	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
 		elog "Renaming ${dir}/lirc to lirc.conf"
 		mv -f "${dir}/lirc" "${dir}/lirc.conf"
 	fi
 
 	# 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
+	if [[ -f "${ROOT}"/etc/lirc/lircd.conf && ! -f "${D}"/etc/lirc/lircd.conf ]]; then
+		cp "${ROOT}"/etc/lirc/lircd.conf "${D}"/etc/lirc/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
+	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
+	ewarn "The new default location for lircd.conf is inside of"
+	ewarn "/etc/lirc/ directory"
 
-	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"
 }