app-cdr/ccd2iso: EAPI="6", correct LICENSE, epatch -> eapply, Mac

Closes: https://github.com/gentoo/gentoo/pull/4665

diff --git a/app-cdr/ccd2iso/ccd2iso-0.3.ebuild b/app-cdr/ccd2iso/ccd2iso-0.3.ebuild
index 5de87f72e89a861d4b0fae5b497f2f45d811199a..5de8728f6ab25e5fd4caf2a6604958bda5be08a2 100644 (file)
--- 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 2f907123e26bb44a3f2fdc95ca6f17ba4af9af8d..de193eaf438c8c93600b00d6a569c65bee16a3e3 100644 (file)
--- 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 aea31f505a53959a7bec9f637c52595c0c4c0680..b983a8ed7b2864684a9fb2adf1bbc0a48a2e2719 100644 (file)
--- 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>