| 1 |
commit: 4d06f76d57ab30556ec00e736172a55f5e63d569 |
| 2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 2 17:30:18 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 2 22:37:16 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d06f76d |
| 7 |
|
| 8 |
media-sound/combine_wave: bump EAPI and drop eutils |
| 9 |
|
| 10 |
combine_wave.man is not a man file, but rather a manual. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 13 |
|
| 14 |
.../combine_wave/combine_wave-0.3.1-r1.ebuild | 25 ++++++++++++---------- |
| 15 |
.../files/combine_wave-0.3.1-overflow.patch | 2 -- |
| 16 |
2 files changed, 14 insertions(+), 13 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
index cee491df0ef..6974e43cf26 100644 |
| 20 |
--- a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild |
| 21 |
+++ b/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild |
| 22 |
@@ -1,11 +1,9 @@ |
| 23 |
-# Copyright 1999-2014 Gentoo Foundation |
| 24 |
+# Copyright 1999-2018 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI="2" |
| 28 |
+EAPI=6 |
| 29 |
|
| 30 |
-inherit eutils toolchain-funcs |
| 31 |
- |
| 32 |
-IUSE="" |
| 33 |
+inherit toolchain-funcs |
| 34 |
|
| 35 |
DESCRIPTION="sync up 2 audio ch. and/or combine 2 mono audio ch. into one stereo wave ch" |
| 36 |
HOMEPAGE="http://panteltje.com/panteltje/dvd/" |
| 37 |
@@ -14,19 +12,24 @@ SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz" |
| 38 |
LICENSE="GPL-2" |
| 39 |
SLOT="0" |
| 40 |
KEYWORDS="~amd64 ~x86" |
| 41 |
+IUSE="" |
| 42 |
+ |
| 43 |
+DOCS=( CHANGES README combine_wave.man ) |
| 44 |
+ |
| 45 |
+PATCHES=( "${FILESDIR}/${P}-overflow.patch" ) |
| 46 |
|
| 47 |
src_prepare() { |
| 48 |
+ default |
| 49 |
# fix makefile |
| 50 |
sed -i -e "s:gcc:\$(CC):g" -e "s:= -O2:+=:g" \ |
| 51 |
- -e "s:\( -o \): \$(LDFLAGS)\1:g" Makefile |
| 52 |
- epatch "${FILESDIR}"/${P}-overflow.patch |
| 53 |
+ -e "s:\( -o \): \$(LDFLAGS)\1:g" Makefile || die "sed Makefile failed" |
| 54 |
} |
| 55 |
|
| 56 |
-src_compile() { |
| 57 |
- emake CC="$(tc-getCC)" || die "emake failed" |
| 58 |
+src_configure() { |
| 59 |
+ tc-export CC |
| 60 |
} |
| 61 |
|
| 62 |
src_install() { |
| 63 |
- dobin combine_wave || die |
| 64 |
- dodoc CHANGES README combine_wave.man |
| 65 |
+ dobin combine_wave |
| 66 |
+ einstalldocs |
| 67 |
} |
| 68 |
|
| 69 |
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 |
| 70 |
index ee7fe38da45..657ff24bbf7 100644 |
| 71 |
--- a/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch |
| 72 |
+++ b/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch |
| 73 |
@@ -1,5 +1,3 @@ |
| 74 |
-diff --git a/combine_wave.c b/combine_wave.c |
| 75 |
-index 5bfa4aa..391db25 100644 |
| 76 |
--- a/combine_wave.c |
| 77 |
+++ b/combine_wave.c |
| 78 |
@@ -601,9 +601,9 @@ for(i = 0; i < header_size; i++) |
Archives