From 7b9f15840068dfaeea5684f8a1af1fe460dfa14c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 2 Jun 2018 17:18:14 +0100
Subject: gentoo resync : 02.06.2018

---
 media-gfx/jpegtoavi/Manifest                           |  4 ++--
 media-gfx/jpegtoavi/files/jpegtoavi-1.5-Makefile.patch |  4 ++--
 media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild               | 15 ++++++---------
 3 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'media-gfx/jpegtoavi')

diff --git a/media-gfx/jpegtoavi/Manifest b/media-gfx/jpegtoavi/Manifest
index 8e2fc9c6fcc6..1852e37cc234 100644
--- a/media-gfx/jpegtoavi/Manifest
+++ b/media-gfx/jpegtoavi/Manifest
@@ -1,4 +1,4 @@
-AUX jpegtoavi-1.5-Makefile.patch 873 BLAKE2B 19499a708db9361b57124fd9ccb4d0b1afbedec660d670d16d70cfcfc70697eedae7572bf3be2e798c568ca4f718f035893830cb3425c342308a064b531c0ca1 SHA512 6a33393a6eef430630b58d12f7e8a5b6a4266c8dfa1a0fd18a20660c5f9ed374edde377abda68dbcefb2863ce07e5c72b23ad7db2620f77e450fdd6c9db563ae
+AUX jpegtoavi-1.5-Makefile.patch 872 BLAKE2B d3da3b46462bb34e7e04ad12f77bbb9c2c410ba73a79513407f803a0e3538fa68f4f7725de2c0b07611babe1b256a2e699a2986187c622f43ba51e40f0571752 SHA512 ef933465a8e43548339168a0249d714ee3e06ab7e9bb652f39de4923ae95d29da7914da5c6ceb13051aa438555b618735c36f6c22254dec96219a1c7954cfb31
 DIST jpegtoavi-1.5.tar.gz 14882 BLAKE2B 969893d9c1b619021043f33abb88720de832a4ebd2292c05467d143977fc425279c00714b74ab17e55e8b5d47e01da4132302c33336a37dff1829e9c05b7b72b SHA512 7daac756cb2b863cdaa1101e99705a429e08695adf777cf6398150e5b2fd01c5b4b772b2d3f177f6d67592a1dd5d4fdcecd62563cefa58d06ef2dcbc2aa07231
-EBUILD jpegtoavi-1.5.ebuild 565 BLAKE2B 79d26437a1649ce03277f1b752be3c697f07924190d09df81370347a52a444219c25a0c00c4275e923e64a77785e37e022921cdb6f8b08aab1344e0503306c06 SHA512 95b7db6169f946751d82e56433f0e26caf28770757d28e56b2b5c69dfb4e6e57fff6c72a8f1dd3b97cb0be2c9be58cc537320bd9561dc484f90b42ecdff4c87a
+EBUILD jpegtoavi-1.5.ebuild 525 BLAKE2B d65fc7fdb202bfbddeace64ce796ad5bff491391954fbdf93614f3d0291acb1e30e6a9444d45c3489167693a878b14cc8ec6b30b5d8448106545c4041bde54c6 SHA512 d4c36f8b9702a12c5e2e4fa70a00af5b92972a475f1b8c6996cf000d2ba8edf5ea914c2bcac9d5f5d6d7f717263950bc46f989901a353629e503a7a6576cfbc0
 MISC metadata.xml 436 BLAKE2B 42833fd1a99c5e2466e8048f2d8a23e8fcca9622b74f8e6fd61ebb649803a87964d8a4189ad652d39210abdc193b070ee0915bab2985fd10bbd1b4e37c07b3f2 SHA512 6e34f1a383d6921a5114ea1d850b428ac50f748a7fe6847978409590346198dad15e998c1bc5f97af5550a90b9f51319133fab2788400c7df9d3cb4cbefd4297
diff --git a/media-gfx/jpegtoavi/files/jpegtoavi-1.5-Makefile.patch b/media-gfx/jpegtoavi/files/jpegtoavi-1.5-Makefile.patch
index 9f562f293b31..3f7d60695389 100644
--- a/media-gfx/jpegtoavi/files/jpegtoavi-1.5-Makefile.patch
+++ b/media-gfx/jpegtoavi/files/jpegtoavi-1.5-Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2010-03-02 23:06:07.000000000 +0200
-+++ Makefile	2010-03-02 23:11:59.000000000 +0200
+--- a/Makefile	2010-03-02 23:06:07.000000000 +0200
++++ b/Makefile	2010-03-02 23:11:59.000000000 +0200
 @@ -1,4 +1,4 @@
 -CC=gcc
 +CC ?= gcc
diff --git a/media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild b/media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild
index eb054f06923d..5da0a3e24689 100644
--- a/media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild
+++ b/media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils toolchain-funcs
+EAPI=6
+inherit toolchain-funcs
 
 DESCRIPTION="JPEG to AVI/MJPEG animation command-line conversion tool"
 HOMEPAGE="https://sourceforge.net/projects/jpegtoavi/"
@@ -13,17 +13,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-}
+PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake || die
 }
 
 src_install() {
-	dobin ${PN} || die
+	dobin ${PN}
 	doman ${PN}.1
 	dodoc CHANGELOG README
 }
-- 
cgit v1.2.3