Version bump, drop old

Package-Manager: portage-2.2.0_alpha164-r1/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x35899067

4 files changed, 17 insertions, 153 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index a45b118d6815..857ec5374fef 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.163 2013/02/18 19:58:09 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.164 2013/03/03 16:16:42 tommy Exp $
+
+*freenet-0.7.5_p1436 (03 Mar 2013)
+
+  03 Mar 2013; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1432.ebuild, -freenet-0.7.5_p1433.ebuild,
+  +freenet-0.7.5_p1436.ebuild:
+  Version bump, drop old
 
 *freenet-0.7.5_p1433 (18 Feb 2013)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 46554212974f..0835d6bbad54 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -11,21 +11,18 @@ AUX freenet-0.7.5_p1422-wrapper.conf 947 SHA256 213508785a1bb2bd1263f434fc52b45b
 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_p1432.zip 4574023 SHA256 ba7ff02bb68e1b91c3f5bc41201436b0b92d26cbac59ef86e52f4970d1d3756c SHA512 30f07d65826a3578e0f38085e34ef9a1c9ede34405066ab2ce7c2447bc5588fc43a6e1dfc6687bf1daccda7ec39ef10deb0ef3fae0446b9fc0b5d2811dd3b6bf WHIRLPOOL f197acb3386084ec9ccdaec8427e65a5912fb182da1061fbda2e828e86a19efa125a248f5364c039ef82f99ab580e8c235aa210e9780f236a94a16fe061fd0cf
-DIST freenet-0.7.5_p1433.zip 4578236 SHA256 eafe12fd78c989b2ee3ce6d1763174cf852dc4d5cc87612628176d6fcf8be2da SHA512 3649374d5962d774d344ee649be091db7549ee84876344b3d2251dcf56f38ad6f6ad16e3a9fad95efcdc19b3641d916d8d4d1fee719387ee392156585ae86c8e WHIRLPOOL 4aa39fc59d05760571867f76a3372f54c5324b72b24148d312481a8c01a57ac92a87579a5d1ad796914e530769164cf546147e14d171c135d5d1809c19504485
+DIST freenet-0.7.5_p1436.zip 4598276 SHA256 0b2b02fd251a825a5f69ee2e03fb4e5b9fb8728459d733f43fbabb19c3f7a2d7 SHA512 29900940543aceb19a7fd49105d5a161d732f6f68cc8aeb1682a736e747fa9c792bb647112ea5a221bc7c37832648f7fed566a98619dd469d3e0a5bc41ed9eef WHIRLPOOL c4093ed35d16207d0783a6ac9a1202637145a4a53f24483bc3c06c0d61827582c8951eee820fac67a0c2912a5cd93e7fb8b24a1f730a1f2019735fcd901dcab6
 DIST freenet-ant-1.7.1.jar 1327167 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408 WHIRLPOOL 667be2b1581c5fd847907b63522a0f83c595a6b8f1805d714e978a5cb0f05de4804153c89605618adf5c3b097a7019e7d7e9de0bf0987c7b1adb0dbc54e0f055
-DIST seednodes-20121030.fref.bz2 9181 SHA256 c71fc9addf7f81208822e59baf2d9ae7f3399c8881360511a7b8926012050b57 SHA512 e079ba7a7752774332862b6332ccff4cd221e53a42b14a795e4c12caca9f7448df67250e8bc456251dafff60048af10a06a83fdc1a04f71b3bb722500d064f2d WHIRLPOOL 4b7b6112680134f6c26ee4bfad0cfe1b2cc2063ef91215c93c562247c7089934df5c78b7fc5e570c4f9a89b3b5574e643917c6961a6b8476a5c98e2689cd2712
 DIST seednodes-20130218.fref.bz2 9194 SHA256 9ac006dc994456ef34f81b070a3dba6574f209fc2ea3413f57f66f0b5dde77a2 SHA512 42539e0471b44be83bcb2cc473217482099f7800d97fd642401607d6d99da4f0ea25c8dc974025d34665607a7f787a37137e4d839b047bca2f1f4d42b8363fe2 WHIRLPOOL 9a4ebbf703f9da7e427fd95ac6b4afbe6f4dd632b09362fbe7504d8606e8b9be768e39cfae82e211bd656e0748b5006e96ab4f4ceb3b9fcf60782a0f062fb8c2
-EBUILD freenet-0.7.5_p1432.ebuild 4275 SHA256 517734f9ecfec6e921c3107b7bc2205fa9de4682682eda4d4364f0cbf54b2e8c SHA512 be435d805d2392c8635f5daaf35988b3383a8d721813129ed4be6924efd2809cf5b769c3272d834e45a853d4c0a765cc2c91b68cb08f22336d184897b0ac0d17 WHIRLPOOL 68fe08b027435616d94f8a561de271ffe4bcaba95b50d8798fb7172d9fb6d7989cc7a67b6307ff6e7f4b4f12c1fdbe6b7e7e8f5838f02f87d8e7f19e371f058f
-EBUILD freenet-0.7.5_p1433.ebuild 4275 SHA256 ab7c867dfefaa45b5080ed91f5519f175182a455ccce9af019161b133b1439a6 SHA512 59ba8b3cf6a2224fc7865797455899de686aa15d70d036684ad4ac08f21e34d4da9444110a82b764dffc51ea815690ce4e7b967095fa6c45193b68e9b3b80251 WHIRLPOOL 05cf76ef71250d10ad16813f5288a3cd5f65af10c145e7841315bc16e08ad58ea771a77da463a05a81281644d3016895c2eeef62a51d50a3828bf4909fc86ba2
-MISC ChangeLog 22319 SHA256 65f11c83b8580cec36b1178ebfd7991c55535436c7da9ac20d0c96435be880b0 SHA512 c85b9519fa18c1b2c613b9f6e17cf2273716de146e0ab61a1cd7c38317a4acc2694a635ba49838c2adb50e0d0939d63b994b18d146fe79bab71702790c4acef2 WHIRLPOOL 517fe07e284a271fac25989952fab287bb6ffd82e439447cd5763163389967c458c6173fed9559ff7a4a6d3dee7f68786e6ee1c8aefe0fd3e2ae18050e015a93
+EBUILD freenet-0.7.5_p1436.ebuild 4275 SHA256 3a9d5b5ffb7eebb3006d5d49879ae31554e7047a653a5bbfb76b0f724165ace6 SHA512 a17290693d16bdb4811a187a3bcbce898b757768046067487c7366166b61736b09a82ade8cd2bcd5ee795fb41b440ee6e09854b378318a5a50c96069adf974ea WHIRLPOOL 20859b3f009b92824025a4585d95edb89b082fa68de5658e98aeb68220dc03b29d19b0e1180db7fab66940c397ba2a300d39c81439f0d7f243e9c637a91b328d
+MISC ChangeLog 22531 SHA256 61fa80b62ac8f6f2ded4b447493bd35d3ca251656eca2b6c537b73b974d58ff9 SHA512 9df72bab341cd145a7b625f6f2d72566dce2575370a575e4a3cddad3ab0a7424903811b10aff0668223b7c780e8926f74c0411ffc99b3f7aa9420eb347d41338 WHIRLPOOL d70f581ac8b85c1076923bb02fe0e9504d4c01f1fa984edc911c0af90963f99eef0a974d1c3a64a4330bd9aa3b8c94b7c097dbef9d0c55cd2a8053bc61c7b4e9
 MISC metadata.xml 243 SHA256 76e8c4cafe92af4eb083e9682c375a2f887458dac6ce8f2982976a96abcf8219 SHA512 92bf36a1bad3877a5a981271afa7381a38f3cc87267233205af5aa0ad53c455d851bb1d9ff60fe02eda49a3347c497c5bfeaa4c160542abd62d81a0450c4b77f WHIRLPOOL 18fde625e32450606e852e52f034c73d6514284aa19842867313432d1ab1cc1d40ceae766c0c61b927a7b5c3917a6624c8e875583f49c0d5951797cf66e8ff95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlEih98ACgkQG7kqcTWJkGeDfgP/XdXDB6Q4zZT+RhV1mChaLC1t
-bRdi19W6FTzHv8+7AzwRU9j/AYXLUWGBu1nbqXqNsoMGbRyPeB0EQWcLpa84QrAI
-jrN8/TYrOrwrhuZu0M+hoCa077sG29TymDGa1eKMVPGYecFS9z2g+WQJ2sdev0cZ
-H/Bg3VH8YOZW3waZJHw=
-=W4qu
+iJwEAQEIAAYFAlEzd3IACgkQG7kqcTWJkGfnYwQArgJ/ZrR5lIdnRvSq1rx1d10z
+FJPHD8ytu0zaPjzHTGm9x3C/JjqS8IUbl8VlVwffFpkMgXzROKO+p6/WMqio/NLS
+Eu7T0PLC2zuAz+7qE0vZjXcvPBYwmGku2qAo6bFrWQtTysuGToY7s5X/DNghmPzA
+oClUXPFFdOqT+mldu7Q=
+=IxAl
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1432.ebuild b/net-p2p/freenet/freenet-0.7.5_p1432.ebuild
deleted file mode 100644
index 7831e3226703..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1432.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2013 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_p1432.ebuild,v 1.1 2013/02/06 21:13:48 tommy Exp $
-
-EAPI="2"
-DATE=20121030
-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="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND=">=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="bcprov,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.bouncycastle.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_p1422-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/0.7.5_p1321-ext.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
-	local ifs_original=${IFS}
-	IFS=","
-	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
-	IFS=${ifs_original}
-	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf
-
-	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_p1433.ebuild b/net-p2p/freenet/freenet-0.7.5_p1436.ebuild
index 928b909421e3..25405c336684 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1433.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1436.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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_p1433.ebuild,v 1.1 2013/02/18 19:58:09 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1436.ebuild,v 1.1 2013/03/03 16:16:42 tommy Exp $
 
 EAPI="2"
 DATE=20130218