[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Patrice Clement]

commit:     1b459774031bee83e9f607f3cfffc0feba319907
Author:     Yifeng Li <tomli <AT> tomli <DOT> me>
AuthorDate: Mon May 15 01:53:33 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue May 23 14:28:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b459774

net-vpn/i2p: remove ecdsa flag in 0.9.30, since DSA is being replaced.

Signed-off-by: Yifeng Li <tomli <AT> tomli.me>
Closes: https://github.com/gentoo/gentoo/pull/4571

 net-vpn/i2p/i2p-0.9.30.ebuild | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/net-vpn/i2p/i2p-0.9.30.ebuild b/net-vpn/i2p/i2p-0.9.30.ebuild
index 7b4348c6cc4..c475d04fc0a 100644
--- a/net-vpn/i2p/i2p-0.9.30.ebuild
+++ b/net-vpn/i2p/i2p-0.9.30.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 
 # Until the deps reach other arches
 KEYWORDS="~amd64 ~x86"
-IUSE="+ecdsa nls"
+IUSE="nls"
 
 # dev-java/ant-core is automatically added due to java-ant-2.eclass
 CP_DEPEND="dev-java/bcprov:1.50
@@ -31,17 +31,14 @@ DEPEND="${CP_DEPEND}
 	>=virtual/jdk-1.7"
 
 RDEPEND="${CP_DEPEND}
-	ecdsa? (
-		|| (
-			dev-java/icedtea:7[-sunec]
-			dev-java/icedtea:8[-sunec]
-			dev-java/icedtea-bin:7
-			dev-java/icedtea-bin:8
-			dev-java/oracle-jre-bin
-			dev-java/oracle-jdk-bin
-		)
-	)
-	!ecdsa? ( >=virtual/jre-1.7 )"
+    || (
+		dev-java/icedtea:7[-sunec]
+		dev-java/icedtea:8[-sunec]
+		dev-java/icedtea-bin:7
+		dev-java/icedtea-bin:8
+		dev-java/oracle-jre-bin
+		dev-java/oracle-jdk-bin
+    )"
 
 EANT_BUILD_TARGET="pkg"
 JAVA_ANT_ENCODING="UTF-8"
@@ -141,17 +138,6 @@ pkg_postinst() {
 	elog 'I2P can be configured through the web interface at http://localhost:7657/console'
 	elog
 
-	if use !ecdsa
-	then
-		ewarn 'DSA keys are being retired since 0.9.30. You should have the ecdsa USE to ensure'
-		ewarn 'the flawless operation of your i2p.'
-		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.'
-		ewarn
-	fi
-
 	ewarn "The router will migrate the jetty.xml for each Jetty website to the new Jetty 9 setup during startup."
 	ewarn "This should work for recent, unmodified configurations but may not work for modified or"
 	ewarn "very old setups. Verify that your Jetty website works after upgrading, and contact i2p"

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Patrice Clement]

commit:     181c59eab64e35b3d8135e6765b5398cea1e2b6e
Author:     tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sun Jun 11 14:13:07 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 21:36:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=181c59ea

net-vpn/i2p: version bump to 0.9.30-r1.

Gentoo-Bug: https://bugs.gentoo.org/620210

Package-Manager: Portage-2.3.5, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4910

 net-vpn/i2p/i2p-0.9.30-r1.ebuild | 152 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)

diff --git a/net-vpn/i2p/i2p-0.9.30-r1.ebuild b/net-vpn/i2p/i2p-0.9.30-r1.ebuild
new file mode 100644
index 00000000000..d64a1c13eda
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.30-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils 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"
+
+# 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:*
+	dev-libs/gmp:0
+	nls? ( >=sys-devel/gettext-0.19 )
+	>=virtual/jdk-1.7"
+
+RDEPEND="${CP_DEPEND}
+	ecdsa? (
+		|| (
+			dev-java/icedtea:7[-sunec]
+			dev-java/icedtea:8[-sunec]
+			dev-java/icedtea-bin:7
+			dev-java/icedtea-bin:8
+			dev-java/oracle-jre-bin
+			dev-java/oracle-jdk-bin
+		)
+	)
+	!ecdsa? ( >=virtual/jre-1.7 )"
+
+EANT_BUILD_TARGET="pkg"
+JAVA_ANT_ENCODING="UTF-8"
+
+I2P_ROOT='/usr/share/i2p'
+I2P_CONFIG_HOME='/var/lib/i2p'
+I2P_CONFIG_DIR="${I2P_CONFIG_HOME}/.i2p"
+
+RES_DIR='installer/resources'
+
+PATCHES=(
+	"${FILESDIR}/${P}-add_libs.patch"
+)
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	enewgroup i2p
+	enewuser i2p -1 -1 "${I2P_CONFIG_HOME}" i2p
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	java-ant_rewrite-classpath
+}
+
+src_prepare() {
+	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|' \
+		"${RES_DIR}/clients.config" || die
+
+	# we do it now so we can resolve path after
+	default
+
+	# replace paths as the installer would
+	sed -i "s|%INSTALL_PATH|${I2P_ROOT}|" \
+		"${RES_DIR}/"{eepget,i2prouter,runplain.sh}  || die
+	sed -i "s|\$INSTALL_PATH|${I2P_ROOT}|" "${RES_DIR}/wrapper.config" || die
+	sed -i "s|%SYSTEM_java_io_tmpdir|${I2P_CONFIG_DIR}|" \
+		"${RES_DIR}/"{i2prouter,runplain.sh} || die
+	sed -i "s|%USER_HOME|${I2P_CONFIG_HOME}|" "${RES_DIR}/i2prouter" || die
+}
+
+src_install() {
+	# cd into pkg-temp.
+	cd "${S}/pkg-temp" || die
+
+	# This is ugly, but to satisfy all non-system .jar dependencies, jetty
+	# would need to be packaged. It would be too large a task
+	# for an unseasoned developer. This seems to be the most pragmatic solution
+	java-pkg_jarinto "${I2P_ROOT}/lib"
+	local i
+	for i in BOB commons-el commons-logging i2p i2psnark i2ptunnel \
+		jasper-compiler jasper-runtime javax.servlet jbigi jetty* mstreaming org.mortbay.* router* \
+		sam standard streaming systray addressbook; do
+		java-pkg_dojar lib/${i}.jar
+	done
+
+	# Set up symlinks for binaries
+	dosym /usr/bin/wrapper "${I2P_ROOT}/i2psvc"
+	dosym "${I2P_ROOT}/i2prouter" /usr/bin/i2prouter
+	dosym "${I2P_ROOT}/eepget" /usr/bin/eepget
+
+	# Install main files and basic documentation
+	exeinto "${I2P_ROOT}"
+	insinto "${I2P_ROOT}"
+	doins blocklist.txt hosts.txt *.config
+	doexe eepget i2prouter runplain.sh
+	dodoc history.txt INSTALL-headless.txt LICENSE.txt
+	doman man/*
+
+	# Install other directories
+	doins -r certificates docs eepsite geoip scripts
+	dodoc -r licenses
+	java-pkg_dowar webapps/*.war
+
+	# Install daemon files
+	newinitd "${FILESDIR}/${P}.initd" i2p
+	systemd_newunit "${FILESDIR}/${P}.service" i2p.service
+
+	# setup user
+	keepdir "${I2P_CONFIG_DIR}"
+	fowners -R i2p:i2p "${I2P_CONFIG_DIR}"
+}
+
+pkg_postinst() {
+	elog "Custom configuration belongs in ${I2P_CONFIG_DIR} 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
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Patrick Lauer]

commit:     d61eca381b2d2bb155f8da0a3f667da2c5a7da26
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 06:37:45 2017 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 06:37:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d61eca38

net-vpn/i2p: Whitespace

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-vpn/i2p/i2p-0.9.30.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-vpn/i2p/i2p-0.9.30.ebuild b/net-vpn/i2p/i2p-0.9.30.ebuild
index c475d04fc0a..54eab04b7fe 100644
--- a/net-vpn/i2p/i2p-0.9.30.ebuild
+++ b/net-vpn/i2p/i2p-0.9.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -31,14 +31,14 @@ DEPEND="${CP_DEPEND}
 	>=virtual/jdk-1.7"
 
 RDEPEND="${CP_DEPEND}
-    || (
+	|| (
 		dev-java/icedtea:7[-sunec]
 		dev-java/icedtea:8[-sunec]
 		dev-java/icedtea-bin:7
 		dev-java/icedtea-bin:8
 		dev-java/oracle-jre-bin
 		dev-java/oracle-jdk-bin
-    )"
+	)"
 
 EANT_BUILD_TARGET="pkg"
 JAVA_ANT_ENCODING="UTF-8"

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Michał Górny]

commit:     b99c2411ac010894a4ee4f9e9931b9bdfadbb9bf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 11:07:54 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 11:07:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b99c2411

net-vpn/i2p: Remove useless maintainer <description/>

Remove useless/redundant maintainer <description/>. It does not benefit
bug wrangling, and only wastes developer's time on reading it. Few tips:

- assignee/CC is implied by ordering, there is no reason to repeat it,
- we know that maintainer is maintainer (la la la la la),
- most of adjectives for maintainer are of no value and/or are obvious.

 net-vpn/i2p/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net-vpn/i2p/metadata.xml b/net-vpn/i2p/metadata.xml
index 52ff6421771..24d53a221ce 100644
--- a/net-vpn/i2p/metadata.xml
+++ b/net-vpn/i2p/metadata.xml
@@ -4,12 +4,10 @@
 <maintainer type="person">
 	<email>tharvik@gmail.com</email>
 	<name>Tharvik</name>
-	<description>Proxy-maintainer; add or CC them for bugs</description>
 </maintainer>
 <maintainer type="person">
 	<email>tomboy64@sina.cn</email>
 	<name>M.B.</name>
-	<description>Proxy-maintainer; add or CC them for bugs</description>
 </maintainer>
 <maintainer type="project">
 	<email>java@gentoo.org</email>

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Jonas Stein]

commit:     c41cf402e30d0cf8e5737f5ed0f96f1d2395f7d0
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  3 15:24:39 2018 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Tue Apr  3 15:27:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41cf402

net-vpn/i2p: Maintainer retired

Proxied maintainer was retired due to inactivity.
Bug: https://bugs.gentoo.org/632854
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 net-vpn/i2p/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/net-vpn/i2p/metadata.xml b/net-vpn/i2p/metadata.xml
index 24d53a221ce..f7a6c323e6c 100644
--- a/net-vpn/i2p/metadata.xml
+++ b/net-vpn/i2p/metadata.xml
@@ -5,10 +5,6 @@
 	<email>tharvik@gmail.com</email>
 	<name>Tharvik</name>
 </maintainer>
-<maintainer type="person">
-	<email>tomboy64@sina.cn</email>
-	<name>M.B.</name>
-</maintainer>
 <maintainer type="project">
 	<email>java@gentoo.org</email>
 	<name>Java</name>

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Michał Górny]

commit:     c80278cc1c5e1962586bee7f0a249cac7204bcd6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 17:35:31 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 17:35:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c80278cc

net-vpn/i2p: Remove support for non-existent deps

 net-vpn/i2p/i2p-0.9.31.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net-vpn/i2p/i2p-0.9.31.ebuild b/net-vpn/i2p/i2p-0.9.31.ebuild
index d64a1c13eda..bf868bfbd84 100644
--- a/net-vpn/i2p/i2p-0.9.31.ebuild
+++ b/net-vpn/i2p/i2p-0.9.31.ebuild
@@ -33,9 +33,7 @@ DEPEND="${CP_DEPEND}
 RDEPEND="${CP_DEPEND}
 	ecdsa? (
 		|| (
-			dev-java/icedtea:7[-sunec]
 			dev-java/icedtea:8[-sunec]
-			dev-java/icedtea-bin:7
 			dev-java/icedtea-bin:8
 			dev-java/oracle-jre-bin
 			dev-java/oracle-jdk-bin

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Patrice Clement]

commit:     90579b151dbeee2ad19ea2b4f873b329d1297823
Author:     tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sun Aug 26 16:21:12 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Sep  7 08:23:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90579b15

net-vpn/i2p: remove 0.9.{31,33}.

 net-vpn/i2p/Manifest          |   2 -
 net-vpn/i2p/i2p-0.9.31.ebuild | 150 ------------------------------------------
 net-vpn/i2p/i2p-0.9.33.ebuild | 143 ----------------------------------------
 3 files changed, 295 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 7c6fb46abad..018ac01d087 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,4 +1,2 @@
-DIST i2psource_0.9.31.tar.bz2 28745769 BLAKE2B e7766eceffb44c7c40ce176c3d98ed9a62472058c90adf1b07bbab11628d6ca4c8c62ca52526a204a6e8f47a182a59e07ccbdef65b6d2c5122d8e64e1df75406 SHA512 ffeb74d02c783febc122580b64561722de04c903e2d33fdeaf74bf3b7d725b8b7ce6556f53a12f0ae0d6c6deb413839e222bc2b8093952e5ecaf1bf96f0d1103
-DIST i2psource_0.9.33.tar.bz2 28985659 BLAKE2B 51b9697271c506de8d34b42ff208a12c9f0409c9aff456aa928dc2d411aceb0473878e9ed0d6ccf3684a7432c64700eec798535b4a4f4e01a2297e3d3ef7603a SHA512 ad772a422923636731350e590a14631209503c3d82db32410cb3002c790c60f9f7d950f94bb4d65ced1c2126e67a92ad65e9cd65ae3f045fc5279f57217066e2
 DIST i2psource_0.9.34.tar.bz2 29332692 BLAKE2B 16b15ac2c7eaa594fc6398105d7e22442fafc4036a54a66c91b3ca9bd98095a9192ae5c28123882ddc6acc7c68fb5eeed3ef1ed632a4b4b96a1abe28dff2286c SHA512 71c80710098ead34c159c6a6873c397048afc76974917e7b65d7846203900ab8bfb4840fec3c7d09ade48e93329b06ec33d9f367dae33a4708b4ea14268beefa
 DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4

diff --git a/net-vpn/i2p/i2p-0.9.31.ebuild b/net-vpn/i2p/i2p-0.9.31.ebuild
deleted file mode 100644
index bf868bfbd84..00000000000
--- a/net-vpn/i2p/i2p-0.9.31.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils 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"
-
-# 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:*
-	dev-libs/gmp:0
-	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 )"
-
-EANT_BUILD_TARGET="pkg"
-JAVA_ANT_ENCODING="UTF-8"
-
-I2P_ROOT='/usr/share/i2p'
-I2P_CONFIG_HOME='/var/lib/i2p'
-I2P_CONFIG_DIR="${I2P_CONFIG_HOME}/.i2p"
-
-RES_DIR='installer/resources'
-
-PATCHES=(
-	"${FILESDIR}/${P}-add_libs.patch"
-)
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	enewgroup i2p
-	enewuser i2p -1 -1 "${I2P_CONFIG_HOME}" i2p
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	java-ant_rewrite-classpath
-}
-
-src_prepare() {
-	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|' \
-		"${RES_DIR}/clients.config" || die
-
-	# we do it now so we can resolve path after
-	default
-
-	# replace paths as the installer would
-	sed -i "s|%INSTALL_PATH|${I2P_ROOT}|" \
-		"${RES_DIR}/"{eepget,i2prouter,runplain.sh}  || die
-	sed -i "s|\$INSTALL_PATH|${I2P_ROOT}|" "${RES_DIR}/wrapper.config" || die
-	sed -i "s|%SYSTEM_java_io_tmpdir|${I2P_CONFIG_DIR}|" \
-		"${RES_DIR}/"{i2prouter,runplain.sh} || die
-	sed -i "s|%USER_HOME|${I2P_CONFIG_HOME}|" "${RES_DIR}/i2prouter" || die
-}
-
-src_install() {
-	# cd into pkg-temp.
-	cd "${S}/pkg-temp" || die
-
-	# This is ugly, but to satisfy all non-system .jar dependencies, jetty
-	# would need to be packaged. It would be too large a task
-	# for an unseasoned developer. This seems to be the most pragmatic solution
-	java-pkg_jarinto "${I2P_ROOT}/lib"
-	local i
-	for i in BOB commons-el commons-logging i2p i2psnark i2ptunnel \
-		jasper-compiler jasper-runtime javax.servlet jbigi jetty* mstreaming org.mortbay.* router* \
-		sam standard streaming systray addressbook; do
-		java-pkg_dojar lib/${i}.jar
-	done
-
-	# Set up symlinks for binaries
-	dosym /usr/bin/wrapper "${I2P_ROOT}/i2psvc"
-	dosym "${I2P_ROOT}/i2prouter" /usr/bin/i2prouter
-	dosym "${I2P_ROOT}/eepget" /usr/bin/eepget
-
-	# Install main files and basic documentation
-	exeinto "${I2P_ROOT}"
-	insinto "${I2P_ROOT}"
-	doins blocklist.txt hosts.txt *.config
-	doexe eepget i2prouter runplain.sh
-	dodoc history.txt INSTALL-headless.txt LICENSE.txt
-	doman man/*
-
-	# Install other directories
-	doins -r certificates docs eepsite geoip scripts
-	dodoc -r licenses
-	java-pkg_dowar webapps/*.war
-
-	# Install daemon files
-	newinitd "${FILESDIR}/${P}.initd" i2p
-	systemd_newunit "${FILESDIR}/${P}.service" i2p.service
-
-	# setup user
-	keepdir "${I2P_CONFIG_DIR}"
-	fowners -R i2p:i2p "${I2P_CONFIG_DIR}"
-}
-
-pkg_postinst() {
-	elog "Custom configuration belongs in ${I2P_CONFIG_DIR} 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.33.ebuild b/net-vpn/i2p/i2p-0.9.33.ebuild
deleted file mode 100644
index cf3d2654ed1..00000000000
--- a/net-vpn/i2p/i2p-0.9.33.ebuild
+++ /dev/null
@@ -1,143 +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 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:*
-	dev-libs/gmp:0
-	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 )"
-
-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|" \
-		-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,i2prouter,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} || \
-		die 'unable to remove locally built jar already found in system'
-	java-pkg_dojar lib/*.jar
-
-	# Set up symlinks for binaries
-	dodir /usr/bin
-	# workaround portage absolute symlink limitation
-	dosym '../share/i2p/i2prouter' '/usr/bin/i2prouter'
-	dosym '../share/i2p/eepget' '/usr/bin/eepget'
-
-	# Install main files and basic documentation
-	exeinto '/usr/share/i2p'
-	insinto '/usr/share/i2p'
-	doins blocklist.txt hosts.txt *.config
-	doexe eepget i2prouter runplain.sh
-	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
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Patrice Clement]

commit:     b822fb9edf12ef4cfdfe3ad8315fd2c06120cf2b
Author:     tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Aug 25 17:33:19 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Sep  7 08:23:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b822fb9e

net-vpn/i2p: bump to 0.9.36.

 net-vpn/i2p/Manifest          |   1 +
 net-vpn/i2p/i2p-0.9.36.ebuild | 140 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index bbc0a793c3f..7c6fb46abad 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,3 +1,4 @@
 DIST i2psource_0.9.31.tar.bz2 28745769 BLAKE2B e7766eceffb44c7c40ce176c3d98ed9a62472058c90adf1b07bbab11628d6ca4c8c62ca52526a204a6e8f47a182a59e07ccbdef65b6d2c5122d8e64e1df75406 SHA512 ffeb74d02c783febc122580b64561722de04c903e2d33fdeaf74bf3b7d725b8b7ce6556f53a12f0ae0d6c6deb413839e222bc2b8093952e5ecaf1bf96f0d1103
 DIST i2psource_0.9.33.tar.bz2 28985659 BLAKE2B 51b9697271c506de8d34b42ff208a12c9f0409c9aff456aa928dc2d411aceb0473878e9ed0d6ccf3684a7432c64700eec798535b4a4f4e01a2297e3d3ef7603a SHA512 ad772a422923636731350e590a14631209503c3d82db32410cb3002c790c60f9f7d950f94bb4d65ced1c2126e67a92ad65e9cd65ae3f045fc5279f57217066e2
 DIST i2psource_0.9.34.tar.bz2 29332692 BLAKE2B 16b15ac2c7eaa594fc6398105d7e22442fafc4036a54a66c91b3ca9bd98095a9192ae5c28123882ddc6acc7c68fb5eeed3ef1ed632a4b4b96a1abe28dff2286c SHA512 71c80710098ead34c159c6a6873c397048afc76974917e7b65d7846203900ab8bfb4840fec3c7d09ade48e93329b06ec33d9f367dae33a4708b4ea14268beefa
+DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4

diff --git a/net-vpn/i2p/i2p-0.9.36.ebuild b/net-vpn/i2p/i2p-0.9.36.ebuild
new file mode 100644
index 00000000000..5bedf3debbf
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.36.ebuild
@@ -0,0 +1,140 @@
+# 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
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Michał Górny]

commit:     f5e8572fb5453380fab4c2cd26bb3026f850c196
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Oct 13 05:24:07 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 10:33:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5e8572f

net-vpn/i2p: use real name of maintainer

Package-Manager: Portage-2.3.49, Repoman-2.3.11
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/10131

 net-vpn/i2p/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/i2p/metadata.xml b/net-vpn/i2p/metadata.xml
index f7a6c323e6c..71d052d100f 100644
--- a/net-vpn/i2p/metadata.xml
+++ b/net-vpn/i2p/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <maintainer type="person">
 	<email>tharvik@gmail.com</email>
-	<name>Tharvik</name>
+	<name>Valérian Rousset</name>
 </maintainer>
 <maintainer type="project">
 	<email>java@gentoo.org</email>

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Michał Górny]

commit:     4d2a3f793876004d3d861650526334ac4fed4534
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Oct 12 11:53:05 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 10:33:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d2a3f79

net-vpn/i2p: drop old 0.9.34

Package-Manager: Portage-2.3.49, Repoman-2.3.11
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-vpn/i2p/Manifest          |   1 -
 net-vpn/i2p/i2p-0.9.34.ebuild | 138 ------------------------------------------
 2 files changed, 139 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 2b1d3223e69..f447a136f4c 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,3 +1,2 @@
-DIST i2psource_0.9.34.tar.bz2 29332692 BLAKE2B 16b15ac2c7eaa594fc6398105d7e22442fafc4036a54a66c91b3ca9bd98095a9192ae5c28123882ddc6acc7c68fb5eeed3ef1ed632a4b4b96a1abe28dff2286c SHA512 71c80710098ead34c159c6a6873c397048afc76974917e7b65d7846203900ab8bfb4840fec3c7d09ade48e93329b06ec33d9f367dae33a4708b4ea14268beefa
 DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
 DIST i2psource_0.9.37.tar.bz2 30277506 BLAKE2B 2c0fe601b3a8967c23f00bd29aef197389039efbf1a3fc0847f819dea44f98e38b9b53b749763dccca740a50d467d5d079b0e4aad707347cc7c7a576fcc44407 SHA512 ce0d320810faaebe2926d988a40f4df968583edbc488b995a32cfd806550a8cf75d2c2397bfd9f3fd443cb462567cc2cdbf08d1de59b6806888724254faebf09

diff --git a/net-vpn/i2p/i2p-0.9.34.ebuild b/net-vpn/i2p/i2p-0.9.34.ebuild
deleted file mode 100644
index ea2983ad0cd..00000000000
--- a/net-vpn/i2p/i2p-0.9.34.ebuild
+++ /dev/null
@@ -1,138 +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 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:*
-	dev-libs/gmp:0
-	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 )"
-
-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|" \
-		-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} || \
-		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
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Michał Górny]

commit:     b9693faa10004e50fd665e34c94e97e85cb7f6fd
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Apr 17 16:23:20 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 10:08:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9693faa

net-vpn/i2p: bump to 0.9.39

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-vpn/i2p/Manifest          |   1 +
 net-vpn/i2p/i2p-0.9.39.ebuild | 157 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 158 insertions(+)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index df84846b426..8443cbbb6d3 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,3 +1,4 @@
 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
+DIST i2psource_0.9.39.tar.bz2 30518064 BLAKE2B da5f4f74db38e932a8d1504dd454f308b6a47e0b308ecb646aafc349c20696d5f18107b393a7a5c3e5a7a24c1f2463657ede1ae6629023d9f817cc5bf0b00d85 SHA512 03ae294a2dbb1c7267484e8b0700ea112820e767ce7e90bc50dc90a1ed621586bd507c6ea80ba177d3498c0959fc1c9d71b51821d527fa48c34847ffbf5c466c

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 00000000000..f9b032fe110
--- /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'
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Michał Górny]

commit:     c971e04935ba2a2e1c8a0680408e7f605a620ba8
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Mon May 20 20:30:53 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 08:54:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c971e049

net-vpn/i2p: drop old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/12064
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-vpn/i2p/Manifest          |   1 -
 net-vpn/i2p/i2p-0.9.38.ebuild | 161 ------------------------------------------
 2 files changed, 162 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 5a93396d265..5220fda265b 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,3 +1,2 @@
-DIST i2psource_0.9.38.tar.bz2 30702106 BLAKE2B c0fd4ea21643edff06853825b9b09dbd648176b6a2318c6bb3846b7c198cac88f89525df0868affbc337e31ec3459f08235cd8a52d38b8551d235c9ef2ca4a4c SHA512 148cd1504dbf0a86367b6dc120a27b2d0d936857eb8cf524e86982d6499c5a831a40aacb3ed67570ad2c323be6545e9a66c12dfc4be2377b80f4d7152e04452d
 DIST i2psource_0.9.39.tar.bz2 30518064 BLAKE2B da5f4f74db38e932a8d1504dd454f308b6a47e0b308ecb646aafc349c20696d5f18107b393a7a5c3e5a7a24c1f2463657ede1ae6629023d9f817cc5bf0b00d85 SHA512 03ae294a2dbb1c7267484e8b0700ea112820e767ce7e90bc50dc90a1ed621586bd507c6ea80ba177d3498c0959fc1c9d71b51821d527fa48c34847ffbf5c466c
 DIST i2psource_0.9.40.tar.bz2 30808508 BLAKE2B b4b81800c4fdcd1c9318e884d6a06f442c28cc902c1aa67a35343b3d61cf95a02186b8e56e455d3896de081d44fd9fa7c2fac1f21f176be3c0b1ca473b6416fa SHA512 297b0bf92405c6e564c5e8c9708bf5b99b8eac721cec04fc74bebac1ff0cd7eae2795cc9788357fb7a9c60d7af37766ae343456203a81b9c2444cda39f3fe46d

diff --git a/net-vpn/i2p/i2p-0.9.38.ebuild b/net-vpn/i2p/i2p-0.9.38.ebuild
deleted file mode 100644
index 396878e979b..00000000000
--- a/net-vpn/i2p/i2p-0.9.38.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# 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"
-
-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'
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Michał Górny]

commit:     fbbb435b16dd29a3c85b418a61d08918cc2a5bd3
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Mon May 20 20:29:32 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 08:54:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbbb435b

net-vpn/i2p: bump to 0.9.40

Closes: https://bugs.gentoo.org/686180
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-vpn/i2p/Manifest          |   1 +
 net-vpn/i2p/i2p-0.9.40.ebuild | 157 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 158 insertions(+)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 07694666fec..5a93396d265 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1,3 @@
 DIST i2psource_0.9.38.tar.bz2 30702106 BLAKE2B c0fd4ea21643edff06853825b9b09dbd648176b6a2318c6bb3846b7c198cac88f89525df0868affbc337e31ec3459f08235cd8a52d38b8551d235c9ef2ca4a4c SHA512 148cd1504dbf0a86367b6dc120a27b2d0d936857eb8cf524e86982d6499c5a831a40aacb3ed67570ad2c323be6545e9a66c12dfc4be2377b80f4d7152e04452d
 DIST i2psource_0.9.39.tar.bz2 30518064 BLAKE2B da5f4f74db38e932a8d1504dd454f308b6a47e0b308ecb646aafc349c20696d5f18107b393a7a5c3e5a7a24c1f2463657ede1ae6629023d9f817cc5bf0b00d85 SHA512 03ae294a2dbb1c7267484e8b0700ea112820e767ce7e90bc50dc90a1ed621586bd507c6ea80ba177d3498c0959fc1c9d71b51821d527fa48c34847ffbf5c466c
+DIST i2psource_0.9.40.tar.bz2 30808508 BLAKE2B b4b81800c4fdcd1c9318e884d6a06f442c28cc902c1aa67a35343b3d61cf95a02186b8e56e455d3896de081d44fd9fa7c2fac1f21f176be3c0b1ca473b6416fa SHA512 297b0bf92405c6e564c5e8c9708bf5b99b8eac721cec04fc74bebac1ff0cd7eae2795cc9788357fb7a9c60d7af37766ae343456203a81b9c2444cda39f3fe46d

diff --git a/net-vpn/i2p/i2p-0.9.40.ebuild b/net-vpn/i2p/i2p-0.9.40.ebuild
new file mode 100644
index 00000000000..f9b032fe110
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.40.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'
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Joonas Niilola]

commit:     85905b5378c7bf8b4179d61b9afcb307990208a1
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Aug 24 06:59:58 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 05:46:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85905b53

net-vpn/i2p: drop 0.9.39

Package-Manager: Portage-2.3.69, Repoman-2.3.16
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.39.ebuild | 157 ------------------------------------------
 2 files changed, 158 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 12d424f1f91..9189f0cf392 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,3 +1,2 @@
-DIST i2psource_0.9.39.tar.bz2 30518064 BLAKE2B da5f4f74db38e932a8d1504dd454f308b6a47e0b308ecb646aafc349c20696d5f18107b393a7a5c3e5a7a24c1f2463657ede1ae6629023d9f817cc5bf0b00d85 SHA512 03ae294a2dbb1c7267484e8b0700ea112820e767ce7e90bc50dc90a1ed621586bd507c6ea80ba177d3498c0959fc1c9d71b51821d527fa48c34847ffbf5c466c
 DIST i2psource_0.9.40.tar.bz2 30808508 BLAKE2B b4b81800c4fdcd1c9318e884d6a06f442c28cc902c1aa67a35343b3d61cf95a02186b8e56e455d3896de081d44fd9fa7c2fac1f21f176be3c0b1ca473b6416fa SHA512 297b0bf92405c6e564c5e8c9708bf5b99b8eac721cec04fc74bebac1ff0cd7eae2795cc9788357fb7a9c60d7af37766ae343456203a81b9c2444cda39f3fe46d
 DIST i2psource_0.9.42.tar.bz2 31523717 BLAKE2B 7f110f282a91fa0de700bfaee95968bb534f6f2c7d097c2d70fc9e6bda3ac583762b6b974b38b5947b15a77f91a8d595c957b35838456280236cd88c25d3d47b SHA512 bf8d83c1b1607f5ecf16d33d16cc760eb982d65ef0f89ebd5c61208a38a23f08f465e04889b8ef1d05df4d02a095d85a80077a5b10253d96023f056d01efacef

diff --git a/net-vpn/i2p/i2p-0.9.39.ebuild b/net-vpn/i2p/i2p-0.9.39.ebuild
deleted file mode 100644
index f9b032fe110..00000000000
--- a/net-vpn/i2p/i2p-0.9.39.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# 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'
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Joonas Niilola]

commit:     4ceea44cd09d97dac2703bbab65902750958d846
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Dec  7 21:39:35 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 15:40:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ceea44c

net-vpn/i2p: drop 0.9.40

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/13911
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-vpn/i2p/Manifest          |   1 -
 net-vpn/i2p/i2p-0.9.40.ebuild | 158 ------------------------------------------
 2 files changed, 159 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 71cda855722..1c6d43b5fe5 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,3 +1,2 @@
-DIST i2psource_0.9.40.tar.bz2 30808508 BLAKE2B b4b81800c4fdcd1c9318e884d6a06f442c28cc902c1aa67a35343b3d61cf95a02186b8e56e455d3896de081d44fd9fa7c2fac1f21f176be3c0b1ca473b6416fa SHA512 297b0bf92405c6e564c5e8c9708bf5b99b8eac721cec04fc74bebac1ff0cd7eae2795cc9788357fb7a9c60d7af37766ae343456203a81b9c2444cda39f3fe46d
 DIST i2psource_0.9.42.tar.bz2 31523717 BLAKE2B 7f110f282a91fa0de700bfaee95968bb534f6f2c7d097c2d70fc9e6bda3ac583762b6b974b38b5947b15a77f91a8d595c957b35838456280236cd88c25d3d47b SHA512 bf8d83c1b1607f5ecf16d33d16cc760eb982d65ef0f89ebd5c61208a38a23f08f465e04889b8ef1d05df4d02a095d85a80077a5b10253d96023f056d01efacef
 DIST i2psource_0.9.44.tar.bz2 32016076 BLAKE2B 5803935cdebd18af48c4f00232cbbae02979c5ccebb68a4bddeb9cf60b6d02b734b72075ac7f9a57713f48cfd2bc0d14598e35df4ff7cdd590be57c68f5737b4 SHA512 a98129dde7d467e77ee37d16f9add3a0a4e602da84e1133c1b4b787133f185ad834cb1c52857e54946e424bd73a56200e48d6cd96856c87c748f53ca26af922e

diff --git a/net-vpn/i2p/i2p-0.9.40.ebuild b/net-vpn/i2p/i2p-0.9.40.ebuild
deleted file mode 100644
index 5ec499b0567..00000000000
--- a/net-vpn/i2p/i2p-0.9.40.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# 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'
-RESTRICT="!test? ( 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'
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Joonas Niilola]

commit:     62f4ad3b84043129401f8e394f2e544acf683684
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Dec  7 21:38:36 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 15:40:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f4ad3b

net-vpn/i2p: bump to 0.9.44

Closes: https://bugs.gentoo.org/702160
Package-Manager: Portage-2.3.79, Repoman-2.3.16
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.44.ebuild | 213 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 214 insertions(+)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 9189f0cf392..71cda855722 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1,3 @@
 DIST i2psource_0.9.40.tar.bz2 30808508 BLAKE2B b4b81800c4fdcd1c9318e884d6a06f442c28cc902c1aa67a35343b3d61cf95a02186b8e56e455d3896de081d44fd9fa7c2fac1f21f176be3c0b1ca473b6416fa SHA512 297b0bf92405c6e564c5e8c9708bf5b99b8eac721cec04fc74bebac1ff0cd7eae2795cc9788357fb7a9c60d7af37766ae343456203a81b9c2444cda39f3fe46d
 DIST i2psource_0.9.42.tar.bz2 31523717 BLAKE2B 7f110f282a91fa0de700bfaee95968bb534f6f2c7d097c2d70fc9e6bda3ac583762b6b974b38b5947b15a77f91a8d595c957b35838456280236cd88c25d3d47b SHA512 bf8d83c1b1607f5ecf16d33d16cc760eb982d65ef0f89ebd5c61208a38a23f08f465e04889b8ef1d05df4d02a095d85a80077a5b10253d96023f056d01efacef
+DIST i2psource_0.9.44.tar.bz2 32016076 BLAKE2B 5803935cdebd18af48c4f00232cbbae02979c5ccebb68a4bddeb9cf60b6d02b734b72075ac7f9a57713f48cfd2bc0d14598e35df4ff7cdd590be57c68f5737b4 SHA512 a98129dde7d467e77ee37d16f9add3a0a4e602da84e1133c1b4b787133f185ad834cb1c52857e54946e424bd73a56200e48d6cd96856c87c748f53ca26af922e

diff --git a/net-vpn/i2p/i2p-0.9.44.ebuild b/net-vpn/i2p/i2p-0.9.44.ebuild
new file mode 100644
index 00000000000..ae09784ef1b
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.44.ebuild
@@ -0,0 +1,213 @@
+# 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
+COMMON_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="${COMMON_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="${COMMON_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/{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 log
+	keepdir /var/log/i2p
+	fowners i2p:i2p /var/log/i2p
+
+	# setup user
+	keepdir /var/lib/i2p
+	keepdir /var/lib/i2p/app
+	keepdir /var/lib/i2p/router
+	keepdir /var/lib/i2p/config
+	fowners i2p:i2p /var/lib/i2p
+}
+
+pkg_postinst() {
+	local old_i2pdir="${EPREFIX}/var/lib/i2p/.i2p" new_i2pdir="${EPREFIX}/var/lib/i2p"
+
+	[ -e "${old_i2pdir}" ] || return
+
+	elog "User is now delegated to acct-user, ${new_i2pdir} is split"
+	elog "into subdirs. It will now try to split ${old_i2pdir} accordingly."
+
+	migrate() {
+		local dest="${1}"
+		shift
+
+		local ret=true
+		for src
+		do
+			[ -e "${src}" ] || continue
+			mv "${src}" "${dest}" || ret=false
+		done
+
+		$ret
+	}
+
+	ebegin "Migrating"
+	local ret=0
+	chown -R i2p:i2p "${EPREFIX}/var/lib/i2p" || ret=1
+	migrate "${new_i2pdir}/app" "${old_i2pdir}/i2psnark" || ret=1
+	migrate "${new_i2pdir}/config" \
+		"${old_i2pdir}/"{docs,eepsite,hosts.txt,prngseed.rnd,*.config*} ||
+		ret=1
+	migrate "${new_i2pdir}/router" \
+		"${old_i2pdir}/"{addressbook,eventlog.txt,hostsdb.blockfile,keyBackup,netDb,peerProfiles,router.*,rrd} ||
+		ret=1
+	migrate "${EPREFIX}/var/log/i2p" "${old_i2pdir}/"{logs/*,wrapper.log*} ||
+		ret=1
+	rm -fr "${old_i2pdir}/"{hostsdb.blockfile.*.corrupt,logs}
+	rmdir "${old_i2pdir}" || ret=1
+
+	if ! eend $ret
+	then
+		ewarn "There was some file remaining in ${old_i2pdir}."
+		ewarn "Please check it there is something of value there."
+		ewarn "remove it when migration is done."
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Joonas Niilola]

commit:     967fab266a2942f3c6d068b8c43b92bbb5a9ee2f
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 05:46:32 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 05:48:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=967fab26

net-vpn/i2p: adhere to java-utils-2.eclass with 0.9.44

Closes: https://bugs.gentoo.org/705520
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-vpn/i2p/{i2p-0.9.44.ebuild => i2p-0.9.44-r1.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-vpn/i2p/i2p-0.9.44.ebuild b/net-vpn/i2p/i2p-0.9.44-r1.ebuild
similarity index 98%
rename from net-vpn/i2p/i2p-0.9.44.ebuild
rename to net-vpn/i2p/i2p-0.9.44-r1.ebuild
index ae09784ef1b..dd7373b40f1 100644
--- a/net-vpn/i2p/i2p-0.9.44.ebuild
+++ b/net-vpn/i2p/i2p-0.9.44-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="nls test"
 RESTRICT="!test? ( test )"
 
 # dev-java/ant-core is automatically added due to java-ant-2.eclass
-COMMON_DEPEND="
+CP_DEPEND="
 	dev-java/bcprov:1.50
 	dev-java/jrobin:0
 	dev-java/slf4j-api:0
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 	java-virtuals/servlet-api:3.1
 "
 
-DEPEND="${COMMON_DEPEND}
+DEPEND="${CP_DEPEND}
 	dev-java/eclipse-ecj:*
 	nls? ( >=sys-devel/gettext-0.19 )
 	virtual/jdk:1.8
@@ -42,7 +42,7 @@ DEPEND="${COMMON_DEPEND}
 	)
 "
 
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${CP_DEPEND}
 	acct-user/i2p
 	acct-group/i2p
 	virtual/jre:1.8

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Joonas Niilola]

commit:     6b17c7258dd2586022f9c5551d502d4870d38530
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Jan 25 17:25:29 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jan 29 06:14:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b17c725

net-vpn/i2p: avoid unecessary keepdir

Closes: https://bugs.gentoo.org/705746
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/14442
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-vpn/i2p/{i2p-0.9.44-r1.ebuild => i2p-0.9.44-r2.ebuild} | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/net-vpn/i2p/i2p-0.9.44-r1.ebuild b/net-vpn/i2p/i2p-0.9.44-r2.ebuild
similarity index 98%
rename from net-vpn/i2p/i2p-0.9.44-r1.ebuild
rename to net-vpn/i2p/i2p-0.9.44-r2.ebuild
index dd7373b40f1..8949446a266 100644
--- a/net-vpn/i2p/i2p-0.9.44-r1.ebuild
+++ b/net-vpn/i2p/i2p-0.9.44-r2.ebuild
@@ -161,9 +161,6 @@ src_install() {
 
 	# setup user
 	keepdir /var/lib/i2p
-	keepdir /var/lib/i2p/app
-	keepdir /var/lib/i2p/router
-	keepdir /var/lib/i2p/config
 	fowners i2p:i2p /var/lib/i2p
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Joonas Niilola]

commit:     ec0c94617cfb93bbd35f5991d77afeec1cf555da
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Mar 21 14:45:36 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 16:12:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec0c9461

net-vpn/i2p: drop 0.9.42

Package-Manager: Portage-2.3.89, Repoman-2.3.20
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.42.ebuild | 213 ------------------------------------------
 2 files changed, 214 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 59d71ad1176..21a9f3ef153 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,3 +1,2 @@
-DIST i2psource_0.9.42.tar.bz2 31523717 BLAKE2B 7f110f282a91fa0de700bfaee95968bb534f6f2c7d097c2d70fc9e6bda3ac583762b6b974b38b5947b15a77f91a8d595c957b35838456280236cd88c25d3d47b SHA512 bf8d83c1b1607f5ecf16d33d16cc760eb982d65ef0f89ebd5c61208a38a23f08f465e04889b8ef1d05df4d02a095d85a80077a5b10253d96023f056d01efacef
 DIST i2psource_0.9.44.tar.bz2 32016076 BLAKE2B 5803935cdebd18af48c4f00232cbbae02979c5ccebb68a4bddeb9cf60b6d02b734b72075ac7f9a57713f48cfd2bc0d14598e35df4ff7cdd590be57c68f5737b4 SHA512 a98129dde7d467e77ee37d16f9add3a0a4e602da84e1133c1b4b787133f185ad834cb1c52857e54946e424bd73a56200e48d6cd96856c87c748f53ca26af922e
 DIST i2psource_0.9.45.tar.bz2 31921025 BLAKE2B 2d37777f77784ff93de4d7442eddf46b9a541902412bf5fb24cf96baba73851cc17d01649a7b4b41a710ccde5690036a890b8f84de00f4c615ed2e23da8fa510 SHA512 d4cf354f0a807d132fae75d4bad3e2e788e1ed03d6f625feb0f1369bb2c9e1a6e2758645acf2017c61dbc47d75e6d834b87455adbead1077f206025686548ae9

diff --git a/net-vpn/i2p/i2p-0.9.42.ebuild b/net-vpn/i2p/i2p-0.9.42.ebuild
deleted file mode 100644
index 01cba74bdfb..00000000000
--- a/net-vpn/i2p/i2p-0.9.42.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2019 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/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}
-	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() {
-	# 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
-
-	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 log
-	keepdir /var/log/i2p
-	fowners i2p:i2p /var/log/i2p
-
-	# setup user
-	keepdir /var/lib/i2p
-	keepdir /var/lib/i2p/app
-	keepdir /var/lib/i2p/router
-	keepdir /var/lib/i2p/config
-	fowners i2p:i2p /var/lib/i2p
-}
-
-pkg_postinst() {
-	local old_i2pdir="${EPREFIX}/var/lib/i2p/.i2p" new_i2pdir="${EPREFIX}/var/lib/i2p"
-
-	[ -e "${old_i2pdir}" ] || return
-
-	elog "User is now delegated to acct-user, ${new_i2pdir} is split"
-	elog "into subdirs. It will now try to split ${old_i2pdir} accordingly."
-
-	migrate() {
-		local dest="${1}"
-		shift
-
-		local ret=true
-		for src
-		do
-			[ -e "${src}" ] || continue
-			mv "${src}" "${dest}" || ret=false
-		done
-
-		$ret
-	}
-
-	ebegin "Migrating"
-	local ret=0
-	chown -R i2p:i2p "${EPREFIX}/var/lib/i2p" || ret=1
-	migrate "${new_i2pdir}/app" "${old_i2pdir}/i2psnark" || ret=1
-	migrate "${new_i2pdir}/config" \
-		"${old_i2pdir}/"{docs,eepsite,hosts.txt,prngseed.rnd,*.config*} ||
-		ret=1
-	migrate "${new_i2pdir}/router" \
-		"${old_i2pdir}/"{addressbook,eventlog.txt,hostsdb.blockfile,keyBackup,netDb,peerProfiles,router.*,rrd} ||
-		ret=1
-	migrate "${EPREFIX}/var/log/i2p" "${old_i2pdir}/"{logs/*,wrapper.log*} ||
-		ret=1
-	rm -fr "${old_i2pdir}/"{hostsdb.blockfile.*.corrupt,logs}
-	rmdir "${old_i2pdir}" || ret=1
-
-	if ! eend $ret
-	then
-		ewarn "There was some file remaining in ${old_i2pdir}."
-		ewarn "Please check it there is something of value there."
-		ewarn "remove it when migration is done."
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Joonas Niilola]

commit:     9944b05d3962da7fac641e8d8edac9177b2ae5a9
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Mar 21 14:44:15 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 16:12:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9944b05d

net-vpn/i2p: bump to 0.9.45

Package-Manager: Portage-2.3.89, Repoman-2.3.20
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.45.ebuild | 210 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 211 insertions(+)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 1c6d43b5fe5..59d71ad1176 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1,3 @@
 DIST i2psource_0.9.42.tar.bz2 31523717 BLAKE2B 7f110f282a91fa0de700bfaee95968bb534f6f2c7d097c2d70fc9e6bda3ac583762b6b974b38b5947b15a77f91a8d595c957b35838456280236cd88c25d3d47b SHA512 bf8d83c1b1607f5ecf16d33d16cc760eb982d65ef0f89ebd5c61208a38a23f08f465e04889b8ef1d05df4d02a095d85a80077a5b10253d96023f056d01efacef
 DIST i2psource_0.9.44.tar.bz2 32016076 BLAKE2B 5803935cdebd18af48c4f00232cbbae02979c5ccebb68a4bddeb9cf60b6d02b734b72075ac7f9a57713f48cfd2bc0d14598e35df4ff7cdd590be57c68f5737b4 SHA512 a98129dde7d467e77ee37d16f9add3a0a4e602da84e1133c1b4b787133f185ad834cb1c52857e54946e424bd73a56200e48d6cd96856c87c748f53ca26af922e
+DIST i2psource_0.9.45.tar.bz2 31921025 BLAKE2B 2d37777f77784ff93de4d7442eddf46b9a541902412bf5fb24cf96baba73851cc17d01649a7b4b41a710ccde5690036a890b8f84de00f4c615ed2e23da8fa510 SHA512 d4cf354f0a807d132fae75d4bad3e2e788e1ed03d6f625feb0f1369bb2c9e1a6e2758645acf2017c61dbc47d75e6d834b87455adbead1077f206025686548ae9

diff --git a/net-vpn/i2p/i2p-0.9.45.ebuild b/net-vpn/i2p/i2p-0.9.45.ebuild
new file mode 100644
index 00000000000..8949446a266
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.45.ebuild
@@ -0,0 +1,210 @@
+# 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/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}
+	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/{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 log
+	keepdir /var/log/i2p
+	fowners i2p:i2p /var/log/i2p
+
+	# setup user
+	keepdir /var/lib/i2p
+	fowners i2p:i2p /var/lib/i2p
+}
+
+pkg_postinst() {
+	local old_i2pdir="${EPREFIX}/var/lib/i2p/.i2p" new_i2pdir="${EPREFIX}/var/lib/i2p"
+
+	[ -e "${old_i2pdir}" ] || return
+
+	elog "User is now delegated to acct-user, ${new_i2pdir} is split"
+	elog "into subdirs. It will now try to split ${old_i2pdir} accordingly."
+
+	migrate() {
+		local dest="${1}"
+		shift
+
+		local ret=true
+		for src
+		do
+			[ -e "${src}" ] || continue
+			mv "${src}" "${dest}" || ret=false
+		done
+
+		$ret
+	}
+
+	ebegin "Migrating"
+	local ret=0
+	chown -R i2p:i2p "${EPREFIX}/var/lib/i2p" || ret=1
+	migrate "${new_i2pdir}/app" "${old_i2pdir}/i2psnark" || ret=1
+	migrate "${new_i2pdir}/config" \
+		"${old_i2pdir}/"{docs,eepsite,hosts.txt,prngseed.rnd,*.config*} ||
+		ret=1
+	migrate "${new_i2pdir}/router" \
+		"${old_i2pdir}/"{addressbook,eventlog.txt,hostsdb.blockfile,keyBackup,netDb,peerProfiles,router.*,rrd} ||
+		ret=1
+	migrate "${EPREFIX}/var/log/i2p" "${old_i2pdir}/"{logs/*,wrapper.log*} ||
+		ret=1
+	rm -fr "${old_i2pdir}/"{hostsdb.blockfile.*.corrupt,logs}
+	rmdir "${old_i2pdir}" || ret=1
+
+	if ! eend $ret
+	then
+		ewarn "There was some file remaining in ${old_i2pdir}."
+		ewarn "Please check it there is something of value there."
+		ewarn "remove it when migration is done."
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Sam James]

commit:     0387502ae04cc8efd621e86a8cec452c3daf68b2
Author:     tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Mon Aug 31 22:59:29 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 00:43:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0387502a

net-vpn/i2p: drop 0.9.44

Package-Manager: Portage-3.0.4, Repoman-2.3.23
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.44-r2.ebuild | 210 ---------------------------------------
 2 files changed, 211 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 205dfbe00af..cfc3977e98a 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,3 +1,2 @@
-DIST i2psource_0.9.44.tar.bz2 32016076 BLAKE2B 5803935cdebd18af48c4f00232cbbae02979c5ccebb68a4bddeb9cf60b6d02b734b72075ac7f9a57713f48cfd2bc0d14598e35df4ff7cdd590be57c68f5737b4 SHA512 a98129dde7d467e77ee37d16f9add3a0a4e602da84e1133c1b4b787133f185ad834cb1c52857e54946e424bd73a56200e48d6cd96856c87c748f53ca26af922e
 DIST i2psource_0.9.45.tar.bz2 31921025 BLAKE2B 2d37777f77784ff93de4d7442eddf46b9a541902412bf5fb24cf96baba73851cc17d01649a7b4b41a710ccde5690036a890b8f84de00f4c615ed2e23da8fa510 SHA512 d4cf354f0a807d132fae75d4bad3e2e788e1ed03d6f625feb0f1369bb2c9e1a6e2758645acf2017c61dbc47d75e6d834b87455adbead1077f206025686548ae9
 DIST i2psource_0.9.47.tar.bz2 32488438 BLAKE2B e1544475dad526e242570918c1bb967a4b713567e71201e08b73c8995743a68396b5951f477bfe8830927c0cdf7e991a25a1978d4aaf88cae3e4218ba57a8818 SHA512 7fdd9ab0b3e81aa89e73be6fa172d723c2b5a67365116a1e0e0ec948067fe4f58e3ad946a0ef4605602c0d803b98e37b2d5692a39a14cf7433d546ada204cbc9

diff --git a/net-vpn/i2p/i2p-0.9.44-r2.ebuild b/net-vpn/i2p/i2p-0.9.44-r2.ebuild
deleted file mode 100644
index 8949446a266..00000000000
--- a/net-vpn/i2p/i2p-0.9.44-r2.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# 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/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}
-	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/{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 log
-	keepdir /var/log/i2p
-	fowners i2p:i2p /var/log/i2p
-
-	# setup user
-	keepdir /var/lib/i2p
-	fowners i2p:i2p /var/lib/i2p
-}
-
-pkg_postinst() {
-	local old_i2pdir="${EPREFIX}/var/lib/i2p/.i2p" new_i2pdir="${EPREFIX}/var/lib/i2p"
-
-	[ -e "${old_i2pdir}" ] || return
-
-	elog "User is now delegated to acct-user, ${new_i2pdir} is split"
-	elog "into subdirs. It will now try to split ${old_i2pdir} accordingly."
-
-	migrate() {
-		local dest="${1}"
-		shift
-
-		local ret=true
-		for src
-		do
-			[ -e "${src}" ] || continue
-			mv "${src}" "${dest}" || ret=false
-		done
-
-		$ret
-	}
-
-	ebegin "Migrating"
-	local ret=0
-	chown -R i2p:i2p "${EPREFIX}/var/lib/i2p" || ret=1
-	migrate "${new_i2pdir}/app" "${old_i2pdir}/i2psnark" || ret=1
-	migrate "${new_i2pdir}/config" \
-		"${old_i2pdir}/"{docs,eepsite,hosts.txt,prngseed.rnd,*.config*} ||
-		ret=1
-	migrate "${new_i2pdir}/router" \
-		"${old_i2pdir}/"{addressbook,eventlog.txt,hostsdb.blockfile,keyBackup,netDb,peerProfiles,router.*,rrd} ||
-		ret=1
-	migrate "${EPREFIX}/var/log/i2p" "${old_i2pdir}/"{logs/*,wrapper.log*} ||
-		ret=1
-	rm -fr "${old_i2pdir}/"{hostsdb.blockfile.*.corrupt,logs}
-	rmdir "${old_i2pdir}" || ret=1
-
-	if ! eend $ret
-	then
-		ewarn "There was some file remaining in ${old_i2pdir}."
-		ewarn "Please check it there is something of value there."
-		ewarn "remove it when migration is done."
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Joonas Niilola]

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
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Joonas Niilola]

commit:     743d71b44d9444abc50e20abe5e103d4bdd2e86a
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sun Dec  6 23:33:10 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=743d71b4

net-vpn/i2p: drop 0.9.45

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.45.ebuild | 210 ------------------------------------------
 2 files changed, 211 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 83886cdee05..bf0384c8731 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,3 +1,2 @@
-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.45.ebuild b/net-vpn/i2p/i2p-0.9.45.ebuild
deleted file mode 100644
index 8949446a266..00000000000
--- a/net-vpn/i2p/i2p-0.9.45.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# 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/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}
-	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/{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 log
-	keepdir /var/log/i2p
-	fowners i2p:i2p /var/log/i2p
-
-	# setup user
-	keepdir /var/lib/i2p
-	fowners i2p:i2p /var/lib/i2p
-}
-
-pkg_postinst() {
-	local old_i2pdir="${EPREFIX}/var/lib/i2p/.i2p" new_i2pdir="${EPREFIX}/var/lib/i2p"
-
-	[ -e "${old_i2pdir}" ] || return
-
-	elog "User is now delegated to acct-user, ${new_i2pdir} is split"
-	elog "into subdirs. It will now try to split ${old_i2pdir} accordingly."
-
-	migrate() {
-		local dest="${1}"
-		shift
-
-		local ret=true
-		for src
-		do
-			[ -e "${src}" ] || continue
-			mv "${src}" "${dest}" || ret=false
-		done
-
-		$ret
-	}
-
-	ebegin "Migrating"
-	local ret=0
-	chown -R i2p:i2p "${EPREFIX}/var/lib/i2p" || ret=1
-	migrate "${new_i2pdir}/app" "${old_i2pdir}/i2psnark" || ret=1
-	migrate "${new_i2pdir}/config" \
-		"${old_i2pdir}/"{docs,eepsite,hosts.txt,prngseed.rnd,*.config*} ||
-		ret=1
-	migrate "${new_i2pdir}/router" \
-		"${old_i2pdir}/"{addressbook,eventlog.txt,hostsdb.blockfile,keyBackup,netDb,peerProfiles,router.*,rrd} ||
-		ret=1
-	migrate "${EPREFIX}/var/log/i2p" "${old_i2pdir}/"{logs/*,wrapper.log*} ||
-		ret=1
-	rm -fr "${old_i2pdir}/"{hostsdb.blockfile.*.corrupt,logs}
-	rmdir "${old_i2pdir}" || ret=1
-
-	if ! eend $ret
-	then
-		ewarn "There was some file remaining in ${old_i2pdir}."
-		ewarn "Please check it there is something of value there."
-		ewarn "remove it when migration is done."
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Miroslav Šulc]

commit:     bb03a17bbcc1400a7db08ff120c8fe4fe66864a1
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Jun  6 18:20:02 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jun  7 08:52:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb03a17b

net-vpn/i2p: remove obsolete version

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 net-vpn/i2p/Manifest          |   1 -
 net-vpn/i2p/i2p-0.9.47.ebuild | 214 ------------------------------------------
 2 files changed, 215 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index bf0384c8731..f35773ca085 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1 @@
-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.47.ebuild b/net-vpn/i2p/i2p-0.9.47.ebuild
deleted file mode 100644
index a775e06556d..00000000000
--- a/net-vpn/i2p/i2p-0.9.47.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# 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/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}
-	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"
-
-PATCHES=(
-	"${FILESDIR}/${P}-DataHelper-decompress-fix-length-check.patch"
-)
-
-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/{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 log
-	keepdir /var/log/i2p
-	fowners i2p:i2p /var/log/i2p
-
-	# setup user
-	keepdir /var/lib/i2p
-	fowners i2p:i2p /var/lib/i2p
-}
-
-pkg_postinst() {
-	local old_i2pdir="${EPREFIX}/var/lib/i2p/.i2p" new_i2pdir="${EPREFIX}/var/lib/i2p"
-
-	[ -e "${old_i2pdir}" ] || return
-
-	elog "User is now delegated to acct-user, ${new_i2pdir} is split"
-	elog "into subdirs. It will now try to split ${old_i2pdir} accordingly."
-
-	migrate() {
-		local dest="${1}"
-		shift
-
-		local ret=true
-		for src
-		do
-			[ -e "${src}" ] || continue
-			mv "${src}" "${dest}" || ret=false
-		done
-
-		$ret
-	}
-
-	ebegin "Migrating"
-	local ret=0
-	chown -R i2p:i2p "${EPREFIX}/var/lib/i2p" || ret=1
-	migrate "${new_i2pdir}/app" "${old_i2pdir}/i2psnark" || ret=1
-	migrate "${new_i2pdir}/config" \
-		"${old_i2pdir}/"{docs,eepsite,hosts.txt,prngseed.rnd,*.config*} ||
-		ret=1
-	migrate "${new_i2pdir}/router" \
-		"${old_i2pdir}/"{addressbook,eventlog.txt,hostsdb.blockfile,keyBackup,netDb,peerProfiles,router.*,rrd} ||
-		ret=1
-	migrate "${EPREFIX}/var/log/i2p" "${old_i2pdir}/"{logs/*,wrapper.log*} ||
-		ret=1
-	rm -fr "${old_i2pdir}/"{hostsdb.blockfile.*.corrupt,logs}
-	rmdir "${old_i2pdir}" || ret=1
-
-	if ! eend $ret
-	then
-		ewarn "There was some file remaining in ${old_i2pdir}."
-		ewarn "Please check it there is something of value there."
-		ewarn "remove it when migration is done."
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Sam James]

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
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Sam James]

commit:     61589380700ec86a6a96bf83ea1223426e71ccaf
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sun Dec 12 23:48:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <tharvik <AT> users.noreply.github.com>
Signed-off-by: Sam James <sam <AT> 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
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Sam James]

commit:     1d9d0a5c560c963cf18c1e42c02209cb08639957
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sun Dec 12 23:50:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 05:07:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d9d0a5c

net-vpn/i2p: drop 0.9.48

Package-Manager: Portage-3.0.20, Repoman-3.0.3
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.48.ebuild | 159 ------------------------------------------
 2 files changed, 160 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 655e597d5d36..6516fa15f565 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,3 +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
 DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a

diff --git a/net-vpn/i2p/i2p-0.9.48.ebuild b/net-vpn/i2p/i2p-0.9.48.ebuild
deleted file mode 100644
index 23715c60adf5..000000000000
--- a/net-vpn/i2p/i2p-0.9.48.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# 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
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Joonas Niilola]

commit:     8522aeba12b06d6bef9a0236726c37ba17a4d3d5
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 13:26:50 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 13:26:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8522aeba

net-vpn/i2p: stabilize 1.6.1 for amd64

Bug: https://bugs.gentoo.org/834924
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-vpn/i2p/i2p-1.6.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-vpn/i2p/i2p-1.6.1.ebuild b/net-vpn/i2p/i2p-1.6.1.ebuild
index 56ba991f558a..8f6fe23c678b 100644
--- a/net-vpn/i2p/i2p-1.6.1.ebuild
+++ b/net-vpn/i2p/i2p-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2
 SLOT="0"
 
 # Until the deps reach other arches
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Arthur Zamarin]

commit:     db4c6bdf98f8aef5c86aa86ce134e64b90a45f9a
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 12:00:56 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 12:00:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db4c6bdf

net-vpn/i2p: Keyword 1.6.1 arm, #834926

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-vpn/i2p/i2p-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/i2p/i2p-1.6.1.ebuild b/net-vpn/i2p/i2p-1.6.1.ebuild
index 8f6fe23c678b..4dc99a0cf9e6 100644
--- a/net-vpn/i2p/i2p-1.6.1.ebuild
+++ b/net-vpn/i2p/i2p-1.6.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2
 SLOT="0"
 
 # Until the deps reach other arches
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Florian Schmaus]

commit:     2cfad5dcbb4c64d8dc56d8a1dd5b6d0804060c17
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Feb 23 01:00:20 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue May 24 14:42:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cfad5dc

net-vpn/i2p: drop 0.9.50

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

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

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 881140797814..f1d5b2e50549 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,3 +1,2 @@
-DIST i2psource_0.9.50.tar.bz2 32409456 BLAKE2B 0c45b48ae6e1957b6c5d828757c70489d260fe15276559e5c366c68c10274b9020b2978bf0674a8628638f41b1e269af0c4d35c20c1f0cee419857c0c803dd82 SHA512 2d6b1d3ed4d32af36d0d3b257dca6fad981e3fa0cd3e45b8227e76e57de092c11ff7c239e879739d330ae809bcf6c71640de32de0c52c54ef8597f0c0e1467ec
 DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a
 DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f

diff --git a/net-vpn/i2p/i2p-0.9.50.ebuild b/net-vpn/i2p/i2p-0.9.50.ebuild
deleted file mode 100644
index 3468bcd0dd19..000000000000
--- a/net-vpn/i2p/i2p-0.9.50.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# 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
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Florian Schmaus]

commit:     e81aa8a3def902513230575ca922e2b0f0056840
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Feb 23 00:59:36 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue May 24 14:41:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e81aa8a3

net-vpn/i2p: bump to 1.7.0

Closes: https://bugs.gentoo.org/839093
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-vpn/i2p/Manifest         |   1 +
 net-vpn/i2p/i2p-1.7.0.ebuild | 145 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 6516fa15f565..881140797814 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1,3 @@
 DIST i2psource_0.9.50.tar.bz2 32409456 BLAKE2B 0c45b48ae6e1957b6c5d828757c70489d260fe15276559e5c366c68c10274b9020b2978bf0674a8628638f41b1e269af0c4d35c20c1f0cee419857c0c803dd82 SHA512 2d6b1d3ed4d32af36d0d3b257dca6fad981e3fa0cd3e45b8227e76e57de092c11ff7c239e879739d330ae809bcf6c71640de32de0c52c54ef8597f0c0e1467ec
 DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a
+DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f

diff --git a/net-vpn/i2p/i2p-1.7.0.ebuild b/net-vpn/i2p/i2p-1.7.0.ebuild
new file mode 100644
index 000000000000..edc82ec59148
--- /dev/null
+++ b/net-vpn/i2p/i2p-1.7.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2022 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 ~arm ~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"
+
+DEPEND="${CP_DEPEND}
+	|| (
+		virtual/jdk:1.8
+		virtual/jdk:11
+	)
+	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:4
+	)
+"
+
+RDEPEND="${CP_DEPEND}
+	acct-user/i2p
+	acct-group/i2p
+	net-libs/nativebiginteger:0
+	|| (
+		virtual/jre:1.8
+		virtual/jre:11
+	)
+"
+
+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() {
+	# 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-4)"
+	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
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Agostino Sarubbo]

commit:     26100bd7979ae7e6a6d60b6a86ea3e6d35c2dc30
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 06:17:03 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 06:17:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26100bd7

net-vpn/i2p: amd64 stable wrt bug #857123

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-vpn/i2p/i2p-1.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/i2p/i2p-1.7.0.ebuild b/net-vpn/i2p/i2p-1.7.0.ebuild
index edc82ec59148..9c4491ff3d78 100644
--- a/net-vpn/i2p/i2p-1.7.0.ebuild
+++ b/net-vpn/i2p/i2p-1.7.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2
 SLOT="0"
 
 # Until the deps reach other arches
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Arthur Zamarin]

commit:     03fc13f1bddd7cc67982bb1945d32023cd0061b9
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Jul 10 06:38:14 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 19:15:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03fc13f1

net-vpn/i2p: drop 1.6.1

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-vpn/i2p/Manifest         |   1 -
 net-vpn/i2p/i2p-1.6.1.ebuild | 147 -------------------------------------------
 2 files changed, 148 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index f1d5b2e50549..e215485a9156 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1 @@
-DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a
 DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f

diff --git a/net-vpn/i2p/i2p-1.6.1.ebuild b/net-vpn/i2p/i2p-1.6.1.ebuild
deleted file mode 100644
index 4dc99a0cf9e6..000000000000
--- a/net-vpn/i2p/i2p-1.6.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2022 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 ~arm ~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
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Sam James]

commit:     7e752d6867a26467426aaece788090753ad91d1f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 14:17:16 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 14:17:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e752d68

net-vpn/i2p: add github upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-vpn/i2p/metadata.xml | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/net-vpn/i2p/metadata.xml b/net-vpn/i2p/metadata.xml
index b09a92c7f9c2..4897b7bf0281 100644
--- a/net-vpn/i2p/metadata.xml
+++ b/net-vpn/i2p/metadata.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person" proxied="yes">
-	<email>tharvik@gmail.com</email>
-	<name>Valérian Rousset</name>
-</maintainer>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-<maintainer type="project" proxied="proxy">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</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="nls">Adds Native Language Support using GNU gettext.</flag>
-</use>
+	<maintainer type="person" proxied="yes">
+		<email>tharvik@gmail.com</email>
+		<name>Valérian Rousset</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</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="nls">Adds Native Language Support using GNU gettext.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">i2p/i2p.i2p</remote-id>
+	</upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Arthur Zamarin]

commit:     000cff15dba302149d1c0a64f185eed6cdda3861
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 06:57:27 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 06:57:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=000cff15

net-vpn/i2p: Keyword 1.7.0 arm64, #834926

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-vpn/i2p/i2p-1.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/i2p/i2p-1.7.0.ebuild b/net-vpn/i2p/i2p-1.7.0.ebuild
index 9c4491ff3d78..5914fa6ea733 100644
--- a/net-vpn/i2p/i2p-1.7.0.ebuild
+++ b/net-vpn/i2p/i2p-1.7.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2
 SLOT="0"
 
 # Until the deps reach other arches
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Sam James]

commit:     3f54e138c20cb28c86d319682dec54c8bdeecf93
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 11:08:42 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 20 11:08:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f54e138

net-vpn/i2p: 2.1.0 needs newer nativebiginteger

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-vpn/i2p/{i2p-2.1.0.ebuild => i2p-2.1.0-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/i2p/i2p-2.1.0.ebuild b/net-vpn/i2p/i2p-2.1.0-r1.ebuild
similarity index 99%
rename from net-vpn/i2p/i2p-2.1.0.ebuild
rename to net-vpn/i2p/i2p-2.1.0-r1.ebuild
index ab62e452b1b0..f927c3080df1 100644
--- a/net-vpn/i2p/i2p-2.1.0.ebuild
+++ b/net-vpn/i2p/i2p-2.1.0-r1.ebuild
@@ -38,7 +38,7 @@ CP_DEPEND="
 	dev-java/minidns-core:1
 	dev-java/zxing-core:3
 	dev-java/zxing-javase:3
-	net-libs/nativebiginteger:0
+	>=net-libs/nativebiginteger-2.1.0:0
 	sys-devel/gettext:0[java]
 	>=www-servers/tomcat-9.0.73:9
 "

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Miroslav Šulc]

commit:     c2ce83154e6120278ba48952771e82f950b00e97
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun May 21 08:23:10 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon May 22 06:08:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ce8315

net-vpn/i2p: remove unneeded dependency on hamcrest-core

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/31115
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 net-vpn/i2p/{i2p-2.1.0-r1.ebuild => i2p-2.1.0-r2.ebuild} | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-vpn/i2p/i2p-2.1.0-r1.ebuild b/net-vpn/i2p/i2p-2.1.0-r2.ebuild
similarity index 99%
rename from net-vpn/i2p/i2p-2.1.0-r1.ebuild
rename to net-vpn/i2p/i2p-2.1.0-r2.ebuild
index f927c3080df1..2883493999e5 100644
--- a/net-vpn/i2p/i2p-2.1.0-r1.ebuild
+++ b/net-vpn/i2p/i2p-2.1.0-r2.ebuild
@@ -48,7 +48,6 @@ DEPEND="
 	test? (
 		dev-java/ant-junit4:0
 		dev-java/hamcrest:0
-		dev-java/hamcrest-core:1.3
 		dev-java/junit:4
 		dev-java/mockito:4
 	)

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Sam James]

commit:     5855b9cfa8abd0d3b45a06e226070b98259af207
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Jun  3 16:38:43 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 14 04:16:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5855b9cf

net-vpn/i2p: widen pkg_pretend to all JDK for 2.1.0

Closes: https://bugs.gentoo.org/847304
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-vpn/i2p/i2p-2.1.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-vpn/i2p/i2p-2.1.0-r2.ebuild b/net-vpn/i2p/i2p-2.1.0-r2.ebuild
index 2883493999e5..b83e479db886 100644
--- a/net-vpn/i2p/i2p-2.1.0-r2.ebuild
+++ b/net-vpn/i2p/i2p-2.1.0-r2.ebuild
@@ -73,8 +73,8 @@ DOCS=( README.md history.txt )
 
 pkg_pretend() {
 	# see https://bugs.gentoo.org/831290
-	if [[ "`java-config --show-active-vm`" = openjdk*-8 ]] &&
-	   [[ "`java-config --query MERGE_VM --package=ant-core`" != openjdk*-8 ]]
+	if [[ "`java-config --show-active-vm`" = *-8 ]] &&
+	   [[ "`java-config --query MERGE_VM --package=ant-core`" != *-8 ]]
 	then
 		eerror "dev-java/ant-core was emerged with a newer version of the JDK."
 		eerror "It will fail to build with virtual/jdk:1.8 due to #831290."

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Arthur Zamarin]

commit:     59aca4ee25c78e825da3192f15dcb66f61ed3531
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 13:15:19 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 13:15:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59aca4ee

net-vpn/i2p: Stabilize 2.2.1 amd64, #910387

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-vpn/i2p/i2p-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/i2p/i2p-2.2.1.ebuild b/net-vpn/i2p/i2p-2.2.1.ebuild
index e665690f55bf..0f1e8acd17e0 100644
--- a/net-vpn/i2p/i2p-2.2.1.ebuild
+++ b/net-vpn/i2p/i2p-2.2.1.ebuild
@@ -14,7 +14,7 @@ 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"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LANGS=(
 	ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
 	sr sv tk tr uk vi zh zh-TW

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Sam James]

commit:     ca657be02a35619424f47de5fdfbc831cdf0f397
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Thu Jul 13 20:49:48 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 16:31:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca657be0

net-vpn/i2p: add 2.3.0

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-2.3.0.ebuild | 266 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 267 insertions(+)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index d566fee0b1f8..7c568e634e98 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,3 +1,4 @@
 DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f
 DIST i2psource_2.1.0.tar.bz2 32817295 BLAKE2B d37463522143c02e04c96d58578312b536ab5e2842e5647dbe5ba3d5c139329c447f16de7e326ef48ef4c6b3c11631e23300b5327cc31d9da5288240f86c926f SHA512 e8639c2b2869d3c7856b598d4cd3505458ed5cab5dce3570cafdaec3ccd77dbaec35787cccc6782acc75adb423b7baaab724ac3c98e5b91b41cf4c76f3614355
 DIST i2psource_2.2.1.tar.bz2 33349391 BLAKE2B 45c681fd64c638e78033efbc025f8ddd0200dd79da45d7af539f7553d792f03b9978a62dac0f4763c4589939e1b220efb13d1e4dca03c143cf3b2de31af818a9 SHA512 98ea0b86fcf879b5e4e415d106c446be73441aa03c91f3b9ac02589a332cafad1bf899d381b5986fb78efc550deceedd2da5514c46fbb70f5928d85a76be5ced
+DIST i2psource_2.3.0.tar.bz2 33379569 BLAKE2B 56002ad57725216730c6a92eed4c4eb569bfe03e4fcbd811577610f8adf212e9db56e6761f5873933d101e513093b61e296871a122a2e2042945c1fe906bc372 SHA512 dc38174683e2388c0e766db71526e98252fc38c52255bd4529684862edfa05ba25204df97cf09a6084f9833507a0d4ea96e112d1138d9c97d2dd582ef98f9301

diff --git a/net-vpn/i2p/i2p-2.3.0.ebuild b/net-vpn/i2p/i2p-2.3.0.ebuild
new file mode 100644
index 000000000000..44f36a5638a3
--- /dev/null
+++ b/net-vpn/i2p/i2p-2.3.0.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 java-ant-2 systemd toolchain-funcs
+
+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"
+
+KEYWORDS="~amd64 ~x86"
+LANGS=(
+	ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
+	sr sv tk tr uk vi zh zh-TW
+)
+IUSE="${LANGS[@]/#/l10n_}"
+
+CP_DEPEND="
+	dev-java/bcprov:0
+	dev-java/hashcash:1
+	dev-java/httpcomponents-client:4
+	dev-java/identicon:1
+	dev-java/java-getopt:1
+	dev-java/java-service-wrapper:0
+	dev-java/jbcrypt:0
+	dev-java/json-simple:2.3
+	dev-java/json-smart:1
+	dev-java/jsonrpc2-base:1
+	dev-java/jsonrpc2-server:1
+	dev-java/jstl:0
+	dev-java/jstl-api:0
+	dev-java/minidns-core:1
+	dev-java/zxing-core:3
+	dev-java/zxing-javase:3
+	sys-devel/gettext:0[java]
+	www-servers/tomcat:9
+"
+DEPEND="
+	dev-libs/gmp:0=
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/hamcrest:0
+		dev-java/junit:4
+		dev-java/mockito:4
+	)
+"
+RDEPEND="
+	${CP_DEPEND}
+	acct-user/i2p
+	acct-group/i2p
+	>=virtual/jre-1.8:*
+"
+
+PATCHES=(
+	"${FILESDIR}/fix-junit-classpath.patch"
+)
+
+EANT_BUILD_TARGET="preppkg-base"
+# no scala as depending on antlib.xml not installed by dev-lang/scala
+EANT_TEST_TARGET="junit.test"
+JAVA_ANT_ENCODING="UTF-8"
+JAVA_ANT_CLASSPATH_TAGS="javac java"
+# built locally
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/core/java/build/i2p.jar"
+EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/router/java/build/router.jar"
+EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/apps/ministreaming/java/build/mstreaming.jar"
+
+DOCS=( README.md history.txt )
+
+pkg_pretend() {
+	# see https://bugs.gentoo.org/831290
+	if [[ "`java-config --show-active-vm`" = *-8 ]] &&
+		[[ "`java-config --query MERGE_VM --package=ant-core`" != *-8 ]]
+	then
+		eerror "dev-java/ant-core was emerged with a newer version of the JDK."
+		eerror "It will fail to build with virtual/jdk:1.8 due to #831290."
+		eerror "Please switch to a newer JDK"
+		eerror "  eselect java-vm set system ..."
+		eerror "Or remerge dev-java/ant-core with virtual/jdk:1.8"
+		eerror "  emerge dev-java/ant-core"
+		die 'bad JDK for ant-core'
+	fi
+}
+
+src_prepare() {
+	default # apply PATCHES
+	java-pkg-2_src_prepare
+
+	# add our classpath
+	for f in `find -name build.xml`
+	do
+		java-ant_rewrite-classpath "$f"
+	done
+
+	# remove most bundled
+	# apps/addressbook/java/src/net/metanotion too much code drift
+	# apps/i2psnark/java/src/org/klomp/snark too much code drift
+	# apps/jrobin need rrd4j ebuild
+	# apps/routerconsole/java/src/{com,edu} too much code drift
+	# {core,router}/java/src/com/southernstorm/noise use internal symbols
+	# core/java/src/freenet too much code drift
+	# core/java/src/gnu/crypto too much code drift
+	# router/java/src/com/maxmind changed interface
+	# router/java/src/org/cybergarage unable to find version 3
+	# router/java/src/org/freenetproject too big to pull
+	# router/java/src/org/xlattice changed interface
+	java-pkg_clean ! \
+		-path "./apps/jetty/jetty-distribution-*" # need to package jetty
+	( cat >> override.properties || die 'set unbundled properties' ) <<- EOF
+		require.gettext=true
+		with-libgetopt-java=true
+		with-libjakarta-taglibs-standard-java=true
+		with-libjson-simple-java=true
+		with-libtomcat9-java=true
+		with-gettext-base=true
+		# with-geoip-database=true need std geoip use
+		# with-libjetty9-java=true needs a jetty ebuild
+	EOF
+
+	# bcprov
+	rm -r core/java/src/net/i2p/crypto/elgamal || die 'unbundle bcprov'
+	sed -e 's,net\.i2p\.crypto\.elgamal\.impl,org.bouncycastle.jce.provider,' \
+		-e 's,net\.i2p\.crypto\.elgamal\.spec,org.bouncycastle.jce.spec,' \
+		-i core/java/src/net/i2p/crypto/{provider/I2PProvider,CryptoConstants}.java ||
+		die 'redirect imports of bcprov'
+	# getopt, gettext
+	rm -r core/java/src/gnu/{getopt,gettext} || die 'unbundle GNU code'
+	# httpcomponents-client
+	rm -r core/java/src/net/i2p/apache || die 'unbundle httpcomponents-client'
+	sed -e 's,net\.i2p\.apache,org.apache,' \
+		-i core/java/src/net/i2p/util/{Addresses,I2PSSLSocketFactory}.java \
+			apps/i2pcontrol/java/net/i2p/i2pcontrol/HostCheckHandler.java ||
+		die 'redirect imports of httpcomponents-client'
+	# identicon, zxing
+	rm -r apps/imagegen/{identicon,zxing} || die 'unbundle identicon & zxing'
+	sed -e '/LICENSE-Identicon.txt/d' -i build.xml &&
+	sed -E '/dir="[^"]*(identicon|zxing)/d' -i apps/imagegen{/imagegen,}/build.xml &&
+	sed -E '/(todir="build\/WEB-INF\/classes"|<\/copy>)/d' -i apps/imagegen/imagegen/build.xml ||
+		die 'do not depend on unbundled'
+	# hashcash
+	rm core/java/src/com/nettgryppa/security/HashCash.java ||
+		die 'unbundle hashcash'
+	# jbcrypt, jsonrpc2-*
+	rm -r apps/i2pcontrol/java/{com,org} || die 'unbundle jbcrypt & jsonrpc2-*'
+	# jstl*
+	sed -E '/"apps\/susidns\/src\/lib\/(jstl|standard).jar"/d' -i build.xml ||
+		die 'unbundle jstl*'
+	# minidns-core, json-simple
+	rm -r core/java/src/org || die 'unbundle minidns-core & json-simple'
+
+	# keep only enabled locales
+	local lang
+	for lang in ${LANGS[@]}
+	do
+		if ! use "l10n_${lang}"
+		then
+			find -regextype egrep \
+					-regex ".*[_\\./]${lang/-/_}.(html|po|1)" \
+				-delete || die "unbundling ${lang} translations"
+		fi
+	done
+
+	# fix some locale names
+	find -name '*_in.*' -exec rename --no-overwrite _in. _id. {} \; &&
+	find -name '*_iw.*' -exec rename --no-overwrite _iw. _he. {} \; ||
+		die 'fix some locale names'
+}
+
+src_configure() {
+	java-ant-2_src_configure
+
+	# deamon shouldn't start GUI
+	sed -i 's|\(clientApp.4.startOnLoad\)=true|\1=false|' \
+		installer/resources/clients.config ||
+		die 'avoid auto starting browser'
+
+	# yep, that's us
+	echo "build.built-by=Gentoo" >> override.properties ||
+		die 'bragging failed'
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	local compile_lib
+	compile_lib() {
+		local name="${1}"
+		local file="${2}"
+		shift 2
+
+		"$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
+			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
+			"${file}" -o "lib${name}.so"
+	}
+
+	cd "${S}/core/c/jbigi/jbigi" || die "unable to cd to jbigi"
+	compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
+		die "unable to build jbigi"
+
+	if use amd64 || use x86; then
+		cd "${S}/core/c/jcpuid" || die "unable to cd to jcpuid"
+		compile_lib jcpuid src/jcpuid.c -Iinclude ||
+			die "unable to build jcpuid"
+	fi
+}
+
+src_test() {
+	# avoid rebuilding
+	sed -e '/<delete dir=".\/build" \/>/d' -i core/java/build.xml ||
+		die 'avoid building twice'
+
+	# halt on error
+	find -name build.xml \
+		-execdir sed -e 's/<junit /\0haltonerror="yes" /' -i {} + ||
+		die 'ensure test failures propagate'
+
+	EANT_GENTOO_CLASSPATH+=",hamcrest,junit-4,mockito-4"
+	java-pkg-2_src_test
+}
+
+src_install() {
+	# install basic documentation
+	einstalldocs
+	doman installer/resources/man/eepget.*
+
+	# install main files
+	java-pkg_doso core/c/jbigi/jbigi/libjbigi.so
+	if use amd64 || use x86; then
+		java-pkg_doso core/c/jcpuid/libjcpuid.so
+	fi
+	cd "${S}/pkg-temp" || die 'unable to change dir to built artifacts'
+	java-pkg_dojar lib/*.jar
+	java-pkg_dowar webapps/*.war
+
+	# install shared
+	insinto /usr/share/i2p
+	doins blocklist.txt hosts.txt {clients,i2p*}.config
+	doins -r certificates docs eepsite geoip scripts
+
+	# install daemons
+	newinitd "${FILESDIR}/i2p.init" i2p
+	systemd_dounit "${FILESDIR}/i2p.service"
+
+	# setup dirs
+	keepdir /var/log/i2p /var/lib/i2p
+	fowners i2p:i2p /var/lib/i2p /var/log/i2p
+
+	# create own launchers
+	java-pkg_dolauncher i2prouter --main net.i2p.router.Router --jar i2p.jar \
+		--pwd "${EPREFIX}/usr/share/i2p" \
+		--java_args "\
+			-Di2p.dir.app=${EPREFIX}/var/lib/i2p/app \
+			-Di2p.dir.config=${EPREFIX}/var/lib/i2p/config \
+			-Di2p.dir.router=${EPREFIX}/var/lib/i2p/router \
+			-Di2p.dir.log=${EPREFIX}/var/log/i2p \
+			-DloggerFilenameOverride=${EPREFIX}/var/log/i2p/router-@"
+	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Sam James]

commit:     c1e50989b3b6b81cf9ba02ae633d89330e1a71ea
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Thu Jul 13 21:45:52 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 16:31:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e50989

net-vpn/i2p: drop 2.1.0-r2

Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/31901
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-vpn/i2p/Manifest            |   1 -
 net-vpn/i2p/i2p-2.1.0-r2.ebuild | 224 ----------------------------------------
 2 files changed, 225 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 7c568e634e98..43dcdae21217 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,4 +1,3 @@
 DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f
-DIST i2psource_2.1.0.tar.bz2 32817295 BLAKE2B d37463522143c02e04c96d58578312b536ab5e2842e5647dbe5ba3d5c139329c447f16de7e326ef48ef4c6b3c11631e23300b5327cc31d9da5288240f86c926f SHA512 e8639c2b2869d3c7856b598d4cd3505458ed5cab5dce3570cafdaec3ccd77dbaec35787cccc6782acc75adb423b7baaab724ac3c98e5b91b41cf4c76f3614355
 DIST i2psource_2.2.1.tar.bz2 33349391 BLAKE2B 45c681fd64c638e78033efbc025f8ddd0200dd79da45d7af539f7553d792f03b9978a62dac0f4763c4589939e1b220efb13d1e4dca03c143cf3b2de31af818a9 SHA512 98ea0b86fcf879b5e4e415d106c446be73441aa03c91f3b9ac02589a332cafad1bf899d381b5986fb78efc550deceedd2da5514c46fbb70f5928d85a76be5ced
 DIST i2psource_2.3.0.tar.bz2 33379569 BLAKE2B 56002ad57725216730c6a92eed4c4eb569bfe03e4fcbd811577610f8adf212e9db56e6761f5873933d101e513093b61e296871a122a2e2042945c1fe906bc372 SHA512 dc38174683e2388c0e766db71526e98252fc38c52255bd4529684862edfa05ba25204df97cf09a6084f9833507a0d4ea96e112d1138d9c97d2dd582ef98f9301

diff --git a/net-vpn/i2p/i2p-2.1.0-r2.ebuild b/net-vpn/i2p/i2p-2.1.0-r2.ebuild
deleted file mode 100644
index b83e479db886..000000000000
--- a/net-vpn/i2p/i2p-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="test"
-
-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"
-
-KEYWORDS="~amd64 ~x86"
-LANGS=(
-	ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
-	sr sv tk tr uk vi zh zh-TW
-)
-IUSE="${LANGS[@]/#/l10n_}"
-
-CP_DEPEND="
-	dev-java/bcprov:0
-	dev-java/hashcash:1
-	dev-java/httpcomponents-client:4
-	dev-java/identicon:1
-	dev-java/java-getopt:1
-	dev-java/java-service-wrapper:0
-	dev-java/jbcrypt:0
-	dev-java/json-simple:2.3
-	dev-java/json-smart:1
-	dev-java/jsonrpc2-base:1
-	dev-java/jsonrpc2-server:1
-	dev-java/jstl:0
-	dev-java/jstl-api:0
-	dev-java/minidns-core:1
-	dev-java/zxing-core:3
-	dev-java/zxing-javase:3
-	>=net-libs/nativebiginteger-2.1.0:0
-	sys-devel/gettext:0[java]
-	>=www-servers/tomcat-9.0.73:9
-"
-DEPEND="
-	${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/hamcrest:0
-		dev-java/junit:4
-		dev-java/mockito:4
-	)
-"
-RDEPEND="
-	${CP_DEPEND}
-	acct-user/i2p
-	acct-group/i2p
-	>=virtual/jre-1.8:*
-"
-
-EANT_BUILD_TARGET="preppkg-base"
-# no scala as depending on antlib.xml not installed by dev-lang/scala
-EANT_TEST_TARGET="junit.test"
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_CLASSPATH_TAGS="javac java"
-# built locally
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/core/java/build/i2p.jar"
-EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/router/java/build/router.jar"
-EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/apps/ministreaming/java/build/mstreaming.jar"
-
-DOCS=( README.md history.txt )
-
-pkg_pretend() {
-	# see https://bugs.gentoo.org/831290
-	if [[ "`java-config --show-active-vm`" = *-8 ]] &&
-	   [[ "`java-config --query MERGE_VM --package=ant-core`" != *-8 ]]
-	then
-		eerror "dev-java/ant-core was emerged with a newer version of the JDK."
-		eerror "It will fail to build with virtual/jdk:1.8 due to #831290."
-		eerror "Please switch to a newer JDK"
-		eerror "  eselect java-vm set system ..."
-		eerror "Or remerge dev-java/ant-core with virtual/jdk:1.8"
-		eerror "  emerge dev-java/ant-core"
-		die 'bad JDK for ant-core'
-	fi
-}
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	# add our classpath
-	for f in `find -name build.xml`
-	do
-		java-ant_rewrite-classpath "$f"
-	done
-
-	# remove most bundled
-	# apps/addressbook/java/src/net/metanotion too much code drift
-	# apps/i2psnark/java/src/org/klomp/snark too much code drift
-	# apps/jrobin need rrd4j ebuild
-	# apps/routerconsole/java/src/{com,edu} too much code drift
-	# {core,router}/java/src/com/southernstorm/noise use internal symbols
-	# core/java/src/freenet too much code drift
-	# core/java/src/gnu/crypto too much code drift
-	# router/java/src/com/maxmind changed interface
-	# router/java/src/org/cybergarage unable to find version 3
-	# router/java/src/org/freenetproject too big to pull
-	# router/java/src/org/xlattice changed interface
-	java-pkg_clean ! \
-		-path "./apps/jetty/jetty-distribution-*" # need to package jetty
-	( cat >> override.properties || die 'set unbundled properties' ) <<- EOF
-		require.gettext=true
-		with-libgetopt-java=true
-		with-libjakarta-taglibs-standard-java=true
-		with-libjson-simple-java=true
-		with-libtomcat9-java=true
-		with-gettext-base=true
-		# with-geoip-database=true need std geoip use
-		# with-libjetty9-java=true needs a jetty ebuild
-	EOF
-
-	# bcprov
-	rm -r core/java/src/net/i2p/crypto/elgamal || die 'unbundle bcprov'
-	sed -e 's,net\.i2p\.crypto\.elgamal\.impl,org.bouncycastle.jce.provider,' \
-		-e 's,net\.i2p\.crypto\.elgamal\.spec,org.bouncycastle.jce.spec,' \
-		-i core/java/src/net/i2p/crypto/{provider/I2PProvider,CryptoConstants}.java ||
-		die 'redirect imports of bcprov'
-	# getopt, gettext
-	rm -r core/java/src/gnu/{getopt,gettext} || die 'unbundle GNU code'
-	# httpcomponents-client
-	rm -r core/java/src/net/i2p/apache || die 'unbundle httpcomponents-client'
-	sed -e 's,net\.i2p\.apache,org.apache,' \
-		-i core/java/src/net/i2p/util/{Addresses,I2PSSLSocketFactory}.java \
-		   apps/i2pcontrol/java/net/i2p/i2pcontrol/HostCheckHandler.java ||
-		die 'redirect imports of httpcomponents-client'
-	# identicon, zxing
-	rm -r apps/imagegen/{identicon,zxing} || die 'unbundle identicon & zxing'
-	sed -e '/LICENSE-Identicon.txt/d' -i build.xml &&
-	sed -E '/dir="[^"]*(identicon|zxing)/d' -i apps/imagegen{/imagegen,}/build.xml &&
-	sed -E '/(todir="build\/WEB-INF\/classes"|<\/copy>)/d' -i apps/imagegen/imagegen/build.xml ||
-		die 'do not depend on unbundled'
-	# hashcash
-	rm core/java/src/com/nettgryppa/security/HashCash.java ||
-		die 'unbundle hashcash'
-	# jbcrypt, jsonrpc2-*
-	rm -r apps/i2pcontrol/java/{com,org} || die 'unbundle jbcrypt & jsonrpc2-*'
-	# jstl*
-	sed -E '/"apps\/susidns\/src\/lib\/(jstl|standard).jar"/d' -i build.xml ||
-		die 'unbundle jstl*'
-	# minidns-core, json-simple
-	rm -r core/java/src/org || die 'unbundle minidns-core & json-simple'
-
-	# keep only enabled locales
-	local lang
-	for lang in ${LANGS[@]}
-	do
-		if ! use "l10n_${lang}"
-		then
-			find -regextype egrep \
-					-regex ".*[_\\./]${lang/-/_}.(html|po|1)" \
-				-delete || die "unbundling ${lang} translations"
-		fi
-	done
-
-	# fix some locale names
-	find -name '*_in.*' -exec rename --no-overwrite _in. _id. {} \; &&
-	find -name '*_iw.*' -exec rename --no-overwrite _iw. _he. {} \; ||
-		die 'fix some locale names'
-}
-
-src_configure() {
-	# deamon shouldn't start GUI
-	sed -i 's|\(clientApp.4.startOnLoad\)=true|\1=false|' \
-		installer/resources/clients.config ||
-		die 'avoid auto starting browser'
-
-	# yep, that's us
-	echo "build.built-by=Gentoo" >> override.properties ||
-		die 'bragging failed'
-}
-
-src_test() {
-	# avoid rebuilding
-	sed -e '/<delete dir=".\/build" \/>/d' -i core/java/build.xml ||
-		die 'avoid building twice'
-
-	EANT_GENTOO_CLASSPATH+=",hamcrest,junit-4,mockito-4"
-	java-pkg-2_src_test
-}
-
-src_install() {
-	# install basic documentation
-	einstalldocs
-	doman installer/resources/man/eepget.*
-
-	# install main files
-	cd "${S}/pkg-temp" || die 'unable to change dir to built artifacts'
-	# remove merged packages
-	java-pkg_dojar lib/*.jar
-	insinto "/usr/share/i2p"
-	doins blocklist.txt hosts.txt {clients,i2p*}.config
-	doins -r certificates docs eepsite geoip scripts
-	java-pkg_dowar webapps/*.war
-
-	# install daemons
-	newinitd "${FILESDIR}/i2p.init" i2p
-	systemd_dounit "${FILESDIR}/i2p.service"
-
-	# setup dirs
-	keepdir /var/log/i2p /var/lib/i2p
-	fowners i2p:i2p /var/lib/i2p /var/log/i2p
-
-	# create own launchers
-	java-pkg_dolauncher i2prouter --main net.i2p.router.Router --jar i2p.jar \
-		--pwd "${EPREFIX}/usr/share/i2p" \
-		--java_args "\
-			-Di2p.dir.app=${EPREFIX}/var/lib/i2p/app \
-			-Di2p.dir.config=${EPREFIX}/var/lib/i2p/config \
-			-Di2p.dir.router=${EPREFIX}/var/lib/i2p/router \
-			-Di2p.dir.log=${EPREFIX}/var/log/i2p \
-			-DloggerFilenameOverride=${EPREFIX}/var/log/i2p/router-@"
-	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Sam James]

commit:     0b116529c08b55fe748c5d96360738e7673b7b9e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 17:20:20 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 17:20:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b116529

net-vpn/i2p: Keyword 2.3.0 arm64, #906822

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-vpn/i2p/i2p-2.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/i2p/i2p-2.3.0.ebuild b/net-vpn/i2p/i2p-2.3.0.ebuild
index 44f36a5638a3..570b2d4a077e 100644
--- a/net-vpn/i2p/i2p-2.3.0.ebuild
+++ b/net-vpn/i2p/i2p-2.3.0.ebuild
@@ -14,7 +14,7 @@ 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"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 LANGS=(
 	ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
 	sr sv tk tr uk vi zh zh-TW

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Sam James]

commit:     3e306fc8477de00153124e6c65714793292dca35
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 17:20:43 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 17:20:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e306fc8

net-vpn/i2p: Keyword 2.3.0 arm, #906822

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-vpn/i2p/i2p-2.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/i2p/i2p-2.3.0.ebuild b/net-vpn/i2p/i2p-2.3.0.ebuild
index 570b2d4a077e..a52e83d76476 100644
--- a/net-vpn/i2p/i2p-2.3.0.ebuild
+++ b/net-vpn/i2p/i2p-2.3.0.ebuild
@@ -14,7 +14,7 @@ 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"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 LANGS=(
 	ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
 	sr sv tk tr uk vi zh zh-TW

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Sam James]

commit:     959408c10db3b0a55037bd4242443b355bfffa73
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 11:22:40 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug  1 11:22:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=959408c1

net-vpn/i2p: Stabilize 2.3.0 amd64, #911551

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-vpn/i2p/i2p-2.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/i2p/i2p-2.3.0.ebuild b/net-vpn/i2p/i2p-2.3.0.ebuild
index a52e83d76476..18618900dcbb 100644
--- a/net-vpn/i2p/i2p-2.3.0.ebuild
+++ b/net-vpn/i2p/i2p-2.3.0.ebuild
@@ -14,7 +14,7 @@ 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"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 LANGS=(
 	ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
 	sr sv tk tr uk vi zh zh-TW

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Miroslav Šulc]

commit:     ae306609e84eca7d939238c1479830e241f9e285
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Aug  5 07:21:51 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug  6 05:46:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae306609

net-vpn/i2p: drop 2.2.1

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/32182
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 net-vpn/i2p/Manifest         |   1 -
 net-vpn/i2p/i2p-2.2.1.ebuild | 266 -------------------------------------------
 2 files changed, 267 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 443372783e38..522c9fe54104 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1 @@
-DIST i2psource_2.2.1.tar.bz2 33349391 BLAKE2B 45c681fd64c638e78033efbc025f8ddd0200dd79da45d7af539f7553d792f03b9978a62dac0f4763c4589939e1b220efb13d1e4dca03c143cf3b2de31af818a9 SHA512 98ea0b86fcf879b5e4e415d106c446be73441aa03c91f3b9ac02589a332cafad1bf899d381b5986fb78efc550deceedd2da5514c46fbb70f5928d85a76be5ced
 DIST i2psource_2.3.0.tar.bz2 33379569 BLAKE2B 56002ad57725216730c6a92eed4c4eb569bfe03e4fcbd811577610f8adf212e9db56e6761f5873933d101e513093b61e296871a122a2e2042945c1fe906bc372 SHA512 dc38174683e2388c0e766db71526e98252fc38c52255bd4529684862edfa05ba25204df97cf09a6084f9833507a0d4ea96e112d1138d9c97d2dd582ef98f9301

diff --git a/net-vpn/i2p/i2p-2.2.1.ebuild b/net-vpn/i2p/i2p-2.2.1.ebuild
deleted file mode 100644
index 8e0ab430ab6b..000000000000
--- a/net-vpn/i2p/i2p-2.2.1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="test"
-
-inherit java-pkg-2 java-ant-2 systemd toolchain-funcs
-
-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"
-
-KEYWORDS="amd64 ~x86"
-LANGS=(
-	ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
-	sr sv tk tr uk vi zh zh-TW
-)
-IUSE="${LANGS[@]/#/l10n_}"
-
-CP_DEPEND="
-	dev-java/bcprov:0
-	dev-java/hashcash:1
-	dev-java/httpcomponents-client:4
-	dev-java/identicon:1
-	dev-java/java-getopt:1
-	dev-java/java-service-wrapper:0
-	dev-java/jbcrypt:0
-	dev-java/json-simple:2.3
-	dev-java/json-smart:1
-	dev-java/jsonrpc2-base:1
-	dev-java/jsonrpc2-server:1
-	dev-java/jstl:0
-	dev-java/jstl-api:0
-	dev-java/minidns-core:1
-	dev-java/zxing-core:3
-	dev-java/zxing-javase:3
-	sys-devel/gettext:0[java]
-	>=www-servers/tomcat-9.0.73:9
-"
-DEPEND="
-	dev-libs/gmp:0=
-	${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/hamcrest:0
-		dev-java/junit:4
-		dev-java/mockito:4
-	)
-"
-RDEPEND="
-	${CP_DEPEND}
-	acct-user/i2p
-	acct-group/i2p
-	>=virtual/jre-1.8:*
-"
-
-PATCHES=(
-	"${FILESDIR}/fix-junit-classpath.patch"
-)
-
-EANT_BUILD_TARGET="preppkg-base"
-# no scala as depending on antlib.xml not installed by dev-lang/scala
-EANT_TEST_TARGET="junit.test"
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_CLASSPATH_TAGS="javac java"
-# built locally
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/core/java/build/i2p.jar"
-EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/router/java/build/router.jar"
-EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/apps/ministreaming/java/build/mstreaming.jar"
-
-DOCS=( README.md history.txt )
-
-pkg_pretend() {
-	# see https://bugs.gentoo.org/831290
-	if [[ "`java-config --show-active-vm`" = *-8 ]] &&
-	   [[ "`java-config --query MERGE_VM --package=ant-core`" != *-8 ]]
-	then
-		eerror "dev-java/ant-core was emerged with a newer version of the JDK."
-		eerror "It will fail to build with virtual/jdk:1.8 due to #831290."
-		eerror "Please switch to a newer JDK"
-		eerror "  eselect java-vm set system ..."
-		eerror "Or remerge dev-java/ant-core with virtual/jdk:1.8"
-		eerror "  emerge dev-java/ant-core"
-		die 'bad JDK for ant-core'
-	fi
-}
-
-src_prepare() {
-	default # apply PATCHES
-	java-pkg-2_src_prepare
-
-	# add our classpath
-	for f in `find -name build.xml`
-	do
-		java-ant_rewrite-classpath "$f"
-	done
-
-	# remove most bundled
-	# apps/addressbook/java/src/net/metanotion too much code drift
-	# apps/i2psnark/java/src/org/klomp/snark too much code drift
-	# apps/jrobin need rrd4j ebuild
-	# apps/routerconsole/java/src/{com,edu} too much code drift
-	# {core,router}/java/src/com/southernstorm/noise use internal symbols
-	# core/java/src/freenet too much code drift
-	# core/java/src/gnu/crypto too much code drift
-	# router/java/src/com/maxmind changed interface
-	# router/java/src/org/cybergarage unable to find version 3
-	# router/java/src/org/freenetproject too big to pull
-	# router/java/src/org/xlattice changed interface
-	java-pkg_clean ! \
-		-path "./apps/jetty/jetty-distribution-*" # need to package jetty
-	( cat >> override.properties || die 'set unbundled properties' ) <<- EOF
-		require.gettext=true
-		with-libgetopt-java=true
-		with-libjakarta-taglibs-standard-java=true
-		with-libjson-simple-java=true
-		with-libtomcat9-java=true
-		with-gettext-base=true
-		# with-geoip-database=true need std geoip use
-		# with-libjetty9-java=true needs a jetty ebuild
-	EOF
-
-	# bcprov
-	rm -r core/java/src/net/i2p/crypto/elgamal || die 'unbundle bcprov'
-	sed -e 's,net\.i2p\.crypto\.elgamal\.impl,org.bouncycastle.jce.provider,' \
-		-e 's,net\.i2p\.crypto\.elgamal\.spec,org.bouncycastle.jce.spec,' \
-		-i core/java/src/net/i2p/crypto/{provider/I2PProvider,CryptoConstants}.java ||
-		die 'redirect imports of bcprov'
-	# getopt, gettext
-	rm -r core/java/src/gnu/{getopt,gettext} || die 'unbundle GNU code'
-	# httpcomponents-client
-	rm -r core/java/src/net/i2p/apache || die 'unbundle httpcomponents-client'
-	sed -e 's,net\.i2p\.apache,org.apache,' \
-		-i core/java/src/net/i2p/util/{Addresses,I2PSSLSocketFactory}.java \
-		   apps/i2pcontrol/java/net/i2p/i2pcontrol/HostCheckHandler.java ||
-		die 'redirect imports of httpcomponents-client'
-	# identicon, zxing
-	rm -r apps/imagegen/{identicon,zxing} || die 'unbundle identicon & zxing'
-	sed -e '/LICENSE-Identicon.txt/d' -i build.xml &&
-	sed -E '/dir="[^"]*(identicon|zxing)/d' -i apps/imagegen{/imagegen,}/build.xml &&
-	sed -E '/(todir="build\/WEB-INF\/classes"|<\/copy>)/d' -i apps/imagegen/imagegen/build.xml ||
-		die 'do not depend on unbundled'
-	# hashcash
-	rm core/java/src/com/nettgryppa/security/HashCash.java ||
-		die 'unbundle hashcash'
-	# jbcrypt, jsonrpc2-*
-	rm -r apps/i2pcontrol/java/{com,org} || die 'unbundle jbcrypt & jsonrpc2-*'
-	# jstl*
-	sed -E '/"apps\/susidns\/src\/lib\/(jstl|standard).jar"/d' -i build.xml ||
-		die 'unbundle jstl*'
-	# minidns-core, json-simple
-	rm -r core/java/src/org || die 'unbundle minidns-core & json-simple'
-
-	# keep only enabled locales
-	local lang
-	for lang in ${LANGS[@]}
-	do
-		if ! use "l10n_${lang}"
-		then
-			find -regextype egrep \
-					-regex ".*[_\\./]${lang/-/_}.(html|po|1)" \
-				-delete || die "unbundling ${lang} translations"
-		fi
-	done
-
-	# fix some locale names
-	find -name '*_in.*' -exec rename --no-overwrite _in. _id. {} \; &&
-	find -name '*_iw.*' -exec rename --no-overwrite _iw. _he. {} \; ||
-		die 'fix some locale names'
-}
-
-src_configure() {
-	java-ant-2_src_configure
-
-	# deamon shouldn't start GUI
-	sed -i 's|\(clientApp.4.startOnLoad\)=true|\1=false|' \
-		installer/resources/clients.config ||
-		die 'avoid auto starting browser'
-
-	# yep, that's us
-	echo "build.built-by=Gentoo" >> override.properties ||
-		die 'bragging failed'
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	local compile_lib
-	compile_lib() {
-		local name="${1}"
-		local file="${2}"
-		shift 2
-
-		"$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
-			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
-			"${file}" -o "lib${name}.so"
-	}
-
-	cd "${S}/core/c/jbigi/jbigi" || die "unable to cd to jbigi"
-	compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
-		die "unable to build jbigi"
-
-	if use amd64 || use x86; then
-		cd "${S}/core/c/jcpuid" || die "unable to cd to jcpuid"
-		compile_lib jcpuid src/jcpuid.c -Iinclude ||
-			die "unable to build jcpuid"
-	fi
-}
-
-src_test() {
-	# avoid rebuilding
-	sed -e '/<delete dir=".\/build" \/>/d' -i core/java/build.xml ||
-		die 'avoid building twice'
-
-	# halt on error
-	find -name build.xml \
-		 -execdir sed -e 's/<junit /\0haltonerror="yes" /' -i {} + ||
-		 die 'ensure test failures propagate'
-
-	EANT_GENTOO_CLASSPATH+=",hamcrest,junit-4,mockito-4"
-	java-pkg-2_src_test
-}
-
-src_install() {
-	# install basic documentation
-	einstalldocs
-	doman installer/resources/man/eepget.*
-
-	# install main files
-	java-pkg_doso core/c/jbigi/jbigi/libjbigi.so
-	if use amd64 || use x86; then
-		java-pkg_doso core/c/jcpuid/libjcpuid.so
-	fi
-	cd "${S}/pkg-temp" || die 'unable to change dir to built artifacts'
-	java-pkg_dojar lib/*.jar
-	java-pkg_dowar webapps/*.war
-
-	# install shared
-	insinto /usr/share/i2p
-	doins blocklist.txt hosts.txt {clients,i2p*}.config
-	doins -r certificates docs eepsite geoip scripts
-
-	# install daemons
-	newinitd "${FILESDIR}/i2p.init" i2p
-	systemd_dounit "${FILESDIR}/i2p.service"
-
-	# setup dirs
-	keepdir /var/log/i2p /var/lib/i2p
-	fowners i2p:i2p /var/lib/i2p /var/log/i2p
-
-	# create own launchers
-	java-pkg_dolauncher i2prouter --main net.i2p.router.Router --jar i2p.jar \
-		--pwd "${EPREFIX}/usr/share/i2p" \
-		--java_args "\
-			-Di2p.dir.app=${EPREFIX}/var/lib/i2p/app \
-			-Di2p.dir.config=${EPREFIX}/var/lib/i2p/config \
-			-Di2p.dir.router=${EPREFIX}/var/lib/i2p/router \
-			-Di2p.dir.log=${EPREFIX}/var/log/i2p \
-			-DloggerFilenameOverride=${EPREFIX}/var/log/i2p/router-@"
-	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Sam James]

commit:     ef4a3ca3e8264b38407ceea43760167e30ec081a
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Dec 16 14:05:32 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 14:12:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef4a3ca3

net-vpn/i2p: revbump to fix separated user dirs

Closes: https://bugs.gentoo.org/913176
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/34311
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-vpn/i2p/i2p-2.3.0-r1.ebuild | 291 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 291 insertions(+)

diff --git a/net-vpn/i2p/i2p-2.3.0-r1.ebuild b/net-vpn/i2p/i2p-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..f4150f6f5378
--- /dev/null
+++ b/net-vpn/i2p/i2p-2.3.0-r1.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 java-ant-2 systemd toolchain-funcs
+
+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"
+
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
+LANGS=(
+	ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
+	sr sv tk tr uk vi zh zh-TW
+)
+IUSE="${LANGS[@]/#/l10n_}"
+
+CP_DEPEND="
+	dev-java/bcprov:0
+	dev-java/hashcash:1
+	dev-java/httpcomponents-client:4
+	dev-java/identicon:1
+	dev-java/java-getopt:1
+	dev-java/java-service-wrapper:0
+	dev-java/jbcrypt:0
+	dev-java/json-simple:2.3
+	dev-java/json-smart:1
+	dev-java/jsonrpc2-base:1
+	dev-java/jsonrpc2-server:1
+	dev-java/jstl:0
+	dev-java/jstl-api:0
+	dev-java/minidns-core:1
+	dev-java/zxing-core:3
+	dev-java/zxing-javase:3
+	sys-devel/gettext:0[java]
+	www-servers/tomcat:9
+"
+DEPEND="
+	dev-libs/gmp:0=
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/hamcrest:0
+		dev-java/junit:4
+		dev-java/mockito:4
+	)
+"
+RDEPEND="
+	${CP_DEPEND}
+	acct-user/i2p
+	acct-group/i2p
+	>=virtual/jre-1.8:*
+"
+
+PATCHES=(
+	"${FILESDIR}/fix-junit-classpath.patch"
+)
+
+EANT_BUILD_TARGET="preppkg-base"
+# no scala as depending on antlib.xml not installed by dev-lang/scala
+EANT_TEST_TARGET="junit.test"
+JAVA_ANT_ENCODING="UTF-8"
+JAVA_ANT_CLASSPATH_TAGS="javac java"
+# built locally
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/core/java/build/i2p.jar"
+EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/router/java/build/router.jar"
+EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/apps/ministreaming/java/build/mstreaming.jar"
+
+DOCS=( README.md history.txt )
+
+pkg_pretend() {
+	# see https://bugs.gentoo.org/831290
+	if [[ "`java-config --show-active-vm`" = *-8 ]] &&
+		[[ "`java-config --query MERGE_VM --package=ant-core`" != *-8 ]]
+	then
+		eerror "dev-java/ant-core was emerged with a newer version of the JDK."
+		eerror "It will fail to build with virtual/jdk:1.8 due to #831290."
+		eerror "Please switch to a newer JDK"
+		eerror "  eselect java-vm set system ..."
+		eerror "Or remerge dev-java/ant-core with virtual/jdk:1.8"
+		eerror "  emerge dev-java/ant-core"
+		die 'bad JDK for ant-core'
+	fi
+}
+
+src_prepare() {
+	default # apply PATCHES
+	java-pkg-2_src_prepare
+
+	# add our classpath
+	for f in `find -name build.xml`
+	do
+		java-ant_rewrite-classpath "$f"
+	done
+
+	# remove most bundled, excepted the next ones.
+	# apps/addressbook/java/src/net/metanotion too much code drift
+	# apps/i2psnark/java/src/org/klomp/snark too much code drift
+	# apps/jrobin need rrd4j ebuild
+	# apps/routerconsole/java/src/{com,edu} too much code drift
+	# {core,router}/java/src/com/southernstorm/noise use internal symbols
+	# core/java/src/freenet too much code drift
+	# core/java/src/gnu/crypto too much code drift
+	# router/java/src/com/maxmind changed interface
+	# router/java/src/org/cybergarage unable to find version 3
+	# router/java/src/org/freenetproject too big to pull
+	# router/java/src/org/xlattice changed interface
+	java-pkg_clean ! \
+		-path "./apps/jetty/jetty-distribution-*" # need to package jetty
+	( cat >> override.properties || die 'set unbundled properties' ) <<- EOF
+		require.gettext=true
+		with-libgetopt-java=true
+		with-libjakarta-taglibs-standard-java=true
+		with-libjson-simple-java=true
+		with-libtomcat9-java=true
+		with-gettext-base=true
+		# with-geoip-database=true need std geoip use
+		# with-libjetty9-java=true needs a jetty ebuild
+	EOF
+
+	# bcprov
+	rm -r core/java/src/net/i2p/crypto/elgamal || die 'unbundle bcprov'
+	sed -e 's,net\.i2p\.crypto\.elgamal\.impl,org.bouncycastle.jce.provider,' \
+		-e 's,net\.i2p\.crypto\.elgamal\.spec,org.bouncycastle.jce.spec,' \
+		-i core/java/src/net/i2p/crypto/{provider/I2PProvider,CryptoConstants}.java ||
+		die 'redirect imports of bcprov'
+	# getopt, gettext
+	rm -r core/java/src/gnu/{getopt,gettext} || die 'unbundle GNU code'
+	# httpcomponents-client
+	rm -r core/java/src/net/i2p/apache || die 'unbundle httpcomponents-client'
+	sed -e 's,net\.i2p\.apache,org.apache,' \
+		-i core/java/src/net/i2p/util/{Addresses,I2PSSLSocketFactory}.java \
+			apps/i2pcontrol/java/net/i2p/i2pcontrol/HostCheckHandler.java ||
+		die 'redirect imports of httpcomponents-client'
+	# identicon, zxing
+	rm -r apps/imagegen/{identicon,zxing} || die 'unbundle identicon & zxing'
+	sed -e '/LICENSE-Identicon.txt/d' -i build.xml &&
+	sed -E '/dir="[^"]*(identicon|zxing)/d' -i apps/imagegen{/imagegen,}/build.xml &&
+	sed -E '/(todir="build\/WEB-INF\/classes"|<\/copy>)/d' -i apps/imagegen/imagegen/build.xml ||
+		die 'do not depend on unbundled'
+	# hashcash
+	rm core/java/src/com/nettgryppa/security/HashCash.java ||
+		die 'unbundle hashcash'
+	# jbcrypt, jsonrpc2-*
+	rm -r apps/i2pcontrol/java/{com,org} || die 'unbundle jbcrypt & jsonrpc2-*'
+	# jstl*
+	sed -E '/"apps\/susidns\/src\/lib\/(jstl|standard).jar"/d' -i build.xml ||
+		die 'unbundle jstl*'
+	# minidns-core, json-simple
+	rm -r core/java/src/org || die 'unbundle minidns-core & json-simple'
+
+	# keep only enabled locales
+	local lang
+	for lang in ${LANGS[@]}
+	do
+		if ! use "l10n_${lang}"
+		then
+			find -regextype egrep \
+					-regex ".*[_\\./]${lang/-/_}.(html|po|1)" \
+				-delete || die "unbundling ${lang} translations"
+		fi
+	done
+
+	# fix some locale names
+	find -name '*_in.*' -exec rename --no-overwrite _in. _id. {} \; &&
+	find -name '*_iw.*' -exec rename --no-overwrite _iw. _he. {} \; ||
+		die 'fix some locale names'
+}
+
+src_configure() {
+	java-ant-2_src_configure
+
+	# deamon shouldn't start GUI
+	sed -i 's|\(clientApp.4.startOnLoad\)=true|\1=false|' \
+		installer/resources/clients.config ||
+		die 'avoid auto starting browser'
+
+	# yep, that's us
+	echo "build.built-by=Gentoo" >> override.properties ||
+		die 'bragging failed'
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	local compile_lib
+	compile_lib() {
+		local name="${1}"
+		local file="${2}"
+		shift 2
+
+		"$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
+			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
+			"${file}" -o "lib${name}.so"
+	}
+
+	cd "${S}/core/c/jbigi/jbigi" || die "unable to cd to jbigi"
+	compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
+		die "unable to build jbigi"
+
+	if use amd64 || use x86; then
+		cd "${S}/core/c/jcpuid" || die "unable to cd to jcpuid"
+		compile_lib jcpuid src/jcpuid.c -Iinclude ||
+			die "unable to build jcpuid"
+	fi
+}
+
+src_test() {
+	# avoid rebuilding
+	sed -e '/<delete dir=".\/build" \/>/d' -i core/java/build.xml ||
+		die 'avoid building twice'
+
+	# halt on error
+	find -name build.xml \
+		-execdir sed -e 's/<junit /\0haltonerror="yes" /' -i {} + ||
+		die 'ensure test failures propagate'
+
+	EANT_GENTOO_CLASSPATH+=",hamcrest,junit-4,mockito-4"
+	java-pkg-2_src_test
+}
+
+src_install() {
+	# install basic documentation
+	einstalldocs
+	doman installer/resources/man/eepget.*
+
+	# install main files
+	java-pkg_doso core/c/jbigi/jbigi/libjbigi.so
+	if use amd64 || use x86; then
+		java-pkg_doso core/c/jcpuid/libjcpuid.so
+	fi
+	cd "${S}/pkg-temp" || die 'unable to change dir to built artifacts'
+	java-pkg_dojar lib/*.jar
+	java-pkg_dowar webapps/*.war
+
+	# install shared
+	insinto /usr/share/i2p
+	doins blocklist.txt hosts.txt {clients,i2p*}.config
+	doins -r certificates docs eepsite geoip scripts
+
+	# install daemons
+	newinitd "${FILESDIR}/i2p.init" i2p
+	systemd_dounit "${FILESDIR}/i2p.service"
+
+	# setup dirs
+	keepdir /var/log/i2p /var/lib/i2p
+	fowners i2p:i2p /var/lib/i2p /var/log/i2p
+
+	# create own launchers
+	java-pkg_dolauncher i2prouter --main net.i2p.router.Router --jar i2p.jar \
+		--pwd "${EPREFIX}/usr/share/i2p" \
+		--java_args "\
+			-Di2p.dir.config=${EPREFIX}/var/lib/i2p \
+			-Di2p.dir.log=${EPREFIX}/var/log/i2p \
+			-DloggerFilenameOverride=${EPREFIX}/var/log/i2p/router-@"
+	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
+}
+
+pkg_postinst() {
+	local i2pdir="${EPREFIX}/var/lib/i2p"
+
+	[ -d "${i2pdir}/app" -a -d "${i2pdir}/config" -a -d "${i2pdir}/router" ] || return
+
+	elog "Separated user directories is not fully supported by upstream."
+	elog "${i2pdir}/{app,config,router} will be merged"
+	elog "in ${i2pdir} accordingly."
+
+	ebegin "Migrating"
+	rm -fr "${i2pdir}/config/addressbook" # prefer router's addressbook
+	local ret=0
+	mv "${i2pdir}"/{app,config,router}/* "${i2pdir}" || ret=1
+	rmdir "${i2pdir}"/{app,config,router} || ret=1
+	find "${i2pdir}" '(' -name '*.config' -o -name '*.xml' ')' \
+		-execdir sed -E "s,${i2pdir}/(app|config|router),${i2pdir}," -i {} + || ret=1
+
+	if ! eend $ret
+	then
+		ewarn "Unable to merge user directories automatically."
+		ewarn "Please merge them by hand and update all configured paths"
+		ewarn "to point to ${i2pdir} before starting the router."
+		ewarn
+		ewarn "Otherwise, consider starting with a fresh router by removing ${i2pdir}."
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Miroslav Šulc]

commit:     8dc96d5506a2c7654c735f2a830b6e3888989d07
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Mar 10 19:39:29 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 21:10:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dc96d55

net-vpn/i2p: update dependency dev-java/ant[junit4]

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 net-vpn/i2p/{i2p-2.3.0-r1.ebuild => i2p-2.3.0-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-vpn/i2p/i2p-2.3.0-r1.ebuild b/net-vpn/i2p/i2p-2.3.0-r2.ebuild
similarity index 99%
rename from net-vpn/i2p/i2p-2.3.0-r1.ebuild
rename to net-vpn/i2p/i2p-2.3.0-r2.ebuild
index f4150f6f5378..31f2d30af985 100644
--- a/net-vpn/i2p/i2p-2.3.0-r1.ebuild
+++ b/net-vpn/i2p/i2p-2.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -46,7 +46,7 @@ DEPEND="
 	${CP_DEPEND}
 	>=virtual/jdk-1.8:*
 	test? (
-		dev-java/ant-junit4:0
+		dev-java/ant:0[junit4]
 		dev-java/hamcrest:0
 		dev-java/junit:4
 		dev-java/mockito:4

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Miroslav Šulc]

commit:     5f059e91871ee6bbfd6997325bfe160624fe3161
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Mar 10 19:47:19 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 21:10:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f059e91

net-vpn/i2p: drop 2.3.0

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 net-vpn/i2p/i2p-2.3.0.ebuild | 266 -------------------------------------------
 1 file changed, 266 deletions(-)

diff --git a/net-vpn/i2p/i2p-2.3.0.ebuild b/net-vpn/i2p/i2p-2.3.0.ebuild
deleted file mode 100644
index 18618900dcbb..000000000000
--- a/net-vpn/i2p/i2p-2.3.0.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="test"
-
-inherit java-pkg-2 java-ant-2 systemd toolchain-funcs
-
-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"
-
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-LANGS=(
-	ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
-	sr sv tk tr uk vi zh zh-TW
-)
-IUSE="${LANGS[@]/#/l10n_}"
-
-CP_DEPEND="
-	dev-java/bcprov:0
-	dev-java/hashcash:1
-	dev-java/httpcomponents-client:4
-	dev-java/identicon:1
-	dev-java/java-getopt:1
-	dev-java/java-service-wrapper:0
-	dev-java/jbcrypt:0
-	dev-java/json-simple:2.3
-	dev-java/json-smart:1
-	dev-java/jsonrpc2-base:1
-	dev-java/jsonrpc2-server:1
-	dev-java/jstl:0
-	dev-java/jstl-api:0
-	dev-java/minidns-core:1
-	dev-java/zxing-core:3
-	dev-java/zxing-javase:3
-	sys-devel/gettext:0[java]
-	www-servers/tomcat:9
-"
-DEPEND="
-	dev-libs/gmp:0=
-	${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/hamcrest:0
-		dev-java/junit:4
-		dev-java/mockito:4
-	)
-"
-RDEPEND="
-	${CP_DEPEND}
-	acct-user/i2p
-	acct-group/i2p
-	>=virtual/jre-1.8:*
-"
-
-PATCHES=(
-	"${FILESDIR}/fix-junit-classpath.patch"
-)
-
-EANT_BUILD_TARGET="preppkg-base"
-# no scala as depending on antlib.xml not installed by dev-lang/scala
-EANT_TEST_TARGET="junit.test"
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_CLASSPATH_TAGS="javac java"
-# built locally
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/core/java/build/i2p.jar"
-EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/router/java/build/router.jar"
-EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/apps/ministreaming/java/build/mstreaming.jar"
-
-DOCS=( README.md history.txt )
-
-pkg_pretend() {
-	# see https://bugs.gentoo.org/831290
-	if [[ "`java-config --show-active-vm`" = *-8 ]] &&
-		[[ "`java-config --query MERGE_VM --package=ant-core`" != *-8 ]]
-	then
-		eerror "dev-java/ant-core was emerged with a newer version of the JDK."
-		eerror "It will fail to build with virtual/jdk:1.8 due to #831290."
-		eerror "Please switch to a newer JDK"
-		eerror "  eselect java-vm set system ..."
-		eerror "Or remerge dev-java/ant-core with virtual/jdk:1.8"
-		eerror "  emerge dev-java/ant-core"
-		die 'bad JDK for ant-core'
-	fi
-}
-
-src_prepare() {
-	default # apply PATCHES
-	java-pkg-2_src_prepare
-
-	# add our classpath
-	for f in `find -name build.xml`
-	do
-		java-ant_rewrite-classpath "$f"
-	done
-
-	# remove most bundled
-	# apps/addressbook/java/src/net/metanotion too much code drift
-	# apps/i2psnark/java/src/org/klomp/snark too much code drift
-	# apps/jrobin need rrd4j ebuild
-	# apps/routerconsole/java/src/{com,edu} too much code drift
-	# {core,router}/java/src/com/southernstorm/noise use internal symbols
-	# core/java/src/freenet too much code drift
-	# core/java/src/gnu/crypto too much code drift
-	# router/java/src/com/maxmind changed interface
-	# router/java/src/org/cybergarage unable to find version 3
-	# router/java/src/org/freenetproject too big to pull
-	# router/java/src/org/xlattice changed interface
-	java-pkg_clean ! \
-		-path "./apps/jetty/jetty-distribution-*" # need to package jetty
-	( cat >> override.properties || die 'set unbundled properties' ) <<- EOF
-		require.gettext=true
-		with-libgetopt-java=true
-		with-libjakarta-taglibs-standard-java=true
-		with-libjson-simple-java=true
-		with-libtomcat9-java=true
-		with-gettext-base=true
-		# with-geoip-database=true need std geoip use
-		# with-libjetty9-java=true needs a jetty ebuild
-	EOF
-
-	# bcprov
-	rm -r core/java/src/net/i2p/crypto/elgamal || die 'unbundle bcprov'
-	sed -e 's,net\.i2p\.crypto\.elgamal\.impl,org.bouncycastle.jce.provider,' \
-		-e 's,net\.i2p\.crypto\.elgamal\.spec,org.bouncycastle.jce.spec,' \
-		-i core/java/src/net/i2p/crypto/{provider/I2PProvider,CryptoConstants}.java ||
-		die 'redirect imports of bcprov'
-	# getopt, gettext
-	rm -r core/java/src/gnu/{getopt,gettext} || die 'unbundle GNU code'
-	# httpcomponents-client
-	rm -r core/java/src/net/i2p/apache || die 'unbundle httpcomponents-client'
-	sed -e 's,net\.i2p\.apache,org.apache,' \
-		-i core/java/src/net/i2p/util/{Addresses,I2PSSLSocketFactory}.java \
-			apps/i2pcontrol/java/net/i2p/i2pcontrol/HostCheckHandler.java ||
-		die 'redirect imports of httpcomponents-client'
-	# identicon, zxing
-	rm -r apps/imagegen/{identicon,zxing} || die 'unbundle identicon & zxing'
-	sed -e '/LICENSE-Identicon.txt/d' -i build.xml &&
-	sed -E '/dir="[^"]*(identicon|zxing)/d' -i apps/imagegen{/imagegen,}/build.xml &&
-	sed -E '/(todir="build\/WEB-INF\/classes"|<\/copy>)/d' -i apps/imagegen/imagegen/build.xml ||
-		die 'do not depend on unbundled'
-	# hashcash
-	rm core/java/src/com/nettgryppa/security/HashCash.java ||
-		die 'unbundle hashcash'
-	# jbcrypt, jsonrpc2-*
-	rm -r apps/i2pcontrol/java/{com,org} || die 'unbundle jbcrypt & jsonrpc2-*'
-	# jstl*
-	sed -E '/"apps\/susidns\/src\/lib\/(jstl|standard).jar"/d' -i build.xml ||
-		die 'unbundle jstl*'
-	# minidns-core, json-simple
-	rm -r core/java/src/org || die 'unbundle minidns-core & json-simple'
-
-	# keep only enabled locales
-	local lang
-	for lang in ${LANGS[@]}
-	do
-		if ! use "l10n_${lang}"
-		then
-			find -regextype egrep \
-					-regex ".*[_\\./]${lang/-/_}.(html|po|1)" \
-				-delete || die "unbundling ${lang} translations"
-		fi
-	done
-
-	# fix some locale names
-	find -name '*_in.*' -exec rename --no-overwrite _in. _id. {} \; &&
-	find -name '*_iw.*' -exec rename --no-overwrite _iw. _he. {} \; ||
-		die 'fix some locale names'
-}
-
-src_configure() {
-	java-ant-2_src_configure
-
-	# deamon shouldn't start GUI
-	sed -i 's|\(clientApp.4.startOnLoad\)=true|\1=false|' \
-		installer/resources/clients.config ||
-		die 'avoid auto starting browser'
-
-	# yep, that's us
-	echo "build.built-by=Gentoo" >> override.properties ||
-		die 'bragging failed'
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	local compile_lib
-	compile_lib() {
-		local name="${1}"
-		local file="${2}"
-		shift 2
-
-		"$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
-			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
-			"${file}" -o "lib${name}.so"
-	}
-
-	cd "${S}/core/c/jbigi/jbigi" || die "unable to cd to jbigi"
-	compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
-		die "unable to build jbigi"
-
-	if use amd64 || use x86; then
-		cd "${S}/core/c/jcpuid" || die "unable to cd to jcpuid"
-		compile_lib jcpuid src/jcpuid.c -Iinclude ||
-			die "unable to build jcpuid"
-	fi
-}
-
-src_test() {
-	# avoid rebuilding
-	sed -e '/<delete dir=".\/build" \/>/d' -i core/java/build.xml ||
-		die 'avoid building twice'
-
-	# halt on error
-	find -name build.xml \
-		-execdir sed -e 's/<junit /\0haltonerror="yes" /' -i {} + ||
-		die 'ensure test failures propagate'
-
-	EANT_GENTOO_CLASSPATH+=",hamcrest,junit-4,mockito-4"
-	java-pkg-2_src_test
-}
-
-src_install() {
-	# install basic documentation
-	einstalldocs
-	doman installer/resources/man/eepget.*
-
-	# install main files
-	java-pkg_doso core/c/jbigi/jbigi/libjbigi.so
-	if use amd64 || use x86; then
-		java-pkg_doso core/c/jcpuid/libjcpuid.so
-	fi
-	cd "${S}/pkg-temp" || die 'unable to change dir to built artifacts'
-	java-pkg_dojar lib/*.jar
-	java-pkg_dowar webapps/*.war
-
-	# install shared
-	insinto /usr/share/i2p
-	doins blocklist.txt hosts.txt {clients,i2p*}.config
-	doins -r certificates docs eepsite geoip scripts
-
-	# install daemons
-	newinitd "${FILESDIR}/i2p.init" i2p
-	systemd_dounit "${FILESDIR}/i2p.service"
-
-	# setup dirs
-	keepdir /var/log/i2p /var/lib/i2p
-	fowners i2p:i2p /var/lib/i2p /var/log/i2p
-
-	# create own launchers
-	java-pkg_dolauncher i2prouter --main net.i2p.router.Router --jar i2p.jar \
-		--pwd "${EPREFIX}/usr/share/i2p" \
-		--java_args "\
-			-Di2p.dir.app=${EPREFIX}/var/lib/i2p/app \
-			-Di2p.dir.config=${EPREFIX}/var/lib/i2p/config \
-			-Di2p.dir.router=${EPREFIX}/var/lib/i2p/router \
-			-Di2p.dir.log=${EPREFIX}/var/log/i2p \
-			-DloggerFilenameOverride=${EPREFIX}/var/log/i2p/router-@"
-	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Florian Schmaus]

commit:     4b96e0e108976ba75930626402c74a23770cb0ba
Author:     Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed May 22 21:54:12 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu May 23 09:13:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b96e0e1

net-vpn/i2p: add 2.5.2

Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/36786
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-vpn/i2p/Manifest         |   1 +
 net-vpn/i2p/i2p-2.5.2.ebuild | 247 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 248 insertions(+)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 522c9fe54104..e183f7d68755 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1 +1,2 @@
 DIST i2psource_2.3.0.tar.bz2 33379569 BLAKE2B 56002ad57725216730c6a92eed4c4eb569bfe03e4fcbd811577610f8adf212e9db56e6761f5873933d101e513093b61e296871a122a2e2042945c1fe906bc372 SHA512 dc38174683e2388c0e766db71526e98252fc38c52255bd4529684862edfa05ba25204df97cf09a6084f9833507a0d4ea96e112d1138d9c97d2dd582ef98f9301
+DIST i2psource_2.5.2.tar.bz2 33791390 BLAKE2B ceb74d4dd1c694aa174d9861615f5765f5620a803a5bd8b30eb8f986b2855a70e38c90899ed655f5cb65af5dde1a9572d4bb4ad5d244e5a62805a81325bf8419 SHA512 92ee39fb75b8b3bc4a06ea04831d2267d0fcd52a250eaa5b162f3c1e2c29207a51dcbafe4eab4fcfa87b21317201911d5bdafc118f5493c98bb86d0513fc9c88

diff --git a/net-vpn/i2p/i2p-2.5.2.ebuild b/net-vpn/i2p/i2p-2.5.2.ebuild
new file mode 100644
index 000000000000..ceeda7588621
--- /dev/null
+++ b/net-vpn/i2p/i2p-2.5.2.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 java-ant-2 systemd toolchain-funcs
+
+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"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LANGS=(
+	ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
+	sr sv tk tr uk vi zh zh-TW
+)
+IUSE="${LANGS[@]/#/l10n_}"
+
+CP_DEPEND="
+	dev-java/bcprov:0
+	dev-java/hashcash:1
+	dev-java/httpcomponents-client:4
+	dev-java/identicon:1
+	dev-java/java-getopt:1
+	dev-java/java-service-wrapper:0
+	dev-java/jbcrypt:0
+	dev-java/json-simple:2.3
+	dev-java/json-smart:1
+	dev-java/jsonrpc2-base:1
+	dev-java/jsonrpc2-server:1
+	dev-java/jstl:0
+	dev-java/jstl-api:0
+	dev-java/minidns-core:1
+	dev-java/zxing-core:3
+	dev-java/zxing-javase:3
+	sys-devel/gettext:0[java]
+	www-servers/tomcat:9
+"
+# jdk-11 for bug #932030
+DEPEND="
+	dev-libs/gmp:0=
+	${CP_DEPEND}
+	>=virtual/jdk-11:*
+	test? (
+		>=dev-java/ant-1.10.14-r3:0[junit4]
+		dev-java/hamcrest:0
+		dev-java/junit:4
+		dev-java/mockito:4
+	)
+"
+RDEPEND="
+	${CP_DEPEND}
+	acct-user/i2p
+	acct-group/i2p
+	>=virtual/jre-1.8:*
+"
+
+PATCHES=(
+	"${FILESDIR}/fix-junit-classpath.patch"
+)
+
+EANT_BUILD_TARGET="preppkg-base"
+# no scala as depending on antlib.xml not installed by dev-lang/scala
+EANT_TEST_TARGET="junit.test"
+JAVA_ANT_ENCODING="UTF-8"
+JAVA_ANT_CLASSPATH_TAGS="javac java"
+# built locally
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/core/java/build/i2p.jar"
+EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/router/java/build/router.jar"
+EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/apps/ministreaming/java/build/mstreaming.jar"
+
+DOCS=( README.md history.txt )
+
+src_prepare() {
+	default # apply PATCHES
+	java-pkg-2_src_prepare
+
+	# add our classpath
+	for f in `find -name build.xml`
+	do
+		java-ant_rewrite-classpath "$f"
+	done
+
+	# remove most bundled, excepted the next ones.
+	# apps/addressbook/java/src/net/metanotion too much code drift
+	# apps/i2psnark/java/src/org/klomp/snark too much code drift
+	# apps/jrobin need rrd4j ebuild
+	# apps/routerconsole/java/src/{com,edu} too much code drift
+	# {core,router}/java/src/com/southernstorm/noise use internal symbols
+	# core/java/src/freenet too much code drift
+	# core/java/src/gnu/crypto too much code drift
+	# router/java/src/com/maxmind changed interface
+	# router/java/src/org/cybergarage unable to find version 3
+	# router/java/src/org/freenetproject too big to pull
+	# router/java/src/org/xlattice changed interface
+	java-pkg_clean ! \
+		-path "./apps/jetty/jetty-distribution-*" # need to package jetty
+	( cat >> override.properties || die 'set unbundled properties' ) <<- EOF
+		require.gettext=true
+		with-libgetopt-java=true
+		with-libjakarta-taglibs-standard-java=true
+		with-libjson-simple-java=true
+		with-libtomcat9-java=true
+		with-gettext-base=true
+		# with-geoip-database=true need std geoip use
+		# with-libjetty9-java=true needs a jetty ebuild
+	EOF
+
+	# bcprov
+	rm -r core/java/src/net/i2p/crypto/elgamal || die 'unbundle bcprov'
+	sed -e 's,net\.i2p\.crypto\.elgamal\.impl,org.bouncycastle.jce.provider,' \
+		-e 's,net\.i2p\.crypto\.elgamal\.spec,org.bouncycastle.jce.spec,' \
+		-i core/java/src/net/i2p/crypto/{provider/I2PProvider,CryptoConstants}.java ||
+		die 'redirect imports of bcprov'
+	# getopt, gettext
+	rm -r core/java/src/gnu/{getopt,gettext} || die 'unbundle GNU code'
+	# httpcomponents-client
+	rm -r core/java/src/net/i2p/apache || die 'unbundle httpcomponents-client'
+	sed -e 's,net\.i2p\.apache,org.apache,' \
+		-i core/java/src/net/i2p/util/{Addresses,I2PSSLSocketFactory}.java \
+			apps/i2pcontrol/java/net/i2p/i2pcontrol/HostCheckHandler.java ||
+		die 'redirect imports of httpcomponents-client'
+	# identicon, zxing
+	rm -r apps/imagegen/{identicon,zxing} || die 'unbundle identicon & zxing'
+	sed -e '/LICENSE-Identicon.txt/d' -i build.xml &&
+	sed -E '/dir="[^"]*(identicon|zxing)/d' -i apps/imagegen{/imagegen,}/build.xml &&
+	sed -E '/(todir="build\/WEB-INF\/classes"|<\/copy>)/d' -i apps/imagegen/imagegen/build.xml ||
+		die 'do not depend on unbundled'
+	# hashcash
+	rm core/java/src/com/nettgryppa/security/HashCash.java ||
+		die 'unbundle hashcash'
+	# jbcrypt, jsonrpc2-*
+	rm -r apps/i2pcontrol/java/{com,org} || die 'unbundle jbcrypt & jsonrpc2-*'
+	# jstl*
+	sed -E '/"apps\/susidns\/src\/lib\/(jstl|standard).jar"/d' -i build.xml ||
+		die 'unbundle jstl*'
+	# minidns-core, json-simple
+	rm -r core/java/src/org || die 'unbundle minidns-core & json-simple'
+
+	# keep only enabled locales
+	local lang
+	for lang in ${LANGS[@]}
+	do
+		if ! use "l10n_${lang}"
+		then
+			find -regextype egrep \
+					-regex ".*[_\\./]${lang/-/_}.(html|po|1)" \
+				-delete || die "unbundling ${lang} translations"
+		fi
+	done
+
+	# fix some locale names
+	find -name '*_in.*' -exec rename --no-overwrite _in. _id. {} \; &&
+	find -name '*_iw.*' -exec rename --no-overwrite _iw. _he. {} \; ||
+		die 'fix some locale names'
+}
+
+src_configure() {
+	java-ant-2_src_configure
+
+	# deamon shouldn't start GUI
+	sed -i 's|\(clientApp.4.startOnLoad\)=true|\1=false|' \
+		installer/resources/clients.config ||
+		die 'avoid auto starting browser'
+
+	# yep, that's us
+	echo "build.built-by=Gentoo" >> override.properties ||
+		die 'bragging failed'
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	local compile_lib
+	compile_lib() {
+		local name="${1}"
+		shift 1
+
+		"$(tc-getCC)" "${@}" -Iinclude ${CFLAGS} $(java-pkg_get-jni-cflags) \
+			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
+			"src/${name}.c" -o "lib${name}.so"
+	}
+
+	cd "${S}/core/c/jbigi/jbigi" || die "unable to cd to jbigi"
+	compile_lib jbigi -lgmp || die "unable to build jbigi"
+
+	if use amd64 || use x86; then
+		cd "${S}/core/c/jcpuid" || die "unable to cd to jcpuid"
+		compile_lib jcpuid || die "unable to build jcpuid"
+	fi
+}
+
+src_test() {
+	# avoid rebuilding
+	sed -e '/<delete dir=".\/build" \/>/d' -i core/java/build.xml ||
+		die 'avoid building twice'
+
+	# halt on error
+	find -name build.xml \
+		-execdir sed -e 's/<junit /\0haltonerror="yes" /' -i {} + ||
+		die 'ensure test failures propagate'
+
+	EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest,junit-4,mockito-4"
+	java-pkg-2_src_test
+}
+
+src_install() {
+	# install basic documentation
+	einstalldocs
+	doman installer/resources/man/eepget.*
+
+	# install main files
+	java-pkg_doso core/c/jbigi/jbigi/libjbigi.so
+	if use amd64 || use x86; then
+		java-pkg_doso core/c/jcpuid/libjcpuid.so
+	fi
+	cd "${S}/pkg-temp" || die 'unable to change dir to built artifacts'
+	java-pkg_dojar lib/*.jar
+	java-pkg_dowar webapps/*.war
+
+	# install shared
+	insinto /usr/share/i2p
+	doins blocklist.txt hosts.txt {clients,i2p*}.config
+	doins -r certificates docs eepsite geoip scripts
+
+	# install daemons
+	newinitd "${FILESDIR}/i2p.init" i2p
+	systemd_dounit "${FILESDIR}/i2p.service"
+
+	# setup dirs
+	keepdir /var/log/i2p /var/lib/i2p
+	fowners i2p:i2p /var/lib/i2p /var/log/i2p
+
+	# create own launchers
+	java-pkg_dolauncher i2prouter --main net.i2p.router.Router --jar i2p.jar \
+		--pwd "${EPREFIX}/usr/share/i2p" \
+		--java_args "\
+			-Di2p.dir.config=${EPREFIX}/var/lib/i2p \
+			-Di2p.dir.log=${EPREFIX}/var/log/i2p \
+			-DloggerFilenameOverride=${EPREFIX}/var/log/i2p/router-@"
+	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Florian Schmaus]

commit:     47500446066873dca19cc142fbeb99afca58e8de
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 09:13:33 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu May 23 09:14:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47500446

net-vpn/i2p: drop no-op sed expression, as reported by iwdevtools

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-vpn/i2p/i2p-2.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/i2p/i2p-2.5.2.ebuild b/net-vpn/i2p/i2p-2.5.2.ebuild
index ceeda7588621..0230dbb8dd40 100644
--- a/net-vpn/i2p/i2p-2.5.2.ebuild
+++ b/net-vpn/i2p/i2p-2.5.2.ebuild
@@ -113,7 +113,7 @@ src_prepare() {
 
 	# bcprov
 	rm -r core/java/src/net/i2p/crypto/elgamal || die 'unbundle bcprov'
-	sed -e 's,net\.i2p\.crypto\.elgamal\.impl,org.bouncycastle.jce.provider,' \
+	sed \
 		-e 's,net\.i2p\.crypto\.elgamal\.spec,org.bouncycastle.jce.spec,' \
 		-i core/java/src/net/i2p/crypto/{provider/I2PProvider,CryptoConstants}.java ||
 		die 'redirect imports of bcprov'

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Miroslav Šulc]

commit:     3184118ec41dc0396b37b920d05b150ad81538b1
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 09:18:12 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu May 23 09:19:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3184118e

net-vpn/i2p: fixed runtime java version on 2.5.2

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 net-vpn/i2p/{i2p-2.5.2.ebuild => i2p-2.5.2-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/i2p/i2p-2.5.2.ebuild b/net-vpn/i2p/i2p-2.5.2-r1.ebuild
similarity index 99%
rename from net-vpn/i2p/i2p-2.5.2.ebuild
rename to net-vpn/i2p/i2p-2.5.2-r1.ebuild
index 0230dbb8dd40..5cb884a1b827 100644
--- a/net-vpn/i2p/i2p-2.5.2.ebuild
+++ b/net-vpn/i2p/i2p-2.5.2-r1.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 	${CP_DEPEND}
 	acct-user/i2p
 	acct-group/i2p
-	>=virtual/jre-1.8:*
+	>=virtual/jre-11:*
 "
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Florian Schmaus]

commit:     45bce3abccdf0b1f5203d31a061efde3feaf7c19
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri May 17 10:04:16 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri May 24 09:42:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45bce3ab

net-vpn/i2p: restrict to >=virtual/jdk-11:* for #932030

- Updates to >=dev-java/ant-1.10.14-r3
- Removes obsolete check for MERGE_VM

Closes: https://bugs.gentoo.org/932030
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36717
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 .../i2p/{i2p-2.3.0-r2.ebuild => i2p-2.3.0-r3.ebuild} | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/net-vpn/i2p/i2p-2.3.0-r2.ebuild b/net-vpn/i2p/i2p-2.3.0-r3.ebuild
similarity index 93%
rename from net-vpn/i2p/i2p-2.3.0-r2.ebuild
rename to net-vpn/i2p/i2p-2.3.0-r3.ebuild
index 31f2d30af985..1be7a9458c8f 100644
--- a/net-vpn/i2p/i2p-2.3.0-r2.ebuild
+++ b/net-vpn/i2p/i2p-2.3.0-r3.ebuild
@@ -41,12 +41,13 @@ CP_DEPEND="
 	sys-devel/gettext:0[java]
 	www-servers/tomcat:9
 "
+# jdk-11 for bug #932030
 DEPEND="
 	dev-libs/gmp:0=
 	${CP_DEPEND}
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	test? (
-		dev-java/ant:0[junit4]
+		>=dev-java/ant-1.10.14-r3:0[junit4]
 		dev-java/hamcrest:0
 		dev-java/junit:4
 		dev-java/mockito:4
@@ -75,21 +76,6 @@ EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/apps/ministreaming/java/build/mstreaming.jar
 
 DOCS=( README.md history.txt )
 
-pkg_pretend() {
-	# see https://bugs.gentoo.org/831290
-	if [[ "`java-config --show-active-vm`" = *-8 ]] &&
-		[[ "`java-config --query MERGE_VM --package=ant-core`" != *-8 ]]
-	then
-		eerror "dev-java/ant-core was emerged with a newer version of the JDK."
-		eerror "It will fail to build with virtual/jdk:1.8 due to #831290."
-		eerror "Please switch to a newer JDK"
-		eerror "  eselect java-vm set system ..."
-		eerror "Or remerge dev-java/ant-core with virtual/jdk:1.8"
-		eerror "  emerge dev-java/ant-core"
-		die 'bad JDK for ant-core'
-	fi
-}
-
 src_prepare() {
 	default # apply PATCHES
 	java-pkg-2_src_prepare

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Miroslav Šulc]

commit:     00113e8e03f5f1a495108377549a0e0dda814977
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 11:01:12 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri May 24 11:01:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00113e8e

net-vpn/i2p: fixed runtime java version in 2.3.0

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 net-vpn/i2p/{i2p-2.3.0-r3.ebuild => i2p-2.3.0-r4.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/i2p/i2p-2.3.0-r3.ebuild b/net-vpn/i2p/i2p-2.3.0-r4.ebuild
similarity index 99%
rename from net-vpn/i2p/i2p-2.3.0-r3.ebuild
rename to net-vpn/i2p/i2p-2.3.0-r4.ebuild
index 1be7a9458c8f..891961cb7373 100644
--- a/net-vpn/i2p/i2p-2.3.0-r3.ebuild
+++ b/net-vpn/i2p/i2p-2.3.0-r4.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 	${CP_DEPEND}
 	acct-user/i2p
 	acct-group/i2p
-	>=virtual/jre-1.8:*
+	>=virtual/jre-11:*
 "
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Joonas Niilola]

commit:     06db896ccee94e0be96e8f63c11b28d4d956ef7b
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 29 06:21:21 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 06:22:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06db896c

net-vpn/i2p: Stabilize 2.5.2-r1 amd64, #934733

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-vpn/i2p/i2p-2.5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/i2p/i2p-2.5.2-r1.ebuild b/net-vpn/i2p/i2p-2.5.2-r1.ebuild
index 5cb884a1b827..75455d2c88fa 100644
--- a/net-vpn/i2p/i2p-2.5.2-r1.ebuild
+++ b/net-vpn/i2p/i2p-2.5.2-r1.ebuild
@@ -14,7 +14,7 @@ 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"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 LANGS=(
 	ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
 	sr sv tk tr uk vi zh zh-TW

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/

[Miroslav Šulc]

commit:     98990a498fb66ce11dd92ec26bc314c8c6cefba0
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jun 29 06:36:00 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 09:50:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98990a49

net-vpn/i2p: drop 2.3.0-r4

Closes: https://bugs.gentoo.org/922986
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/37342
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 net-vpn/i2p/Manifest            |   1 -
 net-vpn/i2p/i2p-2.3.0-r4.ebuild | 277 ----------------------------------------
 2 files changed, 278 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index e183f7d68755..64b2a9814809 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1 @@
-DIST i2psource_2.3.0.tar.bz2 33379569 BLAKE2B 56002ad57725216730c6a92eed4c4eb569bfe03e4fcbd811577610f8adf212e9db56e6761f5873933d101e513093b61e296871a122a2e2042945c1fe906bc372 SHA512 dc38174683e2388c0e766db71526e98252fc38c52255bd4529684862edfa05ba25204df97cf09a6084f9833507a0d4ea96e112d1138d9c97d2dd582ef98f9301
 DIST i2psource_2.5.2.tar.bz2 33791390 BLAKE2B ceb74d4dd1c694aa174d9861615f5765f5620a803a5bd8b30eb8f986b2855a70e38c90899ed655f5cb65af5dde1a9572d4bb4ad5d244e5a62805a81325bf8419 SHA512 92ee39fb75b8b3bc4a06ea04831d2267d0fcd52a250eaa5b162f3c1e2c29207a51dcbafe4eab4fcfa87b21317201911d5bdafc118f5493c98bb86d0513fc9c88

diff --git a/net-vpn/i2p/i2p-2.3.0-r4.ebuild b/net-vpn/i2p/i2p-2.3.0-r4.ebuild
deleted file mode 100644
index 891961cb7373..000000000000
--- a/net-vpn/i2p/i2p-2.3.0-r4.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="test"
-
-inherit java-pkg-2 java-ant-2 systemd toolchain-funcs
-
-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"
-
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-LANGS=(
-	ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
-	sr sv tk tr uk vi zh zh-TW
-)
-IUSE="${LANGS[@]/#/l10n_}"
-
-CP_DEPEND="
-	dev-java/bcprov:0
-	dev-java/hashcash:1
-	dev-java/httpcomponents-client:4
-	dev-java/identicon:1
-	dev-java/java-getopt:1
-	dev-java/java-service-wrapper:0
-	dev-java/jbcrypt:0
-	dev-java/json-simple:2.3
-	dev-java/json-smart:1
-	dev-java/jsonrpc2-base:1
-	dev-java/jsonrpc2-server:1
-	dev-java/jstl:0
-	dev-java/jstl-api:0
-	dev-java/minidns-core:1
-	dev-java/zxing-core:3
-	dev-java/zxing-javase:3
-	sys-devel/gettext:0[java]
-	www-servers/tomcat:9
-"
-# jdk-11 for bug #932030
-DEPEND="
-	dev-libs/gmp:0=
-	${CP_DEPEND}
-	>=virtual/jdk-11:*
-	test? (
-		>=dev-java/ant-1.10.14-r3:0[junit4]
-		dev-java/hamcrest:0
-		dev-java/junit:4
-		dev-java/mockito:4
-	)
-"
-RDEPEND="
-	${CP_DEPEND}
-	acct-user/i2p
-	acct-group/i2p
-	>=virtual/jre-11:*
-"
-
-PATCHES=(
-	"${FILESDIR}/fix-junit-classpath.patch"
-)
-
-EANT_BUILD_TARGET="preppkg-base"
-# no scala as depending on antlib.xml not installed by dev-lang/scala
-EANT_TEST_TARGET="junit.test"
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_CLASSPATH_TAGS="javac java"
-# built locally
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/core/java/build/i2p.jar"
-EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/router/java/build/router.jar"
-EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/apps/ministreaming/java/build/mstreaming.jar"
-
-DOCS=( README.md history.txt )
-
-src_prepare() {
-	default # apply PATCHES
-	java-pkg-2_src_prepare
-
-	# add our classpath
-	for f in `find -name build.xml`
-	do
-		java-ant_rewrite-classpath "$f"
-	done
-
-	# remove most bundled, excepted the next ones.
-	# apps/addressbook/java/src/net/metanotion too much code drift
-	# apps/i2psnark/java/src/org/klomp/snark too much code drift
-	# apps/jrobin need rrd4j ebuild
-	# apps/routerconsole/java/src/{com,edu} too much code drift
-	# {core,router}/java/src/com/southernstorm/noise use internal symbols
-	# core/java/src/freenet too much code drift
-	# core/java/src/gnu/crypto too much code drift
-	# router/java/src/com/maxmind changed interface
-	# router/java/src/org/cybergarage unable to find version 3
-	# router/java/src/org/freenetproject too big to pull
-	# router/java/src/org/xlattice changed interface
-	java-pkg_clean ! \
-		-path "./apps/jetty/jetty-distribution-*" # need to package jetty
-	( cat >> override.properties || die 'set unbundled properties' ) <<- EOF
-		require.gettext=true
-		with-libgetopt-java=true
-		with-libjakarta-taglibs-standard-java=true
-		with-libjson-simple-java=true
-		with-libtomcat9-java=true
-		with-gettext-base=true
-		# with-geoip-database=true need std geoip use
-		# with-libjetty9-java=true needs a jetty ebuild
-	EOF
-
-	# bcprov
-	rm -r core/java/src/net/i2p/crypto/elgamal || die 'unbundle bcprov'
-	sed -e 's,net\.i2p\.crypto\.elgamal\.impl,org.bouncycastle.jce.provider,' \
-		-e 's,net\.i2p\.crypto\.elgamal\.spec,org.bouncycastle.jce.spec,' \
-		-i core/java/src/net/i2p/crypto/{provider/I2PProvider,CryptoConstants}.java ||
-		die 'redirect imports of bcprov'
-	# getopt, gettext
-	rm -r core/java/src/gnu/{getopt,gettext} || die 'unbundle GNU code'
-	# httpcomponents-client
-	rm -r core/java/src/net/i2p/apache || die 'unbundle httpcomponents-client'
-	sed -e 's,net\.i2p\.apache,org.apache,' \
-		-i core/java/src/net/i2p/util/{Addresses,I2PSSLSocketFactory}.java \
-			apps/i2pcontrol/java/net/i2p/i2pcontrol/HostCheckHandler.java ||
-		die 'redirect imports of httpcomponents-client'
-	# identicon, zxing
-	rm -r apps/imagegen/{identicon,zxing} || die 'unbundle identicon & zxing'
-	sed -e '/LICENSE-Identicon.txt/d' -i build.xml &&
-	sed -E '/dir="[^"]*(identicon|zxing)/d' -i apps/imagegen{/imagegen,}/build.xml &&
-	sed -E '/(todir="build\/WEB-INF\/classes"|<\/copy>)/d' -i apps/imagegen/imagegen/build.xml ||
-		die 'do not depend on unbundled'
-	# hashcash
-	rm core/java/src/com/nettgryppa/security/HashCash.java ||
-		die 'unbundle hashcash'
-	# jbcrypt, jsonrpc2-*
-	rm -r apps/i2pcontrol/java/{com,org} || die 'unbundle jbcrypt & jsonrpc2-*'
-	# jstl*
-	sed -E '/"apps\/susidns\/src\/lib\/(jstl|standard).jar"/d' -i build.xml ||
-		die 'unbundle jstl*'
-	# minidns-core, json-simple
-	rm -r core/java/src/org || die 'unbundle minidns-core & json-simple'
-
-	# keep only enabled locales
-	local lang
-	for lang in ${LANGS[@]}
-	do
-		if ! use "l10n_${lang}"
-		then
-			find -regextype egrep \
-					-regex ".*[_\\./]${lang/-/_}.(html|po|1)" \
-				-delete || die "unbundling ${lang} translations"
-		fi
-	done
-
-	# fix some locale names
-	find -name '*_in.*' -exec rename --no-overwrite _in. _id. {} \; &&
-	find -name '*_iw.*' -exec rename --no-overwrite _iw. _he. {} \; ||
-		die 'fix some locale names'
-}
-
-src_configure() {
-	java-ant-2_src_configure
-
-	# deamon shouldn't start GUI
-	sed -i 's|\(clientApp.4.startOnLoad\)=true|\1=false|' \
-		installer/resources/clients.config ||
-		die 'avoid auto starting browser'
-
-	# yep, that's us
-	echo "build.built-by=Gentoo" >> override.properties ||
-		die 'bragging failed'
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	local compile_lib
-	compile_lib() {
-		local name="${1}"
-		local file="${2}"
-		shift 2
-
-		"$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
-			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
-			"${file}" -o "lib${name}.so"
-	}
-
-	cd "${S}/core/c/jbigi/jbigi" || die "unable to cd to jbigi"
-	compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
-		die "unable to build jbigi"
-
-	if use amd64 || use x86; then
-		cd "${S}/core/c/jcpuid" || die "unable to cd to jcpuid"
-		compile_lib jcpuid src/jcpuid.c -Iinclude ||
-			die "unable to build jcpuid"
-	fi
-}
-
-src_test() {
-	# avoid rebuilding
-	sed -e '/<delete dir=".\/build" \/>/d' -i core/java/build.xml ||
-		die 'avoid building twice'
-
-	# halt on error
-	find -name build.xml \
-		-execdir sed -e 's/<junit /\0haltonerror="yes" /' -i {} + ||
-		die 'ensure test failures propagate'
-
-	EANT_GENTOO_CLASSPATH+=",hamcrest,junit-4,mockito-4"
-	java-pkg-2_src_test
-}
-
-src_install() {
-	# install basic documentation
-	einstalldocs
-	doman installer/resources/man/eepget.*
-
-	# install main files
-	java-pkg_doso core/c/jbigi/jbigi/libjbigi.so
-	if use amd64 || use x86; then
-		java-pkg_doso core/c/jcpuid/libjcpuid.so
-	fi
-	cd "${S}/pkg-temp" || die 'unable to change dir to built artifacts'
-	java-pkg_dojar lib/*.jar
-	java-pkg_dowar webapps/*.war
-
-	# install shared
-	insinto /usr/share/i2p
-	doins blocklist.txt hosts.txt {clients,i2p*}.config
-	doins -r certificates docs eepsite geoip scripts
-
-	# install daemons
-	newinitd "${FILESDIR}/i2p.init" i2p
-	systemd_dounit "${FILESDIR}/i2p.service"
-
-	# setup dirs
-	keepdir /var/log/i2p /var/lib/i2p
-	fowners i2p:i2p /var/lib/i2p /var/log/i2p
-
-	# create own launchers
-	java-pkg_dolauncher i2prouter --main net.i2p.router.Router --jar i2p.jar \
-		--pwd "${EPREFIX}/usr/share/i2p" \
-		--java_args "\
-			-Di2p.dir.config=${EPREFIX}/var/lib/i2p \
-			-Di2p.dir.log=${EPREFIX}/var/log/i2p \
-			-DloggerFilenameOverride=${EPREFIX}/var/log/i2p/router-@"
-	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
-}
-
-pkg_postinst() {
-	local i2pdir="${EPREFIX}/var/lib/i2p"
-
-	[ -d "${i2pdir}/app" -a -d "${i2pdir}/config" -a -d "${i2pdir}/router" ] || return
-
-	elog "Separated user directories is not fully supported by upstream."
-	elog "${i2pdir}/{app,config,router} will be merged"
-	elog "in ${i2pdir} accordingly."
-
-	ebegin "Migrating"
-	rm -fr "${i2pdir}/config/addressbook" # prefer router's addressbook
-	local ret=0
-	mv "${i2pdir}"/{app,config,router}/* "${i2pdir}" || ret=1
-	rmdir "${i2pdir}"/{app,config,router} || ret=1
-	find "${i2pdir}" '(' -name '*.config' -o -name '*.xml' ')' \
-		-execdir sed -E "s,${i2pdir}/(app|config|router),${i2pdir}," -i {} + || ret=1
-
-	if ! eend $ret
-	then
-		ewarn "Unable to merge user directories automatically."
-		ewarn "Please merge them by hand and update all configured paths"
-		ewarn "to point to ${i2pdir} before starting the router."
-		ewarn
-		ewarn "Otherwise, consider starting with a fresh router by removing ${i2pdir}."
-	fi
-}