[gentoo-commits] repo/gentoo:master commit in: media-sound/vb2rip/files/, media-sound/vb2rip/

[gentoo-commits] repo/gentoo:master commit in: media-sound/vb2rip/files/, media-sound/vb2rip/

[David Seifert]

commit:     6bfe07120f7adb77e6ba5b96507ff685f3e0f18f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 17:22:30 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue May 28 17:22:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bfe0712

media-sound/vb2rip: Port to EAPI 7

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-sound/vb2rip/files/vb2rip-1.4-makefile.patch | 21 +++++++++++++++++++++
 media-sound/vb2rip/vb2rip-1.4.ebuild               | 22 ++++++++++------------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/media-sound/vb2rip/files/vb2rip-1.4-makefile.patch b/media-sound/vb2rip/files/vb2rip-1.4-makefile.patch
new file mode 100644
index 00000000000..0b584086f53
--- /dev/null
+++ b/media-sound/vb2rip/files/vb2rip-1.4-makefile.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,17 +1,4 @@
+-CC=gcc
+-CFLAGS=-O9 -fomit-frame-pointer -Wall
+-LD=gcc
+-LFLAGS=-s
+-
+ OBJECTS=main.o decode.o wav.o lsb.o rip.o fmt.o fmt_raw.o fmt_vb2.o fmt_8.o fmt_msa.o fmt_xa2.o
+ 
+-all: vb2rip
+-
+ vb2rip: $(OBJECTS)
+-	$(LD) $(LFLAGS) $(OBJECTS) -o $@
+-
+-%.o: %.c
+-	$(CC) $(CFLAGS) -c $<
+-
+-clean:
+-	del *.o
++	$(CC) $(LDFLAGS) $(OBJECTS) $(LOADLIBES) $(LDLIBS) -o vb2rip

diff --git a/media-sound/vb2rip/vb2rip-1.4.ebuild b/media-sound/vb2rip/vb2rip-1.4.ebuild
index 0ee16ac10e2..e9bacb5a23d 100644
--- a/media-sound/vb2rip/vb2rip-1.4.ebuild
+++ b/media-sound/vb2rip/vb2rip-1.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit versionator toolchain-funcs
+inherit toolchain-funcs
 
-MY_PV=$(replace_version_separator '')
+MY_PV=${PV//./}
 
 DESCRIPTION="Konami VB2 sound format ripping utility"
 HOMEPAGE="http://www.neillcorlett.com/vb2rip"
@@ -14,20 +14,18 @@ SRC_URI="http://www.neillcorlett.com/vb2rip/${PN}${MY_PV}.zip"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 S=${WORKDIR}/src
 
-src_compile() {
+PATCHES=( "${FILESDIR}"/${PN}-1.4-makefile.patch )
+
+src_configure() {
 	tc-export CC
-	echo "vb2rip: main.o decode.o wav.o lsb.o rip.o fmt.o fmt_raw.o fmt_vb2.o fmt_8.o fmt_msa.o fmt_xa2.o" > Makefile
-	echo '	$(CC) $(LDFLAGS) $^ -o $@' >> Makefile
-	emake || die
 }
 
 src_install() {
-	dobin vb2rip || die
-	dodoc "${WORKDIR}/games.txt" "${WORKDIR}/vb2rip.txt"
+	dobin vb2rip
+	dodoc "${WORKDIR}"/{games.txt,vb2rip.txt}
 }