summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Bauman <bman@gentoo.org>2018-06-02 13:30:18 -0400
committerAaron Bauman <bman@gentoo.org>2018-06-02 18:37:16 -0400
commit4d06f76d57ab30556ec00e736172a55f5e63d569 (patch)
treec539cff81699735ba513ac869d8c7d4ccb1d1833 /media-sound
parentmedia-plugins/vamp-libxtract-plugins: bump EAPI and drop eutils (diff)
downloadgentoo-4d06f76d57ab30556ec00e736172a55f5e63d569.tar.gz
gentoo-4d06f76d57ab30556ec00e736172a55f5e63d569.tar.bz2
gentoo-4d06f76d57ab30556ec00e736172a55f5e63d569.zip
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
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild25
-rw-r--r--media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch2
2 files changed, 14 insertions, 13 deletions
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 cee491df0ef9..6974e43cf260 100644
--- 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 ee7fe38da458..657ff24bbf75 100644
--- 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++)