Version bump, drop old

Package-Manager: portage-2.2.0_alpha26-r1/cvs/Linux x86_64

4 files changed, 17 insertions, 128 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index a81624f50c54..9714ffde738e 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.121 2011/02/27 10:31:31 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.122 2011/03/11 15:26:49 tommy Exp $
+
+*freenet-0.7.5_p1356 (11 Mar 2011)
+
+  11 Mar 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1352.ebuild, -freenet-0.7.5_p1355.ebuild,
+  +freenet-0.7.5_p1356.ebuild:
+  Version bump, drop old
 
   27 Feb 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   freenet-0.7.5_p1355.ebuild:
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 1b256862b681..3f69f643c5ee 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -9,22 +9,20 @@ AUX run.sh-20090501 16217 RMD160 f8b03990d011e1f149ec43aa536fd7540a19f01a SHA1 1
 AUX strip-openjdk-check.patch 4015 RMD160 c512338ac1dc9ca88082f403d8a4bc4dfcb98c07 SHA1 8e2e7c6eb7bb0f738d9afd73b2b32f7f5b2d515b SHA256 74f4d18e590b181d60ee41c1d3aa9ede8525fd643cdfa4e4688d1c8310ec893c
 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_p1352.zip 3747674 RMD160 a0cd53546dbca68621c57ef990a4121ed186db08 SHA1 c506c43084763bf87e50d797210f0e7c1f775fb9 SHA256 ee6b02c93fbf3218b854d708a4e6049a7cd89b6bc71c4885cc4555dfe20d1681
-DIST freenet-0.7.5_p1355.zip 3748555 RMD160 3146ccabf166499a1bac91b3439cb06fb28043ab SHA1 2c3c48d8291adc9f29fee4706390398d36f728d3 SHA256 9fdd0c5e9bee5632b4314a007616b2335c8a8e1de5f3f5ab93f9947b5d64b8fb
+DIST freenet-0.7.5_p1356.zip 3753145 RMD160 d2afebdf249ad97f88b7d05b78172f54699e0eb1 SHA1 9ac78747fff7b62eb0d40811b3afe7616587bad6 SHA256 4c35b3a095752efe5fc73c8288fef1ff81938a1e433e664161b649d887efedde
 DIST freenet-ant-1.7.1.jar 1327167 RMD160 2ff5fa9c7041aa475bc1374763897fd8f19ca1f4 SHA1 ab21c797797d9e216ff1e05dfaac969a74191cd1 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1
 DIST seednodes-20110212.fref.bz2 8478 RMD160 c058827cc73bc189e1b284c3fe7c854e062ee7ed SHA1 91abad0f7d95616bfa125e28b52c5adfadb7744e SHA256 7e92208899c440f964df395c05dfc1e4b5ffd18ab8de8216f55f9fc2a3cf641e
 DIST seednodes-20110227.fref.bz2 9329 RMD160 7ea14729112624489fe9e85ae01822ac639cbd82 SHA1 3a2b5917e6ae88e455d1bbefedc2a31a2a0d6b65 SHA256 2c3fdaba5e9074f3ee07d1f73e482a40b53c7e85c448a7e1c16f33da1b09544b
-EBUILD freenet-0.7.5_p1352.ebuild 3713 RMD160 f3fdff233b528cc56e56013f488542a195924648 SHA1 ac01753fb9fca112b78d53b2a9b9bd6e6d99c7bd SHA256 e83352f624e4f3e2c0133f571f0957f5c1dfad3e970fab4257435135f3c7f68c
-EBUILD freenet-0.7.5_p1355.ebuild 3762 RMD160 1c1dcac2a1bbf93b8c1b971245a22b7bf38e255b SHA1 7fabfe845fecdc3bb4c41b8bcbec56e38fc7ff65 SHA256 8fcd17a46bcb2f5c73932912c13b019c95edfc13e75a264a17e3df60b52142bb
+EBUILD freenet-0.7.5_p1356.ebuild 3762 RMD160 db3bd2e98069ec00eb18213cfdb21f78c7cf48ea SHA1 88cd14c91a53d3af6457a3808c8b998196e63d89 SHA256 c6e5f4fa7743b1793c4e7364f2ead8aa9359c95d482ad718ff697ce1386638f1
 EBUILD freenet-9999.ebuild 3683 RMD160 31e2285e52d015ed00ca9c30c251418a6f7a16d4 SHA1 3bfff4d567ab25af59cd5496a5121ee72c396add SHA256 efe19a000eaae8263ceb097a6c1c9fa2de63b1bcb60db3517288dca1fa7f252c
-MISC ChangeLog 14265 RMD160 a282830232094581b646e374dca0ffa1b24538c6 SHA1 70b20b8b0867a7be6f6373c1b6392681856ed8c2 SHA256 60a05cc85989fac1e6cce4946386be6fa6dbf2c2fd963e0e4eff1e3124384573
+MISC ChangeLog 14477 RMD160 6fe25d0aca842047b53fd52563451f00ce2f2250 SHA1 c803db50efe57be07c35bfa9c14f602ccd6c7fda SHA256 ad1f129ffef22f4cbdf1d1bb98c2589c0eb1ac0e8119646a868c29647530ed30
 MISC metadata.xml 332 RMD160 692365bdee16dc9218a18a306e5b15a4b2684206 SHA1 6f1d02202549206e3c5856c9a5a99b334015f7c9 SHA256 869705ebd157480153ca5ddbf7c48426b4374a8cba10164a1f1582fde5afa3a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk1qKA0ACgkQG7kqcTWJkGf/swQAkTRc4dgIj2GZCY4+GE9qynps
-1sCdb63QoDvghQUgTenGJQMVk7g/JwZxlXcBnIoi9cdFtOHBc3l2R2C+ma9q2kp4
-BCM/pEYUr1BCSwEFvxHM41j+N2cbAseE7EliY0KZQnpeoZg3eVNTwoytwp39QosL
-n1X9UaZZ/R739Xb/e10=
-=OUcj
+iJwEAQECAAYFAk16P0MACgkQG7kqcTWJkGc91QP/Toyvv38y/BnfBjF8qzCpz/UE
+KWEkYF4b2cKjTUk1+fPOHJT7u8DF5spNngsVpQHjZMNXnrSaR1DnlasfbkBzkyCQ
+Uck/3SFc7JcbpsuGaPMt4fVOZ5Q40wmEqxaxS8MjYjKRvCHQ8y8SdA4kgR5FodWT
+p+YfnAlBA6d5XPQgRwk=
+=Tgop
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1352.ebuild b/net-p2p/freenet/freenet-0.7.5_p1352.ebuild
deleted file mode 100644
index 3a67f795ae4f..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1352.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2011 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_p1352.ebuild,v 1.2 2011/02/15 21:19:42 tommy Exp $
-
-EAPI="2"
-DATE=20110212
-JAVA_PKG_IUSE="doc source"
-
-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.bz2
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="as-is GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="freemail test"
-
-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/lzma
-	dev-java/lzmajio
-	dev-java/mersennetwister"
-DEPEND="app-arch/unzip
-	>=virtual/jdk-1.5
-	${CDEPEND}
-	test? ( dev-java/junit )
-	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.5
-	net-libs/nativebiginteger
-	${CDEPEND}"
-PDEPEND="net-libs/NativeThread
-	freemail? ( dev-java/bcprov )"
-
-EANT_BUILD_TARGET="package"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="ant-core db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper lzma lzmajio mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.junit.present=true"
-use test || export EANT_EXTRA_ARGS+=" -Dtest.skip=true"
-use test && EANT_GENTOO_CLASSPATH+=" junit"
-
-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_unpack() {
-	unpack ${P}.zip seednodes-${DATE}.fref.bz2
-}
-
-src_prepare() {
-	mv "${WORKDIR}"/freenet-fred-* "${S}"
-	cd "${S}"
-	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/0.7.5_p1302-ext.patch
-	epatch "${FILESDIR}"/strip-openjdk-check.patch
-	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
-		-e "s:/usr/share/ant-core/lib/ant.jar:/usr/share/freenet/lib/ant.jar: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 "${EANT_BUILD_XML}"
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.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 "${WORKDIR}"/seednodes-${DATE}.fref seednodes.fref || die
-	fperms +x /var/freenet/run.sh
-	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-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_p1355.ebuild b/net-p2p/freenet/freenet-0.7.5_p1356.ebuild
index 2e61160ff9a3..75639429865b 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1355.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1356.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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_p1355.ebuild,v 1.2 2011/02/27 10:31:31 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1356.ebuild,v 1.1 2011/03/11 15:26:49 tommy Exp $
 
 EAPI="2"
 DATE=20110227