net-p2p/freenet-bin: New upstream release

svn path=/sunrise/; revision=4595

3 files changed, 24 insertions, 19 deletions

diff --git a/net-p2p/freenet-bin/ChangeLog b/net-p2p/freenet-bin/ChangeLog
index 65bf561b2..ad6a03ec3 100644
--- a/net-p2p/freenet-bin/ChangeLog
+++ b/net-p2p/freenet-bin/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Sep 2007; Thomas Sachau (Tommy[D]) thomas.sachau@gmx.de
+  -freenet-bin-0.7.1058.ebuild, +freenet-bin-0.7.1060.ebuild:
+  New upstream release
+
   08 Sep 2007; Markus Ullmann <jokey@gentoo.org> freenet-bin-0.7.1058:
   unbreak it again
 
diff --git a/net-p2p/freenet-bin/Manifest b/net-p2p/freenet-bin/Manifest
index 7286513f3..ade39450b 100644
--- a/net-p2p/freenet-bin/Manifest
+++ b/net-p2p/freenet-bin/Manifest
@@ -1,8 +1,8 @@
 DIST freenet-ext.jar 2452429 RMD160 fdac9646f7fbb5ee82ad62580191695cc6bef593 SHA1 712aaf061e5e35df47ab6727476b78a0cf8c47da SHA256 1ab33492054eb6e8550f608d3b7d6f3a5117b5905f342bfad8cb38a2a9350bf2
-DIST freenet-r14996-snapshot.jar 2127232 RMD160 09c28f513c2a724269fb02983f51eb66b10d4dee SHA1 d1f0f157f922f85526c169d76215bdac2fdac7ff SHA256 026de7b19a8b7aa589acc8c9c6b823907bbc75375131770344bfd2bcdf85a5a0
+DIST freenet-r15074-snapshot.jar 2131029 RMD160 1ade10454cd6dca2fe0d65268cff6e2f5e55de4c SHA1 3bdb74eed0c668fabce3bd96fea2c0ca55410d14 SHA256 db51063e0f5509e702d1e15f682c75e50794f9cb22a610a73dda85deb99baa4c
 DIST freenet07.tar.gz 383366 RMD160 d6f7baee05c1fe2d713fa345fae10bc25287b61e SHA1 8e9ddde6420f5cc24824467747b7a3bcbc21b15c SHA256 aae56bd0d2ed7d80217b1eccab1cf3a946a517df83fc6c1a9de7b95fd82724aa
 DIST update.sh 3115 RMD160 e65f151e06b5a6425dcb59f03b4874ec1e8b5047 SHA1 e024bcfc443982fcc3d888088ef427943fa62f71 SHA256 df80518672316ae8d330e08ef50f170eabacd9003eeac975a400523d0f61922c
 DIST wrapper.conf 1706 RMD160 413f4fec1f60b6d4651f1ffd945e6d9ec2275e39 SHA1 8ec5648d5677325a867118e687f1e05cfe4a417a SHA256 f56a8e897297107c3ea2c95da5f321556e1ac82e87d81f339610f8bb27ecd88b
-EBUILD freenet-bin-0.7.1058.ebuild 2362 RMD160 ae78b5fde1ca1d4675b1c35a64bdf625206d09d2 SHA1 8d89c255822babe9d9a66d018f00dff34d51d7f2 SHA256 dd1dd3c64d61a49a6930bb083973344edaa95eab9fe76d4551046c617f39e818
-MISC ChangeLog 1489 RMD160 a5849b48f693ad5fddd0e38581798cb8bc839e93 SHA1 43024780a0cbe038fcfe2c192ad3ee887d69cade SHA256 639018bcecaff23dec76949cfa90f2305052fde72d7ac1e1e62c971d1dccc291
+EBUILD freenet-bin-0.7.1060.ebuild 2381 RMD160 5fb310e8e0e0beb0fc26bb6a5f8c5de4cec5aed6 SHA1 10aa52c64f45918d0081170e47cdf90627c226d2 SHA256 2289f04ce30ff53fc9043c96f244c4f422dfcf9545b3d860a9527ac2f79c2a58
+MISC ChangeLog 1636 RMD160 9e8079e19c469bda36e07eb7e4bf5593faf5fcd9 SHA1 319b28ab94a0018f5891c516441e644761aa3d4e SHA256 e736a73a3f299f7166c3cc33724162144e302bb452687b18d4f33f2875b12b86
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-p2p/freenet-bin/freenet-bin-0.7.1058.ebuild b/net-p2p/freenet-bin/freenet-bin-0.7.1060.ebuild
index 7f3860a61..58107d84c 100644
--- a/net-p2p/freenet-bin/freenet-bin-0.7.1058.ebuild
+++ b/net-p2p/freenet-bin/freenet-bin-0.7.1060.ebuild
@@ -4,7 +4,7 @@
 
 inherit eutils
 
-MY_JAR_REV="r14996"
+MY_JAR_REV="r15074"
 MY_JAR_FILE="freenet-${MY_JAR_REV}-snapshot.jar"
 
 DESCRIPTION="An encrypted network without censorship"
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.freenetproject.org/alpha/installer/freenet07.tar.gz
 	http://downloads.freenetproject.org/alpha/update/update.sh
 	http://downloads.freenetproject.org/alpha/update/wrapper.conf
 	http://downloads.freenetproject.org/alpha/${MY_JAR_FILE}
-	http://www.tommyserver.de/mirrors/${MY_JAR_FILE}
+	http://dev.gentooexperimental.org/~tommy$/${MY_JAR_FILE}
 	http://downloads.freenetproject.org/alpha/freenet-ext.jar"
 
 LICENSE="GPL-2"
@@ -22,14 +22,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND=""
-RDEPEND=">=virtual/jre-1.4"
+RDEPEND="!net-p2p/freenet
+	>=virtual/jre-1.4"
 
 S="${WORKDIR}/${PN/-bin/}"
 
 RESTRICT="userpriv mirror"
 
-QA_TEXTRELS="opt/freenet/lib/libwrapper-linux-x86-32.so
-	opt/freenet/lib/libwrapper-linux-x86-64.so"
+QA_TEXTRELS="opt/freenet/lib/libwrapper-linux-x86-32.so"
 
 pkg_setup() {
 	enewgroup freenet
@@ -40,11 +40,12 @@ src_unpack() {
 	unpack "freenet07.tar.gz"
 	cd "${S}"
 	rm bin/wrapper-macosx* bin/wrapper-linux-ppc-* lib/libwrapper-macosx*.* \
-	lib/libwrapper*ppc-*.so update stun mdns librarian bin/1run.sh bin/*jar
-	sed -ie 's:./bin/wrapper:/opt/freenet/bin/wrapper:g' run.sh
-	sed -ie 's:./wrapper.conf:/opt/freenet/wrapper.conf:g' run.sh
-	sed -ie 's:PIDDIR=".":PIDDIR="/opt/freenet/":g' run.sh
-	sed -ie 's:#RUN_AS_USER=:RUN_AS_USER=freenet:g' run.sh
+	lib/libwrapper*ppc-*.so update stun mdns librarian bin/1run.sh bin/*jar \
+	welcome.html INSTALL README
+	sed -i -e 's:./bin/wrapper:/opt/freenet/bin/wrapper:g' \
+	-e 's:./wrapper.conf:/opt/freenet/wrapper.conf:g' \
+	-e 's:PIDDIR=".":PIDDIR="/opt/freenet/":g' \
+	-e 's:#RUN_AS_USER=:RUN_AS_USER=freenet:g' run.sh
 }
 
 src_compile() {
@@ -55,16 +56,12 @@ src_install() {
 	cd "${S}"
 	newinitd run.sh freenet
 
-	dodoc INSTALL README 
-
 	insinto /opt/freenet
 	doins ${DISTDIR}/freenet-ext.jar ${DISTDIR}/${MY_JAR_FILE}
-	doins ${DISTDIR}/update.sh ${DISTDIR}/wrapper.conf 
-	doins -r welcome.html run.she update.sh bin lib
-	newins ${DISTDIR}/${MY_JAR_FILE} freenet-stable-latest.jar
+	doins ${DISTDIR}/update.sh ${DISTDIR}/wrapper.conf
+	doins -r update.sh bin lib
 	dosym freenet-stable-latest.jar /opt/freenet/freenet.jar
 	fperms 755 /opt/freenet/bin/wrapper-linux-x86-{32,64}
-	fperms 755 /opt/freenet/{run.she,update.sh}
 	fowners -R freenet:freenet /opt/freenet/
 }
 
@@ -73,4 +70,8 @@ pkg_postinst () {
 	einfo "2. Open localhost:8888 in your browser for the web interface."
 	einfo "3. After uninstalling freenet delete /opt/freenet manually (unless you want to keep it for a later reinstall)"
 	einfo "   as freenet creates some extra stuff not deleted by portage"
+	if (diff /opt/freenet/${MY_JAR_FILE} /opt/freenet/freenet-stable-latest.jar >/dev/null 2>&1); then :;
+	else
+		cp /opt/freenet/${MY_JAR_FILE} /opt/freenet/freenet-stable-latest.jar
+	fi
 }