gentoo resync : 15.12.2019

3 files changed, 39 insertions, 27 deletions

diff --git a/media-sound/vlevel/Manifest b/media-sound/vlevel/Manifest
index e760054dd0bd..4cbc3be72c4c 100644
--- a/media-sound/vlevel/Manifest
+++ b/media-sound/vlevel/Manifest
@@ -1,4 +1,4 @@
-AUX vlevel-0.5-makefile.patch 996 BLAKE2B e278be31a58f5bbee740fda9da4eb5f74ea3c1553c935f95b9876364aab3f172bf23c41b14144ced9dca1fe3740c1600dd4cfa75bbd32e97a9f558f3a427d841 SHA512 fad6590578cc4727c61e423260028369f0e44feafc8634d8ac25b5de259eb82c6471d31bb6c4da6008a42bf25e10352b5b395cbbbb1afced000d15f3968feb14
+AUX vlevel-0.5-makefile.patch 1425 BLAKE2B 7f10ad7fb7c6d7d15a00ab06123466e1d4cf104517664f376fe5a04d9597fce6438b1a8e534d33305370f932104a95d20c50e2ecb239d855773c24c288fb7681 SHA512 3a929054951117cd245b753073e025000c0cf97d933eeec23f23964facb5864b44e12485c7551bc3968cb04b0a2e4c0874dd8ed19d0aa14a91b81506fe3981cf
 DIST vlevel-0.5.tar.gz 25873 BLAKE2B f5edbe219864f4eb34d0eb73a4f131c4a44eafe66ae9652495fc220c70dfc845b3a66b6f5b47305ffe26d8434b195358deb4382f2686a3acf90b4c885ec3b361 SHA512 b84a989f7493f6f008134408fcdc235980c2ef71069125399c67a6144a6f86863d795f1c7b8c10ac21d126e2e819ba117578f3da9bcac29025cfc6580ff3e8f4
-EBUILD vlevel-0.5-r1.ebuild 900 BLAKE2B 765efc14671dee2aeaecb721a76a92220b297f91240b06df4d2227d9f072a0e2271cc97a6e31dc77b67fde71780e1086591edba78e6e28085272acb73bf38aec SHA512 575a5a5871949c5d58616473ea9e27552438281ca84ffc13856e92938537f1fad60993b4ee5ea6a71f92e8d0c6bfaa1770edb34bcbc42e94a18de832e13638b9
+EBUILD vlevel-0.5-r1.ebuild 741 BLAKE2B fe6f40dfca67638f6bb98c4ba3dcbfc0efac6fc58795256ce104c9cbc1271a13128b4c7e67e234c1218a14beaf3ac79abedbe826c99f8ee9e7685cfe012a46e5 SHA512 b465c6ba5d1a65372ca6cb45c3fdb96e8dec58956b180d08964dc19f2bb07b25cc3daa88f701ec89c8fba3582e397037cc3c629c921bec7e906ce977ddfc33d8
 MISC metadata.xml 329 BLAKE2B b51dd0e7151cf74a8b76183ea66baea7ccd271c3ec4d274d88b4135a4ebb0e8fa0ccba071bea50b37ad32627310e826108a84f43bd5c01c5e850f84021f78f85 SHA512 d3272d4cc86186bfc2b08cee68f27cdbb139ea2eb04557977aa9d4088716e1a6d0755bca4ec63363fe83d333198eb9b249359bd191847021438b962548266fcc
diff --git a/media-sound/vlevel/files/vlevel-0.5-makefile.patch b/media-sound/vlevel/files/vlevel-0.5-makefile.patch
index af50f1e3c08c..d7f5d80ebb46 100644
--- a/media-sound/vlevel/files/vlevel-0.5-makefile.patch
+++ b/media-sound/vlevel/files/vlevel-0.5-makefile.patch
@@ -1,6 +1,16 @@
---- vlevel-0.5/Makefile.orig
-+++ vlevel-0.5/Makefile
-@@ -30,6 +30,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,8 @@
+ # User-editable options:
+ 
+ # Change this to suit your preferences (maybe add -march=cputype)	
+-CXXFLAGS=-Wall -O3 -fPIC -DPIC -g
++CXXFLAGS+=-Wall -fPIC
++CPPFLAGS+=-DPIC
+ 
+ # This is where it will be installed
+ PREFIX=/usr/local/bin/
+@@ -30,6 +31,7 @@
  all: vlevel-bin vlevel-ladspa.so
  
  install: all
@@ -8,19 +18,26 @@
  	cp -f vlevel-bin $(PREFIX)
  	mkdir -p $(LADSPA_PREFIX)
  	cp -f vlevel-ladspa.so $(LADSPA_PREFIX)
-@@ -38,13 +39,13 @@
+@@ -38,20 +40,7 @@
  	rm -f *.o vlevel-bin vlevel-ladspa.so
  
  vlevel-ladspa.so: vlevel-ladspa.o volumeleveler.o
 -	$(CXX) $(CXXFLAGS) -shared -o vlevel-ladspa.so vlevel-ladspa.o volumeleveler.o
+-
+-vlevel-ladspa.o: vlevel-ladspa.cpp volumeleveler.h vlevel-ladspa.h vlevel.h ladspa.h
+-	$(CXX) $(CXXFLAGS) -c vlevel-ladspa.cpp
 +	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o vlevel-ladspa.so vlevel-ladspa.o volumeleveler.o
  
- vlevel-ladspa.o: vlevel-ladspa.cpp volumeleveler.h vlevel-ladspa.h vlevel.h ladspa.h
- 	$(CXX) $(CXXFLAGS) -c vlevel-ladspa.cpp
- 
  vlevel-bin: volumeleveler.o commandline.o vlevel-bin.o vlevel.h
 -	$(CXX) $(CXXFLAGS) -o vlevel-bin vlevel-bin.o volumeleveler.o commandline.o
+-
+-volumeleveler.o: volumeleveler.cpp volumeleveler.h vlevel.h
+-	$(CXX) $(CXXFLAGS) -c volumeleveler.cpp
+-
+-vlevel-bin.o: vlevel-bin.cpp volumeleveler.h commandline.h vlevel.h
+-	$(CXX) $(CXXFLAGS) -c vlevel-bin.cpp
+-
+-commandline.o: commandline.cpp commandline.h
+-	$(CXX) $(CXXFLAGS) -c commandline.cpp
+-
 +	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o vlevel-bin vlevel-bin.o volumeleveler.o commandline.o
- 
- volumeleveler.o: volumeleveler.cpp volumeleveler.h vlevel.h
- 	$(CXX) $(CXXFLAGS) -c volumeleveler.cpp
diff --git a/media-sound/vlevel/vlevel-0.5-r1.ebuild b/media-sound/vlevel/vlevel-0.5-r1.ebuild
index d25eb4ec8439..3878e4aedc2c 100644
--- a/media-sound/vlevel/vlevel-0.5-r1.ebuild
+++ b/media-sound/vlevel/vlevel-0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# 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 multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Dynamic compressor to amplify quiet parts of music"
 HOMEPAGE="http://vlevel.sourceforge.net/"
@@ -12,27 +12,22 @@ SRC_URI="mirror://sourceforge/vlevel/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
 
 RDEPEND="media-libs/ladspa-sdk"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-src_compile() {
-	emake CXX=$(tc-getCXX) CXXFLAGS="$CXXFLAGS -fPIC -DPIC"
+src_configure() {
+	tc-export CXX
 }
 
 src_install() {
-	emake PREFIX="${D}/usr/bin/" LADSPA_PREFIX="${D}/usr/$(get_libdir)/ladspa/" install
+	emake PREFIX="${ED}"/usr/bin/ LADSPA_PREFIX="${ED}"/usr/$(get_libdir)/ladspa/ install
 
-	dodoc README TODO docs/*
+	dodoc -r README TODO docs/.
 
-	exeinto /usr/share/doc/${PF}/examples
-	doexe utils/{levelplay,raw2wav,vlevel-dir}
 	docinto examples
-	dodoc utils/README
-	docompress -x /usr/share/doc/${PF}/examples/{levelplay,raw2wav,vlevel-dir}
+	dodoc utils/{levelplay,raw2wav,vlevel-dir,README}
+	docompress -x /usr/share/doc/${PF}/examples
 }