From e45fb07f462fbf8336483ccfa9d675ea0cfdb8f7 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Thu, 17 Oct 2019 12:11:17 +0200 Subject: [PATCH] media-sound/rcenter: Port to EAPI 7 Bug: https://bugs.gentoo.org/697272 Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: David Seifert --- ...0.6.2-Wimplicit-function-declaration.patch | 11 +++++++ .../files/rcenter-0.6.2-makefile.patch | 15 ++++++--- media-sound/rcenter/rcenter-0.6.2.ebuild | 31 +++++++++---------- 3 files changed, 36 insertions(+), 21 deletions(-) create mode 100644 media-sound/rcenter/files/rcenter-0.6.2-Wimplicit-function-declaration.patch diff --git a/media-sound/rcenter/files/rcenter-0.6.2-Wimplicit-function-declaration.patch b/media-sound/rcenter/files/rcenter-0.6.2-Wimplicit-function-declaration.patch new file mode 100644 index 000000000000..00de497890f0 --- /dev/null +++ b/media-sound/rcenter/files/rcenter-0.6.2-Wimplicit-function-declaration.patch @@ -0,0 +1,11 @@ +--- a/main.c ++++ b/main.c +@@ -28,6 +28,8 @@ + #include + #include + #include ++#include ++#include + + // use the first one of these that exists + static char *default_device[] = {"/dev/midi00", "/dev/midi", NULL}; diff --git a/media-sound/rcenter/files/rcenter-0.6.2-makefile.patch b/media-sound/rcenter/files/rcenter-0.6.2-makefile.patch index 2c5fbd761a83..aa579b0d9253 100644 --- a/media-sound/rcenter/files/rcenter-0.6.2-makefile.patch +++ b/media-sound/rcenter/files/rcenter-0.6.2-makefile.patch @@ -1,8 +1,13 @@ -Index: rcenter-0.6.2/Makefile -=================================================================== ---- rcenter-0.6.2.orig/Makefile -+++ rcenter-0.6.2/Makefile -@@ -19,9 +19,9 @@ button.o : button.c +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,4 @@ + ALLFILES = *.c *.h Makefile LICENSE HISTORY README config +-CC = gcc +-CFLAGS = -O2 + BINARIES = rcenter + PREFIX= /usr/local + +@@ -19,9 +17,9 @@ main.o : main.c rcenter : main.o lowlevel.o handler.o button.o diff --git a/media-sound/rcenter/rcenter-0.6.2.ebuild b/media-sound/rcenter/rcenter-0.6.2.ebuild index d071eadc0d76..295c65fb14a2 100644 --- a/media-sound/rcenter/rcenter-0.6.2.ebuild +++ b/media-sound/rcenter/rcenter-0.6.2.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 +EAPI=7 -inherit eutils toolchain-funcs - -IUSE="" +inherit toolchain-funcs DESCRIPTION="Rcenter - A program to control the EMU10K Remote Control" HOMEPAGE="http://rooster.stanford.edu/~ben/projects/rcenter.php" @@ -16,21 +14,22 @@ SLOT="0" #-sparc: emu10k1 doesn't get recognized on sparc hardware KEYWORDS="amd64 -sparc x86" -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-makefile.patch" -} +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch +) -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die +src_configure() { + tc-export CC } src_install() { - chmod 755 rcenter dobin rcenter - dodir /usr/share/rcenter - cp -R config "${D}"/usr/share/rcenter/ + fperms 755 /usr/bin/rcenter + + insinto /usr/share/rcenter + doins -r config + dodoc HISTORY README } @@ -38,7 +37,7 @@ pkg_postinst() { elog "Rcenter Installed - However You need to setup the scripts" elog "for making remote control commands actually work" elog - elog "The Skel scripts can be copied from /usr/share/rcenter/config to /.rcenter" + elog "The Skel scripts can be copied from ${EROOT}/usr/share/rcenter/config to /.rcenter" elog "Where is a person who will use rcenter" elog "Remeber to use emu-config -i to turn on the remote" } -- 2.26.2