summaryrefslogtreecommitdiff
path: root/net-vpn/i2p
diff options
context:
space:
mode:
Diffstat (limited to 'net-vpn/i2p')
-rw-r--r--net-vpn/i2p/Manifest4
-rw-r--r--net-vpn/i2p/i2p-0.9.48.ebuild (renamed from net-vpn/i2p/i2p-0.9.45.ebuild)57
2 files changed, 5 insertions, 56 deletions
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 364ca822bcf9..76fd1c3909b4 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,8 +1,8 @@
AUX i2p-0.9.47-DataHelper-decompress-fix-length-check.patch 1110 BLAKE2B 9e34a568f94baed130c6f9dd3cda2f6ae6e409d7c41bff8fca5226fa6e84d989b46e84672440c8dcfb861d237075093c8a7bfab50d7b2385ca376e11524bc876 SHA512 204150b938fafe5b521d381ed6c517624cec3b47d564d84ae21e7884d87348a3fd4387b193e466df5c152f6262e29e1e88f9f970a78cf516839099b16fd5938a
AUX i2p.init 394 BLAKE2B 477566594bb2da98e65faf0a54be434d2684b23903f1762db674b9c21e7a1647566441b1974594194ff0e43187869af7c8487062183d9250cba01e4faba20bc1 SHA512 c748ebc130b4d5d0860eaf511f3e844b3c3b1291bcc9fc42ea3d3622b8be4f782c1153645f4d4f8e3374649390c533e3264d24afde0b72fd5bdae88e7da6c754
AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
-DIST i2psource_0.9.45.tar.bz2 31921025 BLAKE2B 2d37777f77784ff93de4d7442eddf46b9a541902412bf5fb24cf96baba73851cc17d01649a7b4b41a710ccde5690036a890b8f84de00f4c615ed2e23da8fa510 SHA512 d4cf354f0a807d132fae75d4bad3e2e788e1ed03d6f625feb0f1369bb2c9e1a6e2758645acf2017c61dbc47d75e6d834b87455adbead1077f206025686548ae9
DIST i2psource_0.9.47.tar.bz2 32488438 BLAKE2B e1544475dad526e242570918c1bb967a4b713567e71201e08b73c8995743a68396b5951f477bfe8830927c0cdf7e991a25a1978d4aaf88cae3e4218ba57a8818 SHA512 7fdd9ab0b3e81aa89e73be6fa172d723c2b5a67365116a1e0e0ec948067fe4f58e3ad946a0ef4605602c0d803b98e37b2d5692a39a14cf7433d546ada204cbc9
-EBUILD i2p-0.9.45.ebuild 6141 BLAKE2B f976651689de16ad75c84d1e649df8569a0b84d12996d196facb220152102165d5a693e8214b500f59237e9385129d2fa47f18b5140e755236ae948e9aa2adf4 SHA512 247a2b2fae9736529e9e4c1424a924da9e1dec822c4a7d7d742a77331730cb5e5b42541ce4a7a0590d0c04049171b96e37cc48b4a547958560500ee2f7683152
+DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a
EBUILD i2p-0.9.47.ebuild 6219 BLAKE2B f8f9dec30525d43bad24a7972fa9df12746fc70b4bce1931eacb07eab7dfe771d50ccb7d651452e37ab88aeda25e7d40254fc55b1723b8496e6e90279f16dd22 SHA512 e5a3ff6e87e53baf70f9e1f77302b500572345d42bea2a6706a39d422c2529162d7678237e7decd6a4f873f8e38141d98763fbbfefe6c7d5eddc0ad9d91b05b1
+EBUILD i2p-0.9.48.ebuild 4767 BLAKE2B afe3a7ff68167e428630be309ee2aaa7241c8b07318ac0e736040f33366183dbdf49e2bdc0e80e9579b83c06e3373a0e7397d0aa16e82411d203a979031037e4 SHA512 dab89bf22336afad01ba285b64b893a22b627122c675697ca9d73fc9a9132b99cf0cc44fd3e009fdcdc1e819be5a3be2bf1b219a9b9133f0ef0560348fd3db6a
MISC metadata.xml 709 BLAKE2B b429dbd7d8c4c6d7e9f829d77fc30f8bb0147d3a4e252874d5f1f905a45e7b46f380ea7d25f5a52d871545fff4891a80756bc227d61e101c2bcf17f6e72584bb SHA512 e5e3dd0ec86672394b94e5d740c21a014e42c7d3be502a1bac15f809b39fea25e00493cd70f441752e65da253424945e2fb5c7a86c9b31898f4a17d2ad19bafe
diff --git a/net-vpn/i2p/i2p-0.9.45.ebuild b/net-vpn/i2p/i2p-0.9.48.ebuild
index 8949446a2663..23715c60adf5 100644
--- a/net-vpn/i2p/i2p-0.9.45.ebuild
+++ b/net-vpn/i2p/i2p-0.9.48.ebuild
@@ -19,15 +19,9 @@ 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
+ dev-java/java-service-wrapper:0
+ dev-java/tomcat-servlet-api:4.0
"
DEPEND="${CP_DEPEND}
@@ -134,7 +128,7 @@ src_install() {
cd "${S}/pkg-temp" || die
# we remove system installed jar and install the others
- rm lib/{jrobin,wrapper,jbigi,commons-logging,javax.servlet}.jar || \
+ rm lib/{commons-logging,javax.servlet,wrapper}.jar || \
die "unable to remove locally built jar already found in system"
java-pkg_dojar lib/*.jar
@@ -163,48 +157,3 @@ src_install() {
keepdir /var/lib/i2p
fowners i2p:i2p /var/lib/i2p
}
-
-pkg_postinst() {
- local old_i2pdir="${EPREFIX}/var/lib/i2p/.i2p" new_i2pdir="${EPREFIX}/var/lib/i2p"
-
- [ -e "${old_i2pdir}" ] || return
-
- elog "User is now delegated to acct-user, ${new_i2pdir} is split"
- elog "into subdirs. It will now try to split ${old_i2pdir} accordingly."
-
- migrate() {
- local dest="${1}"
- shift
-
- local ret=true
- for src
- do
- [ -e "${src}" ] || continue
- mv "${src}" "${dest}" || ret=false
- done
-
- $ret
- }
-
- ebegin "Migrating"
- local ret=0
- chown -R i2p:i2p "${EPREFIX}/var/lib/i2p" || ret=1
- migrate "${new_i2pdir}/app" "${old_i2pdir}/i2psnark" || ret=1
- migrate "${new_i2pdir}/config" \
- "${old_i2pdir}/"{docs,eepsite,hosts.txt,prngseed.rnd,*.config*} ||
- ret=1
- migrate "${new_i2pdir}/router" \
- "${old_i2pdir}/"{addressbook,eventlog.txt,hostsdb.blockfile,keyBackup,netDb,peerProfiles,router.*,rrd} ||
- ret=1
- migrate "${EPREFIX}/var/log/i2p" "${old_i2pdir}/"{logs/*,wrapper.log*} ||
- ret=1
- rm -fr "${old_i2pdir}/"{hostsdb.blockfile.*.corrupt,logs}
- rmdir "${old_i2pdir}" || ret=1
-
- if ! eend $ret
- then
- ewarn "There was some file remaining in ${old_i2pdir}."
- ewarn "Please check it there is something of value there."
- ewarn "remove it when migration is done."
- fi
-}