From 73c318acdaf6f8309d68bd266051e6dd1f1bd787 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 8 Jun 2019 09:04:53 +0100
Subject: gentoo resync : 08.06.2019

---
 net-vpn/i2p/Manifest          |   4 +-
 net-vpn/i2p/i2p-0.9.38.ebuild | 161 ------------------------------------------
 net-vpn/i2p/i2p-0.9.40.ebuild | 157 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 159 insertions(+), 163 deletions(-)
 delete mode 100644 net-vpn/i2p/i2p-0.9.38.ebuild
 create mode 100644 net-vpn/i2p/i2p-0.9.40.ebuild

(limited to 'net-vpn/i2p')

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 9b3babf2c8e8..5d80bf5d6fb1 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,8 +1,8 @@
 AUX 0.9.38-add-cp-to-tests 2908 BLAKE2B ab78902afe450bd4f6c5741900cf4e88c5760726b95cae4b74092104a84a05073e227d382080db6af09a96a1034d8e20ec1b4a9c9a6fa6894e7df37e9d887399 SHA512 f2725aea99a37820048cbd8af4f17fd7b3702eba5c2d2d9816bb20a531c9c643e94dd8c88a8b4cd40240ba0fbf20dd85dcb30a7f84f7bcd97dfea5420e8724ac
 AUX i2p.init 489 BLAKE2B f7c484713fa043f1db991e95d58f0d184c0d49062e807671f6aca2c7489ad52e072e2d0f5b6c5b666cbda77764e90da6506b7fd0f7a5b2fb34bbfc0b3c96da53 SHA512 3b9b2bce4359f0ba32f690f7922ed95ccaa133b1cff2e5a1d6bfc91a380757f79f03e8a4966259d19ec888e6db468825e6a9d0d1acdba9d38c81a86b99c4229a
 AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
-DIST i2psource_0.9.38.tar.bz2 30702106 BLAKE2B c0fd4ea21643edff06853825b9b09dbd648176b6a2318c6bb3846b7c198cac88f89525df0868affbc337e31ec3459f08235cd8a52d38b8551d235c9ef2ca4a4c SHA512 148cd1504dbf0a86367b6dc120a27b2d0d936857eb8cf524e86982d6499c5a831a40aacb3ed67570ad2c323be6545e9a66c12dfc4be2377b80f4d7152e04452d
 DIST i2psource_0.9.39.tar.bz2 30518064 BLAKE2B da5f4f74db38e932a8d1504dd454f308b6a47e0b308ecb646aafc349c20696d5f18107b393a7a5c3e5a7a24c1f2463657ede1ae6629023d9f817cc5bf0b00d85 SHA512 03ae294a2dbb1c7267484e8b0700ea112820e767ce7e90bc50dc90a1ed621586bd507c6ea80ba177d3498c0959fc1c9d71b51821d527fa48c34847ffbf5c466c
-EBUILD i2p-0.9.38.ebuild 4618 BLAKE2B 35befafb709b7d61ea4e0c9ec69ef5412703ac659e298ac2568a6995109f1a0741695deafa34ec828f1fb2ccc90c27dbb9ae4e3e85b10a2ae44c00a7c4398fbd SHA512 2c7fe6101d65197b72ff1516802431731ccf0c83169e93de85e5458bfd668ff6353080c6ab2cb18945198ebca358769a1856cf4489e0e72bff70a21f2a59cdd2
+DIST i2psource_0.9.40.tar.bz2 30808508 BLAKE2B b4b81800c4fdcd1c9318e884d6a06f442c28cc902c1aa67a35343b3d61cf95a02186b8e56e455d3896de081d44fd9fa7c2fac1f21f176be3c0b1ca473b6416fa SHA512 297b0bf92405c6e564c5e8c9708bf5b99b8eac721cec04fc74bebac1ff0cd7eae2795cc9788357fb7a9c60d7af37766ae343456203a81b9c2444cda39f3fe46d
 EBUILD i2p-0.9.39.ebuild 4568 BLAKE2B d79911a88386dbcc02791fbae143be8353f3774f5a2aa5a058a8dc24d451c33e64621bfa27b76528d0c228496c099cc1ae414872e50775ad2b0b8ab0ba1798c1 SHA512 3d1142911ff90037b0b9f8f9a8d9c4d70c9f57bbb709f05eae7b5e99390ca5bd37b43b53165d3eb1128f8e881be37ce24307ed005585e3be57a1a390de02f146
+EBUILD i2p-0.9.40.ebuild 4568 BLAKE2B d79911a88386dbcc02791fbae143be8353f3774f5a2aa5a058a8dc24d451c33e64621bfa27b76528d0c228496c099cc1ae414872e50775ad2b0b8ab0ba1798c1 SHA512 3d1142911ff90037b0b9f8f9a8d9c4d70c9f57bbb709f05eae7b5e99390ca5bd37b43b53165d3eb1128f8e881be37ce24307ed005585e3be57a1a390de02f146
 MISC metadata.xml 709 BLAKE2B b429dbd7d8c4c6d7e9f829d77fc30f8bb0147d3a4e252874d5f1f905a45e7b46f380ea7d25f5a52d871545fff4891a80756bc227d61e101c2bcf17f6e72584bb SHA512 e5e3dd0ec86672394b94e5d740c21a014e42c7d3be502a1bac15f809b39fea25e00493cd70f441752e65da253424945e2fb5c7a86c9b31898f4a17d2ad19bafe
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 396878e979b4..000000000000
--- 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'
-}
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 000000000000..f9b032fe1103
--- /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'
+}
-- 
cgit v1.2.3