commit: d56d66381538b5d66697250961416464bb6c91b2
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 2 20:43:24 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 20:46:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d56d6638
net-p2p/i2p: Remove old 0.9.25-r1
Package-Manager: portage-2.3.0
net-p2p/i2p/Manifest | 1 -
net-p2p/i2p/files/i2p-0.9.25-add_libs.patch | 22 ----
net-p2p/i2p/files/i2p-0.9.25-initd | 36 -------
net-p2p/i2p/files/i2p.initd | 36 -------
net-p2p/i2p/files/i2p.service | 13 ---
net-p2p/i2p/i2p-0.9.25-r1.ebuild | 156 ----------------------------
6 files changed, 264 deletions(-)
diff --git a/net-p2p/i2p/Manifest b/net-p2p/i2p/Manifest
index 80867db..d437335 100644
--- a/net-p2p/i2p/Manifest
+++ b/net-p2p/i2p/Manifest
@@ -1,2 +1 @@
-DIST i2psource_0.9.25.tar.bz2 24652935 SHA256
daaac2b5a5a6b5bbd4b805f76e14f6a7c201dfd7c1cf43c98e182d2e657d1236 SHA512
a50f00d9ad32993da30529339e3ffd425d5e97d5120d9e4e446f6fa7ac0cbb6ee4f35c013b0815802ff6c72e188b00d408c7fa398c8ee1ae71be57383a1411f6
WHIRLPOOL
a851f6505155201d872774407dc71c9dd03a4683b3ce35d2fff74fd3f7f17d12cc1cc72dfcc2c7c4f0d82b86333bd0424066ae41330e603ba07872d56c257e27
DIST i2psource_0.9.26.tar.bz2 27039859 SHA256
49fbaea7f4d5ea0606de68ebb270fc3d4380631ecfd5c9ad82ed9356e29df937 SHA512
2b3f96fe97418c176b4e0058817bde81909e46d136ed5cadf9f8fb4323b0a35e0a5d3fc0eaadacbfe8f9578376d8a6c6757121452cd9f7c1c3c7d019169a914d
WHIRLPOOL
b8161e77a491d26f24e786bf185f9eba35aa4421ba17e668f3a8f73fc481c6c8b7ea630b8c860f4cb2c877660a703aaa0dfa2d03d8163ea98a151302067e1600
diff --git a/net-p2p/i2p/files/i2p-0.9.25-add_libs.patch
b/net-p2p/i2p/files/i2p-0.9.25-add_libs.patch
deleted file mode 100644
index 6e8fc8d..00000000
--- a/net-p2p/i2p/files/i2p-0.9.25-add_libs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur a/wrapper.config b/wrapper.config
---- a/pkg-temp/wrapper.config 2016-02-07 23:19:48.714569016 +0100
-+++ b/pkg-temp/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.25-initd
b/net-p2p/i2p/files/i2p-0.9.25-initd
deleted file mode 100644
index bd00917..00000000
--- a/net-p2p/i2p/files/i2p-0.9.25-initd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# 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/files/i2p.initd b/net-p2p/i2p/files/i2p.initd
deleted file mode 100644
index f10c4a0..00000000
--- a/net-p2p/i2p/files/i2p.initd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 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/files/i2p.service b/net-p2p/i2p/files/i2p.service
deleted file mode 100644
index ccbadbd..00000000
--- a/net-p2p/i2p/files/i2p.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Invisible Internet Project
-After=network.target
-
-[Service]
-User=i2p
-Type=forking
-ExecReload=/usr/bin/i2prouter restart
-ExecStart=/usr/bin/i2prouter start
-ExecStop=/usr/bin/i2prouter stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-p2p/i2p/i2p-0.9.25-r1.ebuild b/net-p2p/i2p/i2p-0.9.25-r1.ebuild
deleted file mode 100644
index e25d09f..00000000
--- a/net-p2p/i2p/i2p-0.9.25-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-CDEPEND="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="${CDEPEND}
- dev-java/eclipse-ecj:*
- dev-libs/gmp:*
- nls? ( sys-devel/gettext )
- >=virtual/jdk-1.7"
-
-RDEPEND="${CDEPEND}
- ecdsa? (
- || (
- dev-java/icedtea:7[-sunec]
- dev-java/icedtea:8[-sunec]
- dev-java/icedtea:7[nss,-sunec]
- dev-java/icedtea-bin:7[nss]
- 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"
-EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov-1.50"
-JAVA_ANT_ENCODING="UTF-8"
-
-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 "${I2P_CONFIG_HOME}" i2p -m
-}
-
-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
- if ! use nls; then
- echo "require.gettext=false" >> override.properties
- fi
- eapply_user
-}
-
-src_install() {
- # add libs
- eapply "${FILESDIR}/${PN}-0.9.25-add_libs.patch"
-
- # Cd into pkg-temp.
- cd "${S}/pkg-temp" || die
-
- # 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_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
- 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}/${PN}-0.9.25-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 does 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/icedtea-bin[nss]'
- ewarn ' dev-java/icedtea[-sunec] and bouncycastle (bcprov)'
- ewarn ' dev-java/icedtea-bin and bouncycastle (bcprov)'
- ewarn ' dev-java/oracle-jre-bin'
- ewarn ' dev-java/oracle-jdk-bin'
- ewarn 'Alternatively you can just use Ed25519 keys - which is a
stronger algorithm anyways.'
- 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.'
-
-}
