From 77398e424e45d9e98c1cef3c43bdadb9d56e81ef Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Nov 2019 13:21:36 +0000 Subject: gentoo resync : 10.11.2019 --- net-libs/tox/Manifest | 4 +- net-libs/tox/tox-0.2.10.ebuild | 115 +++++++++++++++++++++++++++++++++++++++++ net-libs/tox/tox-9999.ebuild | 89 ++++++++++++++++++++++--------- 3 files changed, 183 insertions(+), 25 deletions(-) create mode 100644 net-libs/tox/tox-0.2.10.ebuild (limited to 'net-libs/tox') diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest index 364851b77b47..e1e273b081ab 100644 --- a/net-libs/tox/Manifest +++ b/net-libs/tox/Manifest @@ -2,10 +2,12 @@ AUX confd 27 BLAKE2B 16d0801db1dceed2044c14e9f1220ee4f31268622102a50669135dcb199 AUX initd 533 BLAKE2B 0e5b218af1b78b3613bfcd33b9c6c941ff708e55dff6383d234aea19b1677b7cc1f5f69205f4a9ae3db7a668887537d52281c7738f95506ab06088188c3b665e SHA512 46fb490c26244a894e2a33b464083c0b653f9c195af08848cd85b6f74f1677ffe66664c90e9c85e8ddbefec91d773ceec95e7043ea678f7f96c50ed0f96efb56 AUX tox-bootstrapd.conf 2171 BLAKE2B 25021453c2be24bad5ff8e5484c41ebf0c2487f326e30af305fd13f949242098c4a0392caafed2653196b56b8c7f495964e465a5ef0d0dbe22100ee58e8aae89 SHA512 b2fc5db3facc47bc9ae13824ff355b2e7fb496f489ef5e5cc01d17d8fe31befa740d510d76130967c858930ae6ef6183a5feff5a6a0b6853a008100859e4afda AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8 +DIST c-toxcore-0.2.10.tar.gz 515842 BLAKE2B 8e79f9a5045b5fef7825e5eb21644625607d86e472ec75ff45ff826712efa515682f9439181d52444b2a6a21472c6e78a3bea5bb7e356373faf733e2644a315d SHA512 8a6a78c52a67be0b727d0d3a8d1cece20ad716a2e694df0aa747eee7764f64c957458584f59db5e727a9803ed7b21adc1ad8d7e80fd6651e7774ca3504b38fc7 DIST c-toxcore-0.2.8.tar.gz 502907 BLAKE2B 0ca2c861b3cd982b471fac5cf8bdacd21c3248118846cc17e51f33ba04cf3da12a64578744e47daa27bb8613762a6f562eb550f0b7af05a66696412f6d0a6360 SHA512 a23a87a74fe97091b00ea76676a22578ed1e2426ac777146bb6efc984f1bfd3fff0d7fb149691155b8e2db56e1e088a1884536e5b717ff5c45a87b437f275735 DIST c-toxcore-0.2.9.tar.gz 510806 BLAKE2B e67bdb86757d1431cc9d627dbc9afa9f54c3deb7814b38c2126849d10e9225aa58d2b23d175622678be74894ea197d3084719422a605d95eb4c55c4597a79f98 SHA512 917826a906a9ca4f04f34494616b8e36ec9e74c6b0709c50e8fe2dd9da680d170013fef242a3fe1b834e8e54cd2dde6be1c14e5d977f8531436ef34280bc3966 +EBUILD tox-0.2.10.ebuild 3145 BLAKE2B 5c4e33623b746c48d7527ed054919218a18bfa8b44c10cc7acf529d86e179d141428de3753b9c8a5bca7810cf548ed5dca2968140f0d92f37fe62a4c2de6bcf2 SHA512 f22a73a65c2720e0c5a0742f796d8a02cb9a0c07843837e3b8c4c20e2444b7f7dfb313f884c79cb8029b1e51d21eb1ee5eaca18a9e75a961ec0c17feef6a3d71 EBUILD tox-0.2.8.ebuild 2757 BLAKE2B 6b95692af1fb7b3aa1ecba363536769a7466c3b0110bb2ce1b0f885767d6d624b7cda900ac891cbf3dcd9b3552b7a99db1523688ace5641ea5799b08ebfcb1c9 SHA512 8bbc00c73c02246985712429187095765677e08f1161438987fe38a26165c45c5dc1bd71acca27001040f6337ad4a307f350bf8efc6b83e56b02d739ff2168a0 EBUILD tox-0.2.9-r1.ebuild 3128 BLAKE2B a5a0e3a4ec5171fb513a6567916e84a20ec2400ae4a83e97ada018e048b92e03d1874b5accf278dcecf303eae80a917e0d21514a49c6b262e3662f17f0094a9c SHA512 be7033b60e01d5ff19e9465ad2662822a94b97caecf24bd3babd0aa769eec4c7eff67fb62a11d0887b82b5d84d3ccf8e3e8357ff83005ff79637d2c349cbef27 EBUILD tox-0.2.9.ebuild 2695 BLAKE2B d377d87f4e678929521072e5aba6652b11bfe8722dea5a9d6d2c57a81a8519f76f6d7e1f138049de3adab94db04cfee82ba5d493c509f456eb3f6957201a6dd3 SHA512 7f114ea6bcab068aa456212765ee3a3b573a1607482aa60fa149a1c0af3c250ec4a8351a622e05f151fad5d78b4ada1e8cc300a5135e63b112603afc4d187718 -EBUILD tox-9999.ebuild 1803 BLAKE2B 68f3351d491a75643265226fc47e90d23e44cc66f772fe859cff87fcd6b88ced56ffead16ebef992701d023bcd97edd7be45b4075ec72b5afd37b91488b22d01 SHA512 f5dc655a65c4f5f6566008367208d71e017889136e02ad0f023b5a065e3b719c447c9918a3673ce6e9b4c8b0cffdcf7e81b0ca6f701f97b21f3ac04b340ba083 +EBUILD tox-9999.ebuild 3057 BLAKE2B 0bbfe93cdeae91f28f13d633b81a84776e84de6f1bc91e07e95d7a1079adb7c591b23308b41b1979e761938c48e09b77636ae738ad3b533963f8b6a8bfd0d13d SHA512 f40093e691b821e687e441807246210b062eac1fbc8fb8b25c2cb38d5935966385513d558148f38c9ef0cadd2298cc26f78fb2150c7d98b2e828c954b9712bd4 MISC metadata.xml 935 BLAKE2B 27a67342b8cc389cc89a3640589c158ece6be9b25ff2550f063bdcc4d0ded3e39f50ed6ea261e3fb627434a00a4d1e1454797f61fda050ad6c38cc4aa0453ed4 SHA512 24effa76d3f6b31308cb2c18e3f618d4a3392c88bb63b55df65ce7ac9dcacd5ed269b126ffb1af29e0f83bd631d6cc96e14a0343fde709693ebe9d301de9b279 diff --git a/net-libs/tox/tox-0.2.10.ebuild b/net-libs/tox/tox-0.2.10.ebuild new file mode 100644 index 000000000000..11d676ea6137 --- /dev/null +++ b/net-libs/tox/tox-0.2.10.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils systemd + +MY_P="c-toxcore-${PV}" +DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform" +HOMEPAGE="https://tox.chat" +SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0/0.2" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test" + +REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn ) + daemon? ( dht-node )" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" + +DEPEND=" + >dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal] + av? ( + media-libs/libvpx + media-libs/opus + ) + daemon? ( dev-libs/libconfig )" +RDEPEND=" + ${DEPEND} + daemon? ( + acct-group/tox + acct-user/tox + )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + cmake-utils_src_prepare + #remove faulty tests + for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do + sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die + done +} + +src_configure() { + local mycmakeargs=( + -DAUTOTEST=$(usex test) + -DBOOTSTRAP_DAEMON=$(usex daemon) + -DBUILD_MISC_TESTS=$(usex test) + -DBUILD_TOXAV=$(usex av) + -DDHT_BOOTSTRAP=$(usex dht-node) + -DENABLE_SHARED=ON + -DENABLE_STATIC=$(usex static-libs) + -DMUST_BUILD_TOXAV=$(usex av)) + if use test; then + mycmakeargs+=( + -DBUILD_AV_TEST=$(usex av) + -DTEST_TIMEOUT_SECONDS=120 + -DUSE_IPV6=$(usex ipv6)) + else + mycmakeargs+=( + -DBUILD_AV_TEST=OFF + -DUSE_IPV6=OFF) + fi + + if use log-trace; then + mycmakeargs+=(-DMIN_LOGGER_LEVEL="TRACE") + elif use log-debug; then + mycmakeargs+=(-DMIN_LOGGER_LEVEL="DEBUG") + elif use log-info; then + mycmakeargs+=(-DMIN_LOGGER_LEVEL="INFO") + elif use log-warn; then + mycmakeargs+=(-DMIN_LOGGER_LEVEL="WARNING") + elif use log-error; then + mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR") + else + mycmakeargs+=(-DMIN_LOGGER_LEVEL="") + einfo "Logging disabled" + fi + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + if use daemon; then + newinitd "${FILESDIR}"/initd tox-dht-daemon + newconfd "${FILESDIR}"/confd tox-dht-daemon + insinto /etc + doins "${FILESDIR}"/tox-bootstrapd.conf + systemd_dounit "${FILESDIR}"/tox-bootstrapd.service + fi +} + +pkg_postinst() { + if use dht-node; then + ewarn "There is currently an unresolved issue with tox DHT Bootstrap node that causes the program to be" + ewarn "built with a null library reference. This causes an infinite loop for certain revdep-rebuild" + ewarn "commands. If you aren't running a node, please consider disabling the dht-node use flag." + fi + if use daemon; then + if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then + ewarn "Backwards compatability with the bootstrap daemon might have been" + ewarn "broken a while ago. To resolve this issue, REMOVE the following files:" + ewarn " ${EROOT}/var/lib/tox-dht-bootstrap/key" + ewarn " ${EROOT}/etc/tox-bootstrapd.conf" + ewarn " ${EROOT}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid" + ewarn "Then just re-emerge net-libs/tox" + fi + fi +} diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild index 3c267ef0e1e2..501b16dc7266 100644 --- a/net-libs/tox/tox-9999.ebuild +++ b/net-libs/tox/tox-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils git-r3 systemd user +inherit cmake-utils git-r3 systemd DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform" HOMEPAGE="https://tox.chat" @@ -13,29 +13,66 @@ EGIT_REPO_URI="https://github.com/TokTok/c-toxcore.git" LICENSE="GPL-3+" SLOT="0/0.2" KEYWORDS="" -IUSE="+av daemon log-debug log-trace +no-log static-libs test" +IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test" -REQUIRED_USE="^^ ( no-log log-trace log-debug )" +REQUIRED_USE="^^ ( log-debug log-error log-info log-trace log-warn ) + daemon? ( dht-node )" -RDEPEND=" - av? ( media-libs/libvpx:= +COMMON_DEPEND=" + av? ( media-libs/libvpx media-libs/opus ) - daemon? ( dev-libs/libconfig ) + daemon? ( acct-group/tox + acct-user/tox + dev-libs/libconfig ) >=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]" -DEPEND="${RDEPEND} - virtual/pkgconfig" +BDEPEND="virtual/pkgconfig" + +DEPEND="${COMMON_DEPEND}" + +RDEPEND="${COMMON_DEPEND}" + +src_prepare() { + cmake-utils_src_prepare + #remove faulty tests + for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do + sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die + done +} src_configure() { local mycmakeargs=( - -DTRACE=$(usex log-trace) - -DDEBUG=$(usex log-debug) - -DBUILD_TOXAV=$(usex av) - -DMUST_BUILD_TOXAV=$(usex av) - -DBUILD_AV_TEST=$(usex av) + -DAUTOTEST=$(usex test) -DBOOTSTRAP_DAEMON=$(usex daemon) + -DBUILD_TOXAV=$(usex av) + -DDHT_BOOTSTRAP=$(usex dht-node) + -DENABLE_SHARED=ON -DENABLE_STATIC=$(usex static-libs) - ) + -DMUST_BUILD_TOXAV=$(usex av)) + if use test; then + mycmakeargs+=( + -DBUILD_AV_TEST=$(usex av) + -DTEST_TIMEOUT_SECONDS=120 + -DUSE_IPV6=$(usex ipv6)) + else + mycmakeargs+=( + -DBUILD_AV_TEST=OFF + -DUSE_IPV6=OFF) + fi + if use log-trace; then + mycmakeargs+=(-DMIN_LOGGER_LEVEL="TRACE") + elif use log-debug; then + mycmakeargs+=(-DMIN_LOGGER_LEVEL="DEBUG") + elif use log-info; then + mycmakeargs+=(-DMIN_LOGGER_LEVEL="INFO") + elif use log-warn; then + mycmakeargs+=(-DMIN_LOGGER_LEVEL="WARNING") + elif use log-error; then + mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR") + else + mycmakeargs+=(-DMIN_LOGGER_LEVEL="") + einfo "Logging Disabled" + fi cmake-utils_src_configure } @@ -49,20 +86,24 @@ src_install() { doins "${FILESDIR}"/tox-bootstrapd.conf systemd_dounit "${FILESDIR}"/tox-bootstrapd.service fi - - find "${D}" -name '*.la' -delete || die } pkg_postinst() { + if use dht-node; then + ewarn "There is currently an unresolved issue with tox" + ewarn "DHT Bootstrap node that causes the program to be" + ewarn "built with a null library reference. This" + ewarn "causes an infinite loop for certain rev-dep-rebuild" + ewarn "commands. If you aren't running a node, please" + ewarn "consider disabling the dht-node flag" + fi if use daemon; then - enewgroup tox - enewuser tox -1 -1 -1 tox - if [[ -f ${EROOT%/}/var/lib/tox-dht-bootstrap/key ]]; then + if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then ewarn "Backwards compatability with the bootstrap daemon might have been" ewarn "broken a while ago. To resolve this issue, REMOVE the following files:" - ewarn " ${EROOT%/}/var/lib/tox-dht-bootstrap/key" - ewarn " ${EROOT%/}/etc/tox-bootstrapd.conf" - ewarn " ${EROOT%/}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid" + ewarn " ${EROOT}/var/lib/tox-dht-bootstrap/key" + ewarn " ${EROOT}/etc/tox-bootstrapd.conf" + ewarn " ${EROOT}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid" ewarn "Then just re-emerge net-libs/tox" fi fi -- cgit v1.2.3