Drop unused patches, thanks to _Mr_Bones_ for the hint

(Portage version: 2.2.0_alpha85-r1/cvs/Linux x86_64)

4 files changed, 6 insertions, 116 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 93a632b2255d..16c7480e59ca 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.145 2012/02/08 22:31:21 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.146 2012/02/08 22:45:09 tommy Exp $
+
+  08 Feb 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -files/0.7.5_p1297-ext.patch, -files/strip-version-check.patch,
+  -files/wrapper1.conf:
+  Drop unused patches, thanks to _Mr_Bones_ for the hint
 
   08 Feb 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   -freenet-9999.ebuild:
diff --git a/net-p2p/freenet/files/0.7.5_p1297-ext.patch b/net-p2p/freenet/files/0.7.5_p1297-ext.patch
deleted file mode 100644
index 8e23c76bc7a9..000000000000
--- a/net-p2p/freenet/files/0.7.5_p1297-ext.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/freenet-old/node/NodeStarter.java	2010-05-10 21:19:25.000000000 +0200
-+++ src/freenet/node/NodeStarter.java	2010-05-10 21:35:30.000000000 +0200
-@@ -168,37 +168,8 @@
- 	}
- 
- 	private void getExtBuild() {
--		try {
--			extBuildNumber = ExtVersion.buildNumber;
--			extRevisionNumber = ExtVersion.cvsRevision;
--			String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + extBuildNumber + " r" + extRevisionNumber;
--			Logger.normal(this, builtWithMessage);
--			System.out.println(builtWithMessage);
--			extBuildNumber = ExtVersion.buildNumber();
--			if(extBuildNumber == -42) {
--				extBuildNumber = ExtVersion.extBuildNumber();
--				extRevisionNumber = ExtVersion.extRevisionNumber();
--			}
--			if(extBuildNumber == 0) {
--				String buildMessage = "extBuildNumber is 0; perhaps your freenet-ext.jar file is corrupted?";
--				Logger.error(this, buildMessage);
--				System.err.println(buildMessage);
--				extBuildNumber = -1;
--			}
--			if(extRevisionNumber == null) {
--				String revisionMessage = "extRevisionNumber is null; perhaps your freenet-ext.jar file is corrupted?";
--				Logger.error(this, revisionMessage);
--				System.err.println(revisionMessage);
--				extRevisionNumber = "INVALID";
--			}
--		} catch(Throwable t) {
--			// Compatibility code ... will be removed
--			Logger.error(this, "Unable to get the version of your freenet-ext file : it's probably corrupted!");
--			System.err.println("Unable to get the version of your freenet-ext file : it's probably corrupted!");
--			System.err.println(t.getMessage());
--			extRevisionNumber = "INVALID";
--			extBuildNumber = -1;
--		}
-+		extRevisionNumber = "";
-+		extBuildNumber = RECOMMENDED_EXT_BUILD_NUMBER;
- 	}
- 
- 	/**
- 
diff --git a/net-p2p/freenet/files/strip-version-check.patch b/net-p2p/freenet/files/strip-version-check.patch
deleted file mode 100644
index b00990658604..000000000000
--- a/net-p2p/freenet/files/strip-version-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/freenet/node/Node.java	2009-08-09 23:26:38.000000000 +0200
-+++ src/freenet/node/Node.java.neu	2009-08-10 01:00:51.000000000 +0200
-@@ -3554,9 +3554,6 @@
- 				
- 				if(is150 && subver < 10)
- 					spuriousOOMs = true;
--				
--				if(is150 && subver < 20 || is160 && subver < 15)
--					xmlRemoteCodeExec = true;
- 			}
- 			
- 			if(spuriousOOMs) {
diff --git a/net-p2p/freenet/files/wrapper1.conf b/net-p2p/freenet/files/wrapper1.conf
deleted file mode 100644
index 27474428f4bc..000000000000
--- a/net-p2p/freenet/files/wrapper1.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-wrapper.java.command=java
-wrapper.working.dir=/var/freenet/
-wrapper.java.mainclass=freenet.node.NodeStarter
-wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar
-wrapper.java.classpath.2=/usr/share/java-service-wrapper/lib/wrapper.jar
-wrapper.java.classpath.3=/usr/share/db-je-3.3/lib/je.jar
-wrapper.java.classpath.4=/usr/share/fec/lib/fec.jar
-wrapper.java.classpath.5=/usr/share/ant-core/lib/ant.jar
-wrapper.java.classpath.6=/usr/share/lzma/lib/lzma.jar
-wrapper.java.classpath.7=/usr/share/lzmajio/lib/lzmajio.jar
-wrapper.java.classpath.8=/usr/share/mersennetwister/lib/mersennetwister.jar
-wrapper.java.classpath.9=/usr/share/db4o-jdk5/lib/db4o-jdk5.jar
-wrapper.java.classpath.10=/usr/share/db4o-jdk12/lib/db4o-jdk12.jar
-wrapper.java.classpath.11=/usr/share/db4o-jdk11/lib/db4o-jdk11.jar
-wrapper.java.library.path.1=/usr/lib
-wrapper.java.initmemory=60
-wrapper.java.maxmemory=192
-wrapper.java.additional.1=-Dnetworkaddress.cache.ttl=0
-wrapper.java.additional.2=-Dnetworkaddress.cache.negative.ttl=0
-wrapper.java.additional.3=-enableassertions:freenet
-# You might want to set the following line if you have changed java.maxmemory to very high numbers (>>1G)
-#wrapper.java.additional.4=-XX:MaxPermSize=256M
-
-wrapper.app.parameter.1=freenet.ini
-wrapper.console.format=PM
-wrapper.console.loglevel=INFO
-wrapper.logfile=wrapper.log
-wrapper.logfile.format=LPTM
-wrapper.logfile.loglevel=INFO
-wrapper.logfile.maxsize=2M
-wrapper.logfile.maxfiles=3
-wrapper.syslog.loglevel=NONE
-wrapper.console.title=Freenet 0.7
-wrapper.jvm_exit.timeout=120
-wrapper.restart.reload_configuration=TRUE
-wrapper.filter.trigger.1=java.lang.OutOfMemoryError
-wrapper.filter.action.1=RESTART
-
-# Name of the service
-wrapper.ntservice.name=freenet-darknet
-
-# Display name of the service
-wrapper.ntservice.displayname=Freenet 0.7 darknet
-
-# Description of the service
-wrapper.ntservice.description=The Free Network Project daemon
-
-# Service dependencies.  Add dependencies as needed starting from 1
-wrapper.ntservice.dependency.1=
-
-# Mode in which the service is installed.  AUTO_START or DEMAND_START
-wrapper.ntservice.starttype=AUTO_START
-
-# Allow the service to interact with the desktop.
-wrapper.ntservice.interactive=false
-
-wrapper.ntservice.process_priority=BELOW_NORMAL
-
-# Start services with a different user than SYSTEM
-# SEE http://wrapper.tanukisoftware.org/doc/english/prop-ntservice-account.html BEFORE PROCEEDING !