net-p2p/freenet: Version bump + some more splitting

svn path=/sunrise/; revision=5939

8 files changed, 230 insertions, 146 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 73a3a3be1..c17bec86e 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Mar 2008; Thomas Sachau (Tommy[D]) tommy@gentoo.org
+  -freenet-0.7_beta_pre1126.ebuild, +freenet-0.7_beta_pre1130.ebuild,
+  +files/ext.patch, +files/wrapper.conf.patch:
+  Version bump + some more splitting
+
   20 Mar 2008; (Tommy[D]) tommy100@gmx.de -freenet-0.7_beta_pre1123.ebuild,
   +freenet-0.7_beta_pre1126.ebuild:
   New upstream release
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 31569eab5..9b41ade72 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,7 +1,8 @@
-AUX freenet 416 RMD160 95efeda98fe723027c74729b03fd293ca29bdc7a SHA1 796d336341796d081454ebcc45248e90fffaed91 SHA256 d3b665e8d619d995ef9cb67ed4006c96bc4fdf80e6b7923247e022268ab8bae5
-AUX freenet-libNativeThreadpath.patch 2186 RMD160 88d9cf4d41c4aa3002cbcd70a044ae1a999e6ba9 SHA1 a70cc47690982c34378f1125cdab61196e091d8e SHA256 46df56ccb00fe4a2730eef28f2a84bcb57415ea8cc9caea5d9949480ad2b3856
-AUX freenet-libfec8path.patch 1052 RMD160 9e54f57ea087b6b1d3c31b509c7e066c454d8d0f SHA1 2483e0bd6fff40443c4041e880dc8c20abf5b2ca SHA256 3d6ff32f4536549bcde462bf3814568687130a0858f2e610014b7b7f75568573
-DIST freenet-0.7_beta_pre1126.tar.bz2 19024300 RMD160 537f2910824cd4ccc434d9372ea9133a3e263468 SHA1 be57d0bddb1481b018d1d2d81b73a8cdb1b3d7f9 SHA256 0aa427c507e568427c232a07c94354d9258e320d97a81cbcaf3abaefff6ca93e
-EBUILD freenet-0.7_beta_pre1126.ebuild 1491 RMD160 054602455d5831eba39be87ebf914efff5c09bbc SHA1 ee3372a8a80b9a22d0349bac94e9aeb828c62afb SHA256 247204e69ba6375384e5eea7418717a83ed812815640f926431a48d48a0a0c7b
-MISC ChangeLog 6199 RMD160 9b051845916514f568b37e447fbb869b1c7a7853 SHA1 71a628e4e1eff7c85f2ae9b23e9cd5f59f7f19f8 SHA256 9f716a5bbeb1c1fe1446ac47b8c484ae5eb196a9c22d78c08a1607074b5ba47d
-MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
+AUX ext.patch 5065 SHA1 f20a6ab88296ccac14539c2d9bf7eab4305d3b54
+AUX freenet 416 SHA1 796d336341796d081454ebcc45248e90fffaed91
+AUX wrapper.conf.patch 691 SHA1 e280d06f42e310cd96f207f5ffdb28ed18364425
+DIST freenet-0.7_beta_pre1130.tar.bz2 1875340 SHA1 b3b913ee63b5fdae2b12d84c09d74878af340070
+DIST wrapper-20080330.conf 1667 SHA1 7f8679579c47e2c0644d26c67c26d779bf6f8d75
+EBUILD freenet-0.7_beta_pre1130.ebuild 2220 SHA1 cdb30e43d237635e4eaaf1a15abfcfe9928724b7
+MISC ChangeLog 6411 SHA1 f01c7b52491a02eb55bb8f9ff5fedcf7f1e510cc
+MISC metadata.xml 170 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4
diff --git a/net-p2p/freenet/files/ext.patch b/net-p2p/freenet/files/ext.patch
new file mode 100644
index 000000000..702ff5345
--- /dev/null
+++ b/net-p2p/freenet/files/ext.patch
@@ -0,0 +1,119 @@
+diff -ur freenet-old/build.xml freenet/build.xml
+--- freenet-old/build.xml	2008-03-30 14:55:10.000000000 +0200
++++ freenet/build.xml	2008-03-30 16:02:56.000000000 +0200
+@@ -13,7 +13,9 @@
+ 	<property name="build" location="build"/>
+ 	<property name="build-test" location="build-test"/>
+ 	<property name="lib"	location="lib"/>
+-	<property name="freenet-ext.location" location="${lib}/freenet-ext.jar"/>
++	<property name="wrapper.location" location="${lib}/wrapper.jar"/>
++	<property name="je.location" location="${lib}/je.jar"/>
++	<property name="fec.location" location="${lib}/fec.jar"/>
+ 	<property name="javadoc" location="javadoc"/>
+ 	<property name="svn.revision" value="@custom@"/>
+ 	<property name="CSSTokenizerFilter.relative.jflex" value="freenet/clients/http/filter/CSSTokenizerFilter.jflex"/>
+@@ -34,7 +36,6 @@
+ 	</target>
+ 
+ 	<target name="env" depends="mkdir"   description="Learn about the environment">
+-		<available file="${lib}/freenet-ext.jar" property="freenet-ext.present"/>
+ 		<available file="${CSSTokenizerFilter.java}" property="CSSTokenizerFilter.present"/>
+ 		<available file="${junit.location}" property="junit.present"/>
+ 	</target>
+@@ -48,19 +49,9 @@
+ 		</exec>
+ 	</target>
+ 
+-	<target name="get-extjar" depends="env" unless="freenet-ext.present"
+-		description="Download some external libraries which Freenet relies on">
+-		<mkdir dir="${lib}"/>
+-		<get src="http://downloads.freenetproject.org/alpha/freenet-ext.jar" 
+-			dest="${freenet-ext.location}" 
+-			verbose="true"
+-			usetimestamp="true"/>
+-		<property name="freenet-ext.present" value="true"/>
+-	</target>
+-
+ 	<!-- ================================================== -->
+ 
+-	<target name="compile" depends="get-extjar, generate-CSSTokenizerFilter">
++	<target name="compile" depends="generate-CSSTokenizerFilter">
+ 		<!-- Create the time stamp -->
+ 		<tstamp/>
+ 
+@@ -75,7 +66,9 @@
+ 		<!-- FIXME: remove the debug and replace with optimize -->
+ 		<javac srcdir="${src}" destdir="${build}" debug="on" optimize="on" source="1.4">
+ 			<classpath>
+-				<pathelement location="${freenet-ext.location}"/>
++				<pathelement location="${wrapper.location}"/>
++				<pathelement location="${je.location}"/>
++				<pathelement location="${fec.location}"/>
+ 				<pathelement location="gnu-crypto.jar"/>
+ 				<pathelement location="javax-security.jar"/>
+ 				<pathelement location="javax-crypto.jar"/>
+@@ -131,7 +124,9 @@
+ 		<javac srcdir="${test}" destdir="${build-test}" debug="on" optimize="on" source="1.4">
+ 			<classpath>
+ 				<pathelement path="${build}"/>
+-				<pathelement location="${freenet-ext.location}"/>
++				<pathelement location="${wrapper.location}"/>
++				<pathelement location="${je.location}"/>
++				<pathelement location="${fec.location}"/>
+ 				<pathelement location="${junit.location}"/>
+ 			</classpath>
+ 			<include name="**/*.java"/>
+@@ -144,7 +139,9 @@
+ 			<classpath>
+ 				<pathelement path="${build}"/>
+ 				<pathelement path="${build-test}"/>
+-				<pathelement location="${freenet-ext.location}"/>
++				<pathelement location="${wrapper.location}"/>
++				<pathelement location="${je.location}"/>
++				<pathelement location="${fec.location}"/>
+ 				<pathelement location="${junit.location}"/>
+ 			</classpath>
+ 
+diff -ur freenet-old/src/freenet/node/NodeStarter.java freenet/src/freenet/node/NodeStarter.java
+--- freenet-old/src/freenet/node/NodeStarter.java	2008-03-30 14:55:11.000000000 +0200
++++ freenet/src/freenet/node/NodeStarter.java	2008-03-30 16:02:56.000000000 +0200
+@@ -167,37 +167,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/freenet-libNativeThreadpath.patch b/net-p2p/freenet/files/freenet-libNativeThreadpath.patch
deleted file mode 100644
index 368bc0d37..000000000
--- a/net-p2p/freenet/files/freenet-libNativeThreadpath.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- freenet/src/freenet/support/LibraryLoader.java	2008-02-26 18:01:40.000000000 +0100
-+++ freenet/src/freenet/support/LibraryLoader.java.new	2008-02-26 20:39:02.000000000 +0100
-@@ -18,50 +18,12 @@
-  */
- public class LibraryLoader {
- 	
--	public static String getSimplifiedArchitecture() {
--		String arch;
--		if(System.getProperty("os.arch").toLowerCase().matches("(i?[x0-9]86_64|amd64)")) {
--			arch = "amd64";
--		} else if(System.getProperty("os.arch").toLowerCase().matches("(ppc)")) {
--			arch = "ppc";
--		} else {
--			arch = "i386";
--		}
--		
--		return arch;
--	}
--	
- 	public static void loadNative(String path, String libraryName) {
--		final boolean isWindows = File.pathSeparatorChar == '\\';
--		final String libraryNameWithPrefix = (isWindows ? "" : "lib") + libraryName;
--		final String libraryNameWithPrefixAndArch = libraryNameWithPrefix + '-' + getSimplifiedArchitecture();
--		final String libraryNameWithPrefixAndArchAndSuffix = libraryNameWithPrefixAndArch + (isWindows ? ".dll" : ".so");
--		String resourceName = path + libraryNameWithPrefixAndArchAndSuffix;
- 		
- 		try {
--			// Get the resource
--			URL resource = LibraryLoader.class.getResource(resourceName);
--			
--			// Get input stream from jar resource
--			InputStream inputStream = resource.openStream();
--
--			// Copy resource to filesystem in a temp folder with a unique name
--			File temporaryLib = File.createTempFile(libraryNameWithPrefixAndArch, ".tmp");
--			
--			// Delete on exit the dll
--			temporaryLib.deleteOnExit();
--			
--			FileOutputStream outputStream = new FileOutputStream(temporaryLib);
--			byte[] array = new byte[2048];
--			int read = 0;
--			while((read = inputStream.read(array)) > 0) {
--				outputStream.write(array, 0, read);
--			}
--			outputStream.close();
--
--			// Finally, load the dll
--			System.out.println("Attempting to load the "+libraryName+" library ["+resource+']');
--			System.load(temporaryLib.getPath());
-+			File temporaryLib=new File("lib/lib"+libraryName+".so");
-+			System.out.println("Attempting to load the NativeThread library ["+temporaryLib.getAbsolutePath()+']');
-+			System.load(temporaryLib.getAbsolutePath());
- 		} catch(Throwable e) {
- 			e.printStackTrace();
- 		}
diff --git a/net-p2p/freenet/files/freenet-libfec8path.patch b/net-p2p/freenet/files/freenet-libfec8path.patch
deleted file mode 100644
index 7a08e5552..000000000
--- a/net-p2p/freenet/files/freenet-libfec8path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- contrib/fec/fec_src/com/onionnetworks/fec/Native8Code.java.old	2008-02-21 19:46:43.000000000 +0100
-+++ contrib/fec/fec_src/com/onionnetworks/fec/Native8Code.java	2008-02-21 19:27:10.000000000 +0100
-@@ -3,6 +3,7 @@
- //import java.security.AccessController;
- //import sun.security.action.*;
- import com.onionnetworks.util.*;
-+import java.io.File;
- 
- /**
-  * This class is the frontend for the JNI wrapper for the C implementation of
-@@ -21,14 +22,9 @@
-     private int code;
-     
-     static {
--        String path = NativeDeployer.getLibraryPath
--            (Native8Code.class.getClassLoader(),"fec8");
--        if (path != null) {
--            System.load(path);
--        } else {
--            System.out.println("Unable to find native library for fec8 for platform "+NativeDeployer.OS_ARCH);
--	    System.out.println(path);
--        }
-+			File path = new File("lib/libfec8.so");
-+			System.out.println("Loading FEC lib ["+path.getAbsolutePath()+']');
-+			System.load(path.getAbsolutePath());
-     }
-     
-     public Native8Code(int k, int n) {
diff --git a/net-p2p/freenet/files/wrapper.conf.patch b/net-p2p/freenet/files/wrapper.conf.patch
new file mode 100644
index 000000000..da3c45748
--- /dev/null
+++ b/net-p2p/freenet/files/wrapper.conf.patch
@@ -0,0 +1,16 @@
+--- wrapper.conf	2008-03-30 16:12:53.000000000 +0200
++++ wrapper.conf.new	2008-03-30 16:16:12.000000000 +0200
+@@ -1,8 +1,10 @@
+ wrapper.java.command=java

+-wrapper.working.dir=../

++wrapper.working.dir=/opt/freenet/

+ wrapper.java.mainclass=freenet.node.NodeStarter

+-wrapper.java.classpath.1=freenet.jar

+-wrapper.java.classpath.2=freenet-ext.jar

++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.2/lib/je.jar

++wrapper.java.classpath.4=/usr/share/fec/lib/fec.jar

+ wrapper.java.library.path.1=lib

+ wrapper.java.initmemory=60

+ wrapper.java.maxmemory=128

diff --git a/net-p2p/freenet/freenet-0.7_beta_pre1126.ebuild b/net-p2p/freenet/freenet-0.7_beta_pre1126.ebuild
deleted file mode 100644
index 22f80fdf2..000000000
--- a/net-p2p/freenet/freenet-0.7_beta_pre1126.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="http://www.freenetproject.org/"
-SRC_URI="http://dev.gentooexperimental.org/~tommy/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="dev-java/sun-jdk
-	dev-java/ant"
-RDEPEND="virtual/jre
-	net-p2p/fec
-	net-p2p/nativebiginteger
-	dev-java/java-service-wrapper"
-PDEPEND="net-p2p/NativeThread"
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	enewgroup freenet
-	enewuser freenet -1 -1 /opt/freenet freenet
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/freenet-libfec8path.patch "${FILESDIR}"/wrapper.conf.patch
-}
-
-src_install() {
-	emake install || die "emake install failed"
-	doinitd "${FILESDIR}"/freenet
-	dodoc license/README license/LICENSE.Mantissa
-}
-
-pkg_postinst () {
-	elog "1. Start freenet with /etc/init.d/freenet start."
-	elog "2. Open localhost:8888 in your browser for the web interface."
-	elog " "
-	elog "If you dont know trusted people running freenet,"
-	elog "enable opennet (\"insecure mode\") on the config page to get started."
-	elog " "
-	cp /opt/freenet/freenet-cvs-snapshot.jar /opt/freenet/freenet-stable-latest.jar && chown -R freenet:freenet /opt/freenet
-}
-
-pkg_postrm() {
-	elog "If you dont want to use freenet any more"
-	elog "and dont want to keep your identity/other stuff"
-	elog "remember to do 'rm -rf /opt/freenet' to remove everything"
-}
diff --git a/net-p2p/freenet/freenet-0.7_beta_pre1130.ebuild b/net-p2p/freenet/freenet-0.7_beta_pre1130.ebuild
new file mode 100644
index 000000000..776f8506a
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7_beta_pre1130.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=1
+WRAPPER_DATE=20080330
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="An encrypted network without censorship"
+HOMEPAGE="http://www.freenetproject.org/"
+SRC_URI="http://dev.gentooexperimental.org/~tommy/${P}.tar.bz2
+	http://dev.gentooexperimental.org/~tommy~/wrapper-${WRAPPER_DATE}.conf"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/db-je:3.2
+	dev-java/fec
+	dev-java/java-service-wrapper"
+DEPEND=">=dev-java/sun-jdk-1.4
+	dev-java/ant
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.4
+	net-p2p/fec
+	net-p2p/nativebiginteger
+	${CDEPEND}"
+PDEPEND="net-p2p/NativeThread"
+S="${WORKDIR}/${PN}"
+
+EANT_BUILD_TARGET="dist"
+
+pkg_setup() {
+	enewgroup freenet
+	enewuser freenet -1 -1 /opt/freenet freenet
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp "${DISTDIR}"/wrapper-${WRAPPER_DATE}.conf wrapper.conf
+	epatch "${FILESDIR}"/wrapper.conf.patch
+	epatch "${FILESDIR}"/ext.patch
+	use amd64 && sed -i -e 's/=lib/=lib64/g' wrapper.conf
+	mkdir -p lib
+	cd lib
+	java-pkg_jar-from db-je-3.2
+	java-pkg_jar-from java-service-wrapper
+	java-pkg_jar-from fec
+}
+
+src_install() {
+	mv lib/freenet-cvs-snapshot.jar freenet.jar
+	java-pkg_dojar freenet.jar
+	doinitd "${FILESDIR}"/freenet
+	dodoc license/README license/LICENSE.Mantissa \
+		AUTHORS README
+	insinto /opt/freenet
+	doins seednodes.fref wrapper.conf run.sh
+	dodir /opt/freenet/bin
+	dosym /usr/bin/wrapper /opt/freenet/bin/wrapper
+	dodir /opt/freenet/$(get_libdir)
+	dosym ../../../usr/$(get_libdir)/java-service-wrapper/libwrapper.so /opt/freenet/$(get_libdir)/libwrapper.so
+	fperms +x /opt/freenet/run.sh
+}
+
+pkg_postinst () {
+	elog "1. Start freenet with /etc/init.d/freenet start."
+	elog "2. Open localhost:8888 in your browser for the web interface."
+	elog " "
+	elog "If you dont know trusted people running freenet,"
+	elog "enable opennet (\"insecure mode\") on the config page to get started."
+	elog " "
+	chown freenet:freenet /opt/freenet
+}
+
+pkg_postrm() {
+	elog "If you dont want to use freenet any more"
+	elog "and dont want to keep your identity/other stuff"
+	elog "remember to do 'rm -rf /opt/freenet' to remove everything"
+}