Apply separate patches gentoo patches for the two ebuilds. Thanks to Dane Smith for reporting it

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 91 insertions, 3 deletions

diff --git a/app-misc/mouseremote/ChangeLog b/app-misc/mouseremote/ChangeLog
index 4756d6031bca..2a69a98e4968 100644
--- a/app-misc/mouseremote/ChangeLog
+++ b/app-misc/mouseremote/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/mouseremote
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mouseremote/ChangeLog,v 1.13 2010/08/13 15:31:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mouseremote/ChangeLog,v 1.14 2010/08/13 16:34:19 hwoarang Exp $
+
+  13 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+  mouseremote-0.90-r1.ebuild, +files/mouseremote-gentoo-0.90-r1.diff,
+  files/mouseremote-gentoo.diff:
+  Apply separate patches gentoo patches for the two ebuilds. Thanks to Dane
+  Smith for reporting it
 
 *mouseremote-0.90-r1 (13 Aug 2010)
 
diff --git a/app-misc/mouseremote/files/mouseremote-gentoo-0.90-r1.diff b/app-misc/mouseremote/files/mouseremote-gentoo-0.90-r1.diff
new file mode 100644
index 000000000000..d86902e37ed5
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote-gentoo-0.90-r1.diff
@@ -0,0 +1,66 @@
+diff -Naur MouseRemote.ORG/client/MouseRemote.conf MouseRemote/client/MouseRemote.conf
+--- MouseRemote.ORG/client/MouseRemote.conf	Sat Oct  9 21:03:42 1999
++++ MouseRemote/client/MouseRemote.conf	Sat May  4 16:04:43 2002
+@@ -61,3 +61,35 @@
+ 
+ # Definitions for the DVD device
+ [DVD]
++Power
++ChUp
++ChDown
++Mute
++VolUp
++VolDown
++Play
++Stop
++TxtRes
++Rew
++FF
++0
++1
++2
++3
++4
++5
++6
++7
++8
++9
++Ent
++Pause
++Last
++Disp
++AB
++Shift
++Guide
++Select
++TxtOff
++TxtTrns
++Rec
+diff -Naur MouseRemote.ORG/client/MouseRemoteKeys.pl MouseRemote/client/MouseRemoteKeys.pl
+--- MouseRemote.ORG/client/MouseRemoteKeys.pl	Sun Oct 10 00:09:42 1999
++++ MouseRemote/client/MouseRemoteKeys.pl	Sat May  4 15:58:58 2002
+@@ -11,6 +11,7 @@
+ 	play =>		0x0d,
+ 	stop =>		0x0e,
+ 	power =>	0x0f,
++	txtres =>	0x1b,
+ 	rew =>		0x1c,
+ 	ff =>		0x1d,
+ 	0 =>		0x40,
+@@ -31,11 +32,13 @@
+ 	'shift' =>	0x6b,
+ 	guide =>	0x6d,
+ 	'select' =>	0x93,
++	txtoff =>       0x9b,
++	txttrns =>      0xeb,
+ 	rec =>		0xff,
+ 
+ 	pc =>		0x2b,
+-	phone =>	0x4b,
++	phone =>	0x4b,	# Marked as F2 on my model
+ 	web =>		0x8b,
+ 	cd =>		0xab,
+-	dvd =>		0xcb,
++	dvd =>		0xcb,	# Marked as F1 on my model
+ );
diff --git a/app-misc/mouseremote/files/mouseremote-gentoo.diff b/app-misc/mouseremote/files/mouseremote-gentoo.diff
index d86902e37ed5..5c0963859078 100644
--- a/app-misc/mouseremote/files/mouseremote-gentoo.diff
+++ b/app-misc/mouseremote/files/mouseremote-gentoo.diff
@@ -1,3 +1,19 @@
+diff -Naur MouseRemote.ORG/MultiMouse/Makefile MouseRemote/MultiMouse/Makefile
+--- MouseRemote.ORG/MultiMouse/Makefile	Thu Aug 21 14:52:56 1997
++++ MouseRemote/MultiMouse/Makefile	Sat May  4 15:49:16 2002
+@@ -20,10 +20,10 @@
+ 	-DMOUSE_FIFO=\"$(FIFO)\"\
+ 	-DLOCKDIR=\"$(LOCKDIR)\"\
+ 	-DMAX_MICE=$(MICE)
+-CFLAGS=	$(OPTS)\
+-	-O2 # -DDEBUG
+ LDLAGS=	-O2
+ 
++OUTPUT_OPTION= $(OPTS) -o $@
++
+ all:	$(TARGET)
+ 
+ multimoused:	$(OBJS)
 diff -Naur MouseRemote.ORG/client/MouseRemote.conf MouseRemote/client/MouseRemote.conf
 --- MouseRemote.ORG/client/MouseRemote.conf	Sat Oct  9 21:03:42 1999
 +++ MouseRemote/client/MouseRemote.conf	Sat May  4 16:04:43 2002
diff --git a/app-misc/mouseremote/mouseremote-0.90-r1.ebuild b/app-misc/mouseremote/mouseremote-0.90-r1.ebuild
index fdcff72dd9fd..92befeff2657 100644
--- a/app-misc/mouseremote/mouseremote-0.90-r1.ebuild
+++ b/app-misc/mouseremote/mouseremote-0.90-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mouseremote/mouseremote-0.90-r1.ebuild,v 1.2 2010/08/13 16:17:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mouseremote/mouseremote-0.90-r1.ebuild,v 1.3 2010/08/13 16:34:19 hwoarang Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-makefile.diff
-	epatch "${FILESDIR}"/${PN}-gentoo.diff
+	epatch "${FILESDIR}"/${PN}-gentoo-${PVR}.diff
 }
 
 src_compile() {