Add support for USE_ORDER

(Portage version: 2.1_pre3-r1)

5 files changed, 60 insertions, 11 deletions

diff --git a/app-portage/ufed/ChangeLog b/app-portage/ufed/ChangeLog
index 1f7c9c763f15..772ac0c37682 100644
--- a/app-portage/ufed/ChangeLog
+++ b/app-portage/ufed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-portage/ufed
-# Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.31 2005/11/26 16:30:59 truedfx Exp $
+# Copyright 2003-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.32 2006/01/24 19:17:13 truedfx Exp $
+
+*ufed-0.40-r1 (24 Jan 2006)
+
+  24 Jan 2006; Harald van Dijk <truedfx@gentoo.org>
+  +files/ufed-0.40-useorder.patch, -ufed-0.40.ebuild, +ufed-0.40-r1.ebuild:
+  Add support for USE_ORDER
 
 *ufed-0.40 (26 Nov 2005)
 
diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
index 145f65c20d6f..433d6b95ba5b 100644
--- a/app-portage/ufed/Manifest
+++ b/app-portage/ufed/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA1
 
 MD5 7bf2728eda8303810cd8bb92ee8e65f5 ChangeLog 4730
-MD5 4c94b074dd20cd29d231b0bf50bea06c files/digest-ufed-0.36 61
-MD5 773221c03c705b595a0aa42d003532ab files/digest-ufed-0.39 61
-MD5 b67e3c8b2f81a167ba48470321e02a14 files/digest-ufed-0.40 61
 MD5 5ccf37e59ee3f6c65bd263050cf2d85e metadata.xml 265
 MD5 e0b0654bdb84c335b99618eb130b606f ufed-0.36.ebuild 661
 MD5 b5afc70abeaaee4f62f36a700488fe7e ufed-0.39.ebuild 674
-MD5 555fd2ee08383b1d0eb53e4008a03b59 ufed-0.40.ebuild 780
+MD5 b226236d20a44d7cfdec03e85b98a6ca ufed-0.40-r1.ebuild 880
+MD5 4c94b074dd20cd29d231b0bf50bea06c files/digest-ufed-0.36 61
+MD5 773221c03c705b595a0aa42d003532ab files/digest-ufed-0.39 61
+MD5 b67e3c8b2f81a167ba48470321e02a14 files/digest-ufed-0.40-r1 61
+MD5 9ce640539af57edfa74d5269b82b8a79 files/ufed-0.40-useorder.patch 983
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDiI35wnQyISwouHwRAmAYAJ9XuAilTZ1I7q495WqwgSkeAJdMfwCghHu/
-dvkoA8RKfDT7DpTgvOmmC4M=
-=bLdV
+iD8DBQFD1nx+wnQyISwouHwRApWnAJ9e+7sGGdYe/YMHArDmiQH1ycZ1aACeIv4C
+mUfp79ujY4kfjQHBcvJ9TUA=
+=nplp
 -----END PGP SIGNATURE-----
diff --git a/app-portage/ufed/files/digest-ufed-0.40 b/app-portage/ufed/files/digest-ufed-0.40-r1
index 2345f518f492..2345f518f492 100644
--- a/app-portage/ufed/files/digest-ufed-0.40
+++ b/app-portage/ufed/files/digest-ufed-0.40-r1
diff --git a/app-portage/ufed/files/ufed-0.40-useorder.patch b/app-portage/ufed/files/ufed-0.40-useorder.patch
new file mode 100644
index 000000000000..6df4645cccba
--- /dev/null
+++ b/app-portage/ufed/files/ufed-0.40-useorder.patch
@@ -0,0 +1,34 @@
+--- ufed-0.40/Portage.pm
++++ ufed-0.40/Portage.pm
+@@ -40,13 +43,25 @@
+ read_make_defaults;
+ read_make_conf;
+ read_archs;
+-read_use_descs;
+ 
+-%default_flags = %make_defaults_flags;
+-merge %default_flags, %use_defaults_flags;
+-
+-%all_flags = %default_flags;
+-merge %all_flags, %make_conf_flags;
++my $lastorder;
++for(reverse split /:/, $environment{USE_ORDER} || "env:pkg:conf:auto:defaults") {
++	if($_ eq 'defaults') {
++		merge %default_flags, %make_defaults_flags;
++		merge %all_flags, %make_defaults_flags;
++	} elsif($_ eq 'auto') {
++		merge %default_flags, %use_defaults_flags;
++		merge %all_flags, %use_defaults_flags;
++	} elsif($_ eq 'conf') {
++		merge %all_flags, %make_conf_flags;
++	} else {
++		next;
++	}
++	$lastorder = $_;
++}
++if($lastorder ne 'conf') {
++	die "Sorry, USE_ORDER without make.conf overriding global USE flags are not currently supported by ufed.\n";
++}
+ 
+ for(keys %use_masked_flags)
+ { delete $all_flags{$_} if $use_masked_flags{$_} and exists $all_flags{$_} }
diff --git a/app-portage/ufed/ufed-0.40.ebuild b/app-portage/ufed/ufed-0.40-r1.ebuild
index 2c95fe55004c..1453fa5e689a 100644
--- a/app-portage/ufed/ufed-0.40.ebuild
+++ b/app-portage/ufed/ufed-0.40-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.40.ebuild,v 1.1 2005/11/26 16:30:59 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.40-r1.ebuild,v 1.1 2006/01/24 19:17:13 truedfx Exp $
+
+inherit eutils
 
 DESCRIPTION="Gentoo Linux USE flags editor"
 HOMEPAGE="http://www.gentoo.org/"
@@ -15,6 +17,12 @@ DEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}
 	dev-lang/perl"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-useorder.patch
+}
+
 src_compile() {
 	./configure || die "configure failed"
 	emake || die "make failed"