1 |
commit: 0387502ae04cc8efd621e86a8cec452c3daf68b2 |
2 |
Author: tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com> |
3 |
AuthorDate: Mon Aug 31 22:59:29 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 13 00:43:57 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0387502a |
7 |
|
8 |
net-vpn/i2p: drop 0.9.44 |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-2.3.23 |
11 |
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com> |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
net-vpn/i2p/Manifest | 1 - |
15 |
net-vpn/i2p/i2p-0.9.44-r2.ebuild | 210 --------------------------------------- |
16 |
2 files changed, 211 deletions(-) |
17 |
|
18 |
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest |
19 |
index 205dfbe00af..cfc3977e98a 100644 |
20 |
--- a/net-vpn/i2p/Manifest |
21 |
+++ b/net-vpn/i2p/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST i2psource_0.9.44.tar.bz2 32016076 BLAKE2B 5803935cdebd18af48c4f00232cbbae02979c5ccebb68a4bddeb9cf60b6d02b734b72075ac7f9a57713f48cfd2bc0d14598e35df4ff7cdd590be57c68f5737b4 SHA512 a98129dde7d467e77ee37d16f9add3a0a4e602da84e1133c1b4b787133f185ad834cb1c52857e54946e424bd73a56200e48d6cd96856c87c748f53ca26af922e |
24 |
DIST i2psource_0.9.45.tar.bz2 31921025 BLAKE2B 2d37777f77784ff93de4d7442eddf46b9a541902412bf5fb24cf96baba73851cc17d01649a7b4b41a710ccde5690036a890b8f84de00f4c615ed2e23da8fa510 SHA512 d4cf354f0a807d132fae75d4bad3e2e788e1ed03d6f625feb0f1369bb2c9e1a6e2758645acf2017c61dbc47d75e6d834b87455adbead1077f206025686548ae9 |
25 |
DIST i2psource_0.9.47.tar.bz2 32488438 BLAKE2B e1544475dad526e242570918c1bb967a4b713567e71201e08b73c8995743a68396b5951f477bfe8830927c0cdf7e991a25a1978d4aaf88cae3e4218ba57a8818 SHA512 7fdd9ab0b3e81aa89e73be6fa172d723c2b5a67365116a1e0e0ec948067fe4f58e3ad946a0ef4605602c0d803b98e37b2d5692a39a14cf7433d546ada204cbc9 |
26 |
|
27 |
diff --git a/net-vpn/i2p/i2p-0.9.44-r2.ebuild b/net-vpn/i2p/i2p-0.9.44-r2.ebuild |
28 |
deleted file mode 100644 |
29 |
index 8949446a266..00000000000 |
30 |
--- a/net-vpn/i2p/i2p-0.9.44-r2.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,210 +0,0 @@ |
33 |
-# Copyright 1999-2020 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
- |
38 |
-inherit java-pkg-2 java-ant-2 systemd |
39 |
- |
40 |
-DESCRIPTION="A privacy-centric, anonymous network" |
41 |
-HOMEPAGE="https://geti2p.net" |
42 |
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2" |
43 |
- |
44 |
-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" |
45 |
-SLOT="0" |
46 |
- |
47 |
-# Until the deps reach other arches |
48 |
-KEYWORDS="~amd64 ~x86" |
49 |
-IUSE="nls test" |
50 |
-RESTRICT="!test? ( test )" |
51 |
- |
52 |
-# dev-java/ant-core is automatically added due to java-ant-2.eclass |
53 |
-CP_DEPEND=" |
54 |
- dev-java/bcprov:1.50 |
55 |
- dev-java/jrobin:0 |
56 |
- dev-java/slf4j-api:0 |
57 |
- dev-java/tomcat-jstl-impl:0 |
58 |
- dev-java/tomcat-jstl-spec:0 |
59 |
- dev-java/java-service-wrapper:0 |
60 |
- dev-java/commons-logging:0 |
61 |
- dev-java/slf4j-simple:0 |
62 |
- java-virtuals/servlet-api:3.1 |
63 |
-" |
64 |
- |
65 |
-DEPEND="${CP_DEPEND} |
66 |
- dev-java/eclipse-ecj:* |
67 |
- nls? ( >=sys-devel/gettext-0.19 ) |
68 |
- virtual/jdk:1.8 |
69 |
- test? ( |
70 |
- dev-java/ant-junit4:0 |
71 |
- dev-java/hamcrest-core:1.3 |
72 |
- dev-java/hamcrest-library:1.3 |
73 |
- dev-java/junit:4 |
74 |
- ) |
75 |
-" |
76 |
- |
77 |
-RDEPEND="${CP_DEPEND} |
78 |
- acct-user/i2p |
79 |
- acct-group/i2p |
80 |
- virtual/jre:1.8 |
81 |
- net-libs/nativebiginteger:0 |
82 |
-" |
83 |
- |
84 |
-EANT_BUILD_TARGET="pkg" |
85 |
-# no scala as depending on antlib.xml not installed by dev-lang/scala |
86 |
-EANT_TEST_TARGET="junit.test" |
87 |
-JAVA_ANT_ENCODING="UTF-8" |
88 |
- |
89 |
-src_prepare() { |
90 |
- if use test; then |
91 |
- # no *streaming as requiring >dev-java/mockito-1.9.5 |
92 |
- sed -e "/streaming.*junit\.test/d" \ |
93 |
- -i build.xml || |
94 |
- die "unable to remove ministreaming tests" |
95 |
- fi |
96 |
- |
97 |
- # as early as possible to allow generic patches to be applied |
98 |
- default |
99 |
- |
100 |
- java-ant_rewrite-classpath |
101 |
- |
102 |
- java-pkg-2_src_prepare |
103 |
- |
104 |
- # We're on GNU/Linux, we don't need .exe files |
105 |
- echo "noExe=true" > override.properties || die |
106 |
- if ! use nls; then |
107 |
- echo "require.gettext=false" >> override.properties || die |
108 |
- fi |
109 |
- |
110 |
- # avoid auto starting browser |
111 |
- sed -i "s|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|" \ |
112 |
- "installer/resources/clients.config" || die |
113 |
- |
114 |
- # generate wrapper classpath, keeping the default to be replaced later |
115 |
- i2p_cp="" # global forced by java-pkg_gen-cp |
116 |
- java-pkg_gen-cp i2p_cp |
117 |
- local lib i=2 |
118 |
- local cp="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n" |
119 |
- for lib in ${i2p_cp//,/ } |
120 |
- do |
121 |
- cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n" |
122 |
- done |
123 |
- |
124 |
- # add generated cp, hardcode system VM, setting system's conf |
125 |
- sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${cp}|" \ |
126 |
- -e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \ |
127 |
- -e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/$(get_libdir)/java-service-wrapper|" \ |
128 |
- -e "s|\(wrapper\.java\.library\.path\)\.2=.*|\1.2=${EPREFIX}/usr/share/i2p/lib\n\1.3=/usr/$(get_libdir)|" \ |
129 |
- -e "s|\(wrapper\.java\.additional\.1=-DloggerFilenameOverride\)=.*|\1=${EPREFIX}/var/log/i2p/router-@|" \ |
130 |
- -e "s|\(wrapper\.logfile\)=.*|\1=${EPREFIX}/var/log/i2p/wrapper|" \ |
131 |
- -e "/wrapper\.java\.additional\.2\(\.stripquote\|\)/d" \ |
132 |
- -i installer/resources/wrapper.config || |
133 |
- die "unable to apply gentoo config" |
134 |
- local prop i=2 |
135 |
- for prop in \ |
136 |
- "i2p.dir.base=${EPREFIX}/usr/share/i2p" \ |
137 |
- "i2p.dir.app=${EPREFIX}/var/lib/i2p/app" \ |
138 |
- "i2p.dir.config=${EPREFIX}/var/lib/i2p/config" \ |
139 |
- "i2p.dir.router=${EPREFIX}/var/lib/i2p/router" \ |
140 |
- "i2p.dir.log=${EPREFIX}/var/log/i2p" \ |
141 |
- "i2p.dir.pid=${EPREFIX}/tmp" \ |
142 |
- "i2p.dir.temp=${EPREFIX}/tmp" |
143 |
- do |
144 |
- echo "wrapper.java.additional.$((i++))=-D$prop" >> installer/resources/wrapper.config || |
145 |
- die "unable to apply gentoo config" |
146 |
- done |
147 |
-} |
148 |
- |
149 |
-src_test() { |
150 |
- # store built version of jars, overwritten by testing |
151 |
- mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" || |
152 |
- die "unable to save jars before tests" |
153 |
- |
154 |
- # generate test classpath |
155 |
- local cp |
156 |
- cp="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3)" |
157 |
- EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${cp}" java-pkg-2_src_test |
158 |
- |
159 |
- # redo work undone by testing |
160 |
- mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" || |
161 |
- die "unable to restore jars after tests" |
162 |
-} |
163 |
- |
164 |
-src_install() { |
165 |
- # cd into pkg-temp. |
166 |
- cd "${S}/pkg-temp" || die |
167 |
- |
168 |
- # we remove system installed jar and install the others |
169 |
- rm lib/{jrobin,wrapper,jbigi,commons-logging,javax.servlet}.jar || \ |
170 |
- die "unable to remove locally built jar already found in system" |
171 |
- java-pkg_dojar lib/*.jar |
172 |
- |
173 |
- # create own launcher |
174 |
- java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar |
175 |
- |
176 |
- # Install main files and basic documentation |
177 |
- insinto "/usr/share/i2p" |
178 |
- doins blocklist.txt hosts.txt *.config |
179 |
- dodoc history.txt INSTALL-headless.txt LICENSE.txt |
180 |
- doman man/* |
181 |
- |
182 |
- # Install other directories |
183 |
- doins -r certificates docs eepsite geoip scripts |
184 |
- java-pkg_dowar webapps/*.war |
185 |
- |
186 |
- # Install daemon files |
187 |
- newinitd "${FILESDIR}/i2p.init" i2p |
188 |
- systemd_dounit "${FILESDIR}/i2p.service" |
189 |
- |
190 |
- # setup log |
191 |
- keepdir /var/log/i2p |
192 |
- fowners i2p:i2p /var/log/i2p |
193 |
- |
194 |
- # setup user |
195 |
- keepdir /var/lib/i2p |
196 |
- fowners i2p:i2p /var/lib/i2p |
197 |
-} |
198 |
- |
199 |
-pkg_postinst() { |
200 |
- local old_i2pdir="${EPREFIX}/var/lib/i2p/.i2p" new_i2pdir="${EPREFIX}/var/lib/i2p" |
201 |
- |
202 |
- [ -e "${old_i2pdir}" ] || return |
203 |
- |
204 |
- elog "User is now delegated to acct-user, ${new_i2pdir} is split" |
205 |
- elog "into subdirs. It will now try to split ${old_i2pdir} accordingly." |
206 |
- |
207 |
- migrate() { |
208 |
- local dest="${1}" |
209 |
- shift |
210 |
- |
211 |
- local ret=true |
212 |
- for src |
213 |
- do |
214 |
- [ -e "${src}" ] || continue |
215 |
- mv "${src}" "${dest}" || ret=false |
216 |
- done |
217 |
- |
218 |
- $ret |
219 |
- } |
220 |
- |
221 |
- ebegin "Migrating" |
222 |
- local ret=0 |
223 |
- chown -R i2p:i2p "${EPREFIX}/var/lib/i2p" || ret=1 |
224 |
- migrate "${new_i2pdir}/app" "${old_i2pdir}/i2psnark" || ret=1 |
225 |
- migrate "${new_i2pdir}/config" \ |
226 |
- "${old_i2pdir}/"{docs,eepsite,hosts.txt,prngseed.rnd,*.config*} || |
227 |
- ret=1 |
228 |
- migrate "${new_i2pdir}/router" \ |
229 |
- "${old_i2pdir}/"{addressbook,eventlog.txt,hostsdb.blockfile,keyBackup,netDb,peerProfiles,router.*,rrd} || |
230 |
- ret=1 |
231 |
- migrate "${EPREFIX}/var/log/i2p" "${old_i2pdir}/"{logs/*,wrapper.log*} || |
232 |
- ret=1 |
233 |
- rm -fr "${old_i2pdir}/"{hostsdb.blockfile.*.corrupt,logs} |
234 |
- rmdir "${old_i2pdir}" || ret=1 |
235 |
- |
236 |
- if ! eend $ret |
237 |
- then |
238 |
- ewarn "There was some file remaining in ${old_i2pdir}." |
239 |
- ewarn "Please check it there is something of value there." |
240 |
- ewarn "remove it when migration is done." |
241 |
- fi |
242 |
-} |