Fix the patch, bug #406715. Thanks to Flameeyes.

(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

3 files changed, 7 insertions, 69 deletions

diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index 34ec405b5f0b..78938ea1a93c 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/icedtea-web
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.17 2012/03/02 23:21:54 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.18 2012/03/03 21:51:25 caster Exp $
+
+  03 Mar 2012; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.1.4-r8.ebuild,
+  files/fix-plugin-in-icedtea-7.patch:
+  Fix the patch, bug #406715. Thanks to Flameeyes.
 
 *icedtea-web-1.1.4-r8 (02 Mar 2012)
 
diff --git a/dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch b/dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch
index 9827bcc6bd65..4f65145913c9 100644
--- a/dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch
+++ b/dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch
@@ -264,73 +264,6 @@ diff -r f0647c938535 -r 77640d74d21c netx/net/sourceforge/jnlp/PluginBridge.java
          usePack = false;
          useVersion = false;
          String jargs = atts.get("java_arguments");
-diff -r f0647c938535 -r 77640d74d21c netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java
---- a/netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java	Sat Jan 07 02:48:05 2012 -0500
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,63 +0,0 @@
--// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
--//
--// This library is free software; you can redistribute it and/or
--// modify it under the terms of the GNU Lesser General Public
--// License as published by the Free Software Foundation; either
--// version 2.1 of the License, or (at your option) any later version.
--//
--// This library is distributed in the hope that it will be useful,
--// but WITHOUT ANY WARRANTY; without even the implied warranty of
--// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--// Lesser General Public License for more details.
--//
--// You should have received a copy of the GNU Lesser General Public
--// License along with this library; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
--
--package net.sourceforge.jnlp.runtime;
--
--/**
-- * Thread group for a JNLP application.
-- *
-- * @author <a href="mailto:jmaxwell@users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
-- * @version $Revision: 1.1 $
-- */
--public class AppThreadGroup extends ThreadGroup {
--
--    /** the app */
--    private ApplicationInstance app = null;
--
--    /**
--     * Creates new JavaAppThreadGroup
--     *
--     * @param name of the App
--     */
--    public AppThreadGroup(ThreadGroup parent, String name) {
--        super(parent, name);
--    }
--
--    /**
--     * Sets the JNLP app this group is for; can only be called once.
--     */
--    public void setApplication(ApplicationInstance app) {
--        if (this.app != null)
--            throw new IllegalStateException("Application can only be set once");
--
--        this.app = app;
--    }
--
--    /**
--     * Returns the JNLP app for this thread group.
--     */
--    public ApplicationInstance getApplication() {
--        return app;
--    }
--
--    /**
--     * Handle uncaught exceptions for the app.
--     */
--    public void uncaughtException(Thread t, Throwable e) {
--        super.uncaughtException(t, e);
--    }
--
--}
 diff -r f0647c938535 -r 77640d74d21c plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
 --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Sat Jan 07 02:48:05 2012 -0500
 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Fri Apr 29 16:58:05 2011 -0400
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.4-r8.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.4-r8.ebuild
index 789215e5752d..5d3db0638900 100644
--- a/dev-java/icedtea-web/icedtea-web-1.1.4-r8.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.1.4-r8.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/dev-java/icedtea-web/icedtea-web-1.1.4-r8.ebuild,v 1.1 2012/03/02 23:21:55 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.4-r8.ebuild,v 1.2 2012/03/03 21:51:25 caster Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)
 
 EAPI="4"
@@ -61,6 +61,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch
 	# this should be included in next release, plugin doesn't work without it
 	epatch "${FILESDIR}"/fix-plugin-in-icedtea-7.patch
+	rm netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java || die
 	eautoreconf
 }