3 files changed, 33 insertions, 13 deletions
diff --git a/media-sound/vb2rip/Manifest b/media-sound/vb2rip/Manifest
index 124d44ae05f4..d6fe64704ed2 100644
--- a/media-sound/vb2rip/Manifest
+++ b/media-sound/vb2rip/Manifest
@@ -1,3 +1,4 @@
+AUX vb2rip-1.4-makefile.patch 421 BLAKE2B 8e19d04d65c0efe9507aabb62b8b662ebf53bed3ac27d6282b222f46d052058951465302c6a1ea14681f56d1e882214d8ab741b9c0ee8143765ab1a237ff6ba0 SHA512 b0ff12f4c9e7e98ca17897bcdf8bc04032a181707df04f85d669ae2415fcc69dbb3d60611aa4cc15104d61dc344bfaa8e1ba6c34f50a46953eee9faf492ed4c0
 DIST vb2rip14.zip 22254 BLAKE2B 4b1571d07c39558d7e95b3b313b1b109952969143f68a47d06a0538628ff8937f62fd88ccdd7641aeaa814ab86602e028acf83b577ddca30e24ae5814438dad2 SHA512 f84c8bb826a319cb0e0bc6118bc270ace18f52cc73b918ca5ef8d8f674bd7922d23d36fe6034a189f18ac4fb9e6a8f0c460dd407ec350fd1185c1088757678ea
-EBUILD vb2rip-1.4.ebuild 763 BLAKE2B 3b003f310e5d475d41de4f9e082c408b1a94fbad12d4afa1af87af37c919338e037548363154642a8fa1c6f2dc4d6e80674b76ecbc07f8f2f05148759acea2a4 SHA512 fd81d828ee0a532e8977617ed2d10713f1ef0f6cc5b2bb97ee33be26b79e12f8f2b5d0fc9a2f120209c6f54986774ce7de0b5c125f449568155f923c9d4069ad
+EBUILD vb2rip-1.4.ebuild 579 BLAKE2B 88b0d60bb9c96ae50e2d82abeb06608448abba3e0187d439d5280ef3eddab138551ada3dc5ccaba44790c77a709e90da8c0a98fea0bb896501004def605bc976 SHA512 9467ab84a17dbf428857ff0403af1d32a671e5e80571f4ce90ad00f16a2528f77ae80af6581c90e674998a90ed70def0c3fad968813efcb90f201a2721c80774
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
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 000000000000..0b584086f536
--- /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 0ee16ac10e2d..e9bacb5a23df 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}
 }