net-p2p/freenet: New upstream release + update live ebuild

svn path=/sunrise/; revision=6771

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index d3460f9d22e3dd349627fa37b1d486dbcca34a93..11d50475fa0a04eb8b401750d34620f5e9929791 100644 (file)
--- 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: $
 
+  20 Aug 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7_p1155-r1.ebuild, +freenet-0.7_p1158.ebuild,
+  freenet-9999-r1.ebuild:
+  New upstream release + update live ebuild
+
   11 Aug 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   freenet-9999-r1.ebuild:
   Add missing symlinks

diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 7f5d418c6de09c280116e0f21e15add52239cdee..6b95c7463a7e55aeaa0831113a32f5866b7f0662 100644 (file)
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -2,9 +2,9 @@ AUX ext.patch 4954 RMD160 57fb8ecf9be8900a1ad54306d5c4df1eef6acd80 SHA1 3f9eaacd
 AUX freenet 704 RMD160 0deb810401bb95c488e389b6c207312783dd0040 SHA1 ef22ce8d16b1317739bb03b1954b91a70e1141a0 SHA256 a6afc449cec8f57860a24f7e1e8e14457fc5149c751f40ba775798821a5d3c81
 AUX freenet.old 680 RMD160 be4c017aa2696b798fafbadacaa50dd247b0689e SHA1 8cb1b300824070832db04586a434a0b3c8d23086 SHA256 62b94e1d320205899783090def844837d9ff4dfd43dcda21ea77ba49a9c4bd29
 AUX wrapper1.conf 1792 RMD160 9223ed3fd640840021294ef0302ee1e15501f5f9 SHA1 d5dc1932052b744f3a14bec8ba41af53b4e4c5df SHA256 a5e28c8f908a3de603c01f1722690795df914edde4df27657a2496ba71c37f35
-DIST freenet-0.7_p1155.tar.bz2 2112880 RMD160 a1f6b80820b0e295ebb2ba18360af1d54351218a SHA1 6dea82cd63a1db8e97a03f03154c68da85106a0c SHA256 095a2bc04c4886455780fbfbb7940446f90dabff28c028c57997ae6394a1f6d4
-DIST seednodes-20080721.fref 37077 RMD160 4b7aca1d3864a42f4bbece5cf7d9b410888feebe SHA1 93fa0bbae17e15cbf073ad9da9070de023c265f5 SHA256 37f075bc40611f0db15e3e5012aebbd6a14775f2a70e90ab7838b5f91fa42ac1
-EBUILD freenet-0.7_p1155-r1.ebuild 3197 RMD160 affcb9a57ac75e6d8fc720ae15c4d6bd8162438e SHA1 80781881c3cce67c08632557a3159a16bdc2cc51 SHA256 44529a2e5038e59c6e268a572a085bb05105b26590139b99b22e6ed6f6fa48c2
-EBUILD freenet-9999-r1.ebuild 3760 RMD160 81756566b4b1bb1f4202b0cbc4a687a70658523d SHA1 9871cb83a5d11a0b1ab65ae0613ba710e9bf95c7 SHA256 9ea305c4c07b3bcfe1409916ba715afe3389f6054060022b2344123635e95a61
-MISC ChangeLog 12004 RMD160 b87ae27fb9048d64a5f188dcc3fe6fe6b204c9b7 SHA1 8f890d93d5d033ac95235569783209226f509e96 SHA256 1678fbd48ca263e3182ef39d30277c99d4b1e2602a716239fd565c499bf9383f
+DIST freenet-0.7_p1158.tar.bz2 2075969 RMD160 8e41a2ef1d559b0dd2aa4fa68ce839a656464263 SHA1 b52925dd06dec49061ca899d1903d07259dd7690 SHA256 8184c2c6923e577dc37c9597dc5d3731a13595fc94e92b7a2e2f7a9c23497005
+DIST seednodes-20080820.fref 38625 RMD160 3ec724b07c1724bf56e6acf02acae6f76d2aa8c8 SHA1 49038622b68957fd5b02e28529ada22ce8628db3 SHA256 f6ac96938d7c02b28432de3d2eb4fc3644ad87bd23de9117acbc02b50aeca6a6
+EBUILD freenet-0.7_p1158.ebuild 3124 RMD160 7acbf8cf02054bfad62fb6bcc45a8f089bce6a2e SHA1 e968e306d60f66b8f63e6bf52df17bfa7fb394dc SHA256 3acfdf9bd2ca90aa792ce8d6483e0b1d3dab3def61bd1cc3467c3851a509aac6
+EBUILD freenet-9999-r1.ebuild 3741 RMD160 caf147917d75ab94032dd9b2eb6883a8156c7f4b SHA1 a8abe5e3df0b187396cbf60e28fee2f43cda6168 SHA256 b4c9edf95220b840024efece4d76d7035dbe77aa3614f97686bef4e92b742812
+MISC ChangeLog 12193 RMD160 fdd877b6e00567b1b424295971ecdf12ff52de5d SHA1 18395c19d8939f057b56ac687c41d6297ae817cc SHA256 b6622bfbefe16acdc99423364e54bad45e138b8b802f69377c89acafc68dcfa2
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/net-p2p/freenet/freenet-0.7_p1155-r1.ebuild b/net-p2p/freenet/freenet-0.7_p1158.ebuild
similarity index 97%
rename from net-p2p/freenet/freenet-0.7_p1155-r1.ebuild
rename to net-p2p/freenet/freenet-0.7_p1158.ebuild
index f70eeb418133b89d76e91eee1475d9501a6fab58..81c5663aecfecfc352c6778a32e1719a6f8ff264 100644 (file)
--- a/net-p2p/freenet/freenet-0.7_p1155-r1.ebuild
+++ b/net-p2p/freenet/freenet-0.7_p1158.ebuild
@@ -19,7 +19,6 @@ CDEPEND="dev-java/db-je:3.2
        dev-java/fec
        dev-java/java-service-wrapper"
 DEPEND=">=virtual/jdk-1.5
-       dev-java/ant-core
        ${CDEPEND}"
 RDEPEND=">=virtual/jre-1.5
        x86? ( net-libs/fec )
@@ -50,7 +49,6 @@ src_unpack() {
        cp "${FILESDIR}"/wrapper1.conf wrapper.conf
        epatch "${FILESDIR}"/ext.patch
        sed -i -e "s/=lib/=$(get_libdir)/g" wrapper.conf || die "sed failed"
-       sed -i -e "s:opt/:var/:g" run.sh || die "sed failed"
        mkdir -p lib
        cd lib
        java-pkg_jar-from db-je-3.2

diff --git a/net-p2p/freenet/freenet-9999-r1.ebuild b/net-p2p/freenet/freenet-9999-r1.ebuild
index 56c063455f79e2203294420f0ea99616481d06e5..15ea523d1cfd5de61437ad87e6798f7c1d90defe 100644 (file)
--- a/net-p2p/freenet/freenet-9999-r1.ebuild
+++ b/net-p2p/freenet/freenet-9999-r1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=1
-DATE=20080721
+DATE=20080820
 ESVN_REPO_URI="http://freenet.googlecode.com/svn/trunk/freenet"
 ESVN_OPTIONS="--ignore-externals"
 inherit eutils java-pkg-2 java-ant-2 multilib subversion
@@ -22,7 +22,6 @@ CDEPEND="dev-java/db-je:3.2
        dev-java/fec
        dev-java/java-service-wrapper"
 DEPEND=">=virtual/jdk-1.5
-       dev-java/ant-core
        ${CDEPEND}"
 RDEPEND=">=virtual/jre-1.5
        x86? ( net-libs/fec )