[gentoo-commits] repo/gentoo:master commit in: sys-apps/mouseemu/files/, sys-apps/mouseemu/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/mouseemu/files/, sys-apps/mouseemu/

[David Seifert]

commit:     5a99ff2528f404f260d13f20e66bf427beda006f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 10:24:29 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 26 10:27:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a99ff25

sys-apps/mouseemu: Port to EAPI 6

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/mouseemu/files/mouseemu-0.15-build.patch  |  4 ++--
 sys-apps/mouseemu/files/mouseemu-0.15-openrc.patch |  8 ++++++++
 sys-apps/mouseemu/mouseemu-0.12.ebuild             | 20 ++++++++------------
 sys-apps/mouseemu/mouseemu-0.15.ebuild             | 21 ++++++++++-----------
 4 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/sys-apps/mouseemu/files/mouseemu-0.15-build.patch b/sys-apps/mouseemu/files/mouseemu-0.15-build.patch
index 882d66fa775..ad4deae7bf2 100644
--- a/sys-apps/mouseemu/files/mouseemu-0.15-build.patch
+++ b/sys-apps/mouseemu/files/mouseemu-0.15-build.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -1,5 +1,5 @@
  all:
 -	gcc -Wall -g -o mouseemu mouseemu.c

diff --git a/sys-apps/mouseemu/files/mouseemu-0.15-openrc.patch b/sys-apps/mouseemu/files/mouseemu-0.15-openrc.patch
new file mode 100644
index 00000000000..fdd7e457863
--- /dev/null
+++ b/sys-apps/mouseemu/files/mouseemu-0.15-openrc.patch
@@ -0,0 +1,8 @@
+--- a/mouseemu.init.gentoo
++++ b/mouseemu.init.gentoo
+@@ -1,4 +1,4 @@
+-#!/sbin/runscript
++#!/sbin/openrc-run
+ # Copyright 1999-2004 Gentoo Technologies, Inc.
+ # Distributed under the terms of the GNU General Public License v2
+ 

diff --git a/sys-apps/mouseemu/mouseemu-0.12.ebuild b/sys-apps/mouseemu/mouseemu-0.12.ebuild
index ba8f60d6ee4..2b972aee53f 100644
--- a/sys-apps/mouseemu/mouseemu-0.12.ebuild
+++ b/sys-apps/mouseemu/mouseemu-0.12.ebuild
@@ -1,30 +1,26 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Emulates scrollwheel, right- & left-click for one-button mice/touchpads"
 HOMEPAGE="http://geekounet.org/powerbook/"
 SRC_URI="http://geekounet.org/powerbook/files/${PN}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ppc"
 IUSE=""
-DEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}/${PN}" "${WORKDIR}/${P}"
-	epatch "${FILESDIR}"/${P}-fix.diff
-}
+DEPEND=""
 
-src_compile() {
-	emake || die
-}
+S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}"/${P}-fix.diff )
 
 src_install() {
 	dosbin mouseemu
-	dodoc README COPYING
+	einstalldocs
+
 	newinitd mouseemu.init.gentoo mouseemu
 	insinto /etc
 	doins mouseemu.conf

diff --git a/sys-apps/mouseemu/mouseemu-0.15.ebuild b/sys-apps/mouseemu/mouseemu-0.15.ebuild
index b16337e1b1b..2770a221525 100644
--- a/sys-apps/mouseemu/mouseemu-0.15.ebuild
+++ b/sys-apps/mouseemu/mouseemu-0.15.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Emulates scrollwheel, right- & left-click for one-button mice/touchpads"
 HOMEPAGE="http://geekounet.org/powerbook/"
@@ -15,17 +15,16 @@ IUSE=""
 DEPEND=""
 
 S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.13-fix.patch
-	epatch "${FILESDIR}"/${PN}-0.15-build.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13-fix.patch
+	"${FILESDIR}"/${PN}-0.15-build.patch
+	"${FILESDIR}"/${PN}-0.15-openrc.patch
+)
 
 src_install() {
-	dosbin mouseemu || die
-	dodoc README
+	dosbin mouseemu
+	einstalldocs
+
 	newinitd mouseemu.init.gentoo mouseemu
 	insinto /etc
 	doins mouseemu.conf