Merge remote-tracking branch 'github/pr/815'.

Gentoo-Bug: 573978
Pull-Request: https://github.com/gentoo/gentoo/pull/815

5 files changed, 123 insertions, 166 deletions

diff --git a/net-p2p/i2p/Manifest b/net-p2p/i2p/Manifest
index ffff7c12df2e..f9f9dc77d81c 100644
--- a/net-p2p/i2p/Manifest
+++ b/net-p2p/i2p/Manifest
@@ -1,3 +1,3 @@
-DIST i2psource_0.9.18.tar.bz2 24147960 SHA256 6f02f38c933662874c485cb52ca800a9e07c36e74a26fdfeece65e25979beb4b SHA512 6cc336f94f8e4331b26d6e42958808f193ad3709ab6098981077c9390749233fb3d20df5c8fea34ec7810bc8846fd2e11ed7a79bf7c1ec68402b1ccacae999d6 WHIRLPOOL 467285b189af69b300c56756992e53979aa049515cb89ce0d5cbff80b9270c4ab1188f419dd0206b2406780b36ddde73861b5e2e69c7b2e7d8ed00b7bcaaa7a7
 DIST i2psource_0.9.22.tar.bz2 24338146 SHA256 91ac91f7a3e202d248f5294f4951f6b7d8b9bde32991adf7a813ae1bb9188898 SHA512 0fdcd0369f79cc143c449774cb205d2fb4fa5ad32e0b5bd3ed0dee5b24402cc21b1c5650d535518e68aaa98cee5380bf0af041df8b3e1724698aebf61cfb5583 WHIRLPOOL bd36ce760f7a7b942651de576662b3fadbf19bbdb84a020a16783689f3ae4919bf9441762f2d951ed1c02781e62131370b5cc36cd257c187185862901454e971
 DIST i2psource_0.9.23.tar.bz2 24427211 SHA256 24e303f2af1b7b14ed3a6e17cc7d1b6432ec99d8d00246a88486922941c72345 SHA512 1697ee03c5b09c7653f4e30e976062908e0c0ece7ee9651979384fce0d5c887d7cfbd841522d31203f23d7f5dc97d8f8ef238784199b22fe5452299587038f82 WHIRLPOOL a2141b8d9d5f8b552e354678294364bedde9cef5aa39aa95a06dbe19f5f7996b6d5eb0e1b43ad8ce5c2f9e20dc4dda792b994004a95ea1dc83c5541f46de5b89
+DIST i2psource_0.9.24.tar.bz2 24468215 SHA256 134481ae5ef934a411545330d1b22e768189c424a65db47058db0f7d9cf51e7d SHA512 9029ea06640a937385499fd308232f2c3b04308cc834e2e2491a567c47be4aa128d509b2058735cb8cf088a0b9273b418efbca05d70944ef9e95c3d15d96a47a WHIRLPOOL d7211cf46bf4bbaa54340de0dadcb255f2321d75b3d968401612c1bc0926f91f1d248e634c97c8d6948f78cd4a68c9a79ca4a65102e205a56c704a2409416cf3
diff --git a/net-p2p/i2p/files/i2p-0.9.18_fix-paths.patch b/net-p2p/i2p/files/i2p-0.9.18_fix-paths.patch
deleted file mode 100644
index d1c207f10e96..000000000000
--- a/net-p2p/i2p/files/i2p-0.9.18_fix-paths.patch
+++ /dev/null
@@ -1,137 +0,0 @@
---- clients.config	2015-03-15 02:02:29.021408673 -0700
-+++ clients.config	2015-03-15 02:24:33.460308396 -0700
-@@ -60,7 +60,7 @@
- clientApp.4.name=Open Router Console in web browser at startup
- clientApp.4.args=http://127.0.0.1:7657/
- clientApp.4.delay=3
--clientApp.4.startOnLoad=true
-+clientApp.4.startOnLoad=false
- 
- # BOB bridge
- clientApp.5.args=
---- eepget	2015-03-15 02:02:29.078407997 -0700
-+++ eepget	2015-03-15 02:17:51.441075791 -0700
-@@ -1,3 +1,3 @@
- #!/bin/sh
--I2P="%INSTALL_PATH"
-+I2P="/usr/share/i2p"
- java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
---- i2prouter	2015-03-15 02:02:29.079407985 -0700
-+++ i2prouter	2015-03-15 02:11:13.023194731 -0700
-@@ -28,20 +28,22 @@
- # Note that (percent)INSTALL_PATH, (percent)USER_HOME,  and (percent)SYSTEM_java_io_tmpdir
- # should have been replaced by the izpack installer.
- # If you did not run the installer, replace them with the appropriate paths.
--I2P="%INSTALL_PATH"
-+USER_HOME="$HOME"
-+SYSTEM_java_io_tmpdir="$USER_HOME/.i2p"
-+I2P="/usr/share/i2p"
- if [ "`uname -s`" = "Darwin" ]; then
--   if [ -d "%USER_HOME/Library/Application Support" ]; then
--       I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p"
-+   if [ -d "$USER_HOME/Library/Application Support" ]; then
-+       I2P_CONFIG_DIR="$USER_HOME/Library/Application Support/i2p"
-    else
--       I2P_CONFIG_DIR="%USER_HOME/.i2p"
-+       I2P_CONFIG_DIR="$USER_HOME/.i2p"
-    fi
- else
--    I2P_CONFIG_DIR="%USER_HOME/.i2p"
-+    I2P_CONFIG_DIR="$USER_HOME/.i2p"
- fi
--I2PTEMP="%SYSTEM_java_io_tmpdir"
-+I2PTEMP="$SYSTEM_java_io_tmpdir"
- # PORTABLE installation:
- # Use the following instead.
--#I2PTEMP="%INSTALL_PATH"
-+#I2PTEMP="/usr/share/i2p"
- 
- # Application
- APP_NAME="i2p"
---- runplain.sh	2015-03-15 02:02:29.078407997 -0700
-+++ runplain.sh	2015-03-15 02:18:46.530422508 -0700
-@@ -11,8 +11,8 @@
- # Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir
- # should have been replaced by the izpack installer.
- # If you did not run the installer, replace them with the appropriate path.
--I2P="%INSTALL_PATH"
--I2PTEMP="%SYSTEM_java_io_tmpdir"
-+I2P="/usr/share/i2p"
-+I2PTEMP="$SYSTEM_java_io_tmpdir"
- 
- # Having IPv6 enabled can cause problems with certain configurations. Changing the
- # next value to true may help. 
---- wrapper.config	2015-03-15 02:02:29.022408661 -0700
-+++ wrapper.config	2015-03-15 02:21:50.666238909 -0700
-@@ -60,13 +60,17 @@
- # classes, or all the classes of i2p.jar, are in a different directory).
- # Be sure there are no other duplicate classes.
- #
--wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
-+wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar
-+wrapper.java.classpath.2=/usr/share/jakarta-jstl/lib/*.jar
-+wrapper.java.classpath.3=/usr/share/java-service-wrapper/lib/*.jar
-+wrapper.java.classpath.4=/usr/share/bcprov/lib/*.jar
- #  uncomment this to use the system classpath as well (e.g. to get tools.jar)
- # wrapper.java.classpath.2=%CLASSPATH%
- 
- # Java Library Path (location of Wrapper.DLL or libwrapper.so)
--wrapper.java.library.path.1=$INSTALL_PATH
--wrapper.java.library.path.2=$INSTALL_PATH/lib
-+wrapper.java.library.path.1=/usr/share/i2p
-+wrapper.java.library.path.2=/usr/share/i2p/lib
-+wrapper.java.library.path.3=/usr/lib/java-service-wrapper
- 
- # Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
- wrapper.java.additional.auto_bits=TRUE
-@@ -76,7 +80,7 @@
- wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
- wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
- wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true
--wrapper.java.additional.4=-Di2p.dir.base="$INSTALL_PATH"
-+wrapper.java.additional.4=-Di2p.dir.base="/usr/share/i2p"
- wrapper.java.additional.4.stripquotes=TRUE
- 
- # On some IPv6 enabled systems, I2P and other network-enabled java applications
-@@ -96,11 +100,11 @@
- # wrapper.java.additional.7=-Dorg.mortbay.util.FileResource.checkAliases=false
- # PORTABLE installation:
- # uncomment the following
--#wrapper.java.additional.7=-Di2p.dir.pid="$INSTALL_PATH"
-+#wrapper.java.additional.7=-Di2p.dir.pid="/usr/share/i2p"
- #wrapper.java.additional.7.stripquotes=TRUE
--#wrapper.java.additional.8=-Di2p.dir.temp="$INSTALL_PATH"
-+#wrapper.java.additional.8=-Di2p.dir.temp="/usr/share/i2p"
- #wrapper.java.additional.8.stripquotes=TRUE
--#wrapper.java.additional.9=-Di2p.dir.config="$INSTALL_PATH"
-+#wrapper.java.additional.9=-Di2p.dir.config="/usr/share/i2p"
- #wrapper.java.additional.9.stripquotes=TRUE
- #
- # Uncomment this for better performance.
-@@ -147,7 +151,7 @@
- # PORTABLE installation:
- # Use the following instead. I2P will find the logfile here,
- # no need for a wrapper.java.additional line too.
--#wrapper.logfile=$INSTALL_PATH/wrapper.log
-+#wrapper.logfile=/usr/share/i2p/wrapper.log
- 
- # Format of output for the log file.
- # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
-@@ -220,7 +224,7 @@
- #wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid
- # PORTABLE installation:
- # Use the following instead.
--#wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid
-+#wrapper.java.pidfile=/usr/share/i2p/routerjvm.pid
- # pid file for the service monitoring the JVM
- #
- # From i2prouter:
-@@ -238,7 +242,7 @@
- #wrapper.pidfile=$SYSTEM_java_io_tmpdir/i2p.pid
- # PORTABLE installation:
- # Use the following instead.
--#wrapper.pidfile=$INSTALL_PATH/i2p.pid
-+#wrapper.pidfile=/usr/share/i2p/i2p.pid
- 
- #********************************************************************
- # Wrapper General Properties
diff --git a/net-p2p/i2p/files/i2p-0.9.24_add-libs.patch b/net-p2p/i2p/files/i2p-0.9.24_add-libs.patch
new file mode 100644
index 000000000000..f2230449c893
--- /dev/null
+++ b/net-p2p/i2p/files/i2p-0.9.24_add-libs.patch
@@ -0,0 +1,22 @@
+diff -Naur a/wrapper.config b/wrapper.config
+--- a/wrapper.config	2016-02-07 23:19:48.714569016 +0100
++++ b/wrapper.config	2016-02-07 23:20:37.523566840 +0100
+@@ -61,12 +61,18 @@
+ # Be sure there are no other duplicate classes.
+ #
+ wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
++wrapper.java.classpath.2=/usr/share/tomcat-jstl-impl/lib/*.jar
++wrapper.java.classpath.3=/usr/share/tomcat-jstl-spec/lib/*.jar
++wrapper.java.classpath.4=/usr/share/java-service-wrapper/lib/*.jar
++wrapper.java.classpath.5=/usr/share/bcprov-1.50/lib/*.jar
++wrapper.java.classpath.6=/usr/share/jrobin/lib/*.jar
+ #  uncomment this to use the system classpath as well (e.g. to get tools.jar)
+ # wrapper.java.classpath.2=%CLASSPATH%
+ 
+ # Java Library Path (location of Wrapper.DLL or libwrapper.so)
+ wrapper.java.library.path.1=$INSTALL_PATH
+ wrapper.java.library.path.2=$INSTALL_PATH/lib
++wrapper.java.library.path.3=/usr/lib/java-service-wrapper
+ 
+ # Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
+ wrapper.java.additional.auto_bits=TRUE
diff --git a/net-p2p/i2p/files/i2p-0.9.24_initd b/net-p2p/i2p/files/i2p-0.9.24_initd
new file mode 100644
index 000000000000..00e91acc4011
--- /dev/null
+++ b/net-p2p/i2p/files/i2p-0.9.24_initd
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need net
+}
+
+HOME="/var/lib/i2p"
+USER_HOME="$HOME"
+JAVABINARY="/etc/java-config-2/current-system-vm/bin/java"
+INSTALL_PATH="/usr/share/i2p"
+I2P="$INSTALL_PATH"
+I2P_CONFIG_DIR="$USER_HOME/.i2p"
+SYSTEM_java_io_tmpdir="$I2P_CONFIG_DIR"
+I2PTEMP="$SYSTEM_java_io_tmpdir"
+LOGFILE="$I2P_CONFIG_DIR/wrapper.log"
+PIDFILE="/var/run/i2p.pid"
+WRAPPER_CMD="$I2P/i2psvc"
+WRAPPER_CONF="$I2P/wrapper.config"
+
+start() {
+	ebegin "Starting I2P"
+	start-stop-daemon --start -b -m -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -- -c $WRAPPER_CONF wrapper.daemonize=FALSE wrapper.syslog.ident=i2p wrapper.java.command="$JAVABINARY" wrapper.name=i2p wrapper.displayname="I2P Service" wrapper.statusfile="$I2P_CONFIG_DIR/i2p.status" wrapper.java.statusfile="$I2P_CONFIG_DIR/i2p.java.status" wrapper.logfile="$LOGFILE"
+	sleep 1
+	[ -e "$PIDFILE" -a -e /proc/$(cat "$PIDFILE") ]
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping I2P"
+	start-stop-daemon --stop -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -R SIGTERM/20 SIGKILL/20 -P
+	eend $?
+}
+
diff --git a/net-p2p/i2p/i2p-0.9.18.ebuild b/net-p2p/i2p/i2p-0.9.24.ebuild
index c675496090d4..dd695e9894ca 100644
--- a/net-p2p/i2p/i2p-0.9.18.ebuild
+++ b/net-p2p/i2p/i2p-0.9.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,36 +12,51 @@ 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=""
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
+
 # dev-java/ant-core is automatically added due to java-ant-2.eclass
-DEPEND=">=dev-java/bcprov-1.50
-		dev-java/eclipse-ecj:*
-		dev-java/jakarta-jstl
-		dev-java/java-service-wrapper
-		dev-java/jrobin
-		dev-java/slf4j-api
-		dev-libs/gmp:*
-		nls? ( sys-devel/gettext )
-		>=virtual/jdk-1.6:="
-RDEPEND="${DEPEND} >=virtual/jre-1.6"
+CDEPEND="dev-java/jrobin:0
+	dev-java/bcprov:1.50
+	dev-java/slf4j-api:0
+	dev-java/tomcat-jstl-impl:0
+	dev-java/tomcat-jstl-spec:0
+	dev-java/java-service-wrapper:0"
+
+DEPEND="${CDEPEND}
+	dev-java/eclipse-ecj:*
+	dev-libs/gmp:*
+	nls? ( sys-devel/gettext )
+	>=virtual/jdk-1.7"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
 
 EANT_BUILD_TARGET="pkg"
-EANT_GENTOO_CLASSPATH="jakarta-jstl,java-service-wrapper,jrobin,slf4j-api"
+EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov-1.50"
+
+I2P_ROOT='/usr/share/i2p'
+I2P_CONFIG_HOME='/var/lib/i2p'
+I2P_CONFIG_DIR="${I2P_HOME}/.i2p"
 
 pkg_setup() {
+	java-pkg-2_pkg_setup
+
 	enewgroup i2p
-	enewuser i2p -1 -1 /var/lib/i2p i2p -m
+	enewuser i2p -1 -1 "${I2P_CONFIG_HOME}" i2p -m
 }
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
+	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
 	if ! use nls; then
@@ -50,18 +65,29 @@ src_prepare() {
 }
 
 src_install() {
-	# Using ${D} here results in an error. Docs say use $ROOT
-	i2p_home="${ROOT}/usr/share/i2p"
-	# Patch the relevant files. This needs to be in src_install due to
-	# preinst() generating the files we're patching
-	cd pkg-temp
-	epatch "${FILESDIR}/i2p-0.9.18_fix-paths.patch"
+	# Cd into pkg-temp.
+	cd "${S}/pkg-temp" || die
+
+	# add libs
+	epatch "${FILESDIR}/${P}_add-libs.patch"
+
+	# avoid auto starting browser
+	sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \
+		clients.config || die
+
+	# replace paths as the installer would
+	sed -i "s|%INSTALL_PATH|${I2P_ROOT}|" \
+		eepget i2prouter runplain.sh  || die
+	sed -i "s|\$INSTALL_PATH|${I2P_ROOT}|" wrapper.config || die
+	sed -i "s|%SYSTEM_java_io_tmpdir|${I2P_CONFIG_DIR}|" \
+		i2prouter runplain.sh || die
+	sed -i "s|%USER_HOME|${I2P_CONFIG_HOME}|" i2prouter || die
 
 	# This is ugly, but to satisfy all non-system .jar dependencies, jetty and
 	# systray4j would need to be packaged. The former would be too large a task
 	# for an unseasoned developer and systray4j hasn't been touched in over 10
 	# years. This seems to be the most pragmatic solution
-	java-pkg_jarinto "${i2p_home}/lib"
+	java-pkg_jarinto "${I2P_ROOT}/lib"
 	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 systray4j; do
@@ -69,13 +95,13 @@ src_install() {
 	done
 
 	# Set up symlinks for binaries
-	dosym /usr/bin/wrapper ${i2p_home}/i2psvc
-	dosym ${i2p_home}/i2prouter /usr/bin/i2prouter
-	dosym ${i2p_home}/eepget /usr/bin/eepget
+	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_home}
-	insinto ${i2p_home}
+	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
@@ -87,11 +113,21 @@ src_install() {
 	java-pkg_dowar webapps/*.war
 
 	# Install daemon files
-	newinitd "${FILESDIR}/i2p.initd" i2p
+	newinitd "${FILESDIR}/${P}_initd" i2p
 	systemd_newunit "${FILESDIR}"/i2p.service i2p.service
+
+	# setup user
+	dodir "${I2P_CONFIG_DIR}"
+	fowners -R i2p:i2p "${I2P_CONFIG_DIR}"
 }
 
 pkg_postinst() {
 	elog "Custom configuration belongs in /var/lib/i2p/.i2p/ to avoid being overwritten."
 	elog "I2P can be configured through the web interface at http://localhost:7657/index.jsp"
+
+	ewarn 'Currently, the i2p team do not enforce to use ECDSA keys. But it is more and'
+	ewarn 'more pushed. To help the network, you are recommended to have either:'
+	ewarn '  dev-java/icedtea[-sunec,nss]'
+	ewarn '  dev-java/oracle-jre-bin'
+	ewarn '  dev-java/oracle-jdk-bin'
 }