From 3ab914187dc61039c2b6a78e6c8ce3829648ff6e Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Sat, 2 Dec 2017 17:21:39 +0100
Subject: media-sound/cmix: Port to EAPI 6

Package-Manager: Portage-2.3.16, Repoman-2.3.6
---
 media-sound/cmix/Manifest                     |  2 +-
 media-sound/cmix/cmix-1.6.ebuild              | 19 +++++++------------
 media-sound/cmix/files/cmix-1.6-ldflags.patch | 16 ++++++++--------
 3 files changed, 16 insertions(+), 21 deletions(-)

(limited to 'media-sound')

diff --git a/media-sound/cmix/Manifest b/media-sound/cmix/Manifest
index 670057d26288..50811eadb5a2 100644
--- a/media-sound/cmix/Manifest
+++ b/media-sound/cmix/Manifest
@@ -1 +1 @@
-DIST cmix-1.6.tbz2 12880 SHA256 3c63e687c0afac50f5218f2ee0f594132f1656073d5a9cf3f7f0da525b4e8afe SHA512 5d8409872bbea0575a1cb7d15d1f1469571860d06f4f71bf78b685077d0ff394323ef12498d3f8424e00b31a7c7430115ee7a810b7bbf291bb586a3d95f19a38 WHIRLPOOL 08d496d71d2d016679df5c99056d625f097aef7c334a38bbff448145a11cec931c0bb5557a33872459781202c12a46e3cd97b98a32db0f6dc39458eaa8303612
+DIST cmix-1.6.tbz2 12880 BLAKE2B 1d024279a30439099dbc1f7a4c7a98f96143b716f032f57bb662d901e3fb92977333cc6ca1743727128c08ec92f3ef01c57b37e7bf803f8525c05910eed9da0c SHA512 5d8409872bbea0575a1cb7d15d1f1469571860d06f4f71bf78b685077d0ff394323ef12498d3f8424e00b31a7c7430115ee7a810b7bbf291bb586a3d95f19a38
diff --git a/media-sound/cmix/cmix-1.6.ebuild b/media-sound/cmix/cmix-1.6.ebuild
index 933e6189f5a0..1dc7e4ab02a2 100644
--- a/media-sound/cmix/cmix-1.6.ebuild
+++ b/media-sound/cmix/cmix-1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils toolchain-funcs
+EAPI=6
 
-IUSE=""
+inherit toolchain-funcs
 
 DESCRIPTION="command line audio mixer"
 HOMEPAGE="http://cmix.sourceforge.net/"
@@ -14,18 +14,13 @@ SLOT="0"
 #-amd64: 1.6: 'cmix list' gives: MIXER_READ(SOUND_MIXER_OUTSRC): Input/output error
 KEYWORDS="-amd64 ~ppc sparc x86"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-}
+PATCHES=( "${FILESDIR}/${P}-ldflags.patch" )
 
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	einstall || die
 	dobin cmix
-	dodoc README || die
+	einstalldocs
 }
diff --git a/media-sound/cmix/files/cmix-1.6-ldflags.patch b/media-sound/cmix/files/cmix-1.6-ldflags.patch
index ba8dacb2567b..0ddf7e085844 100644
--- a/media-sound/cmix/files/cmix-1.6-ldflags.patch
+++ b/media-sound/cmix/files/cmix-1.6-ldflags.patch
@@ -1,14 +1,14 @@
-Index: cmix-1.6/Makefile
-===================================================================
---- cmix-1.6.orig/Makefile
-+++ cmix-1.6/Makefile
-@@ -3,8 +3,7 @@ CC=gcc
- #CFLAGS=-Wall -O2
- 
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,5 @@
+-CC=gcc
+-#CFLAGS=-Wall -g
+-#CFLAGS=-Wall -O2
+-
  cmix: mix.c
 -	$(CC) $(CFLAGS) mix.c -o $@
 -	strip $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) mix.c -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) mix.c -o $@ $(LIBS)
  
  install: 
  
-- 
cgit v1.2.3-65-gdbad