dev-vcs/colorcvs: EAPI bump, bug 605728

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild b/dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
similarity index 73%
rename from dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild
rename to dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
index d3c5b132c2e0e3c2f747a83c05ff4b51574ca734..2f2076b0e8dca9b453f2e5d81199d463f4470956 100644 (file)
--- a/dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild
+++ b/dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
-inherit eutils prefix
+inherit prefix
 
 DESCRIPTION="A tool based on colorgcc to beautify cvs output"
 HOMEPAGE="https://packages.gentoo.org/package/dev-vcs/colorcvs"
@@ -17,21 +17,23 @@ IUSE=""
 DEPEND=""
 RDEPEND="
        dev-lang/perl
-       dev-vcs/cvs"
+       dev-vcs/cvs
+"
 
 src_prepare() {
        # fix typo
        sed -i -e 's:compiler_pid:cvs_pid:' ${PN} || die "sed failed"
-       epatch "${FILESDIR}"/${P}-prefix.patch
+       eapply "${FILESDIR}"/${P}-prefix.patch
        eprefixify colorcvs
+       default
 }
 
 src_install() {
        insinto /etc/profile.d
-       doins "${FILESDIR}/${PN}-profile.sh" || die "doins failed"
+       doins "${FILESDIR}/${PN}-profile.sh"
 
-       dobin colorcvs || die "dobin failed"
-       dodoc colorcvsrc-sample || die "dodoc failed"
+       dobin colorcvs
+       dodoc colorcvsrc-sample
 }
 
 pkg_postinst() {

diff --git a/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch b/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch
index 0a93b49eba0bcae6f3f963e03a039a3117c8dfd7..acc96c42bf651a055a85d515cd7a3249d259a934 100644 (file)
--- a/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch
+++ b/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch
@@ -1,5 +1,5 @@
---- colorcvs.orig      2008-01-26 20:04:54 +0100
-+++ colorcvs   2008-01-26 20:05:56 +0100
+--- a/colorcvs 2008-01-26 20:04:54 +0100
++++ b/colorcvs 2008-01-26 20:05:56 +0100
 @@ -54,7 +54,7 @@
  
  sub initDefaults