Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/colorcvs/files/, dev-vcs/colorcvs/
Date: Mon, 01 Jan 2018 16:40:28
Message-Id: 1514824809.1cfda215b58da4085361c01aeecec795312ec0f6.dilfridge@gentoo
1 commit: 1cfda215b58da4085361c01aeecec795312ec0f6
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 1 16:40:09 2018 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 1 16:40:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cfda215
7
8 dev-vcs/colorcvs: EAPI bump, bug 605728
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 .../{colorcvs-1.4-r1.ebuild => colorcvs-1.4-r2.ebuild} | 18 ++++++++++--------
13 dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch | 4 ++--
14 2 files changed, 12 insertions(+), 10 deletions(-)
15
16 diff --git a/dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild b/dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
17 similarity index 73%
18 rename from dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild
19 rename to dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
20 index d3c5b132c2e..2f2076b0e8d 100644
21 --- a/dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild
22 +++ b/dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
23 @@ -1,9 +1,9 @@
24 -# Copyright 1999-2017 Gentoo Foundation
25 +# Copyright 1999-2018 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27
28 -EAPI=3
29 +EAPI=6
30
31 -inherit eutils prefix
32 +inherit prefix
33
34 DESCRIPTION="A tool based on colorgcc to beautify cvs output"
35 HOMEPAGE="https://packages.gentoo.org/package/dev-vcs/colorcvs"
36 @@ -17,21 +17,23 @@ IUSE=""
37 DEPEND=""
38 RDEPEND="
39 dev-lang/perl
40 - dev-vcs/cvs"
41 + dev-vcs/cvs
42 +"
43
44 src_prepare() {
45 # fix typo
46 sed -i -e 's:compiler_pid:cvs_pid:' ${PN} || die "sed failed"
47 - epatch "${FILESDIR}"/${P}-prefix.patch
48 + eapply "${FILESDIR}"/${P}-prefix.patch
49 eprefixify colorcvs
50 + default
51 }
52
53 src_install() {
54 insinto /etc/profile.d
55 - doins "${FILESDIR}/${PN}-profile.sh" || die "doins failed"
56 + doins "${FILESDIR}/${PN}-profile.sh"
57
58 - dobin colorcvs || die "dobin failed"
59 - dodoc colorcvsrc-sample || die "dodoc failed"
60 + dobin colorcvs
61 + dodoc colorcvsrc-sample
62 }
63
64 pkg_postinst() {
65
66 diff --git a/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch b/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch
67 index 0a93b49eba0..acc96c42bf6 100644
68 --- a/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch
69 +++ b/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch
70 @@ -1,5 +1,5 @@
71 ---- colorcvs.orig 2008-01-26 20:04:54 +0100
72 -+++ colorcvs 2008-01-26 20:05:56 +0100
73 +--- a/colorcvs 2008-01-26 20:04:54 +0100
74 ++++ b/colorcvs 2008-01-26 20:05:56 +0100
75 @@ -54,7 +54,7 @@
76
77 sub initDefaults