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

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 10 insertions, 72 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/Manifest b/dev-java/icedtea-web/Manifest
index 6d986818cf46..507459dad55d 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,8 +1,8 @@
 AUX 0002-Respect-LDFLAGS.patch 352 RMD160 350d3e85929372dc4193834e6994787aceed7003 SHA1 66a60a87bf6b5487a55e036bef9df42918988b9d SHA256 3e4660e84420e2ae85b00eef40e7e20c0df2c6965fda6827ab025e8167e8f866
-AUX fix-plugin-in-icedtea-7.patch 15838 RMD160 a83cca1bc784745d0b7a5108a86e06e0d339ff60 SHA1 5017d985b38756276f1114d56c1ea1e7a6e585bf SHA256 a633c1abbe4533854df4bfee2b02821a2d14ed50962428e70f3b932ae327e5b6
+AUX fix-plugin-in-icedtea-7.patch 13618 RMD160 39bde96adc1715f7010944bcf9455ebec93d08f9 SHA1 a3c68c9fcfc120eadb03ffaff3657399180e86ac SHA256 0dea03343ecea371004baa508ff20e87fb020652cdb47a7bef80deb1ba17c653
 DIST icedtea-web-1.1.4.tar.gz 812273 RMD160 2aac06c05d4513694968f86861225b5329307781 SHA1 9389030878d7c3aee17f641e3095830fe722fb60 SHA256 b17a742af0153b7887cf667a160f8519afad125bc515b0f4783c66e7ee1a7f26
 EBUILD icedtea-web-1.1.4-r7.ebuild 3949 RMD160 8f1fea7e178161fd388bc000b30d70c3c6f1954f SHA1 cc4aa774b5a83f4abd642a46d50a9232a0efed00 SHA256 300f7e5e2c9d3474d23b50064da182ec99b39071ef818a583aab00d392e6e2a2
-EBUILD icedtea-web-1.1.4-r8.ebuild 4076 RMD160 8c859f268e8ff0e616f7d87bee28e138c5232e10 SHA1 9e3fe3a1259912f9be43c4371db9fa4f9af2263d SHA256 2471c71d5ae584c8fa439071d5c65faa68658ba0a6cb72f3445536b64e1b95fc
+EBUILD icedtea-web-1.1.4-r8.ebuild 4141 RMD160 7ae64b852d10bc9004691d8a4e43ae14138e6a71 SHA1 243a7ce0d99176072cc2b62f58bdeaddbf0e5801 SHA256 86fc970887ca8cf0d9fb7e8dc58cecb19ec09c1fba42732e4659d3cf58094add
 EBUILD icedtea-web-1.1.4.ebuild 3958 RMD160 faf4add9b4ee9e55f7faf4334e4db67687ad2fbe SHA1 703d9b569ccd02f1676525eaa34060b86a2308e6 SHA256 706e4c0419a3707d5618899b2c62cd6e2636e3def77b8ad7c072c3d6b968c860
-MISC ChangeLog 3559 RMD160 78488dca49ec46ef697c78d6864f6613e7a70645 SHA1 8adf32a8c9c1f560f7f3226a8379848a636d713a SHA256 8d4d1f09e07e56713315113e8bd824444dea6d2f254ad0bb070464b582f8af9c
+MISC ChangeLog 3730 RMD160 c73fe912986ea37b0bbd818c78a56ed377f56011 SHA1 06ae7340271a73f81dd87824294e3c1f313182f3 SHA256 cfcce461570dcadf5c0767d9c7fe93690aa1564879a1b2fd406c5069f0107385
 MISC metadata.xml 755 RMD160 a76b269fe8cf35dcacf9bc3dcd9714ef764d9bfb SHA1 517488bae5fe80e69a3fb6af061b813816b47364 SHA256 0589029d53503bd941089cf26f3a6eafe4b0bfe9c727e6c4a44cdc8ec03d5abc
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
 }