Convert "has test $FEATURES" to "use test", and replace old src_test blocking with RESTRICT=test.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

12 files changed, 31 insertions, 41 deletions

diff --git a/dev-vcs/cvs/ChangeLog b/dev-vcs/cvs/ChangeLog
index 0104fd11370d..e8a4760c823c 100644
--- a/dev-vcs/cvs/ChangeLog
+++ b/dev-vcs/cvs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-vcs/cvs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/ChangeLog,v 1.18 2014/05/13 20:06:35 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/ChangeLog,v 1.19 2014/05/14 00:17:49 robbat2 Exp $
+
+  14 May 2014; Robin H. Johnson <robbat2@gentoo.org> cvs-1.11.23.ebuild,
+  cvs-1.12.12-r10.ebuild, cvs-1.12.12-r6.ebuild, cvs-1.12.12-r7.ebuild,
+  cvs-1.12.12-r8.ebuild, cvs-1.12.12-r9.ebuild, cvs-1.12.13-r1.ebuild,
+  cvs-1.12.13-r2.ebuild, cvs-1.12.13.1-r1.ebuild, cvs-1.12.13.1-r2.ebuild,
+  cvs-1.12.13.1.ebuild:
+  Convert "has test $FEATURES" to "use test", and replace old src_test blocking
+  with RESTRICT=test.
 
   13 May 2014; Mikle Kolyada <zlogene@gentoo.org> cvs-1.12.12-r10.ebuild:
   x86 stable wrt byg #506080
diff --git a/dev-vcs/cvs/cvs-1.11.23.ebuild b/dev-vcs/cvs/cvs-1.11.23.ebuild
index a78370c92ef5..b654211afad1 100644
--- a/dev-vcs/cvs/cvs-1.11.23.ebuild
+++ b/dev-vcs/cvs/cvs-1.11.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.11.23.ebuild,v 1.5 2014/05/13 19:26:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.11.23.ebuild,v 1.6 2014/05/14 00:17:49 robbat2 Exp $
 
 EAPI=3
 
@@ -18,6 +18,7 @@ SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 KEYWORDS="~arm64 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs"
+RESTRICT='test'
 
 DEPEND=">=sys-libs/zlib-1.1.4"
 
@@ -59,7 +60,3 @@ src_install() {
 		ln -s cvs.html index.html
 	fi
 }
-
-src_test() {
-	einfo "FEATURES=\"test\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r10.ebuild b/dev-vcs/cvs/cvs-1.12.12-r10.ebuild
index 3dfb8b4e2e6b..247aeffc18d8 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r10.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r10.ebuild,v 1.7 2014/05/13 20:06:35 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r10.ebuild,v 1.8 2014/05/14 00:17:49 robbat2 Exp $
 
 EAPI=3
 
@@ -19,6 +19,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
+RESTRICT='test'
 
 DEPEND=">=sys-libs/zlib-1.1.4
 	kerberos? ( virtual/krb5 )
@@ -87,7 +88,3 @@ src_install() {
 
 	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
 }
-
-src_test() {
-	einfo "FEATURES=\"test\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r6.ebuild b/dev-vcs/cvs/cvs-1.12.12-r6.ebuild
index 7ffe6634af18..2aa6923309c0 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r6.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r6.ebuild,v 1.5 2014/05/13 19:26:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r6.ebuild,v 1.6 2014/05/14 00:17:49 robbat2 Exp $
 
 inherit eutils pam toolchain-funcs
 
@@ -17,6 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 
 IUSE="crypt doc kerberos nls pam server"
+RESTRICT='test'
 
 DEPEND=">=sys-libs/zlib-1.1.4
 	kerberos? ( virtual/krb5 )
@@ -79,7 +80,3 @@ src_install() {
 
 	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
 }
-
-src_test() {
-	einfo "FEATURES=\"test\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r7.ebuild b/dev-vcs/cvs/cvs-1.12.12-r7.ebuild
index 49d175794183..12d62b397b6d 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r7.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r7.ebuild,v 1.4 2014/05/13 19:26:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r7.ebuild,v 1.5 2014/05/14 00:17:49 robbat2 Exp $
 
 EAPI=3
 
@@ -19,6 +19,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
+RESTRICT='test'
 
 DEPEND=">=sys-libs/zlib-1.1.4
 	kerberos? ( virtual/krb5 )
@@ -80,7 +81,3 @@ src_install() {
 
 	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
 }
-
-src_test() {
-	einfo "FEATURES=\"test\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r8.ebuild b/dev-vcs/cvs/cvs-1.12.12-r8.ebuild
index a50615525b9f..cfb11c7c7588 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r8.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r8.ebuild,v 1.4 2014/05/13 19:26:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r8.ebuild,v 1.5 2014/05/14 00:17:49 robbat2 Exp $
 
 EAPI=3
 
@@ -19,6 +19,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
+RESTRICT='test'
 
 DEPEND=">=sys-libs/zlib-1.1.4
 	kerberos? ( virtual/krb5 )
@@ -81,7 +82,3 @@ src_install() {
 
 	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
 }
-
-src_test() {
-	einfo "FEATURES=\"test\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r9.ebuild b/dev-vcs/cvs/cvs-1.12.12-r9.ebuild
index face8ccdc2c8..c819c0205061 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r9.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r9.ebuild,v 1.6 2014/05/13 19:26:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r9.ebuild,v 1.7 2014/05/14 00:17:49 robbat2 Exp $
 
 EAPI=3
 
@@ -19,6 +19,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
+RESTRICT='test'
 
 DEPEND=">=sys-libs/zlib-1.1.4
 	kerberos? ( virtual/krb5 )
@@ -86,7 +87,3 @@ src_install() {
 
 	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
 }
-
-src_test() {
-	einfo "FEATURES=\"test\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/cvs-1.12.13-r1.ebuild b/dev-vcs/cvs/cvs-1.12.13-r1.ebuild
index 86f97e292177..0e84457c09d7 100644
--- a/dev-vcs/cvs/cvs-1.12.13-r1.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13-r1.ebuild,v 1.3 2014/01/19 10:30:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13-r1.ebuild,v 1.4 2014/05/14 00:17:49 robbat2 Exp $
 
 EAPI=3
 
@@ -45,7 +45,7 @@ src_prepare() {
 src_configure() {
 	local myconf
 	# the tests need the server and proxy
-	if has test $FEATURES; then
+	if use test; then
 		use server || \
 		ewarn "The server and proxy code are enabled as they are required for tests."
 		myconf="--enable-server --enable-proxy"
diff --git a/dev-vcs/cvs/cvs-1.12.13-r2.ebuild b/dev-vcs/cvs/cvs-1.12.13-r2.ebuild
index 54820a012219..8cf0af6ea010 100644
--- a/dev-vcs/cvs/cvs-1.12.13-r2.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13-r2.ebuild,v 1.3 2014/01/19 10:30:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13-r2.ebuild,v 1.4 2014/05/14 00:17:49 robbat2 Exp $
 
 EAPI=3
 
@@ -46,7 +46,7 @@ src_prepare() {
 src_configure() {
 	local myconf
 	# the tests need the server and proxy
-	if has test $FEATURES; then
+	if use test; then
 		use server || \
 		ewarn "The server and proxy code are enabled as they are required for tests."
 		myconf="--enable-server --enable-proxy"
diff --git a/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild b/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild
index 937bf67cce16..68c7bccf3ce2 100644
--- a/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild,v 1.4 2014/01/19 10:30:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild,v 1.5 2014/05/14 00:17:49 robbat2 Exp $
 
 EAPI=3
 
@@ -64,7 +64,7 @@ src_prepare() {
 src_configure() {
 	local myconf
 	# the tests need the server and proxy
-	if has test $FEATURES; then
+	if use test; then
 		use server || \
 		ewarn "The server and proxy code are enabled as they are required for tests."
 		myconf="--enable-server --enable-proxy"
diff --git a/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild b/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild
index 6d1e7c7de25b..b20393dcf540 100644
--- a/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild,v 1.4 2014/01/30 15:25:23 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild,v 1.5 2014/05/14 00:17:49 robbat2 Exp $
 
 EAPI=3
 
@@ -65,7 +65,7 @@ src_prepare() {
 src_configure() {
 	local myconf
 	# the tests need the server and proxy
-	if has test $FEATURES; then
+	if use test; then
 		use server || \
 		ewarn "The server and proxy code are enabled as they are required for tests."
 		myconf="--enable-server --enable-proxy"
diff --git a/dev-vcs/cvs/cvs-1.12.13.1.ebuild b/dev-vcs/cvs/cvs-1.12.13.1.ebuild
index f5b7e37bdb8d..7a959d95cad7 100644
--- a/dev-vcs/cvs/cvs-1.12.13.1.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13.1.ebuild,v 1.3 2014/01/19 10:30:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13.1.ebuild,v 1.4 2014/05/14 00:17:49 robbat2 Exp $
 
 EAPI=3
 
@@ -61,7 +61,7 @@ src_prepare() {
 src_configure() {
 	local myconf
 	# the tests need the server and proxy
-	if has test $FEATURES; then
+	if use test; then
 		use server || \
 		ewarn "The server and proxy code are enabled as they are required for tests."
 		myconf="--enable-server --enable-proxy"