gentoo resync : 03.11.2019

4 files changed, 39 insertions, 23 deletions

diff --git a/media-sound/rcenter/Manifest b/media-sound/rcenter/Manifest
index c9d0fa7eefc3..9fed8b83622c 100644
--- a/media-sound/rcenter/Manifest
+++ b/media-sound/rcenter/Manifest
@@ -1,4 +1,5 @@
-AUX rcenter-0.6.2-makefile.patch 555 BLAKE2B ca1459bdb835b73aa947f2549424d6ef2626f497d2699acd6c527d7d787268624e6ffdaa47b9e0f2b05cac0fa053ffa034884a5a662e9860eb083d8f00ced317 SHA512 385c22722ac44ae17420135f68e72ece74a4c3ee1e2eddd578b441c1a32efa6d9ccfc2b80f154475c5a434b49e029189fc1c21682c0a5530e81bb129fdfd041c
+AUX rcenter-0.6.2-Wimplicit-function-declaration.patch 267 BLAKE2B 52460e47e6fd3e74fa36af96cb89eba8f9f4a246367e42f975d4b364098f8142fef0cb100da1782bb0ed9707599695a4c852e9bfa8bce01bd4e59d295dda5509 SHA512 95ba345dcd1716723f74a802e858f0352501fa5c12ee40fb4f1aa1d270d50e4dd465e00d6df243345bf79742469a4b3f0e85e250121090d5c050a45e4741dfa9
+AUX rcenter-0.6.2-makefile.patch 549 BLAKE2B dde87bd6143d878be35574119d2605c1a4b9731c961ff390b76eab71f079679fc8a643409ecd7755a12ebba27b6fa885cabad810a4f2c43d0a8788a154120eec SHA512 7f06434da1605cf903b14a4de830b1f8ab819379a0022f8f95aeb7a7dfe7823ad9e44baebd15a06732720f13016cc9413aa6ac7662878902e9261f82bfdb7582
 DIST rcenter-0.6.2.tgz 15053 BLAKE2B 1a2cf30a42332bfd7dc3141d7cdb9454dffbf4270571f2f6bae581c033eee36e867d980a0ddf49e72bf77f27aa2f45a6ee3c5f15aaee06003031a50d4dc8c979 SHA512 0db7780c3c9f991ff79a9513fcb1640b18050336241d52b99fc63c8632a5d0a1d9a96e1e265c41c0ff2f0c11be9ddf17dd6d4d9b1ee8ce92cdcd2afd716e788b
-EBUILD rcenter-0.6.2.ebuild 1133 BLAKE2B 1e5b4759cbe11ac4dd1224e85bbdfe6ab1e4f67676b4e745e9ff29ff29f7d928a47cb6658adcba54950a042e16f35d70d7385156ebc50c9a65b295d630936417 SHA512 a35272450c80ab7f9c49bf96bdcadfa9d6ec89f1caf1fecbd575cd9f9444578bcdbc2eb56645c0ab0c0e82fbe6c79f598cf98db6b529cf39428e2844b63d80d6
+EBUILD rcenter-0.6.2.ebuild 1079 BLAKE2B 59fb3f5417e6dd214d489d666112572575750634caa679355b2c268266f3ff4806b4dd91c7f280bffe09f449858a15f17a8ec202731c04412069732e131c328c SHA512 56bda1cc2990f069f87912d3dd5a78af11bf1f75eecb47fa9288e5560e8844abbc0ba6a77ce0880ef589bc1807df5ee6326c796b0dbc72795ea102fed08baef6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
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 <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <stdio.h>
++#include <stdlib.h>
+ 
+ // 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 <user>/.rcenter"
+	elog "The Skel scripts can be copied from ${EROOT}/usr/share/rcenter/config to <user>/.rcenter"
 	elog "Where <user> is a person who will use rcenter"
 	elog "Remeber to use emu-config -i to turn on the remote"
 }