Version bump, drop old ones

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

4 files changed, 20 insertions, 94 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index f867ce29991e..f9712193c3eb 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.51 2009/03/22 20:20:37 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.52 2009/04/13 13:06:33 tommy Exp $
+
+*freenet-0.7_p1208 (13 Apr 2009)
+
+  13 Apr 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7_p1204-r1.ebuild, -freenet-0.7_p1205.ebuild,
+  +freenet-0.7_p1208.ebuild:
+  Version bump, drop old ones
 
 *freenet-0.7_p1206 (22 Mar 2009)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 2f7ca0acc55c..e4c17106dd0e 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -5,22 +5,20 @@ AUX ext.patch 2699 RMD160 265342f7fa70564be0fba218bf27864a1709cebe SHA1 13e4bffa
 AUX freenet 476 RMD160 fdce44749587d73cb3f5b916e893e3bb95ef3200 SHA1 48eb8bfbd27a17b0bb3b29248ce4c43b59a76bda SHA256 4a8482117a434e9885438b7ca5384851bff49fefa28b13e33494a746c781342f
 AUX freenet.old 452 RMD160 e9e834fedf4270c14f3e8d754c58eb05f3f570c5 SHA1 edb5d0ab062d46f494db88560885d7ee7b026e29 SHA256 b3047b40128bbd7843dc370ab0aa150a9836ed789f48181bd6d8fc72f1714fa6
 AUX wrapper1.conf 2367 RMD160 9bd2b0337e63b671c7bc4f03ad32b377953ec412 SHA1 1736bfee8a762c8083900e4c9eb7e0b0a3ece961 SHA256 eef1d68b0361444f50573dc2056793bb10aed7b218309cadb25007e8254745f2
-DIST freenet-0.7_p1204.tar.bz2 1337855 RMD160 6b8f87425f46bbc96f42997a164c9a248ab7f546 SHA1 79fd2ffa788b45fdef8dace8f2e2fbba00325b81 SHA256 35eb135602012f62afcf34b844ad38e8124e4898db23480b5bacaabdb03e26ef
-DIST freenet-0.7_p1205.tar.bz2 1340406 RMD160 81961b22388707c10237348735d30856f201643c SHA1 a00ff33b06eb2bd78725e170aecc60a5be9353a9 SHA256 2d58037fa00102b819c17f9725faf547fdc8d5e083fcac25cd272e43cc39073b
 DIST freenet-0.7_p1206.tar.bz2 1385342 RMD160 11565d80fbc73bdf6857f39c024e0dbe1016fbdb SHA1 73e95f48021135883608dcbb2b52f558b404db21 SHA256 fa3cc102f219e85dec93067a9ce341752e749e3e5a7d9e077cbc731781e7de26
+DIST freenet-0.7_p1208.tar.bz2 1484938 RMD160 c30b0b10e2dc336b1f67ef52dc3c0aad020c0de9 SHA1 47c9b964a4615eb8c9ac16fd8cb407f910ef1359 SHA256 967aeffefa1d2bc29b019a11c4f1bff3b7667469f4958e6c3300ce43ff4f1da7
 DIST seednodes-20090226.fref 23886 RMD160 c4e2668f6ee86c553cb425603ce13b93e5bf00c1 SHA1 bcac899e08efa40b7dc97ada7a6caf06f9ac0a9f SHA256 fad4756253b34a7f98453eb305f62e3e4e44fc1eab396c9755314534ed67215e
-EBUILD freenet-0.7_p1204-r1.ebuild 2324 RMD160 d1754fb5417ce435a3ff81514656d05c2057d2d9 SHA1 8e144bfcce1c5f09d3d7d0c0f3d4afe719b25bb8 SHA256 b3ea73201a42ab9f79f842b140fe18b3b5c0665eae1888f4ee46b4ad8c3c1e87
-EBUILD freenet-0.7_p1205.ebuild 2321 RMD160 98dcd2dbf8306db95cd229ea7cda30c4a128f5f8 SHA1 af511bc254c0d77c970831d8fcc6124743a4dca3 SHA256 da8de89961a0a00e5cc58fc39fa103055e887a3daf2e66cccf5c11d2f5deca0f
 EBUILD freenet-0.7_p1206.ebuild 2468 RMD160 b8dd60321d6c47c7f94a1678240ec87bbd4900ea SHA1 0dedb843804ea6978fda0af25d9b256556937751 SHA256 f59876e6392cd85ac3c65cb1d4d6e35e7baaa59e77680e1a8097fc1747724a93
+EBUILD freenet-0.7_p1208.ebuild 2468 RMD160 fab899a3833de2a8d9f1ff612d98ef0c9675449b SHA1 a8c7da47b4cfee17b895f9892b51142bac4f9a6d SHA256 6b55159b4b74fc47a688b60f0879ad4dc9d78d3f1512b060ccd2cf84ad1a8a42
 EBUILD freenet-9999.ebuild 3160 RMD160 fbebcf41f3640c64a0c6590091071f324436b40f SHA1 9f45adc1be081c59ef0571ba747bdf3436b0a650 SHA256 6876ea145def2cb3f331bb42edf04ad3046e21533bc517f4ab4c8ccfae09134b
-MISC ChangeLog 873 RMD160 b0c063a2ce26689dafc4272b638a40a6f5de75c4 SHA1 0b8a085f9795ed7006e322da2bf24069fc278588 SHA256 0b35e742f5fc228e2765f22c1d91e6b910c9afc8c757f544608c5cfb0feacdf7
+MISC ChangeLog 1085 RMD160 04b12ba8f45f4b420a6babee71eac5c2815bbc82 SHA1 8b0437e475bb55484fb94d2d9746e6345aff1f3d SHA256 5557a0d86f62919dc96806c2fcaae60704b2af98dfad8fdf1ddfc78688359b09
 MISC metadata.xml 332 RMD160 5e5c8b88681af85d63236c47f3a9a92881515679 SHA1 38a87952bb9389758e8700b4468b122ccf5199ea SHA256 3ca39205a9351767ed2901a4c8c8dd563ed1d83f6684f3bb6c2ab9e92ba4c10f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iJwEAQECAAYFAknGnZoACgkQG7kqcTWJkGdqUAQAkRYnQjZT0smuD3LuRgJjQ3Ti
-zg+X7yOcFYNviTYiR2LC54Ty44Qi+LM+zcZm2A6AokRet6QQh/7h1qpuPgjIQPLi
-85XWzc9a1dr+2ETjzSMpspv56C7kPJZWu1AhTn3nLeCmtFCf0ovBOZNcrcbdzuQm
-auew20+PqgvK28Y3pMQ=
-=aItn
+iJwEAQECAAYFAknjONwACgkQG7kqcTWJkGeCTwP+L2pzhqt4zSMHlAHi5GSiCUM/
+ibbEetAnACUygj7y1Jk/dxjPr6cUBT87MYFKGp7DE3em26EWTZKSeXJ+a75S1zTq
+dWA3B/j63tDGxjoGx9sAObiHn9Pu4veE7wZ7A9gXbJGv46WHnXP6Y+hebaOhgPc2
+/94NO5Bw+qZ83MOxUnY=
+=hTFf
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7_p1205.ebuild b/net-p2p/freenet/freenet-0.7_p1205.ebuild
deleted file mode 100644
index 13e4d9058826..000000000000
--- a/net-p2p/freenet/freenet-0.7_p1205.ebuild
+++ /dev/null
@@ -1,82 +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_p1205.ebuild,v 1.1 2009/02/27 18:26:21 tommy Exp $
-
-EAPI=1
-inherit eutils java-pkg-2 java-ant-2 multilib
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="http://www.freenetproject.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-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 )"
-S=${WORKDIR}/${PN}
-
-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() {
-	unpack ${A}
-	cd "${S}"
-	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || 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 seednodes.fref run.sh || die
-	fperms +x /var/freenet/run.sh
-	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
-}
-
-pkg_postinst () {
-	elog "1. Start freenet with /etc/init.d/freenet start."
-	elog "2. Open localhost:8888 in your browser for the web interface."
-}
-
-pkg_postrm() {
-	if [ -z has_version ]; then
-		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_p1204-r1.ebuild b/net-p2p/freenet/freenet-0.7_p1208.ebuild
index 6e4773d4ce45..55f7c3a6db3f 100644
--- a/net-p2p/freenet/freenet-0.7_p1204-r1.ebuild
+++ b/net-p2p/freenet/freenet-0.7_p1208.ebuild
@@ -1,6 +1,6 @@
 # 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_p1204-r1.ebuild,v 1.1 2009/02/02 21:25:58 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7_p1208.ebuild,v 1.1 2009/04/13 13:06:33 tommy Exp $
 
 EAPI=1
 inherit eutils java-pkg-2 java-ant-2 multilib
@@ -71,6 +71,9 @@ src_install() {
 pkg_postinst () {
 	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() {