From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 15 Dec 2019 18:09:03 +0000
Subject: gentoo resync : 15.12.2019

---
 media-sound/normalize/Manifest                  |  2 +-
 media-sound/normalize/normalize-0.7.7-r1.ebuild | 31 ++++++++++++++-----------
 2 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'media-sound/normalize')

diff --git a/media-sound/normalize/Manifest b/media-sound/normalize/Manifest
index fe54523e7579..e1da58a051dd 100644
--- a/media-sound/normalize/Manifest
+++ b/media-sound/normalize/Manifest
@@ -1,5 +1,5 @@
 AUX normalize-0.7.7-audiofile-pkgconfig.patch 1865 BLAKE2B 4a03c449e218300328297d30229b26b425e65ab4f7a05725bea78c19ea3e6556bbf3dd9dacf1c73c064a6912120772754e65aee00af8a2f016b9bb2750b2ca2b SHA512 bf8b4fdd3ba9629cefba6eecc3db21b3fe9129429a8df1fcc7794f3eb6e802f1939d0ec23863bf91edecd94651a70f798d6888f0b94b39664b53acf68b737967
 DIST normalize-0.7.7-m4.patch.gz 5078 BLAKE2B 6bb0979c1a94b7bd52ea01cfcfbd715772fb5cd92c46124a43ff6982cc0e369c86a43c836354ea10e1f613274cb58afa4dad6c1d6656393edadc1b7e029f35a8 SHA512 a06d3a51557a0c54e1ff2d0eaec0a8ad51b0faf1457393f2c9207fd428d58e21ecbcbfbab59a15e9fcc59d6ec2dbf91fe78802a67d533a1f90cc6e46205d39f7
 DIST normalize-0.7.7.tar.bz2 388777 BLAKE2B 3ac7be8b86ada8899661d7012d7a60e4a41fcf2c510c302069d1b9ab54efd50e7e042fd5c1365bed1c28fe15b6bc804e605ea7b5f1fd7f96047a70c335275324 SHA512 5fb2265eac93b243682cedb955d2ddfe05f55cafdeb1d757aaef0afb36bc9907ea3321b8554e128f6228bdeeaeef96e3e9ba000d0ad84282cc76a50b3e460ce4
-EBUILD normalize-0.7.7-r1.ebuild 906 BLAKE2B cebe8daf495100143975d501fb040efb13a82d0f56726169352a49aa017acac5e1993c7837ab502e7dd12f1009c43b04668b6bf7ae58f87e91a32d6f2a6674f7 SHA512 a5eb5ff826d68d7a762a9dbc9a63ad94a9ed6136ae11fea33ee0ca036ec6c06081be438bb02f54e637005232aa4dbd433cd077e00be006b1375feb6bc1dbd9dc
+EBUILD normalize-0.7.7-r1.ebuild 848 BLAKE2B 043dbde73b794036107ed29cdf79de76d1f51e253632c1a79c0ca772a1b27e5756227b5c9058df33aba3d28d7d4b33f221e5599439645a233a80dcad2465d11c SHA512 8531086804bff285491be625b784149faead26e22579e591cdc23056d78dcf3a767e243ce22470a64008e95a9d771ea83022bf6f29cc96303dba565b40736045
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/normalize/normalize-0.7.7-r1.ebuild b/media-sound/normalize/normalize-0.7.7-r1.ebuild
index 6058be69c6e0..dbc8ff6009f1 100644
--- a/media-sound/normalize/normalize-0.7.7-r1.ebuild
+++ b/media-sound/normalize/normalize-0.7.7-r1.ebuild
@@ -1,32 +1,37 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Audio file volume normalizer"
 HOMEPAGE="http://normalize.nongnu.org/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.bz2
+SRC_URI="
+	https://savannah.nongnu.org/download/${PN}/${P}.tar.bz2
 	https://dev.gentoo.org/~radhermit/distfiles/${P}-m4.patch.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="audiofile mad nls userland_BSD"
+IUSE="audiofile mad nls"
 
-RDEPEND="mad? ( media-libs/libmad )
-	audiofile? ( >=media-libs/audiofile-0.3.1 )"
-DEPEND="${RDEPEND}
+RDEPEND="
+	audiofile? ( media-libs/audiofile:= )
+	mad? ( media-libs/libmad:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( dev-util/intltool )"
 
-src_prepare() {
-	use userland_BSD && sed -i -e 's/md5sum/md5/' "${S}"/test/*.sh
+PATCHES=(
+	"${FILESDIR}"/${P}-audiofile-pkgconfig.patch
+	"${WORKDIR}"/${P}-m4.patch
+)
 
-	epatch "${FILESDIR}"/${P}-audiofile-pkgconfig.patch
-	epatch "${WORKDIR}"/${P}-m4.patch
-	eautoreconf
+src_prepare() {
+	default
+	AT_M4DIR="." eautoreconf
 }
 
 src_configure() {
-- 
cgit v1.2.3