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

Package-Manager: portage-2.2_rc44/cvs/Linux i686

8 files changed, 11 insertions, 184 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/Manifest b/net-wireless/irda-utils/Manifest
index 95c98377044c..f8882624d733 100644
--- a/net-wireless/irda-utils/Manifest
+++ b/net-wireless/irda-utils/Manifest
@@ -1,20 +1,14 @@
 AUX irda-setup.sh 1638 RMD160 5077d15ac4f9145e62f409d828894c58da353794 SHA1 42617a7f696d13102569804bc6547989acefed78 SHA256 378deb51b9a6321013b57d243ff7b8301078dc7fde2959820bd2d50ef5478076
 AUX irda-usb.sh 1287 RMD160 3296f936476b79819c3d98b57b31518545a394ed SHA1 3e5018aa908bfb6d38979baf7c254241f79a9acd SHA256 3a7189528975249d1701e833f68f301d011150b3b7c0ff1e795bbffc0cf5fecf
-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
 AUX irda-utils-0.9.18-smcinit.diff 509 RMD160 d5887378dd3e5c051889b67d82e5c998f1132dfe SHA1 90f2ed5ec73c678fcc35f3c6540a7e3959e8d606 SHA256 fb1ee401db2630d24ca263c7f1612db723e6c836616a336d2c5a463130355b68
-AUX irda-utils-gcc3.4-fix.patch 400 RMD160 bd8e0fd36370bf01593a7e300625244fdc91a30a SHA1 f31963c39038d37f0141149a1c50c92e2e645302 SHA256 26510de6ac30016a11d67eb2c912d9203828c42257f049bf64b7ca0305dc2326
 AUX irda-utils-rh1.patch 444 RMD160 97a24330f9b3c639f9d53ad25008d07b59391af6 SHA1 7fbbb6438b1057eaad65597dff29a1727d09573e SHA256 725cd43b05dfc9f05f49ee8d3a81050d3421639c8440092c4d9bed5de1c31b30
-AUX irda.conf 313 RMD160 45626a6869a6e40b5da57b95c5a72b5996cc66eb SHA1 48d2ecf98c3493b658d51192db2855167d330777 SHA256 c5c014af8bef432a6d987c7199d9aaca64fe74941502914fc445aa8f2f2dd4e7
 AUX irda.confd 1082 RMD160 6907ff6b6949e936cfdca06fc9e9530c0f7acc94 SHA1 fee39f1cd33adb9e9ee9f7c4340fbc134aaee27d SHA256 bc02b109411bfe3a6d425489633955e412670e0c60a0eb6e994b578cc904a686
 AUX irda.initd 2001 RMD160 df6b88504d3994164521badb15286ced408b9b85 SHA1 b087793d3340ed84425dd8d6abaa404d90e9912b SHA256 6038c83d602f2b9bc94bb1d23e9973f18dca28a1321e7e8cf09f2a5c147628b6
 AUX irda.modsd 1976 RMD160 9d07a7b21a56e2174d19a7cb038ce7b08feed76f SHA1 9a1902f56f7176ee9fb604588f498fc547d9cd39 SHA256 60043436833312f0756ea901cd18469015c793f208708be5fb1b9e012cacc8ef
-AUX irda.rc 993 RMD160 efdc4abacb06477ba716be8f5b079a5654bd8e7a SHA1 481afc6158f164106d98fae3a58e66732fbe53dd SHA256 30dddbc86255fc226cf49d6ea7662423654ae500a3a75a8b5e4849f5570ab2ac
 AUX irda.rules 683 RMD160 df3346e3b5daaa5cc4722f226afbc4d4ee359842 SHA1 16a67ccfeeeeeadd6d1e2bc96df6f62114c1c2f1 SHA256 bdd65537e3cf460d750d595aeee06f52ca292ea6ac68e74784f8defb64dc9202
-DIST irda-utils-0.9.16.tar.gz 306262 RMD160 d09da29efa29c9918e52c5c05eeabbdf17f6b259 SHA1 36b10be40a4c0949c6541ce5c1f2782c906eb231 SHA256 09a30fa12d81014b2877e8b5c36f5a341788579669d72f2dec0e29d22efe11e9
 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.18-r3.ebuild 2754 RMD160 087e5875c548bdce06df1dbbf4f23dc0ba25d0ee SHA1 cbf25ef76a66a7982fa22f66d70f9e56d0427c76 SHA256 a2ee33951acef61ac6b6fbfdb53af5431abdd6faf2dc9452c140340a9751e698
-MISC ChangeLog 6948 RMD160 f18344f41f322b6d5e28538d3553ed1479f1194a SHA1 189d8fe033f5fbdd5cab4fc7e5a6eef4af539c3b SHA256 23c652356e26440661ae2929c30d1c31571cf83fb04f94b2eba516dc412fd140
+EBUILD irda-utils-0.9.18-r3.ebuild 2761 RMD160 0e0eb413089952f9204944b9f9591216f4127ae7 SHA1 e17c0b13b352040afe333845f5c4a1298c2255df SHA256 bcaf3798b3b9c0c7bfc1e19ce70687bb501a1e969c0457da54380d22fe1b9277
+MISC ChangeLog 7244 RMD160 77c6568cf1cbe2da93eafdeedeb294b1345868c8 SHA1 f6d836601e1a14162f1f04a286fb1d84ca47482b SHA256 3c526c706b4248883776640ef77d609266f5cfa368e6ff3cc052a6eca7cc1170
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
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