Change best_version() to has_version(), suggested by Ciaran. has_version() doesn't echo anything, so change to testing return codes as we should have in the first place.

(Portage version: 2.1_pre6-r5)

4 files changed, 19 insertions, 13 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index a84bdb475fa1..b2204347e023 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.528 2006/03/26 20:03:49 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.529 2006/04/03 23:13:52 spyderous Exp $
+
+  03 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r6.ebuild, xorg-x11-6.9.0.ebuild:
+  Change best_version() to has_version(), suggested by Ciaran. has_version()
+  doesn't echo anything, so change to testing return codes as we should have
+  in the first place.
 
   26 Mar 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   xorg-x11-7.0-r1.ebuild:
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild
index 8bec3e0e1b5b..db3975169ab1 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild,v 1.8 2006/01/25 09:29:38 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild,v 1.9 2006/04/03 23:13:52 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -383,7 +383,7 @@ cflag_setup() {
 }
 
 check_pam() {
-	if use pam && best_version x11-base/${PN}; then
+	if use pam && has_version x11-base/${PN}; then
 		einfo "Previous ${PN} installation detected."
 		einfo "Enabling PAM features in ${PN}."
 	else
@@ -647,8 +647,8 @@ host_def_setup() {
 
 		# Remove circular dep between pam and X11, bug #35468
 		# If pam is in USE and we have X11, then we can enable PAM
-#		if use pam && [ "$(best_version x11-base/xorg-x11)" ]
-		if [ "$(best_version x11-base/xorg-x11)" ]; then
+#		if use pam && has_version x11-base/xorg-x11
+		if has_version x11-base/xorg-x11; then
 			# If you want to have optional pam support, do it properly ...
 			use_build pam HasPam
 			use_build pam HasPamMisc
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild
index 9743d05b57d8..96548d26e408 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild,v 1.13 2006/02/07 08:33:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild,v 1.14 2006/04/03 23:13:52 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -383,7 +383,7 @@ cflag_setup() {
 }
 
 check_pam() {
-	if use pam && best_version x11-base/${PN}; then
+	if use pam && has_version x11-base/${PN}; then
 		einfo "Previous ${PN} installation detected."
 		einfo "Enabling PAM features in ${PN}."
 	else
@@ -647,8 +647,8 @@ host_def_setup() {
 
 		# Remove circular dep between pam and X11, bug #35468
 		# If pam is in USE and we have X11, then we can enable PAM
-#		if use pam && [ "$(best_version x11-base/xorg-x11)" ]
-		if [ "$(best_version x11-base/xorg-x11)" ]; then
+#		if use pam && has_version x11-base/xorg-x11
+		if has_version x11-base/xorg-x11; then
 			# If you want to have optional pam support, do it properly ...
 			use_build pam HasPam
 			use_build pam HasPamMisc
diff --git a/x11-base/xorg-x11/xorg-x11-6.9.0.ebuild b/x11-base/xorg-x11/xorg-x11-6.9.0.ebuild
index f75a204ae43d..625a4739b81f 100644
--- a/x11-base/xorg-x11/xorg-x11-6.9.0.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.9.0.ebuild,v 1.1 2006/03/20 18:01:33 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.9.0.ebuild,v 1.2 2006/04/03 23:13:52 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -369,7 +369,7 @@ cflag_setup() {
 }
 
 check_pam() {
-	if use pam && best_version x11-base/${PN}; then
+	if use pam && has_version x11-base/${PN}; then
 		einfo "Previous ${PN} installation detected."
 		einfo "Enabling PAM features in ${PN}."
 	else
@@ -617,8 +617,8 @@ host_def_setup() {
 
 		# Remove circular dep between pam and X11, bug #35468
 		# If pam is in USE and we have X11, then we can enable PAM
-#		if use pam && [ "$(best_version x11-base/xorg-x11)" ]
-		if [ "$(best_version x11-base/xorg-x11)" ]; then
+#		if use pam && has_version x11-base/xorg-x11
+		if has_version x11-base/xorg-x11; then
 			# If you want to have optional pam support, do it properly ...
 			use_build pam HasPam
 			use_build pam HasPamMisc