app-text/csvfix: update to EAPI 6

diff --git a/app-text/csvfix/csvfix-1.6.ebuild b/app-text/csvfix/csvfix-1.6.ebuild
index 50b599f4355b00c25d9f51a47debc0746b80e792..e79e239ef7de04a35039828ed49fef38c4575d4b 100644 (file)
--- a/app-text/csvfix/csvfix-1.6.ebuild
+++ b/app-text/csvfix/csvfix-1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils toolchain-funcs versionator vcs-snapshot
+inherit toolchain-funcs versionator vcs-snapshot
 
 MY_PV="$(delete_all_version_separators)"
 DESCRIPTION="A stream editor for manipulating CSV files"
@@ -20,10 +20,13 @@ RDEPEND="dev-libs/expat"
 DEPEND="${RDEPEND}
        doc? ( app-arch/unzip )"
 
-src_prepare() {
-       epatch "${FILESDIR}"/${P}-makefile.patch
-       epatch "${FILESDIR}"/${PN}-1.10a-tests.patch
+PATCHES=(
+       "${FILESDIR}"/${P}-makefile.patch
+       "${FILESDIR}"/${PN}-1.10a-tests.patch
+)
 
+src_prepare() {
+       default
        edos2unix $(find csvfix/tests -type f)
 }
 
@@ -39,5 +42,8 @@ src_test() {
 
 src_install() {
        dobin csvfix/bin/csvfix
-       use doc && dohtml -r "${WORKDIR}"/${PN}${MY_PV}/*
+       if use doc; then
+               docinto html
+               dodoc -r "${WORKDIR}"/${PN}${MY_PV}/*
+       fi
 }

diff --git a/app-text/csvfix/metadata.xml b/app-text/csvfix/metadata.xml
index 85df0b57fb4f178bd9de7bfa70317cf3b5c6b039..8aaa5d2f6787dc297bc02b7722ea1daad7360683 100644 (file)
--- a/app-text/csvfix/metadata.xml
+++ b/app-text/csvfix/metadata.xml
@@ -6,7 +6,6 @@
     <name>Tim Harder</name>
   </maintainer>
   <upstream>
-    <remote-id type="google-code">csvfix</remote-id>
     <remote-id type="bitbucket">neilb/csvfix</remote-id>
   </upstream>
 </pkgmetadata>