| 1 |
commit: 3ab914187dc61039c2b6a78e6c8ce3829648ff6e |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 2 16:21:39 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 2 16:38:22 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab91418 |
| 7 |
|
| 8 |
media-sound/cmix: Port to EAPI 6 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 11 |
|
| 12 |
media-sound/cmix/Manifest | 2 +- |
| 13 |
media-sound/cmix/cmix-1.6.ebuild | 19 +++++++------------ |
| 14 |
media-sound/cmix/files/cmix-1.6-ldflags.patch | 16 ++++++++-------- |
| 15 |
3 files changed, 16 insertions(+), 21 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-sound/cmix/Manifest b/media-sound/cmix/Manifest |
| 18 |
index 670057d2628..50811eadb5a 100644 |
| 19 |
--- a/media-sound/cmix/Manifest |
| 20 |
+++ b/media-sound/cmix/Manifest |
| 21 |
@@ -1 +1 @@ |
| 22 |
-DIST cmix-1.6.tbz2 12880 SHA256 3c63e687c0afac50f5218f2ee0f594132f1656073d5a9cf3f7f0da525b4e8afe SHA512 5d8409872bbea0575a1cb7d15d1f1469571860d06f4f71bf78b685077d0ff394323ef12498d3f8424e00b31a7c7430115ee7a810b7bbf291bb586a3d95f19a38 WHIRLPOOL 08d496d71d2d016679df5c99056d625f097aef7c334a38bbff448145a11cec931c0bb5557a33872459781202c12a46e3cd97b98a32db0f6dc39458eaa8303612 |
| 23 |
+DIST cmix-1.6.tbz2 12880 BLAKE2B 1d024279a30439099dbc1f7a4c7a98f96143b716f032f57bb662d901e3fb92977333cc6ca1743727128c08ec92f3ef01c57b37e7bf803f8525c05910eed9da0c SHA512 5d8409872bbea0575a1cb7d15d1f1469571860d06f4f71bf78b685077d0ff394323ef12498d3f8424e00b31a7c7430115ee7a810b7bbf291bb586a3d95f19a38 |
| 24 |
|
| 25 |
diff --git a/media-sound/cmix/cmix-1.6.ebuild b/media-sound/cmix/cmix-1.6.ebuild |
| 26 |
index 933e6189f5a..1dc7e4ab02a 100644 |
| 27 |
--- a/media-sound/cmix/cmix-1.6.ebuild |
| 28 |
+++ b/media-sound/cmix/cmix-1.6.ebuild |
| 29 |
@@ -1,9 +1,9 @@ |
| 30 |
-# Copyright 1999-2009 Gentoo Foundation |
| 31 |
+# Copyright 1999-2017 Gentoo Foundation |
| 32 |
# Distributed under the terms of the GNU General Public License v2 |
| 33 |
|
| 34 |
-inherit eutils toolchain-funcs |
| 35 |
+EAPI=6 |
| 36 |
|
| 37 |
-IUSE="" |
| 38 |
+inherit toolchain-funcs |
| 39 |
|
| 40 |
DESCRIPTION="command line audio mixer" |
| 41 |
HOMEPAGE="http://cmix.sourceforge.net/" |
| 42 |
@@ -14,18 +14,13 @@ SLOT="0" |
| 43 |
#-amd64: 1.6: 'cmix list' gives: MIXER_READ(SOUND_MIXER_OUTSRC): Input/output error |
| 44 |
KEYWORDS="-amd64 ~ppc sparc x86" |
| 45 |
|
| 46 |
-src_unpack() { |
| 47 |
- unpack ${A} |
| 48 |
- cd "${S}" |
| 49 |
- epatch "${FILESDIR}/${P}-ldflags.patch" |
| 50 |
-} |
| 51 |
+PATCHES=( "${FILESDIR}/${P}-ldflags.patch" ) |
| 52 |
|
| 53 |
-src_compile() { |
| 54 |
- emake CC="$(tc-getCC)" || die "emake failed" |
| 55 |
+src_configure() { |
| 56 |
+ tc-export CC |
| 57 |
} |
| 58 |
|
| 59 |
src_install() { |
| 60 |
- einstall || die |
| 61 |
dobin cmix |
| 62 |
- dodoc README || die |
| 63 |
+ einstalldocs |
| 64 |
} |
| 65 |
|
| 66 |
diff --git a/media-sound/cmix/files/cmix-1.6-ldflags.patch b/media-sound/cmix/files/cmix-1.6-ldflags.patch |
| 67 |
index ba8dacb2567..0ddf7e08584 100644 |
| 68 |
--- a/media-sound/cmix/files/cmix-1.6-ldflags.patch |
| 69 |
+++ b/media-sound/cmix/files/cmix-1.6-ldflags.patch |
| 70 |
@@ -1,14 +1,14 @@ |
| 71 |
-Index: cmix-1.6/Makefile |
| 72 |
-=================================================================== |
| 73 |
---- cmix-1.6.orig/Makefile |
| 74 |
-+++ cmix-1.6/Makefile |
| 75 |
-@@ -3,8 +3,7 @@ CC=gcc |
| 76 |
- #CFLAGS=-Wall -O2 |
| 77 |
- |
| 78 |
+--- a/Makefile |
| 79 |
++++ b/Makefile |
| 80 |
+@@ -1,10 +1,5 @@ |
| 81 |
+-CC=gcc |
| 82 |
+-#CFLAGS=-Wall -g |
| 83 |
+-#CFLAGS=-Wall -O2 |
| 84 |
+- |
| 85 |
cmix: mix.c |
| 86 |
- $(CC) $(CFLAGS) mix.c -o $@ |
| 87 |
- strip $@ |
| 88 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) mix.c -o $@ |
| 89 |
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) mix.c -o $@ $(LIBS) |
| 90 |
|
| 91 |
install: |
Archives