| 1 |
commit: f639e5bfbbd2eae0a5eed22e4af32287bc57f039 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 4 20:55:44 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 4 20:56:31 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f639e5bf |
| 7 |
|
| 8 |
net-libs/tox: minor style changes |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.4, Repoman-2.3.23 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
net-libs/tox/tox-0.2.12.ebuild | 11 ++++++++--- |
| 14 |
net-libs/tox/tox-9999.ebuild | 14 +++++++++----- |
| 15 |
2 files changed, 17 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-libs/tox/tox-0.2.12.ebuild b/net-libs/tox/tox-0.2.12.ebuild |
| 18 |
index 3723ccda4d6..76511a2fe70 100644 |
| 19 |
--- a/net-libs/tox/tox-0.2.12.ebuild |
| 20 |
+++ b/net-libs/tox/tox-0.2.12.ebuild |
| 21 |
@@ -38,7 +38,9 @@ S="${WORKDIR}/${MY_P}" |
| 22 |
|
| 23 |
src_prepare() { |
| 24 |
cmake_src_prepare |
| 25 |
- #remove faulty tests |
| 26 |
+ |
| 27 |
+ # Remove faulty tests |
| 28 |
+ local testname= |
| 29 |
for testname in lan_discovery save_compatibility; do |
| 30 |
sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die |
| 31 |
done |
| 32 |
@@ -53,11 +55,14 @@ src_configure() { |
| 33 |
-DDHT_BOOTSTRAP=$(usex dht-node) |
| 34 |
-DENABLE_SHARED=ON |
| 35 |
-DENABLE_STATIC=$(usex static-libs) |
| 36 |
- -DMUST_BUILD_TOXAV=$(usex av)) |
| 37 |
+ -DMUST_BUILD_TOXAV=$(usex av) |
| 38 |
+ ) |
| 39 |
+ |
| 40 |
if use test; then |
| 41 |
mycmakeargs+=( |
| 42 |
-DTEST_TIMEOUT_SECONDS=120 |
| 43 |
- -DUSE_IPV6=$(usex ipv6)) |
| 44 |
+ -DUSE_IPV6=$(usex ipv6) |
| 45 |
+ ) |
| 46 |
else |
| 47 |
mycmakeargs+=(-DUSE_IPV6=OFF) |
| 48 |
fi |
| 49 |
|
| 50 |
diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild |
| 51 |
index 23e322bf207..6e0181ca0d8 100644 |
| 52 |
--- a/net-libs/tox/tox-9999.ebuild |
| 53 |
+++ b/net-libs/tox/tox-9999.ebuild |
| 54 |
@@ -35,8 +35,10 @@ RDEPEND=" |
| 55 |
|
| 56 |
src_prepare() { |
| 57 |
cmake_src_prepare |
| 58 |
- #remove faulty tests |
| 59 |
+ |
| 60 |
+ # Remove faulty tests |
| 61 |
local faultytest=(lan_discovery save_compatibility) |
| 62 |
+ local testname= |
| 63 |
for testname in "${faultytest[@]}"; do |
| 64 |
sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die |
| 65 |
done |
| 66 |
@@ -51,14 +53,16 @@ src_configure() { |
| 67 |
-DDHT_BOOTSTRAP=$(usex dht-node) |
| 68 |
-DENABLE_SHARED=ON |
| 69 |
-DENABLE_STATIC=$(usex static-libs) |
| 70 |
- -DMUST_BUILD_TOXAV=$(usex av)) |
| 71 |
+ -DMUST_BUILD_TOXAV=$(usex av) |
| 72 |
+ ) |
| 73 |
+ |
| 74 |
if use test; then |
| 75 |
mycmakeargs+=( |
| 76 |
-DTEST_TIMEOUT_SECONDS=120 |
| 77 |
- -DUSE_IPV6=$(usex ipv6)) |
| 78 |
+ -DUSE_IPV6=$(usex ipv6) |
| 79 |
+ ) |
| 80 |
else |
| 81 |
- mycmakeargs+=( |
| 82 |
- -DUSE_IPV6=OFF) |
| 83 |
+ mycmakeargs+=(-DUSE_IPV6=OFF) |
| 84 |
fi |
| 85 |
|
| 86 |
if use log-trace; then |
Archives