net-p2p/freenet: Add freemail support

svn path=/sunrise/; revision=7201

5 files changed, 22 insertions, 10 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index a942cfc9f..afa3593c2 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: $
 
+  08 Oct 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  freenet-0.7_p1165.ebuild, freenet-9999-r1.ebuild:
+  Add freemail support
+
   28 Sep 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   -freenet-0.7_p1164.ebuild, +freenet-0.7_p1165.ebuild,
   freenet-9999-r1.ebuild:
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index c21d23e60..3ec32bc57 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -4,7 +4,7 @@ AUX freenet.old 643 RMD160 be7dc68fed6caf7062f9b3250be6223513d375ff SHA1 50f7069
 AUX wrapper1.conf 1846 RMD160 b75534061632064f7ebd9153260b021a7f23c076 SHA1 b6df84ded6f31b1a2c0757cdf7c8736e9b744181 SHA256 00b09246fd598c6ce13836d79104e4964de538ac1d9b3af6fa7bf240f142ca00
 DIST freenet-0.7_p1165.tar.bz2 2247846 RMD160 20174fa6c1c02cfe1d61adbfd64d93b844a2789e SHA1 0e7c583f329df7f1937466e4f3649c35ae88f4b3 SHA256 e3399f19704857c0effd790c013f241410eb990e367fc420ac0db0cbb1956803
 DIST seednodes-20080928.fref 28703 RMD160 8f92609f1d8beb3164d8f4d5e35c4539a6824dc3 SHA1 9c5a2a2f6188850b8503c1e31ae79e9964c4662a SHA256 ed153fe40f36c6088f97c4d7bed15333722b7e6b27b7c9efd0c506cd7b79f7c3
-EBUILD freenet-0.7_p1165.ebuild 3317 RMD160 9d8d10a61182a340a7c770a682814a5ed6cba4da SHA1 eb37fd60a2548e84a4a3a17d41954748cfddfd76 SHA256 9006f2ba8764bb64edbe2008436e9f18e8f9eb41b34f3dbe59e09777e3b594ef
-EBUILD freenet-9999-r1.ebuild 4022 RMD160 989d64f9c4138127db77347dbf492ed2550d6592 SHA1 11102c2c38610470877b15a8da48c60c2783fc4a SHA256 78368e26aad359f264d6d44d29711073b9c5abbca28f9b9581959639c49c110b
-MISC ChangeLog 13879 RMD160 3351ea99d7443ac3b284a12df0c61410e0014435 SHA1 f437bc5091f6c05c431edd5c5d083c1129235ec1 SHA256 5fa359409c646ad4c4be23435f707e0f7d6fd9441df1e71190dbf372f11b5b44
-MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
+EBUILD freenet-0.7_p1165.ebuild 3474 RMD160 4b5da28c1e5d97c09e86be3cb01ac9e183e5c087 SHA1 cecb80de964200d488cb0f97e9cd6cbca6879d16 SHA256 16ff63feb2465460f86a4988c355e6176567eb336b801385e1cce7d0985ab2ea
+EBUILD freenet-9999-r1.ebuild 4159 RMD160 c30bba3f34c73cb660914f6656ad91972cd3e750 SHA1 775631f5aa3c443aca76c7a62861376e318e6439 SHA256 67f15dcb6ad13e18d8e87aaf4a342287cc793d32a44c9237fd33d2d982169e13
+MISC ChangeLog 14014 RMD160 aa4a08d1073c534638868b6cc41bf05e8316cefa SHA1 ac73434c4a7c957e47db26bc4487e15caca7174e SHA256 2a5f792ca53ccde26da8c7627a23c343b524bbc759da30c8e58ee8756627a7d3
+MISC metadata.xml 238 RMD160 61d35251af6d2d13fa32d5c455dbf179174ca375 SHA1 b2ff81a006f10b2a9d37722a77eb70be65abb9e8 SHA256 9425b3716c550570a17382ba0b1a9fbf3243483ea6117ae94453ee7047362f8a
diff --git a/net-p2p/freenet/freenet-0.7_p1165.ebuild b/net-p2p/freenet/freenet-0.7_p1165.ebuild
index 02d5cc68a..51236eb74 100644
--- a/net-p2p/freenet/freenet-0.7_p1165.ebuild
+++ b/net-p2p/freenet/freenet-0.7_p1165.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentooexperimental.org/~tommy/distfiles/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="freemail"
 
 CDEPEND="dev-db/db-je:3.3
 	dev-java/fec
@@ -25,7 +25,9 @@ RDEPEND=">=virtual/jre-1.5
 	x86? ( net-libs/fec )
 	net-libs/nativebiginteger
 	${CDEPEND}"
-PDEPEND="net-libs/NativeThread"
+PDEPEND="net-libs/NativeThread
+	freemail? ( dev-java/bcprov
+		net-mail/Freemail )"
 S="${WORKDIR}/${PN}"
 
 EANT_BUILD_TARGET="dist"
@@ -50,6 +52,7 @@ 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"
+	use freemail && echo "wrapper.java.classpath.5=/usr/share/bcprov/lib/bcprov.jar" >> wrapper.conf
 	mkdir -p lib
 	cd lib
 	java-pkg_jar-from db-je-3.3
diff --git a/net-p2p/freenet/freenet-9999-r1.ebuild b/net-p2p/freenet/freenet-9999-r1.ebuild
index 352ae6aec..578add1eb 100644
--- a/net-p2p/freenet/freenet-9999-r1.ebuild
+++ b/net-p2p/freenet/freenet-9999-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://dev.gentooexperimental.org/~tommy/distfiles/seednodes-${DATE}.fr
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="freemail"
 
 CDEPEND="dev-db/db-je:3.3
 	dev-java/fec
@@ -28,10 +28,11 @@ RDEPEND=">=virtual/jre-1.5
 	x86? ( net-libs/fec )
 	net-libs/nativebiginteger
 	${CDEPEND}"
-PDEPEND="net-libs/NativeThread"
+PDEPEND="net-libs/NativeThread
+	freemail? ( dev-java/bcprov
+		net-mail/freemail )"
 S="${WORKDIR}/${PN}"
 
-RESTRICT="userpriv"
 EANT_BUILD_TARGET="dist"
 MY_FREENET_LATEST="-trunk"
 
@@ -68,6 +69,7 @@ src_unpack() {
 	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
 	mkdir -p lib
 	cd lib
 	java-pkg_jar-from db-je-3.3
diff --git a/net-p2p/freenet/metadata.xml b/net-p2p/freenet/metadata.xml
index 7e3286984..c427e4a63 100644
--- a/net-p2p/freenet/metadata.xml
+++ b/net-p2p/freenet/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>maintainer-wanted</herd>
+	<herd>maintainer-wanted</herd>
+	<use>
+		<flag name='freemail'>Add Freemail support</flag>
+	</use>
 </pkgmetadata>