Move file removal from patch to ebuild to prevent failure on some

systems
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/net-p2p/phex/ChangeLog b/net-p2p/phex/ChangeLog
index e24429c22a59a7af0b74331ff59e245dd9775f4e..acc99e19d7903b8066a190688e42e92a310a9afe 100644 (file)
--- a/net-p2p/phex/ChangeLog
+++ b/net-p2p/phex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/phex
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/phex/ChangeLog,v 1.15 2010/06/18 21:10:52 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/phex/ChangeLog,v 1.16 2010/07/10 15:18:22 sochotnicky Exp $
+
+  10 Jul 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  files/0001-Remove-MacOS-GUI-references.patch, phex-3.2.0.102-r1.ebuild:
+  Move file removal from patch to ebuild to prevent failure on some systems
 
 *phex-3.2.0.102-r1 (18 Jun 2010)
 

diff --git a/net-p2p/phex/Manifest b/net-p2p/phex/Manifest
index 371981338002bb97fec70dcee7cbdb88eca49da3..e69eb91acf22365f449f03bedc414c2683df4d2c 100644 (file)
--- a/net-p2p/phex/Manifest
+++ b/net-p2p/phex/Manifest
@@ -1,7 +1,17 @@
-AUX 0001-Remove-MacOS-GUI-references.patch 9676 RMD160 593c38ed333fa183ed68bb993372b701bd02616d SHA1 0ebf3c1600f6a917013ae50a18ebd56da0454016 SHA256 88c8a4ad4a475f74eb6608bcab77b7ca4413c3dd3ac1036110ca7ffe933f42b7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0001-Remove-MacOS-GUI-references.patch 4019 RMD160 5e838ac663bb6116b1f4a0b3c7034a8bbc3625ad SHA1 730eb3ae6c75a7f0f75eedd593ed3e480d141aea SHA256 fe90ec5f8bfac3c542a3f02410415402e5cc163be3f14fc96145a2d9997bca65
 AUX phex-3.0.0.99.sh 350 RMD160 5a765fd7949407bf56bc2475921c0d163f7e8989 SHA1 bf7be4177fc77e18a1fb3d04ed9f2da63c572efc SHA256 169579d431b2eecfd2de9a711d4c9c6fc6838b9066e4ab73f7060d7a6aca5ddc
 DIST phex_3.2.0.102_src.zip 5416827 RMD160 6c9e359aac0b1786333b25f20699a4e6bd61a782 SHA1 0ab7974309375f1e69e6cdc242eaf63eec7b0d58 SHA256 e5b6316a3e60c68949ca33321804ae9473858f7d65d5fb59275a4f0e7a64eda9
-EBUILD phex-3.2.0.102-r1.ebuild 1808 RMD160 9393c5bcdcfb42242ab217763581daa11207da97 SHA1 1ac625a6bf9d70b8f31ef75596e8b6f4a3d5ef11 SHA256 5ad390c6e82ba75ce2db5bb3d6bc126f993041065c09bb0350965a41a3b9e0d7
+EBUILD phex-3.2.0.102-r1.ebuild 1909 RMD160 0b5d3b299a8c8d11121cb3f74e7917e5b6c14ac6 SHA1 cea84372e7250cc5e8ab8535df0c7036b535e5e0 SHA256 36404c696bf481f39e1681393d82fe6c81ed916372b72d5cf3f7fa1ea0dd5c04
 EBUILD phex-3.2.0.102.ebuild 1901 RMD160 f4d586815ce8b17845aee07a539664339f419d25 SHA1 9542eff32a52645cea342b07ec1c9cfd1257c3a8 SHA256 ed8a88b7343bc72356e29261f33a92a246926db6196ee7178d4092a93650a5a6
-MISC ChangeLog 2645 RMD160 dfb7b880a511627e3997509d413447ac2efd38ff SHA1 515f933a3d2d26a9ed7bf27c42c12897680f4210 SHA256 16eff287506fc4d9ae24009f2dac1240ce3bce8d06fde1f3148781815fb4fa03
+MISC ChangeLog 2857 RMD160 41cde501891b995ee310807dada679e2213d8f17 SHA1 e00d83ac62e06e90999216ecc4487dfb48d40ce3 SHA256 2c0fce27e60c5c34d51eb307e8f7254f8bafd2059c2b6da403cb1a9d39ef58ff
 MISC metadata.xml 178 RMD160 762e91a039aed240aa7272e8be70f778d701e15f SHA1 2b364810ae0765d67cdde794f001cceede7e3b93 SHA256 7f865bd96e898370f7e6181794cd523e888a60371a1536ce422ff1f2b4b7db23
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkw4j0oACgkQB9Uc/HGhZ3ww6QCfcozq+EESNYNpRk36Rz7T2Lyp
+wbcAnA6et3+pYDnGYBe490oAsgMrSkat
+=0jVs
+-----END PGP SIGNATURE-----

diff --git a/net-p2p/phex/files/0001-Remove-MacOS-GUI-references.patch b/net-p2p/phex/files/0001-Remove-MacOS-GUI-references.patch
index 06791af09e18b118568e8901c8b0d86537bb65e4..f772157084e81863ac34b792b0ce8c6dc5dbf67f 100644 (file)
--- a/net-p2p/phex/files/0001-Remove-MacOS-GUI-references.patch
+++ b/net-p2p/phex/files/0001-Remove-MacOS-GUI-references.patch
@@ -1,14 +1,12 @@
-From 49f223f74e5557321afdefebd48cdec4f625b97d Mon Sep 17 00:00:00 2001
+From 2bd7907aef02530680cfd795f3f757613777c064 Mon Sep 17 00:00:00 2001
 From: Stanislav Ochotnicky <sochotnicky@gmail.com>
-Date: Fri, 18 Jun 2010 23:01:32 +0200
+Date: Sat, 10 Jul 2010 15:50:13 +0200
 Subject: [PATCH] Remove MacOS GUI references
 
 ---
- src/phex/gui/common/FileDialogHandler.java |   45 +---------
- src/phex/gui/common/GUIRegistry.java       |    5 -
- src/phex/gui/macosx/MacOsxGUIUtils.java    |  140 ----------------------------
- 3 files changed, 2 insertions(+), 188 deletions(-)
- delete mode 100644 src/phex/gui/macosx/MacOsxGUIUtils.java
+ src/phex/gui/common/FileDialogHandler.java |   45 +--------------------------
+ src/phex/gui/common/GUIRegistry.java       |    5 ---
+ 2 files changed, 2 insertions(+), 48 deletions(-)
 
 diff --git a/src/phex/gui/common/FileDialogHandler.java b/src/phex/gui/common/FileDialogHandler.java
 index a5ee4f7..530f374 100644
@@ -110,152 +108,6 @@ index 852722e..3c28f2e 100644
          initializeGlobalActions();\r
          chatFrameManager = new ChatFrameManager();\r
          try \r
-diff --git a/src/phex/gui/macosx/MacOsxGUIUtils.java b/src/phex/gui/macosx/MacOsxGUIUtils.java
-deleted file mode 100644
-index bc6f1d9..0000000
---- a/src/phex/gui/macosx/MacOsxGUIUtils.java
-+++ /dev/null
-@@ -1,140 +0,0 @@
--/*\r
-- *  PHEX - The pure-java Gnutella-servent.\r
-- *  Copyright (C) 2001 - 2006 Phex Development Group\r
-- *\r
-- *  This program is free software; you can redistribute it and/or modify\r
-- *  it under the terms of the GNU General Public License as published by\r
-- *  the Free Software Foundation; either version 2 of the License, or\r
-- *  (at your option) any later version.\r
-- *\r
-- *  This program is distributed in the hope that it will be useful,\r
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-- *  GNU General Public License for more details.\r
-- *\r
-- *  You should have received a copy of the GNU General Public License\r
-- *  along with this program; if not, write to the Free Software\r
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
-- * \r
-- *  Created on 28.08.2005\r
-- *  --- CVS Information ---\r
-- *  $Id: 0001-Remove-MacOS-GUI-references.patch,v 1.1 2010/06/18 21:10:52 sochotnicky Exp $\r
-- */\r
--package phex.gui.macosx;\r
--\r
--import java.awt.FileDialog;\r
--import java.awt.event.ActionEvent;\r
--import java.awt.event.ActionListener;\r
--import java.io.File;\r
--\r
--import net.roydesign.event.ApplicationEvent;\r
--import net.roydesign.mac.MRJAdapter;\r
--import net.roydesign.ui.FolderDialog;\r
--import phex.gui.actions.ExitPhexAction;\r
--import phex.gui.actions.NewDownloadAction;\r
--import phex.gui.common.GUIRegistry;\r
--import phex.gui.dialogs.AboutDialog;\r
--import phex.gui.dialogs.options.OptionsDialog;\r
--import phex.utils.NLogger;\r
--import phex.utils.NLoggerNames;\r
--\r
--public class MacOsxGUIUtils\r
--{\r
--    public static final void installEventHandlers()\r
--    {\r
--        MRJAdapter.addQuitApplicationListener( new ActionListener()\r
--        {\r
--            public void actionPerformed( ActionEvent evt )\r
--            {\r
--                try\r
--                {\r
--                    NLogger.debug( NLoggerNames.NATIV_MACOSX,\r
--                        "Called MacOsX quit handler." );\r
--                    ExitPhexAction.performCloseGUIAction();\r
--                }\r
--                catch (Throwable th)\r
--                {\r
--                    NLogger.error( NLoggerNames.USER_INTERFACE, th, th );\r
--                }\r
--            }\r
--        } );\r
--\r
--        MRJAdapter.setPreferencesEnabled( true );\r
--        MRJAdapter.addPreferencesListener( new ActionListener()\r
--        {\r
--            public void actionPerformed( ActionEvent evt )\r
--            {\r
--                try\r
--                {\r
--                    NLogger.debug( NLoggerNames.NATIV_MACOSX,\r
--                        "Called MacOsX preferences handler." );\r
--                    OptionsDialog dialog = new OptionsDialog();\r
--                    dialog.show();\r
--                }\r
--                catch (Throwable th)\r
--                {\r
--                    NLogger.error( NLoggerNames.USER_INTERFACE, th, th );\r
--                }\r
--            }\r
--        } );\r
--\r
--        MRJAdapter.addAboutListener( new ActionListener()\r
--        {\r
--            public void actionPerformed( ActionEvent evt )\r
--            {\r
--                try\r
--                {\r
--                    AboutDialog dialog = new AboutDialog();\r
--                    dialog.setVisible( true );\r
--                }\r
--                catch (Throwable th)\r
--                {\r
--                    NLogger.error( NLoggerNames.USER_INTERFACE, th, th );\r
--                }\r
--            }\r
--        } );\r
--\r
--        MRJAdapter.addOpenDocumentListener( new ActionListener()\r
--        {\r
--            public void actionPerformed( ActionEvent evt )\r
--            {\r
--                try\r
--                {\r
--                    File file = ((ApplicationEvent) evt).getFile();\r
--                    NLogger.debug( NLoggerNames.NATIV_MACOSX,\r
--                        "Called MacOsX open file handler: " + file );\r
--\r
--                    String absFileName = file.getAbsolutePath();\r
--                    if ( absFileName.endsWith( ".magma" ) )\r
--                    {\r
--                        NewDownloadAction action = (NewDownloadAction) GUIRegistry\r
--                            .getInstance().getGlobalAction(\r
--                                GUIRegistry.NEW_DOWNLOAD_ACTION );\r
--                        action.incommingMagmaDownload( absFileName );\r
--                    }\r
--                    if ( absFileName.endsWith( ".xml" ) )\r
--                    {\r
--                        NewDownloadAction action = (NewDownloadAction) GUIRegistry\r
--                            .getInstance().getGlobalAction(\r
--                                GUIRegistry.NEW_DOWNLOAD_ACTION );\r
--                        action.incommingRSSDownload( absFileName );\r
--                    }\r
--                }\r
--                catch (Throwable th)\r
--                {\r
--                    NLogger.error( NLoggerNames.USER_INTERFACE, th, th );\r
--                }\r
--            }\r
--        } );\r
--    }\r
--\r
--    /**\r
--     * Create folder dialog here. This prevents \r
--     * NoClassDefFoundError on Windows systems since the import of the\r
--     * required OS X classes is elsewhere.\r
--     */\r
--    public static final FileDialog createFolderDialog()\r
--    {\r
--        return new FolderDialog( GUIRegistry.getInstance().getMainFrame() );\r
--    }\r
--}\r
 -- 
 1.7.1
 

diff --git a/net-p2p/phex/phex-3.2.0.102-r1.ebuild b/net-p2p/phex/phex-3.2.0.102-r1.ebuild
index fcda329c8db0514487728a763598473bace7d12c..7b0209c1d6105d24176d1125239f216ee57c7060 100644 (file)
--- a/net-p2p/phex/phex-3.2.0.102-r1.ebuild
+++ b/net-p2p/phex/phex-3.2.0.102-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/net-p2p/phex/phex-3.2.0.102-r1.ebuild,v 1.1 2010/06/18 21:10:52 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/phex/phex-3.2.0.102-r1.ebuild,v 1.2 2010/07/10 15:18:22 sochotnicky Exp $
 
 EAPI=2
 
@@ -39,6 +39,8 @@ JAVA_PKG_BSFIX="off"
 src_prepare() {
        # remove parts related to MacOS gui classes
        epatch "${FILESDIR}/0001-Remove-MacOS-GUI-references.patch"
+       # remove unused class (make sure it's not compiled)
+       rm -vf src/phex/gui/macosx/MacOsxGUIUtils.java
 
        rm -vf lib/*.jar || die
        # avoid patches like plague