Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libwebsockets/
Date: Sun, 03 May 2020 08:00:38
Message-Id: 1588492804.b697d9a0704bd26d97a280efd5543fa90c99bbb3.juippis@gentoo
1 commit: b697d9a0704bd26d97a280efd5543fa90c99bbb3
2 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 3 07:56:26 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sun May 3 08:00:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b697d9a0
7
8 Revert "net-libs/libwebsockets: update version to 4.0.4"
9
10 This reverts commit b9ca847c1d333b741220124b7d82a3cd9810ea94.
11 Added complexity breaks some builds - needs more testing.
12
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 net-libs/libwebsockets/Manifest | 1 -
16 net-libs/libwebsockets/libwebsockets-4.0.4.ebuild | 77 -----------------------
17 2 files changed, 78 deletions(-)
18
19 diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
20 index d7469462305..5372f552d6c 100644
21 --- a/net-libs/libwebsockets/Manifest
22 +++ b/net-libs/libwebsockets/Manifest
23 @@ -1,3 +1,2 @@
24 DIST libwebsockets-3.2.1.tar.gz 9868342 BLAKE2B d822552c611f7cd0ee416bf9b9576c6052e196c1aa68b12c46a00865d3dcd131840218394317f191485fc61d8f3b7654d4a652a47f11d279a555522df84a2350 SHA512 a2d30a7a0416a26484743efdaa8635542480a74b0ef0f6e172dab5de4688486efb13457fc8a884d9916f76322cab0cbc9ab675f496558edd1dd9b833d087207d
25 DIST libwebsockets-4.0.1.tar.gz 12332611 BLAKE2B bc5aaede801b61c389928b41e091a7b84fb24a73a64aa3dc2ba7a1370e146f5c98ede9489ed81fd274884c772de3fa93a9f5b7e3c88be4e28c092a045b7d5e72 SHA512 33eced9690e54106afb63ac58eb25b1eefd7998074d042209c97177f95c14c4aa97c41303918d7b0649863865d85d9579693762b8215df54879621778ffabdf4
26 -DIST libwebsockets-4.0.4.tar.gz 12337293 BLAKE2B 0939b3e80261c28043c62a7f28e1a30931ca2c866bd535b6d2abd80fcd673c904105df5d2e03e4f53498340ad3149a59f29e6a1343df21d154a45fbaa0897bba SHA512 2a4528e3451e2ffe1b4dbe1fa90501bfb59de20a0c42233f88d2a6ef98a6482128a2a0b6703a6e078026bae7a3c4bf8ef4f968aa4961fbc81f253d51ba9bb5bf
27
28 diff --git a/net-libs/libwebsockets/libwebsockets-4.0.4.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.4.ebuild
29 deleted file mode 100644
30 index 7620aaaa024..00000000000
31 --- a/net-libs/libwebsockets/libwebsockets-4.0.4.ebuild
32 +++ /dev/null
33 @@ -1,77 +0,0 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -inherit cmake
40 -
41 -DESCRIPTION="A flexible pure-C library for implementing network protocols"
42 -HOMEPAGE="https://libwebsockets.org/"
43 -SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
44 -
45 -LICENSE="MIT"
46 -SLOT="0/16" # libwebsockets.so.16
47 -KEYWORDS="~amd64 ~arm ~x86"
48 -IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
49 - +lejp libev libevent libressl libuv peer-limits server-status smtp socks5
50 - sqlite3 ssl static-libs threads zip"
51 -
52 -REQUIRED_USE="
53 - generic-sessions? ( smtp sqlite3 )
54 - http-proxy? ( client )
55 - smtp? ( libuv )
56 - ?? ( libev libevent )
57 -"
58 -
59 -RDEPEND="
60 - sys-libs/zlib
61 - caps? ( sys-libs/libcap )
62 - http-proxy? ( net-libs/libhubbub )
63 - libev? ( dev-libs/libev )
64 - libevent? ( dev-libs/libevent:= )
65 - libuv? ( dev-libs/libuv:= )
66 - sqlite3? ( dev-db/sqlite:= )
67 - ssl? (
68 - !libressl? ( dev-libs/openssl:0= )
69 - libressl? ( dev-libs/libressl:0= )
70 - )
71 -"
72 -DEPEND="${RDEPEND}"
73 -BDEPEND="dev-lang/perl"
74 -
75 -PATCHES=(
76 - "${FILESDIR}/libwebsockets-3.2.0-check_chown_result.patch"
77 -)
78 -
79 -src_configure() {
80 - local mycmakeargs=(
81 - -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
82 - -DLWS_HAVE_LIBCAP=$(usex caps)
83 - -DLWS_IPV6=$(usex ipv6)
84 - -DLWS_ROLE_DBUS=$(usex dbus)
85 - -DLWS_WITHOUT_CLIENT=$(usex !client)
86 - -DLWS_WITHOUT_TEST_CLIENT=$(usex !client)
87 - -DLWS_WITH_ACCESS_LOG=$(usex access-log)
88 - -DLWS_WITH_CGI=$(usex cgi)
89 - -DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions)
90 - -DLWS_WITH_HTTP2=$(usex http2)
91 - -DLWS_WITH_HTTP_PROXY=$(usex http-proxy)
92 - -DLWS_WITH_HUBBUB=$(usex http-proxy)
93 - -DLWS_WITH_LEJP=$(usex lejp)
94 - -DLWS_WITH_LIBEV=$(usex libev)
95 - -DLWS_WITH_LIBEVENT=$(usex libevent)
96 - -DLWS_WITH_LIBUV=$(usex libuv)
97 - -DLWS_WITH_PEER_LIMITS=$(usex peer-limits)
98 - -DLWS_WITH_SERVER_STATUS=$(usex server-status)
99 - -DLWS_WITH_SMTP=$(usex smtp)
100 - -DLWS_WITH_SOCKS5=$(usex socks5)
101 - -DLWS_WITH_SQLITE3=$(usex sqlite3)
102 - -DLWS_WITH_SSL=$(usex ssl)
103 - -DLWS_WITH_STATIC=$(usex static-libs)
104 - -DLWS_WITH_THREADPOOL=$(usex threads)
105 - -DLWS_WITH_ZIP_FOPS=$(usex zip)
106 - -DLWS_WITHOUT_TESTAPPS=ON
107 - )
108 -
109 - cmake_src_configure
110 -}