Version bump, drop old

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

4 files changed, 18 insertions, 161 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index ef14795c8d8a..5937c54d54f4 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.155 2012/09/13 17:52:46 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.156 2012/09/28 18:11:35 tommy Exp $
+
+*freenet-0.7.5_p1417 (28 Sep 2012)
+
+  28 Sep 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1411.ebuild, -freenet-0.7.5_p1413.ebuild,
+  +freenet-0.7.5_p1417.ebuild:
+  Version bump, drop old
 
 *freenet-0.7.5_p1413 (13 Sep 2012)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index c4c1bf21173b..31d3e0d66ab8 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 0.7.5_p1302-ext.patch 947 SHA256 66eae4637f9248bf2407e8bb5361b86aa3f1d04acdfca4207a3596877430fbdc SHA512 e8fb05fcffb895a319d5f0abad0275cdb9c938e3f95fded659a7720b42738c253cd4908be9813dc341a9aa7b8b54e7dbe1c487aac2de46e171360a6e04e39667 WHIRLPOOL 232aa033ac968ed5214b34e748479c32658ff604fd4c7e5e9dfc0cb50c83fa16256fe9363b2f6a9674fd7b8d03a1289140f227e7b75be790d7c901ba6c0acaf3
 AUX freenet 476 SHA256 4a8482117a434e9885438b7ca5384851bff49fefa28b13e33494a746c781342f SHA512 3dba34e1d660de3dbe980bc77afb54956cacb0053f9958c067c2b89ee2652af0654f77589528d71da33cce6c1941b717c510a7899c8d884edcbc6f15e7acfdb9 WHIRLPOOL 18f8e455d9423024a8fbbd5407c88cfd35891b973627e3e04e12612892ac93926e2518e39ae0e7e8d2fa03fc2fc9a05f977a7186f2e343953c22b4dfc9f5f933
@@ -9,20 +9,18 @@ AUX freenet-0.7.5_p1389-wrapper.conf 1680 SHA256 f9e8e37b4e7eacbd5534fabce20a659
 AUX freenet.old 452 SHA256 b3047b40128bbd7843dc370ab0aa150a9836ed789f48181bd6d8fc72f1714fa6 SHA512 7f12188a1e81f40f361d6df4cf0ae0f8af1363da19318ce04625411b0ff30badb53b440c984589d9f1386ad05e6b8e4201eb79c99f381468f7f6356dccebb3a9 WHIRLPOOL 182ff0f515c6832a17880ea1db705e5ba690b6d08f1e4d3f12aa4f6e291dab68491507b14541b89a13b4ba797296ac432eaaa24cd8b35ad2d63d14bc6a6c0fae
 AUX libraryloader-revert-using-of-absolute-path.patch 854 SHA256 b8bc840cc0c35a32bf000c23bdb5a7c7cb30508f6f39e3a3d29bb149996e6209 SHA512 24627e9f30a1b4456bf386ebc0a789e6c1d8670d4c1371b2d658cf04f9a04c09dc91ac803af0b8f883578cf9b3b351da69c7f882f7bdf3277f183134219b4889 WHIRLPOOL 6a328c040c81548bc77452639e2a0752304ef639480258b34d6d4ae15b0009d766a18df90f5685d4f2891a71188c19788675a65d8912560afb9a9fdfa0e9261e
 AUX run.sh-20090501 16217 SHA256 470aa99d083a16d2f620282502a59546611f1903e21aef50b93b10d9fada7d7a SHA512 ba97f1e370ffb7c9ea109b7d529430581a588d8d7e121ec09865e9e8932f2901477f7f43e7d0b95c7c95c2c42db05870e5d811528f91f78b48b68a539c804e67 WHIRLPOOL 201c2541da742ae0c211d6b736914340dd06d4907326de5a0073b39e8aa0a60933ed7d4eef3aa86465f9d0c2e0bf5bd78ed85d3c83c08ba9b50aabc25853864e
-DIST freenet-0.7.5_p1411.zip 4289022 SHA256 d5b1aa27f1b8b92550f244556b8349f6609ea761a64fca580d01492fcdc89d6f SHA512 f95875cbfcd5eae85649c67e518e97fa0518ce56d0bb137bb02ea97e5e50886ca46d01c993fc3a44f42328663f848deb9b7edf0cd480cf5cc31d1092f9f5ffe7 WHIRLPOOL 59d837b3a71a813b321bae305f522718017c9ef432ca88184bd884b650f2ffbb590fd6689062ebfb5ceb6f32b1278636df1cfcee50c594dd67609cc89509caeb
-DIST freenet-0.7.5_p1413.zip 4302758 SHA256 4486b4514ca17e301bf6e8e86f74b6cd58f71a0709ac30bb2d34de1a36b6c8cb SHA512 6577b1c8841dfacb627e2ac390d52f12a19a485e42efac37cdee9458c05152c98c4dd651779ddb6f12fbe7c516d078c35626bdfe284645d5c61e57897d87043c WHIRLPOOL 11f3d673e4c08caee79fececf0a5cfabd9d75a6c4f205ba3105f4f0f79ef403cb2772abbd2bb3b75e4864d8b1fc948b781cefaa7bea80e008c3ffc44a14cb1ff
+DIST freenet-0.7.5_p1417.zip 4273586 SHA256 7b2bf929b95fcb528683d73f9365573bcebfec74119896bac85c1039da65fe7e SHA512 47e0fb3b863bb4757329fa073583b093a541cfa6a45e7eea100a415d731034b25c226e9f2b2fc743e503d8c50f41eaac1d8754d4668d4afff433251d5809f9e2 WHIRLPOOL 324fc733c465fcf7e20fddd4428fa46738a8b3f143c98aeb1f94684dd97ba8d18805588ed5ace1c35211caf1a1020c519e26f1f53a6dd534bed092ac5a050b0f
 DIST freenet-ant-1.7.1.jar 1327167 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408 WHIRLPOOL 667be2b1581c5fd847907b63522a0f83c595a6b8f1805d714e978a5cb0f05de4804153c89605618adf5c3b097a7019e7d7e9de0bf0987c7b1adb0dbc54e0f055
 DIST seednodes-20120730.fref.bz2 7995 SHA256 3d162430e3e4ae9827c0580988c2520e8ff9077ca4beaae72d07845923607e44 SHA512 9761765eb1f8c8efc7759d12de8928ae28a7d0cd287666c1e3391cddb65b1e41cb66735f416e48d3294a36d2dec0bbbd7195e3b54651a564ac410403eea58bec WHIRLPOOL 2b8b2f1c9250caac84b11b6775862452d03831c1848fe2ba23bfb4d17b3b453227aed421a2de8b7c62265afdb80b35687325b1939e34d9326920214dd8e41164
-EBUILD freenet-0.7.5_p1411.ebuild 4526 SHA256 60a24c4bfda8b96ea478bca02cab9cc9001ea844158336b943bda272fc1bd976 SHA512 c9030a686339e7abe0c8117a00dd921959051cb70f1b87b1824549040fa8489a55ccc88c263be0c0942edec1b5098e04d862465d0476dff5a51a7087131d5b99 WHIRLPOOL dcf00b135ca55d41561b7d8da53d7d8a3657b5cd05a153cf5387125eaeca800ef6d965535a54711d0646e763f1bc9722f73743b7ef6b9f175039f51925d686fc
-EBUILD freenet-0.7.5_p1413.ebuild 4526 SHA256 8b8dc73805bcd83a6c1d310be90597d235922f4c3774bc26f7604ea0f3539233 SHA512 61fccc81e36021845cc1bffc804548c5f18400622a37971acad5f31f3f019d0cc06ddc57302fd5069347f0ceb33736e908d5199d9726632a5b9732e03a2d1992 WHIRLPOOL 5be1546ec0d2ace0d5c20def71217cdb4f32538648a3a83bf8fce93e69b0ed56de8ccd2aed3f3a3a4a3ac0e0cfd3db3a48fb4da7a822cbcebf59073f399bfc5f
-MISC ChangeLog 20721 SHA256 efefa54a8a6a0911f96cfebf469026e31aa95ad8e20c20a32bff45f01a79fec6 SHA512 bfb0eceb0b44865b73f4514b72692de68f66c577132a1adc4287dd6e3b05102a1059ba68743eddc2d65002b80ef040fe294efe3367032b2668f838305d67a371 WHIRLPOOL ee88a64447f97b4bd6ad9bcd0e933dfaa63a820a08e0f54daf6e045f76ed185f5812318d13c6add1209e7933a255f44c6044687110da4863380681d88fa0494d
+EBUILD freenet-0.7.5_p1417.ebuild 4526 SHA256 d6ddfe5926ae8980af497c82b943424b88700830fba3d0d312c8668912304135 SHA512 bc29413c7203c8b8284bcbad4dc3a005e89bfdad87d0c650e45c0615d9beec824f3dbb1ffee8104bfe7a491cc609580c68675bae834582fa91403334652711ff WHIRLPOOL f127c4329dfed702bf54406e80bca5cd43de78d7daecd1b44fe5614051694812ea470582b97a58bbc59a4313cf4f198c2044451ccaf5191b68763480ba6fedb6
+MISC ChangeLog 20933 SHA256 e3779a5e218b953bcb0f14a62b65da88025c2dd27c5cabb04bf6550e3576b08f SHA512 5e5c2c5397ee20605f7a80b6e15f71f5f7d531d3543117c47ef721c97fbf8436da10a31ababfe0cac65ab156cbedceaeccac05eb798326ef45b1fea29f2944d7 WHIRLPOOL 9be59cc7fdc9b6d8c4e60594a257f707f04716cf6b35b3908bd5a8e3b39b57711fb7f28bd3a0e50600bf316a592eda72ffa38d750cce92a674f88d50e2b08862
 MISC metadata.xml 310 SHA256 e614c0ca7fa5d32c3e94ccd6d822fd0aa482ce31439e0206f26b0f7a76113950 SHA512 51675c6c4240c3ca73e9526462da9617e4fa9a86ec43e21a2c85ef824015b3843948504ecb6643f4fdb65c3911712f2e0ab87ad37b56063445db42a315be6de4 WHIRLPOOL c0b49fedbcb65ed5b30254fc90688436070b66de3cc3699d0621d495dfad139bc6a6388b3f25be3be1824ce1eaf2cf688100abbf621116629e61ecfb52e338e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQECAAYFAlBSHXoACgkQG7kqcTWJkGcD7AP/T8Gl60SUUQw7MskT6f6buYNz
-l8vo2ABSaM8e8+U5lzscbc5lQvWRQt4cUx6h9xMQpMon5CNxQXXVZJf1sio+wxhU
-bAB+SyLpBEGCCCz+kopicuxbXOZF3YEpxfbKmPg2+lKxG4qKqzbXr+lCiEcv2OoF
-mvPNelWYsBAJ9kkwQ/M=
-=wWfF
+iJwEAQEIAAYFAlBl6GMACgkQG7kqcTWJkGfA0AP9H6eppoljDfLI7eYxt/FlTlWu
+6t9B0GVJQnq+/NEdmEdsjsTg8VjKYhtGbezYYHYxIXgPHHElzbGc22/HENCKdXIq
+CaGuXtgm7KTT1LMwY6ZfEZx/uHD109bhJaaXEDBpmbtZXtK3RGqimhEhjc8zGl0a
+v2H8NZt55r1sU2GvzLA=
+=eMbF
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1413.ebuild b/net-p2p/freenet/freenet-0.7.5_p1413.ebuild
deleted file mode 100644
index fe472ba05767..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1413.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2012 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_p1413.ebuild,v 1.1 2012/09/13 17:52:46 tommy Exp $
-
-EAPI="2"
-DATE=20120730
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2 multilib user
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://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="freemail? ( >=dev-java/bcprov-1.45:0 )
-	dev-java/commons-compress:0
-	dev-db/db-je:3.3
-	dev-java/fec:0
-	dev-java/java-service-wrapper:0
-	dev-java/db4o-jdk11:0
-	dev-java/db4o-jdk12:0
-	dev-java/db4o-jdk5:0
-	dev-java/jbitcollider-core:0
-	dev-java/lzma:0
-	dev-java/lzmajio:0
-	dev-java/mersennetwister:0"
-DEPEND="app-arch/unzip
-	>=virtual/jdk-1.6
-	${CDEPEND}
-	test? ( dev-java/junit:0
-		dev-java/ant-junit:0 )
-	dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.6
-	net-libs/nativebiginteger:0
-	${CDEPEND}"
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="commons-compress,db4o-jdk5,db4o-jdk12,db4o-jdk11,db-je-3.3,fec,java-service-wrapper,jbitcollider-core,lzma,lzmajio,mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-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
-	mv "${WORKDIR}"/freenet-fred-* "${S}"
-}
-
-java_prepare() {
-	cp "${FILESDIR}"/freenet-0.7.5_p1389-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/0.7.5_p1302-ext.patch \
-		"${FILESDIR}"/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
-
-	EPATCH_OPTS+=" -R"
-	epatch "${FILESDIR}"/libraryloader-revert-using-of-absolute-path.patch
-
-	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
-		freenet-wrapper.conf || die "sed failed"
-
-	echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf
-
-	local i=2 pkg jars jar
-	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
-		jars="$(java-pkg_getjars ${pkg})"
-		for jar in ${jars} ; do
-			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf
-		done
-	done
-	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf
-
-	if use freemail ; then
-		jars="$(java-pkg_getjars bcprov)"
-		for jar in ${jars} ; do
-			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf
-		done
-	fi
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-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_p1411.ebuild b/net-p2p/freenet/freenet-0.7.5_p1417.ebuild
index 84248ba802a9..de5f3a6cf820 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1411.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1417.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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_p1411.ebuild,v 1.1 2012/09/11 18:38:45 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1417.ebuild,v 1.1 2012/09/28 18:11:35 tommy Exp $
 
 EAPI="2"
 DATE=20120730