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

svn path=/sunrise/; revision=6216

4 files changed, 20 insertions, 17 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index cf881804d..5789b9c36 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 May 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7_p1150.ebuild, +freenet-0.7_p1151.ebuild, freenet-9999.ebuild:
+  New upstream release + update live ebuild
+
   16 May 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   -freenet-0.7_pre1149.ebuild, +freenet-0.7_pre1150.ebuild,
   freenet-9999.ebuild:
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index f57d27b2c..496ae020c 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -2,10 +2,10 @@ AUX ext.patch 5065 RMD160 168a521cea56770a9551ef6554d2df57248564e8 SHA1 f20a6ab8
 AUX freenet 476 RMD160 feff89049a1107a5be2f99951634ab3192403420 SHA1 c71427613ca58e6336d2de19f4544dbf623712bb SHA256 19d3fcebd56a2578e330518d0dd41ba504102c993a23305d2f596520f6403de8
 AUX freenet.old 452 RMD160 c07cd94a5f7ec882824b14a4f0e26cba05c1480c SHA1 beaf4d84a50ad3658160434d2de3379dafd81ec0 SHA256 af03d1479f8b42a5e7b7747486c40d76ebef99c5ed19fdcb185af03123f8c232
 AUX wrapper.conf.patch 691 RMD160 a4f534fb81d20972d80d16a579a5f493918149d1 SHA1 e280d06f42e310cd96f207f5ffdb28ed18364425 SHA256 354dc64eab82bbc312ac226fab56932da7d7fc085bef2a8eb0092229f112ce1d
-DIST freenet-0.7_p1150.tar.bz2 2042987 RMD160 13b497d504983cc02a48beae96ac659dee52f7a8 SHA1 8239fde77848710d684faab7583658551f0775d0 SHA256 c544b65976c9597ad81a6fe39dac2b25f9d182606a39c94f2bd56839c1630044
-DIST seednodes-20080516.fref 37067 RMD160 d94312c09239162e1db13e2f4ea5b03235e62d68 SHA1 dd9fe42e3111c1b10079189b6e46d68f894ebac4 SHA256 9d9d3c587e20038306e8e1924a794b3030b73303d3617acc983e0e457dda7769
+DIST freenet-0.7_p1151.tar.bz2 2040461 RMD160 225ab0e99bb411273e89c90a916007c014ba7e3e SHA1 796a507a0489d11fde4ec15958f1e8b74298d6f6 SHA256 ddea5077e5d87d146da19ddfbfb5f29ac08e1dd240be548c13e9430486197bf8
+DIST seednodes-20080524.fref 37086 RMD160 caa60a34d6bbfc2aa9261f6987dbc3b7076a6c3a SHA1 c90640934467653178bc1f8dd835b49c8fdeef3a SHA256 6d12be16493c4ce3163f2dac85bd9809f60bf36321e913d71c1078d8759267fb
 DIST wrapper-20080330.conf 1667 RMD160 77c0e4d379521ce10da408dd35ec0ebb5c82f4a9 SHA1 7f8679579c47e2c0644d26c67c26d779bf6f8d75 SHA256 70a98acb43b43b00b45bda40de5745ba188d366dd69c5d97968aa4494b7441f0
-EBUILD freenet-0.7_p1150.ebuild 3077 RMD160 508399bebc07ecb70bd18d59835c7005ef02dd52 SHA1 71bed49360ceb6160299719232262ba969f0482f SHA256 7cc5860ba3720fff6744e080d721adbf918293acc6f7a4fd57ddb37d542c72c6
-EBUILD freenet-9999.ebuild 3590 RMD160 33a85dec7737f328c6bafc1359166e2b9c309ac3 SHA1 662106d7c574931a71461fd54ff830abaf7fe190 SHA256 bf60e62bb7083e6ce86283affe643c3b86c0ae405e4972e117b09d9c8a91a68d
-MISC ChangeLog 10000 RMD160 3be84ed27029271f251d4149d17148e6e8d0b2fa SHA1 6b36d28c468aece441fdbe0453f48426cd1a231f SHA256 403d4bb25a459256e6e79f501cba847b95a14670050468966c9057bab43c3dbd
+EBUILD freenet-0.7_p1151.ebuild 3087 RMD160 9a4a41d82b7ffd3f7046dd2550031f25282895c7 SHA1 65e1fad941fbd2671b38d0e2ae7783ac3bcd367d SHA256 f1244f62204085954f38c256ce76dc9c6377099f54795cb140909e44e8fdfa5a
+EBUILD freenet-9999.ebuild 3553 RMD160 336c3522b19d91b9ef6eb75c6b16fcc0e9ea7861 SHA1 ac967515ebaca24a7302fef3b788e423c0aedc82 SHA256 1fd71ce999780f2994a88d81d3ba705e8f622063625f72277d53b21e600a9a6a
+MISC ChangeLog 10181 RMD160 b551d77b02eee60e1e7e8aad23453503e6e17a1b SHA1 03fc160a2229d79945dbcef9c16976f3c8e5fa8d SHA256 da4bb1ade2ac06c8503bb389b5292f529bd492d0d1d4a649fd9b4b2573833f99
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-p2p/freenet/freenet-0.7_p1150.ebuild b/net-p2p/freenet/freenet-0.7_p1151.ebuild
index 734b47c95..24f6ef54a 100644
--- a/net-p2p/freenet/freenet-0.7_p1150.ebuild
+++ b/net-p2p/freenet/freenet-0.7_p1151.ebuild
@@ -9,7 +9,7 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="An encrypted network without censorship"
 HOMEPAGE="http://www.freenetproject.org/"
 SRC_URI="http://dev.gentooexperimental.org/~tommy/distfiles/${P}.tar.bz2
-	http://dev.gentooexperimental.org/~tommy/wrapper-${WRAPPER_DATE}.conf"
+	http://dev.gentooexperimental.org/~tommy/distfiles/wrapper-${WRAPPER_DATE}.conf"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,10 +19,10 @@ IUSE=""
 CDEPEND="dev-java/db-je:3.2
 	dev-java/fec
 	dev-java/java-service-wrapper"
-DEPEND=">=dev-java/sun-jdk-1.4
+DEPEND=">=dev-java/sun-jdk-1.5
 	dev-java/ant-core
 	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.4
+RDEPEND=">=virtual/jre-1.5
 	x86? ( net-libs/fec )
 	net-libs/nativebiginteger
 	${CDEPEND}"
diff --git a/net-p2p/freenet/freenet-9999.ebuild b/net-p2p/freenet/freenet-9999.ebuild
index ad0e58d48..f209ca05e 100644
--- a/net-p2p/freenet/freenet-9999.ebuild
+++ b/net-p2p/freenet/freenet-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=1
-DATE=20080516
+DATE=20080524
 DATE2=20080330
 ESVN_REPO_URI="http://freenet.googlecode.com/svn/trunk/freenet"
 ESVN_OPTIONS="--ignore-externals"
@@ -12,7 +12,7 @@ inherit eutils java-pkg-2 java-ant-2 subversion
 DESCRIPTION="An encrypted network without censorship"
 HOMEPAGE="http://www.freenetproject.org/"
 SRC_URI="http://dev.gentooexperimental.org/~tommy/distfiles/seednodes-${DATE}.fref
-	http://dev.gentooexperimental.org/~tommy/wrapper-${DATE2}.conf"
+	http://dev.gentooexperimental.org/~tommy/distfiles/wrapper-${DATE2}.conf"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,12 +23,11 @@ CDEPEND="dev-java/db-je:3.2
 	dev-java/fec
 	dev-java/java-service-wrapper"
 DEPEND="dev-util/subversion
-	>=dev-java/sun-jdk-1.4
+	>=dev-java/sun-jdk-1.5
 	dev-java/ant-core
 	dev-util/subversion
 	${CDEPEND}"
-RDEPEND="x86? ( >=virtual/jre-1.4 )
-	amd64? ( >=virtual/jre-1.5 )
+RDEPEND=">=virtual/jre-1.5
 	x86? ( net-libs/fec )
 	net-libs/nativebiginteger
 	${CDEPEND}"
@@ -69,12 +68,12 @@ src_unpack() {
 src_compile() {
 	#workaround for installed blackdown-jdk-1.4
 	#freenet does not compile with it
-	if has_version =dev-java/sun-jdk-1.4*; then
-		GENTOO_VM="sun-jdk-1.4" java-pkg-2_src_compile
+	if has_version =dev-java/sun-jdk-1.6*; then
+		GENTOO_VM="sun-jdk-1.6" java-pkg-2_src_compile
 	elif has_version =dev-java/sun-jdk-1.5*; then
 		GENTOO_VM="sun-jdk-1.5" java-pkg-2_src_compile
-	elif has_version =dev-java/sun-jdk-1.6*; then
-		GENTOO_VM="sun-jdk-1.6" java-pkg-2_src_compile
+	elif has_version =dev-java/sun-jdk-1.4*; then
+		die ">=dev-java/sun-jdk-1.5 not found"
 	fi
 }