gentoo resync 08.09.2018

3 files changed, 11 insertions, 166 deletions

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index efa9342d6860..508dfeff9290 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -3,10 +3,8 @@ AUX i2p-0.9.31.initd 1107 BLAKE2B fdfda220dd31fd2f49c1b92e9d1cd64ff3787a9f94031f
 AUX i2p-0.9.31.service 244 BLAKE2B c5532fc4554d738e71f820ece48101452d1e1ae9ddf2280808e215037d73a15f4ec65d77eaafab962e280a48666e26b45c74849896aab6c4c06b6dde15ecb013 SHA512 409438616aa655630e0e3256052fee831a8f68728b67eef077f5ea303d6dcccb06bbb549af5ee1023ef60ee6fa264d0170d991dbbdc0cc70335b030c73a7e6c8
 AUX i2p.init 489 BLAKE2B f7c484713fa043f1db991e95d58f0d184c0d49062e807671f6aca2c7489ad52e072e2d0f5b6c5b666cbda77764e90da6506b7fd0f7a5b2fb34bbfc0b3c96da53 SHA512 3b9b2bce4359f0ba32f690f7922ed95ccaa133b1cff2e5a1d6bfc91a380757f79f03e8a4966259d19ec888e6db468825e6a9d0d1acdba9d38c81a86b99c4229a
 AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
-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
-EBUILD i2p-0.9.31.ebuild 4239 BLAKE2B ae3db6272e5f18cdb07d42a6bdf7c8c4d8912e29424dfe30ce733a2a34ee00d0f3cad8cd0a17477829de6f68f8f71bb490ad937bd023f56df2a9a38f54145947 SHA512 3139cc083e5e13d5c4d7693801127bf271f1431e103373561ecb27829b5206435f0050cb6b417f46ef1c03394122a989000450805aa91b05c1847f8dc09857e8
-EBUILD i2p-0.9.33.ebuild 4227 BLAKE2B 8a0270c41a8c3ca6d727cf01eb1daf58aba144b384039bb131d70d18f18f79c9baabed9d2f21bf0a10bc0a4843ff074f94a0ba33c903540717e13d5fe4f59460 SHA512 a3143b919829a2e67ff8429965b90a6dbd3fa8f81562cbf0512fdc7123c89b028bd24878d93a7abb5d40e4ae2f547b740d37b809569fefd93418cbb7c6eee025
+DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
 EBUILD i2p-0.9.34.ebuild 4049 BLAKE2B a0104622fd5e19989304d3c0572715ea87cb9684aa6c8f0ef264f5fc17f592a1865e14211c932a4a0a8cb89e05f2f914a20867c141d2009764a60c361a2e0e3d SHA512 66fd700c6493bc79b5580b3c811eb0a7043d69b2b1033d4b1f0d95a5c0071a7af33a358a11c308ff9afc16a4b9027168d5cee13a2db7f55ac3ed3cfdbf13c314
+EBUILD i2p-0.9.36.ebuild 4184 BLAKE2B 58fcad81d8247848e26af7881178618720778af04d513d972e4e894eeb37509cef7c09840bc075fe81b6de77ba33609d1bea73675cbc1ef2fd5cfa3dd3e82864 SHA512 46e4e100d34e65d11383a0e731788866e9c77137050c95c02869ebf4ae1db098bcaa9f1c31adc549ff3c6b02b667d257ea560fa62e90ea2214efac7e715ef1bf
 MISC metadata.xml 894 BLAKE2B 7f1415ae58ff6b83e05824111e0de818bce0f6b00fda294124eb838d3d24bab43e03f9224cdb3eb5e9b0625cb4a930fce107aa508275e398362ae4d3be502a73 SHA512 dbb318ce927a56d1f0d84cec63b1265969dd4d77021d36ee93e253c4cf02238265aa02a292353d6f520c223b433ce7dcafe605ce2bf97fa253e97f286be34cdb
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 bf868bfbd84c..000000000000
--- 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.36.ebuild
index cf3d2654ed13..5bedf3debbfa 100644
--- a/net-vpn/i2p/i2p-0.9.33.ebuild
+++ b/net-vpn/i2p/i2p-0.9.36.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit java-pkg-2 java-ant-2 systemd user
+inherit java-pkg-2 java-ant-2 multilib systemd user
 
 DESCRIPTION="A privacy-centric, anonymous network"
 HOMEPAGE="https://geti2p.net"
@@ -26,7 +26,6 @@ CP_DEPEND="dev-java/bcprov:1.50
 
 DEPEND="${CP_DEPEND}
 	dev-java/eclipse-ecj:*
-	dev-libs/gmp:0
 	nls? ( >=sys-devel/gettext-0.19 )
 	>=virtual/jdk-1.7"
 
@@ -39,7 +38,9 @@ RDEPEND="${CP_DEPEND}
 			dev-java/oracle-jdk-bin
 		)
 	)
-	!ecdsa? ( >=virtual/jre-1.7 )"
+	!ecdsa? ( >=virtual/jre-1.7 )
+	net-libs/nativebiginteger:0
+"
 
 EANT_BUILD_TARGET="pkg"
 JAVA_ANT_ENCODING="UTF-8"
@@ -82,13 +83,14 @@ src_prepare() {
 	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,i2prouter,runplain.sh,wrapper.config} || die
+		-i 'installer/resources/'{eepget,runplain.sh,wrapper.config} || die
 }
 
 src_install() {
@@ -96,21 +98,16 @@ src_install() {
 	cd "${S}/pkg-temp" || die
 
 	# we remove system installed jar and install the others
-	rm lib/{jrobin.jar,wrapper.jar} || \
+	rm lib/{jrobin.jar,wrapper.jar,jbigi.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'
+	# create own launcher
+	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
 
 	# 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/*