EAPI bump. Combine patches. Stable for AMD64 x86. Remove short <longdescription>.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

6 files changed, 28 insertions, 56 deletions

diff --git a/app-misc/logitech-applet/ChangeLog b/app-misc/logitech-applet/ChangeLog
index 95400db5bc52..fccc13a4493e 100644
--- a/app-misc/logitech-applet/ChangeLog
+++ b/app-misc/logitech-applet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/logitech-applet
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/logitech-applet/ChangeLog,v 1.14 2010/06/06 17:04:58 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/logitech-applet/ChangeLog,v 1.15 2014/07/19 03:46:38 jer Exp $
+
+  19 Jul 2014; Jeroen Roovers <jer@gentoo.org>
+  logitech-applet-0.4_pre1-r3.ebuild, -files/add-new-id-of-mx300.patch,
+  -files/logitech_applet-mx518.patch,
+  +files/logitech-applet-0.4_pre1-mx300-mx518.patch,
+  -files/logitech_applet-mx518-2.patch, metadata.xml:
+  EAPI bump. Combine patches. Stable for AMD64 x86. Remove short
+  <longdescription>.
 
   06 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   +files/40-logitech_applet.rules, logitech-applet-0.4_pre1-r3.ebuild:
diff --git a/app-misc/logitech-applet/files/add-new-id-of-mx300.patch b/app-misc/logitech-applet/files/add-new-id-of-mx300.patch
deleted file mode 100644
index 3a1407ce141b..000000000000
--- a/app-misc/logitech-applet/files/add-new-id-of-mx300.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur logitech_applet-0.4test1/logitech_applet.c logitech_applet-0.4test1-new/logitech_applet.c
---- logitech_applet-0.4test1/logitech_applet.c	2006-06-28 23:29:04.000000000 +0100
-+++ logitech_applet-0.4test1-new/logitech_applet.c	2006-06-28 23:27:55.000000000 +0100
-@@ -61,6 +61,7 @@
-     { 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 },
diff --git a/app-misc/logitech-applet/files/logitech_applet-mx518.patch b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch
index ae9f333eb844..3e2e06536fcd 100644
--- a/app-misc/logitech-applet/files/logitech_applet-mx518.patch
+++ b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch
@@ -1,6 +1,6 @@
---- logitech_applet-0.4test1/logitech_applet.c	2004-09-21 13:18:55.000000000 +0100
-+++ logitech_applet.c	2006-02-03 14:30:35.000000000 +0000
-@@ -40,6 +40,42 @@
+--- a/logitech_applet.c
++++ b/logitech_applet.c
+@@ -40,6 +40,44 @@
  #endif
  
  #define VENDOR_LOGITECH 0x046D
@@ -25,9 +25,11 @@
 +    { 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 },
@@ -43,7 +45,7 @@
  
  int get_resolution(struct usb_device *dev)
  {
-@@ -141,7 +177,12 @@
+@@ -141,7 +179,12 @@
      return cruise;
  }
  
@@ -52,12 +54,12 @@
 + *  - 0x03 for 400cpi
 + *  - 0x04 for 800cpi
 + *  - 0x05 for 1200cpi
-+ *  - 0x06 for 1600cpi
++ *  - 0x06 for 1600cpi (actually 1800cpi on newer MX518)
 + */
  int set_resolution(struct usb_device *dev, int resolution)
  {
      usb_dev_handle *usb_h;
-@@ -233,39 +274,6 @@
+@@ -233,39 +276,6 @@
      printf("Logitech Mouse Applet, Version %s\n", VERSION);
  }
  
@@ -97,7 +99,7 @@
  int main(int argc, char **argv)
  {
      struct usb_bus *bus;
-@@ -318,8 +326,12 @@
+@@ -318,8 +328,12 @@
  		resolution = 400;
  	    else if (!strcmp("800", optarg))
  		resolution = 800;
@@ -111,7 +113,7 @@
              break;
          case 'v':
  	    version();
-@@ -363,14 +375,22 @@
+@@ -363,14 +377,22 @@
  				    break;
  				case 4: printf("800cpi\n");
  				    break;
diff --git a/app-misc/logitech-applet/files/logitech_applet-mx518-2.patch b/app-misc/logitech-applet/files/logitech_applet-mx518-2.patch
deleted file mode 100644
index 6529b88d7871..000000000000
--- a/app-misc/logitech-applet/files/logitech_applet-mx518-2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=278077
-
---- logitech_applet.c
-+++ logitech_applet.c
-@@ -65,6 +65,7 @@
-     { 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 },
-@@ -182,7 +183,7 @@
-  *  - 0x03 for 400cpi
-  *  - 0x04 for 800cpi
-  *  - 0x05 for 1200cpi
-- *  - 0x06 for 1600cpi
-+ *  - 0x06 for 1600cpi (actually 1800cpi on newer MX518)
-  */
- int set_resolution(struct usb_device *dev, int resolution)
- {
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
index 7bfc870aab02..9ae960229a7f 100644
--- a/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
+++ b/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild,v 1.3 2010/06/06 17:04:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild,v 1.4 2014/07/19 03:46:38 jer Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils
 
 MY_P=${P/_pre/test}
@@ -14,21 +14,19 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
 
 DEPEND="virtual/libusb:0"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/logitech_applet-mx518.patch \
-		"${FILESDIR}"/logitech_applet-mx518-2.patch \
-		"${FILESDIR}"/add-new-id-of-mx300.patch
+	epatch "${FILESDIR}"/${P}-mx300-mx518.patch
 }
 
 src_install() {
-	dosbin logitech_applet || die
+	dosbin logitech_applet
 	dodoc AUTHORS ChangeLog README doc/article.txt
 
 	docinto examples
diff --git a/app-misc/logitech-applet/metadata.xml b/app-misc/logitech-applet/metadata.xml
index 5f759f9a0053..40838bc36783 100644
--- a/app-misc/logitech-applet/metadata.xml
+++ b/app-misc/logitech-applet/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
-	<longdescription lang="en">
-		Control utility for some special features of some special Logitech USB
-		mice!
-	</longdescription>
+<herd>desktop-misc</herd>
 </pkgmetadata>