gentoo resync : 29.06.2020

3 files changed, 126 insertions, 20 deletions

diff --git a/media-sound/erec/Manifest b/media-sound/erec/Manifest
index e4d13137acc4..859a99568929 100644
--- a/media-sound/erec/Manifest
+++ b/media-sound/erec/Manifest
@@ -1,4 +1,5 @@
+AUX erec-2.2.0.1-fix-makefile.patch 2717 BLAKE2B d10a0f2918b4f32b8b0876464dadcbdee37df0a23ab5e7bad99053620d7046ec3dce6c40913c1ea7a895a6843074ebf1fa9b4c9a9f9b33eba6936841456aab28 SHA512 8e014628bb9840fa8b59a825563dc6131b7d99892a7a30f9d844ffcab2d0f5e76af7d90891749a18026b65ee0325a228060bde081824617a8a52387e76b19c53
 AUX erec-2.2.0.1-gcc43.patch 340 BLAKE2B d3fc0c0d4bb509e7ce3839b8e83732a12602036502a010d1752139c66da6fcc8993bfcc98d74fb226ee67a0af9d2f73c5da97586a2fa61932c6469310411f5d0 SHA512 12f94249223911709ce46b3c5b1985019232f2d2ea906cfdebc30f6fd9e314e38ec40b734ea235d063f499e651a76fb05bcbfdd3be190b41e03625180b154cb0
 DIST erec-2.2.0.1.tar.bz2 25966 BLAKE2B 22e93e2185fc5eafab93a2558b3dd1261bcd7a96613fcc9b321baba13ca4dfaf024399aa298d36a6df7857ff0dd03c0bb15d3b3c26549b1845dba22061a94f6e SHA512 24832483ebca011294931a40be192fa1f6a0fbf69d2b515529bd6d9cbdb5bbd904f266bd824f816d044ed7ba63bc8cc6886868a0d594a0071e757c3e9ebfef28
-EBUILD erec-2.2.0.1-r1.ebuild 998 BLAKE2B f260ce3b64e7b15cb49741500340bbc79da4e8bd4e1d79529d8c215be209e496d26e37f756c0220662b34526d8eed366e3532a231b7c3f5c3a019aedc3a2603a SHA512 6a8d6f7f3c8d29adb40c261578090bd14a6ecd8d89ba7edd73918d15103e9d3499e28babe57ae3cf7ef098e652c018afaf0f336fc7643a04d66782b4a846acb0
+EBUILD erec-2.2.0.1-r1.ebuild 684 BLAKE2B 7d0707f008c3c6f9f4f2c66f24d6388b5caf36552499945a7af1d6e0d67be3c7cd0d254b2aac11a22dba221b354b6ed8956a382d57a55813ad8bc3c4f957adcd SHA512 8b82ce4b5fddef11cf341fcf12f41ae70844ce7967b119d50cae7422656e1f24f294f149ba5d0476706cf94db201be26da1c8ffa780de54704b77331659d670b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/erec/erec-2.2.0.1-r1.ebuild b/media-sound/erec/erec-2.2.0.1-r1.ebuild
index 764393565e5c..69ec64516124 100644
--- a/media-sound/erec/erec-2.2.0.1-r1.ebuild
+++ b/media-sound/erec/erec-2.2.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,35 +9,27 @@ DESCRIPTION="Shared audio recording server"
 HOMEPAGE="https://bisqwit.iki.fi/source/erec.html"
 SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 
-KEYWORDS="amd64 ~ppc sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
 
-PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-fix-makefile.patch
+)
 
 DOCS=( README )
 HTML_DOCS=( README.html )
 
 src_prepare() {
-	sed -i \
-		-e "s:BINDIR=/usr/local/bin:BINDIR=${D}/usr/bin:" \
-		-e "s:^\\(ARGHLINK.*-L.*\\):#\\1:" \
-		-e "s:^#\\(ARGHLINK=.*a\\)$:\\1:" \
-		-e "s:\$(CXX):\$(CXX) \$(CXXFLAGS) -I\"${S}\"/argh:g" \
-		Makefile || die
-
-	sed -i \
-		 -e "s:CPPFLAGS=:CPPFLAGS=-I\"${S}\"/argh :" \
-		Makefile.sets || die
-
-	echo "" > .depend || die
-	echo "" > argh/.depend || die
 	default
+
+	# prevent buildsystem from generating header dependencies
+	touch .depend argh/.depend || die
 }
 
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -j1
+src_configure() {
+	tc-export AR CC CXX
 }
 
 src_install() {
diff --git a/media-sound/erec/files/erec-2.2.0.1-fix-makefile.patch b/media-sound/erec/files/erec-2.2.0.1-fix-makefile.patch
new file mode 100644
index 000000000000..31c90354b7e7
--- /dev/null
+++ b/media-sound/erec/files/erec-2.2.0.1-fix-makefile.patch
@@ -0,0 +1,113 @@
+--- a/argh/Makefile
++++ b/argh/Makefile
+@@ -16,12 +16,12 @@
+ all: libargh.so libargh.a
+ 
+ libargh.so: argh.lo
+-	$(CXX) -g -shared -Wl,-soname=$@ -o $@ $^
++	$(CXX) -shared -Wl,-soname=$@ -o $@ $^
+ argh.lo: argh.cc
+ 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -fpic -o $@ -c $<
+ 
+ libargh.a: argh.o
+-	ar -rc $@ $^
++	$(AR) -rc $@ $^
+ 
+ include depfun.mak
+ 
+--- a/argh/Makefile.sets
++++ b/argh/Makefile.sets
+@@ -1,21 +1,18 @@
+-CC=gcc
+-CPP=g++
+ #CXX=g++-2.95
+-CXX=g++
+ #CXX=remotegcc -soktober -- g++
+ 
+ # Options for compiling, generally.
+-CPPFLAGS=-DVERSION=\"$(VERSION)\" -pipe -g
++CPPFLAGS+=-DVERSION=\"$(VERSION)\"
+ #         -fmessage-length=0
+ 
+ WARNINGS=-Wall -W -pedantic \
+-    -Wundef -Wcast-qual -Wpointer-arith -Wstrict-prototypes \
+-    -Wconversion -Wmissing-prototypes -Wwrite-strings \
++    -Wundef -Wcast-qual -Wpointer-arith \
++    -Wconversion -Wwrite-strings \
+     -Wsign-compare -Wredundant-decls
+ #   -Wtraditional -Wcast-align
+ 
+ # C specific warnings
+-CCOPTS=$(WARNINGS) -Waggregate-return -Wshadow -Winline
++CCOPTS=$(WARNINGS) -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wshadow -Winline
+ 
+ # C++ specific warnings
+ CXXOPTS=$(WARNINGS)
+@@ -25,9 +22,8 @@
+ #-march=pentiumpro
+ 
+ # Flags.
+-CFLAGS=$(OPTIM) $(CCOPTS)
+-CXXFLAGS=$(OPTIM) $(CXXOPTS) -fno-default-inline
++CFLAGS+=$(CCOPTS)
++CXXFLAGS+=$(CXXOPTS) -fno-default-inline
+ #-fno-rtti
+ 
+ #LDFLAGS=-pg -ax
+-LDFLAGS=-g
+--- a/Makefile
++++ b/Makefile
+@@ -19,9 +19,9 @@
+ SUBDIRS=argh
+ 
+ # For DYNAMIC argh-linking, use:
+-ARGHLINK=-Largh -largh
++#ARGHLINK=-Largh -largh
+ # For STATIC argh-linking, use:
+-#ARGHLINK=argh/libargh.a
++ARGHLINK=argh/libargh.a
+ 
+ all: subdirs ${PROG}
+ 
+@@ -29,8 +29,8 @@
+ $(SUBDIRS):
+ 	@$(MAKE) -C $@
+ 
+-${PROG}: $(OBJS)
+-	$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(ARGHLINK)
++${PROG}: $(OBJS) subdirs
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Iargh -o $@ $< $(LDLIBS) $(ARGHLINK)
+ 
+ include depfun.mak
+ 
+--- a/Makefile.sets
++++ b/Makefile.sets
+@@ -1,22 +1,18 @@
+ INSTALL=install
+-CC=gcc
+-CXX=g++
+ 
+-CPP=$(CC)
+-LDFLAGS=-g
+ #LDLIBS=-lstdc++
+ 
+-CWARNINGS=-Wall -W -pipe -g \
++CWARNINGS=-Wall -W \
+     -Wundef \
+-    -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes \
+-    -Wmissing-prototypes -Winline
++    -Wcast-qual -Wcast-align -Wwrite-strings \
++    -Winline
+ #   -Wtraditional  -fmessage-length=128
+ 
+-CXXFLAGS=-pedantic -ffast-math $(CWARNINGS)
++CXXFLAGS+=-pedantic $(CWARNINGS)
+ #CFLAGS=-O3 -fomit-frame-pointer -ffast-math $(CWARNINGS)
+-CFLAGS=-O -g $(CWARNINGS)
++CFLAGS+=-Wmissing-prototypes -Wstrict-prototypes $(CWARNINGS)
+ 
+-CPPFLAGS=-DVERSION=\"$(VERSION)\" \
++CPPFLAGS+=-Iargh -DVERSION=\"$(VERSION)\" \
+          -DCONFIG=\"$(CFGDIR)/$(CFGFILE)\" \
+          -DBINDIR=\"$(BINDIR)\" $(DEFS)
+