From: Harald van Dijk <truedfx@gentoo.org>
Date: Fri, 10 Nov 2006 22:13:54 +0000 (+0000)
Subject: Try harder at ignoring masked flags (#154628)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0a41672fa51c19395caaea53f105d5e0c4cd55f1;p=gentoo.git

Try harder at ignoring masked flags (#154628)
Package-Manager: portage-2.1.2_rc1-r5
---

diff --git a/app-portage/ufed/ChangeLog b/app-portage/ufed/ChangeLog
index 6aa0d2bf70d7..1729d6f84620 100644
--- a/app-portage/ufed/ChangeLog
+++ b/app-portage/ufed/ChangeLog
@@ -1,6 +1,12 @@
 # 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.45 2006/10/13 20:50:04 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.46 2006/11/10 22:13:54 truedfx Exp $
+
+*ufed-0.40-r4 (10 Nov 2006)
+
+  10 Nov 2006; Harald van Dijk <truedfx@gentoo.org>
+  +files/ufed-0.40-masked.patch, -ufed-0.40-r3.ebuild, +ufed-0.40-r4.ebuild:
+  Try harder at ignoring masked flags (#154628)
 
   13 Oct 2006; Harald van Dijk <truedfx@gentoo.org>
   +files/ufed-0.40-comments.patch, ufed-0.40-r3.ebuild:
diff --git a/app-portage/ufed/files/digest-ufed-0.40-r4 b/app-portage/ufed/files/digest-ufed-0.40-r4
new file mode 100644
index 000000000000..7e70efd006a3
--- /dev/null
+++ b/app-portage/ufed/files/digest-ufed-0.40-r4
@@ -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-masked.patch b/app-portage/ufed/files/ufed-0.40-masked.patch
new file mode 100644
index 000000000000..e51c5aa48ad3
--- /dev/null
+++ b/app-portage/ufed/files/ufed-0.40-masked.patch
@@ -0,0 +1,18 @@
+--- ufed-0.40/ufed.pl
++++ ufed-0.40/ufed.pl
+@@ -33,8 +33,13 @@
+ }
+ @{$use_descriptions{'-*'}} = 'Never enable any flags other than those specified in /etc/make.conf';
+ 
+-for(keys %Portage::use_masked_flags)
+-{ delete $use_descriptions{$_} if $Portage::use_masked_flags{$_} }
++for(keys %Portage::use_masked_flags) {
++	if($Portage::use_masked_flags{$_}) {
++		delete $Portage::default_flags{$_};
++		delete $Portage::all_flags{$_};
++		delete $use_descriptions{$_};
++	}
++}
+ 
+ flags_dialog;
+ 
diff --git a/app-portage/ufed/ufed-0.40-r4.ebuild b/app-portage/ufed/ufed-0.40-r4.ebuild
new file mode 100644
index 000000000000..b30d50ce6160
--- /dev/null
+++ b/app-portage/ufed/ufed-0.40-r4.ebuild
@@ -0,0 +1,41 @@
+# 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-r4.ebuild,v 1.1 2006/11/10 22:13:54 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
+}
+
+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
+}