net-p2p/freenet: New upstream release

svn path=/sunrise/; revision=4569

5 files changed, 12 insertions, 62 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index eaea456b6..f4cfc89b4 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Sep 2007; Thomas Sachau (Tommy[D]) thomas.sachau@gmx.de
+  +freenet-0.7.1058.ebuild:
+  New upstream release
+
   02 Sep 2007; Thomas Sachau (Tommy[D]) thomas.sachau@gmx.de
   +files/freenet.pem, +files/servers, +metadata.xml,
   +freenet-0.7.1056.ebuild:
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 64cc8bd00..33473e0f8 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,9 +1,7 @@
-AUX freenet.pem 2553 RMD160 e57b58c6b5dc41868c1f8150ca059cf066b5f3ea SHA1 9c8d8e08869bef357c479ba1a22803ceb4489c29 SHA256 ed235c96b41180d028869cacb71eb9e6b55b307f30567c8a9637c1e860093b72
-AUX servers 84 RMD160 3b6883c602df6b9903f9f056cf6d21ee6d9ebe54 SHA1 2a3a99f23241d0d6118c75267f4ec4b171e066f7 SHA256 31838b799f01c9fe8591ca6f4c95938259afde73b71ffc26ae4dbbacee094717
-DIST freenet-sources-v1056.tar.gz 1208171 RMD160 d7abf0bab4d2410b7d85bd46641d8970036252b1 SHA1 020509202e9a514180724d3168fdecc30c653283 SHA256 11deaf08c14092ff35dded114c8a40df5943758345b8bf511e087a973c0e5983
+DIST freenet-sources-v1058.tar.bz2 19105758 RMD160 7939fbb08fabd485a03413c4a4dbe1a2316a64be SHA1 0c162a8a660291e25e16f08f468c30dd17108b37 SHA256 07d2b68871d62e68fbf9f34f3a6bbcc0487c5d56fc3bb26e68445caa6f7d192c
 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-0.7.1056.ebuild 2679 RMD160 5e4a3234d625a15d67a709bba550b19357c57ced SHA1 436ab693181ad1775fe2af6f141c6e069bce04c0 SHA256 1042ad99853a78443e1dd536c19b48a96b2644feba7c2f3e0abced3addc0a00a
-MISC ChangeLog 294 RMD160 c4e1f3a40428b60d034518b07e8a9000ea4a61a6 SHA1 3bb5da5de9904a85243cf72f2f87f60b6f7e394c SHA256 5919b81394a631f04cd9436c39d3de501b832525652f2eecc1087c99e2c54b5c
+EBUILD freenet-0.7.1058.ebuild 2203 RMD160 86f0e1653bdc599f00a7d8888a69f27f77d7b47c SHA1 a922ef70f2982805584ff18a751a187fda518281 SHA256 d8ef552984fb0f4244eff32ec4143e32f85f1166761eb43939e380e992002909
+MISC ChangeLog 407 RMD160 167575ab48835ef08a2c10e317d784e4eb96b3a4 SHA1 98932ae4b51de25d68d071ecf83e97ecf859cc33 SHA256 d7bf61d858495132de080bafc2d51cd5633f5187d8094997389589ca8886b936
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-p2p/freenet/files/freenet.pem b/net-p2p/freenet/files/freenet.pem
deleted file mode 100644
index e9c516e1d..000000000
--- a/net-p2p/freenet/files/freenet.pem
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHLzCCBRegAwIBAgIJAPWhTq7ZNK/WMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
-VQQGEwJYWDETMBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZXdoZXJl
-MRgwFgYDVQQKEw9GcmVlbmV0IFByb2plY3QxCzAJBgNVBAsTAkNBMRswGQYDVQQD
-ExJmcmVlbmV0cHJvamVjdC5vcmcxJzAlBgkqhkiG9w0BCQEWGGFkbWluQGZyZWVu
-ZXRwcm9qZWN0Lm9yZzAeFw0wNTEwMjYwODMxMTNaFw0xNTEwMjQwODMxMTNaMIGj
-MQswCQYDVQQGEwJYWDETMBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29t
-ZXdoZXJlMRgwFgYDVQQKEw9GcmVlbmV0IFByb2plY3QxCzAJBgNVBAsTAkNBMRsw
-GQYDVQQDExJmcmVlbmV0cHJvamVjdC5vcmcxJzAlBgkqhkiG9w0BCQEWGGFkbWlu
-QGZyZWVuZXRwcm9qZWN0Lm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBAN0McbHfVWFVJQ5zO1nF7KbzilxmAD9n4xHmdE1JP08cQ4Xo07Yzd0EYX8C3
-8JiO4keL1bhTmuwmg1y2Mp2VI8qbzgKj0owTelfoDF3KByc3qztC03+a2JDvvF/d
-uHppaMweLp/0jyudwQ/AFaAK4/fQx24PRlDEEZpLPSw5mCmobAr/D5sqjVwwTqBv
-Kf06ND5hY1zcfkl3g+kNlr0HOgffNVx/S5WksicvbqF67XXzgP9NmX6hcnAxa4Lg
-vd5n2M2piJUKhlMvWtQxRwy/9zhWr7QSSUGEgSO9B4ZDXTF5pM/D5P4jATJ1grOV
-Zb5phhsqBNWTq2WuRvTt9CX3ljTvPBCjhXITLkJgn85LUg5bR8p8z3u65KNIGNgf
-hM9uW54+8jJuZUtVvaw3HqpYGUVgQK3/VEfNANpYFVVHkKLnSR6Ugd4q9sModH/9
-RNoi124aRYZ+aBnrtYjGb4UeKrcH0C2z9EAGKgAxoFE7DJfgaAF99uOm9eHe5qGy
-ThiNWt6RlsPT8depyBg5AyJ7afOvrCLcluvhDYkOm/CJCdlNsasbzu3CgcdM0zzL
-YzkOVgBwpfJJCA8OSYOCQW9Cl4S02zwZnJ4JZARI9ScGSCBDbDTHsnJNOaExJowq
-WZn48f/iXavAFPE1StJ2HO/P1KdHmI1LSymyBo6OdxbmzFcZAgMBAAGjggFiMIIB
-XjAdBgNVHQ4EFgQUgDlMU2bvuTuKT5hc+PAsYDTiDJcwgdgGA1UdIwSB0DCBzYAU
-gDlMU2bvuTuKT5hc+PAsYDTiDJehgamkgaYwgaMxCzAJBgNVBAYTAlhYMRMwEQYD
-VQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21ld2hlcmUxGDAWBgNVBAoTD0Zy
-ZWVuZXQgUHJvamVjdDELMAkGA1UECxMCQ0ExGzAZBgNVBAMTEmZyZWVuZXRwcm9q
-ZWN0Lm9yZzEnMCUGCSqGSIb3DQEJARYYYWRtaW5AZnJlZW5ldHByb2plY3Qub3Jn
-ggkA9aFOrtk0r9YwDwYDVR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcw
-CQYDVR0SBAIwADAjBgNVHREEHDAagRhhZG1pbkBmcmVlbmV0cHJvamVjdC5vcmcw
-DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4ICAQBpDEjzYIJ6RLxr4KQT
-c7o0bQRXySqOPUpjrj/y7l+lrmiuy8SfsDcKc8ZvJz6R8s3hULsNibr+XlmK5LrS
-4Xv3JxWCLZ4zposqYcnKIEfuwCyoE39akGS+RTuuQuFe77xsrOk7TaooPLCMFx8m
-JeB7tYNY2ARjgHs856AHDebm+Fc/s6E9G9JECG4uVHiMARFidn38VQ03tEQ/ssLQ
-zueCtRM9/oqpy3hY1p62C6oPSb+VYemI5xukYv4V5ZRaJ8uAv10VI7Y3GwZRssn+
-Ei6hyZkMMGgoBaUnbkphRkD03et/733JrVmweAIA1kfq3R/EGZBQB/3l+H2L/PQl
-Y9tP3WeA+gqzrZgLS5flODJvKRDA0Jn4Y61z2mP2t51ajGD0t3uvGgTBwaB37MuC
-emW39dALz9oBdHAd3lxT2/HKG0ZvtxXVouygMYNWszzTTSBfT/5wr+7nl5//VEep
-JNUM6D+mrCHS5Af+afr16PHhLIwO5fRfZ2OaKoX6y6Re6wTMozTddZ7v01ueaSpG
-FcyEJp8VW9cluz15Z4oO2cq3n5kyI1cDbJDq36JebLw0GJ4M+zVnIQF0J45ArlH9
-WXyuG4FNueuHwuZNYvYtmwO8mUgjzFHLe1fJGDackJd0uHu9REWUK331gcEMJW+K
-wGpL7XVh96NOVOxPQfdRnETSpw==
------END CERTIFICATE-----
diff --git a/net-p2p/freenet/files/servers b/net-p2p/freenet/files/servers
deleted file mode 100644
index 0cb92c884..000000000
--- a/net-p2p/freenet/files/servers
+++ /dev/null
@@ -1,2 +0,0 @@
-[global]
-ssl-authority-files = /usr/local/portage/net-p2p/freenet/files/freenet.pem
diff --git a/net-p2p/freenet/freenet-0.7.1056.ebuild b/net-p2p/freenet/freenet-0.7.1058.ebuild
index eedb92b01..a6459559b 100644
--- a/net-p2p/freenet/freenet-0.7.1056.ebuild
+++ b/net-p2p/freenet/freenet-0.7.1058.ebuild
@@ -4,14 +4,14 @@
 
 inherit eutils versionator
 
-MY_R1="14941"
 MY_V="$(get_version_component_range 3)"
 DESCRIPTION="An encrypted network without censorship"
 HOMEPAGE="http://www.freenetproject.org/"
 SRC_URI="http://downloads.freenetproject.org/alpha/installer/${PN}07.tar.gz
 	http://downloads.freenetproject.org/alpha/update/update.sh
 	http://downloads.freenetproject.org/alpha/update/wrapper.conf
-	http://emu.freenetproject.org/sources/${PN}-sources-v${MY_V}.tar.gz"
+	http://dev.gentooexperimental.org/~tommy/${PN}-sources-v${MY_V}.tar.bz2
+	http://www.tommyserver.de/mirrors/${PN}-sources-v${MY_V}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,14 +19,12 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND="dev-java/sun-jdk
-	dev-util/subversion
 	dev-java/ant"
 RDEPEND="virtual/jre"
 
 S="${WORKDIR}/${PN}"
 RESTRICT="userpriv mirror"
 
-SVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/svn-src/${PN}"
 QA_TEXTRELS="opt/freenet/lib/libwrapper-linux-x86-32.so"
 
 pkg_setup() {
@@ -40,25 +38,18 @@ src_unpack() {
 	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
-	unpack ${PN}-sources-v${MY_V}.tar.gz
-	addwrite "${SVN_STORE_DIR}"
-	mkdir -p "${SVN_STORE_DIR}" || die "could not mkdir"
-	cd "${SVN_STORE_DIR}" && cp "${FILESDIR}"/servers "${FILESDIR}"/freenet.pem .
-	svn --config-dir . -r ${MY_R1} co https://emu.freenetproject.org/svn/trunk/contrib
-	cp -R contrib "${S}"/
+	unpack ${PN}-sources-v${MY_V}.tar.bz2
 }
 
 src_compile() {
 	cd contrib
-	sed -i -e "s:../bdb/lib/je.jar:../bdb/build/lib/je.jar:g" freenet_ext/build.xml
-	sed -i -e "s:@custom@:${MY_R1}:g" freenet_ext/ExtVersion.java
 	mkdir -p bdb/examples
 	cd freenet_ext
 	ant||die "freenet-ext failed"
-	cd ../../${PN}-sources-${MY_V} && mkdir lib && cp ../contrib/freenet_ext/freenet-ext.jar lib/ && rm -R ../contrib
+	cd ../../${PN} && mkdir lib && cp ../contrib/freenet_ext/freenet-ext.jar lib/ && rm -R ../contrib
 	ant|| die "freenet-stable-latest failed"
 	cp lib/*.jar ../
-	cd .. && rm -R ${PN}-sources-${MY_V}
+	cd .. && rm -R ${PN}
 	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' \