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

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

[David Seifert]

commit:     c0dbac28ee90fa403509d2b2a29e4590b47fdcc4
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 00:41:25 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 00:41:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0dbac28

media-sound/vsound: Port to EAPI 7

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

 .../vsound/files/vsound-0.6-fix-build-system.patch | 28 ++++++++++++++++++++++
 media-sound/vsound/vsound-0.6-r1.ebuild            | 25 +++++++++----------
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/media-sound/vsound/files/vsound-0.6-fix-build-system.patch b/media-sound/vsound/files/vsound-0.6-fix-build-system.patch
new file mode 100644
index 00000000000..7e653b6197c
--- /dev/null
+++ b/media-sound/vsound/files/vsound-0.6-fix-build-system.patch
@@ -0,0 +1,28 @@
+--- a/configure.in
++++ b/configure.in
+@@ -3,7 +3,9 @@
+ AC_CANONICAL_SYSTEM
+ 
+ AM_INIT_AUTOMAKE(vsound, 0.5)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
++
++AC_CONFIG_MACRO_DIR([.])
+ 
+ AC_PROG_CC
+ AC_PROG_CPP
+@@ -45,12 +47,12 @@
+ fi
+ 
+ if test "$ac_cv_prog_gcc" = yes ; then
+-	CFLAGS="-g -O2 -Wall -Wstrict-prototypes -pipe"
++	CFLAGS+=" -Wall -Wstrict-prototypes"
+ fi
+ 
+ if test "$ac_arg_debug" = yes; then
+ 	echo "enabling debug"
+-	CFLAGS="$CFLAGS -DENABLE_DEBUG "
++	CPPFLAGS+=" -DENABLE_DEBUG"
+ fi
+ 
+ AC_OUTPUT(Makefile vsound)

diff --git a/media-sound/vsound/vsound-0.6-r1.ebuild b/media-sound/vsound/vsound-0.6-r1.ebuild
index fad961ebbce..90bd0fd7898 100644
--- a/media-sound/vsound/vsound-0.6-r1.ebuild
+++ b/media-sound/vsound/vsound-0.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs autotools
+inherit autotools
 
 DESCRIPTION="A virtual audio loopback cable"
 HOMEPAGE="http://www.vsound.org/"
@@ -14,22 +14,23 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
 
-RDEPEND=">=media-sound/sox-14.2.0"
+RDEPEND="media-sound/sox:="
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-stdout.patch
-	AT_M4DIR="." eautoreconf
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-stdout.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
 
-src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_install() {
 	default
-
-	find "${D}" -name '*.la' -delete
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {