fixed dependencies, cleaned up udev-rules, disabled pidfile writing for irattach (we don't need it and it doesn't work well with multiple irda devices).

(Portage version: 2.1.4.4)

3 files changed, 30 insertions, 17 deletions

diff --git a/net-wireless/irda-utils/ChangeLog b/net-wireless/irda-utils/ChangeLog
index 1b8e0ff0e80e..f210cc87993c 100644
--- a/net-wireless/irda-utils/ChangeLog
+++ b/net-wireless/irda-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/irda-utils
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.28 2008/03/25 15:31:28 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.29 2008/03/29 02:48:16 sbriesen Exp $
+
+*irda-utils-0.9.18-r3 (29 Mar 2008)
+
+  29 Mar 2008; Stefan Briesenick <sbriesen@gentoo.org> files/irda.rules,
+  -irda-utils-0.9.18-r2.ebuild, +irda-utils-0.9.18-r3.ebuild:
+  fixed dependencies, cleaned up udev-rules, disabled pidfile writing for
+  irattach (we don't need it and it doesn't work well with multiple irda
+  devices).
 
   25 Mar 2008; Stefan Briesenick <sbriesen@gentoo.org> files/irda.modsd:
   added options for irlan
diff --git a/net-wireless/irda-utils/files/irda.rules b/net-wireless/irda-utils/files/irda.rules
index 387fc1a58fc7..54dd3c2a4cfe 100644
--- a/net-wireless/irda-utils/files/irda.rules
+++ b/net-wireless/irda-utils/files/irda.rules
@@ -4,15 +4,15 @@
 ACTION!="add", GOTO="irda_pnp_end"
 SUBSYSTEM!="pnp", GOTO="irda_pnp_end"
 
-ATTR{id}=="PNP0510", RUN+="/lib/udev/irda-setup sir"
-ATTR{id}=="PNP0511", RUN+="/lib/udev/irda-setup sir"
-ATTR{id}=="NSC*",    RUN+="/lib/udev/irda-setup fir nsc-ircc"
-ATTR{id}=="IBM0071", RUN+="/lib/udev/irda-setup fir nsc-ircc dongle_id=0x09"
-ATTR{id}=="SMC*",    RUN+="/lib/udev/irda-setup fir smsc-ircc2"
-ATTR{id}=="ALI5123", RUN+="/lib/udev/irda-setup fir ali-ircc"
-ATTR{id}=="VIA3076", RUN+="/lib/udev/irda-setup fir via-ircc"
+ATTR{id}=="PNP0510", RUN+="irda-setup sir"
+ATTR{id}=="PNP0511", RUN+="irda-setup sir"
+ATTR{id}=="NSC*",    RUN+="irda-setup fir nsc-ircc"
+ATTR{id}=="IBM0071", RUN+="irda-setup fir nsc-ircc dongle_id=0x09"
+ATTR{id}=="SMC*",    RUN+="irda-setup fir smsc-ircc2"
+ATTR{id}=="ALI5123", RUN+="irda-setup fir ali-ircc"
+ATTR{id}=="VIA3076", RUN+="irda-setup fir via-ircc"
 
 LABEL="irda_pnp_end"
 
-# IrDA-USB (start irattach automatically)
-KERNEL=="irda[0-9]*", SUBSYSTEM=="net", RUN+="/lib/udev/irda-usb"
+# IrDA-USB (start/stop irattach automatically)
+KERNEL=="irda[0-9]*", SUBSYSTEM=="net", RUN+="irda-usb"
diff --git a/net-wireless/irda-utils/irda-utils-0.9.18-r2.ebuild b/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild
index dc69ac87eb8c..8c51193c6f5e 100644
--- a/net-wireless/irda-utils/irda-utils-0.9.18-r2.ebuild
+++ b/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/irda-utils-0.9.18-r2.ebuild,v 1.1 2008/03/22 18:34:10 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild,v 1.1 2008/03/29 02:48:16 sbriesen Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -13,14 +13,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
 IUSE=""
 
-RDEPEND="=dev-libs/glib-2*
-	>=sys-apps/pciutils-2.2.7-r1
+DEPEND="!app-laptop/smcinit
+	=dev-libs/glib-2*
+	dev-util/pkgconfig
+	>=sys-apps/pciutils-2.2.7-r1"
+
+RDEPEND="${DEPEND}
 	sys-process/procps
 	sys-apps/setserial
-	sys-apps/grep"
-DEPEND="${RDEPEND}
-	!app-laptop/smcinit
-	dev-util/pkgconfig"
+	sys-apps/grep
+	sys-fs/udev"
 
 src_unpack() {
 	unpack ${A}
@@ -44,6 +46,9 @@ src_unpack() {
 	# disable etc subdir in Makefile
 	sed -i -e "s:^\(DIRS.*=.* \)etc \(.*\):\1\2:g" Makefile
 
+	# disable write_pid(), because we don't need it
+	sed -i -e "s:\(write_pid();\):/* \1 */:g" irattach/util.c
+
 	append-flags "-fno-strict-aliasing"
 }