Version bump, drop old, update live ebuild

Package-Manager: portage-2.2.0_alpha2-r1/cvs/Linux x86_64

6 files changed, 51 insertions, 349 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index abe28362b125..66738c025fab 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.101 2010/11/10 21:08:56 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.102 2010/11/22 15:54:20 tommy Exp $
+
+*freenet-0.7.5_p1304 (22 Nov 2010)
+
+  22 Nov 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1302.ebuild, +freenet-0.7.5_p1304.ebuild,
+  freenet-9999.ebuild, -files/build.xml, -files/ext.patch:
+  Version bump, drop old, update live ebuild
 
 *freenet-0.7.5_p1302 (10 Nov 2010)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 5d987b74165d..290c3a735879 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -3,27 +3,24 @@ Hash: SHA1
 
 AUX 0.7.5_p1297-ext.patch 1701 RMD160 1c8e9959d26e98f6ad6b92bae6598c1583863f6e SHA1 54f5d8c5e0158d91010d292a8d7358b474a7aef5 SHA256 c407f6f803255b120b613eae55c3e2e8da0bed2040cf7cbd0aae5e9b23a252db
 AUX 0.7.5_p1302-ext.patch 947 RMD160 5931df622dca62591cbffce5176330acce82567d SHA1 94a91e0a3f1598a26c569b14f81ca50f53d983ee SHA256 66eae4637f9248bf2407e8bb5361b86aa3f1d04acdfca4207a3596877430fbdc
-AUX build.xml 10312 RMD160 6450c456c8213e506028a07c136b6beff123c90a SHA1 5f47db388f23d834ddea6375cd6313ad52ec611c SHA256 e305e70acd2c39989996556795c122780957f58936974db17badbe64015e01d7
-AUX ext.patch 2053 RMD160 afa68b9e7635930a8673e0a4e802987d5ac74fde SHA1 00c94df2b753adc8560573181a5b6042a00b615d SHA256 78a1143dd9281fd25a4a6b34b60f60a2e2e274a7f3d23b115a36b5820543fb5d
 AUX freenet 476 RMD160 fdce44749587d73cb3f5b916e893e3bb95ef3200 SHA1 48eb8bfbd27a17b0bb3b29248ce4c43b59a76bda SHA256 4a8482117a434e9885438b7ca5384851bff49fefa28b13e33494a746c781342f
 AUX freenet.old 452 RMD160 e9e834fedf4270c14f3e8d754c58eb05f3f570c5 SHA1 edb5d0ab062d46f494db88560885d7ee7b026e29 SHA256 b3047b40128bbd7843dc370ab0aa150a9836ed789f48181bd6d8fc72f1714fa6
 AUX run.sh-20090501 16217 RMD160 f8b03990d011e1f149ec43aa536fd7540a19f01a SHA1 123fb5cf1c9b50357156fa300c5015a7e0ca65ad SHA256 470aa99d083a16d2f620282502a59546611f1903e21aef50b93b10d9fada7d7a
 AUX strip-openjdk-check.patch 4015 RMD160 c512338ac1dc9ca88082f403d8a4bc4dfcb98c07 SHA1 8e2e7c6eb7bb0f738d9afd73b2b32f7f5b2d515b SHA256 74f4d18e590b181d60ee41c1d3aa9ede8525fd643cdfa4e4688d1c8310ec893c
 AUX strip-version-check.patch 349 RMD160 579ddfdf6549263e7ec2b9190eff6d08d6a2d5c4 SHA1 58e7422d180e4f443d415ec424646933eceeceb8 SHA256 35a33e5c52288505eefca96a6fbb98ae725d6fbefb727e73e513a1356b5cbfef
 AUX wrapper1.conf 2396 RMD160 e029cb5feaf98a03234a061362c0989207fdfd23 SHA1 9b882dc0d366b946596bdecb1b1d45c1e221e4e0 SHA256 52e5e283ac4c43d78feecf1edf5ccb38e5505c89624769976fcbf4ac2c8a1572
-DIST freenet-0.7.5_p1302.zip 3612557 RMD160 fc4c18545fb65884c55ba6327039c1df974927da SHA1 dcbb8c25458fbdf3a112378415ca765c562a2ffd SHA256 28bfbd1d0fb988faa0dbd2db48841e81e054df69b0cf19580fa9000ebc7d1759
-DIST seednodes-20100820.fref 17507 RMD160 c370edbf3b3de662ff335f6ba85892f9290e691f SHA1 b1a1f73ab2b88dd50d67e4c6d28d7f52743070d6 SHA256 e3db41e689f01c85205ea02d93fc366b5a6da40a05181a39f78f787754a4d342
-DIST seednodes-20101003.fref 17394 RMD160 3236cbb13d7361a9781cbf051c558015d154ba30 SHA1 6c6516652d3cd50a2a918c5e1e6a1577c935788e SHA256 de82d4f8eade8a77d7bef4141777f1d77c730e2b7950fe6a63ec337a290f4cf8
-EBUILD freenet-0.7.5_p1302.ebuild 3150 RMD160 133c4e687abd23f1a0008c4b2b1f25fb77a1778e SHA1 65d3d37af552425a948828cb7a1ede878d671d7c SHA256 3ce5f282d653fc71475810cdc6b96c582a0eda3403c7313e0ec46171bb81ca5e
-EBUILD freenet-9999.ebuild 2733 RMD160 d95947e1a70353cd8f0aafbe3b87ed5ae4e91df0 SHA1 f3eeadc312c102ba4430b2d0a76edf00448cbc19 SHA256 e367a1aceaf3177cb537c3605cfd5185719f5048199f5870f161a9821544c07b
-MISC ChangeLog 10689 RMD160 95c4d1c0ea3266f9fa16d07f7f8bbeeca8a929b9 SHA1 8e8d717cc294f3312142c636eb167f7565513f72 SHA256 90c7807b506926c20bb84d3c3d42cb5aad10dbcc4454fa91f815020f2173d303
+DIST freenet-0.7.5_p1304.zip 3615180 RMD160 453f9ba36150511cfcd9267537f354f6389ff0d5 SHA1 3679efd46cd2136d730b201dda74eb3059ecca5e SHA256 1e187366ead252e96418648391afa1ae2b084dce4a518ec4c9663aada8f7fc6f
+DIST seednodes-20101030.fref 15810 RMD160 7e8091941da4d324d76466400aea627edc75ddf3 SHA1 68489e1fe439726d630211bc7ea062dec7c04c86 SHA256 218d22d391c82278625b4d0057092c5731a7e97821d31ac84d77dcf18b6cdc10
+EBUILD freenet-0.7.5_p1304.ebuild 3436 RMD160 7a626a2b68990fe93e143e54d4fe72097a83b310 SHA1 7bb40ef9c1d4e7fa97f20ee09cd0139c4e872252 SHA256 e565b1def270fdfbf392ea1b936579646bdd85fc29064d78052a53d19f7a9115
+EBUILD freenet-9999.ebuild 3095 RMD160 0b53c7d491c98d5f6abd5921b5cb93f9d612da9b SHA1 3c30afc05ee702db0374d4f5bcf87899cc5d39d4 SHA256 e8558c801830f516f4951696628e681285a3417648f8556fd09ee91ac9fc16d5
+MISC ChangeLog 10949 RMD160 1df6e2e2c71e0d712477d4373bb89712afc80b6a SHA1 c81a39769bef35a8e4da677b046c7fa86f8e9148 SHA256 3a06b8749e1540bd74205e141c7329707cde5270b7b236c8a6b96cc5ac6ee75b
 MISC metadata.xml 332 RMD160 692365bdee16dc9218a18a306e5b15a4b2684206 SHA1 6f1d02202549206e3c5856c9a5a99b334015f7c9 SHA256 869705ebd157480153ca5ddbf7c48426b4374a8cba10164a1f1582fde5afa3a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iJwEAQECAAYFAkzbCjAACgkQG7kqcTWJkGe6NwP+Ll1QgrewI8FWsCiBoCIp+bJO
-zB+8j5sSqLtdNS3n3MsNsjUHuZMR+wysKvZs4i8YtB19g66tEsmI4nsxaJFfUWNV
-v2fRfH1OTae+Pt6sgpIl6+5AjzdEKXSqWZm4oxV3qtr21uPHOHuxUkfM/cMNqqJY
-1+qLw7IxZTsyaII46f8=
-=kG9v
+iJwEAQECAAYFAkzqksgACgkQG7kqcTWJkGcqAQP/Yu6PBUMylPJWVMWiWvtUTxhe
+wHVC5m9wAG0lT1sMqf1RFWPipgbW64qNFOzzuVioLi3+xQDcgFv8ZQcUoT2ena6j
+gwQNSIwzEgGZAhvkr0F7OVeEQCT/bahV25yWzqwSK2alEWWXxgWJLWQ4y8eEbdxw
+jsLp4jkegBYYgqPy0ZE=
+=Z+5o
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/files/build.xml b/net-p2p/freenet/files/build.xml
deleted file mode 100644
index a522e98471cd..000000000000
--- a/net-p2p/freenet/files/build.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="dist" basedir="." name="Freenet" >
-	<description >
-		This file builds Freenet: What is Freenet?
-
-		Freenet is free software which lets you publish and obtain information on the Internet without fear of censorship. To achieve this freedom, the network is entirely decentralized and publishers and consumers of information are anonymous. Without anonymity there can never be true freedom of speech, and without decentralization the network would be vulnerable to attack.
-
-		Possible targets: compile, dist (default), clean
-	</description>
-
-	
-	<property file="build.properties" ></property>
-
-
-	
-	<property name="src" location="src" ></property>
-	<property name="test" location="test" ></property>
-	<property name="build" location="build" ></property>
-	<property name="build-test" location="build-test" ></property>
-	<property name="lib" location="lib" ></property>
-	<property name="freenet-ext.location" location="${lib}/freenet-ext.jar" ></property>
-	<property name="javadoc" location="javadoc" ></property>
-	<property name="minExtVersion" value="-1" ></property>
-	<property name="recommendedExtVersion" value="-1" ></property>
-	<property name="GWT.generatedjs" value="${src}/freenet/clients/http/staticfiles/freenetjs" ></property>
-	<property name="GWT.lib" value="generator/js/lib" ></property>
-	<property name="GWT.lib.dev" value="${GWT.lib}/gwt-dev.jar" ></property>
-	<property name="GWT.lib.user" value="${GWT.lib}/gwt-user.jar" ></property>
-	<property name="version.src" value="freenet/node/Version.java" ></property>
-	<property name="version.build" value="freenet/node/Version.class" ></property>
-	<property name="junit.location" value="/usr/share/java/junit.jar" ></property>
-	<available property="junit.present" file="${junit.location}" ></available>
-
-	<path id="lib.path" >
-		<pathelement location="${freenet-ext.location}" ></pathelement>
-		<pathelement location="gnu-crypto.jar" ></pathelement>
-		<pathelement location="javax-security.jar" ></pathelement>
-		<pathelement location="javax-crypto.jar" ></pathelement>
-	</path>
-
-	<assertions >
-		<enable ></enable>
-	</assertions>
-
-	<exec failifexecutionfails="false" executable="git" errorProperty="git.errror" resultproperty="git.result" outputproperty="git.describe" >
-		<arg value="describe" ></arg>
-		<arg value="--always" ></arg>
-		<arg value="--abbrev=4" ></arg>
-	</exec>
-	<condition property="git.revision" value="${git.describe}" else="@unknown@" >
-		<and >
-			<equals arg1="${git.result}" arg2="0" ></equals>
-			<isset property="git.describe" ></isset>
-		</and>
-	</condition>
-	
-
-	<target name="mkdir" >
-		<mkdir dir="${build}" ></mkdir>
-		<mkdir dir="${build-test}" ></mkdir>
-		<mkdir dir="${lib}" ></mkdir>
-	</target>
-
-	<target depends="mkdir" name="env" description="Learn about the environment" >
-		<available property="freenet-ext.present" file="${lib}/freenet-ext.jar" ></available>
-		
-		<available property="generatedjs.present" type="dir" file="${GWT.generatedjs}" ></available>
-		<echo level="verbose" >Javascript generation present:${generatedjs.present}</echo>
-		<available property="GWT.lib.dev.present" file="${GWT.lib.dev}" ></available>
-		<echo level="verbose" >gwt-dev-linux.jar present:${GWT.lib.dev.present}</echo>
-		<available property="GWT.lib.user.present" file="${GWT.lib.user}" ></available>
-		<echo level="verbose" >gwt-user.jar present:${GWT.lib.user.present}</echo>
-	</target>
-	
-	<target depends="env" unless="GWT.lib.dev.present" name="get-GWT-lib-dev" >
-		<mkdir dir="${GWT.lib}" ></mkdir>
-		<get dest="${GWT.lib}/gwt-dev.jar" src="http://localhost/gwt-dev.jar" verbose="true" usetimestamp="true" ></get>
-		<property name="GWT.lib.dev.present" value="true" ></property>
-	</target>
-	
-	<target depends="env" unless="GWT.lib.user.present" name="get-GWT-lib-user" >
-		<mkdir dir="${GWT.lib}" ></mkdir>
-		<get dest="${GWT.lib}/gwt-user.jar" src="http://localhost/gwt-user.jar" verbose="true" usetimestamp="true" ></get>
-		<property name="GWT.lib.user.present" value="true" ></property>
-	</target>
-	
-	<target unless="generatedjs.present" name="get-GWT-libs" >
-	    <antcall target="get-GWT-lib-dev" ></antcall>
-	    <antcall target="get-GWT-lib-user" ></antcall>
-	</target>
-	
-	<target depends="env,get-GWT-libs" unless="generatedjs.present" name="generate-js" >
-		<ant antfile="build.xml" dir="generator/js" ></ant>
-	</target>
-
-	<target depends="env" unless="freenet-ext.present" name="get-extjar" description="Download some external libraries which Freenet relies on" >
-		<mkdir dir="${lib}" ></mkdir>
-		<get dest="${freenet-ext.location}" src="http://checksums.freenetproject.org/cc/freenet-ext.jar" verbose="true" usetimestamp="true" ></get>
-		<property name="freenet-ext.present" value="true" ></property>
-	</target>
-
-	<condition property="do.junit" value="true" >
-		<and >
-			<isfalse value="${skip_tests}" ></isfalse>
-			<isset property="junit.present" ></isset>
-		</and>
-	</condition>
-	
-
-	<target depends="mkdir" name="compile" >
-		
-		<tstamp ></tstamp>
-
-		
-		<copy tofile="${build}/${version.src}" overwrite="true" file="${src}/${version.src}" ></copy>
-		<delete quiet="true" file="${build}/${version.build}" ></delete>
-		<replace file="${build}/${version.src}" >
-			<replacefilter token="@custom@" value="${git.revision}" ></replacefilter>
-		</replace>
-		<echo message="Updated build version to ${git.revision} in ${build}/${version.src}" ></echo>
-
-		
-		<javac target="1.5" destdir="${build}" source="1.5" debug="on" srcdir="${src}" optimize="on" classpath="${gentoo.classpath}" >
-<!--			<compilerarg value="-Xlint" ></compilerarg> -->
-			
-			<sourcepath >
-				<pathelement path="${build}" ></pathelement>
-			</sourcepath>
-			<classpath >
-				<path refid="lib.path" ></path>
-			</classpath>
-			
-			<include name="freenet/**/*.java" ></include>
-			<include name="net/i2p/util/*.java" ></include>
-			<include name="org/**/*.java" ></include>
-			<exclude name="**/package-info.java" ></exclude>
-			<exclude name="${version.src}" ></exclude>
-		</javac>
-
-		
-		<javac target="1.5" destdir="${build}" source="1.5" debug="on" srcdir="${build}" optimize="on" classpath="${gentoo.classpath}" >
-			<classpath >
-				<path refid="lib.path" ></path>
-			</classpath>
-			<include name="${version.src}" ></include>
-		</javac>
-
-		
-		<copy todir="${build}/freenet/clients/http/staticfiles" >
-			<fileset dir="${src}/freenet/clients/http/staticfiles" ></fileset>
-		</copy>
-		
-		<copy todir="${build}/freenet/l10n" >
-			<fileset dir="${src}/freenet/l10n" >
-				<include name="freenet.l10n.*.properties" ></include>
-				<include name="freenet.l10n.*.tab" ></include>
-			</fileset>
-		</copy>
-
-	</target>
-
-
-	
-
-	<target depends="compile,unit" name="dist" description="generate the distribution" >
-		
-		<jar basedir="${build}" jarfile="${lib}/freenet-cvs-snapshot.jar" >
-			<manifest >
-				<attribute name="Main-Class" value="freenet/node/Node" ></attribute>
-				<attribute name="Built-By" value="${user.name}" ></attribute>
-				<attribute name="Required-Ext-Version" value="${minExtVersion}" ></attribute>
-				<attribute name="Recommended-Ext-Version" value="${recommendedExtVersion}" ></attribute>
-				<attribute name="Class-Path" value="freenet-ext.jar" ></attribute>
-				<section name="common" >
-					<attribute name="Specification-Title" value="Freenet" ></attribute>
-					<attribute name="Specification-Version" value="0.7.5" ></attribute>
-					<attribute name="Specification-Vendor" value="freenetproject.org" ></attribute>
-					<attribute name="Implementation-Title" value="Freenet" ></attribute>
-					<attribute name="Implementation-Version" value="0.7.5 ${TODAY} ${git.revision}" ></attribute>
-					<attribute name="Implementation-Vendor" value="Freenetproject.org" ></attribute>
-				</section>
-			</manifest>
-			<exclude name="${version.src}" ></exclude>
-		</jar>
-	</target>
-
-	
-
-	<target depends="compile" name="unit-build" if="do.junit" >
-		<delete dir="${build-test}" ></delete>
-		<mkdir dir="${build-test}" ></mkdir>
-
-		<javac target="1.5" destdir="${build-test}" source="1.5" debug="on" srcdir="${test}" optimize="on" classpath="${gentoo.classpath}" >
-			<classpath >
-				<path refid="lib.path" ></path>
-				<pathelement path="${build}" ></pathelement>
-				<pathelement location="${junit.location}" ></pathelement>
-			</classpath>
-			<compilerarg value="-Xlint" ></compilerarg>
-			<include name="**/*.java" ></include>
-			<exclude name="*.java" ></exclude>
-		</javac>
-		<copy todir="${build-test}/freenet/client/filter/png" >
-			<fileset dir="${test}/freenet/client/filter/png" ></fileset>
-		</copy>
-		<copy todir="${build-test}/freenet/client/filter/bmp" >
-			<fileset dir="${test}/freenet/client/filter/bmp" ></fileset>
-		</copy>
-	</target>
-
-	<target depends="unit-build" name="unit" if="do.junit" >
-		<junit fork="yes" haltonfailure="yes" printsummary="yes" >
-			<classpath >
-				<path refid="lib.path" ></path>
-				<pathelement path="${build}" ></pathelement>
-				<pathelement path="${build-test}" ></pathelement>
-				<pathelement location="${junit.location}" ></pathelement>
-			</classpath>
-
-			<formatter usefile="false" type="plain" ></formatter>
-
-			<batchtest fork="yes" >
-				<fileset dir="${build-test}" >
-					<include name="**/*Test.class" ></include>
-				</fileset>
-			</batchtest>
-			<sysproperty value="${benchmark}" key="benchmark" ></sysproperty>
-			<sysproperty value="${extensiveTesting}" key="extensiveTesting" ></sysproperty>
-			
-			<assertions >
-				<enable ></enable>
-			</assertions>
-		</junit>
-	</target>
-
-	
-
-	<target name="clean" description="Delete class files and docs dir." >
-		<delete dir="${build}" ></delete>
-		<delete dir="${build-test}" ></delete>
-	</target>
-	<target name="distclean" description="Delete class files, lib dir and docs dir." >
-		<delete dir="${build}" ></delete>
-		<delete dir="${build-test}" ></delete>
-		<delete dir="${lib}" ></delete>
-		<delete dir="${javadoc}" ></delete>
-		<ant antfile="build.xml" target="deleteGenerated" dir="generator/js" ></ant>
-		
-	</target>
-
-
-	<target name="javadoc" >
-		<javadoc sourcepath="${src}" use="true" destdir="${javadoc}" >
-			<fileset dir="${src}" includes="**/*.java" ></fileset>
-			<classpath >
-				<pathelement location="${freenet-ext.location}" ></pathelement>
-			</classpath>
-			<link href="http://java.sun.com/j2se/1.5.0/docs/api" ></link>
-		</javadoc>
-	</target>
-</project>
diff --git a/net-p2p/freenet/files/ext.patch b/net-p2p/freenet/files/ext.patch
deleted file mode 100644
index 60730f9d0434..000000000000
--- a/net-p2p/freenet/files/ext.patch
+++ /dev/null
@@ -1,53 +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;
- 	}
- 
- 	/**
---- build.xml	2010-05-10 21:38:15.000000000 +0200
-+++ build.xml.new	2010-05-10 21:43:29.000000000 +0200
-@@ -124,7 +124,7 @@
- 	</condition>
- 	<!-- ================================================== -->
- 
--	<target name="compile" depends="get-extjar, generate-js">
-+	<target name="compile" depends="mkdir">
- 		<!-- Create the time stamp -->
- 		<tstamp/>
- 
diff --git a/net-p2p/freenet/freenet-0.7.5_p1302.ebuild b/net-p2p/freenet/freenet-0.7.5_p1304.ebuild
index 9b2421a210c0..25d8e65add94 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1302.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1304.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1302.ebuild,v 1.1 2010/11/10 21:08:56 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1304.ebuild,v 1.1 2010/11/22 15:54:20 tommy Exp $
 
 EAPI="2"
-DATE=20101003
+DATE=20101030
+JAVA_PKG_IUSE="doc source"
 
 inherit eutils java-pkg-2 java-ant-2 multilib
 
@@ -15,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.zip
 LICENSE="as-is GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="freemail"
+IUSE="freemail test"
 
 CDEPEND="dev-db/db-je:3.3
 	dev-java/fec
@@ -27,18 +28,22 @@ CDEPEND="dev-db/db-je:3.3
 	dev-java/lzma
 	dev-java/lzmajio
 	dev-java/mersennetwister"
-#force secure versions for now
 DEPEND="app-arch/unzip
 	>=virtual/jdk-1.5
-	${CDEPEND}"
+	${CDEPEND}
+	test? ( dev-java/junit )"
 RDEPEND=">=virtual/jre-1.5
 	net-libs/nativebiginteger
 	${CDEPEND}"
 PDEPEND="net-libs/NativeThread
 	freemail? ( dev-java/bcprov )"
 
-EANT_BUILD_TARGET="dist"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="build-clean.xml"
 EANT_GENTOO_CLASSPATH="ant-core db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper lzma lzmajio mersennetwister"
+EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.junit.present=true"
+use test || export EANT_EXTRA_ARGS+=" -Dtest.skip=true"
+use test && EANT_GENTOO_CLASSPATH+=" junit"
 
 pkg_setup() {
 	has_version dev-java/icedtea[cacao] && {
@@ -61,13 +66,12 @@ src_prepare() {
 	epatch "${FILESDIR}"/strip-openjdk-check.patch
 	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" freenet-wrapper.conf || die "sed failed"
 	use freemail && echo "wrapper.java.classpath.12=/usr/share/bcprov/lib/bcprov.jar" >> freenet-wrapper.conf
-	cp "${FILESDIR}"/build.xml . || die
-	java-ant_rewrite-classpath
+	java-ant_rewrite-classpath "${EANT_BUILD_XML}"
 	java-pkg-2_src_prepare
 }
 
 src_install() {
-	java-pkg_newjar lib/freenet-cvs-snapshot.jar ${PN}.jar
+	java-pkg_dojar dist/freenet.jar
 	if has_version =sys-apps/baselayout-2*; then
 		doinitd "${FILESDIR}"/freenet
 	else
@@ -81,6 +85,8 @@ src_install() {
 	newins "${DISTDIR}"/seednodes-${DATE}.fref seednodes.fref || die
 	fperms +x /var/freenet/run.sh
 	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src
 }
 
 pkg_postinst () {
diff --git a/net-p2p/freenet/freenet-9999.ebuild b/net-p2p/freenet/freenet-9999.ebuild
index be30fd96ade5..bc5d9449ca40 100644
--- a/net-p2p/freenet/freenet-9999.ebuild
+++ b/net-p2p/freenet/freenet-9999.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.11 2010/08/20 19:15:58 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.12 2010/11/22 15:54:20 tommy Exp $
 
-EAPI="1"
-DATE=20100820
+EAPI="2"
+DATE=20101030
+JAVA_PKG_IUSE="doc source"
 
 EGIT_REPO_URI="git://github.com/freenet/fred-official.git"
 EGIT_PROJECT="freenet/fred-official"
@@ -17,7 +18,7 @@ SRC_URI="mirror://gentoo/seednodes-${DATE}.fref"
 LICENSE="as-is GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="freemail"
+IUSE="freemail test"
 
 CDEPEND="dev-db/db-je:3.3
 	dev-java/fec
@@ -30,7 +31,8 @@ CDEPEND="dev-db/db-je:3.3
 	dev-java/lzmajio
 	dev-java/mersennetwister"
 DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
+	${CDEPEND}
+	test? ( dev-java/junit )"
 RDEPEND=">=virtual/jre-1.5
 	net-libs/nativebiginteger
 	${CDEPEND}"
@@ -38,8 +40,12 @@ PDEPEND="net-libs/NativeThread
 	freemail? ( dev-java/bcprov )"
 S=${WORKDIR}/${PN}
 
-EANT_BUILD_TARGET="dist"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="build-clean.xml"
 EANT_GENTOO_CLASSPATH="ant-core db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper lzma lzmajio mersennetwister"
+EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.junit.present=true"
+use test || export EANT_EXTRA_ARGS+=" -Dtest.skip=true"
+use test && EANT_GENTOO_CLASSPATH+=" junit"
 
 pkg_setup() {
 	java-pkg-2_pkg_setup
@@ -47,20 +53,18 @@ pkg_setup() {
 	enewuser freenet -1 -1 /var/freenet freenet
 }
 
-src_unpack() {
-	git_src_unpack
-	cd "${S}"
+src_prepare() {
 	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
 	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/ext.patch
+	epatch "${FILESDIR}"/{0.7.5_p1302-ext,strip-openjdk-check}.patch
 	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" freenet-wrapper.conf || die "sed failed"
 	use freemail && echo "wrapper.java.classpath.12=/usr/share/bcprov/lib/bcprov.jar" >> freenet-wrapper.conf
-	java-ant_rewrite-classpath
+	java-ant_rewrite-classpath "${EANT_BUILD_XML}"
 	cp "${DISTDIR}"/seednodes-${DATE}.fref seednodes.fref || die
 }
 
 src_install() {
-	java-pkg_newjar lib/freenet-cvs-snapshot.jar ${PN}.jar
+	java-pkg_dojar dist/freenet.jar
 	if has_version =sys-apps/baselayout-2*; then
 		doinitd "${FILESDIR}"/freenet
 	else
@@ -73,6 +77,8 @@ src_install() {
 	doins seednodes.fref run.sh || die
 	fperms +x /var/freenet/run.sh
 	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src
 }
 
 pkg_postinst() {