1 |
commit: 90579b151dbeee2ad19ea2b4f873b329d1297823 |
2 |
Author: tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com> |
3 |
AuthorDate: Sun Aug 26 16:21:12 2018 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 7 08:23:53 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90579b15 |
7 |
|
8 |
net-vpn/i2p: remove 0.9.{31,33}. |
9 |
|
10 |
net-vpn/i2p/Manifest | 2 - |
11 |
net-vpn/i2p/i2p-0.9.31.ebuild | 150 ------------------------------------------ |
12 |
net-vpn/i2p/i2p-0.9.33.ebuild | 143 ---------------------------------------- |
13 |
3 files changed, 295 deletions(-) |
14 |
|
15 |
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest |
16 |
index 7c6fb46abad..018ac01d087 100644 |
17 |
--- a/net-vpn/i2p/Manifest |
18 |
+++ b/net-vpn/i2p/Manifest |
19 |
@@ -1,4 +1,2 @@ |
20 |
-DIST i2psource_0.9.31.tar.bz2 28745769 BLAKE2B e7766eceffb44c7c40ce176c3d98ed9a62472058c90adf1b07bbab11628d6ca4c8c62ca52526a204a6e8f47a182a59e07ccbdef65b6d2c5122d8e64e1df75406 SHA512 ffeb74d02c783febc122580b64561722de04c903e2d33fdeaf74bf3b7d725b8b7ce6556f53a12f0ae0d6c6deb413839e222bc2b8093952e5ecaf1bf96f0d1103 |
21 |
-DIST i2psource_0.9.33.tar.bz2 28985659 BLAKE2B 51b9697271c506de8d34b42ff208a12c9f0409c9aff456aa928dc2d411aceb0473878e9ed0d6ccf3684a7432c64700eec798535b4a4f4e01a2297e3d3ef7603a SHA512 ad772a422923636731350e590a14631209503c3d82db32410cb3002c790c60f9f7d950f94bb4d65ced1c2126e67a92ad65e9cd65ae3f045fc5279f57217066e2 |
22 |
DIST i2psource_0.9.34.tar.bz2 29332692 BLAKE2B 16b15ac2c7eaa594fc6398105d7e22442fafc4036a54a66c91b3ca9bd98095a9192ae5c28123882ddc6acc7c68fb5eeed3ef1ed632a4b4b96a1abe28dff2286c SHA512 71c80710098ead34c159c6a6873c397048afc76974917e7b65d7846203900ab8bfb4840fec3c7d09ade48e93329b06ec33d9f367dae33a4708b4ea14268beefa |
23 |
DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4 |
24 |
|
25 |
diff --git a/net-vpn/i2p/i2p-0.9.31.ebuild b/net-vpn/i2p/i2p-0.9.31.ebuild |
26 |
deleted file mode 100644 |
27 |
index bf868bfbd84..00000000000 |
28 |
--- a/net-vpn/i2p/i2p-0.9.31.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,150 +0,0 @@ |
31 |
-# Copyright 1999-2017 Gentoo Foundation |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI="6" |
35 |
- |
36 |
-inherit eutils java-pkg-2 java-ant-2 systemd user |
37 |
- |
38 |
-DESCRIPTION="A privacy-centric, anonymous network." |
39 |
-HOMEPAGE="https://geti2p.net" |
40 |
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2" |
41 |
- |
42 |
-LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2" |
43 |
-SLOT="0" |
44 |
- |
45 |
-# Until the deps reach other arches |
46 |
-KEYWORDS="~amd64 ~x86" |
47 |
-IUSE="+ecdsa nls" |
48 |
- |
49 |
-# dev-java/ant-core is automatically added due to java-ant-2.eclass |
50 |
-CP_DEPEND="dev-java/bcprov:1.50 |
51 |
- dev-java/jrobin:0 |
52 |
- dev-java/slf4j-api:0 |
53 |
- dev-java/tomcat-jstl-impl:0 |
54 |
- dev-java/tomcat-jstl-spec:0 |
55 |
- dev-java/java-service-wrapper:0" |
56 |
- |
57 |
-DEPEND="${CP_DEPEND} |
58 |
- dev-java/eclipse-ecj:* |
59 |
- dev-libs/gmp:0 |
60 |
- nls? ( >=sys-devel/gettext-0.19 ) |
61 |
- >=virtual/jdk-1.7" |
62 |
- |
63 |
-RDEPEND="${CP_DEPEND} |
64 |
- ecdsa? ( |
65 |
- || ( |
66 |
- dev-java/icedtea:8[-sunec] |
67 |
- dev-java/icedtea-bin:8 |
68 |
- dev-java/oracle-jre-bin |
69 |
- dev-java/oracle-jdk-bin |
70 |
- ) |
71 |
- ) |
72 |
- !ecdsa? ( >=virtual/jre-1.7 )" |
73 |
- |
74 |
-EANT_BUILD_TARGET="pkg" |
75 |
-JAVA_ANT_ENCODING="UTF-8" |
76 |
- |
77 |
-I2P_ROOT='/usr/share/i2p' |
78 |
-I2P_CONFIG_HOME='/var/lib/i2p' |
79 |
-I2P_CONFIG_DIR="${I2P_CONFIG_HOME}/.i2p" |
80 |
- |
81 |
-RES_DIR='installer/resources' |
82 |
- |
83 |
-PATCHES=( |
84 |
- "${FILESDIR}/${P}-add_libs.patch" |
85 |
-) |
86 |
- |
87 |
-pkg_setup() { |
88 |
- java-pkg-2_pkg_setup |
89 |
- |
90 |
- enewgroup i2p |
91 |
- enewuser i2p -1 -1 "${I2P_CONFIG_HOME}" i2p |
92 |
-} |
93 |
- |
94 |
-src_unpack() { |
95 |
- unpack ${A} |
96 |
- cd "${S}" || die |
97 |
- java-ant_rewrite-classpath |
98 |
-} |
99 |
- |
100 |
-src_prepare() { |
101 |
- java-pkg-2_src_prepare |
102 |
- |
103 |
- # We're on GNU/Linux, we don't need .exe files |
104 |
- echo "noExe=true" > override.properties || die |
105 |
- if ! use nls; then |
106 |
- echo "require.gettext=false" >> override.properties || die |
107 |
- fi |
108 |
- |
109 |
- # avoid auto starting browser |
110 |
- sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \ |
111 |
- "${RES_DIR}/clients.config" || die |
112 |
- |
113 |
- # we do it now so we can resolve path after |
114 |
- default |
115 |
- |
116 |
- # replace paths as the installer would |
117 |
- sed -i "s|%INSTALL_PATH|${I2P_ROOT}|" \ |
118 |
- "${RES_DIR}/"{eepget,i2prouter,runplain.sh} || die |
119 |
- sed -i "s|\$INSTALL_PATH|${I2P_ROOT}|" "${RES_DIR}/wrapper.config" || die |
120 |
- sed -i "s|%SYSTEM_java_io_tmpdir|${I2P_CONFIG_DIR}|" \ |
121 |
- "${RES_DIR}/"{i2prouter,runplain.sh} || die |
122 |
- sed -i "s|%USER_HOME|${I2P_CONFIG_HOME}|" "${RES_DIR}/i2prouter" || die |
123 |
-} |
124 |
- |
125 |
-src_install() { |
126 |
- # cd into pkg-temp. |
127 |
- cd "${S}/pkg-temp" || die |
128 |
- |
129 |
- # This is ugly, but to satisfy all non-system .jar dependencies, jetty |
130 |
- # would need to be packaged. It would be too large a task |
131 |
- # for an unseasoned developer. This seems to be the most pragmatic solution |
132 |
- java-pkg_jarinto "${I2P_ROOT}/lib" |
133 |
- local i |
134 |
- for i in BOB commons-el commons-logging i2p i2psnark i2ptunnel \ |
135 |
- jasper-compiler jasper-runtime javax.servlet jbigi jetty* mstreaming org.mortbay.* router* \ |
136 |
- sam standard streaming systray addressbook; do |
137 |
- java-pkg_dojar lib/${i}.jar |
138 |
- done |
139 |
- |
140 |
- # Set up symlinks for binaries |
141 |
- dosym /usr/bin/wrapper "${I2P_ROOT}/i2psvc" |
142 |
- dosym "${I2P_ROOT}/i2prouter" /usr/bin/i2prouter |
143 |
- dosym "${I2P_ROOT}/eepget" /usr/bin/eepget |
144 |
- |
145 |
- # Install main files and basic documentation |
146 |
- exeinto "${I2P_ROOT}" |
147 |
- insinto "${I2P_ROOT}" |
148 |
- doins blocklist.txt hosts.txt *.config |
149 |
- doexe eepget i2prouter runplain.sh |
150 |
- dodoc history.txt INSTALL-headless.txt LICENSE.txt |
151 |
- doman man/* |
152 |
- |
153 |
- # Install other directories |
154 |
- doins -r certificates docs eepsite geoip scripts |
155 |
- dodoc -r licenses |
156 |
- java-pkg_dowar webapps/*.war |
157 |
- |
158 |
- # Install daemon files |
159 |
- newinitd "${FILESDIR}/${P}.initd" i2p |
160 |
- systemd_newunit "${FILESDIR}/${P}.service" i2p.service |
161 |
- |
162 |
- # setup user |
163 |
- keepdir "${I2P_CONFIG_DIR}" |
164 |
- fowners -R i2p:i2p "${I2P_CONFIG_DIR}" |
165 |
-} |
166 |
- |
167 |
-pkg_postinst() { |
168 |
- elog "Custom configuration belongs in ${I2P_CONFIG_DIR} to avoid being overwritten." |
169 |
- elog 'I2P can be configured through the web interface at http://localhost:7657/console' |
170 |
- |
171 |
- if use !ecdsa |
172 |
- then |
173 |
- ewarn 'Currently, the i2p team does not enforce to use ECDSA keys. But it is more and' |
174 |
- ewarn 'more pushed. To help the network, you are recommended to have the ecdsa USE.' |
175 |
- ewarn |
176 |
- ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as" |
177 |
- ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation' |
178 |
- ewarn 'as the one you built with.' |
179 |
- fi |
180 |
-} |
181 |
|
182 |
diff --git a/net-vpn/i2p/i2p-0.9.33.ebuild b/net-vpn/i2p/i2p-0.9.33.ebuild |
183 |
deleted file mode 100644 |
184 |
index cf3d2654ed1..00000000000 |
185 |
--- a/net-vpn/i2p/i2p-0.9.33.ebuild |
186 |
+++ /dev/null |
187 |
@@ -1,143 +0,0 @@ |
188 |
-# Copyright 1999-2018 Gentoo Foundation |
189 |
-# Distributed under the terms of the GNU General Public License v2 |
190 |
- |
191 |
-EAPI="6" |
192 |
- |
193 |
-inherit java-pkg-2 java-ant-2 systemd user |
194 |
- |
195 |
-DESCRIPTION="A privacy-centric, anonymous network" |
196 |
-HOMEPAGE="https://geti2p.net" |
197 |
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2" |
198 |
- |
199 |
-LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2" |
200 |
-SLOT="0" |
201 |
- |
202 |
-# Until the deps reach other arches |
203 |
-KEYWORDS="~amd64 ~x86" |
204 |
-IUSE="+ecdsa nls" |
205 |
- |
206 |
-# dev-java/ant-core is automatically added due to java-ant-2.eclass |
207 |
-CP_DEPEND="dev-java/bcprov:1.50 |
208 |
- dev-java/jrobin:0 |
209 |
- dev-java/slf4j-api:0 |
210 |
- dev-java/tomcat-jstl-impl:0 |
211 |
- dev-java/tomcat-jstl-spec:0 |
212 |
- dev-java/java-service-wrapper:0" |
213 |
- |
214 |
-DEPEND="${CP_DEPEND} |
215 |
- dev-java/eclipse-ecj:* |
216 |
- dev-libs/gmp:0 |
217 |
- nls? ( >=sys-devel/gettext-0.19 ) |
218 |
- >=virtual/jdk-1.7" |
219 |
- |
220 |
-RDEPEND="${CP_DEPEND} |
221 |
- ecdsa? ( |
222 |
- || ( |
223 |
- dev-java/icedtea:8[-sunec] |
224 |
- dev-java/icedtea-bin:8 |
225 |
- dev-java/oracle-jre-bin |
226 |
- dev-java/oracle-jdk-bin |
227 |
- ) |
228 |
- ) |
229 |
- !ecdsa? ( >=virtual/jre-1.7 )" |
230 |
- |
231 |
-EANT_BUILD_TARGET="pkg" |
232 |
-JAVA_ANT_ENCODING="UTF-8" |
233 |
- |
234 |
-pkg_setup() { |
235 |
- java-pkg-2_pkg_setup |
236 |
- |
237 |
- enewgroup i2p |
238 |
- enewuser i2p -1 -1 "${EPREFIX}/var/lib/i2p" i2p |
239 |
-} |
240 |
- |
241 |
-src_prepare() { |
242 |
- # as early as possible to allow generic patches to be applied |
243 |
- default |
244 |
- |
245 |
- java-ant_rewrite-classpath |
246 |
- |
247 |
- java-pkg-2_src_prepare |
248 |
- |
249 |
- # We're on GNU/Linux, we don't need .exe files |
250 |
- echo "noExe=true" > override.properties || die |
251 |
- if ! use nls; then |
252 |
- echo "require.gettext=false" >> override.properties || die |
253 |
- fi |
254 |
- |
255 |
- # avoid auto starting browser |
256 |
- sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \ |
257 |
- 'installer/resources/clients.config' || die |
258 |
- |
259 |
- # generate wrapper classpath, keeping the default to be replaced later |
260 |
- i2p_cp='' # global forced by java-pkg_gen-cp |
261 |
- java-pkg_gen-cp i2p_cp |
262 |
- local lib cp i=2 |
263 |
- for lib in ${i2p_cp//,/ } |
264 |
- do |
265 |
- cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n" |
266 |
- done |
267 |
- |
268 |
- # add generated cp and hardcode system VM |
269 |
- sed -e "s|\(wrapper\.java\.classpath\.1=.*\)|\1\n${cp}|" \ |
270 |
- -e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \ |
271 |
- -e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/lib/java-service-wrapper|" \ |
272 |
- -i 'installer/resources/wrapper.config' || die |
273 |
- |
274 |
- # replace paths as the installer would |
275 |
- sed -e "s|[\$%]INSTALL_PATH|${EPREFIX}/usr/share/i2p|" \ |
276 |
- -e "s|%SYSTEM_java_io_tmpdir|${EPREFIX}/var/lib/i2p/.i2p|" \ |
277 |
- -e "s|%USER_HOME|${EPREFIX}/var/lib/i2p|" \ |
278 |
- -i 'installer/resources/'{eepget,i2prouter,runplain.sh,wrapper.config} || die |
279 |
-} |
280 |
- |
281 |
-src_install() { |
282 |
- # cd into pkg-temp. |
283 |
- cd "${S}/pkg-temp" || die |
284 |
- |
285 |
- # we remove system installed jar and install the others |
286 |
- rm lib/{jrobin.jar,wrapper.jar} || \ |
287 |
- die 'unable to remove locally built jar already found in system' |
288 |
- java-pkg_dojar lib/*.jar |
289 |
- |
290 |
- # Set up symlinks for binaries |
291 |
- dodir /usr/bin |
292 |
- # workaround portage absolute symlink limitation |
293 |
- dosym '../share/i2p/i2prouter' '/usr/bin/i2prouter' |
294 |
- dosym '../share/i2p/eepget' '/usr/bin/eepget' |
295 |
- |
296 |
- # Install main files and basic documentation |
297 |
- exeinto '/usr/share/i2p' |
298 |
- insinto '/usr/share/i2p' |
299 |
- doins blocklist.txt hosts.txt *.config |
300 |
- doexe eepget i2prouter runplain.sh |
301 |
- dodoc history.txt INSTALL-headless.txt LICENSE.txt |
302 |
- doman man/* |
303 |
- |
304 |
- # Install other directories |
305 |
- doins -r certificates docs eepsite geoip scripts |
306 |
- java-pkg_dowar webapps/*.war |
307 |
- |
308 |
- # Install daemon files |
309 |
- newinitd "${FILESDIR}/i2p.init" i2p |
310 |
- systemd_dounit "${FILESDIR}/i2p.service" |
311 |
- |
312 |
- # setup user |
313 |
- keepdir '/var/lib/i2p/.i2p' |
314 |
- fowners i2p:i2p '/var/lib/i2p/.i2p' |
315 |
-} |
316 |
- |
317 |
-pkg_postinst() { |
318 |
- elog "Custom configuration belongs in ${EPREFIX}/var/lib/i2p/.i2p to avoid being overwritten." |
319 |
- elog 'I2P can be configured through the web interface at http://localhost:7657/console' |
320 |
- |
321 |
- if use !ecdsa |
322 |
- then |
323 |
- ewarn 'Currently, the i2p team does not enforce to use ECDSA keys. But it is more and' |
324 |
- ewarn 'more pushed. To help the network, you are recommended to have the ecdsa USE.' |
325 |
- ewarn |
326 |
- ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as" |
327 |
- ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation' |
328 |
- ewarn 'as the one you built with.' |
329 |
- fi |
330 |
-} |