Version bump, drop old, update live ebuild

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

5 files changed, 41 insertions, 336 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/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() {