fix udev issues: bug #156665 and #299739

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

6 files changed, 128 insertions, 85 deletions

diff --git a/sys-apps/lomoco/ChangeLog b/sys-apps/lomoco/ChangeLog
index 36c38ffe70fd..1c46ad92355c 100644
--- a/sys-apps/lomoco/ChangeLog
+++ b/sys-apps/lomoco/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/lomoco
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/ChangeLog,v 1.8 2009/05/16 09:21:59 robbat2 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/ChangeLog,v 1.9 2010/03/07 12:39:27 hollow Exp $
+
+*lomoco-1.0-r3 (07 Mar 2010)
+
+  07 Mar 2010; Benedikt Böhm <hollow@gentoo.org> -lomoco-1.0-r1.ebuild,
+  lomoco-1.0-r2.ebuild, +lomoco-1.0-r3.ebuild,
+  files/lomoco-1.0-updated-udev.patch, metadata.xml:
+  fix udev issues: bug #156665 and #299739
 
   16 May 2009; Robin H. Johnson <robbat2@gentoo.org> lomoco-1.0-r1.ebuild,
   lomoco-1.0-r2.ebuild:
diff --git a/sys-apps/lomoco/files/lomoco-1.0-updated-udev.patch b/sys-apps/lomoco/files/lomoco-1.0-updated-udev.patch
index 708b80072a69..96509a6551f0 100644
--- a/sys-apps/lomoco/files/lomoco-1.0-updated-udev.patch
+++ b/sys-apps/lomoco/files/lomoco-1.0-updated-udev.patch
@@ -1,51 +1,78 @@
-Index: lomoco-1.0/udev/toudev.awk
-===================================================================
---- lomoco-1.0.orig/udev/toudev.awk
-+++ lomoco-1.0/udev/toudev.awk
-@@ -1,20 +1,23 @@
+diff --git a/udev/toudev.awk b/udev/toudev.awk
+index 822421d..ada40e5 100644
+--- a/udev/toudev.awk
++++ b/udev/toudev.awk
+@@ -1,15 +1,20 @@
  #!/bin/awk -f
  BEGIN {
--	FS = ","
--	print "ACTION != \"add\", GOTO=\"lomoco_end\""
+ 	FS = ","
++	print "# udev.rules file for Logitech mouse control using lomoco"
++	print "#"
++	print ""
+ 	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 ""
++	print "SUBSYSTEM == \"usb\", ENV{DEVTYPE}==\"usb_device\", GOTO=\"lomoco_start\""
++	print "SUBSYSTEM != \"usb_device\", GOTO=\"lomoco_end\""
++	print ""
++	print "LABEL=\"lomoco_start\""
+ 	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 ""
++    print "ATTRS{idVendor}==\"046d\", ATTRS{idProduct}==\"" substr($1, index($1, "x")+1) \
+ 	  "\", RUN=\"lomoco\""
  }
  
- 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#*.})
+diff --git a/udev/udev.lomoco b/udev/udev.lomoco
+index 9e55511..da896d9 100755
+--- a/udev/udev.lomoco
++++ b/udev/udev.lomoco
+@@ -1,26 +1,24 @@
+-#!/bin/bash
++#!/bin/sh
++#
++#  udev helper script for the locomo utility
++#
+ 
+-case "$DEVPATH" in
+-	*usbdev*.*)
+-		dev=${DEVPATH##*usbdev}
+-		bus=$(printf %03d ${dev%.*})
+-		dev=$(printf %03d ${dev#*.})
++test -x /usr/bin/lomoco || exit 0
++test -r /etc/lomoco.conf || exit 0
  
 -		. /etc/sysconfig/logitech_mouse
-+		. /etc/lomoco.conf
++options=
++. /etc/lomoco.conf
  
- 		options=
+-		options=
++if [ -n "$LOGITECH_MOUSE_RESOLUTION" ]; then
++	options="--$LOGITECH_MOUSE_RESOLUTION"
++fi
+ 
+-		if [ -n "$LOGITECH_MOUSE_RESOLUTION" ]; then
+-			options="--$LOGITECH_MOUSE_RESOLUTION"
+-		fi
+-
+-		if [ -z "$LOGITECH_MOUSE_DISABLE_CC" -o "$LOGITECH_MOUSE_DISABLE_CC" = yes ]; then
+-			options="$options --no-sms"
+-		fi
+-
+-		if [ -n "$options" ]; then
+-			/usr/bin/lomoco -b $bus -d $dev $options
+-		fi
+-	;;
+-esac 2>&1 | /bin/logger -t lomoco
++if [ -z "$LOGITECH_MOUSE_DISABLE_CC" -o "$LOGITECH_MOUSE_DISABLE_CC" = yes ]; then
++	options="$options --no-sms"
++fi
  
++if [ -n "$options" ]; then
++	/usr/bin/lomoco -b $BUSNUM -d $DEVNUM -p $ID_MODEL_ID $options 2>&1 | \
++		sed -e 's/^[[:blank:]]\+//' -e 's/ \+$//' -e '/^$/ d' | \
++		logger -t lomoco -p daemon.info
++fi
diff --git a/sys-apps/lomoco/lomoco-1.0-r1.ebuild b/sys-apps/lomoco/lomoco-1.0-r1.ebuild
deleted file mode 100644
index 9aae36d6c6b8..000000000000
--- a/sys-apps/lomoco/lomoco-1.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/lomoco-1.0-r1.ebuild,v 1.3 2009/05/16 09:21:59 robbat2 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="=virtual/libusb-0*"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-gentoo-hardware-support.patch
-	cd ${S}
-	eautoreconf
-}
-
-src_compile() {
-	econf
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/sys-apps/lomoco/lomoco-1.0-r2.ebuild b/sys-apps/lomoco/lomoco-1.0-r2.ebuild
index 0ddfdec2e312..92538f8b9fb4 100644
--- a/sys-apps/lomoco/lomoco-1.0-r2.ebuild
+++ b/sys-apps/lomoco/lomoco-1.0-r2.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.2 2009/05/16 09:21:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/lomoco-1.0-r2.ebuild,v 1.3 2010/03/07 12:39:27 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."
+DESCRIPTION="Lomoco can configure vendor-specific options on Logitech USB mice."
 HOMEPAGE="http://lomoco.linux-gamers.net/"
 SRC_URI="http://lomoco.linux-gamers.net/files/${P}.tar.gz"
 
@@ -20,8 +18,8 @@ DEPEND="=virtual/libusb-0*"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch ${FILESDIR}/${P}-gentoo-hardware-support.patch
-	epatch ${FILESDIR}/${P}-updated-udev.patch
+	epatch "${FILESDIR}"/${P}-gentoo-hardware-support.patch
+	epatch "${FILESDIR}"/${P}-updated-udev.patch
 	eautoreconf
 }
 
diff --git a/sys-apps/lomoco/lomoco-1.0-r3.ebuild b/sys-apps/lomoco/lomoco-1.0-r3.ebuild
new file mode 100644
index 000000000000..a68c8b94e14d
--- /dev/null
+++ b/sys-apps/lomoco/lomoco-1.0-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/lomoco-1.0-r3.ebuild,v 1.1 2010/03/07 12:39:27 hollow Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="Lomoco can configure vendor-specific options on Logitech USB mice."
+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="=virtual/libusb-0*"
+RDEPEND="${DEPEND} !<sys-fs/udev-114"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo-hardware-support.patch
+	epatch "${FILESDIR}"/${P}-updated-udev.patch
+	eautoreconf
+}
+
+src_compile() {
+	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/metadata.xml b/sys-apps/lomoco/metadata.xml
index 22876d9273cd..9f3fdee2246b 100644
--- a/sys-apps/lomoco/metadata.xml
+++ b/sys-apps/lomoco/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>hollow@gentoo.org</email>
-  <name>Benedikt Boehm</name>
-</maintainer>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>