[gentoo-commits] repo/gentoo:master commit in: media-gfx/crwinfo/files/, media-gfx/crwinfo/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/crwinfo/files/, media-gfx/crwinfo/

[David Seifert]

commit:     972df64821a507399db6f4ed258b4f512fb78151
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 15:07:06 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 15:07:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972df648

media-gfx/crwinfo: Port to EAPI 7

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

 media-gfx/crwinfo/crwinfo-0.2.ebuild      | 14 ++++++--------
 media-gfx/crwinfo/files/crwinfo-0.2.patch |  9 +++++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/media-gfx/crwinfo/crwinfo-0.2.ebuild b/media-gfx/crwinfo/crwinfo-0.2.ebuild
index 09e639edc0a..6f3b79d7548 100644
--- a/media-gfx/crwinfo/crwinfo-0.2.ebuild
+++ b/media-gfx/crwinfo/crwinfo-0.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Canon raw image (CRW) information and thumbnail extractor"
 HOMEPAGE="http://freshmeat.net/projects/crwinfo/"
@@ -12,16 +12,14 @@ SRC_URI="http://neuemuenze.heim1.tu-clausthal.de/~sven/crwinfo/CRWInfo-${PV}.tar
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
 
 S="${WORKDIR}/CRWInfo-${PV}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-	sed \
-		-e '/gcc/s:^.*$:\t$(CC) $(CFLAGS) -Wall -c crwinfo.c\n\t$(CC) $(LDFLAGS) -o crwinfo crwinfo.o:g' \
-		-i Makefile || die
+PATCHES=( "${FILESDIR}"/${P}.patch )
+
+src_compile() {
 	tc-export CC
+	emake crwinfo
 }
 
 src_install() {

diff --git a/media-gfx/crwinfo/files/crwinfo-0.2.patch b/media-gfx/crwinfo/files/crwinfo-0.2.patch
index 18170b10d71..1753ed0bdf3 100644
--- a/media-gfx/crwinfo/files/crwinfo-0.2.patch
+++ b/media-gfx/crwinfo/files/crwinfo-0.2.patch
@@ -1,5 +1,5 @@
---- crwinfo.c.orig	2002-07-30 11:17:03.000000000 -0600
-+++ crwinfo.c	2005-01-21 15:24:54.256888228 -0700
+--- a/crwinfo.c
++++ b/crwinfo.c
 @@ -95,10 +95,10 @@
     fprintf( stderr, "-m        show misc. information (whitepoint, AF mode etc)\n" );
     fprintf( stderr, "-f        show flash information (flash mode etc)\n" );
@@ -15,3 +15,8 @@
     fprintf( stderr, "-x        show experimental information (don't rely on it)\n" );
     exit(0);
  }
+--- a/Makefile
++++ b/Makefile
+@@ -1,2 +0,0 @@
+-all:
+-	gcc -o crwinfo -W -Wall -g crwinfo.c