3 files changed, 10 insertions, 97 deletions
diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index f6d70ca76d62..0c5d81ed7e28 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.63 2009/07/08 20:22:21 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.64 2009/08/02 21:22:52 tommy Exp $
+
+*freenet-0.7.5_p1227 (02 Aug 2009)
+
+  02 Aug 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7_p1222.ebuild, -freenet-0.7_p1223.ebuild,
+  +freenet-0.7.5_p1227.ebuild:
+  Version bump, drop old versions
 
 *freenet-0.7_p1223 (08 Jul 2009)
 
diff --git a/net-p2p/freenet/freenet-0.7_p1223.ebuild b/net-p2p/freenet/freenet-0.7.5_p1227.ebuild
index 551b925cc823..545219a2946b 100644
--- a/net-p2p/freenet/freenet-0.7_p1223.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1227.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_p1223.ebuild,v 1.1 2009/07/08 20:22:21 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1227.ebuild,v 1.1 2009/08/02 21:22:52 tommy Exp $
 
 EAPI="1"
 DATE=20090708
 
 EGIT_REPO_URI="git://github.com/freenet/fred-staging.git"
 EGIT_PROJECT="freenet/fred-staging"
-EGIT_TREE="ba734379c06664db58e39e763e25e541ba90b6d1"
+EGIT_TREE="c5009c153b0745ad19f16e478fc619a8864d241c"
 
 inherit eutils git java-pkg-2 java-ant-2 multilib
 
diff --git a/net-p2p/freenet/freenet-0.7_p1222.ebuild b/net-p2p/freenet/freenet-0.7_p1222.ebuild
deleted file mode 100644
index 558694284179..000000000000
--- a/net-p2p/freenet/freenet-0.7_p1222.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_p1222.ebuild,v 1.1 2009/06/12 19:24:38 tommy Exp $
-
-EAPI="1"
-DATE=20090612
-
-EGIT_REPO_URI="git://github.com/freenet/fred-official.git"
-EGIT_PROJECT="freenet/fred-official"
-EGIT_TREE="139df10e20d9ae4a8afc0ff23f16ba56ec69e011"
-
-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
-}