commit: eb9f6d78154332dfa9b5694be9b28a46c865aa74 Author: Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com> AuthorDate: Sun Dec 6 23:32:44 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Dec 11 07:58:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9f6d78
net-vpn/i2p: bump to 0.9.48 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> net-vpn/i2p/Manifest | 1 + net-vpn/i2p/i2p-0.9.48.ebuild | 159 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+) diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest index cfc3977e98a..83886cdee05 100644 --- a/net-vpn/i2p/Manifest +++ b/net-vpn/i2p/Manifest @@ -1,2 +1,3 @@ DIST i2psource_0.9.45.tar.bz2 31921025 BLAKE2B 2d37777f77784ff93de4d7442eddf46b9a541902412bf5fb24cf96baba73851cc17d01649a7b4b41a710ccde5690036a890b8f84de00f4c615ed2e23da8fa510 SHA512 d4cf354f0a807d132fae75d4bad3e2e788e1ed03d6f625feb0f1369bb2c9e1a6e2758645acf2017c61dbc47d75e6d834b87455adbead1077f206025686548ae9 DIST i2psource_0.9.47.tar.bz2 32488438 BLAKE2B e1544475dad526e242570918c1bb967a4b713567e71201e08b73c8995743a68396b5951f477bfe8830927c0cdf7e991a25a1978d4aaf88cae3e4218ba57a8818 SHA512 7fdd9ab0b3e81aa89e73be6fa172d723c2b5a67365116a1e0e0ec948067fe4f58e3ad946a0ef4605602c0d803b98e37b2d5692a39a14cf7433d546ada204cbc9 +DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a diff --git a/net-vpn/i2p/i2p-0.9.48.ebuild b/net-vpn/i2p/i2p-0.9.48.ebuild new file mode 100644 index 00000000000..23715c60adf --- /dev/null +++ b/net-vpn/i2p/i2p-0.9.48.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit java-pkg-2 java-ant-2 systemd + +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" +RESTRICT="!test? ( test )" + +# dev-java/ant-core is automatically added due to java-ant-2.eclass +CP_DEPEND=" + dev-java/commons-logging:0 + dev-java/java-service-wrapper:0 + dev-java/tomcat-servlet-api:4.0 +" + +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} + acct-user/i2p + acct-group/i2p + 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" + +src_prepare() { + if use test; then + # no *streaming as requiring >dev-java/mockito-1.9.5 + sed -e "/streaming.*junit\.test/d" \ + -i build.xml || + die "unable to remove ministreaming tests" + fi + + # 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 i=2 + local cp="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n" + for lib in ${i2p_cp//,/ } + do + cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n" + done + + # add generated cp, hardcode system VM, setting system's conf + sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${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/$(get_libdir)/java-service-wrapper|" \ + -e "s|\(wrapper\.java\.library\.path\)\.2=.*|\1.2=${EPREFIX}/usr/share/i2p/lib\n\1.3=/usr/$(get_libdir)|" \ + -e "s|\(wrapper\.java\.additional\.1=-DloggerFilenameOverride\)=.*|\1=${EPREFIX}/var/log/i2p/router-@|" \ + -e "s|\(wrapper\.logfile\)=.*|\1=${EPREFIX}/var/log/i2p/wrapper|" \ + -e "/wrapper\.java\.additional\.2\(\.stripquote\|\)/d" \ + -i installer/resources/wrapper.config || + die "unable to apply gentoo config" + local prop i=2 + for prop in \ + "i2p.dir.base=${EPREFIX}/usr/share/i2p" \ + "i2p.dir.app=${EPREFIX}/var/lib/i2p/app" \ + "i2p.dir.config=${EPREFIX}/var/lib/i2p/config" \ + "i2p.dir.router=${EPREFIX}/var/lib/i2p/router" \ + "i2p.dir.log=${EPREFIX}/var/log/i2p" \ + "i2p.dir.pid=${EPREFIX}/tmp" \ + "i2p.dir.temp=${EPREFIX}/tmp" + do + echo "wrapper.java.additional.$((i++))=-D$prop" >> installer/resources/wrapper.config || + die "unable to apply gentoo config" + done +} + +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/{commons-logging,javax.servlet,wrapper}.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 log + keepdir /var/log/i2p + fowners i2p:i2p /var/log/i2p + + # setup user + keepdir /var/lib/i2p + fowners i2p:i2p /var/lib/i2p +}
