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.

Package-Manager: portage-2.1_pre6-r5

5 files changed, 31 insertions, 25 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/Manifest b/x11-base/xorg-x11/Manifest
index ff5e3cedd2a0..97abcf1b074b 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,6 +1,6 @@
-MD5 6a74321039a89d69e14bc3dac56c967f ChangeLog 116669
-RMD160 4caa5064114afd44d4cc97f9ed1f3f764e57c647 ChangeLog 116669
-SHA256 4dbbd910c2959f2d09edefd98bb4ed0d1d945eb4c781acef5a8769c9b4d24a4a ChangeLog 116669
+MD5 0272b4493df77f8cb672a6136641fe33 ChangeLog 116974
+RMD160 30183074213872a8206cdac78622256018f6495c ChangeLog 116974
+SHA256 a2cfc7bfd8e1f735dec1af6c95fa54b455895454c15439ed1181f9e019b3bcf8 ChangeLog 116974
 MD5 84ed1084819731e2acef3610f0b6b30a files/digest-xorg-x11-6.8.2-r4 506
 RMD160 15e40bf572842d9b01c60e30f47a19d66344b2fe files/digest-xorg-x11-6.8.2-r4 506
 SHA256 643219bb6d2a6956bf265c678ab16617d74415c1e70efd3b533090ad9ac0e5cb files/digest-xorg-x11-6.8.2-r4 506
@@ -16,15 +16,15 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 RMD160 a293db25b0a2b203eb1b788ee62601190618066e metadata.xml 230
 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0 metadata.xml 230
-MD5 9206b5418f264d47eec155052a7d00ac xorg-x11-6.8.2-r4.ebuild 55079
-RMD160 e527ce298f985567635500e4cc55012b3a4e0637 xorg-x11-6.8.2-r4.ebuild 55079
-SHA256 f7320b781367e5f20e600e8f66b6d6f3252123e425a2d17aa6d14ab4792adf50 xorg-x11-6.8.2-r4.ebuild 55079
-MD5 d54d6498d0e3c468e8d41de1213c2cdd xorg-x11-6.8.2-r6.ebuild 55184
-RMD160 3f164471d6a66b10f2aac3df85d4e6410f73955d xorg-x11-6.8.2-r6.ebuild 55184
-SHA256 8a424c4ea63bf20cf04aab7c79825c6f838205c01fc44da3e245f342833498d9 xorg-x11-6.8.2-r6.ebuild 55184
-MD5 5dbbc23a3cb4a4c1f11fc85e63310bf2 xorg-x11-6.9.0.ebuild 53410
-RMD160 f3de09a4e72137aa89e9df9029495ce05efcbb0e xorg-x11-6.9.0.ebuild 53410
-SHA256 e60de8f0476aaffef4d44416595b815d2001e933b8d8857a30f58c792bca41cb xorg-x11-6.9.0.ebuild 53410
+MD5 692ef080f66bba581a5ceaada0b1873e xorg-x11-6.8.2-r4.ebuild 55058
+RMD160 643f2c56b649ad335734ecf36dbd80fefada6963 xorg-x11-6.8.2-r4.ebuild 55058
+SHA256 0e07db1b48a14b4173b8aa733d01c6812540721b862b2c157d928d687450ed36 xorg-x11-6.8.2-r4.ebuild 55058
+MD5 3f3680c4b694f41f21c540714ac872f6 xorg-x11-6.8.2-r6.ebuild 55164
+RMD160 5c135ae5f7aaa7a0d1e13bb551cb4be9208d499c xorg-x11-6.8.2-r6.ebuild 55164
+SHA256 53cbadc7fc4be6659882d887acf0a0a807e448b46a783f648fc7a5d6dea2f61e xorg-x11-6.8.2-r6.ebuild 55164
+MD5 5dbc431fe49036c6e75295e858dbbdc5 xorg-x11-6.9.0.ebuild 53389
+RMD160 1c9034051490f125fce76bdda274fd1668c30f0b xorg-x11-6.9.0.ebuild 53389
+SHA256 2d6d605d683d0b53f6b9b53a2edbb25f41c9ff0996ae93566368b896d44eed49 xorg-x11-6.9.0.ebuild 53389
 MD5 ccb5c8106dc0a6f39e7e3839fe0d9261 xorg-x11-7.0-r1.ebuild 17073
 RMD160 c842eaa81157c5a17bfb16574de5806a21a83ce9 xorg-x11-7.0-r1.ebuild 17073
 SHA256 472a3cc7358ae391c655c58e02dc6bf3f921b4b8bc66177e9ac09f174e2136a9 xorg-x11-7.0-r1.ebuild 17073
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