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

[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

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

[David Seifert]

commit:     80998b23c25c7ab7d3ad35fd19602520dc893936
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 16:02:22 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun May 14 16:02:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80998b23

dev-vcs/colorcvs: update EAPI 6 -> 8

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...lorcvs-1.4-r2.ebuild => colorcvs-1.4-r3.ebuild} | 24 ++++++++--------------
 dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch   | 13 ++++++++++--
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild b/dev-vcs/colorcvs/colorcvs-1.4-r3.ebuild
similarity index 73%
rename from dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
rename to dev-vcs/colorcvs/colorcvs-1.4-r3.ebuild
index d9d92a12f434..fa9ca9c7b14a 100644
--- a/dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
+++ b/dev-vcs/colorcvs/colorcvs-1.4-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit prefix
 
@@ -12,34 +12,28 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-DEPEND=""
 RDEPEND="
 	dev-lang/perl
-	dev-vcs/cvs
-"
+	dev-vcs/cvs"
+
+PATCHES=( "${FILESDIR}"/${P}-prefix.patch )
 
 src_prepare() {
-	# fix typo
-	sed -i -e 's:compiler_pid:cvs_pid:' ${PN} || die "sed failed"
-	eapply "${FILESDIR}"/${P}-prefix.patch
-	eprefixify colorcvs
 	default
+	eprefixify colorcvs
 }
 
 src_install() {
-	insinto /etc/profile.d
-	doins "${FILESDIR}/${PN}-profile.sh"
-
 	dobin colorcvs
 	dodoc colorcvsrc-sample
+
+	insinto /etc/profile.d
+	doins "${FILESDIR}"/colorcvs-profile.sh
 }
 
 pkg_postinst() {
-	echo
 	einfo "An alias to colorcvs was installed for the cvs command."
 	einfo "In order to immediately activate it do:"
 	einfo "\tsource /etc/profile"
-	echo
 }

diff --git a/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch b/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch
index acc96c42bf65..ab9e35038aa1 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 @@
---- a/colorcvs	2008-01-26 20:04:54 +0100
-+++ b/colorcvs	2008-01-26 20:05:56 +0100
+--- a/colorcvs
++++ b/colorcvs
 @@ -54,7 +54,7 @@
  
  sub initDefaults
@@ -18,3 +18,12 @@
  	if (-f $configFile)
  	{
  		loadPreferences($configFile);
+@@ -176,7 +176,7 @@
+ }
+ 
+ # Get the return code of the compiler and exit with that.
+-waitpid($compiler_pid, 0);
++waitpid($cvs_pid, 0);
+ exit ($? >> 8);
+ 
+ # arch-tag: colorcvs