added dependencies, compile and install smcinit, added more docs, added udev-support for usb-irda dongles, solves bug #200295.

Package-Manager: portage-2.1.4.4

5 files changed, 119 insertions, 3 deletions

diff --git a/net-wireless/irda-utils/ChangeLog b/net-wireless/irda-utils/ChangeLog
index fc4807f094a1..3b30de08e942 100644
--- a/net-wireless/irda-utils/ChangeLog
+++ b/net-wireless/irda-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/irda-utils
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.23 2007/09/25 15:34:21 hanno Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.24 2008/03/06 21:15:00 sbriesen Exp $
+
+*irda-utils-0.9.18-r1 (06 Mar 2008)
+
+  06 Mar 2008; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/irda-usb.rules, +files/irda-usb.sh, +irda-utils-0.9.18-r1.ebuild:
+  added dependencies, compile and install smcinit, added more docs, added
+  udev-support for usb-irda dongles, solves bug #200295.
 
 *irda-utils-0.9.18 (25 Sep 2007)
 
diff --git a/net-wireless/irda-utils/Manifest b/net-wireless/irda-utils/Manifest
index 8be4c50db0f7..2d342554e67a 100644
--- a/net-wireless/irda-utils/Manifest
+++ b/net-wireless/irda-utils/Manifest
@@ -1,3 +1,5 @@
+AUX irda-usb.rules 51 RMD160 5527564f79f9dc7972de85cd507ef526509e7d49 SHA1 9e50a989d87f74f367637bb06ba1c11177ff9ac3 SHA256 de31cddde14b9e84782109028cca4bfd6dbed570dc6ded580461769b93867e4f
+AUX irda-usb.sh 573 RMD160 6dfbb0d2e99850747a63ae1e47e99f776148cd45 SHA1 367d2588b7576d447e04c0681e4be271e2c5ab06 SHA256 5bdcd178845822c2bf6d9e0ff5cefd2377bbae015a1435dc8ba88a39c960e089
 AUX irda-utils-0.9.16-irkbd.patch 505 RMD160 0d23d2f5e72500378592fbbafa2582cac58787f7 SHA1 fc4ba50e3fb5e378fdcb64c9c86c44f398436f64 SHA256 1c97c8d5a3e4266a5be4c0da41368b0d8cf43a1645285a85e3f0a7c1744dc6cd
 AUX irda-utils-0.9.18-io.h.diff 1604 RMD160 51a71ec4a5388cceb76aeeb24709a39f62e2cb91 SHA1 416b0229a2cc53ef2f030eba1089aac6dd786fec SHA256 41ad319946969d3ef3951894433420203666924d97c50acf571f89bd79adde99
 AUX irda-utils-0.9.18-makefile.diff 298 RMD160 daa1b92b0e1db4afd844944dcf6574e677382a07 SHA1 3fe858ead185931a73db6c37f70e98f3061c4b40 SHA256 1ed15399f8b1b8bb92b0c7b7e263030382a8b9b743bcfcaf86e5babdb31c0174
@@ -10,6 +12,7 @@ DIST irda-utils-0.9.17-pre5.tar.gz 311160 RMD160 b1135acdca77f9012847caa2fb4a44f
 DIST irda-utils-0.9.18.tar.gz 168390 RMD160 440e5b1e013a639431bc247f0005699edabd3607 SHA1 00cd918e373a1f7735dbf8af3a29ade4564ff763 SHA256 61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6
 EBUILD irda-utils-0.9.16-r1.ebuild 2034 RMD160 faf8118e5f8cc826de19e8167cbd4c8959a16978 SHA1 c834d71658cae4318eba16a359981ff029512e42 SHA256 44f628152e3e345f306657fce77f709a1227be0ad014778a3d4accc1954f9c8c
 EBUILD irda-utils-0.9.17_pre5.ebuild 2096 RMD160 2e70c612abaefc6ccadeed8b1e2ca44fc3b3f312 SHA1 e64c0caccb5e548156aeeab010b0fa72995e9f54 SHA256 64f6a423fb8e69b461e283bcac1231dbcce90d3cd4579f9f6b9a5a5c617d2a6d
+EBUILD irda-utils-0.9.18-r1.ebuild 2389 RMD160 cf1eb819dc1a5df1ad73f0992ac10e8b6936f8e8 SHA1 060afd2fcb72b4d616952d00ff614b8d79d72b22 SHA256 17d6071c215941a25ed3f9d4d7b0f7524e766fbd3dd776223bfabc783b62051f
 EBUILD irda-utils-0.9.18.ebuild 1459 RMD160 174a8319aa39beacce575145524eb9f1098cabed SHA1 6b3e0509029fd5c54fc42ac4deeb21bca407caf2 SHA256 cac3e3ffe426a455d6677d545020cdc76a77785fe4f1ef0398c48d6df6efee37
-MISC ChangeLog 5244 RMD160 009fa18d593d9cce7a15ac1923b33fe931259a76 SHA1 2a2861aa82325928906445852a4daff5d8070f2a SHA256 3f3b377c4e7ea21e2f03ebd61a2c5faaff9ebfef97891182cfe492ee45224787
+MISC ChangeLog 5546 RMD160 fb0afb48ff42e2a6f9340f99c094c65138107451 SHA1 56f99cf9e79bc173e06f4868381222e1eb0aeefb SHA256 fa2cb0cab071f00f75daba143e3a0a1a212073be347efc78abfa3045b063812b
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
diff --git a/net-wireless/irda-utils/files/irda-usb.rules b/net-wireless/irda-utils/files/irda-usb.rules
new file mode 100644
index 000000000000..067e12010c2a
--- /dev/null
+++ b/net-wireless/irda-utils/files/irda-usb.rules
@@ -0,0 +1 @@
+KERNEL=="irda[0-9]*", RUN+="/lib/udev/irda-usb.sh"
diff --git a/net-wireless/irda-utils/files/irda-usb.sh b/net-wireless/irda-utils/files/irda-usb.sh
new file mode 100644
index 000000000000..fdbc4cf46737
--- /dev/null
+++ b/net-wireless/irda-utils/files/irda-usb.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Find out where sysfs is mounted. Exit if not available
+SYSFS=$(/bin/sed -n "s:^[^ ]* \([^ ]\+\) sysfs .*:\1:p" /proc/mounts)
+if [[ -z "${SYSFS}" ]]; then
+	echo "sysfs is required"
+	exit 1
+fi
+
+case "${ACTION}" in
+	add)
+		MODALIAS="${SYSFS}${DEVPATH}/device/modalias"
+		if [[ -f "${MODALIAS}" ]]; then
+			case $(<"${MODALIAS}") in
+				usb:*)
+					# attach USB-IrDA interface
+					/usr/sbin/irattach ${INTERFACE} -s
+					;;
+			esac
+		fi
+		;;
+	remove)
+		# unconditionally kill irattach instance
+		/usr/bin/pkill -f "^/usr/sbin/irattach ${INTERFACE} ?"
+		;;
+esac
diff --git a/net-wireless/irda-utils/irda-utils-0.9.18-r1.ebuild b/net-wireless/irda-utils/irda-utils-0.9.18-r1.ebuild
new file mode 100644
index 000000000000..f035623e8d8b
--- /dev/null
+++ b/net-wireless/irda-utils/irda-utils-0.9.18-r1.ebuild
@@ -0,0 +1,79 @@
+# 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-r1.ebuild,v 1.1 2008/03/06 21:15:00 sbriesen Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="IrDA utilities for infrared communication"
+HOMEPAGE="http://irda.sourceforge.net"
+SRC_URI="mirror://sourceforge/irda/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
+IUSE=""
+
+RDEPEND="=dev-libs/glib-2*
+	>=sys-apps/pciutils-2.2.7-r1"
+DEPEND="${RDEPEND}
+	!app-laptop/smcinit
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/irda-utils-rh1.patch"
+	epatch "${FILESDIR}/irda-utils-0.9.18-makefile.diff"
+	epatch "${FILESDIR}/irda-utils-0.9.18-io.h.diff"
+
+	# fix crosscompile, respect CFLAGS (Bug 200295)
+	sed -i -e "/^CC/s:gcc:$(tc-getCC):" \
+		-e "/^LD/s:ld:$(tc-getLD):" \
+		-e "/^AR/s:ar:$(tc-getAR):" \
+		-e "/^RANLIB/s:ranlib:$(tc-getRANLIB):" \
+		-e "/^CFLAGS/s:-O2:${CFLAGS}:" Makefile */Makefile
+
+	# fix compile when pciutils is compiled with USE=zlib (Bug 200295)
+	sed -i -e "s:-lpci:$(pkg-config --libs libpci):g" smcinit/Makefile
+
+	append-flags "-fno-strict-aliasing"
+}
+
+src_compile() {
+	emake RPM_OPT_FLAGS="${CFLAGS}" RPM_BUILD_ROOT="${D}" ROOT="${D}" \
+		|| die "emake failed"
+}
+
+src_install () {
+	dodir /usr/bin
+	dodir /usr/sbin
+
+	emake install RPM_OPT_FLAGS="${CFLAGS}" ROOT="${D}" \
+		MANDIR="${D}/usr/share/man" \
+		|| die "emake install failed"
+
+	newdoc ethereal/README     README.wireshark
+	newdoc irattach/README     README.irattach
+	newdoc irdadump/README     README.irdadump
+	newdoc irdaping/README     README.irdaping
+	newdoc irsockets/README    README.irsockets
+	newdoc tekram/README       README.tekram
+	newdoc smcinit/README      README.smcinit
+	newdoc smcinit/README.Peri README.smcinit.Peri
+	newdoc smcinit/README.Rob  README.smcinit.Rob
+	newdoc smcinit/README.Tom  README.smcinit.Tom
+	newdoc irattach/ChangeLog  ChangeLog.irattach
+	newdoc irdadump/ChangeLog  ChangeLog.irdadump
+	newdoc smcinit/ChangeLog   ChangeLog.smcinit
+	dohtml smcinit/RobMiller-irda.html
+	dodoc README etc/modules.conf.irda
+
+	newconfd "${FILESDIR}/irda.conf" irda
+	newinitd "${FILESDIR}/irda.rc" irda
+
+	insinto /etc/udev/rules.d
+	newins "${FILESDIR}/irda-usb.rules" 53-irda-usb.rules
+	exeinto /lib/udev
+	doexe "${FILESDIR}/irda-usb.sh"
+}