public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/
Date: Fri, 16 Jul 2021 01:34:56 +0000 (UTC)	[thread overview]
Message-ID: <1626399205.b5af0d5853d8d01c9df5b23278c278093ecc58a9.sam@gentoo> (raw)

commit:     b5af0d5853d8d01c9df5b23278c278093ecc58a9
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Jul 14 22:17:18 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 01:33:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5af0d58

net-vpn/i2p: bump to 0.9.50

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-vpn/i2p/Manifest          |   1 +
 net-vpn/i2p/i2p-0.9.50.ebuild | 159 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 160 insertions(+)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index f35773ca085..3e6a65c8c9e 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1 +1,2 @@
 DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a
+DIST i2psource_0.9.50.tar.bz2 32409456 BLAKE2B 0c45b48ae6e1957b6c5d828757c70489d260fe15276559e5c366c68c10274b9020b2978bf0674a8628638f41b1e269af0c4d35c20c1f0cee419857c0c803dd82 SHA512 2d6b1d3ed4d32af36d0d3b257dca6fad981e3fa0cd3e45b8227e76e57de092c11ff7c239e879739d330ae809bcf6c71640de32de0c52c54ef8597f0c0e1467ec

diff --git a/net-vpn/i2p/i2p-0.9.50.ebuild b/net-vpn/i2p/i2p-0.9.50.ebuild
new file mode 100644
index 00000000000..3468bcd0dd1
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.50.ebuild
@@ -0,0 +1,159 @@
+# 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://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/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
+		dev-java/mockito:0
+	)
+"
+
+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 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() {
+	# 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 classpath
+	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
+
+	# 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/{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
+}


             reply	other threads:[~2021-07-16  1:35 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-16  1:34 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-04-12 23:01 [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/ Sam James
2025-03-25  4:36 Sam James
2025-03-11  8:33 Sam James
2024-11-28  0:09 Jakov Smolić
2024-10-17 15:32 Arthur Zamarin
2024-10-12 17:12 Arthur Zamarin
2024-09-28 13:30 Arthur Zamarin
2024-09-27 23:23 Jakov Smolić
2024-06-29  9:50 Miroslav Šulc
2024-06-29  6:22 Joonas Niilola
2024-05-24 11:02 Miroslav Šulc
2024-05-24  9:44 Florian Schmaus
2024-05-23  9:19 Miroslav Šulc
2024-05-23  9:14 Florian Schmaus
2024-05-23  9:14 Florian Schmaus
2024-03-10 21:10 Miroslav Šulc
2024-03-10 21:10 Miroslav Šulc
2024-01-05 14:12 Sam James
2023-08-06  5:46 Miroslav Šulc
2023-08-01 11:22 Sam James
2023-07-18 17:21 Sam James
2023-07-18 17:21 Sam James
2023-07-18 16:32 Sam James
2023-07-18 16:32 Sam James
2023-07-15 13:15 Arthur Zamarin
2023-06-14  4:17 Sam James
2023-05-22  6:08 Miroslav Šulc
2023-05-20 11:08 Sam James
2022-08-05  6:57 Arthur Zamarin
2022-07-28 14:17 Sam James
2022-07-10 19:15 Arthur Zamarin
2022-07-10  6:17 Agostino Sarubbo
2022-05-24 14:42 Florian Schmaus
2022-05-24 14:42 Florian Schmaus
2022-03-12 12:01 Arthur Zamarin
2022-03-11 13:30 Joonas Niilola
2021-12-13  5:10 Sam James
2021-12-13  5:10 Sam James
2021-06-07  8:52 Miroslav Šulc
2020-12-11  7:58 Joonas Niilola
2020-12-11  7:58 Joonas Niilola
2020-09-13  0:44 Sam James
2020-03-21 16:13 Joonas Niilola
2020-03-21 16:13 Joonas Niilola
2020-01-29  6:14 Joonas Niilola
2020-01-16  5:49 Joonas Niilola
2020-01-06 15:40 Joonas Niilola
2020-01-06 15:40 Joonas Niilola
2019-11-13  6:03 Joonas Niilola
2019-06-05  8:54 Michał Górny
2019-06-05  8:54 Michał Górny
2019-04-22 10:17 Michał Górny
2018-10-14 10:33 Michał Górny
2018-10-14 10:33 Michał Górny
2018-09-07  8:24 Patrice Clement
2018-09-07  8:24 Patrice Clement
2018-08-26 17:40 Michał Górny
2018-04-03 15:28 Jonas Stein
2018-02-11 11:12 Michał Górny
2017-08-26  6:50 Patrick Lauer
2017-06-12 21:37 Patrice Clement
2017-05-23 14:28 Patrice Clement

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1626399205.b5af0d5853d8d01c9df5b23278c278093ecc58a9.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox