From 088ae1176787ef3d2c6bcd6f314b59b8766a7149 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Fri, 29 Jul 2022 23:38:14 +0200
Subject: media-sound/combine_wave: update EAPI 6 -> 8

Closes: https://bugs.gentoo.org/714654
Signed-off-by: David Seifert <soap@gentoo.org>
---
 .../combine_wave/combine_wave-0.3.1-r1.ebuild      | 35 ----------------------
 .../combine_wave/combine_wave-0.3.1-r2.ebuild      | 31 +++++++++++++++++++
 .../files/combine_wave-0.3.1-makefile.patch        | 22 ++++++++++++++
 .../combine_wave-0.3.1-missing-includes.patch      | 14 +++++++++
 4 files changed, 67 insertions(+), 35 deletions(-)
 delete mode 100644 media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
 create mode 100644 media-sound/combine_wave/combine_wave-0.3.1-r2.ebuild
 create mode 100644 media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch
 create mode 100644 media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch

(limited to 'media-sound/combine_wave')

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
deleted file mode 100644
index 6974e43cf260..000000000000
--- a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/"
-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 || die "sed Makefile failed"
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin combine_wave
-	einstalldocs
-}
diff --git a/media-sound/combine_wave/combine_wave-0.3.1-r2.ebuild b/media-sound/combine_wave/combine_wave-0.3.1-r2.ebuild
new file mode 100644
index 000000000000..ff73a2b87cd2
--- /dev/null
+++ b/media-sound/combine_wave/combine_wave-0.3.1-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/"
+SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-overflow.patch
+	"${FILESDIR}"/${P}-missing-includes.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin combine_wave
+
+	einstalldocs
+	dodoc combine_wave.man
+}
diff --git a/media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch b/media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch
new file mode 100644
index 000000000000..591d56ad1867
--- /dev/null
+++ b/media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,16 +3,13 @@
+ #CC  = /usr/local/bin/g++
+ #CC  = /usr/bin/g++
+ 
+-CFLAGS = -O2 -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+-
+-.c.o:
+-	gcc $(CFLAGS) -c $<
++CFLAGS += -Wall
++CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+ OBJECT =\
+ combine_wave.o
+ 
+-a.out : $(OBJECT)
+-	gcc -o combine_wave  $(OBJECT)
++all: combine_wave
+ 		
+ # DEPENDENCIES
+ combine_wave.o : combine_wave.c combine_wave.h wave_header.h
diff --git a/media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch b/media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch
new file mode 100644
index 000000000000..3d6a3c938ba1
--- /dev/null
+++ b/media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch
@@ -0,0 +1,14 @@
+--- a/combine_wave.h
++++ b/combine_wave.h
+@@ -12,9 +12,10 @@
+ #include <float.h>
+ #include <math.h>
+ #include <linux/soundcard.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include "stdint.h"
+ #include <sys/ioctl.h>
++#include <sys/select.h>
+ #include <string.h> 
+ 
+ 
-- 
cgit v1.2.3-65-gdbad