From f10528b3136e6d137a8e385c52ecb0b6a33723bb Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Thu, 18 May 2017 04:20:31 +0300
Subject: app-cdr/ccd2iso: EAPI="6", correct LICENSE, epatch -> eapply, Mac

Closes: https://github.com/gentoo/gentoo/pull/4665
---
 app-cdr/ccd2iso/ccd2iso-0.3.ebuild              | 20 ++++++--------------
 app-cdr/ccd2iso/files/ccd2iso-0.3-headers.patch |  4 ++--
 app-cdr/ccd2iso/metadata.xml                    | 14 +++++++-------
 3 files changed, 15 insertions(+), 23 deletions(-)

(limited to 'app-cdr')

diff --git a/app-cdr/ccd2iso/ccd2iso-0.3.ebuild b/app-cdr/ccd2iso/ccd2iso-0.3.ebuild
index 5de87f72e89a..5de8728f6ab2 100644
--- a/app-cdr/ccd2iso/ccd2iso-0.3.ebuild
+++ b/app-cdr/ccd2iso/ccd2iso-0.3.ebuild
@@ -1,26 +1,18 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils
+EAPI="6"
 
-DESCRIPTION="Converts CloneCD images (popular under Windows) to ISOs"
+DESCRIPTION="Convert CD images from ccd (CloneCD) to iso"
 HOMEPAGE="https://sourceforge.net/projects/ccd2iso/"
 SRC_URI="mirror://sourceforge/ccd2iso/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-headers.patch
-}
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+PATCHES=( "${FILESDIR}/${P}-headers.patch" )
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	emake install DESTDIR="${D}"
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/app-cdr/ccd2iso/files/ccd2iso-0.3-headers.patch b/app-cdr/ccd2iso/files/ccd2iso-0.3-headers.patch
index 2f907123e26b..de193eaf438c 100644
--- a/app-cdr/ccd2iso/files/ccd2iso-0.3-headers.patch
+++ b/app-cdr/ccd2iso/files/ccd2iso-0.3-headers.patch
@@ -1,5 +1,5 @@
---- src/ccd2iso.c.orig	2007-04-01 03:00:14.000000000 -0400
-+++ src/ccd2iso.c	2007-04-01 03:00:57.000000000 -0400
+--- ccd2iso-0.3/src/ccd2iso.c	2007-04-01 03:00:14.000000000 -0400
++++ ccd2iso-0.3/src/ccd2iso.c	2007-04-01 03:00:57.000000000 -0400
 @@ -27,6 +27,7 @@
  
  #include <stdio.h>
diff --git a/app-cdr/ccd2iso/metadata.xml b/app-cdr/ccd2iso/metadata.xml
index aea31f505a53..b983a8ed7b28 100644
--- a/app-cdr/ccd2iso/metadata.xml
+++ b/app-cdr/ccd2iso/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-CloneCD image to ISO image file converter
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">ccd2iso</remote-id>
-	</upstream>
+<maintainer type="person">
+    <email>yegortimoshenko@gmail.com</email>
+    <name>Yegor Timoshenko</name>
+</maintainer>  
+<upstream>
+    <remote-id type="sourceforge">ccd2iso</remote-id>
+</upstream>
 </pkgmetadata>
-- 
cgit v1.2.3