fixed modprobe.d file (.conf extension) + removed old version.

(Portage version: 2.2_rc44/cvs/Linux i686)

7 files changed, 9 insertions, 176 deletions

diff --git a/net-wireless/irda-utils/ChangeLog b/net-wireless/irda-utils/ChangeLog
index 3a016dd8846a..5bf9d394db09 100644
--- a/net-wireless/irda-utils/ChangeLog
+++ b/net-wireless/irda-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/irda-utils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.32 2009/09/27 17:48:06 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.33 2009/10/08 19:54:30 sbriesen Exp $
+
+  08 Oct 2009; Stefan Briesenick <sbriesen@gentoo.org>
+  -irda-utils-0.9.16-r1.ebuild, -files/irda-utils-0.9.16-irkbd.patch,
+  irda-utils-0.9.18-r3.ebuild, -files/irda.conf, -files/irda.rc,
+  -files/irda-utils-gcc3.4-fix.patch:
+  fixed modprobe.d file (.conf extension) + removed old version.
 
   27 Sep 2009; nixnut <nixnut@gentoo.org> irda-utils-0.9.18-r3.ebuild:
   ppc stable #284570
diff --git a/net-wireless/irda-utils/files/irda-utils-0.9.16-irkbd.patch b/net-wireless/irda-utils/files/irda-utils-0.9.16-irkbd.patch
deleted file mode 100644
index 151cb475834d..000000000000
--- a/net-wireless/irda-utils/files/irda-utils-0.9.16-irkbd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urp irda-utils-0.9.16/tekram/irkbd.c irda-utils-0.9.16-irkbd/tekram/irkbd.c
---- irda-utils-0.9.16/tekram/irkbd.c	2000-11-06 22:13:52.000000000 +0100
-+++ irda-utils-0.9.16-irkbd/tekram/irkbd.c	2005-02-08 15:36:52.000000000 +0100
-@@ -33,7 +33,6 @@
- #include <sys/time.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
--#include <sys/kd.h>
- 
- #include <unistd.h>
- #include <stdio.h>
-@@ -45,7 +44,7 @@
- 
- #include <irda.h>
- 
--#include <asm/byteorder.h>
-+#include <linux/types.h>
- 
- #include "irkbd.h"
- 
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
deleted file mode 100644
index 8bee9c1d3c5b..000000000000
--- a/net-wireless/irda-utils/files/irda-utils-gcc3.4-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.conf b/net-wireless/irda-utils/files/irda.conf
deleted file mode 100644
index e5e48a5534a9..000000000000
--- a/net-wireless/irda-utils/files/irda.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/files/irda.conf,v 1.1 2004/10/04 18:53:38 brix Exp $
-
-IRDA=yes
-IRDADEV=/dev/ttyS2
-#Set (optional) Dongle name here
-#DONGLE=actisys+
-DISCOVERY=yes
diff --git a/net-wireless/irda-utils/files/irda.rc b/net-wireless/irda-utils/files/irda.rc
deleted file mode 100644
index 5ab2726953b3..000000000000
--- a/net-wireless/irda-utils/files/irda.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/runscript
-# 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/files/irda.rc,v 1.2 2005/10/22 00:13:10 brix Exp $
-
-depend() {
-	use serial
-}
-
-checkconfig() {
-        if [ -z "$IRDA" ] || [ -z "$IRDADEV" ] ; then
-		eerror "You need to setup IRDA and IRDADEV in /etc/conf.d/irda first"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	# Check that irda is enabled.
-	[ ${IRDA} = "no" ] && return 1
-
-	[ -f /usr/sbin/irattach ] || return 1
-
-	local ARGS=""
-	if [ $DONGLE ]; then
-		ARGS="$ARGS -d $DONGLE"
-	fi
-	if [ "$DISCOVERY" = "yes" ];then
-		ARGS="$ARGS -s"
-	fi
-
-        # Attach irda device
-        ebegin "Starting IrDA"
-        start-stop-daemon --start --quiet \
-                --exec /usr/sbin/irattach -- ${IRDADEV} ${ARGS}
-	eend ${?}
-}
-
-stop() {
-        ebegin "Shutting down IrDA"
-	start-stop-daemon --stop --quiet --pidfile /var/run/irattach.pid
-	eend ${?}
-}
diff --git a/net-wireless/irda-utils/irda-utils-0.9.16-r1.ebuild b/net-wireless/irda-utils/irda-utils-0.9.16-r1.ebuild
deleted file mode 100644
index 52f89f753eeb..000000000000
--- a/net-wireless/irda-utils/irda-utils-0.9.16-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2007 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-r1.ebuild,v 1.8 2007/04/12 21:23:09 betelgeuse Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.4"
-
-inherit eutils autotools
-
-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 ppc x86"
-IUSE="gtk"
-
-DEPEND="=dev-libs/glib-1.2*
-	gtk? ( =x11-libs/gtk+-1.2* )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/irda-utils-rh1.patch"
-	epatch "${FILESDIR}/irda-utils-gcc3.4-fix.patch"
-	epatch "${FILESDIR}/${P}-irkbd.patch"
-}
-
-src_compile() {
-	export WANT_AUTOCONF=2.5
-	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}" MANDIR="${D}/usr/share/man" \
-		|| 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
-
-	newconfd "${FILESDIR}/irda.conf" irda
-	newinitd "${FILESDIR}/irda.rc" irda
-}
diff --git a/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild b/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild
index 8b3d5afb121f..059d89c8cfff 100644
--- a/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild
+++ b/net-wireless/irda-utils/irda-utils-0.9.18-r3.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/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild,v 1.4 2009/09/27 17:48:06 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild,v 1.5 2009/10/08 19:54:30 sbriesen Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -83,7 +83,7 @@ src_install () {
 	newinitd "${FILESDIR}/irda.initd" irda
 
 	insinto /etc/modprobe.d
-	newins "${FILESDIR}/irda.modsd" irda
+	newins "${FILESDIR}/irda.modsd" irda.conf
 
 	insinto /etc/udev/rules.d
 	newins "${FILESDIR}/irda.rules" 53-irda.rules