From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 28 Apr 2019 09:54:45 +0100
Subject: gentoo resync : 28.04.2019
---
net-vpn/i2p/Manifest | 9 +-
net-vpn/i2p/files/0.9.37-add-cp-to-tests | 33 ------
net-vpn/i2p/i2p-0.9.36.ebuild | 140 ------------------------
net-vpn/i2p/i2p-0.9.37.ebuild | 179 -------------------------------
net-vpn/i2p/i2p-0.9.39.ebuild | 157 +++++++++++++++++++++++++++
net-vpn/i2p/metadata.xml | 1 -
6 files changed, 160 insertions(+), 359 deletions(-)
delete mode 100644 net-vpn/i2p/files/0.9.37-add-cp-to-tests
delete mode 100644 net-vpn/i2p/i2p-0.9.36.ebuild
delete mode 100644 net-vpn/i2p/i2p-0.9.37.ebuild
create mode 100644 net-vpn/i2p/i2p-0.9.39.ebuild
(limited to 'net-vpn/i2p')
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index cc285abbeb4b..9b3babf2c8e8 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,11 +1,8 @@
-AUX 0.9.37-add-cp-to-tests 1880 BLAKE2B bd5da44d351acbea0583a7e26ead5c898739c87fc33b949772b8fdb9415c3277913cf0e97fadf6c379e8b4cfb4d723ea7e121b6c36ed72d4cec96b8d4bbd1fbd SHA512 3afcb97ad455777d9ad1f158d9a6f0de42694dd92841dc588a4308f666a6a4810cfa3be5a1f00a730e7f15f8573e9f7a5107885561f4e7a847da017904ee37a1
AUX 0.9.38-add-cp-to-tests 2908 BLAKE2B ab78902afe450bd4f6c5741900cf4e88c5760726b95cae4b74092104a84a05073e227d382080db6af09a96a1034d8e20ec1b4a9c9a6fa6894e7df37e9d887399 SHA512 f2725aea99a37820048cbd8af4f17fd7b3702eba5c2d2d9816bb20a531c9c643e94dd8c88a8b4cd40240ba0fbf20dd85dcb30a7f84f7bcd97dfea5420e8724ac
AUX i2p.init 489 BLAKE2B f7c484713fa043f1db991e95d58f0d184c0d49062e807671f6aca2c7489ad52e072e2d0f5b6c5b666cbda77764e90da6506b7fd0f7a5b2fb34bbfc0b3c96da53 SHA512 3b9b2bce4359f0ba32f690f7922ed95ccaa133b1cff2e5a1d6bfc91a380757f79f03e8a4966259d19ec888e6db468825e6a9d0d1acdba9d38c81a86b99c4229a
AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
-DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
-DIST i2psource_0.9.37.tar.bz2 30277506 BLAKE2B 2c0fe601b3a8967c23f00bd29aef197389039efbf1a3fc0847f819dea44f98e38b9b53b749763dccca740a50d467d5d079b0e4aad707347cc7c7a576fcc44407 SHA512 ce0d320810faaebe2926d988a40f4df968583edbc488b995a32cfd806550a8cf75d2c2397bfd9f3fd443cb462567cc2cdbf08d1de59b6806888724254faebf09
DIST i2psource_0.9.38.tar.bz2 30702106 BLAKE2B c0fd4ea21643edff06853825b9b09dbd648176b6a2318c6bb3846b7c198cac88f89525df0868affbc337e31ec3459f08235cd8a52d38b8551d235c9ef2ca4a4c SHA512 148cd1504dbf0a86367b6dc120a27b2d0d936857eb8cf524e86982d6499c5a831a40aacb3ed67570ad2c323be6545e9a66c12dfc4be2377b80f4d7152e04452d
-EBUILD i2p-0.9.36.ebuild 4184 BLAKE2B 58fcad81d8247848e26af7881178618720778af04d513d972e4e894eeb37509cef7c09840bc075fe81b6de77ba33609d1bea73675cbc1ef2fd5cfa3dd3e82864 SHA512 46e4e100d34e65d11383a0e731788866e9c77137050c95c02869ebf4ae1db098bcaa9f1c31adc549ff3c6b02b667d257ea560fa62e90ea2214efac7e715ef1bf
-EBUILD i2p-0.9.37.ebuild 5212 BLAKE2B d7851583229df8021448749324ffe3927ca843ac59fc97ced69adeafed513a9c75be89346ff8f8353c0df02f963e06788e2653e2a3853aebea7604653ed33b08 SHA512 e6aaa547eb6039804b8af5c17fa35e532f303d54bfbcd5d3c25ba17b53cc390b1f7e87e257ea55e2311d2bc4cc2985a77401db44a7a4a3ea47cd6e64386c0341
+DIST i2psource_0.9.39.tar.bz2 30518064 BLAKE2B da5f4f74db38e932a8d1504dd454f308b6a47e0b308ecb646aafc349c20696d5f18107b393a7a5c3e5a7a24c1f2463657ede1ae6629023d9f817cc5bf0b00d85 SHA512 03ae294a2dbb1c7267484e8b0700ea112820e767ce7e90bc50dc90a1ed621586bd507c6ea80ba177d3498c0959fc1c9d71b51821d527fa48c34847ffbf5c466c
EBUILD i2p-0.9.38.ebuild 4618 BLAKE2B 35befafb709b7d61ea4e0c9ec69ef5412703ac659e298ac2568a6995109f1a0741695deafa34ec828f1fb2ccc90c27dbb9ae4e3e85b10a2ae44c00a7c4398fbd SHA512 2c7fe6101d65197b72ff1516802431731ccf0c83169e93de85e5458bfd668ff6353080c6ab2cb18945198ebca358769a1856cf4489e0e72bff70a21f2a59cdd2
-MISC metadata.xml 904 BLAKE2B cc55ce0d1f0cd042997b30a12405ad9e4f0e7e63926c8bc5409dae47d2f0aa37fd141ce8dd436abeb0b417b04484b7bc0155b075899c8127d424301b1af2913b SHA512 195b17fe2bedf530b32ef031b92044d9adf7c1e43d7ba067301bb02d716c9a9836c105663083aad79353afc9938cca1359dc57409adae809e12c8e2f260240c2
+EBUILD i2p-0.9.39.ebuild 4568 BLAKE2B d79911a88386dbcc02791fbae143be8353f3774f5a2aa5a058a8dc24d451c33e64621bfa27b76528d0c228496c099cc1ae414872e50775ad2b0b8ab0ba1798c1 SHA512 3d1142911ff90037b0b9f8f9a8d9c4d70c9f57bbb709f05eae7b5e99390ca5bd37b43b53165d3eb1128f8e881be37ce24307ed005585e3be57a1a390de02f146
+MISC metadata.xml 709 BLAKE2B b429dbd7d8c4c6d7e9f829d77fc30f8bb0147d3a4e252874d5f1f905a45e7b46f380ea7d25f5a52d871545fff4891a80756bc227d61e101c2bcf17f6e72584bb SHA512 e5e3dd0ec86672394b94e5d740c21a014e42c7d3be502a1bac15f809b39fea25e00493cd70f441752e65da253424945e2fb5c7a86c9b31898f4a17d2ad19bafe
diff --git a/net-vpn/i2p/files/0.9.37-add-cp-to-tests b/net-vpn/i2p/files/0.9.37-add-cp-to-tests
deleted file mode 100644
index b8e967dd31d2..000000000000
--- a/net-vpn/i2p/files/0.9.37-add-cp-to-tests
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
---- a/apps/ministreaming/java/build.xml 2018-10-04 12:05:09.000000000 +0200
-+++ b/apps/ministreaming/java/build.xml 2018-10-12 08:15:16.481532093 +0200
-@@ -194,6 +194,7 @@
- includeAntRuntime="false"
- destdir="./build/obj" >
- <classpath>
-+ <pathelement path="${javac.classpath}" />
- <pathelement location="../../../core/java/build/i2p.jar" />
- <pathelement location="${junit.home}/junit4.jar" />
- <pathelement location="${hamcrest.home}/hamcrest.jar" />
-diff -Naur a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
---- a/apps/streaming/java/build.xml 2018-10-04 12:05:09.000000000 +0200
-+++ b/apps/streaming/java/build.xml 2018-10-12 11:17:22.814404049 +0200
-@@ -62,6 +62,7 @@
- includeAntRuntime="false"
- destdir="./build/obj" >
- <classpath>
-+ <pathelement path="${javac.classpath}" />
- <pathelement location="../../../core/java/build/i2p.jar" />
- <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
- <pathelement location="${junit.home}/junit4.jar" />
-diff -Naur a/router/java/build.xml b/router/java/build.xml
---- a/router/java/build.xml 2018-10-04 12:05:14.000000000 +0200
-+++ b/router/java/build.xml 2018-10-12 08:14:52.921530213 +0200
-@@ -162,6 +162,7 @@
- includeAntRuntime="true"
- destdir="./build/obj">
- <classpath>
-+ <pathelement path="${javac.classpath}" />
- <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
diff --git a/net-vpn/i2p/i2p-0.9.36.ebuild b/net-vpn/i2p/i2p-0.9.36.ebuild
deleted file mode 100644
index 5bedf3debbfa..000000000000
--- a/net-vpn/i2p/i2p-0.9.36.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2 java-ant-2 multilib systemd user
-
-DESCRIPTION="A privacy-centric, anonymous network"
-HOMEPAGE="https://geti2p.net"
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
-
-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"
-SLOT="0"
-
-# Until the deps reach other arches
-KEYWORDS="~amd64 ~x86"
-IUSE="+ecdsa nls"
-
-# dev-java/ant-core is automatically added due to java-ant-2.eclass
-CP_DEPEND="dev-java/bcprov:1.50
- dev-java/jrobin:0
- dev-java/slf4j-api:0
- dev-java/tomcat-jstl-impl:0
- dev-java/tomcat-jstl-spec:0
- dev-java/java-service-wrapper:0"
-
-DEPEND="${CP_DEPEND}
- dev-java/eclipse-ecj:*
- nls? ( >=sys-devel/gettext-0.19 )
- >=virtual/jdk-1.7"
-
-RDEPEND="${CP_DEPEND}
- ecdsa? (
- || (
- dev-java/icedtea:8[-sunec]
- dev-java/icedtea-bin:8
- dev-java/oracle-jre-bin
- dev-java/oracle-jdk-bin
- )
- )
- !ecdsa? ( >=virtual/jre-1.7 )
- net-libs/nativebiginteger:0
-"
-
-EANT_BUILD_TARGET="pkg"
-JAVA_ANT_ENCODING="UTF-8"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
-
- enewgroup i2p
- enewuser i2p -1 -1 "${EPREFIX}/var/lib/i2p" i2p
-}
-
-src_prepare() {
- # as early as possible to allow generic patches to be applied
- default
-
- java-ant_rewrite-classpath
-
- java-pkg-2_src_prepare
-
- # We're on GNU/Linux, we don't need .exe files
- echo "noExe=true" > override.properties || die
- if ! use nls; then
- echo "require.gettext=false" >> override.properties || die
- fi
-
- # avoid auto starting browser
- sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \
- 'installer/resources/clients.config' || die
-
- # generate wrapper classpath, keeping the default to be replaced later
- i2p_cp='' # global forced by java-pkg_gen-cp
- java-pkg_gen-cp i2p_cp
- local lib cp i=2
- for lib in ${i2p_cp//,/ }
- do
- cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
- done
-
- # add generated cp and hardcode system VM
- sed -e "s|\(wrapper\.java\.classpath\.1=.*\)|\1\n${cp}|" \
- -e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
- -e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/lib/java-service-wrapper|" \
- -e "s|\(wrapper\.java\.library\.path\.2\)=.*|\0\nwrapper.java.library.path.3=/usr/$(get_libdir)|" \
- -i 'installer/resources/wrapper.config' || die
-
- # replace paths as the installer would
- sed -e "s|[\$%]INSTALL_PATH|${EPREFIX}/usr/share/i2p|" \
- -e "s|%SYSTEM_java_io_tmpdir|${EPREFIX}/var/lib/i2p/.i2p|" \
- -e "s|%USER_HOME|${EPREFIX}/var/lib/i2p|" \
- -i 'installer/resources/'{eepget,runplain.sh,wrapper.config} || die
-}
-
-src_install() {
- # cd into pkg-temp.
- cd "${S}/pkg-temp" || die
-
- # we remove system installed jar and install the others
- rm lib/{jrobin.jar,wrapper.jar,jbigi.jar} || \
- die 'unable to remove locally built jar already found in system'
- java-pkg_dojar lib/*.jar
-
- # create own launcher
- java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
-
- # Install main files and basic documentation
- insinto '/usr/share/i2p'
- doins blocklist.txt hosts.txt *.config
- dodoc history.txt INSTALL-headless.txt LICENSE.txt
- doman man/*
-
- # Install other directories
- doins -r certificates docs eepsite geoip scripts
- java-pkg_dowar webapps/*.war
-
- # Install daemon files
- newinitd "${FILESDIR}/i2p.init" i2p
- systemd_dounit "${FILESDIR}/i2p.service"
-
- # setup user
- keepdir '/var/lib/i2p/.i2p'
- fowners i2p:i2p '/var/lib/i2p/.i2p'
-}
-
-pkg_postinst() {
- elog "Custom configuration belongs in ${EPREFIX}/var/lib/i2p/.i2p to avoid being overwritten."
- elog 'I2P can be configured through the web interface at http://localhost:7657/console'
-
- if use !ecdsa
- then
- ewarn 'Currently, the i2p team does not enforce to use ECDSA keys. But it is more and'
- ewarn 'more pushed. To help the network, you are recommended to have the ecdsa USE.'
- ewarn
- ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as"
- ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation'
- ewarn 'as the one you built with.'
- fi
-}
diff --git a/net-vpn/i2p/i2p-0.9.37.ebuild b/net-vpn/i2p/i2p-0.9.37.ebuild
deleted file mode 100644
index b12699fa6694..000000000000
--- a/net-vpn/i2p/i2p-0.9.37.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2 java-ant-2 systemd user
-
-DESCRIPTION="A privacy-centric, anonymous network"
-HOMEPAGE="https://geti2p.net"
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
-
-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"
-SLOT="0"
-
-# Until the deps reach other arches
-KEYWORDS="~amd64 ~x86"
-IUSE="+ecdsa nls test"
-
-# dev-java/ant-core is automatically added due to java-ant-2.eclass
-CP_DEPEND='dev-java/bcprov:1.50
- dev-java/jrobin:0
- dev-java/slf4j-api:0
- dev-java/tomcat-jstl-impl:0
- dev-java/tomcat-jstl-spec:0
- dev-java/java-service-wrapper:0
- dev-java/commons-logging:0
- dev-java/slf4j-simple:0
- java-virtuals/servlet-api:3.1
-'
-
-DEPEND="${CP_DEPEND}
- dev-java/eclipse-ecj:*
- nls? ( >=sys-devel/gettext-0.19 )
- virtual/jdk:1.8
- test? (
- dev-java/ant-junit4:0
- dev-java/hamcrest-core:1.3
- dev-java/hamcrest-library:1.3
- dev-java/junit:4
- )
-"
-
-RDEPEND="${CP_DEPEND}
- ecdsa? (
- || (
- dev-java/icedtea:8[-sunec]
- dev-java/icedtea-bin:8
- dev-java/oracle-jre-bin
- dev-java/oracle-jdk-bin
- )
- )
- !ecdsa? ( virtual/jre:1.8 )
- net-libs/nativebiginteger:0
-"
-
-EANT_BUILD_TARGET="pkg"
-# no scala as depending on antlib.xml not installed by dev-lang/scala
-EANT_TEST_TARGET='junit.test'
-JAVA_ANT_ENCODING="UTF-8"
-
-PATCHES=(
- "${FILESDIR}/${PV}-add-cp-to-tests"
-)
-
-pkg_setup() {
- java-pkg-2_pkg_setup
-
- enewgroup i2p
- enewuser i2p -1 -1 "${EPREFIX}/var/lib/i2p" i2p
-}
-
-src_prepare() {
- # as early as possible to allow generic patches to be applied
- default
-
- java-ant_rewrite-classpath
-
- java-pkg-2_src_prepare
-
- # We're on GNU/Linux, we don't need .exe files
- echo "noExe=true" > override.properties || die
- if ! use nls; then
- echo "require.gettext=false" >> override.properties || die
- fi
-
- # avoid auto starting browser
- sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \
- 'installer/resources/clients.config' || die
-
- # generate wrapper classpath, keeping the default to be replaced later
- i2p_cp='' # global forced by java-pkg_gen-cp
- java-pkg_gen-cp i2p_cp
- local lib cp i=2
- for lib in ${i2p_cp//,/ }
- do
- cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
- done
-
- # add generated cp and hardcode system VM
- sed -e "s|\(wrapper\.java\.classpath\.1=.*\)|\1\n${cp}|" \
- -e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
- -e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/lib/java-service-wrapper|" \
- -e "s|\(wrapper\.java\.library\.path\.2\)=.*|\0\nwrapper.java.library.path.3=/usr/$(get_libdir)|" \
- -i 'installer/resources/wrapper.config' || die
-
- # replace paths as the installer would
- sed -e "s|[\$%]INSTALL_PATH|${EPREFIX}/usr/share/i2p|" \
- -e "s|%SYSTEM_java_io_tmpdir|${EPREFIX}/var/lib/i2p/.i2p|" \
- -e "s|%USER_HOME|${EPREFIX}/var/lib/i2p|" \
- -i 'installer/resources/'{eepget,runplain.sh,wrapper.config} || die
-
- if use test; then
- # no *streaming as requiring >dev-java/mockito-1.9.5
- sed -e '/junit\.test.*streaming/d' \
- -i build.xml ||
- die 'unable to remove ministreaming tests'
- fi
-}
-
-src_test() {
- # store built version of jars, overwritten by testing
- mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" ||
- die 'unable to save jars before tests'
-
- # generate test classpath
- local cp
- cp="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3)"
- EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${cp}" java-pkg-2_src_test
-
- # redo work undone by testing
- mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" ||
- die 'unable to restore jars after tests'
-}
-
-src_install() {
- # cd into pkg-temp.
- cd "${S}/pkg-temp" || die
-
- # we remove system installed jar and install the others
- rm lib/{jrobin,wrapper,jbigi,commons-logging,javax.servlet}.jar || \
- die 'unable to remove locally built jar already found in system'
- java-pkg_dojar lib/*.jar
-
- # create own launcher
- java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
-
- # Install main files and basic documentation
- insinto '/usr/share/i2p'
- doins blocklist.txt hosts.txt *.config
- dodoc history.txt INSTALL-headless.txt LICENSE.txt
- doman man/*
-
- # Install other directories
- doins -r certificates docs eepsite geoip scripts
- java-pkg_dowar webapps/*.war
-
- # Install daemon files
- newinitd "${FILESDIR}/i2p.init" i2p
- systemd_dounit "${FILESDIR}/i2p.service"
-
- # setup user
- keepdir '/var/lib/i2p/.i2p'
- fowners i2p:i2p '/var/lib/i2p/.i2p'
-}
-
-pkg_postinst() {
- elog "Custom configuration belongs in ${EPREFIX}/var/lib/i2p/.i2p to avoid being overwritten."
- elog 'I2P can be configured through the web interface at http://localhost:7657/console'
-
- if use !ecdsa
- then
- ewarn 'Currently, the i2p team does not enforce to use ECDSA keys. But it is more and'
- ewarn 'more pushed. To help the network, you are recommended to have the ecdsa USE.'
- ewarn
- ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as"
- ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation'
- ewarn 'as the one you built with.'
- fi
-}
diff --git a/net-vpn/i2p/i2p-0.9.39.ebuild b/net-vpn/i2p/i2p-0.9.39.ebuild
new file mode 100644
index 000000000000..f9b032fe1103
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.39.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2 java-ant-2 systemd user
+
+DESCRIPTION="A privacy-centric, anonymous network"
+HOMEPAGE="https://geti2p.net"
+SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+
+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"
+SLOT="0"
+
+# Until the deps reach other arches
+KEYWORDS="~amd64 ~x86"
+IUSE='nls test'
+
+# dev-java/ant-core is automatically added due to java-ant-2.eclass
+CP_DEPEND='dev-java/bcprov:1.50
+ dev-java/jrobin:0
+ dev-java/slf4j-api:0
+ dev-java/tomcat-jstl-impl:0
+ dev-java/tomcat-jstl-spec:0
+ dev-java/java-service-wrapper:0
+ dev-java/commons-logging:0
+ dev-java/slf4j-simple:0
+ java-virtuals/servlet-api:3.1
+'
+
+DEPEND="${CP_DEPEND}
+ dev-java/eclipse-ecj:*
+ nls? ( >=sys-devel/gettext-0.19 )
+ virtual/jdk:1.8
+ test? (
+ dev-java/ant-junit4:0
+ dev-java/hamcrest-core:1.3
+ dev-java/hamcrest-library:1.3
+ dev-java/junit:4
+ )
+"
+
+RDEPEND="${CP_DEPEND}
+ virtual/jre:1.8
+ net-libs/nativebiginteger:0
+"
+
+EANT_BUILD_TARGET="pkg"
+# no scala as depending on antlib.xml not installed by dev-lang/scala
+EANT_TEST_TARGET='junit.test'
+JAVA_ANT_ENCODING="UTF-8"
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+
+ enewgroup i2p
+ enewuser i2p -1 -1 "${EPREFIX}/var/lib/i2p" i2p
+}
+
+src_prepare() {
+ # as early as possible to allow generic patches to be applied
+ default
+
+ java-ant_rewrite-classpath
+
+ java-pkg-2_src_prepare
+
+ # We're on GNU/Linux, we don't need .exe files
+ echo "noExe=true" > override.properties || die
+ if ! use nls; then
+ echo "require.gettext=false" >> override.properties || die
+ fi
+
+ # avoid auto starting browser
+ sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \
+ 'installer/resources/clients.config' || die
+
+ # generate wrapper classpath, keeping the default to be replaced later
+ i2p_cp='' # global forced by java-pkg_gen-cp
+ java-pkg_gen-cp i2p_cp
+ local lib cp i=2
+ for lib in ${i2p_cp//,/ }
+ do
+ cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
+ done
+
+ # add generated cp and hardcode system VM
+ sed -e "s|\(wrapper\.java\.classpath\.1=.*\)|\1\n${cp}|" \
+ -e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
+ -e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/lib/java-service-wrapper|" \
+ -e "s|\(wrapper\.java\.library\.path\.2\)=.*|\0\nwrapper.java.library.path.3=/usr/$(get_libdir)|" \
+ -i 'installer/resources/wrapper.config' || die
+
+ # replace paths as the installer would
+ sed -e "s|[\$%]INSTALL_PATH|${EPREFIX}/usr/share/i2p|" \
+ -e "s|%SYSTEM_java_io_tmpdir|${EPREFIX}/var/lib/i2p/.i2p|" \
+ -e "s|%USER_HOME|${EPREFIX}/var/lib/i2p|" \
+ -i 'installer/resources/'{eepget,runplain.sh,wrapper.config} || die
+
+ if use test; then
+ # no *streaming as requiring >dev-java/mockito-1.9.5
+ sed -e '/junit\.test.*streaming/d' \
+ -i build.xml ||
+ die 'unable to remove ministreaming tests'
+ fi
+}
+
+src_test() {
+ # store built version of jars, overwritten by testing
+ mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" ||
+ die 'unable to save jars before tests'
+
+ # generate test classpath
+ local cp
+ cp="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3)"
+ EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${cp}" java-pkg-2_src_test
+
+ # redo work undone by testing
+ mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" ||
+ die 'unable to restore jars after tests'
+}
+
+src_install() {
+ # cd into pkg-temp.
+ cd "${S}/pkg-temp" || die
+
+ # we remove system installed jar and install the others
+ rm lib/{jrobin,wrapper,jbigi,commons-logging,javax.servlet}.jar || \
+ die 'unable to remove locally built jar already found in system'
+ java-pkg_dojar lib/*.jar
+
+ # create own launcher
+ java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
+
+ # Install main files and basic documentation
+ insinto '/usr/share/i2p'
+ doins blocklist.txt hosts.txt *.config
+ dodoc history.txt INSTALL-headless.txt LICENSE.txt
+ doman man/*
+
+ # Install other directories
+ doins -r certificates docs eepsite geoip scripts
+ java-pkg_dowar webapps/*.war
+
+ # Install daemon files
+ newinitd "${FILESDIR}/i2p.init" i2p
+ systemd_dounit "${FILESDIR}/i2p.service"
+
+ # setup user
+ keepdir '/var/lib/i2p/.i2p'
+ fowners i2p:i2p '/var/lib/i2p/.i2p'
+}
+
+pkg_postinst() {
+ elog "Custom configuration belongs in ${EPREFIX}/var/lib/i2p/.i2p to avoid being overwritten."
+ elog 'I2P can be configured through the web interface at http://localhost:7657/console'
+}
diff --git a/net-vpn/i2p/metadata.xml b/net-vpn/i2p/metadata.xml
index 71d052d100fd..47d301c7bc15 100644
--- a/net-vpn/i2p/metadata.xml
+++ b/net-vpn/i2p/metadata.xml
@@ -15,7 +15,6 @@
</maintainer>
<longdescription>I2P is an anonymous network, exposing a simple layer that applications can use to anonymously and securely send messages to each other.</longdescription>
<use>
- <flag name="ecdsa">Enables additional checks to make sure a setup is available that is capable of using I2Ps ECDSA provisions. I2P will work without it, but you will likely see warnings.</flag>
<flag name="nls">Adds Native Language Support using GNU gettext.</flag>
</use>
</pkgmetadata>
--
cgit v1.2.3