1 |
commit: de8927c7212b2d04caaf110f2d5d52d29be5fe44 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 22 16:21:08 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 22 18:23:32 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de8927c7 |
7 |
|
8 |
net-misc/aria2: Disable websocket support that requires bundled libs |
9 |
|
10 |
Closes: https://bugs.gentoo.org/872191 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
...{aria2-1.36.0.ebuild => aria2-1.36.0-r1.ebuild} | 38 +++++++++++++++------- |
14 |
1 file changed, 27 insertions(+), 11 deletions(-) |
15 |
|
16 |
diff --git a/net-misc/aria2/aria2-1.36.0.ebuild b/net-misc/aria2/aria2-1.36.0-r1.ebuild |
17 |
similarity index 90% |
18 |
rename from net-misc/aria2/aria2-1.36.0.ebuild |
19 |
rename to net-misc/aria2/aria2-1.36.0-r1.ebuild |
20 |
index 88356647df78..c5eb810cec54 100644 |
21 |
--- a/net-misc/aria2/aria2-1.36.0.ebuild |
22 |
+++ b/net-misc/aria2/aria2-1.36.0-r1.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2021 Gentoo Authors |
25 |
+# Copyright 1999-2022 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI=8 |
29 |
@@ -12,11 +12,16 @@ SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar |
30 |
LICENSE="GPL-2+-with-openssl-exception" |
31 |
KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" |
32 |
SLOT="0" |
33 |
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc" |
34 |
+IUSE=" |
35 |
+ adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle |
36 |
+ nls sqlite scripts ssh ssl tcmalloc test xmlrpc |
37 |
+" |
38 |
# xmlrpc has no explicit switch, it's turned out by any XML library |
39 |
# so metalink implicitly forces it on |
40 |
-REQUIRED_USE="?? ( jemalloc tcmalloc ) |
41 |
- metalink? ( xmlrpc )" |
42 |
+REQUIRED_USE=" |
43 |
+ ?? ( jemalloc tcmalloc ) |
44 |
+ metalink? ( xmlrpc ) |
45 |
+" |
46 |
RESTRICT="!test? ( test )" |
47 |
|
48 |
# Crazy GnuTLS/OpenSSL/etc. logic below: |
49 |
@@ -34,13 +39,15 @@ RESTRICT="!test? ( test )" |
50 |
# We map this into: |
51 |
# ssl? -> openssl || (gnutls + (nettle || libgcrypt )) |
52 |
# !ssl? -> nettle || libgcrypt |
53 |
-RDEPEND="sys-libs/zlib:0= |
54 |
+RDEPEND=" |
55 |
+ sys-libs/zlib:0= |
56 |
adns? ( >=net-dns/c-ares-1.5.0:0= ) |
57 |
jemalloc? ( dev-libs/jemalloc ) |
58 |
libuv? ( >=dev-libs/libuv-1.13:0= ) |
59 |
metalink? ( |
60 |
libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) |
61 |
- !libxml2? ( dev-libs/expat:0= ) ) |
62 |
+ !libxml2? ( dev-libs/expat:0= ) |
63 |
+ ) |
64 |
sqlite? ( dev-db/sqlite:3= ) |
65 |
ssh? ( net-libs/libssh2:= ) |
66 |
ssl? ( |
67 |
@@ -73,16 +80,22 @@ RDEPEND="sys-libs/zlib:0= |
68 |
tcmalloc? ( dev-util/google-perftools ) |
69 |
xmlrpc? ( |
70 |
libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) |
71 |
- !libxml2? ( dev-libs/expat:0= ) )" |
72 |
+ !libxml2? ( dev-libs/expat:0= ) |
73 |
+ ) |
74 |
+" |
75 |
|
76 |
-DEPEND="${RDEPEND} |
77 |
- test? ( >=dev-util/cppunit-1.12.0:0 )" |
78 |
+DEPEND=" |
79 |
+ ${RDEPEND} |
80 |
+ test? ( >=dev-util/cppunit-1.12.0:0 ) |
81 |
+" |
82 |
RDEPEND+=" |
83 |
nls? ( virtual/libiconv virtual/libintl ) |
84 |
- scripts? ( dev-lang/ruby )" |
85 |
+ scripts? ( dev-lang/ruby ) |
86 |
+" |
87 |
BDEPEND="app-arch/xz-utils |
88 |
virtual/pkgconfig |
89 |
- nls? ( sys-devel/gettext )" |
90 |
+ nls? ( sys-devel/gettext ) |
91 |
+" |
92 |
|
93 |
pkg_setup() { |
94 |
if use scripts && ! use xmlrpc; then |
95 |
@@ -123,6 +136,9 @@ src_configure() { |
96 |
$(use_with sqlite sqlite3) |
97 |
$(use_with ssh libssh2) |
98 |
$(use_with tcmalloc) |
99 |
+ |
100 |
+ # forces bundled wslay |
101 |
+ --disable-websocket |
102 |
) |
103 |
|
104 |
# See TLS/MD logic described above deps. |