| 1 |
commit: 597632a29af5eadf96159482be025edb5883ac16 |
| 2 |
Author: Josiah Mullins <JoMull01 <AT> protonmail <DOT> com> |
| 3 |
AuthorDate: Tue Dec 21 21:42:09 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 7 05:06:18 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=597632a2 |
| 7 |
|
| 8 |
net-libs/tox: Updates to tox-9999 |
| 9 |
|
| 10 |
This commit updates the 9999 ebuild to EAPI 8, |
| 11 |
removes the static-libs use flags, updated |
| 12 |
faulty test section and added true/false output |
| 13 |
parameters for usex in src_configure. |
| 14 |
|
| 15 |
Signed-off-by: Josiah Mullins <JoMull01 <AT> protonmail.com> |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
net-libs/tox/tox-9999.ebuild | 33 ++++++++++++++------------------- |
| 19 |
1 file changed, 14 insertions(+), 19 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild |
| 22 |
index e80ab4531665..ba31cc1a5c28 100644 |
| 23 |
--- a/net-libs/tox/tox-9999.ebuild |
| 24 |
+++ b/net-libs/tox/tox-9999.ebuild |
| 25 |
@@ -1,7 +1,7 @@ |
| 26 |
# Copyright 1999-2021 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
-EAPI=7 |
| 30 |
+EAPI=8 |
| 31 |
|
| 32 |
inherit cmake git-r3 systemd |
| 33 |
|
| 34 |
@@ -13,14 +13,14 @@ EGIT_REPO_URI="https://github.com/TokTok/c-toxcore.git" |
| 35 |
LICENSE="GPL-3+" |
| 36 |
SLOT="0/0.2" |
| 37 |
KEYWORDS="" |
| 38 |
-IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test" |
| 39 |
+IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn test" |
| 40 |
RESTRICT="!test? ( test )" |
| 41 |
|
| 42 |
-REQUIRED_USE="^^ ( log-debug log-error log-info log-trace log-warn ) |
| 43 |
+REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn ) |
| 44 |
daemon? ( dht-node )" |
| 45 |
|
| 46 |
BDEPEND="virtual/pkgconfig" |
| 47 |
-DEPEND=">dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal] |
| 48 |
+DEPEND="dev-libs/libsodium:=[asm,urandom,-minimal] |
| 49 |
av? ( |
| 50 |
media-libs/libvpx:= |
| 51 |
media-libs/opus |
| 52 |
@@ -36,31 +36,26 @@ RDEPEND=" |
| 53 |
src_prepare() { |
| 54 |
cmake_src_prepare |
| 55 |
|
| 56 |
- # Remove faulty tests |
| 57 |
- local faultytest=(lan_discovery save_compatibility) |
| 58 |
- local testname= |
| 59 |
- for testname in "${faultytest[@]}"; do |
| 60 |
+ #remove faulty tests |
| 61 |
+ for testname in lan_discovery save_compatibility set_status_message; do |
| 62 |
sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die |
| 63 |
done |
| 64 |
} |
| 65 |
|
| 66 |
src_configure() { |
| 67 |
local mycmakeargs=( |
| 68 |
- -DAUTOTEST=$(usex test) |
| 69 |
- -DBOOTSTRAP_DAEMON=$(usex daemon) |
| 70 |
- -DBUILD_MISC_TESTS=$(usex test) |
| 71 |
- -DBUILD_TOXAV=$(usex av) |
| 72 |
- -DDHT_BOOTSTRAP=$(usex dht-node) |
| 73 |
+ -DAUTOTEST=$(usex test ON OFF) |
| 74 |
+ -DBOOTSTRAP_DAEMON=$(usex daemon ON OFF) |
| 75 |
+ -DBUILD_MISC_TESTS=$(usex test ON OFF) |
| 76 |
+ -DBUILD_TOXAV=$(usex av ON OFF) |
| 77 |
+ -DDHT_BOOTSTRAP=$(usex dht-node ON OFF) |
| 78 |
-DENABLE_SHARED=ON |
| 79 |
- -DENABLE_STATIC=$(usex static-libs) |
| 80 |
- -DMUST_BUILD_TOXAV=$(usex av) |
| 81 |
- ) |
| 82 |
- |
| 83 |
+ -DENABLE_STATIC=OFF |
| 84 |
+ -DMUST_BUILD_TOXAV=$(usex av ON OFF)) |
| 85 |
if use test; then |
| 86 |
mycmakeargs+=( |
| 87 |
-DTEST_TIMEOUT_SECONDS=120 |
| 88 |
- -DUSE_IPV6=$(usex ipv6) |
| 89 |
- ) |
| 90 |
+ -DUSE_IPV6=$(usex ipv6 ON OFF)) |
| 91 |
else |
| 92 |
mycmakeargs+=(-DUSE_IPV6=OFF) |
| 93 |
fi |
Archives