Custom src_test() to avoid merge problems, bug #73206

6 files changed, 33 insertions, 13 deletions

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 <scandium@gentoo.org> 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/Manifest b/dev-util/cvs/Manifest
index fed30867f9c6..03656a05930c 100644
--- a/dev-util/cvs/Manifest
+++ b/dev-util/cvs/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 504c9e3b8e1f1954011a8bf4c60afcbd cvs-1.11.17.ebuild 1452
-MD5 ba105ed13c155fb8af43d186a8f6dc7a ChangeLog 7554
-MD5 07b85aa8946986c37680452c44a15b9d cvs-1.12.10.ebuild 1734
+MD5 f42245d74e6ad4a0ba5cebf5c5bc8c8a cvs-1.11.17.ebuild 1534
+MD5 a1c457dc6564f3a55d71b328867a301b ChangeLog 7749
+MD5 52cd05cf6ac8e51e83db35e4adff1c55 cvs-1.12.10.ebuild 1816
 MD5 7164d2a546785fee1e77dac8839fdeaa metadata.xml 224
-MD5 7ced58e9dc8f176ef77352525d087d9c cvs-1.11.18.ebuild 1462
-MD5 b12535f3928b2d75f71695e07bdaada0 cvs-1.12.9.ebuild 1733
+MD5 6b4d385f0bfcbea4e6d4370bfc53b812 cvs-1.11.18.ebuild 1544
+MD5 defc46ea8970a99ae567789a8924571f cvs-1.12.9.ebuild 1815
 MD5 2d50778e9aededb1c08b84c8e8b62ad3 files/cvs.pam 124
 MD5 cc3afaf974475188ce0d80b0b919f611 files/digest-cvs-1.12.9 272
 MD5 a156ed2cb03477a919f3a5faa80cb2a4 files/cvspserver.xinetd.d 282
@@ -16,7 +16,7 @@ MD5 b20f44a825bed58f0e28635b827cb7fd files/digest-cvs-1.12.10 276
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBnND6PgS8WLD64cERAgCiAJ0Uc2x1AM6uB8Y9ux8VBNlQWAWITQCfXpbX
-q1nt32pTqzgfBtQ1cDxG0HY=
-=XVJC
+iD8DBQFBsJbkPgS8WLD64cERAoylAJ4hH6RCKV5f+UG0a3GLUc17uNQWGwCfZzHo
+arhvCzAlGtrGxLAr88fwJ0g=
+=/7MV
 -----END PGP SIGNATURE-----
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"
+}