Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/jpegtoavi/files/, media-gfx/jpegtoavi/
Date: Tue, 29 May 2018 20:10:45
Message-Id: 1527624613.3dac42213022d7fffa2a441d50400581fc3459a5.bman@gentoo
1 commit: 3dac42213022d7fffa2a441d50400581fc3459a5
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 29 15:28:03 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Tue May 29 20:10:13 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dac4221
7
8 media-gfx/jpegtoavi: bump EAPI and drop eutils
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 media-gfx/jpegtoavi/files/jpegtoavi-1.5-Makefile.patch | 4 ++--
13 media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild | 14 ++++++--------
14 2 files changed, 8 insertions(+), 10 deletions(-)
15
16 diff --git a/media-gfx/jpegtoavi/files/jpegtoavi-1.5-Makefile.patch b/media-gfx/jpegtoavi/files/jpegtoavi-1.5-Makefile.patch
17 index 9f562f293b3..3f7d6069538 100644
18 --- a/media-gfx/jpegtoavi/files/jpegtoavi-1.5-Makefile.patch
19 +++ b/media-gfx/jpegtoavi/files/jpegtoavi-1.5-Makefile.patch
20 @@ -1,5 +1,5 @@
21 ---- Makefile.orig 2010-03-02 23:06:07.000000000 +0200
22 -+++ Makefile 2010-03-02 23:11:59.000000000 +0200
23 +--- a/Makefile 2010-03-02 23:06:07.000000000 +0200
24 ++++ b/Makefile 2010-03-02 23:11:59.000000000 +0200
25 @@ -1,4 +1,4 @@
26 -CC=gcc
27 +CC ?= gcc
28
29 diff --git a/media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild b/media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild
30 index eb054f06923..a11929389db 100644
31 --- a/media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild
32 +++ b/media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild
33 @@ -1,8 +1,8 @@
34 -# Copyright 1999-2010 Gentoo Foundation
35 +# Copyright 1999-2018 Gentoo Foundation
36 # Distributed under the terms of the GNU General Public License v2
37
38 -EAPI=2
39 -inherit eutils toolchain-funcs
40 +EAPI=6
41 +inherit toolchain-funcs
42
43 DESCRIPTION="JPEG to AVI/MJPEG animation command-line conversion tool"
44 HOMEPAGE="https://sourceforge.net/projects/jpegtoavi/"
45 @@ -13,17 +13,15 @@ SLOT="0"
46 KEYWORDS="~amd64 ~x86"
47 IUSE=""
48
49 -src_prepare() {
50 - epatch "${FILESDIR}"/${P}-Makefile.patch
51 -}
52 +PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
53
54 src_compile() {
55 tc-export CC
56 - emake || die
57 + default
58 }
59
60 src_install() {
61 - dobin ${PN} || die
62 + dobin ${PN}
63 doman ${PN}.1
64 dodoc CHANGELOG README
65 }