* [gentoo-commits] repo/gentoo:master commit in: net-p2p/phex/files/, net-p2p/phex/
@ 2015-12-10 9:49 Patrice Clement
0 siblings, 0 replies; only message in thread
From: Patrice Clement @ 2015-12-10 9:49 UTC (permalink / raw
To: gentoo-commits
commit: b3fd801f5f28420e91e8adf5a2c68c2433240614
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 09:46:40 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 09:46:40 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3fd801f
net-p2p/phex: Removal. Fixes bug 276095.
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
net-p2p/phex/Manifest | 1 -
.../files/0001-Remove-MacOS-GUI-references.patch | 113 ---------------------
net-p2p/phex/files/phex-3.0.0.99.sh | 7 --
net-p2p/phex/metadata.xml | 9 --
net-p2p/phex/phex-3.2.0.102-r1.ebuild | 65 ------------
5 files changed, 195 deletions(-)
diff --git a/net-p2p/phex/Manifest b/net-p2p/phex/Manifest
deleted file mode 100644
index 0f1da7f..0000000
--- a/net-p2p/phex/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST phex_3.2.0.102_src.zip 5416827 SHA256 e5b6316a3e60c68949ca33321804ae9473858f7d65d5fb59275a4f0e7a64eda9 SHA512 202ae0a549cd7bebd6256c3315d82be3710a9ae4ee55fb9ad42720634c9ee2cd508273bc3f4e5f91e0ffb463f7d54266361ed335bc581a551f3ec2de9d163330 WHIRLPOOL 1837017585da6622cbf3453b380f5b664ae491f1c7b76c5859020fe0a6e2eef9ee90c32aa6cd6281ffc8ea65a35a2f696b94b281d8640ba5b71b480ea6946013
diff --git a/net-p2p/phex/files/0001-Remove-MacOS-GUI-references.patch b/net-p2p/phex/files/0001-Remove-MacOS-GUI-references.patch
deleted file mode 100644
index f772157..0000000
--- a/net-p2p/phex/files/0001-Remove-MacOS-GUI-references.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 2bd7907aef02530680cfd795f3f757613777c064 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@gmail.com>
-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 ---
- 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
---- a/src/phex/gui/common/FileDialogHandler.java
-+++ b/src/phex/gui/common/FileDialogHandler.java
-@@ -34,7 +34,6 @@ import javax.swing.filechooser.FileFilter;
-
- import org.apache.commons.lang.SystemUtils;
-
--import phex.gui.macosx.MacOsxGUIUtils;
- import phex.utils.DirectoryOnlyFileFilter;
-
- public class FileDialogHandler
-@@ -45,7 +44,7 @@ public class FileDialogHandler
- {
- if ( SystemUtils.IS_OS_MAC_OSX )
- {
-- return openMacDirectoryChooser( title, null, null );
-+ return null;
- }
- else
- {
-@@ -71,10 +70,7 @@ public class FileDialogHandler
- {
- if ( SystemUtils.IS_OS_MAC_OSX )
- {
-- return new File[]
-- {
-- openMacDirectoryChooser( title, notifyPopupTitle, notifyPopupShortMessage )
-- };
-+ return null;
- }
- else
- {
-@@ -85,43 +81,6 @@ public class FileDialogHandler
- }
- }
-
-- private static File openMacDirectoryChooser( String title,
-- String notifyPopupTitle, String notifyPopupShortMessage )
-- {
-- // create folder dialog through other class this prevents
-- // NoClassDefFoundError on Windows systems since the import of the
-- // required OS X classes is elsewhere.
-- FileDialog dia = MacOsxGUIUtils.createFolderDialog();
-- dia.setTitle(title);
--
-- // unfortunatly its not possible to display notification popup
-- // besides heavy weight dialog.
-- //if ( notifyPopupTitle != null || notifyPopupShortMessage != null )
-- //{
-- //displayMacNotificationPopup( dia, notifyPopupTitle,
-- // notifyPopupShortMessage );
-- //}
--
-- DirectoryOnlyFileFilter filter = new DirectoryOnlyFileFilter();
-- dia.setFilenameFilter( new FileFilterWrapper(
-- filter) );
-- dia.setVisible( true );
-- String dirStr = dia.getDirectory();
-- String fileStr = dia.getFile();
--
-- if( dirStr == null || fileStr == null )
-- {
-- return null;
-- }
-- File file = new File(dirStr, fileStr);
-- // validate filter
-- if( !filter.accept(file) )
-- {
-- return null;
-- }
-- return file;
-- }
--
- private static JFileChooser initDefaultChooser( String title,
- String approveBtnText, char approveBtnMnemonic, FileFilter filter,
- int mode, File currentDirectory, String notifyPopupTitle,
-diff --git a/src/phex/gui/common/GUIRegistry.java b/src/phex/gui/common/GUIRegistry.java
-index 852722e..3c28f2e 100644
---- a/src/phex/gui/common/GUIRegistry.java
-+++ b/src/phex/gui/common/GUIRegistry.java
-@@ -47,7 +47,6 @@ import phex.gui.actions.FWAction;
- import phex.gui.actions.NewDownloadAction;
- import phex.gui.actions.SwitchNetworkAction;
- import phex.gui.chat.ChatFrameManager;
--import phex.gui.macosx.MacOsxGUIUtils;
- import phex.gui.prefs.InterfacePrefs;
- import phex.update.UpdateCheckRunner;
- import phex.utils.Localizer;
-@@ -119,10 +118,6 @@ public final class GUIRegistry implements GUIRegistryConstants
- }
- }
-
-- if ( SystemUtils.IS_OS_MAC_OSX )
-- {
-- MacOsxGUIUtils.installEventHandlers();
-- }
- initializeGlobalActions();
- chatFrameManager = new ChatFrameManager();
- try
---
-1.7.1
-
diff --git a/net-p2p/phex/files/phex-3.0.0.99.sh b/net-p2p/phex/files/phex-3.0.0.99.sh
deleted file mode 100644
index 9713680..0000000
--- a/net-p2p/phex/files/phex-3.0.0.99.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#!/bin/sh
-
-java -classpath $(java-config -p commons-logging,commons-httpclient-3,phex,jgoodies-looks-2.0,jgoodies-forms) phex.Main
diff --git a/net-p2p/phex/metadata.xml b/net-p2p/phex/metadata.xml
deleted file mode 100644
index dbb3a31..0000000
--- a/net-p2p/phex/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>net-p2p</herd>
- <herd>java</herd>
- <upstream>
- <remote-id type="sourceforge">phex</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-p2p/phex/phex-3.2.0.102-r1.ebuild b/net-p2p/phex/phex-3.2.0.102-r1.ebuild
deleted file mode 100644
index 75b2f8c..0000000
--- a/net-p2p/phex/phex-3.2.0.102-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="java gnutella file-sharing application"
-HOMEPAGE="http://phex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.zip"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-COMMON_DEPEND="dev-java/commons-httpclient:3
- dev-java/commons-logging:0
- dev-java/jgoodies-forms:0
- dev-java/jgoodies-looks:2.0
- dev-java/log4j:0
- dev-java/l2fprod-common:0
- dev-java/commons-beanutils:1.7
- dev-java/commons-codec:0
- dev-java/commons-collections:0
- dev-java/commons-lang:2.1"
-
-DEPEND="app-arch/unzip
- >=virtual/jdk-1.5
- ${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_P}_src"
-
-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
- sed -i "s/createJar, copyThirdpartyJars/createJar/" build/buildJava.xml || die
- JAVA_ANT_REWRITE_CLASSPATH="true" java-ant_bsfix_files build/*.xml
- # remove bundled packages that we have - bug #176739
- rm -rf src/com/l2fprod src/org/apache || die
-}
-
-src_compile() {
- local gcp="$(java-pkg_getjars commons-httpclient-3,commons-logging,jgoodies-forms,jgoodies-looks-2.0,log4j,l2fprod-common,commons-beanutils-1.7,commons-codec,commons-collections,commons-lang-2.1)"
- cd build
- eant -Dgentoo.classpath="${gcp}:MRJAdapter.jar" -Dproject.buildtarget=build buildJava
-}
-
-src_install() {
- java-pkg_dojar build/lib/${PN}.jar
-
- java-pkg_dolauncher ${PN} --main phex.Main
-
- dohtml docs/readme/* || die
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-12-10 9:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-10 9:49 [gentoo-commits] repo/gentoo:master commit in: net-p2p/phex/files/, net-p2p/phex/ Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox