diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-24 17:22:19 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-24 17:22:19 +0000 |
commit | aa3411e241a201d53a2689766fe419f2756819f3 (patch) | |
tree | cc19adfde0a10aab1ab566c8dfe3c1616e5cc390 /net-p2p/freenet | |
parent | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (diff) |
gentoo resync : 24.03.2019
Diffstat (limited to 'net-p2p/freenet')
-rw-r--r-- | net-p2p/freenet/Manifest | 6 | ||||
-rw-r--r-- | net-p2p/freenet/freenet-0.7.5_p1478.ebuild | 158 | ||||
-rw-r--r-- | net-p2p/freenet/freenet-0.7.5_p1484.ebuild (renamed from net-p2p/freenet/freenet-0.7.5_p1478-r1.ebuild) | 25 |
3 files changed, 18 insertions, 171 deletions
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest index 576850d378a4..01c61429c181 100644 --- a/net-p2p/freenet/Manifest +++ b/net-p2p/freenet/Manifest @@ -7,14 +7,12 @@ AUX freenet 474 BLAKE2B f50fbfaaaf6a919ac15b078a627eb1b2fbc9e6b6c83e4229ae4032e6 AUX freenet-0.7.5_p1474-wrapper.conf 949 BLAKE2B 6832683015aff6db0ad2b4116a6b8aea2ca23c1ac38da72ae71ac3a339a2efe69a7bab37911035d82a15d6ff725fb8d481deae42bd1bbaf0ad62119194674354 SHA512 a6d30afc502176a6e0bab480368553c1df50add8fe18b65cede38be752c989125999cbb8bedfd68641623fd4498e19610c16d02fcf9d951da450a9612301cdeb AUX freenet.service 271 BLAKE2B 7d47ad525f4bb13e07c50a0bdf19f1ef234d5219e82f426254c316abc4517180c22267a245ca022edf68e615a2865fe0dd08f694ee5ee2ced8c5391b3c5e33ad SHA512 2f3d4ec0ba05eff328e8176cbe130176a82a1bb432599de44ab78ca27e9c96e0eafe0871f12b0165247f941a2e929635a6abe6cd61351b1305c0d0e8cff83d2b AUX run.sh-20090501 16217 BLAKE2B 249254104ca2d0a20131a5d6b36a07b14fe6407d1915d75ecf98a617de6e532def710975ff1b2e0b580f7148099cd7f6915d8adc0b15e1f67af4fc4713e0e5af SHA512 ba97f1e370ffb7c9ea109b7d529430581a588d8d7e121ec09865e9e8932f2901477f7f43e7d0b95c7c95c2c42db05870e5d811528f91f78b48b68a539c804e67 -DIST freenet-0.7.5_p1478.zip 5082260 BLAKE2B 4f08b5eff361b0666647f67152fb9709d35ca6c5996a0ac1e899de16510d2f25afb89c8af150a4f9d0785da25ff5db2e80fc2e851e0c42c763b72952d456bde1 SHA512 4147ef68e9c61a7d90c378cd9a3896933c4b931c31caf95107d1e188b4bf51d187381200d262fc1adaf939be7b0ea0eec9f795a09c897c1d20765325ac5faf03 DIST freenet-0.7.5_p1480.zip 5099654 BLAKE2B cdbe32e90f61f664c0aff8dea81a68a46ced7ba5aef3068243d99a1b189597dfc4126c6e83c0fd4de547d6d076939c601ed3d3f8ec4fa6d4a5dd5d6ef5322069 SHA512 8e6c11014554cba0591f5f98a6af22660643a2d62c46fb003ec16d1dd3643178300081bef78083d87608c012f232f46f71fdd201d031248bf28e91899f71547e DIST freenet-0.7.5_p1483.zip 5548445 BLAKE2B 275e9d86d5d2aff94c227d774ce8853a0aeefb8963d6365f684e5e9b07ee4ba3779908d35e0b2ca92fc980c4199a1d29be73cce476c9e3d2f237734e4f9a35e7 SHA512 6c959c0ece7faaa07cd3c228cd2de7c15063ccd30f91b45b180d4d79e0060c5c156470d03eb421418ccd207931f9737e1a63b8be639b348cb0d15dacca89e4cc +DIST freenet-0.7.5_p1484.zip 5584092 BLAKE2B d5be70eae9ae40134d8aed92e649a50ea5c967b13c84bb327b1429a2b709caf9a37443a5ca3e54df520a775ab4705cd7656d7060b9c29c7af1d894936991f2ee SHA512 126e794972c65e9caaca2baa3724f199e1ad432c92351826222be54ee184ca4076fe1b13394914f60b5449731763e00ccb097639092b4c724e5bca1bb10f5ac2 DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408 DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7225192afd500f2ff5a3521b1a53c4d62fc2d5b4c0a6ed4d62fa3cd4da64a42da04459dea81701d98faf36b4642eb8 SHA512 cde40562156627818e3384cb8ca29ac02cc52eb9e02c3b0627d7786b4b7deace79b3a840f61c551a25f4d771190558fb277b3f63a71994c30c7b28a2c2f85497 -DIST seednodes-20160521.fref.bz2 13751 BLAKE2B f464eb99fcefd690867246b1a77175230ac1cc9e037f3dc465d56ad70d293df78f990cfd75e6be64c26d77f2bc7bfa0bbdedd9d1720a4afa658ed3c381139eb1 SHA512 3530ac6bf9de886930bb403c2d2ec27102d5dc6904582ee69987e369dbfaf7170aadbc02b95836ff43fef2531fb06087a494b426662cd5529c87316590fd2686 -EBUILD freenet-0.7.5_p1478-r1.ebuild 4240 BLAKE2B b42422f22a2d862f259347306781b4023b7cb7add0b10294288eea3ca8a95b86e1a5d0d05a125c87530e1c06f943d7571aae9686d30a197e6845357623e4980c SHA512 3329c581704206df82e1a823947a4f64b6a3f347acc3908376e3055ba0bb684e64e70bf521788297def4918a759502e6220df3bfaa4e526dca837544903fad1a -EBUILD freenet-0.7.5_p1478.ebuild 4240 BLAKE2B b42422f22a2d862f259347306781b4023b7cb7add0b10294288eea3ca8a95b86e1a5d0d05a125c87530e1c06f943d7571aae9686d30a197e6845357623e4980c SHA512 3329c581704206df82e1a823947a4f64b6a3f347acc3908376e3055ba0bb684e64e70bf521788297def4918a759502e6220df3bfaa4e526dca837544903fad1a EBUILD freenet-0.7.5_p1480.ebuild 4298 BLAKE2B 2f01470434fbc26103814728c6a0614227e1fd39a3a5fba273eec0970da749a08056e81805b2346280154adfa9cfe81891c3c6dea9e5734db14aa8cc25d73c9b SHA512 353064278dc061132a7d48037ae74fa53d129f40d79372e8f5cbf5ad4d91401d1d8062ea16d7710317a06988637efdfca4ad1b79c341b8a75a7a4ae1d790bd12 EBUILD freenet-0.7.5_p1483.ebuild 4640 BLAKE2B efbd14d417e37ab120f8b5f1e984806cc154aecc4b9b0c70998e8f3e6406fdc30ffc24b9e217ccc45ac68b093674f880ac0c032c846bb741090fef267a10a206 SHA512 58a0a6df60f777055a11dba1e76ed41b8df7b75263d035441d2e591d589eb83220eb721b02bbcb90e40d6399f9564e664c49a81924cc7d9bc16117e62c3779db +EBUILD freenet-0.7.5_p1484.ebuild 4640 BLAKE2B efbd14d417e37ab120f8b5f1e984806cc154aecc4b9b0c70998e8f3e6406fdc30ffc24b9e217ccc45ac68b093674f880ac0c032c846bb741090fef267a10a206 SHA512 58a0a6df60f777055a11dba1e76ed41b8df7b75263d035441d2e591d589eb83220eb721b02bbcb90e40d6399f9564e664c49a81924cc7d9bc16117e62c3779db MISC metadata.xml 333 BLAKE2B a43991a83e4f80ef55bf5e3858670d45bddfb5a1168a638124642260dc4c498430a6f5892a47d68af14fe3b63968d71561b92b1b31507d04770269d352843e21 SHA512 73b9b7fc476aba6342a92820a2a4d200735370173f10fd93521daa89c711d9152006dbb00aa1f513558cf0fb7e33ca97f7442ddce4a7bcc58c8a3ec8a08403c8 diff --git a/net-p2p/freenet/freenet-0.7.5_p1478.ebuild b/net-p2p/freenet/freenet-0.7.5_p1478.ebuild deleted file mode 100644 index d37f8db162eb..000000000000 --- a/net-p2p/freenet/freenet-0.7.5_p1478.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DATE=20160521 -JAVA_PKG_IUSE="doc source" - -inherit eutils java-pkg-2 java-ant-2 multilib systemd user - -DESCRIPTION="An encrypted network without censorship" -HOMEPAGE="https://freenetproject.org/" -SRC_URI=" - https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip - mirror://gentoo/seednodes-${DATE}.fref.bz2 - mirror://gentoo/freenet-ant-1.7.1.jar" - -LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -CDEPEND="dev-java/bcprov:1.54 - dev-java/commons-compress:0 - dev-java/fec:0 - dev-java/java-service-wrapper:0 - dev-java/jbitcollider-core:0 - dev-java/lzma:0 - dev-java/lzmajio:0 - dev-java/mersennetwister:0" - -DEPEND=" - app-arch/unzip - >=virtual/jdk-1.7 - ${CDEPEND} - test? ( - dev-java/junit:0 - dev-java/ant-junit:0 - ) - dev-java/ant-core:0" - -RDEPEND=" - >=virtual/jre-1.7 - net-libs/nativebiginteger:0 - ${CDEPEND}" - -PDEPEND="net-libs/NativeThread:0" - -JAVA_PKG_BSFIX_NAME+=" build-clean.xml" -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_CLASSPATH_TAGS+=" javadoc" -JAVA_ANT_ENCODING="utf8" - -EANT_BUILD_TARGET="package" -EANT_TEST_TARGET="unit" -EANT_BUILD_XML="build-clean.xml" -EANT_GENTOO_CLASSPATH="bcprov-1.54,commons-compress,fec,java-service-wrapper,jbitcollider-core,lzma,lzmajio,mersennetwister" -EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true" - -S="${WORKDIR}/fred-build0${PV#*p}" - -RESTRICT="test" # they're broken in the last release. - -MY_PATCHES=( - "${FILESDIR}"/0.7.5_p1321-ext.patch - "${FILESDIR}/"0.7.5_p1475-remove-git.patch -) - -pkg_setup() { - has_version dev-java/icedtea[cacao] && { - ewarn "dev-java/icedtea was built with cacao USE flag." - ewarn "freenet may compile with it, but it will refuse to run." - ewarn "Please remerge dev-java/icedtea without cacao USE flag," - ewarn "if you plan to use it for running freenet." - } - java-pkg-2_pkg_setup - enewgroup freenet - enewuser freenet -1 -1 /var/freenet freenet -} - -src_unpack() { - unpack ${P}.zip seednodes-${DATE}.fref.bz2 -} - -java_prepare() { - cp "${FILESDIR}"/freenet-0.7.5_p1474-wrapper.conf freenet-wrapper.conf || die - cp "${FILESDIR}"/run.sh-20090501 run.sh || die - - epatch "${MY_PATCHES[@]}" - - sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \ - freenet-wrapper.conf || die "sed failed" - - echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf || die - - local i=2 pkg jars jar - local ifs_original=${IFS} - IFS="," - for pkg in ${EANT_GENTOO_CLASSPATH} ; do - jars="$(java-pkg_getjars ${pkg})" - for jar in ${jars} ; do - echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf || die - done - done - IFS=${ifs_original} - echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die - - cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die -} - -EANT_TEST_EXTRA_ARGS="-Dtest.skip=false" - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_dojar dist/freenet.jar - java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar - - if has_version =sys-apps/baselayout-2*; then - doinitd "${FILESDIR}"/freenet - else - newinitd "${FILESDIR}"/freenet.old freenet - fi - - systemd_dounit "${FILESDIR}"/freenet.service - - dodoc AUTHORS - newdoc README.md README - insinto /etc - doins freenet-wrapper.conf - insinto /var/freenet - doins run.sh - newins "${WORKDIR}"/seednodes-${DATE}.fref seednodes.fref - fperms +x /var/freenet/run.sh - dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so - use doc && java-pkg_dojavadoc javadoc - use source && java-pkg_dosrc src -} - -pkg_postinst() { - elog " " - elog "1. Start freenet with /etc/init.d/freenet start." - elog "2. Open localhost:8888 in your browser for the web interface." - #workaround for previously existing freenet user - [[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \ - freenet:freenet /var/freenet -} - -pkg_postrm() { - if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then - elog " " - elog "If you dont want to use freenet any more" - elog "and dont want to keep your identity/other stuff" - elog "remember to do 'rm -rf /var/freenet' to remove everything" - fi -} diff --git a/net-p2p/freenet/freenet-0.7.5_p1478-r1.ebuild b/net-p2p/freenet/freenet-0.7.5_p1484.ebuild index d37f8db162eb..104ad58ab195 100644 --- a/net-p2p/freenet/freenet-0.7.5_p1478-r1.ebuild +++ b/net-p2p/freenet/freenet-0.7.5_p1484.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 DATE=20160521 JAVA_PKG_IUSE="doc source" @@ -10,9 +10,10 @@ inherit eutils java-pkg-2 java-ant-2 multilib systemd user DESCRIPTION="An encrypted network without censorship" HOMEPAGE="https://freenetproject.org/" +# https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip SRC_URI=" https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip - mirror://gentoo/seednodes-${DATE}.fref.bz2 + https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar" LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0" @@ -25,6 +26,7 @@ CDEPEND="dev-java/bcprov:1.54 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 + dev-java/jna:0 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0" @@ -54,7 +56,7 @@ JAVA_ANT_ENCODING="utf8" EANT_BUILD_TARGET="package" EANT_TEST_TARGET="unit" EANT_BUILD_XML="build-clean.xml" -EANT_GENTOO_CLASSPATH="bcprov-1.54,commons-compress,fec,java-service-wrapper,jbitcollider-core,lzma,lzmajio,mersennetwister" +EANT_GENTOO_CLASSPATH="bcprov-1.54,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna,lzma,lzmajio,mersennetwister" EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true" S="${WORKDIR}/fred-build0${PV#*p}" @@ -62,7 +64,7 @@ S="${WORKDIR}/fred-build0${PV#*p}" RESTRICT="test" # they're broken in the last release. MY_PATCHES=( - "${FILESDIR}"/0.7.5_p1321-ext.patch + "${FILESDIR}"/0.7.5_p1483-ext.patch "${FILESDIR}/"0.7.5_p1475-remove-git.patch ) @@ -79,12 +81,17 @@ pkg_setup() { } src_unpack() { - unpack ${P}.zip seednodes-${DATE}.fref.bz2 +# unpack ${P}.zip seednodes-${PV}.zip + unpack ${P}.zip seednodes-0.7.5_p1480.zip } -java_prepare() { +src_prepare() { +# cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref + cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref cp "${FILESDIR}"/freenet-0.7.5_p1474-wrapper.conf freenet-wrapper.conf || die cp "${FILESDIR}"/run.sh-20090501 run.sh || die + cp "${FILESDIR}"/build-clean.xml build-clean.xml || die + cp "${FILESDIR}"/build.properties build.properties || die epatch "${MY_PATCHES[@]}" @@ -106,6 +113,7 @@ java_prepare() { echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die + eapply_user } EANT_TEST_EXTRA_ARGS="-Dtest.skip=false" @@ -131,8 +139,7 @@ src_install() { insinto /etc doins freenet-wrapper.conf insinto /var/freenet - doins run.sh - newins "${WORKDIR}"/seednodes-${DATE}.fref seednodes.fref + doins run.sh seednodes.fref fperms +x /var/freenet/run.sh dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so use doc && java-pkg_dojavadoc javadoc |