From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1E3C5158087 for ; Mon, 13 Dec 2021 05:10:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4807C2BC01A; Mon, 13 Dec 2021 05:10:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C0980E07C5 for ; Mon, 13 Dec 2021 05:10:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94FDB3430C4 for ; Mon, 13 Dec 2021 05:10:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 031A01BF for ; Mon, 13 Dec 2021 05:10:13 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1639372073.61589380700ec86a6a96bf83ea1223426e71ccaf.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/i2p/Manifest net-vpn/i2p/i2p-1.6.1.ebuild X-VCS-Directories: net-vpn/i2p/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 61589380700ec86a6a96bf83ea1223426e71ccaf X-VCS-Branch: master Date: Mon, 13 Dec 2021 05:10:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 46b4dc1b-519e-4c32-bd7c-e5a5e6773fb5 X-Archives-Hash: a51c0cdb68098178961500b119253742 commit: 61589380700ec86a6a96bf83ea1223426e71ccaf Author: Valérian Rousset users noreply github com> AuthorDate: Sun Dec 12 23:48:24 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Dec 13 05:07:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61589380 net-vpn/i2p: bump to 0.9.50 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Valérian Rousset users.noreply.github.com> Signed-off-by: Sam James gentoo.org> net-vpn/i2p/Manifest | 1 + net-vpn/i2p/i2p-1.6.1.ebuild | 147 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest index 3e6a65c8c9ed..655e597d5d36 100644 --- a/net-vpn/i2p/Manifest +++ b/net-vpn/i2p/Manifest @@ -1,2 +1,3 @@ DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a DIST i2psource_0.9.50.tar.bz2 32409456 BLAKE2B 0c45b48ae6e1957b6c5d828757c70489d260fe15276559e5c366c68c10274b9020b2978bf0674a8628638f41b1e269af0c4d35c20c1f0cee419857c0c803dd82 SHA512 2d6b1d3ed4d32af36d0d3b257dca6fad981e3fa0cd3e45b8227e76e57de092c11ff7c239e879739d330ae809bcf6c71640de32de0c52c54ef8597f0c0e1467ec +DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a diff --git a/net-vpn/i2p/i2p-1.6.1.ebuild b/net-vpn/i2p/i2p-1.6.1.ebuild new file mode 100644 index 000000000000..56ba991f558a --- /dev/null +++ b/net-vpn/i2p/i2p-1.6.1.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2021 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://files.i2p-projekt.de/${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/java-service-wrapper:0" + +#dev-java/eclipse-ecj:* +DEPEND="${CP_DEPEND} + virtual/jdk:1.8 + nls? ( >=sys-devel/gettext-0.19 ) + test? ( + dev-java/ant-junit4:0 + dev-java/hamcrest-core:1.3 + dev-java/hamcrest-library:1.3 + dev-java/junit:4 + dev-java/mockito:0 + ) +" + +RDEPEND="${CP_DEPEND} + acct-user/i2p + acct-group/i2p + net-libs/nativebiginteger:0 + virtual/jre:1.8 +" + +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 classpath="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n" + for lib in ${i2p_cp//,/ } + do + classpath+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n" + done + + # add generated classpath, hardcode system VM, setting system's conf + sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${classpath}|" \ + -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() { + # generate test classpath + local classpath="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3,mockito)" + EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${classpath}" java-pkg-2_src_test +} + +src_install() { + # cd into pkg-temp. + cd "${S}/pkg-temp" || die + + # we remove system installed jar and install the others + rm lib/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 +}