gentoo resync : 14.07.2018

5 files changed, 191 insertions, 0 deletions

diff --git a/app-misc/logitech-applet/Manifest b/app-misc/logitech-applet/Manifest
new file mode 100644
index 000000000000..3ecf7b1f7da9
--- /dev/null
+++ b/app-misc/logitech-applet/Manifest
@@ -0,0 +1,5 @@
+AUX 40-logitech_applet.rules 251 BLAKE2B f29b2df9ca3427e4bfbe993a9d92ce39df25aefc13d4698418a13530e60f2c57c80ae9f4f2a3baecc1ddd2da2178d5be5f68d354f44fb88a5ce357e05d510c4b SHA512 689058ab61508c342a29dea2de620473453e9237c33cc0119b2c22dc502b6c345d8e42d7769c7cc246c75efbbfa91bd2fdaea15c40ce89468224274b20b80670
+AUX logitech-applet-0.4_pre1-mx300-mx518.patch 5815 BLAKE2B 79c277fd37a439ba3441e0414437004443967c06db6d5615a47da134ddf2daa8b4ffbde43aa3a210e6a76e8125def42fd033fe706ed85a937249db6feb5feb86 SHA512 5b613821ed6c88eed99c36bf1d6df5c27183e41e176082247752970f372aef0e299e729aaeda508ef1cfe323a0e3ce368d3ca1a13a6836278458a531531883ff
+DIST logitech_applet-0.4test1.tar.gz 75783 BLAKE2B 71ac28c1efab922c5d48db00be53eb0c9200ea05972d1fc1a9551f3963fd9d4be46e7a66ebabb873873e1c0e89486e0e32ea7810cafb3eb0ade67cf399c46508 SHA512 64389b365d9d3473bf3ec027c7d9ee34cbdcddf9abb6bfabf4e771a255dade80e6758b7a997da3eaf23c19f1bd4559e79fb199e9f62e0f2ad1af92eab4b23789
+EBUILD logitech-applet-0.4_pre1-r3.ebuild 701 BLAKE2B f24c0721bfd186e56f8432a795d2f9e1789122a36d1b8b85e439a7ee0459f653777974f4ed271b4c0836f80aeae741cd5efa310f779925f7a72fa8921fb544a6 SHA512 1ff40051c70f4b54beb8a396628a00bbe738936f6efb180e3a7228a71c2ecaf8658091e7c93670f7a40623eaedf2d813fa8e2c851a42a485ea9969ea9b484f9a
+MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/app-misc/logitech-applet/files/40-logitech_applet.rules b/app-misc/logitech-applet/files/40-logitech_applet.rules
new file mode 100644
index 000000000000..a51277c3ecb9
--- /dev/null
+++ b/app-misc/logitech-applet/files/40-logitech_applet.rules
@@ -0,0 +1,6 @@
+ACTION!="add", GOTO="logitech_applet_rules_end"
+SUBSYSTEM!="usb*", GOTO="logitech_applet_rules_end"
+
+ATTRS{manufacturer}=="Logitech", ATTRS{product}=="USB-PS/2 Optical Mouse", RUN+="/usr/sbin/logitech_applet -s 800"
+
+LABEL="logitech_applet_rules_end"
diff --git a/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch
new file mode 100644
index 000000000000..3e2e06536fcd
--- /dev/null
+++ b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch
@@ -0,0 +1,139 @@
+--- a/logitech_applet.c
++++ b/logitech_applet.c
+@@ -40,6 +40,44 @@
+ #endif
+ 
+ #define VENDOR_LOGITECH 0x046D
++#define HAS_RES 0x01  /* mouse supports variable resolution */
++#define HAS_SS  0x02  /* mouse supports smart scroll control */
++#define HAS_CSR  0x04  /* mouse supports cordless status reporting and control */
++#define HAS_SSR  0x08  /* mouse supports smart scroll reporting */
++#define USE_CH2  0x10 /* mouse needs to use the second channel */
++
++struct device_table {
++    int idVendor;
++    int idProduct;
++    char* Model;
++    char* Name;
++    int flags;
++} 
++
++device_table[] = {
++    { VENDOR_LOGITECH, 0xC00E, "M-BJ58", "Wheel Mouse Optical", HAS_RES },
++    { VENDOR_LOGITECH, 0xC00F, "M-BJ79", "MouseMan Traveler", HAS_RES },
++    { VENDOR_LOGITECH, 0xC012, "M-BL63B", "MouseMan Dual Optical", HAS_RES },
++    { VENDOR_LOGITECH, 0xC01B, "M-BP86", "MX310 Optical Mouse", HAS_RES },
++    { VENDOR_LOGITECH, 0xC01D, "M-BS81A", "MX510 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
++    { VENDOR_LOGITECH, 0xC01E, "M-BS81A", "MX518 Optical Mouse", HAS_RES },
++    { VENDOR_LOGITECH, 0xC01F, "M-BS82", "MX300 Optical Mouse", HAS_RES },
++    { VENDOR_LOGITECH, 0xC024, "M-BP82", "MX300 Optical Mouse", HAS_RES },
++    { VENDOR_LOGITECH, 0xC025, "M-BP81A", "MX500 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
++    { VENDOR_LOGITECH, 0xC031, "M-UT58A", "iFeel Mouse (silver)", HAS_RES },
++    { VENDOR_LOGITECH, 0xC051, "M-BS81A", "MX518 Optical Mouse", HAS_RES },
++    { VENDOR_LOGITECH, 0xC501, "C-BA4-MSE", "Mouse Receiver", HAS_CSR },
++    { VENDOR_LOGITECH, 0xC502, "C-UA3-DUAL", "Dual Receiver", HAS_CSR | USE_CH2},
++    { VENDOR_LOGITECH, 0xC504, "C-BD9-DUAL", "Cordless Freedom Optical", HAS_CSR | USE_CH2 },
++    { VENDOR_LOGITECH, 0xC505, "C-BG17-DUAL", "Cordless Elite Duo", HAS_SS | HAS_SSR | HAS_CSR | USE_CH2},
++    { VENDOR_LOGITECH, 0xC506, "C-BF16-MSE", "MX700 Optical Mouse", HAS_SS | HAS_CSR },
++    { VENDOR_LOGITECH, 0xC508, "C-BA4-MSE", "Cordless Optical TrackMan", HAS_SS | HAS_CSR },
++    { VENDOR_LOGITECH, 0xC50B, "967300-0403", "Cordless MX Duo Receiver", HAS_SS|HAS_CSR },
++    { VENDOR_LOGITECH, 0xC50E, "M-RAG97", "MX1000 Laser Mouse", HAS_SS | HAS_CSR },
++    { VENDOR_LOGITECH, 0xC702, "C-UF15", "Receiver for Cordless Presenter", HAS_CSR },
++    { 0, 0, 0, 0, 0 }
++};
++
+ 
+ int get_resolution(struct usb_device *dev)
+ {
+@@ -141,7 +179,12 @@
+     return cruise;
+ }
+ 
+-/* resolution should be 0x03 for 400cpi, 0x04 for 800cpi */
++/* resolution should be:
++ *  - 0x03 for 400cpi
++ *  - 0x04 for 800cpi
++ *  - 0x05 for 1200cpi
++ *  - 0x06 for 1600cpi (actually 1800cpi on newer MX518)
++ */
+ int set_resolution(struct usb_device *dev, int resolution)
+ {
+     usb_dev_handle *usb_h;
+@@ -233,39 +276,6 @@
+     printf("Logitech Mouse Applet, Version %s\n", VERSION);
+ }
+ 
+-#define HAS_RES 0x01  /* mouse supports variable resolution */
+-#define HAS_SS  0x02  /* mouse supports smart scroll control */
+-#define HAS_CSR  0x04  /* mouse supports cordless status reporting and control */
+-#define HAS_SSR  0x08  /* mouse supports smart scroll reporting */
+-#define USE_CH2  0x10 /* mouse needs to use the second channel */
+-
+-struct device_table {
+-    int idVendor;
+-    int idProduct;
+-    char* Model;
+-    char* Name;
+-    int flags;
+-} device_table[] = {
+-    { VENDOR_LOGITECH, 0xC00E, "M-BJ58", "Wheel Mouse Optical", HAS_RES },
+-    { VENDOR_LOGITECH, 0xC00F, "M-BJ79", "MouseMan Traveler", HAS_RES },
+-    { VENDOR_LOGITECH, 0xC012, "M-BL63B", "MouseMan Dual Optical", HAS_RES },
+-    { VENDOR_LOGITECH, 0xC01B, "M-BP86", "MX310 Optical Mouse", HAS_RES },
+-    { VENDOR_LOGITECH, 0xC01D, "M-BS81A", "MX510 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
+-    { VENDOR_LOGITECH, 0xC024, "M-BP82", "MX300 Optical Mouse", HAS_RES },
+-    { VENDOR_LOGITECH, 0xC025, "M-BP81A", "MX500 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
+-    { VENDOR_LOGITECH, 0xC031, "M-UT58A", "iFeel Mouse (silver)", HAS_RES },
+-    { VENDOR_LOGITECH, 0xC501, "C-BA4-MSE", "Mouse Receiver", HAS_CSR },
+-    { VENDOR_LOGITECH, 0xC502, "C-UA3-DUAL", "Dual Receiver", HAS_CSR | USE_CH2},
+-    { VENDOR_LOGITECH, 0xC504, "C-BD9-DUAL", "Cordless Freedom Optical", HAS_CSR | USE_CH2 },
+-    { VENDOR_LOGITECH, 0xC505, "C-BG17-DUAL", "Cordless Elite Duo", HAS_SS | HAS_SSR | HAS_CSR | USE_CH2},
+-    { VENDOR_LOGITECH, 0xC506, "C-BF16-MSE", "MX700 Optical Mouse", HAS_SS | HAS_CSR },
+-    { VENDOR_LOGITECH, 0xC508, "C-BA4-MSE", "Cordless Optical TrackMan", HAS_SS | HAS_CSR },
+-    { VENDOR_LOGITECH, 0xC50B, "967300-0403", "Cordless MX Duo Receiver", HAS_SS|HAS_CSR },
+-    { VENDOR_LOGITECH, 0xC50E, "M-RAG97", "MX1000 Laser Mouse", HAS_SS | HAS_CSR },
+-    { VENDOR_LOGITECH, 0xC702, "C-UF15", "Receiver for Cordless Presenter", HAS_CSR },
+-    { 0, 0, 0, 0, 0 }
+-};
+-
+ int main(int argc, char **argv)
+ {
+     struct usb_bus *bus;
+@@ -318,8 +328,12 @@
+ 		resolution = 400;
+ 	    else if (!strcmp("800", optarg))
+ 		resolution = 800;
++	    else if (!strcmp("1200", optarg))
++		resolution = 1200;
++	    else if (!strcmp("1600", optarg))
++		resolution = 1600;
+ 	    else
+-		printf("Bad argument (should be 400 or 800)\n");
++		printf("Bad argument (should be 400, 800, 1200 or 1600)\n");
+             break;
+         case 'v':
+ 	    version();
+@@ -363,14 +377,22 @@
+ 				    break;
+ 				case 4: printf("800cpi\n");
+ 				    break;
++				case 5: printf("1200cpi\n");
++				    break;
++				case 6: printf("1600cpi\n");
++				    break;
+ 				default: printf("(Unexpected result:%i)\n", resolution);
+ 				    break;
+ 				}
+ 			} else {
+ 			    if (400 == resolution)
+ 				set_resolution(dev, 0x03);
+-			    else 
++			    else if (800 == resolution) 
+ 				set_resolution(dev, 0x04);
++			    else if (1200 == resolution)
++				set_resolution(dev, 0x05);
++			    else
++				set_resolution(dev, 0x06);
+ 			}
+ 		    }
+ 
diff --git a/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild b/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
new file mode 100644
index 000000000000..54066326d6cc
--- /dev/null
+++ b/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+MY_P=${P/_pre/test}
+MY_P=${MY_P/-applet/_applet}
+
+DESCRIPTION="Control utility for some special features of some special Logitech USB mice!"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="virtual/libusb:0"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-mx300-mx518.patch
+}
+
+src_install() {
+	dosbin logitech_applet
+	dodoc AUTHORS ChangeLog README doc/article.txt
+
+	docinto examples
+	dodoc "${FILESDIR}"/40-logitech_applet.rules
+}
diff --git a/app-misc/logitech-applet/metadata.xml b/app-misc/logitech-applet/metadata.xml
new file mode 100644
index 000000000000..49c86a887b6a
--- /dev/null
+++ b/app-misc/logitech-applet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>desktop-misc@gentoo.org</email>
+	<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
+</pkgmetadata>