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

["Sam James" <sam@gentoo.org>]

commit:     9ce679d4e9e2d0934814a61cc6bbeaf10da2a02b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 17:22:57 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 17:23:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ce679d4

net-vpn/i2p: drop 1.7.0-r1

Bug: https://bugs.gentoo.org/906882
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-vpn/i2p/Manifest                |   1 -
 net-vpn/i2p/files/1.7.0-i2p.init    |  17 -----
 net-vpn/i2p/files/1.7.0-i2p.service |  10 ---
 net-vpn/i2p/i2p-1.7.0-r1.ebuild     | 139 ------------------------------------
 net-vpn/i2p/metadata.xml            |   3 -
 5 files changed, 170 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 43dcdae21217..443372783e38 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,3 +1,2 @@
-DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f
 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/files/1.7.0-i2p.init b/net-vpn/i2p/files/1.7.0-i2p.init
deleted file mode 100644
index d59899b899e9..000000000000
--- a/net-vpn/i2p/files/1.7.0-i2p.init
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-readonly WRAPPER_CONF="/usr/share/i2p/wrapper.config"
-
-command=wrapper
-command_args="$WRAPPER_CONF wrapper.syslog.ident=i2p"
-command_background=true
-command_progress=true
-command_user=i2p
-pidfile=/var/run/i2p.pid
-retry='SIGTERM/20 SIGKILL/20'

diff --git a/net-vpn/i2p/files/1.7.0-i2p.service b/net-vpn/i2p/files/1.7.0-i2p.service
deleted file mode 100644
index 87c218075a1c..000000000000
--- a/net-vpn/i2p/files/1.7.0-i2p.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Invisible Internet Project
-After=network.target
-
-[Service]
-User=i2p
-ExecStart=/usr/bin/wrapper /usr/share/i2p/wrapper.config wrapper.syslog.ident=i2p wrapper.logfile=/var/lib/i2p/.i2p/wrapper.log
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-vpn/i2p/i2p-1.7.0-r1.ebuild b/net-vpn/i2p/i2p-1.7.0-r1.ebuild
deleted file mode 100644
index 16802953f72a..000000000000
--- a/net-vpn/i2p/i2p-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2023 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 ~arm64 ~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
-	local classpath="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n"
-	classpath+="wrapper.java.classpath.2=$(java-pkg_getjars java-service-wrapper)\n"
-
-	# 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}/${PV}-i2p.init" i2p
-	systemd_dounit "${FILESDIR}/${PV}-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
-}

diff --git a/net-vpn/i2p/metadata.xml b/net-vpn/i2p/metadata.xml
index 4897b7bf0281..fa444480afee 100644
--- a/net-vpn/i2p/metadata.xml
+++ b/net-vpn/i2p/metadata.xml
@@ -14,9 +14,6 @@
 		<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>