Make sure flags don't get hidden just because they are masked for one package (#157576)

(Portage version: 2.1.2_rc2-r5)

4 files changed, 57 insertions, 3 deletions

diff --git a/app-portage/ufed/ChangeLog b/app-portage/ufed/ChangeLog
index 2adf61c19d29..7e99583d4153 100644
--- a/app-portage/ufed/ChangeLog
+++ b/app-portage/ufed/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-portage/ufed
 # Copyright 2003-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.47 2006/11/26 03:27:53 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.48 2006/12/09 23:04:45 truedfx Exp $
+
+*ufed-0.40-r6 (09 Dec 2006)
+
+  09 Dec 2006; Harald van Dijk <truedfx@gentoo.org>
+  files/ufed-0.40-packageusemask.patch, -ufed-0.40-r5.ebuild,
+  +ufed-0.40-r6.ebuild:
+  Make sure flags don't get hidden just because they are masked for one
+  package (#157576)
 
 *ufed-0.40-r5 (26 Nov 2006)
 
diff --git a/app-portage/ufed/files/digest-ufed-0.40-r6 b/app-portage/ufed/files/digest-ufed-0.40-r6
new file mode 100644
index 000000000000..7e70efd006a3
--- /dev/null
+++ b/app-portage/ufed/files/digest-ufed-0.40-r6
@@ -0,0 +1,3 @@
+MD5 81c6dc3af93d6ab2f592ba2cd7b1ee7f ufed-0.40.tar.bz2 20288
+RMD160 f360eb01f952acb4f52cfa571927a523f1fe3015 ufed-0.40.tar.bz2 20288
+SHA256 85d8894b7d163dacf7dfc94fff4e8c4a9cbb0302a66fc7e545a6d5c1c6c9318c ufed-0.40.tar.bz2 20288
diff --git a/app-portage/ufed/files/ufed-0.40-packageusemask.patch b/app-portage/ufed/files/ufed-0.40-packageusemask.patch
index 13c8c760c2f9..fee6cef25cd6 100644
--- a/app-portage/ufed/files/ufed-0.40-packageusemask.patch
+++ b/app-portage/ufed/files/ufed-0.40-packageusemask.patch
@@ -39,7 +39,7 @@
  sub have_package($) {
  	my ($cp) = @_;
  	return $packages{$cp};
-@@ -213,6 +216,7 @@
+@@ -216,6 +213,7 @@
  			redo PARENT;
  		}
  	}
@@ -47,7 +47,7 @@
  }
  
  sub read_sh($) {
-@@ -299,7 +301,14 @@
+@@ -301,7 +299,15 @@
  	for my $dir(@profiles) {
  		for(noncomments "$dir/use.mask") {
  			my $off = s/^-//;
@@ -58,6 +58,7 @@
 +			my($pkg, @flags) = split;
 +			for(@flags) {
 +				my $off = s/^-//;
++				$use_masked_flags{$_}{''} ||= 0;
 +				$use_masked_flags{$_}{$pkg} = !$off;
 +			}
  		}
diff --git a/app-portage/ufed/ufed-0.40-r6.ebuild b/app-portage/ufed/ufed-0.40-r6.ebuild
new file mode 100644
index 000000000000..4d7ede1d85b4
--- /dev/null
+++ b/app-portage/ufed/ufed-0.40-r6.ebuild
@@ -0,0 +1,42 @@
+# 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-r6.ebuild,v 1.1 2006/12/09 23:04:45 truedfx Exp $
+
+inherit eutils
+
+DESCRIPTION="Gentoo Linux USE flags editor"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~truedfx/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-useorder.patch
+	epatch "${FILESDIR}"/${P}-source.patch
+	epatch "${FILESDIR}"/${P}-comments.patch
+	epatch "${FILESDIR}"/${P}-masked.patch
+	epatch "${FILESDIR}"/${P}-packageusemask.patch
+}
+
+src_compile() {
+	./configure || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	newsbin ufed.pl ufed
+	doman ufed.8
+	insinto /usr/lib/ufed
+	doins *.pm
+	exeinto /usr/lib/ufed
+	doexe ufed-curses
+}