include udev support, fixes #156665

(Portage version: 2.1.3_rc9)

6 files changed, 110 insertions, 30 deletions

diff --git a/sys-apps/lomoco/ChangeLog b/sys-apps/lomoco/ChangeLog
index 7e5c1b239750..b9d3bc5a4193 100644
--- a/sys-apps/lomoco/ChangeLog
+++ b/sys-apps/lomoco/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/lomoco
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/ChangeLog,v 1.6 2007/05/15 14:19:07 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/ChangeLog,v 1.7 2007/07/30 09:19:25 hollow Exp $
+
+*lomoco-1.0-r2 (30 Jul 2007)
+
+  30 Jul 2007; Benedikt Böhm <hollow@gentoo.org>
+  +files/lomoco-1.0-updated-udev.patch, +files/lomoco.conf,
+  -lomoco-1.0.ebuild, +lomoco-1.0-r2.ebuild:
+  include udev support, fixes #156665
 
   15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/sys-apps/lomoco/files/digest-lomoco-1.0 b/sys-apps/lomoco/files/digest-lomoco-1.0-r2
index 4132be1399bb..4132be1399bb 100644
--- a/sys-apps/lomoco/files/digest-lomoco-1.0
+++ b/sys-apps/lomoco/files/digest-lomoco-1.0-r2
diff --git a/sys-apps/lomoco/files/lomoco-1.0-updated-udev.patch b/sys-apps/lomoco/files/lomoco-1.0-updated-udev.patch
new file mode 100644
index 000000000000..708b80072a69
--- /dev/null
+++ b/sys-apps/lomoco/files/lomoco-1.0-updated-udev.patch
@@ -0,0 +1,51 @@
+Index: lomoco-1.0/udev/toudev.awk
+===================================================================
+--- lomoco-1.0.orig/udev/toudev.awk
++++ lomoco-1.0/udev/toudev.awk
+@@ -1,20 +1,23 @@
+ #!/bin/awk -f
+ BEGIN {
+-	FS = ","
+-	print "ACTION != \"add\", GOTO=\"lomoco_end\""
+-	print "SUBSYSTEM != \"usb\", GOTO=\"lomoco_end\""
+-	print "SYSFS{idVendor} != \"046d\", GOTO=\"lomoco_end\""
+-	print ""
++        FS = ","
++        print "# udev.rules file for Logitech mouse control using lomoco"
++        print "#"
++        print ""
++        print "ACTION != \"add\", GOTO=\"lomoco_end\""
++        print "SUBSYSTEM != \"usb_device\", GOTO=\"lomoco_end\""
++        print ""
+ }
+ 
+ $1 ~ /0xc[a-f0-9][a-f0-9][a-f0-9]/ {
+     print "# " substr($3, index($3, "\"")) ", " $2
+-    print "SYSFS{idProduct}==\"" substr($1, index($1, "x")+1) \
+-	  "\", RUN=\"lomoco\""
++    print "SYSFS{idVendor}==\"046d\", SYSFS{idProduct}==\"" substr($1, 
++index($1, "x")+1) \
++          "\", RUN+=\"lomoco\""
++    print ""
+ }
+ 
+ END {
+-	print ""
+-	print "LABEL=\"lomoco_end\""
++        print ""
++        print "LABEL=\"lomoco_end\""
+ }
+-
+Index: lomoco-1.0/udev/udev.lomoco
+===================================================================
+--- lomoco-1.0.orig/udev/udev.lomoco
++++ lomoco-1.0/udev/udev.lomoco
+@@ -6,7 +6,7 @@ case "$DEVPATH" in
+ 		bus=$(printf %03d ${dev%.*})
+ 		dev=$(printf %03d ${dev#*.})
+ 
+-		. /etc/sysconfig/logitech_mouse
++		. /etc/lomoco.conf
+ 
+ 		options=
+ 
diff --git a/sys-apps/lomoco/files/lomoco.conf b/sys-apps/lomoco/files/lomoco.conf
new file mode 100644
index 000000000000..31d31cca83bb
--- /dev/null
+++ b/sys-apps/lomoco/files/lomoco.conf
@@ -0,0 +1,2 @@
+LOGITECH_MOUSE_RESOLUTION=800
+LOGITECH_MOUSE_DISABLE_CC=no
diff --git a/sys-apps/lomoco/lomoco-1.0-r2.ebuild b/sys-apps/lomoco/lomoco-1.0-r2.ebuild
new file mode 100644
index 000000000000..7c20634bb7d0
--- /dev/null
+++ b/sys-apps/lomoco/lomoco-1.0-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/lomoco-1.0-r2.ebuild,v 1.1 2007/07/30 09:19:25 hollow Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="Lomoco can configure vendor-specific options on Logitech USB mice \
+(or dual-personality mice plugged into the USB port). Visit the website for \
+specific available options."
+HOMEPAGE="http://lomoco.linux-gamers.net/"
+SRC_URI="http://lomoco.linux-gamers.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libusb"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch ${FILESDIR}/${P}-gentoo-hardware-support.patch
+	epatch ${FILESDIR}/${P}-updated-udev.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf
+	emake || die "make failed"
+	awk -f udev/toudev.awk < src/lomoco.c > udev/40-lomoco.rules \
+		|| die "failed to create udev rules"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	insinto /etc/udev/rules.d
+	doins udev/40-lomoco.rules
+
+	insinto /etc
+	doins "${FILESDIR}"/lomoco.conf
+
+	insinto /lib/udev
+	insopts -m 0755
+	newins udev/udev.lomoco lomoco
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/sys-apps/lomoco/lomoco-1.0.ebuild b/sys-apps/lomoco/lomoco-1.0.ebuild
deleted file mode 100644
index 3a08e12bf89a..000000000000
--- a/sys-apps/lomoco/lomoco-1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/lomoco-1.0.ebuild,v 1.3 2006/04/22 12:15:04 tcort Exp $
-
-inherit autotools
-
-DESCRIPTION="Lomoco can configure vendor-specific options on Logitech USB mice \
-(or dual-personality mice plugged into the USB port). Visit the website for \
-specific available options."
-HOMEPAGE="http://lomoco.linux-gamers.net/"
-SRC_URI="http://lomoco.linux-gamers.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libusb"
-
-src_compile() {
-	eautoreconf
-	econf
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}