net-p2p/freenet: New upstream release, update live ebuild, make ebuilds ready for...

[~andy/sunrise] / net-p2p / freenet / freenet-9999-r1.ebuild

diff --git a/net-p2p/freenet/freenet-9999-r1.ebuild b/net-p2p/freenet/freenet-9999-r1.ebuild
index 578add1eb2afe215e3f66d0d4ba171fa2d7912bd..bd88fd44bd60f331531216972332e37fe8ed44ef 100644 (file)
--- a/net-p2p/freenet/freenet-9999-r1.ebuild
+++ b/net-p2p/freenet/freenet-9999-r1.ebuild
@@ -21,7 +21,11 @@ IUSE="freemail"
 CDEPEND="dev-db/db-je:3.3
        dev-java/fec
        dev-java/java-service-wrapper
-       dev-java/db4o"
+       dev-java/db4o
+       dev-java/ant-core
+       dev-java/sevenzip
+       dev-java/lzmajio
+       dev-java/mersennetwister"
 DEPEND=">=virtual/jdk-1.5
        ${CDEPEND}"
 RDEPEND=">=virtual/jre-1.5
@@ -30,28 +34,21 @@ RDEPEND=">=virtual/jre-1.5
        ${CDEPEND}"
 PDEPEND="net-libs/NativeThread
        freemail? ( dev-java/bcprov
-               net-mail/freemail )"
+               net-mail/Freemail )"
 S="${WORKDIR}/${PN}"
 
 EANT_BUILD_TARGET="dist"
-MY_FREENET_LATEST="-trunk"
 
 pkg_setup() {
        java-pkg-2_pkg_setup
        enewgroup freenet
        grep /opt/freenet /etc/passwd >/dev/null
-       if [ $? == "0" ]; then
-               ewarn " "
-               ewarn "Changing freenet homedir from /opt/freenet to /var/freenet"
-               ewarn " "
-               usermod -d /var/freenet freenet || die "Was not able to change freenet homedir from /opt/freenet to /var/freenet"
-       else
-               enewuser freenet -1 -1 /var/freenet freenet
-       fi
+       enewuser freenet -1 -1 /var/freenet freenet
 }
 
 src_unpack() {
        subversion_src_unpack
+       subversion_wc_info
        ESVN_REPO_URI="http://freenet.googlecode.com/svn/trunk/apps/new_installer/res/unix/"
        ESVN_OPTIONS="-N"
        subversion_src_unpack
@@ -65,17 +62,20 @@ src_unpack() {
        head -n 133 run.sh >run1.sh
        tail -n 444 run.sh >>run1.sh
        mv run1.sh run.sh
-       subversion_wc_info
        sed -ie "s:@custom@:${ESVN_WC_REVISION}:g" src/freenet/node/Version.java
        epatch "${FILESDIR}"/ext.patch
        sed -i -e "s/=lib/=$(get_libdir)/g" wrapper.conf || die "sed failed"
-       use freemail && echo "wrapper.java.classpath.5=/usr/share/bcprov/lib/bcprov.jar" >> wrapper.conf
+       use freemail && echo "wrapper.java.classpath.10=/usr/share/bcprov/lib/bcprov.jar" >> wrapper.conf
        mkdir -p lib
        cd lib
        java-pkg_jar-from db-je-3.3
        java-pkg_jar-from java-service-wrapper
        java-pkg_jar-from fec
        java-pkg_jar-from db4o
+       java-pkg_jar-from ant-core ant.jar
+       java-pkg_jar-from sevenzip
+       java-pkg_jar-from lzmajio
+       java-pkg_jar-from mersennetwister
 }
 
 src_install() {
@@ -110,12 +110,6 @@ pkg_postinst () {
        ewarn "You can now edit it without the next update overwriting it."
        elog " "
        chown freenet:freenet /var/freenet
-       if [[ -e /opt/freenet/freenet.ini ]] && ! [[ -e /var/freenet/freenet.ini ]]; then
-               ewarn " "
-               ewarn "Please move freenet to the new location with the following command:"
-               ewarn "         mv /opt/freenet /var/freenet"
-               ewarn " "
-       fi
 }
 
 pkg_postrm() {