Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: ChangeLog freenet-0.7_p1209.ebuild freenet-9999.ebuild
Date: Fri, 01 May 2009 17:38:21
Message-Id: E1Lzwgl-0000mS-0Y@stork.gentoo.org
1 tommy 09/05/01 17:38:19
2
3 Modified: ChangeLog freenet-9999.ebuild
4 Added: freenet-0.7_p1209.ebuild
5 Log:
6 Version bump, switch to git sources
7 (Portage version: 2.2_rc31/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.53 net-p2p/freenet/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/ChangeLog?rev=1.53&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/ChangeLog?rev=1.53&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/ChangeLog?r1=1.52&r2=1.53
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v
19 retrieving revision 1.52
20 retrieving revision 1.53
21 diff -u -r1.52 -r1.53
22 --- ChangeLog 13 Apr 2009 13:06:33 -0000 1.52
23 +++ ChangeLog 1 May 2009 17:38:18 -0000 1.53
24 @@ -1,6 +1,12 @@
25 # ChangeLog for net-p2p/freenet
26 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.52 2009/04/13 13:06:33 tommy Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.53 2009/05/01 17:38:18 tommy Exp $
29 +
30 +*freenet-0.7_p1209 (01 May 2009)
31 +
32 + 01 May 2009; Thomas Sachau (Tommy[D]) <tommy@g.o>
33 + +files/run.sh-20090501, +freenet-0.7_p1209.ebuild, freenet-9999.ebuild:
34 + Version bump, switch to git sources
35
36 *freenet-0.7_p1208 (13 Apr 2009)
37
38
39
40
41 1.3 net-p2p/freenet/freenet-9999.ebuild
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild?rev=1.3&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild?rev=1.3&content-type=text/plain
45 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild?r1=1.2&r2=1.3
46
47 Index: freenet-9999.ebuild
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v
50 retrieving revision 1.2
51 retrieving revision 1.3
52 diff -u -r1.2 -r1.3
53 --- freenet-9999.ebuild 27 Feb 2009 18:26:21 -0000 1.2
54 +++ freenet-9999.ebuild 1 May 2009 17:38:18 -0000 1.3
55 @@ -1,16 +1,18 @@
56 # Copyright 1999-2009 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.2 2009/02/27 18:26:21 tommy Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.3 2009/05/01 17:38:18 tommy Exp $
60
61 -EAPI=1
62 -DATE=20090226
63 -ESVN_REPO_URI="http://freenet.googlecode.com/svn/trunk/freenet"
64 -ESVN_OPTIONS="--ignore-externals"
65 -inherit eutils java-pkg-2 java-ant-2 multilib subversion
66 +EAPI="1"
67 +DATE=20090413
68 +
69 +EGIT_REPO_URI="git://github.com/freenet/fred-official.git"
70 +EGIT_PROJECT="freenet/fred-official"
71 +
72 +inherit eutils git java-pkg-2 java-ant-2 multilib
73
74 DESCRIPTION="An encrypted network without censorship"
75 HOMEPAGE="http://www.freenetproject.org/"
76 -SRC_URI="http://dev.gentooexperimental.org/~tommy/distfiles/seednodes-${DATE}.fref"
77 +SRC_URI="mirror://gentoo/seednodes-${DATE}.fref"
78
79 LICENSE="as-is GPL-2"
80 SLOT="0"
81 @@ -46,21 +48,10 @@
82 }
83
84 src_unpack() {
85 - subversion_src_unpack
86 - subversion_wc_info
87 - sed -i -e "s:@custom@:${ESVN_WC_REVISION}:g" src/freenet/node/Version.java || die "sed failed"
88 - ESVN_REPO_URI="http://freenet.googlecode.com/svn/trunk/apps/new_installer/res/unix/"
89 - ESVN_OPTIONS="-N"
90 - subversion_src_unpack
91 + git_src_unpack
92 cd "${S}"
93 cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
94 - sed -i -e 's:./bin/wrapper:/usr/bin/wrapper:g' \
95 - -e 's:./wrapper.conf:/etc/freenet-wrapper.conf:g' \
96 - -e 's:PIDDIR=".":PIDDIR="/var/freenet/":g' \
97 - -e 's:#RUN_AS_USER=:RUN_AS_USER=freenet:g' run.sh || die "sed failed"
98 - head -n 133 run.sh >run1.sh
99 - tail -n 452 run.sh >>run1.sh
100 - mv run1.sh run.sh || die
101 + cp "${FILESDIR}"/run.sh-20090501 run.sh || die
102 epatch "${FILESDIR}"/ext.patch
103 sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" freenet-wrapper.conf || die "sed failed"
104 use freemail && echo "wrapper.java.classpath.12=/usr/share/bcprov/lib/bcprov.jar" >> freenet-wrapper.conf
105 @@ -84,12 +75,8 @@
106 dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
107 }
108
109 -pkg_preinst() {
110 - java-pkg-2_pkg_preinst
111 - subversion_pkg_preinst
112 -}
113 -
114 pkg_postinst() {
115 + elog
116 elog "1. Start freenet with /etc/init.d/freenet start."
117 elog "2. Open localhost:8888 in your browser for the web interface."
118 }
119
120
121
122 1.1 net-p2p/freenet/freenet-0.7_p1209.ebuild
123
124 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/freenet-0.7_p1209.ebuild?rev=1.1&view=markup
125 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/freenet-0.7_p1209.ebuild?rev=1.1&content-type=text/plain
126
127 Index: freenet-0.7_p1209.ebuild
128 ===================================================================
129 # Copyright 1999-2009 Gentoo Foundation
130 # Distributed under the terms of the GNU General Public License v2
131 # $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7_p1209.ebuild,v 1.1 2009/05/01 17:38:18 tommy Exp $
132
133 EAPI="1"
134 DATE=20090413
135
136 EGIT_REPO_URI="git://github.com/freenet/fred-official.git"
137 EGIT_PROJECT="freenet/fred-official"
138 EGIT_TREE="81cfd0f6d7b13b8aabef3cd5d1bc65c0fc9da3c7"
139
140 inherit eutils git java-pkg-2 java-ant-2 multilib
141
142 DESCRIPTION="An encrypted network without censorship"
143 HOMEPAGE="http://www.freenetproject.org/"
144 SRC_URI="mirror://gentoo/seednodes-${DATE}.fref"
145
146
147 LICENSE="as-is GPL-2"
148 SLOT="0"
149 KEYWORDS="~amd64 ~x86"
150 IUSE="freemail"
151
152 CDEPEND="dev-db/db-je:3.3
153 dev-java/fec
154 dev-java/java-service-wrapper
155 dev-java/db4o-jdk11
156 dev-java/db4o-jdk12
157 dev-java/db4o-jdk5
158 dev-java/ant-core
159 dev-java/lzma
160 dev-java/lzmajio
161 dev-java/mersennetwister"
162 DEPEND=">=virtual/jdk-1.5
163 ${CDEPEND}"
164 RDEPEND=">=virtual/jre-1.5
165 net-libs/nativebiginteger
166 ${CDEPEND}"
167 PDEPEND="net-libs/NativeThread
168 freemail? ( dev-java/bcprov )"
169
170 EANT_BUILD_TARGET="dist"
171 EANT_GENTOO_CLASSPATH="ant-core db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper lzma lzmajio mersennetwister"
172
173 pkg_setup() {
174 java-pkg-2_pkg_setup
175 enewgroup freenet
176 enewuser freenet -1 -1 /var/freenet freenet
177 }
178
179 src_unpack() {
180 git_src_unpack
181 cd "${S}"
182 cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
183 cp "${FILESDIR}"/run.sh-20090501 run.sh || die
184 epatch "${FILESDIR}"/ext.patch
185 sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" freenet-wrapper.conf || die "sed failed"
186 use freemail && echo "wrapper.java.classpath.12=/usr/share/bcprov/lib/bcprov.jar" >> freenet-wrapper.conf
187 java-ant_rewrite-classpath
188 }
189
190 src_install() {
191 java-pkg_newjar lib/freenet-cvs-snapshot.jar ${PN}.jar
192 if has_version =sys-apps/baselayout-2*; then
193 doinitd "${FILESDIR}"/freenet
194 else
195 newinitd "${FILESDIR}"/freenet.old freenet
196 fi
197 dodoc AUTHORS README || die
198 insinto /etc
199 doins freenet-wrapper.conf || die
200 insinto /var/freenet
201 doins seednodes.fref run.sh || die
202 fperms +x /var/freenet/run.sh
203 dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
204 }
205
206 pkg_postinst () {
207 elog "1. Start freenet with /etc/init.d/freenet start."
208 elog "2. Open localhost:8888 in your browser for the web interface."
209 #workaround for previously existing freenet user
210 [[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
211 freenet:freenet /var/freenet
212 }
213
214 pkg_postrm() {
215 if [ -z has_version ]; then
216 elog "If you dont want to use freenet any more"
217 elog "and dont want to keep your identity/other stuff"
218 elog "remember to do 'rm -rf /var/freenet' to remove everything"
219 fi
220 }
Report Message
Find on MARC Find on Google Groups