From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 25 Nov 2020 22:39:15 +0000
Subject: gentoo resync : 25.11.2020

---
 media-sound/dbmeasure/Manifest                     |  3 ++-
 .../dbmeasure/dbmeasure-0.0.20100217.ebuild        | 25 +++++++++-------------
 .../files/dbmeasure-0.0.20100217-makefile.patch    | 23 ++++++++++++++++++++
 3 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 media-sound/dbmeasure/files/dbmeasure-0.0.20100217-makefile.patch

(limited to 'media-sound/dbmeasure')

diff --git a/media-sound/dbmeasure/Manifest b/media-sound/dbmeasure/Manifest
index e13601fa8f2d..aac3fe226fa3 100644
--- a/media-sound/dbmeasure/Manifest
+++ b/media-sound/dbmeasure/Manifest
@@ -1,3 +1,4 @@
+AUX dbmeasure-0.0.20100217-makefile.patch 695 BLAKE2B 63505f9e09abd5b5fcade4fc3539aa1bc0c27cc3a0c9c32b98c6b2a8d5dde088dc7fc65fa382db7de428d3d9a4a546698c71634af098122765e00cb55c469bc4 SHA512 0db670b632bd34fcf15f2621996d79837f0f511f86f50699c0c9991d81a9de7485992806a8058fbbc741512edcf0af19f8f9b24d04eac9fded94aeb24cb74c93
 DIST dbmeasure-0.0.20100217-ed8105083ab72f9afac9d18b7563fbc3d6c1c925.tar.gz 6647 BLAKE2B e3732a664d8941f5990c9cad87411f9a204869acfa90c66fa4ba5648016095204f96eeaf6f0cbc2f9dc3dc4c37f5a3dffeb9c4b21b8f0805feb7b84643fe9bc6 SHA512 d52a6d8d34625b3ddbeff70e712ddefabfb955ceedc525377d672b472b57163c1194df29ffcc23d881bfb7a5d38cd2850c09ee7c5e30e579414f5c599ad2b78b
-EBUILD dbmeasure-0.0.20100217.ebuild 995 BLAKE2B fa3fe8c18b4245a8e6289d5a8f6d55efe3da4b93ae814681195e9849be8471ef64310d1a0ad8a8744236f4ce48d5af08eb480e7905ad5e56abdbe98842284b88 SHA512 9ae55290bb900b6d41fa5489c314f35a1b5b3b76a62e81c23c98816c448e0f2b6d80e1d0d2d516196e341c41f7e19eb73ab377b34ded2c4a7f45a8659447a5f2
+EBUILD dbmeasure-0.0.20100217.ebuild 824 BLAKE2B 176b0fd29ebea5865d2c2f58b3b1b3e1bcd8ee2e2139df03b4f09beda0c418e22f037aab6903391e53b5a7776feed6ad117b70ef622aff4c1bd506ea744fdde5 SHA512 1752b63fa096f56c427a8d43562c7e4e5affe5fe94a9267a6762da1223261095c725c550c5e9fbb36bb7b37f88306d99332f0882304882164a1d7d5b1f1064b7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild b/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
index 274d72ed6f75..6a8ba2c3976d 100644
--- a/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
+++ b/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 GIT_COMMITID="ed8105083ab72f9afac9d18b7563fbc3d6c1c925"
 MY_PV="${PV}-${GIT_COMMITID}"
 MY_P="${PN}-${MY_PV}"
@@ -15,24 +16,18 @@ SRC_URI="http://git.0pointer.de/?p=${PN}.git;a=snapshot;h=${GIT_COMMITID};sf=tgz
 LICENSE="BSD" # need to confirm w/ upstream
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND=">=media-libs/alsa-lib-1.0.26"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}"
 
-S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-src_prepare() {
-	tc-export CC
-	# We drop the -g for debug output but we keep the -O0, as we don't want GCC
-	# to optimize out some critical math.
+src_configure() {
+	tc-export CC PKG_CONFIG
 	strip-flags
-	sed -i \
-		-e 's:$(CC):& $(LDFLAGS):' \
-		-e '/^CFLAGS/s:=:+=:' \
-		-e '/^CFLAGS/s:-g -pipe::' \
-		Makefile || die
 }
 
 src_install() {
diff --git a/media-sound/dbmeasure/files/dbmeasure-0.0.20100217-makefile.patch b/media-sound/dbmeasure/files/dbmeasure-0.0.20100217-makefile.patch
new file mode 100644
index 000000000000..6851c9b357c7
--- /dev/null
+++ b/media-sound/dbmeasure/files/dbmeasure-0.0.20100217-makefile.patch
@@ -0,0 +1,23 @@
+We drop the -g for debug output but we keep the -O0, as we don't want GCC
+to optimize out some critical math.
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,13 +1,13 @@
+-CFLAGS=-Wextra -Wall -O0 -g -pipe `pkg-config --cflags alsa`
+-LIBS=`pkg-config --libs alsa` -lm
++CFLAGS+=-Wextra -Wall -O0 $(shell $(PKG_CONFIG) --cflags alsa)
++LIBS=-lm $(shell $(PKG_CONFIG) --libs alsa)
+ 
+ all: dbmeasure dbverify
+ 
+ dbmeasure: dbmeasure.o
+-	$(CC) -o dbmeasure $^ $(CFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o dbmeasure $^ $(LIBS)
+ 
+ dbverify: dbverify.o
+-	$(CC) -o dbverify $^ $(CFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o dbverify $^ $(LIBS)
+ 
+ clean:
+ 	rm -f *.o dbmeasure dbverify
-- 
cgit v1.2.3