From: Samuli Suominen <ssuominen@gentoo.org>
Date: Mon, 19 Jul 2010 06:47:37 +0000 (+0000)
Subject: no more xul:1.8
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a052ef8ff231148d041486e9e2bb78938d91fb7c;p=gentoo.git

no more xul:1.8
---

diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index eb55b151b35e..a270d2df1d27 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.83 2010/07/05 22:05:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.84 2010/07/19 06:47:37 ssuominen Exp $
 
 # AMD64 Team <amd64@gentoo.org>
 # Mask packages that rely on amd64 multilib
@@ -167,7 +167,6 @@ media-video/binkplayer
 net-dialup/slmodem
 net-im/skype
 net-im/skysentials
-net-libs/xulrunner-bin
 net-misc/icaclient
 net-p2p/sancho-bin
 net-voip/wengophone-bin
diff --git a/profiles/features/64bit-native/package.mask b/profiles/features/64bit-native/package.mask
index 29967d8ff4df..e661e183eb32 100644
--- a/profiles/features/64bit-native/package.mask
+++ b/profiles/features/64bit-native/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/package.mask,v 1.57 2010/07/05 22:09:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/package.mask,v 1.58 2010/07/19 06:47:37 ssuominen Exp $
 
 # AMD64 Team <amd64@gentoo.org>
 # Mask packages that rely on amd64 multilib
@@ -167,7 +167,6 @@ media-video/binkplayer
 net-dialup/slmodem
 net-im/skype
 net-im/skysentials
-net-libs/xulrunner-bin
 net-misc/icaclient
 net-p2p/sancho-bin
 net-voip/wengophone-bin
diff --git a/profiles/package.mask b/profiles/package.mask
index 661226c3db70..0a5f74b9160e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11774 2010/07/18 13:40:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11775 2010/07/19 06:47:35 ssuominen 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
@@ -200,15 +200,6 @@ dev-libs/seed
 # See bug #324411.
 dev-haskell/filepath
 
-# Samuli Suominen <ssuominen@gentoo.org> (28 Jun 2010)
-# Vulnerable xulrunner, bug #324953
-#
-# himerge needs gtk2hs compiled with xulrunner:1.8
-#
-# Masked for removal in 30 days
-=net-libs/xulrunner-1.8*
-app-portage/himerge
-
 # Samuli Suominen <ssuominen@gentoo.org> (28 Jun 2010)
 # Fails to compile, bug #274385
 # Internal copy of old libpcap and libtomcrypt, bug #278419
@@ -236,12 +227,6 @@ media-libs/libdecodeqr
 =sys-apps/lm_sensors-2*
 sys-apps/lm_sensors-modules
 
-# Samuli Suominen <ssuominen@gentoo.org> (26 Jun 2010)
-# Vulnerable and now unused xulrunner-bin, support was dropped from acroread.
-#
-# Masked for removal in 30 days, bug 324953.
-net-libs/xulrunner-bin
-
 # Diego E. Pettenò <flameeyes@gentoo.org> (26 Jun 2010)
 #  on behalf of QA team
 #