[gentoo-commits] repo/gentoo:master commit in: media-sound/dbmeasure/, media-sound/dbmeasure/files/

[gentoo-commits] repo/gentoo:master commit in: media-sound/dbmeasure/, media-sound/dbmeasure/files/

[David Seifert]

commit:     b7363807fce6d09a024a8c6cf09de6669c91d24d
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 15:04:32 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 15:04:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7363807

media-sound/dbmeasure: Port to EAPI 7

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../dbmeasure/dbmeasure-0.0.20100217.ebuild        | 25 +++++++++-------------
 .../files/dbmeasure-0.0.20100217-makefile.patch    | 23 ++++++++++++++++++++
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild b/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
index 274d72ed6f7..6a8ba2c3976 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 00000000000..6851c9b357c
--- /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