app-misc/mouseremote: fix ebuild breakage, update to EAPI=6

Package-Manager: portage-2.2.26

6 files changed, 52 insertions, 100 deletions

diff --git a/app-misc/mouseremote/Manifest b/app-misc/mouseremote/Manifest
index f14c2450ca99..bab5e76a8511 100644
--- a/app-misc/mouseremote/Manifest
+++ b/app-misc/mouseremote/Manifest
@@ -1 +1,9 @@
+AUX mouseremote-0.90-fix-warnings.diff 631 SHA256 d8261933f6182199a4a31edd784be47ed7d9da95b3b669054b967ecb0b4db66a SHA512 203b8df256510e98e5f46365c308b12c80fb7c92f164663ace8627e1ff9ae0e47c69912fe562e92466f289c0827d46f295b776ce43859d94b272ff6f8cf35a6f WHIRLPOOL c95874a234ac5308c04d10a958eb12341d0dd481c706a117d37373951315e911bc2900cb9c747d7795bcccb10d9142770a46548679ac898a21e0f71ec2692911
+AUX mouseremote-0.90-gentoo.diff 1130 SHA256 28e0c6eb9799f34d511189fb8ccd515dd807fb758722b3b0f201d40cf35824c7 SHA512 607483c622f3347d3fad6de2f8c9eacd3a4f389baaa2bed94e72a6d5db65006c67231b92962ad08b1756983fe6af7d599b93bba880558867a032840942654e6b WHIRLPOOL ef7240f0288b2a9e08d18694aef68b8e26e4521b54ed4d8fbf041e96c5ce14e9fca169e98a38f0eccb9138c79702f60fe1af6437dd6681b3a13dd5f60ebf3609
+AUX mouseremote-0.90-makefile.diff 507 SHA256 4eb87a4e108455d3c622a9ba7d711b5b28f747efe86034a7c821905e1f1e8f3f SHA512 160efb2db998c42ab2efb34e8b462f3b709a03b8d4a8bf0be4c6c45c8204285e67bc6e5cecc4dd25ee71c6625b3e7653f83a2be8c51ed09103e2f119102b2ec0 WHIRLPOOL ad4810ecb377ee3fa1939fc57f7f33caaefccf531e849a73d7252b6bd6502a5f4fe257471b8aa02591e9cde2301f54b4fb1c9671ad0fa9c4333a62402d601299
+AUX mouseremote.conf 468 SHA256 91ad4bb7137fdb3f06004292fa2c9a02092af9a60af319be2053690532d4a6a4 SHA512 95893961cb9750dbceac500e9aaed5f6bed63ebb229ec83c1bf08a1919543c23417403aca159bd0a3174b0f4e67d6d6cb9cfc54870c19a0d3b19520a5677c21d WHIRLPOOL f106f66482ad2bd73d81e2b5eb14a07cb92518bedf91781281b3b81af11b4a26b12f041b5e468189bfb29aeca3eb919040564185b86b0cf8d3411624c4bd5146
+AUX mouseremote.start 605 SHA256 4aab086b0ede4d28635f26c84d30fb48fac041be2fdcd204c779789698aadd03 SHA512 1752ad79a5303f9c48ef95f76530efef37a92d0156a4b08e72e2589001ca3c3b518ec80a4944ceb5983c89016d72b7ad83c769ee0282a1b6633922495bfe3285 WHIRLPOOL 5ce8c642aec176fd0a9db63941fd154e69f6231c928bd8a129fb50dbba3810691261ff800e45442fdca87ec9c75a739283edb8242e6a512db400507b8cd3ace4
 DIST MouseRemote.tar.gz 41752 SHA256 cde90093c11d7d5b398d2ff9448a7c67bfc3bfa26d71802dff2de715f179b50f SHA512 d92ec4a1efda7e63cc02283b2aabcd6b42bedba17539371856e6ca3b6b5feaf9c306604db9a781836375afb6da226c16b8031f5f749d367857c2cde28e097483 WHIRLPOOL 43f66bad05a2e8f64cc384e7e4d9fcc9eb53bbc19b215713fd0ff5b8f71095d933e80dafd02393c1f5a99f688edab5f2051355246e2d5a938200fe2c49c30d6b
+EBUILD mouseremote-0.90-r2.ebuild 1952 SHA256 6c38a9e38c793bbac135a38af8b3e6f0d531cca7baf774c80713b0ce6bbf753b SHA512 702cd8253e1a93c1ca08bd3325cefdd02d52a7386d1cb5366e14e1debc084439dc33713faa740f1d69e1e4db0b411f244f3b421d3a54119820dd17441232b23e WHIRLPOOL d2fb9f3c14693d7d175d4099b408cf0d1ddf039c6e9c0192ab9446254e38862e9f953af5e60098226f6a1a5d14d0b0fc90c3a99cdb859a86f6ed4aa0521ddf8f
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
+MISC mouseremote-0.90-r2.ebuild.bak 2007 SHA256 e531ec99aad56c2db0b1a7fefbb6477ca3ea147a5965bd136ac474ec8e20c461 SHA512 e6a64c9b35dd6cc48d1dc45bd4c2ebee5f6bf3ccd741680fe90f1ad49d50b8aa8345304494eb14b451cc9c1a828e6cc8e8198c09fa812bb0e4fea059563f5115 WHIRLPOOL 407f1b7e26ac527554825880481713c0f3cb3901a9b677cbb550dbc6783b8ff3d6674e010db7f5f108a2b02cb34fe4961cae39eb4e929e3a8d4b03f3163fe996
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff b/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff
new file mode 100644
index 000000000000..63447b9bc4ce
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff
@@ -0,0 +1,23 @@
+diff -ur MultiMouse.orig/daemon.c MultiMouse/daemon.c
+--- MultiMouse.orig/daemon.c	1999-10-09 20:08:58.000000000 +0000
++++ MultiMouse/daemon.c	2016-04-27 22:36:59.133322312 +0000
+@@ -22,6 +22,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <signal.h>
++#include <stdlib.h>
+ 
+ #include "mumse.h"
+ 
+diff -ur MultiMouse.orig/main.c MultiMouse/main.c
+--- MultiMouse.orig/main.c	1999-10-03 17:40:23.000000000 +0000
++++ MultiMouse/main.c	2016-04-27 22:34:58.346647395 +0000
+@@ -25,6 +25,8 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <signal.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include "mumse.h"
+ 
diff --git a/app-misc/mouseremote/files/mouseremote-gentoo-0.90-r1.diff b/app-misc/mouseremote/files/mouseremote-0.90-gentoo.diff
index d86902e37ed5..d86902e37ed5 100644
--- a/app-misc/mouseremote/files/mouseremote-gentoo-0.90-r1.diff
+++ b/app-misc/mouseremote/files/mouseremote-0.90-gentoo.diff
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff b/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff
index 6f0354903011..2f6fb8a81f15 100644
--- a/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff
+++ b/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff
@@ -1,5 +1,5 @@
 --- MultiMouse/Makefile	1997-08-21 08:52:56.000000000 -0400
-+++ MultiMouse/Makefile.new	2010-08-13 00:05:47.000000000 -0400
++++ MultiMouse/Makefile	2010-08-13 00:05:47.000000000 -0400
 @@ -20,14 +20,13 @@
  	-DMOUSE_FIFO=\"$(FIFO)\"\
  	-DLOCKDIR=\"$(LOCKDIR)\"\
diff --git a/app-misc/mouseremote/files/mouseremote-gentoo.diff b/app-misc/mouseremote/files/mouseremote-gentoo.diff
deleted file mode 100644
index 5c0963859078..000000000000
--- a/app-misc/mouseremote/files/mouseremote-gentoo.diff
+++ /dev/null
@@ -1,82 +0,0 @@
-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
-@@ -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/mouseremote-0.90-r2.ebuild b/app-misc/mouseremote/mouseremote-0.90-r2.ebuild
index b0d3c1f9b8b4..3f471ecd5170 100644
--- a/app-misc/mouseremote/mouseremote-0.90-r2.ebuild
+++ b/app-misc/mouseremote/mouseremote-0.90-r2.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-inherit eutils
+EAPI=6
+
+inherit toolchain-funcs
 
-S="${WORKDIR}/MouseRemote"
 DESCRIPTION="X10 MouseRemote"
 HOMEPAGE="http://www4.pair.com/gribnif/ha/"
 SRC_URI="http://www4.pair.com/gribnif/ha/MouseRemote.tar.gz"
@@ -16,12 +17,14 @@ IUSE=""
 
 DEPEND="virtual/perl-Time-HiRes"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+S="${WORKDIR}/MouseRemote"
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}"/${P}-makefile.diff
+	eapply "${FILESDIR}"/${P}-gentoo.diff
+	eapply -p0 "${FILESDIR}"/${P}-fix-warnings.diff
 
-	epatch "${FILESDIR}"/${P}-makefile.diff
-	epatch "${FILESDIR}"/${PN}-gentoo-${PVR}.diff
+	eapply_user
 }
 
 src_compile() {
@@ -29,21 +32,21 @@ src_compile() {
 		CC=$(tc-getCC) \
 		PREFIX=/usr \
 		LOCKDIR=/var/lock \
-	    JMANDIR=/usr/share/man/ja_JP.ujis || die
+	    JMANDIR=/usr/share/man/ja_JP.ujis
 }
 
 src_install() {
-	dobin MultiMouse/multimouse || die
-	dosbin MultiMouse/multimoused || die
+	dobin MultiMouse/multimouse
+	dosbin MultiMouse/multimoused
 
-	dodoc README MultiMouse/README.jis MultiMouse/README.newstuff || die
-	newdoc MultiMouse/README README.MultiMouse || die
-	newdoc client/MouseRemote.conf MouseRemote.conf.dist || die
-	newdoc client/MouseRemote.pl MouseRemote.pl.dist || die
-	newdoc client/MouseRemoteKeys.pl MouseRemoteKeys.pl.dist || die
+	dodoc README MultiMouse/README.jis MultiMouse/README.newstuff
+	newdoc MultiMouse/README README.MultiMouse
+	newdoc client/MouseRemote.conf MouseRemote.conf.dist
+	newdoc client/MouseRemote.pl MouseRemote.pl.dist
+	newdoc client/MouseRemoteKeys.pl MouseRemoteKeys.pl.dist
 
-	newinitd "${FILESDIR}"/mouseremote.start mouseremote || die
-	newconfd "${FILESDIR}"/mouseremote.conf mouseremote || die
+	newinitd "${FILESDIR}"/mouseremote.start mouseremote
+	newconfd "${FILESDIR}"/mouseremote.conf mouseremote
 }
 
 pkg_postinst() {