From: Thomas Sachau Date: Sat, 13 Mar 2010 18:38:10 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2bbc896fd6b36dc3691b81fe29b368a7504ba846;p=gentoo.git Version bump Package-Manager: portage-2.2_rc67-r2/cvs/Linux x86_64 --- diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog index 45dec95c76e9..0f8dc042802a 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.74 2010/02/16 17:52:11 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.75 2010/03/13 18:38:08 tommy Exp $ + +*freenet-0.7.5_p1241 (13 Mar 2010) + + 13 Mar 2010; Thomas Sachau (Tommy[D]) + -freenet-0.7.5_p1239.ebuild, -freenet-0.7.5_p1240.ebuild, + +freenet-0.7.5_p1241.ebuild, files/ext.patch: + Version bump 16 Feb 2010; Thomas Sachau (Tommy[D]) freenet-0.7.5_p1239.ebuild, freenet-0.7.5_p1240.ebuild: diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest index f1cf2498753c..971a2f886b6b 100644 --- a/net-p2p/freenet/Manifest +++ b/net-p2p/freenet/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX ext.patch 2591 RMD160 751750389cae1f50357466f5b6fef257a635fbef SHA1 dd3a23899f6b5e85131893294743b35a49814e3b SHA256 2e19f0869e0e2bc026464ce526d1603f1439fcfdd8d5cb4d258c69221188590f +AUX ext.patch 2889 RMD160 1ad0e4912247b548633a951226db99676eb16326 SHA1 bb5dd7f1b608216acf73d7d59d7d2c8b034b187c SHA256 577cd63dbb2833c5ecf1ead95bb7ea28c95b64c9835e655f6e789dbdfdc77b14 AUX freenet 476 RMD160 fdce44749587d73cb3f5b916e893e3bb95ef3200 SHA1 48eb8bfbd27a17b0bb3b29248ce4c43b59a76bda SHA256 4a8482117a434e9885438b7ca5384851bff49fefa28b13e33494a746c781342f AUX freenet-0.7.5_p1232-strip-error.patch 747 RMD160 ea1c7127d3b759ddab102322b865e92a12665c6b SHA1 2182f15e34c444d5924d26b2078da2f0bec6b0fe SHA256 bb3ca54049ee537f30c353c681ba6399f6bc47850fa2c7969e02c9622c1e1793 AUX freenet-0.7.5_p1232-strip-openjdk-warning.patch 448 RMD160 fe46149bc653ebf8181f82940028e44817bf2b93 SHA1 ac4cdf3a18ac07f9f4fd1f9e2fb9fe19dd047f86 SHA256 6f129e24455e0c12d6b83f9940bb7e88b7896eb459cac248a76344171b2a3426 @@ -9,21 +9,19 @@ AUX freenet.old 452 RMD160 e9e834fedf4270c14f3e8d754c58eb05f3f570c5 SHA1 edb5d0a AUX run.sh-20090501 16217 RMD160 f8b03990d011e1f149ec43aa536fd7540a19f01a SHA1 123fb5cf1c9b50357156fa300c5015a7e0ca65ad SHA256 470aa99d083a16d2f620282502a59546611f1903e21aef50b93b10d9fada7d7a 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_p1239.tgz 2169738 RMD160 656cd917a59f5f716884c2fa9f0b878686ca6871 SHA1 498d35a56902bee8613b6c5be8797248d1b0cb4e SHA256 afb833102b57167390c552c79e6afb7f286a19770bd1313429094408f11a8703 -DIST freenet-0.7.5_p1240.zip 3001067 RMD160 12415fdb9eb1d29a9f6b4dfa8daa7319843b80a7 SHA1 c94a6733ea3dbcde6a3483b3b429e0309207248a SHA256 7b34a3d3f2e0f7ae141ace2b51fa54c862ddd5b0fabd7ac1aca7871b29a085bd +DIST freenet-0.7.5_p1241.zip 3010424 RMD160 bc633424b2f9df69f6b99d10916cadbe8d66afb8 SHA1 dc14ac637b5d90d1c6a0cec8767d02f7cb09857b SHA256 da197317fd1a41d47386781638233c092b39a78bc80e668766f001e55e763f89 DIST seednodes-20091027.fref 22241 RMD160 5a21874cb0c8dd27cc46329253a10182ac1280bd SHA1 55a060aee01afa8e9bc94be04e2356b7e2f6c4b0 SHA256 42a00a8166deb01ad660600315a9624961c4403ebcf1509971f483ddb4b63e94 -DIST seednodes-20100204.fref 30225 RMD160 b9b6c837bb08927aa8061213ef2548e8d5aeebfc SHA1 87a480522f3b7ea068b27e86b9a25809fcd53d72 SHA256 a09d5c3d977cb42efe05dc7fac8f799db3b566ef2e01da242f1bf6c9b0de9f19 -EBUILD freenet-0.7.5_p1239.ebuild 3169 RMD160 da8c796f6f1b31a0c6decaac65af906d5d8f8687 SHA1 3e1a80ab2283c29d13a922d8004a17ec951b6bfa SHA256 abea17b2d55207306c340e635a366232ad4fb2b6956ffe85a83e68a1333084e0 -EBUILD freenet-0.7.5_p1240.ebuild 3169 RMD160 eea7b4b5146e28f97c0363bf26320a9a9b7c95c8 SHA1 34294fcb4534ca86bff9d49e61dd7f2061f2cec6 SHA256 a6c5eaea85ee42c354a87a3c53d550be97023378cf42c73bf44ed2b8d803352a +DIST seednodes-20100313.fref 30223 RMD160 5be72b1d32e88887e1ce3e6c87d820b44ab326fd SHA1 41dc160e22e6e5393cd02f6852046fd536e4f04d SHA256 e18b839f5551bd58f1976846ea99e9cc4697fe1d580acd8a324e39b29ac71f1e +EBUILD freenet-0.7.5_p1241.ebuild 3169 RMD160 80db5671653caecc27f2bbe2dc739caa779a909e SHA1 2aa34b6c49a040a672675f3ed432926a3afe3085 SHA256 e65953fc88fcbf943e36f084ec2413dca6ca4ca51d1d04d09a1b9a4fa5fa633d EBUILD freenet-9999.ebuild 2579 RMD160 af27c89827ed87434431e2151a844d4e456b07b4 SHA1 bebe0bf774eb6a58a2f94b145021ee57bee4fc4f SHA256 c4f241bcea153172ebb8ef420e75101d987f70b8f3b190ffbde3ce9a42623ee1 -MISC ChangeLog 5474 RMD160 89dea860e0348effb05554d1e098e83ffa1214dc SHA1 b03a8bfcb3f7c4082668c762a7468c8441b989db SHA256 4513a990275af38982617cf4e7e1d479e11395952aeadbd43570799ba69f509d +MISC ChangeLog 5693 RMD160 ca2199b9f2b5fc0d8a2da376b13de2a354fd345f SHA1 36429f7b2daa74c8eb63df21409722e1d029dec4 SHA256 b720e9de649f548c077d8aa28b86c0b9f93e76053b95d4a8ad1304e25434961c MISC metadata.xml 332 RMD160 5e5c8b88681af85d63236c47f3a9a92881515679 SHA1 38a87952bb9389758e8700b4468b122ccf5199ea SHA256 3ca39205a9351767ed2901a4c8c8dd563ed1d83f6684f3bb6c2ab9e92ba4c10f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iJwEAQECAAYFAkt621kACgkQG7kqcTWJkGcKhwP/avtX9XACjm7sD/ocOkuSINuJ -z7UJmaSSwH633k7vw+gVaJKa78z8rhsCTOmK1XoXpCWChvI7RZgFEos+1OQizK5l -U5IElIX6KGBpquemu0AGwQLC4P9135ymTgOnIemLAfhfTtsxIiMbqIs+FQixxn3f -wsOeQezou7ogsJUVaKk= -=8GGx +iJwEAQECAAYFAkub250ACgkQG7kqcTWJkGeTfgP+Ow3gFkgbvenK/1MbqZN8XjVK +19XmqkU/A5WkqgqIUM1Y40qMgGdogBFd4oVrRlIVFO2YSuO5WJoM8uWEveS7xoep +XBG7E8DJSA3KO+GMGV6tdTGZeI+Wpi4awH3dY5wtqmJJpM42AdMeBulOH6t7yDGk +QgB86VwE0qOEeOAray0= +=wX7M -----END PGP SIGNATURE----- diff --git a/net-p2p/freenet/files/ext.patch b/net-p2p/freenet/files/ext.patch index bc3a3a22f118..78a3cbc808f1 100644 --- a/net-p2p/freenet/files/ext.patch +++ b/net-p2p/freenet/files/ext.patch @@ -1,9 +1,10 @@ ---- freenet/build.xml 2009-08-04 20:54:09.267989544 +0200 -+++ freenet/build.xml.new 2009-08-04 20:57:01.295527065 +0200 -@@ -68,19 +68,9 @@ - +--- freenet/build.xml 2010-03-13 19:11:10.000000000 +0100 ++++ freenet/build.xml.new 2010-03-13 19:12:26.000000000 +0100 +@@ -68,26 +68,9 @@ + + - +- - - @@ -14,13 +15,19 @@ - - - +- +- +- +- +- +- - + - + diff -ur freenet-old/src/freenet/node/NodeStarter.java freenet/src/freenet/node/NodeStarter.java --- freenet-old/src/freenet/node/NodeStarter.java 2008-10-28 21:40:50.000000000 +0100 +++ freenet/src/freenet/node/NodeStarter.java 2008-10-28 21:39:14.000000000 +0100 diff --git a/net-p2p/freenet/freenet-0.7.5_p1239.ebuild b/net-p2p/freenet/freenet-0.7.5_p1239.ebuild deleted file mode 100644 index 7e784f2e50bd..000000000000 --- a/net-p2p/freenet/freenet-0.7.5_p1239.ebuild +++ /dev/null @@ -1,96 +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_p1239.ebuild,v 1.2 2010/02/16 17:52:11 tommy Exp $ - -EAPI="2" -DATE=20091027 - -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/tarball/build0${PV#*p} -> ${P}.tgz - 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 - dev-java/lzma - dev-java/lzmajio - dev-java/mersennetwister" -#force secure versions for now -DEPEND="|| ( >=dev-java/icedtea6-1.5.1 >=dev-java/icedtea6-bin-1.5.1 >=dev-java/sun-jdk-1.5.0.20 >=dev-java/sun-jdk-1.6.0.15 ) - >=virtual/jdk-1.5 - ${CDEPEND}" -RDEPEND="|| ( >=dev-java/icedtea6-1.5.1 >=dev-java/icedtea6-bin-1.5.1 >=dev-java/sun-jdk-1.5.0.20 >=dev-java/sun-jdk-1.6.0.15 >=dev-java/sun-jre-bin-1.5.0.20 >=dev-java/sun-jre-bin-1.6.0.15 ) - >=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() { - java-pkg-2_pkg_setup - enewgroup freenet - enewuser freenet -1 -1 /var/freenet freenet -} - -src_prepare() { - cd "${WORKDIR}"/freenet-fred-official-* - S=$(pwd) - cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die - cp "${FILESDIR}"/run.sh-20090501 run.sh || die - epatch "${FILESDIR}"/ext.patch - epatch "${FILESDIR}"/${PN}-0.7.5_p1232-{strip-error,strip-openjdk-warning}.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_p1240.ebuild b/net-p2p/freenet/freenet-0.7.5_p1241.ebuild similarity index 97% rename from net-p2p/freenet/freenet-0.7.5_p1240.ebuild rename to net-p2p/freenet/freenet-0.7.5_p1241.ebuild index b6f246df48a3..19168b0971cc 100644 --- a/net-p2p/freenet/freenet-0.7.5_p1240.ebuild +++ b/net-p2p/freenet/freenet-0.7.5_p1241.ebuild @@ -1,9 +1,9 @@ # 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_p1240.ebuild,v 1.2 2010/02/16 17:52:11 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1241.ebuild,v 1.1 2010/03/13 18:38:08 tommy Exp $ EAPI="2" -DATE=20100204 +DATE=20100313 inherit eutils java-pkg-2 java-ant-2 multilib