Clean up deprecated masks, wrt bug #444181

4 files changed, 9 insertions, 20 deletions

diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog
index 3194fa77af33..5f56a8e85b18 100644
--- a/profiles/arch/amd64/ChangeLog
+++ b/profiles/arch/amd64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.195 2012/12/09 08:02:53 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.196 2012/12/19 10:17:57 pinkbyte Exp $
+
+  19 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> no-multilib/package.mask,
+  no-multilib/package.use.mask, package.use.mask:
+  Clean up deprecated masks, wrt bug #444181
 
   09 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask,
   use.mask:
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 6cef9edc0fd2..347435546b03 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.122 2012/12/01 21:03:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.123 2012/12/19 10:17:57 pinkbyte Exp $
 
 # AMD64 Team <amd64@gentoo.org>
 # Mask packages that rely on amd64 multilib
@@ -70,7 +70,6 @@ games-arcade/jardinains
 games-arcade/gish-demo
 games-emulation/caps
 games-emulation/nestra
-games-emulation/snes9express
 games-emulation/zinc
 games-emulation/zsnes
 games-fps/avp
@@ -166,7 +165,6 @@ net-im/skype
 net-im/skypetab-ng
 net-misc/icaclient
 net-misc/ps3mediaserver
-net-p2p/sancho-bin
 sci-biology/foldingathome
 sci-electronics/eagle
 sci-chemistry/cara-bin
@@ -185,8 +183,3 @@ www-plugins/nspluginwrapper
 # AMD64 Team; <amd64@gentoo.org>
 # grub-1 is not available on no-multilib-profiles
 <sys-boot/grub-1.99
-
-# Diego Elio Pettenò <flameeyes@gentoo.org>
-# older hpacucli shipped only with 32-bit binaries
-<sys-block/hpacucli-9.30.15.0
-
diff --git a/profiles/arch/amd64/no-multilib/package.use.mask b/profiles/arch/amd64/no-multilib/package.use.mask
index 924c421bd443..41317c2f6579 100644
--- a/profiles/arch/amd64/no-multilib/package.use.mask
+++ b/profiles/arch/amd64/no-multilib/package.use.mask
@@ -1,15 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.use.mask,v 1.14 2012/06/24 23:44:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.use.mask,v 1.15 2012/12/19 10:17:57 pinkbyte Exp $
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (24 Jun 2012)
 # Disable 32-bit parts of wine, bug #351436
 app-emulation/wine mono win32
 
-# Feb 06, 2010 Justin Lecher <jlec@gentoo.org>
-# icc masked
-sci-biology/fasta icc
-
 # Apr 28, 2008 Sébastien Fabbro <bicatali@gentoo.org>
 # ifc masked
 sci-libs/acml ifc
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 20e07d37442f..0c216b6fdcc8 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.145 2012/12/09 08:02:53 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.146 2012/12/19 10:17:57 pinkbyte Exp $
 
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -38,10 +38,6 @@ dev-php/pecl-memcached igbinary
 # dependency keyworded here, masked in base
 media-libs/freetype -infinality
 
-# Rick Farina <zerochaos@gentoo.org> (09 July 2012)
-# limited testing of net-libs/libbtbb is all this mask is needed for
-net-analyzer/wireshark -btbb
-
 # Rick Farina <zerochaos@gentoo.org> (05 July 2012)
 # masked in base, unmask x86/amd64 only
 app-crypt/johntheripper -cuda
@@ -165,7 +161,7 @@ app-emulation/wine gstreamer
 
 # Andrey Grozin <grozin@gentoo.org> (24 Dec 2009)
 # openmcl (aka clozurecl) is only available on x86 and amd64
-sci-mathematics/maxima -openmcl -clozurecl
+sci-mathematics/maxima -clozurecl
 
 # Mounir Lamouri <volkmar@gentoo.org> (07 Nov 2009)
 # Masked in base, unmak for amd64/x86. Bug 267264