diff options
Diffstat (limited to 'net-vpn/i2p')
| -rw-r--r-- | net-vpn/i2p/Manifest | 4 | ||||
| -rw-r--r-- | net-vpn/i2p/i2p-1.6.1.ebuild (renamed from net-vpn/i2p/i2p-0.9.48.ebuild) | 42 |
2 files changed, 17 insertions, 29 deletions
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest index 7489d70a138b..a34ba2f66bbf 100644 --- a/net-vpn/i2p/Manifest +++ b/net-vpn/i2p/Manifest @@ -1,7 +1,7 @@ AUX i2p.init 391 BLAKE2B e62a23021db61ba93adaf1ff9c2f0bb9372cee3921544c9ca498f3472dc64c700a0fb78d2fed9dafc0fa98c97670f67266a2e0f8c594c7c1352d15e1b23d7586 SHA512 12c69b2c5918a23219d84f2c1ded286ced6f78564241372bead318ddcb77876e90c800735f7ed6e92c03f69dfeb990ec43e40efd1e9ee32888b404d1e2e9643a AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5 -DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a DIST i2psource_0.9.50.tar.bz2 32409456 BLAKE2B 0c45b48ae6e1957b6c5d828757c70489d260fe15276559e5c366c68c10274b9020b2978bf0674a8628638f41b1e269af0c4d35c20c1f0cee419857c0c803dd82 SHA512 2d6b1d3ed4d32af36d0d3b257dca6fad981e3fa0cd3e45b8227e76e57de092c11ff7c239e879739d330ae809bcf6c71640de32de0c52c54ef8597f0c0e1467ec -EBUILD i2p-0.9.48.ebuild 4767 BLAKE2B afe3a7ff68167e428630be309ee2aaa7241c8b07318ac0e736040f33366183dbdf49e2bdc0e80e9579b83c06e3373a0e7397d0aa16e82411d203a979031037e4 SHA512 dab89bf22336afad01ba285b64b893a22b627122c675697ca9d73fc9a9132b99cf0cc44fd3e009fdcdc1e819be5a3be2bf1b219a9b9133f0ef0560348fd3db6a +DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a EBUILD i2p-0.9.50.ebuild 4799 BLAKE2B 895096a59bffbff9345f8c8250ad92b5bbe30c58c515bf8be1f2380c1acf2cbd718a51d57a6406e217af969fe1838a7c51f6f517a09cf2c25d717551b92b0306 SHA512 e76c98981e9e17046d30ba626a01a30ed2e5be9335bea79417baac0a618a5c0b70b9e8c6696be30a0f88f38414e36ddfc112dc796a11ed6ccb48850eb34221c5 +EBUILD i2p-1.6.1.ebuild 4456 BLAKE2B 3900132797092a6277511c5c8ac435305b8f117caad8712163ab3fa5b0cd0ca3b2047d10b5e0332544c82ddc5a6d8efefefda94a72c0eb4d6e02a731c8b4a15c SHA512 162c9802f96f1a1845d08ec52e68925d8c7767e1ec06426243a2b2acade213e9fb347e3229cac6d355b15a0f4167431b60617ef4e925a6e71d2b626493bed579 MISC metadata.xml 740 BLAKE2B 06a3a1b273cd25dacdedfb1e9dbb1a1ef5c32cf44bb76101ba521ac3b387533c10e111b76182a04e55d50a9bdf7e03f15101db768a63d03c02190c5aebe1f4ac SHA512 b598a77193edf843a205f4fdf22e779b978e26d1b3fcec9adc19e78783bbda15d53c66a55ef0b14fe3c25601f167e5f5f299fa0472ef3620dc46fd47c97ff909 diff --git a/net-vpn/i2p/i2p-0.9.48.ebuild b/net-vpn/i2p/i2p-1.6.1.ebuild index 23715c60adf5..56ba991f558a 100644 --- a/net-vpn/i2p/i2p-0.9.48.ebuild +++ b/net-vpn/i2p/i2p-1.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,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" +SRC_URI="https://files.i2p-projekt.de/${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" @@ -18,29 +18,26 @@ IUSE="nls test" RESTRICT="!test? ( test )" # dev-java/ant-core is automatically added due to java-ant-2.eclass -CP_DEPEND=" - dev-java/commons-logging:0 - dev-java/java-service-wrapper:0 - dev-java/tomcat-servlet-api:4.0 -" +CP_DEPEND="dev-java/java-service-wrapper:0" +#dev-java/eclipse-ecj:* DEPEND="${CP_DEPEND} - dev-java/eclipse-ecj:* - nls? ( >=sys-devel/gettext-0.19 ) virtual/jdk:1.8 + nls? ( >=sys-devel/gettext-0.19 ) test? ( dev-java/ant-junit4:0 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 + dev-java/mockito:0 ) " RDEPEND="${CP_DEPEND} acct-user/i2p acct-group/i2p - virtual/jre:1.8 net-libs/nativebiginteger:0 + virtual/jre:1.8 " EANT_BUILD_TARGET="pkg" @@ -71,20 +68,20 @@ src_prepare() { # avoid auto starting browser sed -i "s|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|" \ - "installer/resources/clients.config" || die + 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 cp="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n" + local classpath="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n" for lib in ${i2p_cp//,/ } do - cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n" + classpath+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n" done - # add generated cp, hardcode system VM, setting system's conf - sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${cp}|" \ + # add generated classpath, hardcode system VM, setting system's conf + sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${classpath}|" \ -e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \ -e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/$(get_libdir)/java-service-wrapper|" \ -e "s|\(wrapper\.java\.library\.path\)\.2=.*|\1.2=${EPREFIX}/usr/share/i2p/lib\n\1.3=/usr/$(get_libdir)|" \ @@ -109,18 +106,9 @@ src_prepare() { } src_test() { - # store built version of jars, overwritten by testing - mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" || - die "unable to save jars before tests" - # generate test classpath - local cp - cp="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3)" - EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${cp}" java-pkg-2_src_test - - # redo work undone by testing - mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" || - die "unable to restore jars after tests" + local classpath="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3,mockito)" + EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${classpath}" java-pkg-2_src_test } src_install() { @@ -128,7 +116,7 @@ src_install() { cd "${S}/pkg-temp" || die # we remove system installed jar and install the others - rm lib/{commons-logging,javax.servlet,wrapper}.jar || \ + rm lib/wrapper.jar || \ die "unable to remove locally built jar already found in system" java-pkg_dojar lib/*.jar |