diff options
| -rw-r--r-- | net-p2p/freenet/ChangeLog | 5 | ||||
| -rw-r--r-- | net-p2p/freenet/Manifest | 12 | ||||
| -rw-r--r-- | net-p2p/freenet/files/ext.patch | 34 | ||||
| -rw-r--r-- | net-p2p/freenet/files/wrapper1.conf | 1 | ||||
| -rw-r--r-- | net-p2p/freenet/freenet-0.7_p1166.ebuild (renamed from net-p2p/freenet/freenet-0.7_p1165.ebuild) | 6 | ||||
| -rw-r--r-- | net-p2p/freenet/freenet-9999-r1.ebuild | 6 |
6 files changed, 40 insertions, 24 deletions
diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog index afa3593c2..88759ae1b 100644 --- a/net-p2p/freenet/ChangeLog +++ b/net-p2p/freenet/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 27 Oct 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> + -freenet-0.7_p1165.ebuild, +freenet-0.7_p1166.ebuild, + freenet-9999-r1.ebuild, files/ext.patch, files/wrapper1.conf: + New upstream release + update live ebuild + 08 Oct 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> freenet-0.7_p1165.ebuild, freenet-9999-r1.ebuild: Add freemail support diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest index 86a332800..8ee340404 100644 --- a/net-p2p/freenet/Manifest +++ b/net-p2p/freenet/Manifest @@ -1,10 +1,10 @@ -AUX ext.patch 4954 RMD160 57fb8ecf9be8900a1ad54306d5c4df1eef6acd80 SHA1 3f9eaacdac0165f22ab6fe368140b820b93191b2 SHA256 206205dcf18ae6ad641fcb9f620b605aea47ed6b078296b41476ac3074045325 +AUX ext.patch 5219 RMD160 2d835d17793ea6f441524feab9c484a536c571f0 SHA1 0cd41ebe37ce257a3602aef3a564398f99c3ed85 SHA256 879e552d5bf8398851489855858cfaa4aaadfc346a5957595f0f12998895b104 AUX freenet 667 RMD160 3b27107bc1c7ce786621817aedbd51bef8d87281 SHA1 b2e1c5ee6df53e41533a7f24acac4531eb2b0c4b SHA256 3112937e3ea474a9e9624aaf841b9f52007abb2f48b0c3b9b1e886b882318c84 AUX freenet.old 643 RMD160 be7dc68fed6caf7062f9b3250be6223513d375ff SHA1 50f706994d7fba56e3b38fdbc2998b246147d713 SHA256 8396eea93c2dcb8c7ce7d8659d0da22e06992867c8d57526c634455395334f72 -AUX wrapper1.conf 1846 RMD160 b75534061632064f7ebd9153260b021a7f23c076 SHA1 b6df84ded6f31b1a2c0757cdf7c8736e9b744181 SHA256 00b09246fd598c6ce13836d79104e4964de538ac1d9b3af6fa7bf240f142ca00 -DIST freenet-0.7_p1165.tar.bz2 2247846 RMD160 20174fa6c1c02cfe1d61adbfd64d93b844a2789e SHA1 0e7c583f329df7f1937466e4f3649c35ae88f4b3 SHA256 e3399f19704857c0effd790c013f241410eb990e367fc420ac0db0cbb1956803 +AUX wrapper1.conf 1903 RMD160 8937491f8fffd2e01f2a5f45adbd9d188ae8fd02 SHA1 02436e8f4717c2047165229fa515a425a4a2fea2 SHA256 fced6c20eca2706203b457ed4425cffdcd000d4dcb1e814e8427666a34165771 +DIST freenet-0.7_p1166.tar.bz2 2243858 RMD160 34169c2ee84683503901bf869ac50b772626dbec SHA1 7c4c5101db36dbc7767a3b46471bf52b5573aec1 SHA256 7a04ce7a951c2f6fc1ddf73bcfc1d33efd9e55e9af167868283a0a25c941f895 DIST seednodes-20080928.fref 28703 RMD160 8f92609f1d8beb3164d8f4d5e35c4539a6824dc3 SHA1 9c5a2a2f6188850b8503c1e31ae79e9964c4662a SHA256 ed153fe40f36c6088f97c4d7bed15333722b7e6b27b7c9efd0c506cd7b79f7c3 -EBUILD freenet-0.7_p1165.ebuild 3474 RMD160 4b5da28c1e5d97c09e86be3cb01ac9e183e5c087 SHA1 cecb80de964200d488cb0f97e9cd6cbca6879d16 SHA256 16ff63feb2465460f86a4988c355e6176567eb336b801385e1cce7d0985ab2ea -EBUILD freenet-9999-r1.ebuild 4159 RMD160 b1c168109036087c259f3d02159cb81b55d53b27 SHA1 817223e9895b8dde6902255a997c05a2efa593ac SHA256 d58416a0f4eb37ef1d820a9502c96eb9a43df06ce5d25fe2937040a59145abe1 -MISC ChangeLog 14014 RMD160 aa4a08d1073c534638868b6cc41bf05e8316cefa SHA1 ac73434c4a7c957e47db26bc4487e15caca7174e SHA256 2a5f792ca53ccde26da8c7627a23c343b524bbc759da30c8e58ee8756627a7d3 +EBUILD freenet-0.7_p1166.ebuild 3529 RMD160 e6248afd05b05a29e8766b6ab863d4fd52e1bbaa SHA1 fe41de61f9d956e6a728b1b9862a79bde99709a3 SHA256 ad1adf77fbe33a57ba398a9c695912b880771ca172e2a190da6c7e068ee71571 +EBUILD freenet-9999-r1.ebuild 4214 RMD160 3ebc65efe6f8626971e90cec3bcbad443bfab84c SHA1 81aaf4b4f31998eb59e3c17bbc0dd67980e830e0 SHA256 112cae519f1f025a218b2f16d0d01b5d161a8ccf9acefee79ea8395cbd3c3fc8 +MISC ChangeLog 14238 RMD160 8222f367b6cbd574de9c3636d0c9f108ce7fdef2 SHA1 dd1599a844caf0025fb6aec85bdfc8b3ea852028 SHA256 f697cd29952db0e2a6c46504e3139632776ebafd4964b741282725e10b9d3beb MISC metadata.xml 238 RMD160 61d35251af6d2d13fa32d5c455dbf179174ca375 SHA1 b2ff81a006f10b2a9d37722a77eb70be65abb9e8 SHA256 9425b3716c550570a17382ba0b1a9fbf3243483ea6117ae94453ee7047362f8a diff --git a/net-p2p/freenet/files/ext.patch b/net-p2p/freenet/files/ext.patch index 0ab581ca6..0c08c0512 100644 --- a/net-p2p/freenet/files/ext.patch +++ b/net-p2p/freenet/files/ext.patch @@ -1,7 +1,7 @@ diff -ur freenet-old/build.xml freenet/build.xml ---- freenet-old/build.xml 2008-03-30 14:55:10.000000000 +0200 -+++ freenet/build.xml 2008-03-30 16:02:56.000000000 +0200 -@@ -13,7 +13,9 @@ +--- freenet-old/build.xml 2008-10-27 18:32:49.000000000 +0100 ++++ freenet/build.xml 2008-10-27 18:36:47.000000000 +0100 +@@ -16,7 +16,10 @@ <property name="build" location="build"/> <property name="build-test" location="build-test"/> <property name="lib" location="lib"/> @@ -9,10 +9,11 @@ diff -ur freenet-old/build.xml freenet/build.xml + <property name="wrapper.location" location="${lib}/wrapper.jar"/> + <property name="je.location" location="${lib}/je.jar"/> + <property name="fec.location" location="${lib}/fec.jar"/> ++ <property name="ant.location" location="${lib}/ant.jar"/> <property name="javadoc" location="javadoc"/> <property name="svn.revision" value="@custom@"/> <property name="CSSTokenizerFilter.relative.jflex" value="freenet/clients/http/filter/CSSTokenizerFilter.jflex"/> -@@ -34,7 +36,6 @@ +@@ -37,7 +40,6 @@ </target> <target name="env" depends="mkdir" description="Learn about the environment"> @@ -20,7 +21,7 @@ diff -ur freenet-old/build.xml freenet/build.xml <available file="${CSSTokenizerFilter.java}" property="CSSTokenizerFilter.present"/> <available file="${junit.location}" property="junit.present"/> </target> -@@ -48,19 +49,9 @@ +@@ -51,19 +53,9 @@ </exec> </target> @@ -41,29 +42,31 @@ diff -ur freenet-old/build.xml freenet/build.xml <!-- Create the time stamp --> <tstamp/> -@@ -75,7 +66,9 @@ - <!-- FIXME: remove the debug and replace with optimize --> - <javac srcdir="${src}" destdir="${build}" debug="on" optimize="on" source="1.4"> +@@ -77,7 +69,10 @@ + + <javac srcdir="${src}" destdir="${build}" debug="on" optimize="on" source="1.5"> <classpath> - <pathelement location="${freenet-ext.location}"/> + <pathelement location="${wrapper.location}"/> + <pathelement location="${je.location}"/> + <pathelement location="${fec.location}"/> ++ <pathelement location="${ant.location}"/> <pathelement location="gnu-crypto.jar"/> <pathelement location="javax-security.jar"/> <pathelement location="javax-crypto.jar"/> -@@ -131,7 +124,9 @@ - <javac srcdir="${test}" destdir="${build-test}" debug="on" optimize="on" source="1.4"> +@@ -135,7 +130,10 @@ + <javac srcdir="${test}" destdir="${build-test}" debug="on" optimize="on" source="1.5"> <classpath> <pathelement path="${build}"/> - <pathelement location="${freenet-ext.location}"/> + <pathelement location="${wrapper.location}"/> + <pathelement location="${je.location}"/> + <pathelement location="${fec.location}"/> ++ <pathelement location="${ant.location}"/> <pathelement location="${junit.location}"/> </classpath> - <include name="**/*.java"/> -@@ -144,7 +139,9 @@ + <compilerarg value="-Xlint"/> +@@ -149,7 +147,10 @@ <classpath> <pathelement path="${build}"/> <pathelement path="${build-test}"/> @@ -71,11 +74,14 @@ diff -ur freenet-old/build.xml freenet/build.xml + <pathelement location="${wrapper.location}"/> + <pathelement location="${je.location}"/> + <pathelement location="${fec.location}"/> ++ <pathelement location="${ant.location}"/> <pathelement location="${junit.location}"/> </classpath> ---- freenet/src/freenet/node/NodeStarter.java 2008-07-03 23:05:20.000000000 +0200 -+++ freenet/src/freenet/node/NodeStarter.java.new 2008-07-03 23:08:14.000000000 +0200 +Nur in freenet: lib. +diff -ur freenet-old/src/freenet/node/NodeStarter.java freenet/src/freenet/node/NodeStarter.java +--- freenet-old/src/freenet/node/NodeStarter.java 2008-10-27 18:32:49.000000000 +0100 ++++ freenet/src/freenet/node/NodeStarter.java 2008-10-27 18:34:12.000000000 +0100 @@ -162,37 +162,8 @@ } diff --git a/net-p2p/freenet/files/wrapper1.conf b/net-p2p/freenet/files/wrapper1.conf index 32e686280..3914a3f89 100644 --- a/net-p2p/freenet/files/wrapper1.conf +++ b/net-p2p/freenet/files/wrapper1.conf @@ -6,6 +6,7 @@ wrapper.java.classpath.2=/usr/share/java-service-wrapper/lib/wrapper.jar wrapper.java.classpath.3=/usr/share/db-je-3.3/lib/je.jar wrapper.java.classpath.4=/usr/share/fec/lib/fec.jar wrapper.java.classpath.5=/usr/share/db4o/lib/db4o.jar +wrapper.java.classpath.6=/usr/share/ant-core/lib/ant.jar wrapper.java.library.path.1=lib wrapper.java.initmemory=60 wrapper.java.maxmemory=128 diff --git a/net-p2p/freenet/freenet-0.7_p1165.ebuild b/net-p2p/freenet/freenet-0.7_p1166.ebuild index 51236eb74..9c05170a1 100644 --- a/net-p2p/freenet/freenet-0.7_p1165.ebuild +++ b/net-p2p/freenet/freenet-0.7_p1166.ebuild @@ -18,7 +18,8 @@ IUSE="freemail" CDEPEND="dev-db/db-je:3.3 dev-java/fec dev-java/java-service-wrapper - dev-java/db4o" + dev-java/db4o + dev-java/ant-core" DEPEND=">=virtual/jdk-1.5 ${CDEPEND}" RDEPEND=">=virtual/jre-1.5 @@ -52,13 +53,14 @@ src_unpack() { cp "${FILESDIR}"/wrapper1.conf wrapper.conf epatch "${FILESDIR}"/ext.patch sed -i -e "s/=lib/=$(get_libdir)/g" wrapper.conf || die "sed failed" - use freemail && echo "wrapper.java.classpath.5=/usr/share/bcprov/lib/bcprov.jar" >> wrapper.conf + use freemail && echo "wrapper.java.classpath.7=/usr/share/bcprov/lib/bcprov.jar" >> wrapper.conf mkdir -p lib cd lib java-pkg_jar-from db-je-3.3 java-pkg_jar-from java-service-wrapper java-pkg_jar-from fec java-pkg_jar-from db4o + java-pkg_jar-from ant-core ant.jar } src_install() { diff --git a/net-p2p/freenet/freenet-9999-r1.ebuild b/net-p2p/freenet/freenet-9999-r1.ebuild index 01cbc2616..59bce1333 100644 --- a/net-p2p/freenet/freenet-9999-r1.ebuild +++ b/net-p2p/freenet/freenet-9999-r1.ebuild @@ -21,7 +21,8 @@ IUSE="freemail" CDEPEND="dev-db/db-je:3.3 dev-java/fec dev-java/java-service-wrapper - dev-java/db4o" + dev-java/db4o + dev-java/ant-core" DEPEND=">=virtual/jdk-1.5 ${CDEPEND}" RDEPEND=">=virtual/jre-1.5 @@ -69,13 +70,14 @@ src_unpack() { sed -ie "s:@custom@:${ESVN_WC_REVISION}:g" src/freenet/node/Version.java epatch "${FILESDIR}"/ext.patch sed -i -e "s/=lib/=$(get_libdir)/g" wrapper.conf || die "sed failed" - use freemail && echo "wrapper.java.classpath.5=/usr/share/bcprov/lib/bcprov.jar" >> wrapper.conf + use freemail && echo "wrapper.java.classpath.7=/usr/share/bcprov/lib/bcprov.jar" >> wrapper.conf mkdir -p lib cd lib java-pkg_jar-from db-je-3.3 java-pkg_jar-from java-service-wrapper java-pkg_jar-from fec java-pkg_jar-from db4o + java-pkg_jar-from ant-core ant.jar } src_install() { |