From fbcbd9f8d74e7e955fab535359a2eaae739703cc Mon Sep 17 00:00:00 2001 From: Rainer Groesslinger Date: Fri, 3 Dec 2004 16:39:54 +0000 Subject: Custom src_test() to avoid merge problems, bug #73206 --- dev-util/cvs/ChangeLog | 6 +++++- dev-util/cvs/cvs-1.11.17.ebuild | 6 +++++- dev-util/cvs/cvs-1.11.18.ebuild | 6 +++++- dev-util/cvs/cvs-1.12.10.ebuild | 6 +++++- dev-util/cvs/cvs-1.12.9.ebuild | 6 +++++- 5 files changed, 25 insertions(+), 5 deletions(-) (limited to 'dev-util') diff --git a/dev-util/cvs/ChangeLog b/dev-util/cvs/ChangeLog index d104435630c7..76ca53a6733e 100644 --- a/dev-util/cvs/ChangeLog +++ b/dev-util/cvs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/cvs # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.64 2004/11/18 16:41:59 scandium Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.65 2004/12/03 16:39:54 scandium Exp $ + + 03 Dec 2004; Rainer Groesslinger cvs-1.11.17.ebuild, + cvs-1.11.18.ebuild, cvs-1.12.10.ebuild, cvs-1.12.9.ebuild: + Custom src_test() to avoid merge problems, bug #73206 *cvs-1.12.10 (18 Nov 2004) diff --git a/dev-util/cvs/cvs-1.11.17.ebuild b/dev-util/cvs/cvs-1.11.17.ebuild index 7d4f1b1e4c15..f26226780f1d 100644 --- a/dev-util/cvs/cvs-1.11.17.ebuild +++ b/dev-util/cvs/cvs-1.11.17.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.17.ebuild,v 1.14 2004/09/26 14:03:09 scandium Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.17.ebuild,v 1.15 2004/12/03 16:39:54 scandium Exp $ DESCRIPTION="Concurrent Versions System - source code revision control tools" HOMEPAGE="http://www.cvshome.org/" @@ -47,3 +47,7 @@ src_install() { ln -s cvs.html index.html fi } + +src_test() { + einfo "FEATURES=\"maketest\" has been disabled for dev-util/cvs" +} diff --git a/dev-util/cvs/cvs-1.11.18.ebuild b/dev-util/cvs/cvs-1.11.18.ebuild index 216228cc434c..929efafcaea9 100644 --- a/dev-util/cvs/cvs-1.11.18.ebuild +++ b/dev-util/cvs/cvs-1.11.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.18.ebuild,v 1.1 2004/11/12 12:37:29 scandium Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.18.ebuild,v 1.2 2004/12/03 16:39:54 scandium Exp $ DESCRIPTION="Concurrent Versions System - source code revision control tools" HOMEPAGE="http://www.cvshome.org/" @@ -47,3 +47,7 @@ src_install() { ln -s cvs.html index.html fi } + +src_test() { + einfo "FEATURES=\"maketest\" has been disabled for dev-util/cvs" +} diff --git a/dev-util/cvs/cvs-1.12.10.ebuild b/dev-util/cvs/cvs-1.12.10.ebuild index 3bb40e232479..a327072999ee 100644 --- a/dev-util/cvs/cvs-1.12.10.ebuild +++ b/dev-util/cvs/cvs-1.12.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.10.ebuild,v 1.1 2004/11/18 16:41:59 scandium Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.10.ebuild,v 1.2 2004/12/03 16:39:54 scandium Exp $ DESCRIPTION="Concurrent Versions System - source code revision control tools" HOMEPAGE="http://www.cvshome.org/" @@ -61,3 +61,7 @@ src_install() { newins ${FILESDIR}/cvs.pam cvs fi } + +src_test() { + einfo "FEATURES=\"maketest\" has been disabled for dev-util/cvs" +} diff --git a/dev-util/cvs/cvs-1.12.9.ebuild b/dev-util/cvs/cvs-1.12.9.ebuild index 337184356ef6..363fe64b335b 100644 --- a/dev-util/cvs/cvs-1.12.9.ebuild +++ b/dev-util/cvs/cvs-1.12.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.9.ebuild,v 1.2 2004/09/26 14:03:09 scandium Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.9.ebuild,v 1.3 2004/12/03 16:39:54 scandium Exp $ DESCRIPTION="Concurrent Versions System - source code revision control tools" HOMEPAGE="http://www.cvshome.org/" @@ -61,3 +61,7 @@ src_install() { newins ${FILESDIR}/cvs.pam cvs fi } + +src_test() { + einfo "FEATURES=\"maketest\" has been disabled for dev-util/cvs" +} -- cgit v1.2.3-65-gdbad