media-sound/combine_wave: bump EAPI and drop eutils

combine_wave.man is not a man file, but rather a manual.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild b/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
index cee491df0ef981d827ac56758f3169e9c0eed2d1..6974e43cf260dddd8e605046f693880d6dc45e22 100644 (file)
--- a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
+++ b/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit eutils toolchain-funcs
-
-IUSE=""
+inherit toolchain-funcs
 
 DESCRIPTION="sync up 2 audio ch. and/or combine 2 mono audio ch. into one stereo wave ch"
 HOMEPAGE="http://panteltje.com/panteltje/dvd/"
@@ -14,19 +12,24 @@ SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS=( CHANGES README combine_wave.man )
+
+PATCHES=( "${FILESDIR}/${P}-overflow.patch" )
 
 src_prepare() {
+       default
        # fix makefile
        sed -i -e "s:gcc:\$(CC):g" -e "s:= -O2:+=:g" \
-               -e "s:\( -o \): \$(LDFLAGS)\1:g" Makefile
-       epatch "${FILESDIR}"/${P}-overflow.patch
+               -e "s:\( -o \): \$(LDFLAGS)\1:g" Makefile || die "sed Makefile failed"
 }
 
-src_compile() {
-       emake CC="$(tc-getCC)" || die "emake failed"
+src_configure() {
+       tc-export CC
 }
 
 src_install() {
-       dobin combine_wave || die
-       dodoc CHANGES README combine_wave.man
+       dobin combine_wave
+       einstalldocs
 }

diff --git a/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch b/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch
index ee7fe38da458c5f06efdfd5d9bfa3098f1638ce2..657ff24bbf759c8644c6cfcd29477db0411e8e05 100644 (file)
--- a/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch
+++ b/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch
@@ -1,5 +1,3 @@
-diff --git a/combine_wave.c b/combine_wave.c
-index 5bfa4aa..391db25 100644
 --- a/combine_wave.c
 +++ b/combine_wave.c
 @@ -601,9 +601,9 @@ for(i = 0; i < header_size; i++)