Gentoo Archives: gentoo-commits

From: "Thomas Sachau (tommy)" <tommy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-p2p/freenet: freenet-9999.ebuild freenet-0.7.5_p1389.ebuild ChangeLog freenet-0.7.5_p1384.ebuild
Date: Sun, 31 Jul 2011 18:46:00
Message-Id: 20110731184548.52B872004B@flycatcher.gentoo.org
1 tommy 11/07/31 18:45:48
2
3 Modified: freenet-9999.ebuild ChangeLog
4 Added: freenet-0.7.5_p1389.ebuild
5 Removed: freenet-0.7.5_p1384.ebuild
6 Log:
7 Version bump, drop old, update live ebuild, fixes bug 376973, bug 376975 and bug 376277
8
9 (Portage version: 2.2.0_alpha47-r1/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.19 net-p2p/freenet/freenet-9999.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild?rev=1.19&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild?rev=1.19&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild?r1=1.18&r2=1.19
17
18 Index: freenet-9999.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v
21 retrieving revision 1.18
22 retrieving revision 1.19
23 diff -u -r1.18 -r1.19
24 --- freenet-9999.ebuild 16 Jul 2011 10:25:24 -0000 1.18
25 +++ freenet-9999.ebuild 31 Jul 2011 18:45:48 -0000 1.19
26 @@ -1,15 +1,15 @@
27 # Copyright 1999-2011 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.18 2011/07/16 10:25:24 tommy Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.19 2011/07/31 18:45:48 tommy Exp $
31
32 EAPI="2"
33 -DATE=20110715
34 +DATE=20110731
35 JAVA_PKG_IUSE="doc source"
36
37 EGIT_REPO_URI="git://github.com/freenet/fred-official.git"
38 EGIT_PROJECT="freenet/fred-official"
39
40 -inherit eutils git java-pkg-2 java-ant-2 multilib
41 +inherit eutils git-2 java-pkg-2 java-ant-2 multilib
42
43 DESCRIPTION="An encrypted network without censorship"
44 HOMEPAGE="http://www.freenetproject.org/"
45 @@ -21,12 +21,15 @@
46 KEYWORDS=""
47 IUSE="freemail test"
48
49 -CDEPEND="dev-db/db-je:3.3
50 +CDEPEND="freemail? ( dev-java/bcprov )
51 + dev-java/commons-compress
52 + dev-db/db-je:3.3
53 dev-java/fec
54 dev-java/java-service-wrapper
55 dev-java/db4o-jdk11
56 dev-java/db4o-jdk12
57 dev-java/db4o-jdk5
58 + dev-java/jbitcollider-core
59 dev-java/lzma
60 dev-java/lzmajio
61 dev-java/mersennetwister"
62 @@ -37,13 +40,12 @@
63 RDEPEND=">=virtual/jre-1.6
64 net-libs/nativebiginteger
65 ${CDEPEND}"
66 -PDEPEND="net-libs/NativeThread
67 - freemail? ( dev-java/bcprov )"
68 +PDEPEND="net-libs/NativeThread"
69 S=${WORKDIR}/${PN}
70
71 EANT_BUILD_TARGET="package"
72 EANT_BUILD_XML="build-clean.xml"
73 -EANT_GENTOO_CLASSPATH="ant-core db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper lzma lzmajio mersennetwister"
74 +EANT_GENTOO_CLASSPATH="commons-compres db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper jbitcollider-core lzma lzmajio mersennetwister"
75 EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.junit.present=true"
76 use test || export EANT_EXTRA_ARGS+=" -Dtest.skip=true"
77 use test && EANT_GENTOO_CLASSPATH+=" junit"
78 @@ -66,14 +68,33 @@
79 }
80
81 src_prepare() {
82 - cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
83 + cp "${FILESDIR}"/freenet-0.7.5_p1389-wrapper1.conf freenet-wrapper.conf || die
84 cp "${FILESDIR}"/run.sh-20090501 run.sh || die
85 - epatch "${FILESDIR}"/0.7.5_p1302-ext.patch
86 - epatch "${FILESDIR}"/strip-openjdk-check.patch
87 + epatch "${FILESDIR}"/0.7.5_p1302-ext.patch \
88 + "${FILESDIR}"/strip-openjdk-check.patch \
89 + "${FILESDIR}"/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch \
90 + "${FILESDIR}"/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
91 sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
92 - -e "s:/usr/share/ant-core/lib/ant.jar:/usr/share/freenet/lib/ant.jar:g" \
93 freenet-wrapper.conf || die "sed failed"
94 - use freemail && echo "wrapper.java.classpath.12=/usr/share/bcprov/lib/bcprov.jar" >> freenet-wrapper.conf
95 +
96 + echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf
97 +
98 + local i=2 pkg jars jar
99 + for pkg in ${EANT_GENTOO_CLASSPATH} ; do
100 + jars="$(java-pkg_getjars ${pkg})"
101 + for jar in ${jars} ; do
102 + echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf
103 + done
104 + done
105 + echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf
106 +
107 + if use freemail ; then
108 + jars="$(java-pkg_getjars bcprov)"
109 + for jar in ${jars} ; do
110 + echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf
111 + done
112 + fi
113 +
114 java-ant_rewrite-classpath "${EANT_BUILD_XML}"
115 java-pkg-2_src_prepare
116 }
117
118
119
120 1.134 net-p2p/freenet/ChangeLog
121
122 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/ChangeLog?rev=1.134&view=markup
123 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/ChangeLog?rev=1.134&content-type=text/plain
124 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/ChangeLog?r1=1.133&r2=1.134
125
126 Index: ChangeLog
127 ===================================================================
128 RCS file: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v
129 retrieving revision 1.133
130 retrieving revision 1.134
131 diff -u -r1.133 -r1.134
132 --- ChangeLog 16 Jul 2011 10:25:24 -0000 1.133
133 +++ ChangeLog 31 Jul 2011 18:45:48 -0000 1.134
134 @@ -1,6 +1,16 @@
135 # ChangeLog for net-p2p/freenet
136 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
137 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.133 2011/07/16 10:25:24 tommy Exp $
138 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.134 2011/07/31 18:45:48 tommy Exp $
139 +
140 +*freenet-0.7.5_p1389 (31 Jul 2011)
141 +
142 + 31 Jul 2011; Thomas Sachau (Tommy[D]) <tommy@g.o>
143 + -freenet-0.7.5_p1384.ebuild, +freenet-0.7.5_p1389.ebuild,
144 + +files/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch,
145 + +files/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch,
146 + +files/freenet-0.7.5_p1389-wrapper.conf, freenet-9999.ebuild:
147 + Version bump, drop old, update live ebuild, fixes bug 376973, bug 376975 and
148 + bug 376277
149
150 *freenet-0.7.5_p1384 (16 Jul 2011)
151
152
153
154
155 1.1 net-p2p/freenet/freenet-0.7.5_p1389.ebuild
156
157 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1389.ebuild?rev=1.1&view=markup
158 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1389.ebuild?rev=1.1&content-type=text/plain
159
160 Index: freenet-0.7.5_p1389.ebuild
161 ===================================================================
162 # Copyright 1999-2011 Gentoo Foundation
163 # Distributed under the terms of the GNU General Public License v2
164 # $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1389.ebuild,v 1.1 2011/07/31 18:45:48 tommy Exp $
165
166 EAPI="2"
167 DATE=20110731
168 JAVA_PKG_IUSE="doc source"
169
170 inherit eutils java-pkg-2 java-ant-2 multilib
171
172 DESCRIPTION="An encrypted network without censorship"
173 HOMEPAGE="http://www.freenetproject.org/"
174 SRC_URI="http://github.com/${PN}/fred-official/zipball/build0${PV#*p} -> ${P}.zip
175 mirror://gentoo/seednodes-${DATE}.fref.bz2
176 mirror://gentoo/freenet-ant-1.7.1.jar"
177
178 LICENSE="as-is GPL-2"
179 SLOT="0"
180 KEYWORDS="~amd64 ~x86"
181 IUSE="freemail test"
182
183 CDEPEND="freemail? ( dev-java/bcprov )
184 dev-java/commons-compress
185 dev-db/db-je:3.3
186 dev-java/fec
187 dev-java/java-service-wrapper
188 dev-java/db4o-jdk11
189 dev-java/db4o-jdk12
190 dev-java/db4o-jdk5
191 dev-java/jbitcollider-core
192 dev-java/lzma
193 dev-java/lzmajio
194 dev-java/mersennetwister"
195 DEPEND="app-arch/unzip
196 >=virtual/jdk-1.6
197 ${CDEPEND}
198 test? ( dev-java/junit
199 dev-java/ant-junit )
200 dev-java/ant-core"
201 RDEPEND=">=virtual/jre-1.6
202 net-libs/nativebiginteger
203 ${CDEPEND}"
204 PDEPEND="net-libs/NativeThread"
205
206 EANT_BUILD_TARGET="package"
207 EANT_TEST_TARGET="unit"
208 EANT_BUILD_XML="build-clean.xml"
209 EANT_GENTOO_CLASSPATH="commons-compress db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper jbitcollider-core lzma lzmajio mersennetwister"
210 EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.junit.present=true"
211 export EANT_EXTRA_ARGS+=" -Dtest.skip=true"
212
213 pkg_setup() {
214 has_version dev-java/icedtea[cacao] && {
215 ewarn "dev-java/icedtea was built with cacao USE flag."
216 ewarn "freenet may compile with it, but it will refuse to run."
217 ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
218 ewarn "if you plan to use it for running freenet."
219 }
220 java-pkg-2_pkg_setup
221 enewgroup freenet
222 enewuser freenet -1 -1 /var/freenet freenet
223 }
224
225 src_unpack() {
226 unpack ${P}.zip seednodes-${DATE}.fref.bz2
227 mv "${WORKDIR}"/freenet-fred-* "${S}"
228 }
229
230 src_prepare() {
231 cp "${FILESDIR}"/freenet-0.7.5_p1389-wrapper.conf freenet-wrapper.conf || die
232 cp "${FILESDIR}"/run.sh-20090501 run.sh || die
233 epatch "${FILESDIR}"/0.7.5_p1302-ext.patch \
234 "${FILESDIR}"/strip-openjdk-check.patch \
235 "${FILESDIR}"/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch \
236 "${FILESDIR}"/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
237
238 sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
239 freenet-wrapper.conf || die "sed failed"
240
241 echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf
242
243 local i=2 pkg jars jar
244 for pkg in ${EANT_GENTOO_CLASSPATH} ; do
245 jars="$(java-pkg_getjars ${pkg})"
246 for jar in ${jars} ; do
247 echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf
248 done
249 done
250 echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf
251
252 if use freemail ; then
253 jars="$(java-pkg_getjars bcprov)"
254 for jar in ${jars} ; do
255 echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf
256 done
257 fi
258
259 java-ant_rewrite-classpath "${EANT_BUILD_XML}"
260 java-pkg-2_src_prepare
261 cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
262 }
263
264 src_test() {
265 java-pkg_jar-from --into lib fec
266 java-pkg_jar-from --into lib java-service-wrapper
267 java-pkg_jar-from --into lib mersennetwister
268 java-pkg_jar-from --into lib lzma
269 java-pkg_jar-from --into lib db4o-jdk5
270 java-pkg_jar-from --into lib db4o-jdk12
271 java-pkg_jar-from --into lib db4o-jdk11
272 export EANT_EXTRA_ARGS+=" -Dtest.skip=false"
273 java-pkg-2_src_test
274 }
275
276 src_install() {
277 java-pkg_dojar dist/freenet.jar
278 java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
279 if has_version =sys-apps/baselayout-2*; then
280 doinitd "${FILESDIR}"/freenet
281 else
282 newinitd "${FILESDIR}"/freenet.old freenet
283 fi
284 dodoc AUTHORS README || die
285 insinto /etc
286 doins freenet-wrapper.conf || die
287 insinto /var/freenet
288 doins run.sh || die
289 newins "${WORKDIR}"/seednodes-${DATE}.fref seednodes.fref || die
290 fperms +x /var/freenet/run.sh
291 dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
292 use doc && java-pkg_dojavadoc javadoc
293 use source && java-pkg_dosrc src
294 }
295
296 pkg_postinst() {
297 elog " "
298 elog "1. Start freenet with /etc/init.d/freenet start."
299 elog "2. Open localhost:8888 in your browser for the web interface."
300 #workaround for previously existing freenet user
301 [[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
302 freenet:freenet /var/freenet
303 }
304
305 pkg_postrm() {
306 if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then
307 elog " "
308 elog "If you dont want to use freenet any more"
309 elog "and dont want to keep your identity/other stuff"
310 elog "remember to do 'rm -rf /var/freenet' to remove everything"
311 fi
312 }