From 07a79a268edfbac4dba8c66eff20cbdc2aac0f6a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 May 2023 08:56:17 +0100 Subject: gentoo auto-resync : 22:05:2023 - 08:56:17 --- net-vpn/Manifest.gz | Bin 7072 -> 7070 bytes net-vpn/i2p/Manifest | 2 +- net-vpn/i2p/i2p-2.1.0-r1.ebuild | 225 ---------------------------------------- net-vpn/i2p/i2p-2.1.0-r2.ebuild | 224 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 225 insertions(+), 226 deletions(-) delete mode 100644 net-vpn/i2p/i2p-2.1.0-r1.ebuild create mode 100644 net-vpn/i2p/i2p-2.1.0-r2.ebuild (limited to 'net-vpn') diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz index c06198f2aedf..b1d22e7abb38 100644 Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest index f400b32ba804..b3ba62afd9fc 100644 --- a/net-vpn/i2p/Manifest +++ b/net-vpn/i2p/Manifest @@ -6,5 +6,5 @@ AUX i2p.service 172 BLAKE2B 8523af82e33d7a8f5b37138f8d28c7adb4c08607b84813f35b42 DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f DIST i2psource_2.1.0.tar.bz2 32817295 BLAKE2B d37463522143c02e04c96d58578312b536ab5e2842e5647dbe5ba3d5c139329c447f16de7e326ef48ef4c6b3c11631e23300b5327cc31d9da5288240f86c926f SHA512 e8639c2b2869d3c7856b598d4cd3505458ed5cab5dce3570cafdaec3ccd77dbaec35787cccc6782acc75adb423b7baaab724ac3c98e5b91b41cf4c76f3614355 EBUILD i2p-1.7.0-r1.ebuild 4212 BLAKE2B 7cf5f94c8d1a9814f69cce175ce49b6f63575b9e90e6c404bec07be1f4476713db635561b355aab314a71cfe7e02ae1615902f6ad22984d238037c234146644f SHA512 a3c609a3c37e6430daed918d215536d1ec9ddd4c12f1191a26184503fee3b8dd88b2db700be6870414a4d775dc548d0c8bc0d579a595a9b079e57f1142dd712a -EBUILD i2p-2.1.0-r1.ebuild 7167 BLAKE2B f2a5bcdb1b0e52fa258aae083525cec795a5d64c17fc203cdc5a2305529fc8e3dcb3eae5a208a4fc97d6d91a0c0119958e61b9188bf504a7b898c14bce1b856b SHA512 5fb4b5f20ab5079f4a8825c54a9d63bbd3f1e68b9b8e06221fed102cbfdd97743ab8dbebf75b9b7eb381ddb225d84f372fb5e23cdde0e3a09742fd26f517c0a0 +EBUILD i2p-2.1.0-r2.ebuild 7138 BLAKE2B 90153ea24b8ee7aea9c1c8242fc4fff477f2c9bddd287c0af39a9f1c04a614a545b8d91794180764286274fb0516206ae81f4e76a712151181116799879b373a SHA512 40baca6878e714d28740abc489647e70a6b2912a80169e1c549847c72bf6cc86a4bf4a0ba917eee079eff04bd658483d003939d8c70dd61617c8f01f0bd17cde MISC metadata.xml 832 BLAKE2B ecda42c25627405f84f1df24fecf9b117c2dd15c44166eaea65df6924dce67e562a0ba7af83508fe7512d5ee75b23620e59ab7376701178f0cef6c47d42b751f SHA512 effe4661ecc390b6b76984192fcd4124cb29302e5ff4c545447b08ca5fc07ae63efa57d3082487940c64ade864d9c76a55f1bd1a05217808fb733a3a18cb553d diff --git a/net-vpn/i2p/i2p-2.1.0-r1.ebuild b/net-vpn/i2p/i2p-2.1.0-r1.ebuild deleted file mode 100644 index f927c3080df1..000000000000 --- a/net-vpn/i2p/i2p-2.1.0-r1.ebuild +++ /dev/null @@ -1,225 +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 - -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 - >=net-libs/nativebiginteger-2.1.0:0 - sys-devel/gettext:0[java] - >=www-servers/tomcat-9.0.73:9 -" -DEPEND=" - ${CP_DEPEND} - >=virtual/jdk-1.8:* - test? ( - dev-java/ant-junit4:0 - dev-java/hamcrest:0 - dev-java/hamcrest-core:1.3 - dev-java/junit:4 - dev-java/mockito:4 - ) -" -RDEPEND=" - ${CP_DEPEND} - acct-user/i2p - acct-group/i2p - >=virtual/jre-1.8:* -" - -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`" = openjdk*-8 ]] && - [[ "`java-config --query MERGE_VM --package=ant-core`" != openjdk*-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() { - 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() { - # 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_test() { - # avoid rebuilding - sed -e '//d' -i core/java/build.xml || - die 'avoid building twice' - - 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 - cd "${S}/pkg-temp" || die 'unable to change dir to built artifacts' - # remove merged packages - java-pkg_dojar lib/*.jar - insinto "/usr/share/i2p" - doins blocklist.txt hosts.txt {clients,i2p*}.config - doins -r certificates docs eepsite geoip scripts - java-pkg_dowar webapps/*.war - - # 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 -} diff --git a/net-vpn/i2p/i2p-2.1.0-r2.ebuild b/net-vpn/i2p/i2p-2.1.0-r2.ebuild new file mode 100644 index 000000000000..2883493999e5 --- /dev/null +++ b/net-vpn/i2p/i2p-2.1.0-r2.ebuild @@ -0,0 +1,224 @@ +# 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 + +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 + >=net-libs/nativebiginteger-2.1.0:0 + sys-devel/gettext:0[java] + >=www-servers/tomcat-9.0.73:9 +" +DEPEND=" + ${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:* +" + +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`" = openjdk*-8 ]] && + [[ "`java-config --query MERGE_VM --package=ant-core`" != openjdk*-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() { + 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() { + # 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_test() { + # avoid rebuilding + sed -e '//d' -i core/java/build.xml || + die 'avoid building twice' + + 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 + cd "${S}/pkg-temp" || die 'unable to change dir to built artifacts' + # remove merged packages + java-pkg_dojar lib/*.jar + insinto "/usr/share/i2p" + doins blocklist.txt hosts.txt {clients,i2p*}.config + doins -r certificates docs eepsite geoip scripts + java-pkg_dowar webapps/*.war + + # 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 +} -- cgit v1.2.3