Alphabetize drivers in the other ebuilds as well, for easier application of other patches.

(Portage version: 2.1_pre7-r5)

4 files changed, 21 insertions, 16 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 2c379b0224c3..60855474993c 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.82 2006/04/16 20:02:31 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.83 2006/04/16 20:10:52 spyderous Exp $
+
+  16 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.4.2-r2.ebuild,
+  mesa-6.5.ebuild, mesa-6.5-r1.ebuild:
+  Alphabetize drivers in the other ebuilds as well, for easier application of
+  other patches.
 
   16 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.5-r2.ebuild:
   Append -fno-strict-aliasing, many drivers have issues.
diff --git a/media-libs/mesa/mesa-6.4.2-r2.ebuild b/media-libs/mesa/mesa-6.4.2-r2.ebuild
index 9d67524e2f6f..d6697a05a6dd 100644
--- a/media-libs/mesa/mesa-6.4.2-r2.ebuild
+++ b/media-libs/mesa/mesa-6.4.2-r2.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/media-libs/mesa/mesa-6.4.2-r2.ebuild,v 1.5 2006/04/08 21:57:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.2-r2.ebuild,v 1.6 2006/04/16 20:10:52 spyderous Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -17,13 +17,13 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE_VIDEO_CARDS="
 	video_cards_ati
-	video_cards_sunffb
 	video_cards_i810
 	video_cards_mga
 	video_cards_none
 	video_cards_s3virge
 	video_cards_savage
 	video_cards_sis
+	video_cards_sunffb
 	video_cards_tdfx
 	video_cards_trident
 	video_cards_via"
@@ -117,9 +117,6 @@ src_unpack() {
 	if use video_cards_ati; then
 		add_drivers mach64 r128 radeon r200 r300
 	fi
-	if use video_cards_sunffb; then
-		add_drivers ffb
-	fi
 	if use video_cards_i810; then
 		add_drivers i810 i830 i915
 	fi
@@ -135,6 +132,9 @@ src_unpack() {
 	if use video_cards_sis; then
 		add_drivers sis
 	fi
+	if use video_cards_sunffb; then
+		add_drivers ffb
+	fi
 	if use video_cards_tdfx; then
 		add_drivers tdfx
 	fi
diff --git a/media-libs/mesa/mesa-6.5-r1.ebuild b/media-libs/mesa/mesa-6.5-r1.ebuild
index cc6cd9972ec8..206fa9635dd9 100644
--- a/media-libs/mesa/mesa-6.5-r1.ebuild
+++ b/media-libs/mesa/mesa-6.5-r1.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/media-libs/mesa/mesa-6.5-r1.ebuild,v 1.1 2006/04/12 02:49:02 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r1.ebuild,v 1.2 2006/04/16 20:10:52 spyderous Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -17,13 +17,13 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE_VIDEO_CARDS="
 	video_cards_ati
-	video_cards_sunffb
 	video_cards_i810
 	video_cards_mga
 	video_cards_none
 	video_cards_s3virge
 	video_cards_savage
 	video_cards_sis
+	video_cards_sunffb
 	video_cards_tdfx
 	video_cards_trident
 	video_cards_via"
@@ -112,9 +112,6 @@ src_unpack() {
 	if use video_cards_ati; then
 		add_drivers mach64 r128 radeon r200 r300
 	fi
-	if use video_cards_sunffb; then
-		add_drivers ffb
-	fi
 	if use video_cards_i810; then
 		add_drivers i810 i915
 	fi
@@ -130,6 +127,9 @@ src_unpack() {
 	if use video_cards_sis; then
 		add_drivers sis
 	fi
+	if use video_cards_sunffb; then
+		add_drivers ffb
+	fi
 	if use video_cards_tdfx; then
 		add_drivers tdfx
 	fi
diff --git a/media-libs/mesa/mesa-6.5.ebuild b/media-libs/mesa/mesa-6.5.ebuild
index 62df839bbdd9..d526507d3965 100644
--- a/media-libs/mesa/mesa-6.5.ebuild
+++ b/media-libs/mesa/mesa-6.5.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/media-libs/mesa/mesa-6.5.ebuild,v 1.5 2006/04/08 21:57:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.ebuild,v 1.6 2006/04/16 20:10:52 spyderous Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -17,13 +17,13 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE_VIDEO_CARDS="
 	video_cards_ati
-	video_cards_sunffb
 	video_cards_i810
 	video_cards_mga
 	video_cards_none
 	video_cards_s3virge
 	video_cards_savage
 	video_cards_sis
+	video_cards_sunffb
 	video_cards_tdfx
 	video_cards_trident
 	video_cards_via"
@@ -111,9 +111,6 @@ src_unpack() {
 	if use video_cards_ati; then
 		add_drivers mach64 r128 radeon r200 r300
 	fi
-	if use video_cards_sunffb; then
-		add_drivers ffb
-	fi
 	if use video_cards_i810; then
 		add_drivers i810 i915
 	fi
@@ -129,6 +126,9 @@ src_unpack() {
 	if use video_cards_sis; then
 		add_drivers sis
 	fi
+	if use video_cards_sunffb; then
+		add_drivers ffb
+	fi
 	if use video_cards_tdfx; then
 		add_drivers tdfx
 	fi