commit: eca2467d3fa41470edfeb493a68876e20f91e51c Author: tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com> AuthorDate: Fri Feb 9 15:40:02 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Feb 11 18:38:26 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eca2467d
net-vpn/i2p: remove 0.9.30 Closes: https://github.com/gentoo/gentoo/pull/7008 Package-Manager: Portage-2.3.13, Repoman-2.3.3 net-vpn/i2p/Manifest | 1 - net-vpn/i2p/files/i2p-0.9.30-add_libs.patch | 22 ---- net-vpn/i2p/files/i2p-0.9.30.initd | 35 ------- net-vpn/i2p/files/i2p-0.9.30.service | 13 --- net-vpn/i2p/i2p-0.9.30-r1.ebuild | 152 ---------------------------- net-vpn/i2p/i2p-0.9.30.ebuild | 149 --------------------------- 6 files changed, 372 deletions(-) diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest index fced4eedf7f..c04dc1e1d47 100644 --- a/net-vpn/i2p/Manifest +++ b/net-vpn/i2p/Manifest @@ -1,3 +1,2 @@ -DIST i2psource_0.9.30.tar.bz2 28035272 BLAKE2B 1e1b14b3126b8fd73489ddc99f7f83ea1b501d7c7ce31e11bbdb8e4a4fe33e06bf906277b7f10e912bdf54de8511c3c3d0eccf2607dcfaacb36ed89875425471 SHA512 59819125fd6aca9fd5ae25a424e78f25bd2e8f9ba995256f9bf7c1fb2a99cebf26a1dcaf1f202276f5656b4582c4b86fdcf9d23011f809b99764b0023fd243f8 DIST i2psource_0.9.31.tar.bz2 28745769 BLAKE2B e7766eceffb44c7c40ce176c3d98ed9a62472058c90adf1b07bbab11628d6ca4c8c62ca52526a204a6e8f47a182a59e07ccbdef65b6d2c5122d8e64e1df75406 SHA512 ffeb74d02c783febc122580b64561722de04c903e2d33fdeaf74bf3b7d725b8b7ce6556f53a12f0ae0d6c6deb413839e222bc2b8093952e5ecaf1bf96f0d1103 DIST i2psource_0.9.33.tar.bz2 28985659 BLAKE2B 51b9697271c506de8d34b42ff208a12c9f0409c9aff456aa928dc2d411aceb0473878e9ed0d6ccf3684a7432c64700eec798535b4a4f4e01a2297e3d3ef7603a SHA512 ad772a422923636731350e590a14631209503c3d82db32410cb3002c790c60f9f7d950f94bb4d65ced1c2126e67a92ad65e9cd65ae3f045fc5279f57217066e2 diff --git a/net-vpn/i2p/files/i2p-0.9.30-add_libs.patch b/net-vpn/i2p/files/i2p-0.9.30-add_libs.patch deleted file mode 100644 index 0ea3149a362..00000000000 --- a/net-vpn/i2p/files/i2p-0.9.30-add_libs.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur a/installer/resources/wrapper.config b/installer/resources/wrapper.config ---- a/installer/resources/wrapper.config 2016-11-07 11:42:42.503030002 +0100 -+++ b/installer/resources/wrapper.config 2016-11-07 11:43:11.873031594 +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-vpn/i2p/files/i2p-0.9.30.initd b/net-vpn/i2p/files/i2p-0.9.30.initd deleted file mode 100644 index 216d19474cb..00000000000 --- a/net-vpn/i2p/files/i2p-0.9.30.initd +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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-vpn/i2p/files/i2p-0.9.30.service b/net-vpn/i2p/files/i2p-0.9.30.service deleted file mode 100644 index ccbadbd4d16..00000000000 --- a/net-vpn/i2p/files/i2p-0.9.30.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-vpn/i2p/i2p-0.9.30-r1.ebuild b/net-vpn/i2p/i2p-0.9.30-r1.ebuild deleted file mode 100644 index d64a1c13eda..00000000000 --- a/net-vpn/i2p/i2p-0.9.30-r1.ebuild +++ /dev/null @@ -1,152 +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:7[-sunec] - dev-java/icedtea:8[-sunec] - 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" -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.30.ebuild b/net-vpn/i2p/i2p-0.9.30.ebuild deleted file mode 100644 index 54eab04b7fe..00000000000 --- a/net-vpn/i2p/i2p-0.9.30.ebuild +++ /dev/null @@ -1,149 +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="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} - || ( - dev-java/icedtea:7[-sunec] - dev-java/icedtea:8[-sunec] - dev-java/icedtea-bin:7 - dev-java/icedtea-bin:8 - dev-java/oracle-jre-bin - dev-java/oracle-jdk-bin - )" - -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; 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' - elog - - ewarn "The router will migrate the jetty.xml for each Jetty website to the new Jetty 9 setup during startup." - ewarn "This should work for recent, unmodified configurations but may not work for modified or" - ewarn "very old setups. Verify that your Jetty website works after upgrading, and contact i2p" - ewarn "developers on IRC if you need assistance" - ewarn - ewarn "Several plugins are not compatible with Jetty 9 and must be updated if you use them." - ewarn "New updated version avaliable: i2pbote 0.4.6, zzzot 0.15.0." - ewarn "No new version so far: BwSchedule 0.0.36, i2pcontrol 0.11." -}
