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

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

3 files changed, 18 insertions, 63 deletions

diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
index 36d2b6fad7cf..b54b6985b956 100644
--- a/app-portage/ufed/Manifest
+++ b/app-portage/ufed/Manifest
@@ -9,10 +9,10 @@ AUX ufed-0.40-masked.patch 487 RMD160 2418285104f72cef7b87a2c4225ea7934cb37076 S
 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-packageusemask.patch 1735 RMD160 0a4a7ec921b3bdb1c06bf2353743f2540a6ea2f1 SHA1 73587d78bc4536b3a90a0b2a4962461de6e44ec9 SHA256 459310ddf3b79625b4871f757bec1f57edeb56357402ece9c4bc7b0b0245f6af
-MD5 28784a7d6a4ce0cbb6dca61be4d355a7 files/ufed-0.40-packageusemask.patch 1735
-RMD160 0a4a7ec921b3bdb1c06bf2353743f2540a6ea2f1 files/ufed-0.40-packageusemask.patch 1735
-SHA256 459310ddf3b79625b4871f757bec1f57edeb56357402ece9c4bc7b0b0245f6af files/ufed-0.40-packageusemask.patch 1735
+AUX ufed-0.40-packageusemask.patch 1773 RMD160 158e0033bdde3264259e28cf77964b6b7527cf42 SHA1 12fc4602e48899d9c8ab598519d1b381cea94d50 SHA256 ff9c592ad541d71e9ff85acd4d061b711d2d555ee97592b380d450edf40b242f
+MD5 7f727c3991a0031fbc8b7483f515a36c files/ufed-0.40-packageusemask.patch 1773
+RMD160 158e0033bdde3264259e28cf77964b6b7527cf42 files/ufed-0.40-packageusemask.patch 1773
+SHA256 ff9c592ad541d71e9ff85acd4d061b711d2d555ee97592b380d450edf40b242f files/ufed-0.40-packageusemask.patch 1773
 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
@@ -26,14 +26,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-r5.ebuild 1063 RMD160 63d349c054a53800a0e4a882e3b362cb4aaeee22 SHA1 4ccd21c53857a50f01bb69d8b6b29a6f6e959978 SHA256 530c0f3418875a1116cb78817fddf39a54b7acd8f8eed814c7fad477b03e18fb
-MD5 5769a205c950d8e83b7e9e3772b5e3d4 ufed-0.40-r5.ebuild 1063
-RMD160 63d349c054a53800a0e4a882e3b362cb4aaeee22 ufed-0.40-r5.ebuild 1063
-SHA256 530c0f3418875a1116cb78817fddf39a54b7acd8f8eed814c7fad477b03e18fb ufed-0.40-r5.ebuild 1063
-MISC ChangeLog 6921 RMD160 4ccad0eeb259570a3368bdc8d5c2af5b7e1b632d SHA1 7b61a4d1b0edea430a33915c1cf68f99677dbfc4 SHA256 64c53deb8b54203bf5fddfd18713f56098afa1281142ba307a873c5486b98922
-MD5 75cc8f481820123d67c4f5d933a3d04d ChangeLog 6921
-RMD160 4ccad0eeb259570a3368bdc8d5c2af5b7e1b632d ChangeLog 6921
-SHA256 64c53deb8b54203bf5fddfd18713f56098afa1281142ba307a873c5486b98922 ChangeLog 6921
+EBUILD ufed-0.40-r6.ebuild 1063 RMD160 f698d047a0813957244d7397b5990cdd2bb59fa5 SHA1 904883db5451a6f5dd8ebf88850709b31878a900 SHA256 37f28c0667d92bebcd06e70ad3ed8a896472bebe669d0ca8657371cd236de1f5
+MD5 eb0b0c6a728bbd65bf28efee3cf7d5af ufed-0.40-r6.ebuild 1063
+RMD160 f698d047a0813957244d7397b5990cdd2bb59fa5 ufed-0.40-r6.ebuild 1063
+SHA256 37f28c0667d92bebcd06e70ad3ed8a896472bebe669d0ca8657371cd236de1f5 ufed-0.40-r6.ebuild 1063
+MISC ChangeLog 7181 RMD160 4d6ef8ab1b5d865205959d25e3a29d0d89279b83 SHA1 c13b6aa575901084f38fb8b79725e5b2e376b02f SHA256 2c9aaf203eee32e62f52aeb4e356be4be0ac47a8ce7129da3987221ff20cfeea
+MD5 e9c76c410e55b8adaa6a31b0609258e9 ChangeLog 7181
+RMD160 4d6ef8ab1b5d865205959d25e3a29d0d89279b83 ChangeLog 7181
+SHA256 2c9aaf203eee32e62f52aeb4e356be4be0ac47a8ce7129da3987221ff20cfeea ChangeLog 7181
 MISC metadata.xml 256 RMD160 338deafc839d9e041e7c2df1ad9f3d73da67c096 SHA1 437b2fe5a9ddf258e30d77483bea041d998381de SHA256 52559b22087ad96b3cc63918a82c69515b3efdb8ca7735746698650bf62bb8b5
 MD5 44210a1a211263a77eb20617b32fc034 metadata.xml 256
 RMD160 338deafc839d9e041e7c2df1ad9f3d73da67c096 metadata.xml 256
@@ -41,13 +41,13 @@ SHA256 52559b22087ad96b3cc63918a82c69515b3efdb8ca7735746698650bf62bb8b5 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-r5 229
-RMD160 9a2e4cd0ec4386bcb41f0f86600349ce81adfc91 files/digest-ufed-0.40-r5 229
-SHA256 ab4e5175bb19f7da7346789599ae29fd34571bee57737d1bb4b18b6100005afb files/digest-ufed-0.40-r5 229
+MD5 7d26611087014dbdcc3a09d2f186b47d files/digest-ufed-0.40-r6 229
+RMD160 9a2e4cd0ec4386bcb41f0f86600349ce81adfc91 files/digest-ufed-0.40-r6 229
+SHA256 ab4e5175bb19f7da7346789599ae29fd34571bee57737d1bb4b18b6100005afb files/digest-ufed-0.40-r6 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFaQnhwnQyISwouHwRAvCKAKC9gO/PPL3ef0G3B5cyregvBqFpZwCgkT8u
-Y+IbceCNgY0nGJhWrnWWNdk=
-=bvhl
+iD8DBQFFe0EhwnQyISwouHwRAlwYAJ4tfLWpsNxuGcThEJSpF9mi0CeGwACgjgdr
+nK95qt9y+FSOTs2FYDONpeE=
+=8NqE
 -----END PGP SIGNATURE-----
diff --git a/app-portage/ufed/files/digest-ufed-0.40-r5 b/app-portage/ufed/files/digest-ufed-0.40-r5
deleted file mode 100644
index 7e70efd006a3..000000000000
--- a/app-portage/ufed/files/digest-ufed-0.40-r5
+++ /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-r5.ebuild b/app-portage/ufed/ufed-0.40-r5.ebuild
deleted file mode 100644
index c67fdfcc77da..000000000000
--- a/app-portage/ufed/ufed-0.40-r5.ebuild
+++ /dev/null
@@ -1,42 +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-r5.ebuild,v 1.1 2006/11/26 03:27:53 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
-}