Try harder at ignoring masked flags (#154628)

(Portage version: 2.1.2_rc1-r5)
 (Signed Manifest commit)

3 files changed, 25 insertions, 54 deletions

diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
index 51622db094a3..6e8243f40caa 100644
--- a/app-portage/ufed/Manifest
+++ b/app-portage/ufed/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ufed-0.40-comments.patch 1514 RMD160 92eab07ec71b6d51b9952455b73f04b1c26c37b2 SHA1 164528e1d2e29776f70a97f7483f531206e4b155 SHA256 f7a812e012f04c3f6c52f5efb096349ed25ddff0898c1107f7acd170eac1b17f
 MD5 62923c05ef3324fd91998a595dc3a0a6 files/ufed-0.40-comments.patch 1514
 RMD160 92eab07ec71b6d51b9952455b73f04b1c26c37b2 files/ufed-0.40-comments.patch 1514
 SHA256 f7a812e012f04c3f6c52f5efb096349ed25ddff0898c1107f7acd170eac1b17f files/ufed-0.40-comments.patch 1514
+AUX ufed-0.40-masked.patch 487 RMD160 2418285104f72cef7b87a2c4225ea7934cb37076 SHA1 aee6579a525e54274d75c754691ef0418da8e9bb SHA256 d2fd936d900d245ac7e1ed488dee602afe5b5536d1e3d5102ee015d60ff09217
+MD5 30b866f768ed7485fcabb6392ff5504a files/ufed-0.40-masked.patch 487
+RMD160 2418285104f72cef7b87a2c4225ea7934cb37076 files/ufed-0.40-masked.patch 487
+SHA256 d2fd936d900d245ac7e1ed488dee602afe5b5536d1e3d5102ee015d60ff09217 files/ufed-0.40-masked.patch 487
 AUX ufed-0.40-source.patch 1934 RMD160 636f210be5b3f74ec204f8427503d3a60e6b28ac SHA1 2c2c51aaabcbf80c50039c9b180574d72b3992f2 SHA256 5050eb221225c0232632a19bc67ba29e8c6fd6ae557307ca76acfdee5f211449
 MD5 1a7e4676adf9b12bdc3b264d777b7a05 files/ufed-0.40-source.patch 1934
 RMD160 636f210be5b3f74ec204f8427503d3a60e6b28ac files/ufed-0.40-source.patch 1934
@@ -15,14 +22,14 @@ EBUILD ufed-0.40-r1.ebuild 883 RMD160 9bf0e2fecbc174035e4f1f0b01d40c180a543e23 S
 MD5 aefa5838facf8bf397caf38b84928dd1 ufed-0.40-r1.ebuild 883
 RMD160 9bf0e2fecbc174035e4f1f0b01d40c180a543e23 ufed-0.40-r1.ebuild 883
 SHA256 160cade783335069d2f7d55f74887bc0c50857acce5dd429f79cb3b41c22abf9 ufed-0.40-r1.ebuild 883
-EBUILD ufed-0.40-r3.ebuild 975 RMD160 23f51c91ab35020323d42cb1764cd1f389e40abb SHA1 37db7aaf9c288b2b80459ecf26f97f76273badcd SHA256 ba12fc4d41fb2e980ba14e7474dcd241e3ee604e49cc59c9625fa9c7d91ba9ac
-MD5 740afaab45ecd8a9179f52f054c504e5 ufed-0.40-r3.ebuild 975
-RMD160 23f51c91ab35020323d42cb1764cd1f389e40abb ufed-0.40-r3.ebuild 975
-SHA256 ba12fc4d41fb2e980ba14e7474dcd241e3ee604e49cc59c9625fa9c7d91ba9ac ufed-0.40-r3.ebuild 975
-MISC ChangeLog 6469 RMD160 f31c102f197556af95436592431ba1129d378da2 SHA1 f82fdaf2d63e432ec5ba2b9813694764e5596f1e SHA256 ff495dc1a637e99cbc9ddea55972eced048e209158ca7996aca38997ece650cd
-MD5 3684dc0eff2c57b0f1459f47a2d79f21 ChangeLog 6469
-RMD160 f31c102f197556af95436592431ba1129d378da2 ChangeLog 6469
-SHA256 ff495dc1a637e99cbc9ddea55972eced048e209158ca7996aca38997ece650cd ChangeLog 6469
+EBUILD ufed-0.40-r4.ebuild 1015 RMD160 c9e3a3b4479889bed81b9fc8ef3750c5a967e592 SHA1 4c2bd7f6f480521f936836d47de6ccb0ee299575 SHA256 20fa0c62002b7bdc1b910f8538c461044388fb938a0468fd05526c07be0e3ea0
+MD5 de3a5a0a51b2f8fa6af2dd70e2aa67a9 ufed-0.40-r4.ebuild 1015
+RMD160 c9e3a3b4479889bed81b9fc8ef3750c5a967e592 ufed-0.40-r4.ebuild 1015
+SHA256 20fa0c62002b7bdc1b910f8538c461044388fb938a0468fd05526c07be0e3ea0 ufed-0.40-r4.ebuild 1015
+MISC ChangeLog 6676 RMD160 31d619d7e71ee2267544fa286f05727956de5fb3 SHA1 5a88b11f8bf08a06f6281b5470ba755aa87e77f1 SHA256 95efa6267b65f3205e01fbd8f712e9ddbbca6b1fdc54988251d72b395917624e
+MD5 49d31367d6408b89e3bfc49e4c8fedd3 ChangeLog 6676
+RMD160 31d619d7e71ee2267544fa286f05727956de5fb3 ChangeLog 6676
+SHA256 95efa6267b65f3205e01fbd8f712e9ddbbca6b1fdc54988251d72b395917624e ChangeLog 6676
 MISC metadata.xml 265 RMD160 49b20aa4df13abd20ed643ce52961c0e13b11460 SHA1 834ed4eba6fb3f001c5451d54037e7c16b90d5cb SHA256 df02d5d577fa52114638619266025af5b63c43ab79869b8e1b921470338869f5
 MD5 5ccf37e59ee3f6c65bd263050cf2d85e metadata.xml 265
 RMD160 49b20aa4df13abd20ed643ce52961c0e13b11460 metadata.xml 265
@@ -30,6 +37,13 @@ SHA256 df02d5d577fa52114638619266025af5b63c43ab79869b8e1b921470338869f5 metadata
 MD5 7d26611087014dbdcc3a09d2f186b47d files/digest-ufed-0.40-r1 229
 RMD160 9a2e4cd0ec4386bcb41f0f86600349ce81adfc91 files/digest-ufed-0.40-r1 229
 SHA256 ab4e5175bb19f7da7346789599ae29fd34571bee57737d1bb4b18b6100005afb files/digest-ufed-0.40-r1 229
-MD5 7d26611087014dbdcc3a09d2f186b47d files/digest-ufed-0.40-r3 229
-RMD160 9a2e4cd0ec4386bcb41f0f86600349ce81adfc91 files/digest-ufed-0.40-r3 229
-SHA256 ab4e5175bb19f7da7346789599ae29fd34571bee57737d1bb4b18b6100005afb files/digest-ufed-0.40-r3 229
+MD5 7d26611087014dbdcc3a09d2f186b47d files/digest-ufed-0.40-r4 229
+RMD160 9a2e4cd0ec4386bcb41f0f86600349ce81adfc91 files/digest-ufed-0.40-r4 229
+SHA256 ab4e5175bb19f7da7346789599ae29fd34571bee57737d1bb4b18b6100005afb files/digest-ufed-0.40-r4 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFVPmrwnQyISwouHwRAvNBAJ9cPQqpzCuiQqvHDohHdZ+gv3Vu/ACdG82v
+qhyTr6gcoFQSrPzt8VMAwec=
+=Cyff
+-----END PGP SIGNATURE-----
diff --git a/app-portage/ufed/files/digest-ufed-0.40-r3 b/app-portage/ufed/files/digest-ufed-0.40-r3
deleted file mode 100644
index 7e70efd006a3..000000000000
--- a/app-portage/ufed/files/digest-ufed-0.40-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-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/ufed-0.40-r3.ebuild b/app-portage/ufed/ufed-0.40-r3.ebuild
deleted file mode 100644
index 429dcaad0d6d..000000000000
--- a/app-portage/ufed/ufed-0.40-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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-r3.ebuild,v 1.2 2006/10/13 20:50:04 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
-}
-
-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
-}