Version bump.

6 files changed, 119 insertions, 2 deletions

diff --git a/net-wireless/irda-utils/ChangeLog b/net-wireless/irda-utils/ChangeLog
index f8d2e084815c..6f0cc313149f 100644
--- a/net-wireless/irda-utils/ChangeLog
+++ b/net-wireless/irda-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/irda-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.1 2004/10/04 18:53:38 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.2 2004/10/04 19:12:48 brix Exp $
+
+*irda-utils-0.9.16 (04 Oct 2004)
+
+  04 Oct 2004; Henrik Brix Andersen <brix@gentoo.org>
+  +files/irda-utils-gcc3.4-fix.patch, +files/irda-utils-rh1.patch,
+  +irda-utils-0.9.16.ebuild:
+  Version bump. Fixes bug #63475
 
 *irda-utils-0.9.13 (04 Oct 2004)
 
diff --git a/net-wireless/irda-utils/Manifest b/net-wireless/irda-utils/Manifest
index 76676c101744..0ddfce01df00 100644
--- a/net-wireless/irda-utils/Manifest
+++ b/net-wireless/irda-utils/Manifest
@@ -1,8 +1,12 @@
+MD5 abdd36ca1caf555292f36b401751af17 irda-utils-0.9.16.ebuild 1813
 MD5 9490402a9e36f316fa8d41b9c6aa24df irda-utils-0.9.13.ebuild 1199
 MD5 0ff30c1ba55c18f0f7d5398e7acde14c irda-utils-0.9.15.ebuild 1584
-MD5 4f4226f402499400dc432480819fd60b ChangeLog 2370
+MD5 7459b42289a83fca2b891ebd10bec3ad ChangeLog 2588
 MD5 dc1773fc29727c205a632b4a780a5d21 metadata.xml 219
 MD5 10a500d681ec4e01d3d614987d5c9068 files/digest-irda-utils-0.9.13 69
 MD5 b853c309634581523261878b433cc4ac files/digest-irda-utils-0.9.15 69
+MD5 ef26e8a578b5a78843863316b3223e67 files/digest-irda-utils-0.9.16 69
+MD5 23a2271075f62051f30dd6ed9bbd3f85 files/irda-utils-gcc3.4-fix.patch 400
+MD5 fa2075c93b60699aaa4017ace46406ef files/irda-utils-rh1.patch 444
 MD5 db4f871dba7e66e861503b792ca0a7e3 files/irda.conf 313
 MD5 b3f79d6bc205a1fde999cb893ba247b1 files/irda.rc 970
diff --git a/net-wireless/irda-utils/files/digest-irda-utils-0.9.16 b/net-wireless/irda-utils/files/digest-irda-utils-0.9.16
new file mode 100644
index 000000000000..64987819b490
--- /dev/null
+++ b/net-wireless/irda-utils/files/digest-irda-utils-0.9.16
@@ -0,0 +1 @@
+MD5 2ff18f0571b5a331be7cd22fc3decd41 irda-utils-0.9.16.tar.gz 306262
diff --git a/net-wireless/irda-utils/files/irda-utils-gcc3.4-fix.patch b/net-wireless/irda-utils/files/irda-utils-gcc3.4-fix.patch
new file mode 100644
index 000000000000..8bee9c1d3c5b
--- /dev/null
+++ b/net-wireless/irda-utils/files/irda-utils-gcc3.4-fix.patch
@@ -0,0 +1,11 @@
+--- irda-utils-0.9.16/tekram/irkbd.c.gcc3.4	2000-11-06 22:13:52.000000000 +0100
++++ irda-utils-0.9.16/tekram/irkbd.c	2004-06-10 08:31:33.412633390 +0200
+@@ -286,7 +286,7 @@ static inline void irkbd_handle_response
+ 	case IRKBD_RSP_KBDSPEEDOK:
+ 		break;
+ 	default:
+-		printf(__FUNCTION__ "(), unknown response %02x\n", rsp);
++		printf("%s(), unknown response %02x\n", __func__, rsp);
+ 		break;
+ 	}
+ }
diff --git a/net-wireless/irda-utils/files/irda-utils-rh1.patch b/net-wireless/irda-utils/files/irda-utils-rh1.patch
new file mode 100644
index 000000000000..6e4bfca618ae
--- /dev/null
+++ b/net-wireless/irda-utils/files/irda-utils-rh1.patch
@@ -0,0 +1,11 @@
+--- irda-utils-0.9.15/irattach/irattach.c.rh1	2003-11-24 17:30:21.000000000 +0100
++++ irda-utils-0.9.15/irattach/irattach.c	2003-11-24 17:34:51.000000000 +0100
+@@ -614,7 +614,7 @@
+ 	/* First arg is device name. Save it now, because in some cases
+ 	 * getopt() will remove it... */
+ 	strncpy(device, argv[1], 20);
+-	device[20] = '\0';
++	device[19] = '\0';
+ 
+ 	/* Look for options */
+ 	/* Do this before processing device, to handle "-h" and -v"
diff --git a/net-wireless/irda-utils/irda-utils-0.9.16.ebuild b/net-wireless/irda-utils/irda-utils-0.9.16.ebuild
new file mode 100644
index 000000000000..b18beecc1772
--- /dev/null
+++ b/net-wireless/irda-utils/irda-utils-0.9.16.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2004 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.16.ebuild,v 1.1 2004/10/04 19:12:48 brix Exp $
+
+inherit eutils
+
+DESCRIPTION="IrDA Utilities, tools for IrDA communication"
+HOMEPAGE="http://irda.sourceforge.net/"
+SRC_URI="mirror://sourceforge/irda/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="gtk"
+
+DEPEND="virtual/libc
+	=dev-libs/glib-1.2*
+	gtk? ( =x11-libs/gtk+-1.2* )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/irda-utils-rh1.patch
+	epatch ${FILESDIR}/irda-utils-gcc3.4-fix.patch
+}
+
+src_compile() {
+	export WANT_AUTOMAKE=1.4
+	export RPM_OPT_FLAGS=${CFLAGS}
+
+	emake ROOT="${D}" RPM_BUILD_ROOT="${D}" || die "Making failed."
+
+	cd ${S}/irsockets
+	emake || die "Making irsockets failed."
+
+	if use gtk; then
+		cd ${S}/findchip
+		emake gfindchip || die "Making gfindchip failed."
+	fi
+}
+
+src_install () {
+	dodir /usr/bin
+	dodir /usr/sbin
+
+	emake install PREFIX="${D}" ROOT="${D}" || die "Couldn't install from ${S}"
+
+	# irda-utils's install-etc installs files in /etc/sysconfig if
+	# that directory exists on the system, so clean up just in case.
+	# This is for bug 1797 (17 Jan 2004 agriffis)
+	rm -rf ${D}/etc/sysconfig 2>/dev/null
+
+	into /usr
+	dobin irsockets/irdaspray
+	dobin irsockets/ias_query
+	dobin irsockets/irprintf
+	dobin irsockets/irprintfx
+	dobin irsockets/irscanf
+	dobin irsockets/recv_ultra
+	dobin irsockets/send_ultra
+
+	if use gtk; then
+		dosbin findchip/gfindchip
+	fi
+
+	# install README's into /usr/share/doc
+	for i in *
+	do
+		if [ -d $i -a $i != "man" ]; then
+			if [ -f $i/README ]; then
+				cp $i/README README.$i
+				dodoc README.$i
+				rm README.$i
+			fi
+		fi
+	done
+
+	dodoc etc/modules.conf.irda
+
+	insinto /etc/conf.d ; newins ${FILESDIR}/irda.conf irda
+	insinto /etc/init.d ; insopts -m0755 ; newins ${FILESDIR}/irda.rc irda
+}