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

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

[Patrice Clement]

commit:     8a45d0ebce80a44831be3cd9c298a6d5ff3b6ece
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 22:03:11 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 22:34:42 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a45d0eb

net-p2p/i2p: Stick common dependencies in CDEPEND variable.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-p2p/i2p/i2p-0.9.22.ebuild | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/net-p2p/i2p/i2p-0.9.22.ebuild b/net-p2p/i2p/i2p-0.9.22.ebuild
index d397525..879f632 100644
--- a/net-p2p/i2p/i2p-0.9.22.ebuild
+++ b/net-p2p/i2p/i2p-0.9.22.ebuild
@@ -18,14 +18,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 # dev-java/ant-core is automatically added due to java-ant-2.eclass
-DEPEND="dev-java/eclipse-ecj:*
-		dev-java/jrobin:0
-		dev-java/slf4j-api:0
-		dev-java/java-service-wrapper:0
-		dev-libs/gmp:*
-		nls? ( sys-devel/gettext )
-		>=virtual/jdk-1.6"
-RDEPEND="${DEPEND} >=virtual/jre-1.6"
+CDEPEND="dev-java/jrobin:0
+	dev-java/slf4j-api:0
+	dev-java/java-service-wrapper:0"
+
+DEPEND="${CDEPEND}
+	dev-java/eclipse-ecj:*
+	dev-libs/gmp:*
+	nls? ( sys-devel/gettext )
+	>=virtual/jdk-1.6"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
 
 EANT_BUILD_TARGET="pkg"
 EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api"

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

[Patrice Clement]

commit:     87f5e0180223db27be4f22d4eb447d106043ac9b
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 13:42:32 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 13:43:36 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87f5e018

net-p2p/i2p: Uncomment a doins line. Fixes bug 563372.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-p2p/i2p/i2p-0.9.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/i2p/i2p-0.9.22-r1.ebuild b/net-p2p/i2p/i2p-0.9.22-r1.ebuild
index 7bcfaff..4a06383 100644
--- a/net-p2p/i2p/i2p-0.9.22-r1.ebuild
+++ b/net-p2p/i2p/i2p-0.9.22-r1.ebuild
@@ -85,7 +85,7 @@ src_install() {
 	# Install main files and basic documentation
 	exeinto ${i2p_home}
 	insinto ${i2p_home}
-	#doins blocklist.txt hosts.txt *.config
+	doins blocklist.txt hosts.txt *.config
 	doexe eepget i2prouter runplain.sh
 	dodoc history.txt INSTALL-headless.txt LICENSE.txt
 	doman man/*

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

[Patrice Clement]

commit:     76ca701f15773c55d5f8c5aee5c93e6e18a7464f
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 09:18:40 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 09:20:14 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ca701f

net-p2p/i2p: Correct bcprov version in classpath. Fixes bug 563372.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-p2p/i2p/i2p-0.9.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/i2p/i2p-0.9.22-r1.ebuild b/net-p2p/i2p/i2p-0.9.22-r1.ebuild
index 4a06383..c1b1f02 100644
--- a/net-p2p/i2p/i2p-0.9.22-r1.ebuild
+++ b/net-p2p/i2p/i2p-0.9.22-r1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="${CDEPEND}
 	>=virtual/jre-1.6"
 
 EANT_BUILD_TARGET="pkg"
-EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov"
+EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov-1.50"
 
 pkg_setup() {
 	enewgroup i2p

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

[Daniel Campbell]

commit:     9dde59154c7bc4cc1c1a0a2283586208637b59b6
Author:     Daniel Campbell <zlg <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 17:49:03 2015 +0000
Commit:     Daniel Campbell <zlg <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 17:53:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dde5915

net-p2p/i2p: Remove myself as maintainer

Package-Manager: portage-2.2.23

 net-p2p/i2p/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-p2p/i2p/metadata.xml b/net-p2p/i2p/metadata.xml
index 316d7cc..16fc6e2 100644
--- a/net-p2p/i2p/metadata.xml
+++ b/net-p2p/i2p/metadata.xml
@@ -7,7 +7,6 @@
 	<email>sam@cmpct.info</email>
 	<description>Proxy-maintainer; add or CC them for bugs</description>
 </maintainer>
-<maintainer><email>zlg@gentoo.org</email></maintainer>
 <longdescription>I2P is an anonymous network, exposing a simple layer that applications can use to anonymously and securely send messages to each other.</longdescription>
 <use>
 <flag name="nls">Adds Native Language Support using GNU gettext.</flag>

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

[Patrice Clement]

commit:     f42889a92628738940b8bbf7bf583dc99d89497a
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 19:32:23 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 21:04:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f42889a9

net-p2p/i2p: Changing maintainer, the current one has gone AWOL.

Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-p2p/i2p/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/i2p/metadata.xml b/net-p2p/i2p/metadata.xml
index 16fc6e2..15efd3e 100644
--- a/net-p2p/i2p/metadata.xml
+++ b/net-p2p/i2p/metadata.xml
@@ -4,7 +4,7 @@
 <herd>java</herd>
 <herd>proxy-maintainers</herd>
 <maintainer>
-	<email>sam@cmpct.info</email>
+	<email>tharvik@gmail.com</email>
 	<description>Proxy-maintainer; add or CC them for bugs</description>
 </maintainer>
 <longdescription>I2P is an anonymous network, exposing a simple layer that applications can use to anonymously and securely send messages to each other.</longdescription>

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

[Patrice Clement]

commit:     6036043082cf8d73e949005d8d7070856d87b6c3
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  7 07:56:07 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jan  7 07:56:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60360430

net-p2p/i2p: Add missing die.

Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-p2p/i2p/i2p-0.9.23.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/i2p/i2p-0.9.23.ebuild b/net-p2p/i2p/i2p-0.9.23.ebuild
index 52e9cc0..bfe7595 100644
--- a/net-p2p/i2p/i2p-0.9.23.ebuild
+++ b/net-p2p/i2p/i2p-0.9.23.ebuild
@@ -46,7 +46,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
+	cd "${S}" || die
 	java-ant_rewrite-classpath
 }
 

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

[Patrice Clement]

commit:     93a8be510ab8a295504ad7d906d1a1aae7545ab7
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Sun Feb 14 04:01:08 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 07:58:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a8be51

net-p2p/i2p: adjust metadata.xml for i2p

- add tomboy64 <AT> sina.cn as additional proxy-maintainer
- add name-tag for tharvik

Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches

 net-p2p/i2p/metadata.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/net-p2p/i2p/metadata.xml b/net-p2p/i2p/metadata.xml
index 3d2ba23..eb1dd22 100644
--- a/net-p2p/i2p/metadata.xml
+++ b/net-p2p/i2p/metadata.xml
@@ -3,6 +3,12 @@
 <pkgmetadata>
 <maintainer type="person">
 	<email>tharvik@gmail.com</email>
+	<name>Tharvik</name>
+	<description>Proxy-maintainer; add or CC them for bugs</description>
+</maintainer>
+<maintainer type="person">
+	<email>tomboy64@sina.cn</email>
+	<name>M.B.</name>
 	<description>Proxy-maintainer; add or CC them for bugs</description>
 </maintainer>
 <maintainer type="project">

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

[Patrice Clement]

commit:     4eae7210ca88d54ee3f8ff245a5813683156ee4b
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Fri Feb 12 20:45:15 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 07:58:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eae7210

net-p2p/i2p: rebump to 0.9.24-r1

adjust requirements for JVM regarding ECDSA

Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches

 net-p2p/i2p/i2p-0.9.24-r1.ebuild | 151 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)

diff --git a/net-p2p/i2p/i2p-0.9.24-r1.ebuild b/net-p2p/i2p/i2p-0.9.24-r1.ebuild
new file mode 100644
index 0000000..c265d91
--- /dev/null
+++ b/net-p2p/i2p/i2p-0.9.24-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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
+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}
+	|| (
+		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
+	)"
+
+EANT_BUILD_TARGET="pkg"
+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 "${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
+}
+
+src_install() {
+	# 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_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}/${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 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.'
+
+}

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

[Patrice Clement]

commit:     9bef1e830162489718f25ef38a96dc9ab91b30fc
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Mon Mar 28 13:20:13 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 08:24:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bef1e83

net-p2p/i2p: clean out old ebuilds: 0.9.22, 22-r1, 23, 24

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches
Closes: https://github.com/gentoo/gentoo/pull/1153

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-p2p/i2p/Manifest             |   2 -
 net-p2p/i2p/i2p-0.9.22-r1.ebuild | 106 -------------------------------
 net-p2p/i2p/i2p-0.9.22.ebuild    | 103 ------------------------------
 net-p2p/i2p/i2p-0.9.23.ebuild    | 122 -----------------------------------
 net-p2p/i2p/i2p-0.9.24.ebuild    | 133 ---------------------------------------
 5 files changed, 466 deletions(-)

diff --git a/net-p2p/i2p/Manifest b/net-p2p/i2p/Manifest
index c2dfc5b..1504c9c 100644
--- a/net-p2p/i2p/Manifest
+++ b/net-p2p/i2p/Manifest
@@ -1,4 +1,2 @@
-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
 DIST i2psource_0.9.25.tar.bz2 24652935 SHA256 daaac2b5a5a6b5bbd4b805f76e14f6a7c201dfd7c1cf43c98e182d2e657d1236 SHA512 a50f00d9ad32993da30529339e3ffd425d5e97d5120d9e4e446f6fa7ac0cbb6ee4f35c013b0815802ff6c72e188b00d408c7fa398c8ee1ae71be57383a1411f6 WHIRLPOOL a851f6505155201d872774407dc71c9dd03a4683b3ce35d2fff74fd3f7f17d12cc1cc72dfcc2c7c4f0d82b86333bd0424066ae41330e603ba07872d56c257e27

diff --git a/net-p2p/i2p/i2p-0.9.22-r1.ebuild b/net-p2p/i2p/i2p-0.9.22-r1.ebuild
deleted file mode 100644
index c1b1f02..0000000
--- a/net-p2p/i2p/i2p-0.9.22-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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
-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.6"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-EANT_BUILD_TARGET="pkg"
-EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov-1.50"
-
-pkg_setup() {
-	enewgroup i2p
-	enewuser i2p -1 -1 /var/lib/i2p i2p -m
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	java-ant_rewrite-classpath
-}
-
-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
-}
-
-src_install() {
-	# Cd into pkg-temp.
-	cd "${S}/pkg-temp" || die
-
-	# Apply patch.
-	epatch "${FILESDIR}/${P}_fix-paths.patch"
-
-	# Using ${D} here results in an error. Docs say use $ROOT
-	i2p_home="${ROOT}/usr/share/i2p"
-
-	# 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"
-	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_home}/i2psvc
-	dosym ${i2p_home}/i2prouter /usr/bin/i2prouter
-	dosym ${i2p_home}/eepget /usr/bin/eepget
-
-	# Install main files and basic documentation
-	exeinto ${i2p_home}
-	insinto ${i2p_home}
-	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}/i2p.initd" i2p
-	systemd_newunit "${FILESDIR}"/i2p.service i2p.service
-}
-
-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"
-}

diff --git a/net-p2p/i2p/i2p-0.9.22.ebuild b/net-p2p/i2p/i2p-0.9.22.ebuild
deleted file mode 100644
index 879f632..0000000
--- a/net-p2p/i2p/i2p-0.9.22.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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
-CDEPEND="dev-java/jrobin:0
-	dev-java/slf4j-api:0
-	dev-java/java-service-wrapper:0"
-
-DEPEND="${CDEPEND}
-	dev-java/eclipse-ecj:*
-	dev-libs/gmp:*
-	nls? ( sys-devel/gettext )
-	>=virtual/jdk-1.6"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-EANT_BUILD_TARGET="pkg"
-EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api"
-
-pkg_setup() {
-	enewgroup i2p
-	enewuser i2p -1 -1 /var/lib/i2p i2p -m
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	java-ant_rewrite-classpath
-}
-
-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
-}
-
-src_install() {
-	# Cd into pkg-temp.
-	cd "${S}/pkg-temp" || die
-
-	# Apply patch.
-	epatch "${FILESDIR}/${P}_fix-paths.patch"
-
-	# Using ${D} here results in an error. Docs say use $ROOT
-	i2p_home="${ROOT}/usr/share/i2p"
-
-	# 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"
-	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_home}/i2psvc
-	dosym ${i2p_home}/i2prouter /usr/bin/i2prouter
-	dosym ${i2p_home}/eepget /usr/bin/eepget
-
-	# Install main files and basic documentation
-	exeinto ${i2p_home}
-	insinto ${i2p_home}
-	#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}/i2p.initd" i2p
-	systemd_newunit "${FILESDIR}"/i2p.service i2p.service
-}
-
-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"
-}

diff --git a/net-p2p/i2p/i2p-0.9.23.ebuild b/net-p2p/i2p/i2p-0.9.23.ebuild
deleted file mode 100644
index bfe7595..0000000
--- a/net-p2p/i2p/i2p-0.9.23.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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
-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.6"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-EANT_BUILD_TARGET="pkg"
-EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov-1.50"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	enewgroup i2p
-	enewuser i2p -1 -1 /var/lib/i2p 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
-
-	#epatch "${FILESDIR}/${P}_fix-encoding.patch"
-}
-
-src_install() {
-	# Cd into pkg-temp.
-	cd "${S}/pkg-temp" || die
-
-	# Apply patch.
-	epatch "${FILESDIR}/${P}_fix-paths.patch"
-
-	# Using ${D} here results in an error. Docs say use $ROOT
-	i2p_home="${ROOT}/usr/share/i2p"
-
-	# 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"
-	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_home}/i2psvc
-	dosym ${i2p_home}/i2prouter /usr/bin/i2prouter
-	dosym ${i2p_home}/eepget /usr/bin/eepget
-
-	# Install main files and basic documentation
-	exeinto ${i2p_home}
-	insinto ${i2p_home}
-	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}"/i2p.service i2p.service
-
-	# setup user
-	dodir /var/lib/i2p/.i2p
-	fowners -R i2p:i2p /var/lib/i2p/.i2p
-}
-
-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'
-}

diff --git a/net-p2p/i2p/i2p-0.9.24.ebuild b/net-p2p/i2p/i2p-0.9.24.ebuild
deleted file mode 100644
index dd695e9..0000000
--- a/net-p2p/i2p/i2p-0.9.24.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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
-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="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 "${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
-}
-
-src_install() {
-	# 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_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}/${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'
-}

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

[Patrice Clement]

commit:     2d2e534f92ff60694ade74176f1551e76182b1ed
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Mon Mar 28 13:17:31 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 08:24:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d2e534f

net-p2p/i2p: fix compile failure with LC_ALL=C.

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches
Gentoo-Bug: https://bugs.gentoo.org/578374
Closes: https://github.com/gentoo/gentoo/pull/1153

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-p2p/i2p/{i2p-0.9.24-r1.ebuild => i2p-0.9.24-r2.ebuild} | 1 +
 net-p2p/i2p/{i2p-0.9.25.ebuild => i2p-0.9.25-r1.ebuild}    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net-p2p/i2p/i2p-0.9.24-r1.ebuild b/net-p2p/i2p/i2p-0.9.24-r2.ebuild
similarity index 99%
rename from net-p2p/i2p/i2p-0.9.24-r1.ebuild
rename to net-p2p/i2p/i2p-0.9.24-r2.ebuild
index c265d91..f0f48b0 100644
--- a/net-p2p/i2p/i2p-0.9.24-r1.ebuild
+++ b/net-p2p/i2p/i2p-0.9.24-r2.ebuild
@@ -45,6 +45,7 @@ RDEPEND="${CDEPEND}
 
 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'

diff --git a/net-p2p/i2p/i2p-0.9.25.ebuild b/net-p2p/i2p/i2p-0.9.25-r1.ebuild
similarity index 99%
rename from net-p2p/i2p/i2p-0.9.25.ebuild
rename to net-p2p/i2p/i2p-0.9.25-r1.ebuild
index 8e00d27..e25d09f 100644
--- a/net-p2p/i2p/i2p-0.9.25.ebuild
+++ b/net-p2p/i2p/i2p-0.9.25-r1.ebuild
@@ -48,6 +48,7 @@ RDEPEND="${CDEPEND}
 
 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'

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

[James Le Cuirot]

commit:     0f67b790f8ed83037a0339569c555e77c7b77805
Author:     tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Sep  2 15:24:53 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 20:46:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f67b790

net-p2p/i2p: fix enewuser unsupported use (@gsora)

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2191

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 net-p2p/i2p/i2p-0.9.26.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/i2p/i2p-0.9.26.ebuild b/net-p2p/i2p/i2p-0.9.26.ebuild
index 8f0da55..fc39f4c 100644
--- a/net-p2p/i2p/i2p-0.9.26.ebuild
+++ b/net-p2p/i2p/i2p-0.9.26.ebuild
@@ -64,7 +64,7 @@ pkg_setup() {
 	java-pkg-2_pkg_setup
 
 	enewgroup i2p
-	enewuser i2p -1 -1 "${I2P_CONFIG_HOME}" i2p -m
+	enewuser i2p -1 -1 "${I2P_CONFIG_HOME}" i2p
 }
 
 src_unpack() {