gentoo resync : 03.11.2019

3 files changed, 41 insertions, 15 deletions

diff --git a/media-sound/rawrec/Manifest b/media-sound/rawrec/Manifest
index e0c9f91f3eca..233a90cce66d 100644
--- a/media-sound/rawrec/Manifest
+++ b/media-sound/rawrec/Manifest
@@ -1,4 +1,5 @@
+AUX rawrec-0.9.991-fix-build-system.patch 900 BLAKE2B 3572e6c249c777514aed2f35c5a0814aa148ea352361b72c50c4da377bd274ed8241c361fa9124735d881cf6b3ba5dcf6151b0a1484d33469d7dc57a61c57d98 SHA512 f2223ec30e07b43d8ae6790f3e4c7f363824646b5fd7c6fb4e72f8637cfc60306a3b322efae656566752b933da00d19790d6bfeb5c84442ebdfc2960358ecef2
 AUX rawrec-libs.patch 817 BLAKE2B 8da060f6631560d3f994af4471aa08f7f4a0d01664281adac71350088e81e724f021d2ffcd768b889f9472dd819d4e95ef284ded121fe0661854a511b96fb4ef SHA512 86707ebc6533c137c3a569394cbfd17626dd855e2caeebe2a469091ad5d88f50932e4b4717d4e9cf88e44678c4bc51f74bfccd04c13d98f6e3471300fdaf4dd8
 DIST rawrec-0.9.991.tar.gz 62134 BLAKE2B 2ff1bc864f0da3d2416f3b5dfc8f331396544d396a47f94dcbd7b2880453a007db1254610262799239a6096fd7465018129fd23c59fe5b30cef9069a55de0eec SHA512 3f0c6080b246231089cf01dbb5be0e9e6749cd9d339a9d3ea865681e836767c69909bb9f70ef7d87b39298603438169e9531e957e364dfcbe64aef074f862d90
-EBUILD rawrec-0.9.991.ebuild 759 BLAKE2B 347fb68df445645d280c1c2b0fb8e4baa04f5f9b479d42134ce27bbec58ac18a4f6c86497c06df84a9f5b24b1abd3f70bfaee0efa13c1ca521359a344abb03f9 SHA512 3f1577b9fe2c049486cfc961eeac486c16253f03f12060168ab37ec7085d32aa207862ee81f5230abff925282091d917b85324b54ebe4885ee85eed0c9a5bb94
+EBUILD rawrec-0.9.991.ebuild 721 BLAKE2B 562957c3a068cb2f21923b25c8d753ad8e97720dfc315030df3b4d1762beec97185931208abcd77ab8663a9f4154ff4e0266b3d5d1d775ee0943f29f3b4acc34 SHA512 f417dcda3da41f865a4118c9aa1735212ef01a8dcfc4d97bb188e54c07f78a083faa605d37649cbe17a8394d4ccbed00fca0870b65d5dee3bb22537830418c01
 MISC metadata.xml 329 BLAKE2B cb48532535b24c1aa027739ba20960f703f4b16f4c9bd0dfbee5c3db57fe00b11290ca72f2290b7edd4fa0e806acd82363dd92c7a6fc09ad97bba6784d90ca24 SHA512 03288474cb2d673f67059727711ae15215ea738740e473082470065728892794d13cf2c7426b48d93a85adbcf805d81f1b3eeb2f89dec08fe459a4202f6f87cb
diff --git a/media-sound/rawrec/files/rawrec-0.9.991-fix-build-system.patch b/media-sound/rawrec/files/rawrec-0.9.991-fix-build-system.patch
new file mode 100644
index 000000000000..bef125094f13
--- /dev/null
+++ b/media-sound/rawrec/files/rawrec-0.9.991-fix-build-system.patch
@@ -0,0 +1,24 @@
+--- a/Makefile
++++ b/Makefile
+@@ -6,19 +6,15 @@
+ HEADERS = $(wildcard *.h)
+ OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
+ 
+-CC = gcc
+ WARNFLAGS = -Wall -W -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
+-DEBUGFLAGS = -O0 -g
+-OPTFLAGS = -O2
+ 
+ # Uncomment this to try to use untested priority ceiling/inheritance
+ # code (if system supports it).
+ #FANCY_THREAD_DEFINES = -DUSE_FANCY_PRIORITY_CODE
+ 
+ # FIXME: USEBUFFLOCK appears to be historic, and should probably go some day.
+-CFLAGS = $(WARNFLAGS) $(OPTFLAGS) $(DEBUGFLAGS) -DUSEBUFFLOCK \
+-         $(FANCY_THREAD_DEFINES) -D_REENTRANT -D_GNU_SOURCE \
+-         -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++CFLAGS += $(WARNFLAGS)
++CPPFLAGS += -DUSEBUFFLOCK -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ LIBS = -lm -lpthread
+ 
+ # The GNU way is just too painful.  I'm not writing three tiers of
diff --git a/media-sound/rawrec/rawrec-0.9.991.ebuild b/media-sound/rawrec/rawrec-0.9.991.ebuild
index 24377e072281..3372ddccaf5f 100644
--- a/media-sound/rawrec/rawrec-0.9.991.ebuild
+++ b/media-sound/rawrec/rawrec-0.9.991.ebuild
@@ -1,9 +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 flag-o-matic toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="CLI program to play and record audiofiles"
 HOMEPAGE="http://rawrec.sourceforge.net"
@@ -12,23 +12,24 @@ SRC_URI="mirror://sourceforge/rawrec/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
 
-S="${S}"/src
+S="${WORKDIR}/${P}/src"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-libs.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-libs.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
 
-src_compile() {
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed."
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	emake EXE_DIR="${D}/usr/bin" \
-		MAN_DIR="${D}/usr/share/man/man1" install || die "emake install failed."
+	dobin rawrec
+	dosym rawrec /usr/bin/rawplay
+
+	doman ../docs/user/rawrec.1
+	dosym rawrec.1 /usr/share/man/man1/rawplay.1
 
 	einfo "Removing SUID from binary.."
 	fperms 755 /usr/bin/rawrec