Version bump

Package-Manager: portage-2.2_rc96-r1/cvs/Linux x86_64

4 files changed, 17 insertions, 114 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index d709a5b949c1..bad02bb5e05a 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.96 2010/10/03 01:02:57 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.97 2010/10/14 16:45:23 tommy Exp $
+
+*freenet-0.7.5_p1291 (14 Oct 2010)
+
+  14 Oct 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1277.ebuild, -freenet-0.7.5_p1283.ebuild,
+  +freenet-0.7.5_p1291.ebuild:
+  Version bump, drop old
 
 *freenet-0.7.5_p1283 (03 Oct 2010)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index ed9da8da4ef4..ab7db72af08f 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -8,22 +8,19 @@ AUX run.sh-20090501 16217 RMD160 f8b03990d011e1f149ec43aa536fd7540a19f01a SHA1 1
 AUX strip-openjdk-check.patch 2332 RMD160 92d35cc304c4dbf6747d12e97d318014e9ad4b49 SHA1 f3d70414f13dbc5d3fcd832d2796e1ec56a60b33 SHA256 450f21664ad64f92051c04bd5a9bf4095ed04cc0e24cd436c23c578cf2022821
 AUX strip-version-check.patch 349 RMD160 579ddfdf6549263e7ec2b9190eff6d08d6a2d5c4 SHA1 58e7422d180e4f443d415ec424646933eceeceb8 SHA256 35a33e5c52288505eefca96a6fbb98ae725d6fbefb727e73e513a1356b5cbfef
 AUX wrapper1.conf 2396 RMD160 e029cb5feaf98a03234a061362c0989207fdfd23 SHA1 9b882dc0d366b946596bdecb1b1d45c1e221e4e0 SHA256 52e5e283ac4c43d78feecf1edf5ccb38e5505c89624769976fcbf4ac2c8a1572
-DIST freenet-0.7.5_p1277.zip 3567496 RMD160 f01f227f0bd58a1b2d3427ddff2b20fd5281ce9b SHA1 22cdfbca8e483d1a8ee58e35e60e8aa726e1602f SHA256 a974cc9d8cfc7e41839b90baacbfed3882636d465819d6aa2f2db674bfb4c1e8
-DIST freenet-0.7.5_p1283.zip 3577337 RMD160 6862c247fb85be397bceba638b0da241705989af SHA1 fa8c430c52499fc46aa0d1654094ed68c88ddea9 SHA256 3bcc301238f7b286468d0d9ccc14e03e006bbbf6d4d0840d407cdd0cc86250e4
-DIST seednodes-20100701.fref 22311 RMD160 e80cd82b443b45c00998c0e87bfe6e485686419a SHA1 024bc22dacfe336fafef1b9fafadeaec7c976491 SHA256 1264cad055f597583cf7f5f14cdaafd392c5543d45cfff2c450c1fd551da3105
+DIST freenet-0.7.5_p1291.zip 3593419 RMD160 ae4b32101fea7d6a8396c77ce07e3a26fbb48282 SHA1 5b9e2ad3c780c6c8fd42fa5ec26af2d6fb6bb174 SHA256 eb4d6363aec1f5ecff72437fdf90847015ebe58dd3a7cb710473bf248e609016
 DIST seednodes-20100820.fref 17507 RMD160 c370edbf3b3de662ff335f6ba85892f9290e691f SHA1 b1a1f73ab2b88dd50d67e4c6d28d7f52743070d6 SHA256 e3db41e689f01c85205ea02d93fc366b5a6da40a05181a39f78f787754a4d342
 DIST seednodes-20101003.fref 17394 RMD160 3236cbb13d7361a9781cbf051c558015d154ba30 SHA1 6c6516652d3cd50a2a918c5e1e6a1577c935788e SHA256 de82d4f8eade8a77d7bef4141777f1d77c730e2b7950fe6a63ec337a290f4cf8
-EBUILD freenet-0.7.5_p1277.ebuild 3149 RMD160 e439a2ecc92100962bf993ad9e32f376d0e2367d SHA1 f429748a941b58f9dd44bc9a81b349437e6ee244 SHA256 19a4e87c8ce9139ee0a5f9cd07f8548b0dc3cc2e5802e4a23b466eda18bbf78c
-EBUILD freenet-0.7.5_p1283.ebuild 3149 RMD160 6e9f8540b4719c7064d856b22c70f852f6b468ed SHA1 a4d378f3981c7a1de9c3a2f0d54b336a717642b6 SHA256 dc752b950cc67b6edd9b8659066ab3edc5272c05079cf88a100451dd38566aad
+EBUILD freenet-0.7.5_p1291.ebuild 3149 RMD160 32cf4b7c9bc47a205c2ef8b0ebd6f6d181a16ba5 SHA1 fc17316948aba619e99972441a96d43676117f65 SHA256 fbfb3a98397745dbd042317fcb80294f7296af3c0ebeded092edabed8a9c47b2
 EBUILD freenet-9999.ebuild 2733 RMD160 d95947e1a70353cd8f0aafbe3b87ed5ae4e91df0 SHA1 f3eeadc312c102ba4430b2d0a76edf00448cbc19 SHA256 e367a1aceaf3177cb537c3605cfd5185719f5048199f5870f161a9821544c07b
-MISC ChangeLog 9527 RMD160 6538a170e70420e54cd2d9727cb4539213d5520b SHA1 5cd9b40c6d5a2e08e965c4b3f34fe9898298c306 SHA256 f57609f0cb660d50f5163186c2f363fffce181415371c4b23b647fbe66f501af
+MISC ChangeLog 9739 RMD160 a3aa7b36edd105291d083d2269a4a941400d806d SHA1 b30743f93716c707b692b68b10e274f2b24c0246 SHA256 cfd754eca9a1255f0f88d5017c4aa80b0a55bf9ee77efc82f37d2013d0139ca3
 MISC metadata.xml 332 RMD160 692365bdee16dc9218a18a306e5b15a4b2684206 SHA1 6f1d02202549206e3c5856c9a5a99b334015f7c9 SHA256 869705ebd157480153ca5ddbf7c48426b4374a8cba10164a1f1582fde5afa3a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iJwEAQECAAYFAkyn1kwACgkQG7kqcTWJkGfQhwQAxMNoohG4zxhKABQPWE3mUoit
-3g3Hrx2tBcMjKq5KZb2/8g854swcFwg5uC/rzXeDRdCB9eXySejmfIN7J6IVJ+UX
-brHQor6uKO1E+HPntFy3dFbzYWyREEJ/y+uvoTdpKQlAJHYWL+A6VNi3ZRWTIq2S
-de19CpKzcWYjkWk0eD0=
-=+eFt
+iJwEAQECAAYFAky3M8sACgkQG7kqcTWJkGcz1QP9FSeWCQH2DG034O96mm5SocNj
+S/QoEPU8IiOFJ+mHNa9F4/65eKVNnQvC55KpJhupdFCItKMMKrpPtFGP+/VGgeFO
+vZfz+iRfZNYC4bOUhkJLwUCVl/WFo7vf3QbIATHXnJYz1OpmdS8AamD2XBZlm+PB
+putGndLaXkHDaIL+V34=
+=acsT
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1277.ebuild b/net-p2p/freenet/freenet-0.7.5_p1277.ebuild
deleted file mode 100644
index 5736b5b207c5..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1277.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1277.ebuild,v 1.1 2010/09/13 17:48:04 tommy Exp $
-
-EAPI="2"
-DATE=20100701
-
-inherit eutils java-pkg-2 java-ant-2 multilib
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="http://www.freenetproject.org/"
-SRC_URI="http://github.com/${PN}/fred-official/zipball/build0${PV#*p} -> ${P}.zip
-	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-1.7*
-	dev-java/lzma
-	dev-java/lzmajio
-	dev-java/mersennetwister"
-#force secure versions for now
-DEPEND="app-arch/unzip
-	>=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() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-	enewgroup freenet
-	enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_prepare() {
-	mv "${WORKDIR}"/freenet-fred-official-* "${S}"
-	cd "${S}"
-	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/ext.patch
-	epatch "${FILESDIR}"/strip-openjdk-check.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
-	java-pkg-2_src_prepare
-}
-
-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 ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; 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.5_p1283.ebuild b/net-p2p/freenet/freenet-0.7.5_p1291.ebuild
index 69457d9d6495..b8a3c044420a 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1283.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1291.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1283.ebuild,v 1.1 2010/10/03 01:02:57 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1291.ebuild,v 1.1 2010/10/14 16:45:23 tommy Exp $
 
 EAPI="2"
 DATE=20101003