Comment out support for vulnerable firefox and xulrunner (only in deps).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 6eea1fbac77a049d867c6080f8e3a229ba863c1b..b029fc806c3b9956a6de00190c6a90dc0ee119cf 100644 (file)
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/swt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.126 2010/06/26 10:55:35 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.127 2010/06/26 14:46:17 ssuominen Exp $
+
+  26 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> swt-3.3.1.1-r1.ebuild:
+  Comment out support for vulnerable firefox and xulrunner (only in deps).
 
   26 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
   +swt-3.3.1.1-r1.ebuild, +files/swt-3.3-manifest:

diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index d25f51174c03a7e9bcaa1d7d56f3729799e38b46..1325f33c6277ca12b613c3a73f8e1faa9bbaf11a 100644 (file)
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -15,8 +15,8 @@ DIST swt-3.4-gtk-linux-x86_64.zip 4730884 RMD160 17207c7fda0589c1153867fab73afaa
 DIST swt-3.5.2-gtk-linux-ppc.zip 4947929 RMD160 4849fec03de7b41f8190703f78cdc44f0424676e SHA1 ab6184e95b57de857f9f6dfaba8368c83ca18e8c SHA256 f2619f6e107eee3c55c6694df4c89e77976d2d5517b6f3c17c358602536abf28
 DIST swt-3.5.2-gtk-linux-x86.zip 4881316 RMD160 e18809a878c6c660bcf08d36cb9433f4803acd99 SHA1 f5a9c156a43b76b9dfa5d1ff515862a59ec4eb58 SHA256 00477e6fc3c913916cd980a1ec29629c5250afc52dc0fcee74b035af0360eef7
 DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 RMD160 32aca7c0ad9ced672efa1a1a94bdccd3a1b90450 SHA1 4d23e02e60054b5f26cf96abfe3f09d4c4cb0812 SHA256 91f9e2d4f6ca3926252d33895aafe82ba1b72bcdb77ec71dafa20d154f5d5bc7
-EBUILD swt-3.3.1.1-r1.ebuild 5819 RMD160 4650ed7ff6f2de5cc823a365f4d14021d406fbcf SHA1 5cb9ad0c9c3e9dbc2243b6a8c56792f885a1154f SHA256 05afba9d1a651074a28fa3d86d3ff448d7426dc379de95784ffd70484063f21a
+EBUILD swt-3.3.1.1-r1.ebuild 5857 RMD160 78bdae228c15885928199eb22b949dcf777d77b1 SHA1 751834a3c87f17d6bb8d7d2553463dcb7f685c67 SHA256 7f8ea17958bbe4899feeee142867a274f4c7f29ef072ca6fa86528246def1294
 EBUILD swt-3.4-r4.ebuild 6313 RMD160 7b9617b2499358289afb4665c76249f4a6ccf5f3 SHA1 2689f78427bc6e260b4c00de817adafc48e825cf SHA256 d72edb3516a67633a5ae98b47cf4c9602d55a2402b80a2f9267518c729ee0d1d
 EBUILD swt-3.5.2.ebuild 6023 RMD160 8375f29f20f7c2174542b673757ea67e08a35f3e SHA1 2fb2ec0bde456d65c749771a60c742aeb5f30266 SHA256 bc7a24bcb98d7602b4fb509b7d7cd5ed8ac620666d54ac0d68472e0107e053f9
-MISC ChangeLog 21369 RMD160 41bb1bad0b091c6e499040d9583c42bc8ecba98f SHA1 10cd7e555d9bf12fbaaaf22eca453e02775545b1 SHA256 49d08ce6b5cd405d8f3651cd04aec5a5fd9843149f3c9d0c527696839039e87b
+MISC ChangeLog 21523 RMD160 518ea26971f45187a14496443f7066cd618775c0 SHA1 50354f74514d08154df2e2906d14b45659b4dc07 SHA256 3d617651ba3dff5b2860ae0265a6ca63877696c1965f3299af7442f5600f2a12
 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8

diff --git a/dev-java/swt/swt-3.3.1.1-r1.ebuild b/dev-java/swt/swt-3.3.1.1-r1.ebuild
index d3936c1683bdd3c455188f0d5525c4eb702c7c1e..447491f70b14cb83331a899acae838b3fdf155ff 100644 (file)
--- a/dev-java/swt/swt-3.3.1.1-r1.ebuild
+++ b/dev-java/swt/swt-3.3.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.3.1.1-r1.ebuild,v 1.11 2010/06/26 10:55:35 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.3.1.1-r1.ebuild,v 1.12 2010/06/26 14:46:17 ssuominen Exp $
 
 EAPI="1"
 
@@ -39,20 +39,23 @@ COMMON=">=dev-libs/glib-2.6
                                        =gnome-base/gnome-vfs-2*
                                        =gnome-base/libgnomeui-2*
                                )
-               firefox? ( !xulrunner? (
-                       =www-client/mozilla-firefox-2*
-                       >=dev-libs/nspr-4.6.2
-               ) )
-               xulrunner? (
-                       net-libs/xulrunner:1.8
-                       >=dev-libs/nspr-4.6.2
-               )
                opengl? (
                        virtual/opengl
                        virtual/glu
                )
                x11-libs/libXtst"
 
+# Masked in base/package.use.mask
+#
+# firefox? ( !xulrunner? (
+#      =www-client/mozilla-firefox-2*
+#      >=dev-libs/nspr-4.6.2
+# ) )
+# xulrunner? (
+#      net-libs/xulrunner:1.8
+#      >=dev-libs/nspr-4.6.2
+# )
+
 # libXtst/xextproto is done like this due to the XTest.h move - bug #292244
 DEPEND=">=virtual/jdk-1.4
                app-arch/unzip