gentoo resync : 15.12.2019

3 files changed, 30 insertions, 16 deletions

diff --git a/media-sound/ttaenc/Manifest b/media-sound/ttaenc/Manifest
index 6c5017165175..726708140b6c 100644
--- a/media-sound/ttaenc/Manifest
+++ b/media-sound/ttaenc/Manifest
@@ -1,3 +1,4 @@
+AUX ttaenc-3.4.1-fix-build-system.patch 460 BLAKE2B c6b8ff7b908364a0052b8b32c5ed424e998a600449c9f04bf52a7d2fc1cb7221b7eacf3f542f102b15b08a1208a3fd7b75b3c1b590986e1bea56d2bef899cd12 SHA512 4d36ac15f22dca57bbb1c83f94a6279dff56607c428eea56b4aaef9ca4405233653c28a7df924f36da60b60c6cd54226ae70553f81f996ae796fed1ed8deee33
 DIST ttaenc-3.4.1-src.tgz 20835 BLAKE2B 9eb2a52b67874c1b44b092c6f665c8105b86f05b69be10aea1a0b196487e0d950dbc174385dd686c4574abdcd77c2945f441b672a77e9c9a48bfa822ccdc1a01 SHA512 489f9a2e0f94a82f12302f076e33062104e58688ffde97e742ad3c8c226bd0000133c539e9111e10f2d24c176e0b7ddd0a76e60bd3baafa53c29b3cd89ada06d
-EBUILD ttaenc-3.4.1-r1.ebuild 585 BLAKE2B 62136ff78348a44061ab7f0d57fa2e72c355f3c07aa2aa447e84f762430b806aefc566d60d3fec6b96771272c19b8ded782df0d2928979a363682b9c51675ede SHA512 8deda5e07a81c5007e7b69eb58a3e27a3af2108ef053cbbb7469ef9102ae88e38a1da596aa4a7ea028cc8824d4bd38509fa9860661302df7a4dfdf1baced8ed4
+EBUILD ttaenc-3.4.1-r1.ebuild 493 BLAKE2B 05dd271171e8e8bbded6c23bb19ebeb76de0cd89d981a728c37cae86bc0b1a7b221ec24139ea7b49abebbc94cf619d050f6f35643161211eec3bb0cfc52a9885 SHA512 9cec57c6c403d94edeab729c4cb46fe67148941be9b63e8ab53ae039822247d2da81895a44e7e79895f4db9b8be85f466d2c77bdf93435716fb2deb87a335d30
 MISC metadata.xml 326 BLAKE2B 9ca570aaafb07e124bf9ea766b9eb51537cb9d8f1abc8cf22021db7aae18719c4d52213f2ce074cb5e31a25cf6596747048e958db9eef6d4f67962c2c49b143a SHA512 cbf753d8944172edfe707a17f07936cf5af413721a7f657262fd4a4c65d001a39ea13069fc16d6ea5248e0025ad7c5b1852b36baeb1e1be53787ae1f4d9f8536
diff --git a/media-sound/ttaenc/files/ttaenc-3.4.1-fix-build-system.patch b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-build-system.patch
new file mode 100644
index 000000000000..794316d24899
--- /dev/null
+++ b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-build-system.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,16 +2,12 @@
+ # $Id: Makefile,v 1.4 2007/04/04 00:00:00 root Exp $
+ #
+ 
+-CFLAGS	= -Wall -O3 -fomit-frame-pointer -funroll-loops \
+-		  -fforce-addr -falign-functions=4 -msse
++CFLAGS	+= -Wall
+ TTAENC	= ttaenc
+ INSDIR	= /usr/bin
+ 
+ ttaenc: $(patsubst %.c, %.o, $(wildcard *.c))
+-	gcc $^ -o $@ $(CFLAGS)
+-
+-%.o:	%.c
+-	gcc -c $(CFLAGS) $<
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+ 
+ install:
+ 	[ -d "$(INSDIR)" ] || mkdir $(INSDIR)
diff --git a/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
index d7697469bc3e..34f01191dd63 100644
--- a/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
+++ b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,23 +12,15 @@ SRC_URI="mirror://sourceforge/tta/${P}-src.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-DEPEND="sys-apps/sed"
+S="${WORKDIR}/${P}-src"
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
-S=${WORKDIR}/${P}-src
-
-src_prepare() {
-	sed -i -e "s:gcc:$(tc-getCC):g" \
-		-e "s:-o:${LDFLAGS} -o:g" \
-		Makefile || die
-}
-
-src_compile () {
-	emake CFLAGS="${CFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
-src_install () {
+src_install() {
 	dobin ttaenc
 	dodoc ChangeLog-${PV} README
 }