[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/

2023-05-22 Thread Conrad Kostecki 
commit: 2ffe425c17bd394cb06649a77eb92ad54ed4065b
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon May 22 17:17:11 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon May 22 21:26:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ffe425c

net-vpn/i2p: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31133
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-vpn/i2p/files/2.1.0-fix-getopt-classpath.patch | 24 --
 1 file changed, 24 deletions(-)

diff --git a/net-vpn/i2p/files/2.1.0-fix-getopt-classpath.patch 
b/net-vpn/i2p/files/2.1.0-fix-getopt-classpath.patch
deleted file mode 100644
index a67b43ba08da..
--- a/net-vpn/i2p/files/2.1.0-fix-getopt-classpath.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/apps/routerconsole/java/build.xml 
b/apps/routerconsole/java/build.xml
-index 48f9245..2fba5e4 100644
 a/apps/routerconsole/java/build.xml
-+++ b/apps/routerconsole/java/build.xml
-@@ -85,6 +85,7 @@
- 
- 
- 
-+
- 
- 
- 
-diff --git a/router/java/build.xml b/router/java/build.xml
-index 3449609..bcd9602 100644
 a/router/java/build.xml
-+++ b/router/java/build.xml
-@@ -277,6 +277,7 @@
- 
- 
- 
-+
- 
- 
-

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/

2023-05-20 Thread Sam James 
commit: 916696fbb950678c7b9dc06e4c7346fe0499f609
Author: Valérian Rousset  users  noreply  github 
 com>
AuthorDate: Fri Apr 14 20:01:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 20 09:21:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=916696fb

net-vpn/i2p: revbump 1.7.0-r1

Signed-off-by: Valérian Rousset  users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/29290
Signed-off-by: Sam James  gentoo.org>

 net-vpn/i2p/files/1.7.0-i2p.init  | 17 +
 net-vpn/i2p/files/1.7.0-i2p.service   | 10 ++
 net-vpn/i2p/{i2p-1.7.0.ebuild => i2p-1.7.0-r1.ebuild} | 14 --
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/net-vpn/i2p/files/1.7.0-i2p.init b/net-vpn/i2p/files/1.7.0-i2p.init
new file mode 100644
index ..d59899b899e9
--- /dev/null
+++ b/net-vpn/i2p/files/1.7.0-i2p.init
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+   need net
+}
+
+readonly WRAPPER_CONF="/usr/share/i2p/wrapper.config"
+
+command=wrapper
+command_args="$WRAPPER_CONF wrapper.syslog.ident=i2p"
+command_background=true
+command_progress=true
+command_user=i2p
+pidfile=/var/run/i2p.pid
+retry='SIGTERM/20 SIGKILL/20'

diff --git a/net-vpn/i2p/files/1.7.0-i2p.service 
b/net-vpn/i2p/files/1.7.0-i2p.service
new file mode 100644
index ..87c218075a1c
--- /dev/null
+++ b/net-vpn/i2p/files/1.7.0-i2p.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Invisible Internet Project
+After=network.target
+
+[Service]
+User=i2p
+ExecStart=/usr/bin/wrapper /usr/share/i2p/wrapper.config 
wrapper.syslog.ident=i2p wrapper.logfile=/var/lib/i2p/.i2p/wrapper.log
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-vpn/i2p/i2p-1.7.0.ebuild b/net-vpn/i2p/i2p-1.7.0-r1.ebuild
similarity index 92%
rename from net-vpn/i2p/i2p-1.7.0.ebuild
rename to net-vpn/i2p/i2p-1.7.0-r1.ebuild
index 5914fa6ea733..16802953f72a 100644
--- a/net-vpn/i2p/i2p-1.7.0.ebuild
+++ b/net-vpn/i2p/i2p-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -69,14 +69,8 @@ src_prepare() {
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 i=2
local 
classpath="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n"
-   for lib in ${i2p_cp//,/ }
-   do
-   classpath+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars 
${lib})\n"
-   done
+   classpath+="wrapper.java.classpath.2=$(java-pkg_getjars 
java-service-wrapper)\n"
 
# add generated classpath, hardcode system VM, setting system's conf
sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${classpath}|" \
@@ -132,8 +126,8 @@ src_install() {
java-pkg_dowar webapps/*.war
 
# Install daemon files
-   newinitd "${FILESDIR}/i2p.init" i2p
-   systemd_dounit "${FILESDIR}/i2p.service"
+   newinitd "${FILESDIR}/${PV}-i2p.init" i2p
+   systemd_dounit "${FILESDIR}/${PV}-i2p.service"
 
# setup log
keepdir /var/log/i2p

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/

2021-07-14 Thread Conrad Kostecki 
commit: f6fbe74a87c4108a4fe5567e60cd8fed06003746
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Jul 14 19:25:18 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Jul 14 20:03:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6fbe74a

net-vpn/i2p: remove unused patch

Bug: https://github.com/gentoo/gentoo/pull/21641
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...47-DataHelper-decompress-fix-length-check.patch | 25 --
 1 file changed, 25 deletions(-)

diff --git 
a/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch 
b/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch
deleted file mode 100644
index b728cc28cb1..000
--- a/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# from https://trac.i2p2.de/ticket/2770
-From ceb0749e0d5c3c496b4a91bc3a9d3b5e296fc456 Mon Sep 17 00:00:00 2001
-From: zzz 
-Date: Wed, 2 Sep 2020 15:57:04 +
-Subject: [PATCH] Util: Fix decompression of compressed zero bytes (ticket
- #2770)
-

- core/java/src/net/i2p/data/DataHelper.java | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/core/java/src/net/i2p/data/DataHelper.java 
b/core/java/src/net/i2p/data/DataHelper.java
-index aaa47797c3..39f766e6fa 100644
 a/core/java/src/net/i2p/data/DataHelper.java
-+++ b/core/java/src/net/i2p/data/DataHelper.java
-@@ -1902,7 +1902,8 @@ public static String unescapeHTML(String escaped) {
-  */
- public static byte[] decompress(byte orig[], int offset, int length) 
throws IOException {
- if (orig == null) return orig;
--if (length < 23)
-+// normal overhead is 23 bytes, but a compress of zero bytes is 20 
bytes
-+if (length < 20)
- throw new IOException("length");
- if (length < 65559 && orig[offset + 10] == 0x01)
- return zeroDecompress(orig, offset, length);

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/

2020-09-12 Thread Sam James 
commit: f6dacb7a6f9a04445313879ccd2a318613dcd28b
Author: tharvik  users  noreply  github  com>
AuthorDate: Mon Aug 31 22:57:40 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 13 00:43:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6dacb7a

net-vpn/i2p: bump to 0.9.47

Closes: https://bugs.gentoo.org/735624
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Valérian Rousset  users.noreply.github.com>
Signed-off-by: Sam James  gentoo.org>

 net-vpn/i2p/Manifest   |   1 +
 ...47-DataHelper-decompress-fix-length-check.patch |  25 +++
 net-vpn/i2p/i2p-0.9.47.ebuild  | 214 +
 3 files changed, 240 insertions(+)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 21a9f3ef153..205dfbe00af 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1,3 @@
 DIST i2psource_0.9.44.tar.bz2 32016076 BLAKE2B 
5803935cdebd18af48c4f00232cbbae02979c5ccebb68a4bddeb9cf60b6d02b734b72075ac7f9a57713f48cfd2bc0d14598e35df4ff7cdd590be57c68f5737b4
 SHA512 
a98129dde7d467e77ee37d16f9add3a0a4e602da84e1133c1b4b787133f185ad834cb1c52857e54946e424bd73a56200e48d6cd96856c87c748f53ca26af922e
 DIST i2psource_0.9.45.tar.bz2 31921025 BLAKE2B 
2d3f77784ff93de4d7442eddf46b9a541902412bf5fb24cf96baba73851cc17d01649a7b4b41a710ccde5690036a890b8f84de00f4c615ed2e23da8fa510
 SHA512 
d4cf354f0a807d132fae75d4bad3e2e788e1ed03d6f625feb0f1369bb2c9e1a6e2758645acf2017c61dbc47d75e6d834b87455adbead1077f206025686548ae9
+DIST i2psource_0.9.47.tar.bz2 32488438 BLAKE2B 
e1544475dad526e242570918c1bb967a4b713567e71201e08b73c8995743a68396b5951f477bfe8830927c0cdf7e991a25a1978d4aaf88cae3e4218ba57a8818
 SHA512 
7fdd9ab0b3e81aa89e73be6fa172d723c2b5a67365116a1e0e0ec948067fe4f58e3ad946a0ef4605602c0d803b98e37b2d5692a39a14cf7433d546ada204cbc9

diff --git 
a/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch 
b/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch
new file mode 100644
index 000..b728cc28cb1
--- /dev/null
+++ b/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch
@@ -0,0 +1,25 @@
+# from https://trac.i2p2.de/ticket/2770
+From ceb0749e0d5c3c496b4a91bc3a9d3b5e296fc456 Mon Sep 17 00:00:00 2001
+From: zzz 
+Date: Wed, 2 Sep 2020 15:57:04 +
+Subject: [PATCH] Util: Fix decompression of compressed zero bytes (ticket
+ #2770)
+
+---
+ core/java/src/net/i2p/data/DataHelper.java | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/core/java/src/net/i2p/data/DataHelper.java 
b/core/java/src/net/i2p/data/DataHelper.java
+index aaa47797c3..39f766e6fa 100644
+--- a/core/java/src/net/i2p/data/DataHelper.java
 b/core/java/src/net/i2p/data/DataHelper.java
+@@ -1902,7 +1902,8 @@ public static String unescapeHTML(String escaped) {
+  */
+ public static byte[] decompress(byte orig[], int offset, int length) 
throws IOException {
+ if (orig == null) return orig;
+-if (length < 23)
++// normal overhead is 23 bytes, but a compress of zero bytes is 20 
bytes
++if (length < 20)
+ throw new IOException("length");
+ if (length < 65559 && orig[offset + 10] == 0x01)
+ return zeroDecompress(orig, offset, length);

diff --git a/net-vpn/i2p/i2p-0.9.47.ebuild b/net-vpn/i2p/i2p-0.9.47.ebuild
new file mode 100644
index 000..a775e06556d
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.47.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-ant-2 systemd
+
+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"
+RESTRICT="!test? ( 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}
+   acct-user/i2p
+   acct-group/i2p
+   virtual/jre:1.8
+   net-libs/nativebiginteger:0
+"
+
+EANT_BUILD_TARGET="pkg"
+# no scala as depending on antlib.xml not installed by d

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/

2019-11-12 Thread Joonas Niilola 
commit: 297bc664c5e11bf178ff894e1a68f751de9b8c0c
Author: Valérian Rousset  users  noreply  github 
 com>
AuthorDate: Fri Aug 23 19:12:16 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Nov 13 05:46:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=297bc664

net-vpn/i2p: bump to 0.9.42

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Valérian Rousset  users.noreply.github.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 net-vpn/i2p/Manifest  |   1 +
 net-vpn/i2p/files/i2p.init|   8 +-
 net-vpn/i2p/i2p-0.9.42.ebuild | 213 ++
 3 files changed, 217 insertions(+), 5 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 5220fda265b..12d424f1f91 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1,3 @@
 DIST i2psource_0.9.39.tar.bz2 30518064 BLAKE2B 
da5f4f74db38e932a8d1504dd454f308b6a47e0b308ecb646aafc349c20696d5f18107b393a7a5c3e5a7a24c1f2463657ede1ae6629023d9f817cc5bf0b00d85
 SHA512 
03ae294a2dbb1c7267484e8b0700ea112820e767ce7e90bc50dc90a1ed621586bd507c6ea80ba177d3498c0959fc1c9d71b51821d527fa48c34847ffbf5c466c
 DIST i2psource_0.9.40.tar.bz2 30808508 BLAKE2B 
b4b81800c4fdcd1c9318e884d6a06f442c28cc902c1aa67a35343b3d61cf95a02186b8e56e455d3896de081d44fd9fa7c2fac1f21f176be3c0b1ca473b6416fa
 SHA512 
297b0bf92405c6e564c5e8c9708bf5b99b8eac721cec04fc74bebac1ff0cd7eae2795cc9788357fb7a9c60d7af37766ae343456203a81b9c2444cda39f3fe46d
+DIST i2psource_0.9.42.tar.bz2 31523717 BLAKE2B 
7f110f282a91fa0de700bfaee95968bb534f6f2c7d097c2d70fc9e6bda3ac583762b6b974b38b5947b15a77f91a8d595c957b35838456280236cd88c25d3d47b
 SHA512 
bf8d83c1b1607f5ecf16d33d16cc760eb982d65ef0f89ebd5c61208a38a23f08f465e04889b8ef1d05df4d02a095d85a80077a5b10253d96023f056d01efacef

diff --git a/net-vpn/i2p/files/i2p.init b/net-vpn/i2p/files/i2p.init
index bbc73b47005..eb901676bd4 100644
--- a/net-vpn/i2p/files/i2p.init
+++ b/net-vpn/i2p/files/i2p.init
@@ -6,14 +6,12 @@ depend() {
need net
 }
 
-CONFIG_PATH="/var/lib/i2p/.i2p"
-INSTALL_PATH="/usr/share/i2p"
-WRAPPER_CONF="$INSTALL_PATH/wrapper.config"
+readonly WRAPPER_CONF="/usr/share/i2p/wrapper.config"
 
 command=wrapper
-command_args="$WRAPPER_CONF wrapper.syslog.ident=i2p 
wrapper.logfile=$CONFIG_PATH/wrapper.log"
+command_args="$WRAPPER_CONF wrapper.syslog.ident=i2p"
 command_background=true
 command_progress=true
 command_user=i2p
-pidfile="/var/run/i2p.pid"
+pidfile=/var/run/i2p.pid
 retry='SIGTERM/20 SIGKILL/20'

diff --git a/net-vpn/i2p/i2p-0.9.42.ebuild b/net-vpn/i2p/i2p-0.9.42.ebuild
new file mode 100644
index 000..01cba74bdfb
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.42.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-ant-2 systemd
+
+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"
+RESTRICT="!test? ( 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}
+   acct-user/i2p
+   acct-group/i2p
+   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"
+
+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

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/

2019-06-17 Thread Aaron Bauman 
commit: d0cc093e6a8f2d5a626b07ca8d899deb00dd4dc3
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Jun 10 15:40:27 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue Jun 18 00:34:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0cc093e

net-vpn/i2p: remove unused file

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12234
Signed-off-by: Aaron Bauman  gentoo.org>

 net-vpn/i2p/files/0.9.38-add-cp-to-tests | 45 
 1 file changed, 45 deletions(-)

diff --git a/net-vpn/i2p/files/0.9.38-add-cp-to-tests 
b/net-vpn/i2p/files/0.9.38-add-cp-to-tests
deleted file mode 100644
index ddf2f7d5fca..000
--- a/net-vpn/i2p/files/0.9.38-add-cp-to-tests
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur a/apps/ministreaming/java/build.xml 
b/apps/ministreaming/java/build.xml
 a/apps/ministreaming/java/build.xml2019-01-30 13:31:14.958832623 
+0100
-+++ b/apps/ministreaming/java/build.xml2019-01-30 13:39:00.050869739 
+0100
-@@ -173,7 +173,7 @@
- 
- 
- 
--
-+
- 
- 
- 
-diff -Naur a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
 a/apps/streaming/java/build.xml2019-01-30 13:31:14.953832622 +0100
-+++ b/apps/streaming/java/build.xml2019-01-30 13:38:56.683869470 +0100
-@@ -49,7 +49,7 @@
- 
- 
- 
--
-+
- 
- 
- 
-diff -Naur a/router/java/build.xml b/router/java/build.xml
 a/router/java/build.xml2019-01-30 13:31:22.905833257 +0100
-+++ b/router/java/build.xml2019-01-30 13:39:04.133870065 +0100
-@@ -130,7 +130,7 @@
- 
- 
- 
--
-+
- 
- 
- 
-@@ -148,7 +148,7 @@
- 
- 
- 
--
-+
- 
- 
-

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/

2019-04-22 Thread Michał Górny 
commit: 781c446ea87431fa75a501089155068a7521d7b9
Author: Valérian Rousset  users  noreply  github 
 com>
AuthorDate: Wed Apr 17 16:25:21 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Apr 22 10:08:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781c446e

net-vpn/i2p: drop 0.9.3[67]

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Valérian Rousset  users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/11722
Signed-off-by: Michał Górny  gentoo.org>

 net-vpn/i2p/Manifest |   2 -
 net-vpn/i2p/files/0.9.37-add-cp-to-tests |  33 --
 net-vpn/i2p/i2p-0.9.36.ebuild| 140 
 net-vpn/i2p/i2p-0.9.37.ebuild| 179 ---
 net-vpn/i2p/metadata.xml |   1 -
 5 files changed, 355 deletions(-)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 8443cbbb6d3..07694666fec 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,4 +1,2 @@
-DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 
0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357
 SHA512 
e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
-DIST i2psource_0.9.37.tar.bz2 30277506 BLAKE2B 
2c0fe601b3a8967c23f00bd29aef197389039efbf1a3fc0847f819dea44f98e38b9b53b749763dccca740a50d467d5d079b0e4aad707347cc7c7a576fcc44407
 SHA512 
ce0d320810faaebe2926d988a40f4df968583edbc488b995a32cfd806550a8cf75d2c2397bfd9f3fd443cb462567cc2cdbf08d1de59b6806888724254faebf09
 DIST i2psource_0.9.38.tar.bz2 30702106 BLAKE2B 
c0fd4ea21643edff06853825b9b09dbd648176b6a2318c6bb3846b7c198cac88f89525df0868affbc337e31ec3459f08235cd8a52d38b8551d235c9ef2ca4a4c
 SHA512 
148cd1504dbf0a86367b6dc120a27b2d0d936857eb8cf524e86982d6499c5a831a40aacb3ed67570ad2c323be6545e9a66c12dfc4be2377b80f4d7152e04452d
 DIST i2psource_0.9.39.tar.bz2 30518064 BLAKE2B 
da5f4f74db38e932a8d1504dd454f308b6a47e0b308ecb646aafc349c20696d5f18107b393a7a5c3e5a7a24c1f2463657ede1ae6629023d9f817cc5bf0b00d85
 SHA512 
03ae294a2dbb1c7267484e8b0700ea112820e767ce7e90bc50dc90a1ed621586bd507c6ea80ba177d3498c0959fc1c9d71b51821d527fa48c34847ffbf5c466c

diff --git a/net-vpn/i2p/files/0.9.37-add-cp-to-tests 
b/net-vpn/i2p/files/0.9.37-add-cp-to-tests
deleted file mode 100644
index b8e967dd31d..000
--- a/net-vpn/i2p/files/0.9.37-add-cp-to-tests
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur a/apps/ministreaming/java/build.xml 
b/apps/ministreaming/java/build.xml
 a/apps/ministreaming/java/build.xml2018-10-04 12:05:09.0 
+0200
-+++ b/apps/ministreaming/java/build.xml2018-10-12 08:15:16.481532093 
+0200
-@@ -194,6 +194,7 @@
- includeAntRuntime="false"
- destdir="./build/obj" >
- 
-+
- 
- 
- 
-diff -Naur a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
 a/apps/streaming/java/build.xml2018-10-04 12:05:09.0 +0200
-+++ b/apps/streaming/java/build.xml2018-10-12 11:17:22.814404049 +0200
-@@ -62,6 +62,7 @@
- includeAntRuntime="false"
- destdir="./build/obj" >
- 
-+
- 
- 
- 
-diff -Naur a/router/java/build.xml b/router/java/build.xml
 a/router/java/build.xml2018-10-04 12:05:14.0 +0200
-+++ b/router/java/build.xml2018-10-12 08:14:52.921530213 +0200
-@@ -162,6 +162,7 @@
- includeAntRuntime="true"
- destdir="./build/obj">
- 
-+
- 
- 
- 

diff --git a/net-vpn/i2p/i2p-0.9.36.ebuild b/net-vpn/i2p/i2p-0.9.36.ebuild
deleted file mode 100644
index 5bedf3debbf..000
--- a/net-vpn/i2p/i2p-0.9.36.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2 java-ant-2 multilib 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:*
-   nls? ( >=sys-devel/gettext-0.19 )
-   >=virtual/jdk-1.7"
-
-RDEPEND="${CP_DEPEND}
-   ecdsa? (
-

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/

2018-10-14 Thread Michał Górny 
commit: 70d699adf34f0736b03231a8e8c926570c9dbe96
Author: Valérian Rousset  users  noreply  github 
 com>
AuthorDate: Fri Oct 12 10:26:16 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Oct 14 10:33:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70d699ad

net-vpn/i2p: bump to 0.9.37

Package-Manager: Portage-2.3.49, Repoman-2.3.11
Signed-off-by: Valérian Rousset  users.noreply.github.com>
Signed-off-by: Michał Górny  gentoo.org>

 net-vpn/i2p/Manifest |   1 +
 net-vpn/i2p/files/0.9.37-add-cp-to-tests |  33 ++
 net-vpn/i2p/i2p-0.9.37.ebuild| 179 +++
 3 files changed, 213 insertions(+)

diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 018ac01d087..2b1d3223e69 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1,3 @@
 DIST i2psource_0.9.34.tar.bz2 29332692 BLAKE2B 
16b15ac2c7eaa594fc6398105d7e22442fafc4036a54a66c91b3ca9bd98095a9192ae5c28123882ddc6acc7c68fb5eeed3ef1ed632a4b4b96a1abe28dff2286c
 SHA512 
71c80710098ead34c159c6a6873c397048afc76974917e7b65d7846203900ab8bfb4840fec3c7d09ade48e93329b06ec33d9f367dae33a4708b4ea14268beefa
 DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 
0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357
 SHA512 
e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
+DIST i2psource_0.9.37.tar.bz2 30277506 BLAKE2B 
2c0fe601b3a8967c23f00bd29aef197389039efbf1a3fc0847f819dea44f98e38b9b53b749763dccca740a50d467d5d079b0e4aad707347cc7c7a576fcc44407
 SHA512 
ce0d320810faaebe2926d988a40f4df968583edbc488b995a32cfd806550a8cf75d2c2397bfd9f3fd443cb462567cc2cdbf08d1de59b6806888724254faebf09

diff --git a/net-vpn/i2p/files/0.9.37-add-cp-to-tests 
b/net-vpn/i2p/files/0.9.37-add-cp-to-tests
new file mode 100644
index 000..b8e967dd31d
--- /dev/null
+++ b/net-vpn/i2p/files/0.9.37-add-cp-to-tests
@@ -0,0 +1,33 @@
+diff -Naur a/apps/ministreaming/java/build.xml 
b/apps/ministreaming/java/build.xml
+--- a/apps/ministreaming/java/build.xml2018-10-04 12:05:09.0 
+0200
 b/apps/ministreaming/java/build.xml2018-10-12 08:15:16.481532093 
+0200
+@@ -194,6 +194,7 @@
+ includeAntRuntime="false"
+ destdir="./build/obj" >
+ 
++
+ 
+ 
+ 
+diff -Naur a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
+--- a/apps/streaming/java/build.xml2018-10-04 12:05:09.0 +0200
 b/apps/streaming/java/build.xml2018-10-12 11:17:22.814404049 +0200
+@@ -62,6 +62,7 @@
+ includeAntRuntime="false"
+ destdir="./build/obj" >
+ 
++
+ 
+ 
+ 
+diff -Naur a/router/java/build.xml b/router/java/build.xml
+--- a/router/java/build.xml2018-10-04 12:05:14.0 +0200
 b/router/java/build.xml2018-10-12 08:14:52.921530213 +0200
+@@ -162,6 +162,7 @@
+ includeAntRuntime="true"
+ destdir="./build/obj">
+ 
++
+ 
+ 
+ 

diff --git a/net-vpn/i2p/i2p-0.9.37.ebuild b/net-vpn/i2p/i2p-0.9.37.ebuild
new file mode 100644
index 000..b12699fa669
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.37.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2018 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="+ecdsa 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}
+   ecdsa? (
+   || (
+   dev-java/icedtea:8[-sunec]
+   dev-java/icedtea-bin:8
+   dev-java/oracle-jre-bin
+   dev-java/oracle-jdk-bin
+

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/

2018-09-21 Thread James Le Cuirot 
commit: 9e4861349d2f7b614879eb4b345838da524a5dbe
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Sep 19 17:33:09 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Sep 21 18:25:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e486134

net-vpn/i2p: remove unused patch/files

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/9918

 net-vpn/i2p/files/i2p-0.9.31-add_libs.patch | 22 ---
 net-vpn/i2p/files/i2p-0.9.31.initd  | 33 -
 net-vpn/i2p/files/i2p-0.9.31.service| 13 
 3 files changed, 68 deletions(-)

diff --git a/net-vpn/i2p/files/i2p-0.9.31-add_libs.patch 
b/net-vpn/i2p/files/i2p-0.9.31-add_libs.patch
deleted file mode 100644
index 0ea3149a362..000
--- a/net-vpn/i2p/files/i2p-0.9.31-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.31.initd 
b/net-vpn/i2p/files/i2p-0.9.31.initd
deleted file mode 100644
index 122d64f4919..000
--- a/net-vpn/i2p/files/i2p-0.9.31.initd
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 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"
-   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.31.service 
b/net-vpn/i2p/files/i2p-0.9.31.service
deleted file mode 100644
index ccbadbd4d16..000
--- a/net-vpn/i2p/files/i2p-0.9.31.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

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/

2018-02-11 Thread Michał Górny 
commit: eca2467d3fa41470edfeb493a68876e20f91e51c
Author: tharvik  users  noreply  github  com>
AuthorDate: Fri Feb  9 15:40:02 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb 11 18:38:26 2018 +
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..000
--- 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..000
--- 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..000
--- a/

[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/

2017-05-23 Thread Patrice Clement 
commit: 70afa77a8c8a4624174e7d1b7ce9a58f812b1f69
Author: Yifeng Li  tomli  me>
AuthorDate: Tue May  9 14:42:54 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue May 23 14:28:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70afa77a

net-vpn/i2p: remove 0.9.28.

Signed-off-by: Yifeng Li  tomli.me>
Closes: https://github.com/gentoo/gentoo/pull/4571

 net-vpn/i2p/files/i2p-0.9.28-add_libs.patch |  22 
 net-vpn/i2p/files/i2p-0.9.28.initd  |  35 ---
 net-vpn/i2p/files/i2p-0.9.28.service|  13 ---
 net-vpn/i2p/i2p-0.9.28.ebuild   | 152 
 4 files changed, 222 deletions(-)

diff --git a/net-vpn/i2p/files/i2p-0.9.28-add_libs.patch 
b/net-vpn/i2p/files/i2p-0.9.28-add_libs.patch
deleted file mode 100644
index 0ea3149a362..000
--- a/net-vpn/i2p/files/i2p-0.9.28-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.28.initd 
b/net-vpn/i2p/files/i2p-0.9.28.initd
deleted file mode 100644
index 216d19474cb..000
--- a/net-vpn/i2p/files/i2p-0.9.28.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.28.service 
b/net-vpn/i2p/files/i2p-0.9.28.service
deleted file mode 100644
index ccbadbd4d16..000
--- a/net-vpn/i2p/files/i2p-0.9.28.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.28.ebuild b/net-vpn/i2p/i2p-0.9.28.ebuild
deleted file mode 100644
index 103ad6ed5e1..000
--- a/net-vpn/i2p/i2p-0.9.28.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2016 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