From fe50b662002e8b444d2d58f8764ca6142258ffce Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 21 May 2012 06:08:19 +0000 Subject: Force net-misc/npapi-sdk for USE="nsplugin" instead of having || ( ) dependency block with net-libs/xulrunner which is obsolete and vulnerable. (Portage version: 2.2.0_alpha107/cvs/Linux x86_64) --- www-plugins/gnash/ChangeLog | 6 +++++- www-plugins/gnash/gnash-0.8.10-r2.ebuild | 9 ++------- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'www-plugins') diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog index dc7ddedb4ddf..6234175f5289 100644 --- a/www-plugins/gnash/ChangeLog +++ b/www-plugins/gnash/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-plugins/gnash # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.86 2012/05/16 11:35:05 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.87 2012/05/21 06:08:19 ssuominen Exp $ + + 21 May 2012; Samuli Suominen gnash-0.8.10-r2.ebuild: + Force net-misc/npapi-sdk for USE="nsplugin" instead of having || ( ) + dependency block with net-libs/xulrunner which is obsolete and vulnerable. 16 May 2012; Tomáš Chvátal -files/gnash-0.8.3-boost-dynamic-link.patch, -files/gnash-0.8.5-klash.patch, diff --git a/www-plugins/gnash/gnash-0.8.10-r2.ebuild b/www-plugins/gnash/gnash-0.8.10-r2.ebuild index 4aa33795d901..1069bf43f280 100644 --- a/www-plugins/gnash/gnash-0.8.10-r2.ebuild +++ b/www-plugins/gnash/gnash-0.8.10-r2.ebuild @@ -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/www-plugins/gnash/gnash-0.8.10-r2.ebuild,v 1.6 2012/05/16 11:35:05 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10-r2.ebuild,v 1.7 2012/05/21 06:08:19 ssuominen Exp $ EAPI=4 CMAKE_REQUIRED="never" @@ -106,12 +106,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) - nsplugin? ( - || ( - net-misc/npapi-sdk - >=net-libs/xulrunner-1.9.2:1.9 - ) - ) + nsplugin? ( net-misc/npapi-sdk ) test? ( dev-util/dejagnu )" # Tests hang with sandbox, bug #321017 RESTRICT="test" -- cgit v1.2.3-65-gdbad