summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-misc/logitech-applet/Manifest1
-rw-r--r--app-misc/logitech-applet/files/40-logitech_applet.rules6
-rw-r--r--app-misc/logitech-applet/files/logitech-applet-0.4_pre1-configure-error-handling.patch20
-rw-r--r--app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch139
-rw-r--r--app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild43
-rw-r--r--app-misc/logitech-applet/metadata.xml8
-rw-r--r--profiles/package.mask5
7 files changed, 0 insertions, 222 deletions
diff --git a/app-misc/logitech-applet/Manifest b/app-misc/logitech-applet/Manifest
deleted file mode 100644
index a4ed35c835d5..000000000000
--- a/app-misc/logitech-applet/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST logitech_applet-0.4test1.tar.gz 75783 BLAKE2B 71ac28c1efab922c5d48db00be53eb0c9200ea05972d1fc1a9551f3963fd9d4be46e7a66ebabb873873e1c0e89486e0e32ea7810cafb3eb0ade67cf399c46508 SHA512 64389b365d9d3473bf3ec027c7d9ee34cbdcddf9abb6bfabf4e771a255dade80e6758b7a997da3eaf23c19f1bd4559e79fb199e9f62e0f2ad1af92eab4b23789
diff --git a/app-misc/logitech-applet/files/40-logitech_applet.rules b/app-misc/logitech-applet/files/40-logitech_applet.rules
deleted file mode 100644
index a51277c3ecb9..000000000000
--- a/app-misc/logitech-applet/files/40-logitech_applet.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-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-configure-error-handling.patch b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-configure-error-handling.patch
deleted file mode 100644
index 1373a1010c1f..000000000000
--- a/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-configure-error-handling.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -24,7 +24,7 @@ if test "$LUSB" = "no"; then
- echo " http://libusb.sourceforge.net"
- echo " or use the --with-libusb-includes option, if you have it installed"
- echo " in an unusual place"
-- exit
-+ exit 1
- fi
- AC_CHECK_LIB(usb, usb_init, LUSB="yes", LUSB="no")
- if test "$LUSB" = "no"; then
-@@ -33,7 +33,7 @@ if test "$LUSB" = "no"; then
- echo " http://libusb.sourceforge.net"
- echo " or use the --with-libusb-libraries option, if you have it installed"
- echo " in an unusual place"
-- exit
-+ exit 1
- fi
-
- AC_OUTPUT(Makefile)
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
deleted file mode 100644
index 3e2e06536fcd..000000000000
--- a/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- 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
deleted file mode 100644
index ed10f90c5788..000000000000
--- a/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-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"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="virtual/libusb:0"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-mx300-mx518.patch
- "${FILESDIR}"/${PN}-0.4_pre1-configure-error-handling.patch
-)
-
-src_prepare() {
- default
-
- mv configure.{in,ac} || die
-
- # For error handling patch
- eautoreconf
-}
-
-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
deleted file mode 100644
index 49c86a887b6a..000000000000
--- a/app-misc/logitech-applet/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
diff --git a/profiles/package.mask b/profiles/package.mask
index 1d46c9eea4ad..cc708305f1a8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -586,11 +586,6 @@ dev-java/commons-fileupload
# see bug: https://bugs.gentoo.org/785796
dev-java/commons-el
-# Jonas Stein <jstein@gentoo.org> (2021-04-25)
-# Bad SRC_URI, dead upstream.
-# Removal on 2021-06-01. Bug #785736.
-app-misc/logitech-applet
-
# Stephan Hartmann <sultan@gentoo.org> (2021-04-24)
# Dev channel releases are only for people who
# are developers or want more experimental features