From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/
Date: Sun, 6 Aug 2023 05:46:56 +0000 (UTC) [thread overview]
Message-ID: <1691300814.ae306609e84eca7d939238c1479830e241f9e285.fordfrog@gentoo> (raw)
commit: ae306609e84eca7d939238c1479830e241f9e285
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Aug 5 07:21:51 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 6 05:46:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae306609
net-vpn/i2p: drop 2.2.1
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/32182
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
net-vpn/i2p/Manifest | 1 -
net-vpn/i2p/i2p-2.2.1.ebuild | 266 -------------------------------------------
2 files changed, 267 deletions(-)
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 443372783e38..522c9fe54104 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1 @@
-DIST i2psource_2.2.1.tar.bz2 33349391 BLAKE2B 45c681fd64c638e78033efbc025f8ddd0200dd79da45d7af539f7553d792f03b9978a62dac0f4763c4589939e1b220efb13d1e4dca03c143cf3b2de31af818a9 SHA512 98ea0b86fcf879b5e4e415d106c446be73441aa03c91f3b9ac02589a332cafad1bf899d381b5986fb78efc550deceedd2da5514c46fbb70f5928d85a76be5ced
DIST i2psource_2.3.0.tar.bz2 33379569 BLAKE2B 56002ad57725216730c6a92eed4c4eb569bfe03e4fcbd811577610f8adf212e9db56e6761f5873933d101e513093b61e296871a122a2e2042945c1fe906bc372 SHA512 dc38174683e2388c0e766db71526e98252fc38c52255bd4529684862edfa05ba25204df97cf09a6084f9833507a0d4ea96e112d1138d9c97d2dd582ef98f9301
diff --git a/net-vpn/i2p/i2p-2.2.1.ebuild b/net-vpn/i2p/i2p-2.2.1.ebuild
deleted file mode 100644
index 8e0ab430ab6b..000000000000
--- a/net-vpn/i2p/i2p-2.2.1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="test"
-
-inherit java-pkg-2 java-ant-2 systemd toolchain-funcs
-
-DESCRIPTION="A privacy-centric, anonymous network"
-HOMEPAGE="https://geti2p.net"
-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"
-
-KEYWORDS="amd64 ~x86"
-LANGS=(
- ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
- sr sv tk tr uk vi zh zh-TW
-)
-IUSE="${LANGS[@]/#/l10n_}"
-
-CP_DEPEND="
- dev-java/bcprov:0
- dev-java/hashcash:1
- dev-java/httpcomponents-client:4
- dev-java/identicon:1
- dev-java/java-getopt:1
- dev-java/java-service-wrapper:0
- dev-java/jbcrypt:0
- dev-java/json-simple:2.3
- dev-java/json-smart:1
- dev-java/jsonrpc2-base:1
- dev-java/jsonrpc2-server:1
- dev-java/jstl:0
- dev-java/jstl-api:0
- dev-java/minidns-core:1
- dev-java/zxing-core:3
- dev-java/zxing-javase:3
- sys-devel/gettext:0[java]
- >=www-servers/tomcat-9.0.73:9
-"
-DEPEND="
- dev-libs/gmp:0=
- ${CP_DEPEND}
- >=virtual/jdk-1.8:*
- test? (
- dev-java/ant-junit4:0
- dev-java/hamcrest:0
- dev-java/junit:4
- dev-java/mockito:4
- )
-"
-RDEPEND="
- ${CP_DEPEND}
- acct-user/i2p
- acct-group/i2p
- >=virtual/jre-1.8:*
-"
-
-PATCHES=(
- "${FILESDIR}/fix-junit-classpath.patch"
-)
-
-EANT_BUILD_TARGET="preppkg-base"
-# no scala as depending on antlib.xml not installed by dev-lang/scala
-EANT_TEST_TARGET="junit.test"
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_CLASSPATH_TAGS="javac java"
-# built locally
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/core/java/build/i2p.jar"
-EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/router/java/build/router.jar"
-EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/apps/ministreaming/java/build/mstreaming.jar"
-
-DOCS=( README.md history.txt )
-
-pkg_pretend() {
- # see https://bugs.gentoo.org/831290
- if [[ "`java-config --show-active-vm`" = *-8 ]] &&
- [[ "`java-config --query MERGE_VM --package=ant-core`" != *-8 ]]
- then
- eerror "dev-java/ant-core was emerged with a newer version of the JDK."
- eerror "It will fail to build with virtual/jdk:1.8 due to #831290."
- eerror "Please switch to a newer JDK"
- eerror " eselect java-vm set system ..."
- eerror "Or remerge dev-java/ant-core with virtual/jdk:1.8"
- eerror " emerge dev-java/ant-core"
- die 'bad JDK for ant-core'
- fi
-}
-
-src_prepare() {
- default # apply PATCHES
- java-pkg-2_src_prepare
-
- # add our classpath
- for f in `find -name build.xml`
- do
- java-ant_rewrite-classpath "$f"
- done
-
- # remove most bundled
- # apps/addressbook/java/src/net/metanotion too much code drift
- # apps/i2psnark/java/src/org/klomp/snark too much code drift
- # apps/jrobin need rrd4j ebuild
- # apps/routerconsole/java/src/{com,edu} too much code drift
- # {core,router}/java/src/com/southernstorm/noise use internal symbols
- # core/java/src/freenet too much code drift
- # core/java/src/gnu/crypto too much code drift
- # router/java/src/com/maxmind changed interface
- # router/java/src/org/cybergarage unable to find version 3
- # router/java/src/org/freenetproject too big to pull
- # router/java/src/org/xlattice changed interface
- java-pkg_clean ! \
- -path "./apps/jetty/jetty-distribution-*" # need to package jetty
- ( cat >> override.properties || die 'set unbundled properties' ) <<- EOF
- require.gettext=true
- with-libgetopt-java=true
- with-libjakarta-taglibs-standard-java=true
- with-libjson-simple-java=true
- with-libtomcat9-java=true
- with-gettext-base=true
- # with-geoip-database=true need std geoip use
- # with-libjetty9-java=true needs a jetty ebuild
- EOF
-
- # bcprov
- rm -r core/java/src/net/i2p/crypto/elgamal || die 'unbundle bcprov'
- sed -e 's,net\.i2p\.crypto\.elgamal\.impl,org.bouncycastle.jce.provider,' \
- -e 's,net\.i2p\.crypto\.elgamal\.spec,org.bouncycastle.jce.spec,' \
- -i core/java/src/net/i2p/crypto/{provider/I2PProvider,CryptoConstants}.java ||
- die 'redirect imports of bcprov'
- # getopt, gettext
- rm -r core/java/src/gnu/{getopt,gettext} || die 'unbundle GNU code'
- # httpcomponents-client
- rm -r core/java/src/net/i2p/apache || die 'unbundle httpcomponents-client'
- sed -e 's,net\.i2p\.apache,org.apache,' \
- -i core/java/src/net/i2p/util/{Addresses,I2PSSLSocketFactory}.java \
- apps/i2pcontrol/java/net/i2p/i2pcontrol/HostCheckHandler.java ||
- die 'redirect imports of httpcomponents-client'
- # identicon, zxing
- rm -r apps/imagegen/{identicon,zxing} || die 'unbundle identicon & zxing'
- sed -e '/LICENSE-Identicon.txt/d' -i build.xml &&
- sed -E '/dir="[^"]*(identicon|zxing)/d' -i apps/imagegen{/imagegen,}/build.xml &&
- sed -E '/(todir="build\/WEB-INF\/classes"|<\/copy>)/d' -i apps/imagegen/imagegen/build.xml ||
- die 'do not depend on unbundled'
- # hashcash
- rm core/java/src/com/nettgryppa/security/HashCash.java ||
- die 'unbundle hashcash'
- # jbcrypt, jsonrpc2-*
- rm -r apps/i2pcontrol/java/{com,org} || die 'unbundle jbcrypt & jsonrpc2-*'
- # jstl*
- sed -E '/"apps\/susidns\/src\/lib\/(jstl|standard).jar"/d' -i build.xml ||
- die 'unbundle jstl*'
- # minidns-core, json-simple
- rm -r core/java/src/org || die 'unbundle minidns-core & json-simple'
-
- # keep only enabled locales
- local lang
- for lang in ${LANGS[@]}
- do
- if ! use "l10n_${lang}"
- then
- find -regextype egrep \
- -regex ".*[_\\./]${lang/-/_}.(html|po|1)" \
- -delete || die "unbundling ${lang} translations"
- fi
- done
-
- # fix some locale names
- find -name '*_in.*' -exec rename --no-overwrite _in. _id. {} \; &&
- find -name '*_iw.*' -exec rename --no-overwrite _iw. _he. {} \; ||
- die 'fix some locale names'
-}
-
-src_configure() {
- java-ant-2_src_configure
-
- # deamon shouldn't start GUI
- sed -i 's|\(clientApp.4.startOnLoad\)=true|\1=false|' \
- installer/resources/clients.config ||
- die 'avoid auto starting browser'
-
- # yep, that's us
- echo "build.built-by=Gentoo" >> override.properties ||
- die 'bragging failed'
-}
-
-src_compile() {
- java-pkg-2_src_compile
-
- local compile_lib
- compile_lib() {
- local name="${1}"
- local file="${2}"
- shift 2
-
- "$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
- ${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
- "${file}" -o "lib${name}.so"
- }
-
- cd "${S}/core/c/jbigi/jbigi" || die "unable to cd to jbigi"
- compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
- die "unable to build jbigi"
-
- if use amd64 || use x86; then
- cd "${S}/core/c/jcpuid" || die "unable to cd to jcpuid"
- compile_lib jcpuid src/jcpuid.c -Iinclude ||
- die "unable to build jcpuid"
- fi
-}
-
-src_test() {
- # avoid rebuilding
- sed -e '/<delete dir=".\/build" \/>/d' -i core/java/build.xml ||
- die 'avoid building twice'
-
- # halt on error
- find -name build.xml \
- -execdir sed -e 's/<junit /\0haltonerror="yes" /' -i {} + ||
- die 'ensure test failures propagate'
-
- EANT_GENTOO_CLASSPATH+=",hamcrest,junit-4,mockito-4"
- java-pkg-2_src_test
-}
-
-src_install() {
- # install basic documentation
- einstalldocs
- doman installer/resources/man/eepget.*
-
- # install main files
- java-pkg_doso core/c/jbigi/jbigi/libjbigi.so
- if use amd64 || use x86; then
- java-pkg_doso core/c/jcpuid/libjcpuid.so
- fi
- cd "${S}/pkg-temp" || die 'unable to change dir to built artifacts'
- java-pkg_dojar lib/*.jar
- java-pkg_dowar webapps/*.war
-
- # install shared
- insinto /usr/share/i2p
- doins blocklist.txt hosts.txt {clients,i2p*}.config
- doins -r certificates docs eepsite geoip scripts
-
- # install daemons
- newinitd "${FILESDIR}/i2p.init" i2p
- systemd_dounit "${FILESDIR}/i2p.service"
-
- # setup dirs
- keepdir /var/log/i2p /var/lib/i2p
- fowners i2p:i2p /var/lib/i2p /var/log/i2p
-
- # create own launchers
- java-pkg_dolauncher i2prouter --main net.i2p.router.Router --jar i2p.jar \
- --pwd "${EPREFIX}/usr/share/i2p" \
- --java_args "\
- -Di2p.dir.app=${EPREFIX}/var/lib/i2p/app \
- -Di2p.dir.config=${EPREFIX}/var/lib/i2p/config \
- -Di2p.dir.router=${EPREFIX}/var/lib/i2p/router \
- -Di2p.dir.log=${EPREFIX}/var/log/i2p \
- -DloggerFilenameOverride=${EPREFIX}/var/log/i2p/router-@"
- java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
-}
next reply other threads:[~2023-08-06 5:47 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-06 5:46 Miroslav Šulc [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-11 8:33 [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/ Sam James
2024-11-28 0:09 Jakov Smolić
2024-10-17 15:32 Arthur Zamarin
2024-10-12 17:12 Arthur Zamarin
2024-09-28 13:30 Arthur Zamarin
2024-09-27 23:23 Jakov Smolić
2024-06-29 9:50 Miroslav Šulc
2024-06-29 6:22 Joonas Niilola
2024-05-24 11:02 Miroslav Šulc
2024-05-24 9:44 Florian Schmaus
2024-05-23 9:19 Miroslav Šulc
2024-05-23 9:14 Florian Schmaus
2024-05-23 9:14 Florian Schmaus
2024-03-10 21:10 Miroslav Šulc
2024-03-10 21:10 Miroslav Šulc
2024-01-05 14:12 Sam James
2023-08-01 11:22 Sam James
2023-07-18 17:21 Sam James
2023-07-18 17:21 Sam James
2023-07-18 16:32 Sam James
2023-07-18 16:32 Sam James
2023-07-15 13:15 Arthur Zamarin
2023-06-14 4:17 Sam James
2023-05-22 6:08 Miroslav Šulc
2023-05-20 11:08 Sam James
2022-08-05 6:57 Arthur Zamarin
2022-07-28 14:17 Sam James
2022-07-10 19:15 Arthur Zamarin
2022-07-10 6:17 Agostino Sarubbo
2022-05-24 14:42 Florian Schmaus
2022-05-24 14:42 Florian Schmaus
2022-03-12 12:01 Arthur Zamarin
2022-03-11 13:30 Joonas Niilola
2021-12-13 5:10 Sam James
2021-12-13 5:10 Sam James
2021-07-16 1:34 Sam James
2021-06-07 8:52 Miroslav Šulc
2020-12-11 7:58 Joonas Niilola
2020-12-11 7:58 Joonas Niilola
2020-09-13 0:44 Sam James
2020-03-21 16:13 Joonas Niilola
2020-03-21 16:13 Joonas Niilola
2020-01-29 6:14 Joonas Niilola
2020-01-16 5:49 Joonas Niilola
2020-01-06 15:40 Joonas Niilola
2020-01-06 15:40 Joonas Niilola
2019-11-13 6:03 Joonas Niilola
2019-06-05 8:54 Michał Górny
2019-06-05 8:54 Michał Górny
2019-04-22 10:17 Michał Górny
2018-10-14 10:33 Michał Górny
2018-10-14 10:33 Michał Górny
2018-09-07 8:24 Patrice Clement
2018-09-07 8:24 Patrice Clement
2018-08-26 17:40 Michał Górny
2018-04-03 15:28 Jonas Stein
2018-02-11 11:12 Michał Górny
2017-08-26 6:50 Patrick Lauer
2017-06-12 21:37 Patrice Clement
2017-05-23 14:28 Patrice Clement
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1691300814.ae306609e84eca7d939238c1479830e241f9e285.fordfrog@gentoo \
--to=fordfrog@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox