Index: i2p-0.9.18.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/i2p/i2p-0.9.18.ebuild,v
retrieving revision 1.1
diff -u -B -r1.1 i2p-0.9.18.ebuild
--- i2p-0.9.18.ebuild	22 May 2015 05:44:58 -0000	1.1
+++ i2p-0.9.18.ebuild	19 Jul 2015 10:38:01 -0000
@@ -6,47 +6,52 @@
 
 inherit eutils java-pkg-2 java-ant-2 systemd user
 
-DESCRIPTION="A privacy-centric, anonymous network."
+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
-DEPEND=">=dev-java/bcprov-1.50
-		dev-java/eclipse-ecj:*
-		dev-java/jakarta-jstl
-		dev-java/java-service-wrapper
-		dev-java/jrobin
-		dev-java/slf4j-api
-		dev-libs/gmp:*
-		nls? ( sys-devel/gettext )
-		>=virtual/jdk-1.6:="
-RDEPEND="${DEPEND} >=virtual/jre-1.6"
 
+CDEPEND="dev-java/commons-logging:0
+	dev-java/java-service-wrapper:0
+	dev-java/jrobin:0
+	dev-libs/gmp:0
+	java-virtuals/servlet-api:3.0
+	nls? ( sys-devel/gettext )"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+# We're on GNU/Linux, we don't need .exe files
+EANT_EXTRA_ARGS="-DnoExe=true"
 EANT_BUILD_TARGET="pkg"
-EANT_GENTOO_CLASSPATH="jakarta-jstl,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
+	java-pkg-2_pkg_setup
+	use nls || EANT_EXTRA_ARGS+=" -Drequire.gettext=false"
 }
 
-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
+java_prepare() {
+	rm installer/lib/launch4j/lib/*.jar || die
+
+	java-pkg_jar-from servlet-api-3.0 servlet-api.jar apps/jetty/jetty-distribution-*/lib/servlet-api-*.jar
+	java-pkg_jar-from servlet-api-3.0 jsp-api.jar apps/jetty/jetty-distribution-*/lib/jsp/javax.servlet.jsp-*.jar
+	java-pkg_jar-from servlet-api-3.0 el-api.jar apps/jetty/apache-tomcat-deployer/lib/el-api.jar
+
+	java-pkg_jar-from jrobin jrobin.jar apps/jrobin/jrobin*.jar
+#	java-pkg_jar-from --into apps/susidns/src/WEB-INF/lib jakarta-jstl
+	rm -v apps/susidns/src/WEB-INF/lib/* || die
+	java-pkg_jar-from --into installer/lib/wrapper/all java-service-wrapper
+	java-pkg_jar-from --into installer/lib/launch4j/lib commons-logging commons-logging.jar
 }
 
 src_install() {
@@ -62,9 +67,9 @@
 	# 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
+	for i in BOB i2p i2psnark i2ptunnel \
+		jasper-compiler jasper-runtime jbigi jetty* mstreaming org.mortbay.* router* \
+		sam streaming systray systray4j; do
 		java-pkg_dojar lib/${i}.jar
 	done