Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/
Date: Sun, 14 Oct 2018 10:34:01
Message-Id: 1539513226.4d2a3f793876004d3d861650526334ac4fed4534.mgorny@gentoo
1 commit: 4d2a3f793876004d3d861650526334ac4fed4534
2 Author: Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
3 AuthorDate: Fri Oct 12 11:53:05 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 14 10:33:46 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d2a3f79
7
8 net-vpn/i2p: drop old 0.9.34
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.11
11 Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
12 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
13
14 net-vpn/i2p/Manifest | 1 -
15 net-vpn/i2p/i2p-0.9.34.ebuild | 138 ------------------------------------------
16 2 files changed, 139 deletions(-)
17
18 diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
19 index 2b1d3223e69..f447a136f4c 100644
20 --- a/net-vpn/i2p/Manifest
21 +++ b/net-vpn/i2p/Manifest
22 @@ -1,3 +1,2 @@
23 -DIST i2psource_0.9.34.tar.bz2 29332692 BLAKE2B 16b15ac2c7eaa594fc6398105d7e22442fafc4036a54a66c91b3ca9bd98095a9192ae5c28123882ddc6acc7c68fb5eeed3ef1ed632a4b4b96a1abe28dff2286c SHA512 71c80710098ead34c159c6a6873c397048afc76974917e7b65d7846203900ab8bfb4840fec3c7d09ade48e93329b06ec33d9f367dae33a4708b4ea14268beefa
24 DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
25 DIST i2psource_0.9.37.tar.bz2 30277506 BLAKE2B 2c0fe601b3a8967c23f00bd29aef197389039efbf1a3fc0847f819dea44f98e38b9b53b749763dccca740a50d467d5d079b0e4aad707347cc7c7a576fcc44407 SHA512 ce0d320810faaebe2926d988a40f4df968583edbc488b995a32cfd806550a8cf75d2c2397bfd9f3fd443cb462567cc2cdbf08d1de59b6806888724254faebf09
26
27 diff --git a/net-vpn/i2p/i2p-0.9.34.ebuild b/net-vpn/i2p/i2p-0.9.34.ebuild
28 deleted file mode 100644
29 index ea2983ad0cd..00000000000
30 --- a/net-vpn/i2p/i2p-0.9.34.ebuild
31 +++ /dev/null
32 @@ -1,138 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI="6"
37 -
38 -inherit java-pkg-2 java-ant-2 systemd user
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="+ecdsa nls"
50 -
51 -# dev-java/ant-core is automatically added due to java-ant-2.eclass
52 -CP_DEPEND="dev-java/bcprov:1.50
53 - dev-java/jrobin:0
54 - dev-java/slf4j-api:0
55 - dev-java/tomcat-jstl-impl:0
56 - dev-java/tomcat-jstl-spec:0
57 - dev-java/java-service-wrapper:0"
58 -
59 -DEPEND="${CP_DEPEND}
60 - dev-java/eclipse-ecj:*
61 - dev-libs/gmp:0
62 - nls? ( >=sys-devel/gettext-0.19 )
63 - >=virtual/jdk-1.7"
64 -
65 -RDEPEND="${CP_DEPEND}
66 - ecdsa? (
67 - || (
68 - dev-java/icedtea:8[-sunec]
69 - dev-java/icedtea-bin:8
70 - dev-java/oracle-jre-bin
71 - dev-java/oracle-jdk-bin
72 - )
73 - )
74 - !ecdsa? ( >=virtual/jre-1.7 )"
75 -
76 -EANT_BUILD_TARGET="pkg"
77 -JAVA_ANT_ENCODING="UTF-8"
78 -
79 -pkg_setup() {
80 - java-pkg-2_pkg_setup
81 -
82 - enewgroup i2p
83 - enewuser i2p -1 -1 "${EPREFIX}/var/lib/i2p" i2p
84 -}
85 -
86 -src_prepare() {
87 - # as early as possible to allow generic patches to be applied
88 - default
89 -
90 - java-ant_rewrite-classpath
91 -
92 - java-pkg-2_src_prepare
93 -
94 - # We're on GNU/Linux, we don't need .exe files
95 - echo "noExe=true" > override.properties || die
96 - if ! use nls; then
97 - echo "require.gettext=false" >> override.properties || die
98 - fi
99 -
100 - # avoid auto starting browser
101 - sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \
102 - 'installer/resources/clients.config' || die
103 -
104 - # generate wrapper classpath, keeping the default to be replaced later
105 - i2p_cp='' # global forced by java-pkg_gen-cp
106 - java-pkg_gen-cp i2p_cp
107 - local lib cp i=2
108 - for lib in ${i2p_cp//,/ }
109 - do
110 - cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
111 - done
112 -
113 - # add generated cp and hardcode system VM
114 - sed -e "s|\(wrapper\.java\.classpath\.1=.*\)|\1\n${cp}|" \
115 - -e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
116 - -e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/lib/java-service-wrapper|" \
117 - -i 'installer/resources/wrapper.config' || die
118 -
119 - # replace paths as the installer would
120 - sed -e "s|[\$%]INSTALL_PATH|${EPREFIX}/usr/share/i2p|" \
121 - -e "s|%SYSTEM_java_io_tmpdir|${EPREFIX}/var/lib/i2p/.i2p|" \
122 - -e "s|%USER_HOME|${EPREFIX}/var/lib/i2p|" \
123 - -i 'installer/resources/'{eepget,runplain.sh,wrapper.config} || die
124 -}
125 -
126 -src_install() {
127 - # cd into pkg-temp.
128 - cd "${S}/pkg-temp" || die
129 -
130 - # we remove system installed jar and install the others
131 - rm lib/{jrobin.jar,wrapper.jar} || \
132 - die 'unable to remove locally built jar already found in system'
133 - java-pkg_dojar lib/*.jar
134 -
135 - # create own launcher
136 - java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
137 -
138 - # Install main files and basic documentation
139 - insinto '/usr/share/i2p'
140 - doins blocklist.txt hosts.txt *.config
141 - dodoc history.txt INSTALL-headless.txt LICENSE.txt
142 - doman man/*
143 -
144 - # Install other directories
145 - doins -r certificates docs eepsite geoip scripts
146 - java-pkg_dowar webapps/*.war
147 -
148 - # Install daemon files
149 - newinitd "${FILESDIR}/i2p.init" i2p
150 - systemd_dounit "${FILESDIR}/i2p.service"
151 -
152 - # setup user
153 - keepdir '/var/lib/i2p/.i2p'
154 - fowners i2p:i2p '/var/lib/i2p/.i2p'
155 -}
156 -
157 -pkg_postinst() {
158 - elog "Custom configuration belongs in ${EPREFIX}/var/lib/i2p/.i2p to avoid being overwritten."
159 - elog 'I2P can be configured through the web interface at http://localhost:7657/console'
160 -
161 - if use !ecdsa
162 - then
163 - ewarn 'Currently, the i2p team does not enforce to use ECDSA keys. But it is more and'
164 - ewarn 'more pushed. To help the network, you are recommended to have the ecdsa USE.'
165 - ewarn
166 - ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as"
167 - ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation'
168 - ewarn 'as the one you built with.'
169 - fi
170 -}