Add patch for logitech MX-518. Thanks to Roman Porizka and Anton Bolshakov. Bug #392583

(Portage version: 2.1.11.18/cvs/Linux x86_64)

3 files changed, 86 insertions, 4 deletions

diff --git a/sys-apps/lomoco/ChangeLog b/sys-apps/lomoco/ChangeLog
index a180eee2c378..596db8bcb9b5 100644
--- a/sys-apps/lomoco/ChangeLog
+++ b/sys-apps/lomoco/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/lomoco
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/ChangeLog,v 1.19 2012/08/19 22:12:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/ChangeLog,v 1.20 2012/09/22 17:37:30 hwoarang Exp $
+
+*lomoco-1.0-r9 (22 Sep 2012)
+
+  22 Sep 2012; Markos Chandras <hwoarang@gentoo.org> +lomoco-1.0-r9.ebuild,
+  files/lomoco-1.0-gentoo-hardware-support.patch:
+  Add patch for logitech MX-518. Thanks to Roman Porizka and Anton Bolshakov.
+  Bug #392583
 
 *lomoco-1.0-r8 (19 Aug 2012)
 
diff --git a/sys-apps/lomoco/files/lomoco-1.0-gentoo-hardware-support.patch b/sys-apps/lomoco/files/lomoco-1.0-gentoo-hardware-support.patch
index 2913ec477fee..5a5cd7d3fcb9 100644
--- a/sys-apps/lomoco/files/lomoco-1.0-gentoo-hardware-support.patch
+++ b/sys-apps/lomoco/files/lomoco-1.0-gentoo-hardware-support.patch
@@ -1,8 +1,7 @@
-- Support for other hardware 
+- Support for other hardware
 - ssr comment in the mouse array.
 - Use of defines for numeric constants to improve code readability.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+- Debian patch integrated
 
 diff -Nuar --exclude '*~' lomoco-1.0.old/src/lomoco.c lomoco-1.0/src/lomoco.c
 --- lomoco-1.0.old/src/lomoco.c	2006-03-01 06:10:05.000000000 -0800
@@ -22,6 +21,14 @@ diff -Nuar --exclude '*~' lomoco-1.0.old/src/lomoco.c lomoco-1.0/src/lomoco.c
  	{0xc00e, "Wheel Mouse Optical",                        "M-BJ58",      0, 1, 0, 0, 0},
  	{0xc00f, "MouseMan Traveler",                          "M-BJ79",      0, 1, 0, 0, 0},
  	{0xc012, "MouseMan Dual Optical",                      "M-BL63B",     0, 1, 0, 0, 0},
+@@ -42,6 +42,7 @@
+ 	{0xc012, "MouseMan Dual Optical",                      "M-BL63B",     0, 1, 0, 0, 0},
+ 	{0xc01d, "MX510 Optical Mouse",                        "M-BS81A",     0, 1, 1, 1, 0},
+ 	{0xc01e, "MX518 Optical Mouse",                        "M-BS81A",     0, 1, 1, 0, 0},
++	{0xc051, "MX518 Optical Mouse",                        "M-BS81A",     0, 1, 1, 0, 0},
+ 	{0xc024, "MX300 Optical Mouse",                        "M-BP82",      0, 1, 0, 0, 0},
+ 	{0xc01b, "MX310 Optical Mouse",                        "M-BP86",      0, 1, 0, 0, 0},
+ 	{0xc025, "MX500 Optical Mouse",                        "M-BP81A",     0, 1, 1, 1, 0},
 @@ -49,50 +50,37 @@
  	{0xc041, "G5 Laser Gaming Mouse",                      "M-UAC113",    0, 1, 0, 1, 0},
  	{0xc501, "Mouse Receiver",                             "C-BA4-MSE",   1, 0, 0, 0, 0},
@@ -248,6 +255,15 @@ diff -Nuar --exclude '*~' lomoco-1.0.old/src/lomoco.c lomoco-1.0/src/lomoco.c
  				m->has_sms? "SMS ": ""
  				);
  		}
+@@ -667,7 +671,7 @@
+ 				device->filename,
+ 				device->descriptor.idVendor,
+ 				device->descriptor.idProduct,
+-				ret ? product : "Unknown"
++				ret > 0 ? product : "Unknown"
+ 				);
+ 			continue;
+ 		}
 diff -Nuar --exclude '*~' lomoco-1.0.old/src/lomoco.h lomoco-1.0/src/lomoco.h
 --- lomoco-1.0.old/src/lomoco.h	2006-03-01 06:10:05.000000000 -0800
 +++ lomoco-1.0/src/lomoco.h	2006-04-30 02:34:04.381175920 -0700
diff --git a/sys-apps/lomoco/lomoco-1.0-r9.ebuild b/sys-apps/lomoco/lomoco-1.0-r9.ebuild
new file mode 100644
index 000000000000..339926bfdffd
--- /dev/null
+++ b/sys-apps/lomoco/lomoco-1.0-r9.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/lomoco-1.0-r9.ebuild,v 1.1 2012/09/22 17:37:30 hwoarang Exp $
+
+EAPI=4
+inherit autotools eutils multilib toolchain-funcs
+
+DESCRIPTION="Lomoco can configure vendor-specific options on Logitech USB mice."
+HOMEPAGE="http://www.lomoco.org/"
+SRC_URI="http://www.lomoco.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!<sys-fs/udev-114
+	virtual/libusb:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	cp -f "${FILESDIR}"/lomoco-pm-utils-r1 "${T}" || die
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	sed -i -e "s|@UDEVDIR@|${udevdir}|" "${T}"/lomoco-pm-utils-r1 || die
+
+	epatch \
+		"${FILESDIR}"/${P}-gentoo-hardware-support.patch \
+		"${FILESDIR}"/${P}-updated-udev.patch \
+
+	eautoreconf
+}
+
+src_compile() {
+	emake
+	emake udev-rules
+}
+
+src_install() {
+	default
+
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
+	insinto "${udevdir}"/rules.d
+	newins udev/lomoco.rules 40-lomoco.rules
+
+	exeinto "${udevdir}"
+	newexe udev/udev.lomoco lomoco
+
+	insinto /etc
+	doins "${FILESDIR}"/lomoco.conf
+
+	exeinto /etc/pm/sleep.d
+	newexe "${T}"/lomoco-pm-utils-r1 lomoco
+}