(#199282) Use has_version instead of best_version to make sure we detect xorg-server installation correctly (Jakub Moc).

Package-Manager: portage-2.1.3.19

4 files changed, 25 insertions, 20 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 147a8209a2c5..24151693cf88 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.165 2007/11/14 06:18:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.166 2007/11/16 18:16:30 dberkholz Exp $
+
+  16 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>; mesa-7.0.1.ebuild,
+  mesa-7.0.2.ebuild:
+  (#199282) Use has_version instead of best_version to make sure we detect
+  xorg-server installation correctly (Jakub Moc).
 
   14 Nov 2007; Zac Medico <zmedico@gentoo.org> mesa-6.5.2-r1.ebuild,
   mesa-7.0.1.ebuild, mesa-7.0.2.ebuild:
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 3e56e09d2d29..e10ebe639da0 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -24,18 +24,18 @@ EBUILD mesa-6.5.2-r1.ebuild 9090 RMD160 e625707b6acda5455b26fc7d237227ad619ac023
 MD5 10dcb97acb9e2efa00d38df8af358525 mesa-6.5.2-r1.ebuild 9090
 RMD160 e625707b6acda5455b26fc7d237227ad619ac023 mesa-6.5.2-r1.ebuild 9090
 SHA256 e093c6c6a45f9608d2a85be26d8fbf0b9c3d3afdbe7ca5c369099fbdef2fe351 mesa-6.5.2-r1.ebuild 9090
-EBUILD mesa-7.0.1.ebuild 9736 RMD160 899f45d11cb3227c271a7a02aff3dc58293656fe SHA1 44c60a87bddf211304c944f25cb3c64961020064 SHA256 f00180fcd97e33731a1d4d81ee5e626e26ca7f7213856dbe94b103a04fae7ed0
-MD5 202bc8585a2230f737c964255c42e826 mesa-7.0.1.ebuild 9736
-RMD160 899f45d11cb3227c271a7a02aff3dc58293656fe mesa-7.0.1.ebuild 9736
-SHA256 f00180fcd97e33731a1d4d81ee5e626e26ca7f7213856dbe94b103a04fae7ed0 mesa-7.0.1.ebuild 9736
-EBUILD mesa-7.0.2.ebuild 9948 RMD160 4e6f498a7ac6abf986fe36b07aae44b79bc66ff5 SHA1 f45ce750bdc1f44f7f1c0bd16e2b65530648365f SHA256 91a707e57a8815cb0ad11c61e762b6e9b300d108e3c41c99964bcce18221488a
-MD5 56f6977fc6099ca7ebc06a6b964a39cf mesa-7.0.2.ebuild 9948
-RMD160 4e6f498a7ac6abf986fe36b07aae44b79bc66ff5 mesa-7.0.2.ebuild 9948
-SHA256 91a707e57a8815cb0ad11c61e762b6e9b300d108e3c41c99964bcce18221488a mesa-7.0.2.ebuild 9948
-MISC ChangeLog 30887 RMD160 b6c05022f3e182ee8eb2a009c7909b949cf9a190 SHA1 c4576ccce6bef61964e88fb80e3b4234da3b108a SHA256 1a739868c4435cd36364dd29719c5fd1363dc509126f526102a0b2557a9cfbbf
-MD5 65a167dee364e89b1f836d5bb1776780 ChangeLog 30887
-RMD160 b6c05022f3e182ee8eb2a009c7909b949cf9a190 ChangeLog 30887
-SHA256 1a739868c4435cd36364dd29719c5fd1363dc509126f526102a0b2557a9cfbbf ChangeLog 30887
+EBUILD mesa-7.0.1.ebuild 9737 RMD160 867e01c21ded73b0751d5e80e2363caf4da636b5 SHA1 50a05a13827f20d7c7d67c79e13aeaacfabbca7b SHA256 91f4cee656f07ff81332238f09bb4f3767e98275528e1ba8dd5133445926d001
+MD5 21d109ff34a7353d36d1f50a7819d75a mesa-7.0.1.ebuild 9737
+RMD160 867e01c21ded73b0751d5e80e2363caf4da636b5 mesa-7.0.1.ebuild 9737
+SHA256 91f4cee656f07ff81332238f09bb4f3767e98275528e1ba8dd5133445926d001 mesa-7.0.1.ebuild 9737
+EBUILD mesa-7.0.2.ebuild 9949 RMD160 b1f3160a99372db459d7fb178cf2dc5760920ceb SHA1 8f08837f5a3524b93743a020957522048869e350 SHA256 fe06d16a513ac9bf8ddac27a3d871ee0251ac4634b9e9737aaabe5df13f0124d
+MD5 dbabea309060666e781d0af6c37684e5 mesa-7.0.2.ebuild 9949
+RMD160 b1f3160a99372db459d7fb178cf2dc5760920ceb mesa-7.0.2.ebuild 9949
+SHA256 fe06d16a513ac9bf8ddac27a3d871ee0251ac4634b9e9737aaabe5df13f0124d mesa-7.0.2.ebuild 9949
+MISC ChangeLog 31110 RMD160 8e0525faab0129038e82cf294f983ecfe8d0f6d4 SHA1 9a0dc230eaeec65ae9273f600682cad3d701f21b SHA256 01c9eb0155d560fefd481147177662f69d659d9f1c7486fc7eb4db62475f8246
+MD5 e25632fd08b2db0b697713f91b2711a4 ChangeLog 31110
+RMD160 8e0525faab0129038e82cf294f983ecfe8d0f6d4 ChangeLog 31110
+SHA256 01c9eb0155d560fefd481147177662f69d659d9f1c7486fc7eb4db62475f8246 ChangeLog 31110
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -52,7 +52,7 @@ SHA256 7ac631b09304f1ee9a9a19227fba7fdbcc223c8b07a564b7c00fc042b84df777 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHOpNc/ejvha5XGaMRAjV3AKDTtzMAr+XK/GcXhOoGlhcjKQUkBACZAXrm
-7yOsA+SPGnKLPQyoaCX4VKg=
-=eQWN
+iD8DBQFHPd6EXVaO67S1rtsRApuPAJ9RwG+xya3UwTJfjC7D15XYLhYpmwCgkdBY
+5Y9e+8jA+7bCq/XIA9fGVa0=
+=dhl7
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-7.0.1.ebuild b/media-libs/mesa/mesa-7.0.1.ebuild
index 8cd5c77aae0a..546b2b66addf 100644
--- a/media-libs/mesa/mesa-7.0.1.ebuild
+++ b/media-libs/mesa/mesa-7.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.0.1.ebuild,v 1.6 2007/11/14 06:18:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.0.1.ebuild,v 1.7 2007/11/16 18:16:30 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability versionator
 
@@ -262,7 +262,7 @@ pkg_postinst() {
 
 	# We need the outer check, because xorg-server may not be installed
 	# first, and built_with_use() dies if the package isn't installed.
-	if best_version x11-base/xorg-server; then
+	if has_version x11-base/xorg-server; then
 		if built_with_use x11-base/xorg-server nptl; then
 			ewarn "Rebuild x11-base/xorg-server without USE=nptl"
 			ewarn "or AIGLX (compiz, etc.) will not work."
diff --git a/media-libs/mesa/mesa-7.0.2.ebuild b/media-libs/mesa/mesa-7.0.2.ebuild
index cd1caccf398c..35fe2edb84c0 100644
--- a/media-libs/mesa/mesa-7.0.2.ebuild
+++ b/media-libs/mesa/mesa-7.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.0.2.ebuild,v 1.5 2007/11/14 06:18:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.0.2.ebuild,v 1.6 2007/11/16 18:16:30 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability versionator
 
@@ -266,7 +266,7 @@ pkg_postinst() {
 
 	# We need the outer check, because xorg-server may not be installed
 	# first, and built_with_use() dies if the package isn't installed.
-	if best_version x11-base/xorg-server; then
+	if has_version x11-base/xorg-server; then
 		if built_with_use x11-base/xorg-server nptl; then
 			ewarn "Rebuild x11-base/xorg-server without USE=nptl"
 			ewarn "or AIGLX (compiz, etc.) will not work."