Version bump, remove all old versions, update patch

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 19 insertions, 107 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/Manifest b/net-p2p/freenet/Manifest
index 7d32359da6c0..e32fefba9ec2 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,23 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ext.patch 2699 RMD160 265342f7fa70564be0fba218bf27864a1709cebe SHA1 13e4bffafbe587846b1dff381c17ba958e5a42aa SHA256 43bac68aa0b4188b7d053bcea3f2c22a41ebaae9e6abec75cba4d2d52fe9f0fc
+AUX ext.patch 2696 RMD160 c6d3b033feb7ef80fa3f99b6dda0cee24d361877 SHA1 1c5fb77c045fc8762d230689ddb5f5485633f9b9 SHA256 cc87570b7ee917ef663e746e09215978fb82a41f0310f8f6faf203045e9a89c6
 AUX freenet 476 RMD160 fdce44749587d73cb3f5b916e893e3bb95ef3200 SHA1 48eb8bfbd27a17b0bb3b29248ce4c43b59a76bda SHA256 4a8482117a434e9885438b7ca5384851bff49fefa28b13e33494a746c781342f
 AUX freenet.old 452 RMD160 e9e834fedf4270c14f3e8d754c58eb05f3f570c5 SHA1 edb5d0ab062d46f494db88560885d7ee7b026e29 SHA256 b3047b40128bbd7843dc370ab0aa150a9836ed789f48181bd6d8fc72f1714fa6
 AUX run.sh-20090501 16218 RMD160 4805178fcff6e4414515c11709d8339c333f2fd0 SHA1 93a787a3d75a43dcd229ad422a05bb9f29eefda7 SHA256 a6c296bb39983349b43afbb3e758c3940e7ba86940d3a2615c47e97ad733dc19
 AUX wrapper1.conf 2367 RMD160 9bd2b0337e63b671c7bc4f03ad32b377953ec412 SHA1 1736bfee8a762c8083900e4c9eb7e0b0a3ece961 SHA256 eef1d68b0361444f50573dc2056793bb10aed7b218309cadb25007e8254745f2
 DIST seednodes-20090413.fref 22342 RMD160 e9342614255f0e15c37eb830631ef4e62cf672e1 SHA1 2c966b82b42a72ecfbef717f9f5c30b6e5f2e52b SHA256 adfcda384f3b239a763d7a0bc4bd0cb7623febb534798d5f384ebd11efad7a92
-EBUILD freenet-0.7_p1212.ebuild 2753 RMD160 cef5c3dff01c152b8fc8abec95e5a74bad20bf0b SHA1 8df53ac9ae6cb8215894a118176eb81e19fbade8 SHA256 44f3009714a2fa05603b3ac4e1b862b257e3f20504028aed655acaa4e12299c1
-EBUILD freenet-0.7_p1213.ebuild 2753 RMD160 b7570b101667b3eee90ab500cb94bcf3fc608661 SHA1 29192076c71c84311f6a394270d07a5adab79364 SHA256 bcb935b40c3dc27f3b84ac93cb2d9432510d48f7d275458d3b59c04c9d59a9fe
+EBUILD freenet-0.7_p1214.ebuild 2753 RMD160 fb53e56e6338cc8791d0103623adff28b8afbc2f SHA1 abf540a8c9f079cd8ad422a45e0bbdd29c9efe3d SHA256 a34795559562db135b6d17474fd7b11505368599128ec6e6aac45b370c73a215
 EBUILD freenet-9999.ebuild 2551 RMD160 f2eff29f748334cbb32a7999e5d605f82ebd6545 SHA1 097203589039d568d6fa182d5761dbfec9709f7e SHA256 50430b5c3ccca4e15af0555f446f3d187a151e9077eaaea487c08ab410b2bb07
-MISC ChangeLog 2236 RMD160 1bc6b4255f7bbe9341abf1d6d4162c18b3124c47 SHA1 2c8bc6d51b7d8929712225e62da4afedec5348e0 SHA256 bdedcec0ce3fe4211659208f646c3e4dd9c73c0f99d3f242047f69b29254df18
+MISC ChangeLog 2486 RMD160 5089c387d46a4d24a18c39d964acf2666835fd95 SHA1 d52e59b34ad5ce2d2f6cc132c82377d510673dfb SHA256 2fe949b22a45e6a0ff51e31a3d0b9c91dbd0ce41da02f85a72d133750cc1b085
 MISC metadata.xml 332 RMD160 5e5c8b88681af85d63236c47f3a9a92881515679 SHA1 38a87952bb9389758e8700b4468b122ccf5199ea SHA256 3ca39205a9351767ed2901a4c8c8dd563ed1d83f6684f3bb6c2ab9e92ba4c10f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iJwEAQECAAYFAkokQuUACgkQG7kqcTWJkGdIGgP/R5WftiTpbJxGMnqlG6vjCw6B
-5S5qN4pk6azSEZnCrDmGr0lWhIA+XiDsq+xhFRsgXJequBl2wAqHyKZVm2xIDWbD
-SviLhZ8IOunVjB8gt6d43SlTMitgEgikipS7bE/ZTLv4jJaJ8EpKRs8dY7HtsPoV
-v1GzeOD/33ZruAUbv5c=
-=KbAD
+iJwEAQECAAYFAkooB0IACgkQG7kqcTWJkGfv3gQAuzcpwUuDlatYgM7L5yFAXDne
+hZYs60QjnKaE7TicY6dex5Fw3qWp+xwwVrv8IDl8DxC+xjNfZg6TwbtYu/430cn0
+k5/Dkojf0loCd1adO0YjsHVPMJjSKe5GRLhBRCMS61S64fBnIrICCgOZ7+hsvk3I
+dpoPC1sR4PswKWbtOyM=
+=xjxs
 -----END PGP SIGNATURE-----
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