[gentoo-commits] repo/gentoo:master commit in: dev-vcs/colorcvs/files/, dev-vcs/colorcvs/

[Andreas Hüttel]

commit:     1cfda215b58da4085361c01aeecec795312ec0f6
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  1 16:40:09 2018 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jan  1 16:40:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cfda215

dev-vcs/colorcvs: EAPI bump, bug 605728

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../{colorcvs-1.4-r1.ebuild => colorcvs-1.4-r2.ebuild} | 18 ++++++++++--------
 dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch       |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

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 d3c5b132c2e..2f2076b0e8d 100644
--- 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 0a93b49eba0..acc96c42bf6 100644
--- 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