Version bump, remove all old versions, update patch

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 11 insertions, 98 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index e95a66660252..f89ff2b9882e 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.58 2009/06/01 21:06:36 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.59 2009/06/04 17:41:17 tommy Exp $
+
+*freenet-0.7_p1214 (04 Jun 2009)
+
+  04 Jun 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7_p1212.ebuild, -freenet-0.7_p1213.ebuild,
+  +freenet-0.7_p1214.ebuild, files/ext.patch:
+  Version bump, remove all old versions, update patch
 
 *freenet-0.7_p1213 (01 Jun 2009)
 
diff --git a/net-p2p/freenet/files/ext.patch b/net-p2p/freenet/files/ext.patch
index a98e7f846bcb..f461150c4648 100644
--- a/net-p2p/freenet/files/ext.patch
+++ b/net-p2p/freenet/files/ext.patch
@@ -8,7 +8,7 @@ diff -ur freenet-old/build.xml freenet/build.xml
 -	<target name="get-extjar" depends="env" unless="freenet-ext.present"
 -		description="Download some external libraries which Freenet relies on">
 -		<mkdir dir="${lib}"/>
--		<get src="http://downloads.freenetproject.org/alpha/freenet-ext.jar" 
+-		<get src="http://checksums.freenetproject.org/cc/freenet-ext.jar" 
 -			dest="${freenet-ext.location}" 
 -			verbose="true"
 -			usetimestamp="true"/>
diff --git a/net-p2p/freenet/freenet-0.7_p1213.ebuild b/net-p2p/freenet/freenet-0.7_p1213.ebuild
deleted file mode 100644
index 1fcf439fbb36..000000000000
--- a/net-p2p/freenet/freenet-0.7_p1213.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7_p1213.ebuild,v 1.1 2009/06/01 21:06:36 tommy Exp $
-
-EAPI="1"
-DATE=20090413
-
-EGIT_REPO_URI="git://github.com/freenet/fred-official.git"
-EGIT_PROJECT="freenet/fred-official"
-EGIT_TREE="5bc0e634a968824bf471fef53d26dd16d9c27a55"
-
-inherit eutils git java-pkg-2 java-ant-2 multilib
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="http://www.freenetproject.org/"
-SRC_URI="mirror://gentoo/seednodes-${DATE}.fref"
-
-LICENSE="as-is GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="freemail"
-
-CDEPEND="dev-db/db-je:3.3
-	dev-java/fec
-	dev-java/java-service-wrapper
-	dev-java/db4o-jdk11
-	dev-java/db4o-jdk12
-	dev-java/db4o-jdk5
-	dev-java/ant-core
-	dev-java/lzma
-	dev-java/lzmajio
-	dev-java/mersennetwister"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	net-libs/nativebiginteger
-	${CDEPEND}"
-PDEPEND="net-libs/NativeThread
-	freemail? ( dev-java/bcprov )"
-
-EANT_BUILD_TARGET="dist"
-EANT_GENTOO_CLASSPATH="ant-core db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper lzma lzmajio mersennetwister"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup freenet
-	enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_unpack() {
-	git_src_unpack
-	cd "${S}"
-	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/ext.patch
-	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" freenet-wrapper.conf || die "sed failed"
-	use freemail && echo "wrapper.java.classpath.12=/usr/share/bcprov/lib/bcprov.jar" >> freenet-wrapper.conf
-	java-ant_rewrite-classpath
-}
-
-src_install() {
-	java-pkg_newjar lib/freenet-cvs-snapshot.jar ${PN}.jar
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-	dodoc AUTHORS README || die
-	insinto /etc
-	doins freenet-wrapper.conf || die
-	insinto /var/freenet
-	doins run.sh || die
-	newins "${DISTDIR}"/seednodes-${DATE}.fref seednodes.fref || die
-	fperms +x /var/freenet/run.sh
-	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
-}
-
-pkg_postinst () {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/freenet start."
-	elog "2. Open localhost:8888 in your browser for the web interface."
-	#workaround for previously existing freenet user
-	[[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
-		freenet:freenet /var/freenet
-}
-
-pkg_postrm() {
-	if [ -z has_version ]; then
-		elog " "
-		elog "If you dont want to use freenet any more"
-		elog "and dont want to keep your identity/other stuff"
-		elog "remember to do 'rm -rf /var/freenet' to remove everything"
-	fi
-}
diff --git a/net-p2p/freenet/freenet-0.7_p1212.ebuild b/net-p2p/freenet/freenet-0.7_p1214.ebuild
index 741fd98c2d0f..3c6bd7e42221 100644
--- a/net-p2p/freenet/freenet-0.7_p1212.ebuild
+++ b/net-p2p/freenet/freenet-0.7_p1214.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7_p1212.ebuild,v 1.1 2009/05/27 17:41:31 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7_p1214.ebuild,v 1.1 2009/06/04 17:41:17 tommy Exp $
 
 EAPI="1"
 DATE=20090413
 
 EGIT_REPO_URI="git://github.com/freenet/fred-official.git"
 EGIT_PROJECT="freenet/fred-official"
-EGIT_TREE="ea7a1649735e86f558776d40d7e2d15798b8ee91"
+EGIT_TREE="22484d3ae10939f28de2aa00d6fa457c25a3e8e4"
 
 inherit eutils git java-pkg-2 java-ant-2 multilib