summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild4
-rw-r--r--net-libs/aqbanking/aqbanking-6.2.5.ebuild4
-rw-r--r--net-libs/balde-markdown/Manifest1
-rw-r--r--net-libs/balde-markdown/balde-markdown-0.1.ebuild45
-rw-r--r--net-libs/balde-markdown/metadata.xml13
-rw-r--r--net-libs/balde/Manifest1
-rw-r--r--net-libs/balde/balde-0.1.1.ebuild57
-rw-r--r--net-libs/balde/metadata.xml13
-rw-r--r--net-libs/c-client/c-client-2007f-r7.ebuild6
-rw-r--r--net-libs/canlock/Manifest4
-rw-r--r--net-libs/canlock/canlock-2b.ebuild39
-rw-r--r--net-libs/canlock/canlock-3.3.0.ebuild (renamed from net-libs/canlock/canlock-3.2.2.ebuild)19
-rw-r--r--net-libs/canlock/files/canlock-2b-make.patch116
-rw-r--r--net-libs/canlock/metadata.xml5
-rw-r--r--net-libs/courier-authlib/Manifest4
-rw-r--r--net-libs/courier-authlib/courier-authlib-0.70.0-r3.ebuild149
-rw-r--r--net-libs/courier-authlib/courier-authlib-0.71.0-r3.ebuild149
-rw-r--r--net-libs/courier-authlib/courier-authlib-0.71.0-r4.ebuild (renamed from net-libs/courier-authlib/courier-authlib-0.69.0-r4.ebuild)7
-rw-r--r--net-libs/courier-authlib/courier-authlib-0.71.1-r3.ebuild149
-rw-r--r--net-libs/courier-authlib/courier-authlib-0.71.2-r3.ebuild149
-rw-r--r--net-libs/courier-authlib/courier-authlib-0.71.3-r2.ebuild (renamed from net-libs/courier-authlib/courier-authlib-0.71.3-r1.ebuild)7
-rw-r--r--net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild4
-rw-r--r--net-libs/courier-unicode/courier-unicode-2.1.ebuild4
-rw-r--r--net-libs/courier-unicode/courier-unicode-2.2.3-r1.ebuild4
-rw-r--r--net-libs/cppzmq/cppzmq-4.6.0.ebuild4
-rw-r--r--net-libs/cvm/cvm-0.97-r1.ebuild4
-rw-r--r--net-libs/czmq/Manifest1
-rw-r--r--net-libs/czmq/czmq-4.2.0.ebuild50
-rw-r--r--net-libs/czmq/czmq-4.2.1.ebuild2
-rw-r--r--net-libs/davix/davix-0.7.6.ebuild4
-rw-r--r--net-libs/dleyna-connector-dbus/Manifest1
-rw-r--r--net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.0.ebuild23
-rw-r--r--net-libs/dleyna-renderer/Manifest2
-rw-r--r--net-libs/dleyna-renderer/dleyna-renderer-0.7.2.ebuild (renamed from net-libs/dleyna-renderer/dleyna-renderer-0.7.0.ebuild)6
-rw-r--r--net-libs/enet/Manifest1
-rw-r--r--net-libs/enet/enet-1.3.13.ebuild24
-rw-r--r--net-libs/glib-networking/Manifest5
-rw-r--r--net-libs/glib-networking/files/glib-networking-2.70.0-time_t-32-bit.patch52
-rw-r--r--net-libs/glib-networking/glib-networking-2.68.1.ebuild80
-rw-r--r--net-libs/glib-networking/glib-networking-2.70.1.ebuild (renamed from net-libs/glib-networking/glib-networking-2.68.2.ebuild)4
-rw-r--r--net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild (renamed from net-libs/glib-networking/glib-networking-2.70.0.ebuild)13
-rw-r--r--net-libs/gnet/files/gnet-2.0.8-autotools.patch37
-rw-r--r--net-libs/gnet/gnet-2.0.8-r4.ebuild (renamed from net-libs/gnet/gnet-2.0.8-r3.ebuild)50
-rw-r--r--net-libs/gnome-online-accounts/Manifest2
-rw-r--r--net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild9
-rw-r--r--net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild (renamed from net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild)14
-rw-r--r--net-libs/gnutls/Manifest3
-rw-r--r--net-libs/gnutls/gnutls-3.7.3-r1.ebuild126
-rw-r--r--net-libs/gnutls/gnutls-3.7.5.ebuild143
-rw-r--r--net-libs/gnutls/metadata.xml3
-rw-r--r--net-libs/google-cloud-cpp/Manifest7
-rw-r--r--net-libs/google-cloud-cpp/files/0001-Make-the-install-target-work.patch12
-rw-r--r--net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch33
-rw-r--r--net-libs/google-cloud-cpp/files/0002-cmake-set-library-soversions.patch130
-rw-r--r--net-libs/google-cloud-cpp/files/google-cloud-cpp-0.5.0-openssl.patch13
-rw-r--r--net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r2.ebuild (renamed from net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r1.ebuild)13
-rw-r--r--net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0.ebuild60
-rw-r--r--net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild63
-rw-r--r--net-libs/google-cloud-cpp/google-cloud-cpp-0.5.0.ebuild65
-rw-r--r--net-libs/google-cloud-cpp/google-cloud-cpp-1.36.0.ebuild (renamed from net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild)46
-rw-r--r--net-libs/grpc/Manifest2
-rw-r--r--net-libs/grpc/grpc-1.41.1.ebuild2
-rw-r--r--net-libs/grpc/grpc-1.43.0.ebuild (renamed from net-libs/grpc/grpc-1.37.1-r2.ebuild)12
-rw-r--r--net-libs/gssdp/Manifest4
-rw-r--r--net-libs/gssdp/gssdp-1.2.3.ebuild49
-rw-r--r--net-libs/gssdp/gssdp-1.3.1.ebuild61
-rw-r--r--net-libs/gssdp/gssdp-1.4.0.1.ebuild (renamed from net-libs/gssdp/gssdp-1.3.0.ebuild)7
-rw-r--r--net-libs/gtk-vnc/Manifest2
-rw-r--r--net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch59
-rw-r--r--net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch28
-rw-r--r--net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch36
-rw-r--r--net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild (renamed from net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild)12
-rw-r--r--net-libs/gupnp-av/Manifest4
-rw-r--r--net-libs/gupnp-av/gupnp-av-0.12.11.ebuild39
-rw-r--r--net-libs/gupnp-av/gupnp-av-0.13.1.ebuild42
-rw-r--r--net-libs/gupnp-av/gupnp-av-0.14.0.ebuild (renamed from net-libs/gupnp-av/gupnp-av-0.13.0.ebuild)4
-rw-r--r--net-libs/gupnp-igd/Manifest1
-rw-r--r--net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch99
-rw-r--r--net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild58
-rw-r--r--net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild4
-rw-r--r--net-libs/gupnp/Manifest3
-rw-r--r--net-libs/gupnp/gupnp-1.2.7.ebuild71
-rw-r--r--net-libs/gupnp/gupnp-1.4.3.ebuild (renamed from net-libs/gupnp/gupnp-1.3.1.ebuild)6
-rw-r--r--net-libs/ignition-transport/Manifest2
-rw-r--r--net-libs/ignition-transport/ignition-transport-8.2.1.ebuild (renamed from net-libs/ignition-transport/ignition-transport-8.1.0.ebuild)2
-rw-r--r--net-libs/jreen/Manifest1
-rw-r--r--net-libs/jreen/jreen-1.3.0-r1.ebuild37
-rw-r--r--net-libs/jreen/metadata.xml11
-rw-r--r--net-libs/ldns/Manifest1
-rw-r--r--net-libs/ldns/files/ldns-1.8.1-pkgconfig.patch10
-rw-r--r--net-libs/ldns/ldns-1.7.1-r5.ebuild8
-rw-r--r--net-libs/ldns/ldns-1.7.1-r6.ebuild8
-rw-r--r--net-libs/ldns/ldns-1.8.0-r1.ebuild10
-rw-r--r--net-libs/ldns/ldns-1.8.0-r4.ebuild (renamed from net-libs/ldns/ldns-1.8.0-r2.ebuild)28
-rw-r--r--net-libs/ldns/ldns-1.8.1.ebuild87
-rw-r--r--net-libs/libad9361-iio/libad9361-iio-0.2.ebuild4
-rw-r--r--net-libs/libaxc/Manifest1
-rw-r--r--net-libs/libaxc/libaxc-0.3.7.ebuild73
-rw-r--r--net-libs/libbitcoinconsensus/Manifest4
-rw-r--r--net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild104
-rw-r--r--net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild115
-rw-r--r--net-libs/libbloom/libbloom-1.5-r2.ebuild4
-rw-r--r--net-libs/libbloom/libbloom-1.6.ebuild2
-rw-r--r--net-libs/libbtbb/Manifest2
-rw-r--r--net-libs/libbtbb/libbtbb-2018.08.1.ebuild150
-rw-r--r--net-libs/libbtbb/libbtbb-2018.12.1.ebuild150
-rw-r--r--net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild32
-rw-r--r--net-libs/libbtbb/libbtbb-2020.12.1.ebuild150
-rw-r--r--net-libs/libbtbb/libbtbb-9999.ebuild132
-rw-r--r--net-libs/libbtbb/metadata.xml3
-rw-r--r--net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild18
-rw-r--r--net-libs/libdom/libdom-0.4.1-r1.ebuild4
-rw-r--r--net-libs/libecap/libecap-1.0.1.ebuild4
-rw-r--r--net-libs/libesmtp/libesmtp-9999.ebuild11
-rw-r--r--net-libs/libgfbgraph/Manifest1
-rw-r--r--net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild54
-rw-r--r--net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild4
-rw-r--r--net-libs/libgsasl/libgsasl-1.10.0.ebuild4
-rw-r--r--net-libs/libhackrf/libhackrf-2021.03.1.ebuild4
-rw-r--r--net-libs/libhtp/Manifest1
-rw-r--r--net-libs/libhtp/libhtp-0.5.40.ebuild35
-rw-r--r--net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch3
-rw-r--r--net-libs/libhubbub/libhubbub-0.3.7.ebuild4
-rw-r--r--net-libs/libident/libident-0.32-r1.ebuild4
-rw-r--r--net-libs/libiio/libiio-0.21.ebuild4
-rw-r--r--net-libs/libircclient/libircclient-1.10.ebuild2
-rw-r--r--net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch26
-rw-r--r--net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild (renamed from net-libs/libiscsi/libiscsi-1.19.0.ebuild)11
-rw-r--r--net-libs/libiscsi/metadata.xml3
-rw-r--r--net-libs/libisds/libisds-0.11.1-r1.ebuild (renamed from net-libs/libisds/libisds-0.11.1.ebuild)4
-rw-r--r--net-libs/libisds/libisds-9999.ebuild4
-rw-r--r--net-libs/libktorrent/Manifest4
-rw-r--r--net-libs/libktorrent/libktorrent-21.12.3.ebuild (renamed from net-libs/libktorrent/libktorrent-21.08.3.ebuild)4
-rw-r--r--net-libs/libktorrent/libktorrent-22.04.1.ebuild (renamed from net-libs/libktorrent/libktorrent-21.11.90.ebuild)6
-rw-r--r--net-libs/liblockfile/Manifest1
-rw-r--r--net-libs/liblockfile/liblockfile-1.16.ebuild60
-rw-r--r--net-libs/liblockfile/liblockfile-1.17.ebuild4
-rw-r--r--net-libs/libmbim/Manifest4
-rw-r--r--net-libs/libmbim/libmbim-1.26.2.ebuild (renamed from net-libs/libmbim/libmbim-1.26.0.ebuild)2
-rw-r--r--net-libs/libmbim/libmbim-1.26.4.ebuild (renamed from net-libs/libmbim/libmbim-1.24.8.ebuild)14
-rw-r--r--net-libs/libmicrohttpd/Manifest2
-rw-r--r--net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild2
-rw-r--r--net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild2
-rw-r--r--net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild2
-rw-r--r--net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild56
-rw-r--r--net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild56
-rw-r--r--net-libs/libmirisdr/libmirisdr-9999.ebuild23
-rw-r--r--net-libs/libmirisdr/metadata.xml12
-rw-r--r--net-libs/libmnl/Manifest3
-rw-r--r--net-libs/libmnl/libmnl-1.0.4.ebuild10
-rw-r--r--net-libs/libmnl/libmnl-1.0.5.ebuild31
-rw-r--r--net-libs/libmrss/libmrss-0.19.2-r1.ebuild4
-rw-r--r--net-libs/libnatpmp/libnatpmp-20150609.ebuild4
-rw-r--r--net-libs/libnet/metadata.xml1
-rw-r--r--net-libs/libnetconf2/Manifest3
-rw-r--r--net-libs/libnetconf2/libnetconf2-2.0.24.ebuild48
-rw-r--r--net-libs/libnetconf2/libnetconf2-2.1.7.ebuild (renamed from net-libs/libnetconf2/libnetconf2-2.0.19.ebuild)6
-rw-r--r--net-libs/libnetfilter_acct/Manifest1
-rw-r--r--net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild11
-rw-r--r--net-libs/libnetfilter_conntrack/Manifest4
-rw-r--r--net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-musl.patch46
-rw-r--r--net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild43
-rw-r--r--net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild4
-rw-r--r--net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.ebuild (renamed from net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild)38
-rw-r--r--net-libs/libnetfilter_cthelper/Manifest3
-rw-r--r--net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild11
-rw-r--r--net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.1-r1.ebuild35
-rw-r--r--net-libs/libnetfilter_cttimeout/Manifest3
-rw-r--r--net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild11
-rw-r--r--net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.1.ebuild34
-rw-r--r--net-libs/libnetfilter_log/Manifest2
-rw-r--r--net-libs/libnetfilter_log/libnetfilter_log-1.0.2.ebuild37
-rw-r--r--net-libs/libnetfilter_queue/Manifest1
-rw-r--r--net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild9
-rw-r--r--net-libs/libnfnetlink/Manifest3
-rw-r--r--net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild18
-rw-r--r--net-libs/libnfnetlink/libnfnetlink-1.0.2.ebuild52
-rw-r--r--net-libs/libnfsidmap/Manifest1
-rw-r--r--net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch22
-rw-r--r--net-libs/libnfsidmap/files/libnfsidmap-0.27-getgrouplist.patch115
-rw-r--r--net-libs/libnfsidmap/libnfsidmap-0.27.ebuild56
-rw-r--r--net-libs/libnfsidmap/metadata.xml8
-rw-r--r--net-libs/libnftnl/Manifest2
-rw-r--r--net-libs/libnftnl/libnftnl-1.2.0-r1.ebuild60
-rw-r--r--net-libs/libnftnl/libnftnl-1.2.1.ebuild14
-rw-r--r--net-libs/libnftnl/libnftnl-9999.ebuild14
-rw-r--r--net-libs/libnice/Manifest2
-rw-r--r--net-libs/libnice/libnice-0.1.18.ebuild48
-rw-r--r--net-libs/libnice/libnice-0.1.19.ebuild47
-rw-r--r--net-libs/libnids/Manifest1
-rw-r--r--net-libs/libnids/files/libnids-1.26-revert-SONAME-bump.patch26
-rw-r--r--net-libs/libnids/libnids-1.26-r1.ebuild60
-rw-r--r--net-libs/libnma/Manifest5
-rw-r--r--net-libs/libnma/libnma-1.8.34.ebuild (renamed from net-libs/libnma/libnma-1.8.32.ebuild)4
-rw-r--r--net-libs/libnma/libnma-1.8.36.ebuild (renamed from net-libs/libnma/libnma-1.8.30.ebuild)17
-rw-r--r--net-libs/libnma/libnma-1.8.38.ebuild71
-rw-r--r--net-libs/libnpupnp/Manifest1
-rw-r--r--net-libs/libnpupnp/libnpupnp-4.1.5-r1.ebuild48
-rw-r--r--net-libs/libnpupnp/libnpupnp-4.2.1.ebuild48
-rw-r--r--net-libs/libnsl/libnsl-2.0.0-r1.ebuild4
-rw-r--r--net-libs/libnxml/libnxml-0.18.3-r1.ebuild4
-rw-r--r--net-libs/liboauth/liboauth-1.0.3-r1.ebuild4
-rw-r--r--net-libs/libomemo/Manifest2
-rw-r--r--net-libs/libomemo/libomemo-0.8.0.ebuild51
-rw-r--r--net-libs/libomemo/libomemo-0.8.1.ebuild38
-rw-r--r--net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild4
-rw-r--r--net-libs/libosmocore/Manifest1
-rw-r--r--net-libs/libosmocore/files/libosmocore-0.6.0-automake-1.13.patch11
-rw-r--r--net-libs/libosmocore/libosmocore-0.10.2.ebuild46
-rw-r--r--net-libs/libosmocore/libosmocore-9999.ebuild46
-rw-r--r--net-libs/libosmocore/metadata.xml11
-rw-r--r--net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch11
-rw-r--r--net-libs/libotr/libotr-4.1.1.ebuild13
-rw-r--r--net-libs/libpcap/Manifest2
-rw-r--r--net-libs/libpcap/libpcap-1.10.0-r1.ebuild96
-rw-r--r--net-libs/libpcap/libpcap-1.10.1-r1.ebuild6
-rw-r--r--net-libs/libpcap/libpcap-9999.ebuild6
-rw-r--r--net-libs/libproxy/files/libproxy-0.4.17-mozjs.patch15
-rw-r--r--net-libs/libproxy/libproxy-0.4.17-r1.ebuild (renamed from net-libs/libproxy/libproxy-0.4.17.ebuild)5
-rw-r--r--net-libs/libpsl/libpsl-0.21.0.ebuild4
-rw-r--r--net-libs/libpsl/libpsl-0.21.1.ebuild4
-rw-r--r--net-libs/libqmi/Manifest5
-rw-r--r--net-libs/libqmi/libqmi-1.28.6.ebuild49
-rw-r--r--net-libs/libqmi/libqmi-1.30.4.ebuild (renamed from net-libs/libqmi/libqmi-1.30.2.ebuild)2
-rw-r--r--net-libs/libqmi/libqmi-1.30.6.ebuild (renamed from net-libs/libqmi/libqmi-1.30.0.ebuild)2
-rw-r--r--net-libs/libquotient/libquotient-0.6.11-r1.ebuild (renamed from net-libs/libquotient/libquotient-0.6.11.ebuild)6
-rw-r--r--net-libs/libsearpc/libsearpc-3.2.0-r2.ebuild4
-rw-r--r--net-libs/libsignal-protocol-c/metadata.xml4
-rw-r--r--net-libs/libslirp/Manifest1
-rw-r--r--net-libs/libslirp/libslirp-4.6.1.ebuild6
-rw-r--r--net-libs/libslirp/libslirp-4.7.0.ebuild35
-rw-r--r--net-libs/libsoup/Manifest8
-rw-r--r--net-libs/libsoup/files/3.0.2-fix-leak.patch24
-rw-r--r--net-libs/libsoup/libsoup-2.74.2.ebuild (renamed from net-libs/libsoup/libsoup-2.72.0-r1.ebuild)2
-rw-r--r--net-libs/libsoup/libsoup-3.0.4.ebuild (renamed from net-libs/libsoup/libsoup-3.0.2.ebuild)4
-rw-r--r--net-libs/libsoup/libsoup-3.0.5.ebuild (renamed from net-libs/libsoup/libsoup-2.74.1.ebuild)27
-rw-r--r--net-libs/libsoup/libsoup-3.0.6.ebuild (renamed from net-libs/libsoup/libsoup-2.74.0.ebuild)27
-rw-r--r--net-libs/libssh/libssh-0.9.6.ebuild4
-rw-r--r--net-libs/libssh/libssh-9999.ebuild4
-rw-r--r--net-libs/libssh2/libssh2-1.10.0.ebuild4
-rw-r--r--net-libs/libtirpc/libtirpc-1.3.2.ebuild4
-rw-r--r--net-libs/libtorrent-rasterbar/Manifest8
-rw-r--r--net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch46
-rw-r--r--net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild114
-rw-r--r--net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild114
-rw-r--r--net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12-r1.ebuild114
-rw-r--r--net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild69
-rw-r--r--net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6-r1.ebuild112
-rw-r--r--net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9-r1.ebuild114
-rw-r--r--net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5-r1.ebuild77
-rw-r--r--net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild78
-rw-r--r--net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.6.ebuild74
-rw-r--r--net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild4
-rw-r--r--net-libs/libtrace/Manifest1
-rw-r--r--net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch133
-rw-r--r--net-libs/libtrace/libtrace-4.0.18_p1.ebuild70
-rw-r--r--net-libs/libupnp/Manifest1
-rw-r--r--net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch32
-rw-r--r--net-libs/libupnp/libupnp-1.14.7.ebuild51
-rw-r--r--net-libs/libwebsockets/Manifest2
-rw-r--r--net-libs/libwebsockets/libwebsockets-4.3.1.ebuild (renamed from net-libs/libwebsockets/libwebsockets-4.3.0.ebuild)2
-rw-r--r--net-libs/libyang/Manifest3
-rw-r--r--net-libs/libyang/libyang-2.0.112.ebuild45
-rw-r--r--net-libs/libyang/libyang-2.0.164.ebuild (renamed from net-libs/libyang/libyang-2.0.97.ebuild)2
-rw-r--r--net-libs/libzapojit/libzapojit-0.0.3-r1.ebuild (renamed from net-libs/libzapojit/libzapojit-0.0.3.ebuild)11
-rw-r--r--net-libs/loudmouth/Manifest1
-rw-r--r--net-libs/loudmouth/files/loudmouth-1.5.4-freeaddrinfo-musl.patch40
-rw-r--r--net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild4
-rw-r--r--net-libs/loudmouth/loudmouth-1.5.4.ebuild57
-rw-r--r--net-libs/loudmouth/metadata.xml5
-rw-r--r--net-libs/mbedtls/Manifest6
-rw-r--r--net-libs/mbedtls/mbedtls-2.16.12.ebuild (renamed from net-libs/mbedtls/mbedtls-2.16.11.ebuild)3
-rw-r--r--net-libs/mbedtls/mbedtls-2.28.0-r1.ebuild (renamed from net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild)9
-rw-r--r--net-libs/mbedtls/mbedtls-3.1.0.ebuild (renamed from net-libs/mbedtls/mbedtls-3.0.0.ebuild)0
-rw-r--r--net-libs/mbedtls/metadata.xml3
-rw-r--r--net-libs/miniupnpc/metadata.xml11
-rw-r--r--net-libs/miniupnpc/miniupnpc-2.2.3.ebuild8
-rw-r--r--net-libs/nDPI/Manifest3
-rw-r--r--net-libs/nDPI/nDPI-4.0-r1.ebuild66
-rw-r--r--net-libs/nDPI/nDPI-4.2.ebuild50
-rw-r--r--net-libs/nDPI/nDPI-9999.ebuild68
-rw-r--r--net-libs/nativebiginteger/Manifest2
-rw-r--r--net-libs/nativebiginteger/nativebiginteger-1.6.1.ebuild (renamed from net-libs/nativebiginteger/nativebiginteger-0.9.48.ebuild)6
-rw-r--r--net-libs/neon/Manifest5
-rw-r--r--net-libs/neon/metadata.xml5
-rw-r--r--net-libs/neon/neon-0.30.2.ebuild105
-rw-r--r--net-libs/neon/neon-0.31.0.ebuild105
-rw-r--r--net-libs/neon/neon-0.32.1.ebuild109
-rw-r--r--net-libs/neon/neon-0.32.2.ebuild (renamed from net-libs/neon/neon-0.31.1.ebuild)52
-rw-r--r--net-libs/nghttp2/Manifest1
-rw-r--r--net-libs/nghttp2/nghttp2-1.47.0.ebuild76
-rw-r--r--net-libs/ngtcp2/Manifest6
-rw-r--r--net-libs/ngtcp2/metadata.xml3
-rw-r--r--net-libs/ngtcp2/ngtcp2-0.1.0.ebuild42
-rw-r--r--net-libs/ngtcp2/ngtcp2-0.2.1.ebuild49
-rw-r--r--net-libs/ngtcp2/ngtcp2-0.3.0.ebuild49
-rw-r--r--net-libs/ngtcp2/ngtcp2-0.3.1.ebuild49
-rw-r--r--net-libs/ngtcp2/ngtcp2-0.4.0.ebuild49
-rw-r--r--net-libs/ngtcp2/ngtcp2-0.5.0.ebuild49
-rw-r--r--net-libs/ngtcp2/ngtcp2-9999.ebuild21
-rw-r--r--net-libs/nodejs/Manifest11
-rw-r--r--net-libs/nodejs/files/nodejs-12.20.1-fix_ppc64_crashes.patch44
-rw-r--r--net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch95
-rw-r--r--net-libs/nodejs/files/nodejs-14.19.0-global-npm-config.patch20
-rw-r--r--net-libs/nodejs/files/nodejs-16.4.2-paxmarking.patch113
-rw-r--r--net-libs/nodejs/files/nodejs-18.0.0-paxmarking.patch113
-rw-r--r--net-libs/nodejs/files/nodejs-99999999-llhttp.patch20
-rw-r--r--net-libs/nodejs/nodejs-12.22.5-r1.ebuild249
-rw-r--r--net-libs/nodejs/nodejs-12.22.6.ebuild249
-rw-r--r--net-libs/nodejs/nodejs-12.22.7.ebuild249
-rw-r--r--net-libs/nodejs/nodejs-14.18.0.ebuild242
-rw-r--r--net-libs/nodejs/nodejs-14.19.0.ebuild (renamed from net-libs/nodejs/nodejs-14.18.1.ebuild)7
-rw-r--r--net-libs/nodejs/nodejs-16.14.2.ebuild (renamed from net-libs/nodejs/nodejs-16.13.0.ebuild)6
-rw-r--r--net-libs/nodejs/nodejs-16.9.1.ebuild231
-rw-r--r--net-libs/nodejs/nodejs-18.1.0.ebuild (renamed from net-libs/nodejs/nodejs-16.10.0.ebuild)7
-rw-r--r--net-libs/ntirpc/Manifest1
-rw-r--r--net-libs/ntirpc/metadata.xml20
-rw-r--r--net-libs/ntirpc/ntirpc-3.4-r1.ebuild (renamed from net-libs/ntirpc/ntirpc-3.4.ebuild)6
-rw-r--r--net-libs/ntirpc/ntirpc-4.0-r1.ebuild33
-rw-r--r--net-libs/obby/Manifest1
-rw-r--r--net-libs/obby/metadata.xml5
-rw-r--r--net-libs/obby/obby-0.4.8-r1.ebuild36
-rw-r--r--net-libs/onion/Manifest1
-rw-r--r--net-libs/onion/files/protos.patch28
-rw-r--r--net-libs/onion/metadata.xml17
-rw-r--r--net-libs/onion/onion-0.8.ebuild71
-rw-r--r--net-libs/onion/onion-9999.ebuild69
-rw-r--r--net-libs/ortp/ortp-0.23.0-r1.ebuild7
-rw-r--r--net-libs/pacparser/Manifest1
-rw-r--r--net-libs/pacparser/files/pacparser-1.4.0-build.patch96
-rw-r--r--net-libs/pacparser/files/pacparser-1.4.0-pymod.patch61
-rw-r--r--net-libs/pacparser/pacparser-1.4.0.ebuild70
-rw-r--r--net-libs/phodav/phodav-2.5.ebuild4
-rw-r--r--net-libs/quiche/Manifest220
-rw-r--r--net-libs/quiche/files/quiche-0.11.0-fix-pkg-config-output-path.patch65
-rw-r--r--net-libs/quiche/quiche-0.11.0.ebuild (renamed from net-libs/quiche/quiche-0.8.1.ebuild)131
-rw-r--r--net-libs/quiche/quiche-0.12.0.ebuild (renamed from net-libs/quiche/quiche-0.9.0.ebuild)117
-rw-r--r--net-libs/quiche/quiche-0.13.0.ebuild (renamed from net-libs/quiche/quiche-0.8.0.ebuild)160
-rw-r--r--net-libs/quiche/quiche-0.5.1.ebuild189
-rw-r--r--net-libs/quiche/quiche-0.6.0.ebuild195
-rw-r--r--net-libs/quiche/quiche-0.7.0.ebuild200
-rw-r--r--net-libs/quiche/quiche-9999.ebuild132
-rw-r--r--net-libs/qxmpp/qxmpp-1.4.0.ebuild4
-rw-r--r--net-libs/rabbitmq-c/Manifest1
-rw-r--r--net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild53
-rw-r--r--net-libs/rpc2/Manifest2
-rw-r--r--net-libs/rpc2/rpc2-2.14.ebuild4
-rw-r--r--net-libs/rpcsvc-proto/Manifest1
-rw-r--r--net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3.ebuild32
-rw-r--r--net-libs/rtrlib/Manifest1
-rw-r--r--net-libs/rtrlib/rtrlib-0.8.0.ebuild44
-rw-r--r--net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch21
-rw-r--r--net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch15
-rw-r--r--net-libs/serf/metadata.xml5
-rw-r--r--net-libs/serf/serf-1.3.9-r2.ebuild20
-rw-r--r--net-libs/serf/serf-1.3.9-r3.ebuild80
-rw-r--r--net-libs/signond/Manifest2
-rw-r--r--net-libs/signond/files/signond-8.60-crashfix.patch160
-rw-r--r--net-libs/signond/files/signond-8.60-drop-fno-rtti.patch123
-rw-r--r--net-libs/signond/signond-8.61.ebuild (renamed from net-libs/signond/signond-8.60-r2.ebuild)23
-rw-r--r--net-libs/stem/Manifest1
-rw-r--r--net-libs/stem/stem-1.8.0-r1.ebuild4
-rw-r--r--net-libs/stem/stem-1.8.0_p20211118.ebuild49
-rw-r--r--net-libs/telepathy-farstream/telepathy-farstream-0.6.2-r1.ebuild (renamed from net-libs/telepathy-farstream/telepathy-farstream-0.6.2.ebuild)20
-rw-r--r--net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild5
-rw-r--r--net-libs/tox/Manifest2
-rw-r--r--net-libs/tox/tox-0.2.13.ebuild (renamed from net-libs/tox/tox-0.2.11-r1.ebuild)49
-rw-r--r--net-libs/tox/tox-9999.ebuild33
-rw-r--r--net-libs/tox_extension_messages/Manifest2
-rw-r--r--net-libs/tox_extension_messages/tox_extension_messages-0.0.3.ebuild (renamed from net-libs/tox_extension_messages/tox_extension_messages-0.0.2.ebuild)2
-rw-r--r--net-libs/toxext/Manifest2
-rw-r--r--net-libs/toxext/toxext-0.0.3.ebuild (renamed from net-libs/toxext/toxext-0.0.2.ebuild)9
-rw-r--r--net-libs/udns/udns-0.4.ebuild4
-rw-r--r--net-libs/usrsctp/usrsctp-0.9.5.0.ebuild4
-rw-r--r--net-libs/webkit-gtk/Manifest3
-rw-r--r--net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch55
-rw-r--r--net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch31
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild300
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild (renamed from net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild)98
-rw-r--r--net-libs/wvstreams/files/wvstreams-99999-openssl-ldflags.patch10
-rw-r--r--net-libs/wvstreams/files/wvstreams-99999-soname.patch11
-rw-r--r--net-libs/wvstreams/wvstreams-99999.ebuild93
-rw-r--r--net-libs/xdp-tools/Manifest2
-rw-r--r--net-libs/xdp-tools/xdp-tools-1.2.3.ebuild (renamed from net-libs/xdp-tools/xdp-tools-1.2.0.ebuild)27
-rw-r--r--net-libs/xrootd-ceph/Manifest3
-rw-r--r--net-libs/xrootd-ceph/files/xrootd-ceph-5.4.0_no-werror.patch11
-rw-r--r--net-libs/xrootd-ceph/xrootd-ceph-5.1.1.ebuild36
-rw-r--r--net-libs/xrootd-ceph/xrootd-ceph-5.4.0.ebuild (renamed from net-libs/xrootd-ceph/xrootd-ceph-5.2.0.ebuild)6
-rw-r--r--net-libs/xrootd/Manifest3
-rw-r--r--net-libs/xrootd/metadata.xml3
-rw-r--r--net-libs/xrootd/xrootd-5.0.3-r1.ebuild2
-rw-r--r--net-libs/xrootd/xrootd-5.1.1-r1.ebuild117
-rw-r--r--net-libs/xrootd/xrootd-5.3.1.ebuild2
-rw-r--r--net-libs/xrootd/xrootd-5.4.0.ebuild (renamed from net-libs/xrootd/xrootd-5.2.0-r1.ebuild)32
-rw-r--r--net-libs/zeromq/zeromq-4.3.3-r1.ebuild4
-rw-r--r--net-libs/zeromq/zeromq-4.3.4-r1.ebuild6
-rw-r--r--net-libs/zmqpp/zmqpp-4.2.0-r1.ebuild (renamed from net-libs/zmqpp/zmqpp-4.2.0.ebuild)9
397 files changed, 4817 insertions, 8815 deletions
diff --git a/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild b/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild
index 1156f64a3ad..b1073f7e8a3 100644
--- a/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild
+++ b/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
CDEPEND="
dev-java/jna:4
diff --git a/net-libs/aqbanking/aqbanking-6.2.5.ebuild b/net-libs/aqbanking/aqbanking-6.2.5.ebuild
index b13c9410937..d7fb4a15ceb 100644
--- a/net-libs/aqbanking/aqbanking-6.2.5.ebuild
+++ b/net-libs/aqbanking/aqbanking-6.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/342/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
IUSE="debug doc ebics examples ofx"
BDEPEND="
diff --git a/net-libs/balde-markdown/Manifest b/net-libs/balde-markdown/Manifest
deleted file mode 100644
index 7074ba7f4d8..00000000000
--- a/net-libs/balde-markdown/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST balde-markdown-0.1.tar.bz2 260429 BLAKE2B 4306a02e363a271c77d9ab3f08261ab9410d6ac8c258bc74dec3b1cabd8728927d12bd0d0b2941f5dbd90256e11ef8e30b5c952c2d7711bf6ae2896068822862 SHA512 ba0a952d1f8480f6173a8af6eb662741ac04db4e39d65158afac97606c2faaaff973dce384b2bc1d42aabbdd345cd451fc5624f1c6d2f941f2630b2e76a01d10
diff --git a/net-libs/balde-markdown/balde-markdown-0.1.ebuild b/net-libs/balde-markdown/balde-markdown-0.1.ebuild
deleted file mode 100644
index 810fde09dce..00000000000
--- a/net-libs/balde-markdown/balde-markdown-0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/balde/${PN}.git"
- inherit git-r3 autotools
-fi
-
-DESCRIPTION="A balde extension that adds Markdown support"
-HOMEPAGE="https://github.com/balde/balde-markdown"
-
-SRC_URI="https://github.com/balde/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-if [[ ${PV} = *9999* ]]; then
- SRC_URI=""
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/glib-2.34
- >=net-libs/balde-0.1
- app-text/discount"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- [[ ${PV} = *9999* ]] && eautoreconf
- default
-}
-
-src_configure() {
- econf \
- --without-valgrind \
- --disable-static
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/balde-markdown/metadata.xml b/net-libs/balde-markdown/metadata.xml
deleted file mode 100644
index 0571121e40f..00000000000
--- a/net-libs/balde-markdown/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <maintainer status="active">
- <email>rafaelmartins@gentoo.org</email>
- <name>Rafael G. Martins</name>
- </maintainer>
- <bugs-to>mailto:balde-dev@googlegroups.com</bugs-to>
- <remote-id type="github">balde/balde-markdown</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-libs/balde/Manifest b/net-libs/balde/Manifest
deleted file mode 100644
index cb7a523ea24..00000000000
--- a/net-libs/balde/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST balde-0.1.1.tar.bz2 360412 BLAKE2B 88f25e7c409c61f45d5fca0664d3602fd206caade28977d7d38d5626fdbc423c76cc8dda2c5829ea2b6b2f79dd9897b3a890b9a5a862d6defad4e11808edab54 SHA512 fafb9e9344ecb1caf6a4451b99adb3505fb728015e2bcce3d81162f679a70267e49a0dc194c6c977a7a155f9b5ae3318fdfcb63fb0223e43943c0fc5e8503acd
diff --git a/net-libs/balde/balde-0.1.1.ebuild b/net-libs/balde/balde-0.1.1.ebuild
deleted file mode 100644
index d9d20aa89a4..00000000000
--- a/net-libs/balde/balde-0.1.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3 autotools
-fi
-
-DESCRIPTION="A microframework for C based on GLib and bad intentions"
-HOMEPAGE="https://balde.rgm.io/"
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-if [[ ${PV} = *9999* ]]; then
- SRC_URI=""
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/glib-2.34
- dev-libs/fcgi
- x11-misc/shared-mime-info"
-
-if [[ ${PV} = *9999* ]]; then
- RDEPEND="${RDEPEND}
- dev-util/peg"
-fi
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-
-src_prepare() {
- [[ ${PV} = *9999* ]] && eautoreconf
- default
-}
-
-src_configure() {
- econf \
- $(use_with doc doxygen) \
- --disable-examples \
- --without-valgrind
-}
-
-src_compile() {
- default
- use doc && emake doxygen
-}
-
-src_install() {
- default
- use doc && dohtml -r doc/build/html/.
-}
diff --git a/net-libs/balde/metadata.xml b/net-libs/balde/metadata.xml
deleted file mode 100644
index dc226aff2d4..00000000000
--- a/net-libs/balde/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <maintainer status="active">
- <email>rafaelmartins@gentoo.org</email>
- <name>Rafael G. Martins</name>
- </maintainer>
- <bugs-to>mailto:balde-dev@googlegroups.com</bugs-to>
- <remote-id type="github">balde/balde</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-libs/c-client/c-client-2007f-r7.ebuild b/net-libs/c-client/c-client-2007f-r7.ebuild
index befa819f22a..7d67a406761 100644
--- a/net-libs/c-client/c-client-2007f-r7.ebuild
+++ b/net-libs/c-client/c-client-2007f-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD pam ssl static-libs topal chappa"
+IUSE="doc +ipv6 kerberos pam ssl static-libs topal chappa"
RDEPEND="
!net-mail/uw-imap
@@ -107,8 +107,6 @@ src_compile() {
# Fall back to "slx" when USE=pam is not set. This ensures that
# we link in libcrypt to get the crypt() routine (bug #456928).
use pam && target=lnp passwdtype=pam || target=slx passwdtype=std
- elif use kernel_FreeBSD ; then
- target=bsf passwdtype=pam
fi
use kerberos \
&& mymake="EXTRAAUTHENTICATORS=gss" \
diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest
index de690807ad1..59fb34a6189 100644
--- a/net-libs/canlock/Manifest
+++ b/net-libs/canlock/Manifest
@@ -1,3 +1 @@
-DIST canlock_2b-6.diff.gz 7946 BLAKE2B 489161a24f832d978fae49f7349e9ddd3518cfc0b3c02a8e614bffbefafd2fd3ff9f5720b2df0dead30e6d70dcd510380fee8cc2b535268266408719ca030e35 SHA512 fa89d638d87e5cb18bd6c270200cd5d962c5a263855e5cbbd8e944dea633a61d6f0c271da04d56096ef23e0a9f252e3bdead496e9aa9afe31d3f8e7ef679020f
-DIST canlock_2b.orig.tar.gz 14099 BLAKE2B 93c991298ed7bf7ab57b290edf6e6b7bcd86ab452002cd61acbff17ec60eed2e15983b3f1cbe8d54acf4f0cfa11480822c7d7ed474e4c51dea018f73933308f2 SHA512 3ceeac6a17fc3bb3330626d22145371ed5f53ad2a33c6a60b639dab0dbc8ff85623839a9d1e1d4cb78580a9060b0ec9fd3489d1374feecf587b2ec5c7963f58e
-DIST libcanlock-3.2.2.tar.bz2 467561 BLAKE2B e332c379647c7ad3fbf5f0a8051b888be65674bcb2c9be1b689f009fd35eecbb29644d9f17aaa3812c9405283708207c6f220f630e0dd1c6a5508d41b85a6070 SHA512 3d194a37bdbdf640bb6996383ce988c9177573b6f84c29569d759308564c7636d98d5c267988bd034b33681f814400eb7fbecf78d90f54b126edb3bf384f928f
+DIST libcanlock-3.3.0.tar.bz2 625796 BLAKE2B 001512a6d2d226aed93882de8d8f4f02a066cc67e6f21b411b8e1ee2ff0d4580732c90a6fc2756a79f992629cd18fbc319510960c39f33284c86bebfed3d4216 SHA512 100d2b4bf3eadedb7da230317cd37b2c1b259bbd783099a74e0d75fdc6ecddb8a6fd854a2b272bda3629bcf1ac1ae2b3d5657fca9137c17e38aad88f30e4c81c
diff --git a/net-libs/canlock/canlock-2b.ebuild b/net-libs/canlock/canlock-2b.ebuild
deleted file mode 100644
index d54ed58f370..00000000000
--- a/net-libs/canlock/canlock-2b.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P="${P/-/_}"
-
-DESCRIPTION="A library for creating and verifying Usenet cancel locks"
-HOMEPAGE="https://packages.qa.debian.org/c/canlock.html"
-SRC_URI="
- mirror://debian/pool/main/c/${PN}/${MY_P}.orig.tar.gz
- mirror://debian/pool/main/c/${PN}/${MY_P}-6.diff.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${P/-/}"
-
-PATCHES=(
- "${WORKDIR}"/${MY_P}-6.diff
- "${FILESDIR}"/${P}-make.patch
-)
-
-src_configure() {
- tc-export CC
-}
-
-src_install() {
- dolib.so src/libcanlock.so.2.0.0
- dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so.2
- dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so
-
- doheader include/canlock.h
-
- dodoc CHANGES README doc/HOWTO
-}
diff --git a/net-libs/canlock/canlock-3.2.2.ebuild b/net-libs/canlock/canlock-3.3.0.ebuild
index b073927e1e7..bd8ea08f194 100644
--- a/net-libs/canlock/canlock-3.2.2.ebuild
+++ b/net-libs/canlock/canlock-3.3.0.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit toolchain-funcs
-
DESCRIPTION="A library for creating and verifying Usenet cancel locks"
HOMEPAGE="https://micha.freeshell.org/libcanlock/"
SRC_URI="https://micha.freeshell.org/lib${PN}/src/lib${P}.tar.bz2"
@@ -12,13 +10,15 @@ S="${WORKDIR}/lib${P}"
LICENSE="BSD MIT"
SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+legacy"
+KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+IUSE="header-parser +legacy"
-BDEPEND="sys-devel/flex
- virtual/yacc"
+BDEPEND="
+ sys-devel/flex
+ virtual/yacc
+"
-DOCS=( ChangeLog{,_V{0..2}} README doc/sec_review.txt )
+DOCS=( ChangeLog{,_V{0..2}} README TODO doc/sec_review.txt )
src_prepare() {
default
@@ -30,6 +30,7 @@ src_prepare() {
src_configure() {
local econf_args=(
--enable-pc-files
+ $(use_enable header-parser hp)
$(use_enable legacy legacy-api)
)
@@ -43,6 +44,6 @@ src_install() {
# keep old header location for compability with canlock v2
use legacy && dosym ./libcanlock-3/canlock.h /usr/include/canlock.h
- # required for net-nntp/tin
+ # required for =net-nntp/tin-2.6.0
dosym ./libcanlock-3.pc /usr/$(get_libdir)/pkgconfig/libcanlock3.pc
}
diff --git a/net-libs/canlock/files/canlock-2b-make.patch b/net-libs/canlock/files/canlock-2b-make.patch
deleted file mode 100644
index da90c738af6..00000000000
--- a/net-libs/canlock/files/canlock-2b-make.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,38 +1,39 @@
--CFLAGS = -Iinclude
--LDFLAGS = -L. -lcanlock
--CC = gcc
--STATIC_LIB = libcanlock.a
-+CPPFLAGS += -Iinclude
-+LDLIBS = -L./src -lcanlock
-
--all: hmactest canlocktest $(STATIC_LIB)
-+all: shared
-
--sha1test: t/sha1test.c $(STATIC_LIB)
-- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
-+sha1test: t/sha1test.c shared
-+ $(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS)
-
--hmactest: t/hmactest.c $(STATIC_LIB)
-- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
-+hmactest: t/hmactest.c shared
-+ $(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS)
-
--canlocktest: t/canlocktest.c $(STATIC_LIB)
-- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
-+canlocktest: t/canlocktest.c shared
-+ $(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS)
-
--$(STATIC_LIB):
-- cd src && make
-- ln -s src/libcanlock.a libcanlock.a
-+static:
-+ cd src && $(MAKE) libcanlock.a
-+ ln -sf src/libcanlock.a libcanlock.a
-+
-+shared:
-+ cd src && $(MAKE) libcanlock.so.2.0.0
-
- clean:
- rm -f src/*.o t/*.o t/*.out *.gmon gmon.*
-- cd src && make clean
-+ cd src && $(MAKE) clean
- rm -f *.a canlocktest hmactest sha1test *.exe *.h lib-stamp
-
- install: all
-- cd src && make install DESTDIR=$(DESTDIR)
-+ cd src && $(MAKE) install DESTDIR=$(DESTDIR)
- install --mode=644 include/canlock.h $(DESTDIR)/usr/include
--
--test: all
-+
-+check: hmactest canlocktest
- @echo "hmactest: "
-- @./hmactest > t/hmactest.out || echo hmm
-+ @LD_LIBRARY_PATH=src/ ./hmactest > t/hmactest.out || echo hmm
- @diff t/hmactest.shouldbe t/hmactest.out && echo " Pass." || (echo " **FAIL**" ; exit 1)
- @echo "=-=-=-="
- @echo "canlocktest: "
-- @./canlocktest > t/canlocktest.out
-+ @LD_LIBRARY_PATH=src/ ./canlocktest > t/canlocktest.out
- @diff t/canlocktest.shouldbe t/canlocktest.out && echo " Pass." || (echo " **FAIL**" ; exit 1)
- @echo "=-=-=-="
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,32 +1,35 @@
--LIBOBJS = base64.lo canlock.lo hmac_sha1.lo sha1.lo
--CC = gcc
- LIBTOOL = libtool
--CFLAGS = -I../include
-+CPPFLAGS += -I../include
- SOURCES = base64.c canlock.c hmac_sha1.c sha1.c
--OBJS = base64.o canlock.o hmac_sha1.o sha1.o
-+OBJS := $(SOURCES:.c=.o)
-+LIBOBJS := $(SOURCES:.c=.lo)
- SHARELINKFLAGS = -Wl,-soname -Wl,libcanlock.so.2
- SHAREDFLAGS = -fPIC -DPIC
- LIBS = libcanlock.a libcanlock.so.2.0.0
- INSTALL = install
-
-+.SUFFIXES: .c .o .h .lo
-+
- all: $(LIBS)
-
--libcanlock.a:
-- $(CC) $(CFLAGS) -c $(SOURCES)
-- ar cru libcanlock.a $(OBJS)
-- ranlib libcanlock.a
-- rm $(OBJS)
--
--libcanlock.so.2.0.0:
-- $(CC) $(CFLAGS) $(SHAREDFLAGS) -c $(SOURCES)
-- $(CC) -shared $(OBJS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0
-+.c.lo:
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(SHAREDFLAGS) -c -o $@ $<
-+
-+libcanlock.a: $(OBJS)
-+ $(AR) cru libcanlock.a $(OBJS)
-+ $(RANLIB) libcanlock.a
-+
-+libcanlock.so.2.0.0: $(LIBOBJS)
-+ $(CC) -shared $(LIBOBJS) $(LDFLAGS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0
-+ ln -s libcanlock.so.2.0.0 libcanlock.so
-+ ln -s libcanlock.so.2.0.0 libcanlock.so.2
-
- install: all
- $(INSTALL) libcanlock.so.2.0.0 $(DESTDIR)/usr/lib
- cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so.2
- cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so
- $(INSTALL) libcanlock.a $(DESTDIR)/usr/lib/libcanlock.a
-- ranlib $(DESTDIR)/usr/lib/libcanlock.a
--
-+ $(RANLIB) $(DESTDIR)/usr/lib/libcanlock.a
-+
- clean:
-- rm -f $(OBJS) $(LIBS)
-+ rm -f $(OBJS) $(LIBOBJS) $(LIBS)
diff --git a/net-libs/canlock/metadata.xml b/net-libs/canlock/metadata.xml
index 84c5f5b3076..74e1f5c9b3c 100644
--- a/net-libs/canlock/metadata.xml
+++ b/net-libs/canlock/metadata.xml
@@ -9,8 +9,7 @@
</maintainer>
</upstream>
<use>
- <flag name="legacy" restrict="&gt;=net-libs/canlock-3.0">
- Enable or disable building legacy code (v2 compatible)
- </flag>
+ <flag name="header-parser">Build article header parsers</flag>
+ <flag name="legacy">Build legacy API (v2 compatible)</flag>
</use>
</pkgmetadata>
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index aa1b7ec5f3e..433b7134be8 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,6 +1,2 @@
-DIST courier-authlib-0.69.0.tar.bz2 2197718 BLAKE2B 63c273a85983ce7bd57496eeefac51107e3132dc9eb372f199530dbf6c5a5ddde7f8ee285aa54a096002f9058dc7e1cd9eb1194e3d512ea19882f93b1147345a SHA512 c3806aa50d7ff13f75536064ec46028db3d5e1f4ef64692b5ece64810b4042ae0840bb346c73ae9d36f6113173f0e5e922356a178c10815640a26caa921e1614
-DIST courier-authlib-0.70.0.tar.bz2 2183323 BLAKE2B ebf58f8c4e7b58766edc684ced590ea7bfa692eff19a483f4ab7748a73e96e1c66858985ac89e281205838660a72e9a33e3b3c28fce3f94d981b61ca56b1e2b1 SHA512 61ce62860cc7ceb51f255a0659bf9b8f4172d0c1c8aee06d9821144330f9526f54e6bdb0158f2fd754d6ad92fd4cc84306b949d46c92e8aed47a397023b36b65
DIST courier-authlib-0.71.0.tar.bz2 2207895 BLAKE2B 8eb92b2c07acfb662b34a2234759a80f3a1b5a96c9e537cd6215bd9a9a607ed8995461dd599e4fe2698e70510f11815ad13a0511446303ae5e26ff616f05d92f SHA512 7a9700c472fd9d6942bd15dfd8db474a738817608bcd8106b6211b24cdc0631fd69f99e7a5c9e9f6088c16b53a9304ec429c031b16621f8ef52581af8a4256ec
-DIST courier-authlib-0.71.1.tar.bz2 2208870 BLAKE2B 5058a5d3182c53020c3be0a693908bd90e6e2397f03124df3efd7c3bd39ebdc794166d49c6153880bbf93518afbf4388160680cd701236b075b6e59624fb6882 SHA512 a1b36f4f3b0f11fb34e5dab197b3a0471bc6a99528fe77836b3b2d12f9dac292be4c181aeba5afa3410685dd6882ed00ff6692e74cd0132ba591de1294d0f2d7
-DIST courier-authlib-0.71.2.tar.bz2 2208460 BLAKE2B 49aaea85032166ba4867e7834bb2f6c8d3eccb0ebe24b94bac3033a3da2154e3162d06892354b37eb0c38db092ce0096b050246db341b18a32065c19f322238a SHA512 b0bd2356013d48a998908d4825901e8e730ec276699005696948781e8af4014e25eded3116fa5a8a38b6236e9713f454170628b51aedab7b7d2ebec082643a47
DIST courier-authlib-0.71.3.tar.bz2 2208794 BLAKE2B 4b0f56f066368383d471dd8f46941f7b652a87be939ba6319cf99115991c03dd117d6bc246cc802fa7066ce5c75aaa102c59ae397948dd31ddbbb024059566ef SHA512 02c55ff1a91aac581942f8a4a01edd2bb8e2e1a07faf551d40a97583ce2f6eab12e850e3170df255c1e7680a34e418784ec14bb033825d6bac21192ae37ce55d
diff --git a/net-libs/courier-authlib/courier-authlib-0.70.0-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.70.0-r3.ebuild
deleted file mode 100644
index c2e8c3099c6..00000000000
--- a/net-libs/courier-authlib/courier-authlib-0.70.0-r3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="https://www.courier-mta.org/authlib/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
-
-RESTRICT="!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
- >=net-libs/courier-unicode-2.1:=
- virtual/libcrypt:=
- gdbm? ( sys-libs/gdbm:= )
- !gdbm? ( sys-libs/db:= )
- dev-libs/openssl:0=
- ldap? ( >=net-nds/openldap-1.2.11 )
- mysql? ( dev-db/mysql-connector-c:= )
- pam? ( sys-libs/pam )
- postgres? ( dev-db/postgresql:= )
- sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- if ! has_version 'dev-tcltk/expect' ; then
- ewarn 'The dev-tcltk/expect package is not installed.'
- ewarn 'Without it, you will not be able to change system login passwords.'
- ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
- ewarn 'and others) will work just fine.'
- fi
-}
-
-src_configure() {
- filter-flags -fomit-frame-pointer
- local myconf
- if use berkdb ; then
- if use gdbm ; then
- ewarn "Both gdbm and berkdb selected. Using gdbm."
- else
- myconf="--with-db=db"
- fi
- fi
- use gdbm && myconf="--with-db=gdbm"
- use debug && myconf+=" debug=true"
- use sqlite && myconf+=" --with-sqlite-libs"
-
- econf \
- --sysconfdir=/etc/courier \
- --datadir=/usr/share/courier \
- --localstatedir=/var/lib/courier \
- --sharedstatedir=/var/lib/courier/com \
- --with-authdaemonvar=/var/lib/courier/authdaemon \
- --with-authshadow \
- --without-redhat \
- --with-mailuser=mail \
- --with-mailgroup=mail \
- --cache-file="${S}/configuring.cache" \
- $(use_with pam authpam) \
- $(use_with ldap authldap) \
- $(use_with mysql authmysql) \
- $(use_with postgres authpgsql) \
- $(use_with sqlite authsqlite) \
- ${myconf}
-}
-
-orderfirst() {
- file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
- if [[ -e "${file}" ]] ; then
- orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
- new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/ / /g\"`\""
- sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
- fi
-}
-
-finduserdb() {
- for dir in \
- /etc/courier/authlib /etc/courier /etc/courier-imap \
- /usr/lib/courier/etc /usr/lib/courier-imap/etc \
- /usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
- /usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
- /usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
- if [[ -e "${dir}/userdb" ]] ; then
- einfo "Found userdb at: ${dir}/userdb"
- cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
- chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
- continue
- fi
- done
-}
-
-src_install() {
- diropts -o mail -g mail
- dodir /etc/courier
- keepdir /var/lib/courier/authdaemon
- keepdir /etc/courier/authlib
- emake DESTDIR="${D}" install
- [[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
- emake DESTDIR="${D}" install-configure
- rm -f "${D}"/etc/courier/authlib/*.bak
- chown mail:mail "${D}"/etc/courier/authlib/* || die
- for y in "${D}"/etc/courier/authlib/*.dist ; do
- [[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
- done
- use pam && orderfirst authdaemonrc authmodulelist authpam
- use ldap && orderfirst authdaemonrc authmodulelist authldap
- use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
- use postgres && orderfirst authdaemonrc authmodulelist authpgsql
- use mysql && orderfirst authdaemonrc authmodulelist authmysql
-
- DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
- HTML_DOCS=( README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
- if use mysql ; then
- DOCS+=( README.authmysql.myownquery )
- HTML_DOCS+=( README.authmysql.html )
- fi
- if use postgres ; then
- HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
- fi
- if use ldap ; then
- DOCS+=( README.ldap )
- dodir /etc/openldap/schema
- cp -f authldap.schema "${D}/etc/openldap/schema/" || die
- fi
- if use sqlite ; then
- HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
- fi
- einstalldocs
-
- newinitd "${FILESDIR}/${PN}-r2" "${PN}"
-
- use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
- if [[ -e /etc/courier/authlib/userdb ]] ; then
- einfo "Running makeuserdb ..."
- chmod go-rwx /etc/courier/authlib/userdb || die
- makeuserdb
- fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.0-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.0-r3.ebuild
deleted file mode 100644
index 14023d2a01b..00000000000
--- a/net-libs/courier-authlib/courier-authlib-0.71.0-r3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="https://www.courier-mta.org/authlib/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
-
-RESTRICT="!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
- >=net-libs/courier-unicode-2.1:=
- virtual/libcrypt:=
- gdbm? ( sys-libs/gdbm:= )
- !gdbm? ( sys-libs/db:= )
- dev-libs/openssl:0=
- ldap? ( >=net-nds/openldap-1.2.11 )
- mysql? ( dev-db/mysql-connector-c:= )
- pam? ( sys-libs/pam )
- postgres? ( dev-db/postgresql:= )
- sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- if ! has_version 'dev-tcltk/expect' ; then
- ewarn 'The dev-tcltk/expect package is not installed.'
- ewarn 'Without it, you will not be able to change system login passwords.'
- ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
- ewarn 'and others) will work just fine.'
- fi
-}
-
-src_configure() {
- filter-flags -fomit-frame-pointer
- local myconf
- if use berkdb ; then
- if use gdbm ; then
- ewarn "Both gdbm and berkdb selected. Using gdbm."
- else
- myconf="--with-db=db"
- fi
- fi
- use gdbm && myconf="--with-db=gdbm"
- use debug && myconf+=" debug=true"
- use sqlite && myconf+=" --with-sqlite-libs"
-
- econf \
- --sysconfdir=/etc/courier \
- --datadir=/usr/share/courier \
- --localstatedir=/var/lib/courier \
- --sharedstatedir=/var/lib/courier/com \
- --with-authdaemonvar=/var/lib/courier/authdaemon \
- --with-authshadow \
- --without-redhat \
- --with-mailuser=mail \
- --with-mailgroup=mail \
- --cache-file="${S}/configuring.cache" \
- $(use_with pam authpam) \
- $(use_with ldap authldap) \
- $(use_with mysql authmysql) \
- $(use_with postgres authpgsql) \
- $(use_with sqlite authsqlite) \
- ${myconf}
-}
-
-orderfirst() {
- file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
- if [[ -e "${file}" ]] ; then
- orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
- new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/ / /g\"`\""
- sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
- fi
-}
-
-finduserdb() {
- for dir in \
- /etc/courier/authlib /etc/courier /etc/courier-imap \
- /usr/lib/courier/etc /usr/lib/courier-imap/etc \
- /usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
- /usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
- /usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
- if [[ -e "${dir}/userdb" ]] ; then
- einfo "Found userdb at: ${dir}/userdb"
- cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
- chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
- continue
- fi
- done
-}
-
-src_install() {
- diropts -o mail -g mail
- dodir /etc/courier
- keepdir /var/lib/courier/authdaemon
- keepdir /etc/courier/authlib
- emake DESTDIR="${D}" install
- [[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
- emake DESTDIR="${D}" install-configure
- rm -f "${D}"/etc/courier/authlib/*.bak
- chown mail:mail "${D}"/etc/courier/authlib/* || die
- for y in "${D}"/etc/courier/authlib/*.dist ; do
- [[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
- done
- use pam && orderfirst authdaemonrc authmodulelist authpam
- use ldap && orderfirst authdaemonrc authmodulelist authldap
- use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
- use postgres && orderfirst authdaemonrc authmodulelist authpgsql
- use mysql && orderfirst authdaemonrc authmodulelist authmysql
-
- DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
- HTML_DOCS=( README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
- if use mysql ; then
- DOCS+=( README.authmysql.myownquery )
- HTML_DOCS+=( README.authmysql.html )
- fi
- if use postgres ; then
- HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
- fi
- if use ldap ; then
- DOCS+=( README.ldap )
- dodir /etc/openldap/schema
- cp -f authldap.schema "${D}/etc/openldap/schema/" || die
- fi
- if use sqlite ; then
- HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
- fi
- einstalldocs
-
- newinitd "${FILESDIR}/${PN}-r2" "${PN}"
-
- use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
- if [[ -e /etc/courier/authlib/userdb ]] ; then
- einfo "Running makeuserdb ..."
- chmod go-rwx /etc/courier/authlib/userdb || die
- makeuserdb
- fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.69.0-r4.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.0-r4.ebuild
index 14023d2a01b..65762bfae11 100644
--- a/net-libs/courier-authlib/courier-authlib-0.69.0-r4.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.courier-mta.org/authlib/"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86"
IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
RESTRICT="!berkdb? ( test )"
@@ -22,7 +22,7 @@ DEPEND="net-mail/mailbase
gdbm? ( sys-libs/gdbm:= )
!gdbm? ( sys-libs/db:= )
dev-libs/openssl:0=
- ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap? ( >=net-nds/openldap-1.2.11:= )
mysql? ( dev-db/mysql-connector-c:= )
pam? ( sys-libs/pam )
postgres? ( dev-db/postgresql:= )
@@ -60,7 +60,6 @@ src_configure() {
--sharedstatedir=/var/lib/courier/com \
--with-authdaemonvar=/var/lib/courier/authdaemon \
--with-authshadow \
- --without-redhat \
--with-mailuser=mail \
--with-mailgroup=mail \
--cache-file="${S}/configuring.cache" \
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.1-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.1-r3.ebuild
deleted file mode 100644
index a72659a6479..00000000000
--- a/net-libs/courier-authlib/courier-authlib-0.71.1-r3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="https://www.courier-mta.org/authlib/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
-
-RESTRICT="!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
- >=net-libs/courier-unicode-2.1.2:=
- virtual/libcrypt:=
- gdbm? ( sys-libs/gdbm:= )
- !gdbm? ( sys-libs/db:= )
- dev-libs/openssl:0=
- ldap? ( >=net-nds/openldap-1.2.11 )
- mysql? ( dev-db/mysql-connector-c:= )
- pam? ( sys-libs/pam )
- postgres? ( dev-db/postgresql:= )
- sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- if ! has_version 'dev-tcltk/expect' ; then
- ewarn 'The dev-tcltk/expect package is not installed.'
- ewarn 'Without it, you will not be able to change system login passwords.'
- ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
- ewarn 'and others) will work just fine.'
- fi
-}
-
-src_configure() {
- filter-flags -fomit-frame-pointer
- local myconf
- if use berkdb ; then
- if use gdbm ; then
- ewarn "Both gdbm and berkdb selected. Using gdbm."
- else
- myconf="--with-db=db"
- fi
- fi
- use gdbm && myconf="--with-db=gdbm"
- use debug && myconf+=" debug=true"
- use sqlite && myconf+=" --with-sqlite-libs"
-
- econf \
- --sysconfdir=/etc/courier \
- --datadir=/usr/share/courier \
- --localstatedir=/var/lib/courier \
- --sharedstatedir=/var/lib/courier/com \
- --with-authdaemonvar=/var/lib/courier/authdaemon \
- --with-authshadow \
- --without-redhat \
- --with-mailuser=mail \
- --with-mailgroup=mail \
- --cache-file="${S}/configuring.cache" \
- $(use_with pam authpam) \
- $(use_with ldap authldap) \
- $(use_with mysql authmysql) \
- $(use_with postgres authpgsql) \
- $(use_with sqlite authsqlite) \
- ${myconf}
-}
-
-orderfirst() {
- file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
- if [[ -e "${file}" ]] ; then
- orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
- new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/ / /g\"`\""
- sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
- fi
-}
-
-finduserdb() {
- for dir in \
- /etc/courier/authlib /etc/courier /etc/courier-imap \
- /usr/lib/courier/etc /usr/lib/courier-imap/etc \
- /usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
- /usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
- /usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
- if [[ -e "${dir}/userdb" ]] ; then
- einfo "Found userdb at: ${dir}/userdb"
- cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
- chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
- continue
- fi
- done
-}
-
-src_install() {
- diropts -o mail -g mail
- dodir /etc/courier
- keepdir /var/lib/courier/authdaemon
- keepdir /etc/courier/authlib
- emake DESTDIR="${D}" install
- [[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
- emake DESTDIR="${D}" install-configure
- rm -f "${D}"/etc/courier/authlib/*.bak
- chown mail:mail "${D}"/etc/courier/authlib/* || die
- for y in "${D}"/etc/courier/authlib/*.dist ; do
- [[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
- done
- use pam && orderfirst authdaemonrc authmodulelist authpam
- use ldap && orderfirst authdaemonrc authmodulelist authldap
- use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
- use postgres && orderfirst authdaemonrc authmodulelist authpgsql
- use mysql && orderfirst authdaemonrc authmodulelist authmysql
-
- DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
- HTML_DOCS=( README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
- if use mysql ; then
- DOCS+=( README.authmysql.myownquery )
- HTML_DOCS+=( README.authmysql.html )
- fi
- if use postgres ; then
- HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
- fi
- if use ldap ; then
- DOCS+=( README.ldap )
- dodir /etc/openldap/schema
- cp -f authldap.schema "${D}/etc/openldap/schema/" || die
- fi
- if use sqlite ; then
- HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
- fi
- einstalldocs
-
- newinitd "${FILESDIR}/${PN}-r2" "${PN}"
-
- use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
- if [[ -e /etc/courier/authlib/userdb ]] ; then
- einfo "Running makeuserdb ..."
- chmod go-rwx /etc/courier/authlib/userdb || die
- makeuserdb
- fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.2-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.2-r3.ebuild
deleted file mode 100644
index 50ad7474ac4..00000000000
--- a/net-libs/courier-authlib/courier-authlib-0.71.2-r3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="https://www.courier-mta.org/authlib/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
-
-RESTRICT="!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
- >=net-libs/courier-unicode-2.2.3:=
- virtual/libcrypt:=
- gdbm? ( sys-libs/gdbm:= )
- !gdbm? ( sys-libs/db:= )
- dev-libs/openssl:0=
- ldap? ( >=net-nds/openldap-1.2.11 )
- mysql? ( dev-db/mysql-connector-c:= )
- pam? ( sys-libs/pam )
- postgres? ( dev-db/postgresql:= )
- sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- if ! has_version 'dev-tcltk/expect' ; then
- ewarn 'The dev-tcltk/expect package is not installed.'
- ewarn 'Without it, you will not be able to change system login passwords.'
- ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
- ewarn 'and others) will work just fine.'
- fi
-}
-
-src_configure() {
- filter-flags -fomit-frame-pointer
- local myconf
- if use berkdb ; then
- if use gdbm ; then
- ewarn "Both gdbm and berkdb selected. Using gdbm."
- else
- myconf="--with-db=db"
- fi
- fi
- use gdbm && myconf="--with-db=gdbm"
- use debug && myconf+=" debug=true"
- use sqlite && myconf+=" --with-sqlite-libs"
-
- econf \
- --sysconfdir=/etc/courier \
- --datadir=/usr/share/courier \
- --localstatedir=/var/lib/courier \
- --sharedstatedir=/var/lib/courier/com \
- --with-authdaemonvar=/var/lib/courier/authdaemon \
- --with-authshadow \
- --without-redhat \
- --with-mailuser=mail \
- --with-mailgroup=mail \
- --cache-file="${S}/configuring.cache" \
- $(use_with pam authpam) \
- $(use_with ldap authldap) \
- $(use_with mysql authmysql) \
- $(use_with postgres authpgsql) \
- $(use_with sqlite authsqlite) \
- ${myconf}
-}
-
-orderfirst() {
- file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
- if [[ -e "${file}" ]] ; then
- orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
- new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/ / /g\"`\""
- sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
- fi
-}
-
-finduserdb() {
- for dir in \
- /etc/courier/authlib /etc/courier /etc/courier-imap \
- /usr/lib/courier/etc /usr/lib/courier-imap/etc \
- /usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
- /usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
- /usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
- if [[ -e "${dir}/userdb" ]] ; then
- einfo "Found userdb at: ${dir}/userdb"
- cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
- chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
- continue
- fi
- done
-}
-
-src_install() {
- diropts -o mail -g mail
- dodir /etc/courier
- keepdir /var/lib/courier/authdaemon
- keepdir /etc/courier/authlib
- emake DESTDIR="${D}" install
- [[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
- emake DESTDIR="${D}" install-configure
- rm -f "${D}"/etc/courier/authlib/*.bak
- chown mail:mail "${D}"/etc/courier/authlib/* || die
- for y in "${D}"/etc/courier/authlib/*.dist ; do
- [[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
- done
- use pam && orderfirst authdaemonrc authmodulelist authpam
- use ldap && orderfirst authdaemonrc authmodulelist authldap
- use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
- use postgres && orderfirst authdaemonrc authmodulelist authpgsql
- use mysql && orderfirst authdaemonrc authmodulelist authmysql
-
- DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
- HTML_DOCS=( README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
- if use mysql ; then
- DOCS+=( README.authmysql.myownquery )
- HTML_DOCS+=( README.authmysql.html )
- fi
- if use postgres ; then
- HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
- fi
- if use ldap ; then
- DOCS+=( README.ldap )
- dodir /etc/openldap/schema
- cp -f authldap.schema "${D}/etc/openldap/schema/" || die
- fi
- if use sqlite ; then
- HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
- fi
- einstalldocs
-
- newinitd "${FILESDIR}/${PN}-r2" "${PN}"
-
- use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
- if [[ -e /etc/courier/authlib/userdb ]] ; then
- einfo "Running makeuserdb ..."
- chmod go-rwx /etc/courier/authlib/userdb || die
- makeuserdb
- fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.3-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.3-r2.ebuild
index c96a75a26e0..45725d6e9a4 100644
--- a/net-libs/courier-authlib/courier-authlib-0.71.3-r1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.courier-mta.org/authlib/"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
RESTRICT="!berkdb? ( test )"
@@ -22,7 +22,7 @@ DEPEND="net-mail/mailbase
gdbm? ( sys-libs/gdbm:= )
!gdbm? ( sys-libs/db:= )
dev-libs/openssl:0=
- ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap? ( >=net-nds/openldap-1.2.11:= )
mysql? ( dev-db/mysql-connector-c:= )
pam? ( sys-libs/pam )
postgres? ( dev-db/postgresql:= )
@@ -60,7 +60,6 @@ src_configure() {
--sharedstatedir=/var/lib/courier/com \
--with-authdaemonvar=/var/lib/courier/authdaemon \
--with-authshadow \
- --without-redhat \
--with-mailuser=mail \
--with-mailgroup=mail \
--cache-file="${S}/configuring.cache" \
diff --git a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
index a80fccb27ac..d4f8eaceef4 100644
--- a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.courier-mta.org/"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86"
IUSE=""
src_configure() {
diff --git a/net-libs/courier-unicode/courier-unicode-2.1.ebuild b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
index 483c9d41a56..272513d9f5b 100644
--- a/net-libs/courier-unicode/courier-unicode-2.1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.courier-mta.org/"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86"
IUSE=""
src_install() {
diff --git a/net-libs/courier-unicode/courier-unicode-2.2.3-r1.ebuild b/net-libs/courier-unicode/courier-unicode-2.2.3-r1.ebuild
index dbb52817c9b..a47c80c883c 100644
--- a/net-libs/courier-unicode/courier-unicode-2.2.3-r1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0/7"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
src_configure() {
econf --disable-static
diff --git a/net-libs/cppzmq/cppzmq-4.6.0.ebuild b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
index 8ac687bd6ab..48351df3d3b 100644
--- a/net-libs/cppzmq/cppzmq-4.6.0.ebuild
+++ b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/net-libs/cvm/cvm-0.97-r1.ebuild b/net-libs/cvm/cvm-0.97-r1.ebuild
index 4f0ebc583ce..09087fabb5d 100644
--- a/net-libs/cvm/cvm-0.97-r1.ebuild
+++ b/net-libs/cvm/cvm-0.97-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/cvm/archive/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
IUSE="mysql postgres test vpopmail"
RESTRICT="!test? ( test )"
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
index 8e879cecd35..d50579096f3 100644
--- a/net-libs/czmq/Manifest
+++ b/net-libs/czmq/Manifest
@@ -1,2 +1 @@
-DIST czmq-4.2.0.tar.gz 1522824 BLAKE2B 2b2ec308f37a122d5478f63ed029c5ac01d8da40e676e812ec321e039839c7d364fef3eef67df928e6514f0fd2cd65ae35ba89347ead2b44c610812a012364dd SHA512 a3716efbece193196355fb7055b7e81067d29551765de2533178804ca5d85f98cd8cd01f88b4eecbea905adf3b7513e3b8a7e78e350adf1a6e69edbea5f6260c
DIST czmq-4.2.1.tar.gz 1617066 BLAKE2B 5b635ccd7e85f05cd4f81f1ddaef80f7478feccfb916b1a7317f539354d0a4dabb7bf14a9dbee4dae3f6fbfcaf402c51ee9ba9810d952fc837c03c14304d4dab SHA512 776c524ffeba3dbe2534351f91623a6f9db31268aa2e794e29b7eca99c9fd0a726de0f7fba4376a5b3d7321b1033314e86644efaa5a9c7226fc1f06805f7aa9f
diff --git a/net-libs/czmq/czmq-4.2.0.ebuild b/net-libs/czmq/czmq-4.2.0.ebuild
deleted file mode 100644
index 678a10dbc55..00000000000
--- a/net-libs/czmq/czmq-4.2.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="High-level C Binding for ZeroMQ"
-HOMEPAGE="http://czmq.zeromq.org"
-SRC_URI="https://github.com/zeromq/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0/4"
-KEYWORDS="amd64 arm arm64 ~hppa x86"
-IUSE="curl drafts http-client http-server lz4 static-libs systemd +uuid"
-
-BDEPEND="app-text/asciidoc
- app-text/xmlto
- virtual/pkgconfig"
-
-RDEPEND=">=net-libs/zeromq-4:=[drafts?]
- http-client? ( net-misc/curl )
- http-server? ( net-libs/libmicrohttpd:= )
- lz4? ( app-arch/lz4:= )
- systemd? ( sys-apps/systemd )
- uuid? ( sys-apps/util-linux:0= )"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README.md )
-
-src_configure() {
- local myeconfargs=(
- --enable-drafts=$(usex drafts)
- --with-docs=no
- --with-uuid=$(usex uuid)
- --with-libcurl=$(usex http-client)
- --with-libmicrohttpd=$(usex http-server)
- --with-libsystemd=$(usex systemd)
- --with-liblz4=$(usex lz4)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if ! use static-libs ; then
- find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
- fi
-}
diff --git a/net-libs/czmq/czmq-4.2.1.ebuild b/net-libs/czmq/czmq-4.2.1.ebuild
index 4811dcd20d2..64690fe52ff 100644
--- a/net-libs/czmq/czmq-4.2.1.ebuild
+++ b/net-libs/czmq/czmq-4.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/zeromq/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa x86"
IUSE="curl drafts http-client http-server lz4 nss static-libs systemd +uuid"
BDEPEND="app-text/asciidoc
diff --git a/net-libs/davix/davix-0.7.6.ebuild b/net-libs/davix/davix-0.7.6.ebuild
index 927b71e5b41..015f1c2d845 100644
--- a/net-libs/davix/davix-0.7.6.ebuild
+++ b/net-libs/davix/davix-0.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PN
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="doc ipv6 kernel_linux test tools"
+IUSE="doc ipv6 test tools"
RESTRICT="!test? ( test )"
CDEPEND="
diff --git a/net-libs/dleyna-connector-dbus/Manifest b/net-libs/dleyna-connector-dbus/Manifest
index 262621e0f63..b309ff4b9ad 100644
--- a/net-libs/dleyna-connector-dbus/Manifest
+++ b/net-libs/dleyna-connector-dbus/Manifest
@@ -1,2 +1 @@
-DIST dleyna-connector-dbus-0.4.0.tar.gz 15046 BLAKE2B 644d9f0703d4675e5173306deffb6b7f300e36b1472d3d31f78d3dac98fa682819b3002e902260e5fe307d1a3060142fb764d3e5e2297362b1a0f0fb154492d5 SHA512 03ad706291549db56c0ad3121a6ecc5f1ecacf0bfa34956a397f8b0682b57fd6f847b0dc73ac5e30684f0ffde38b7b717dcccb00a0498f89b3ccc31e196e279e
DIST dleyna-connector-dbus-0.4.1.tar.gz 15081 BLAKE2B aaff6588da05920b108da5c89c457bc1eeb9d7330ae1c06bc3f95f4d4467c93a6524602cedc455f3db324f0a1fca121d52fdbae135eb57d4fe6face9f86ac680 SHA512 43d9f13304c19bd2fc975283ebc68359d5a7bf174221a8877e31994e393b9c1421440acbbd1b2e9945953c1248e596168aac74b50922080ee6db1b02dac03315
diff --git a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.0.ebuild b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.0.ebuild
deleted file mode 100644
index 4b30995f9e4..00000000000
--- a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="utility library for higher level dLeyna libraries"
-HOMEPAGE="https://github.com/phako/dleyna-connector-dbus"
-SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-DEPEND="
- >=dev-libs/glib-2.28:2
- >=net-libs/dleyna-core-0.7.0:1.0=
-"
-RDEPEND="${DEPEND}
- >=sys-apps/dbus-1
-"
-BDEPEND="virtual/pkgconfig"
diff --git a/net-libs/dleyna-renderer/Manifest b/net-libs/dleyna-renderer/Manifest
index db56df89f04..b4f2c6f40e1 100644
--- a/net-libs/dleyna-renderer/Manifest
+++ b/net-libs/dleyna-renderer/Manifest
@@ -1 +1 @@
-DIST dleyna-renderer-0.7.0.tar.gz 65982 BLAKE2B dc9acf5d3c39cfc8d7b84890b3fda2f4f4856276c1fb900f114a8f07f0459906d99ebe5f941d8953f5b3c635b6eaa5319300510037891aaf2079f88fd92618ec SHA512 6b1b222971780841c5080b769888a42beadaf7cd576f0d07741585e208876179d3cdde123cbd5a2e4129d2b9e0ba18a7edf7626dd8a0cb1d4a45b91340c3e9fe
+DIST dleyna-renderer-0.7.2.tar.gz 66365 BLAKE2B 6e033f4d93f14e855aeeabfa1d31fdf4db499b1a2773c55c2631cef1c5bad850e162926554203585e490ac24d9e23eb33028052b26dc4585540eff1ee93d334c SHA512 a36ee90c30c8dece0e7c65855d6b01f92840bd26380e3553a4b0df910b3f593eb9b4cb932ad084b30c36396e819cd6841c080fe49d7032052d3ce40498e978cb
diff --git a/net-libs/dleyna-renderer/dleyna-renderer-0.7.0.ebuild b/net-libs/dleyna-renderer/dleyna-renderer-0.7.2.ebuild
index 67bf52cbf42..804a16ccd15 100644
--- a/net-libs/dleyna-renderer/dleyna-renderer-0.7.0.ebuild
+++ b/net-libs/dleyna-renderer/dleyna-renderer-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,9 +17,9 @@ DEPEND="
>=dev-libs/glib-2.28:2
>=net-libs/gssdp-1.2.0:0=
>=net-libs/gupnp-1.2.0:0=
- >=net-libs/gupnp-av-0.11.5
+ >=net-libs/gupnp-av-0.12.9
>=media-libs/gupnp-dlna-0.9.4:2.0
- >=net-libs/libsoup-2.28.2:2.4
+ >=net-libs/libsoup-2.42.0:2.4
>=net-libs/dleyna-core-0.7.0:1.0=
"
RDEPEND="${DEPEND}
diff --git a/net-libs/enet/Manifest b/net-libs/enet/Manifest
index daa988d6f3f..a873dd5c2d1 100644
--- a/net-libs/enet/Manifest
+++ b/net-libs/enet/Manifest
@@ -1,3 +1,2 @@
DIST enet-1.2.2.tar.gz 413454 BLAKE2B 3d13ae43a3ce361cf19d7b79c8ec92f76b7c1066659bf4e531a3144b03aac4e7b3738c102eff12bc0748a4a798e7be77473a6b386d29bb416998057f71ffe9d9 SHA512 2c28ab4b650dd4165ee5913c1bc80dc47e43f2363a5fdd7f3aa9be8fb3afbc8aff7a6bce731f7dac45eb930fc6338cd811c07e8dedca5554a7dd32293685062d
-DIST enet-1.3.13.tar.gz 669090 BLAKE2B 3041e9b2fe431dda2eae3464417d79b80664ff2c303222607991db28328e8eca2357fbf66248f40344bf93a26e0d1ffdad4698f9fe58939224b830700acee501 SHA512 82501c0248330a3a6bcac907907760e59b18cb662ebb42fe2c91e1557f1bc8ab452bf3fe7477dc01fa7a6e3b6124e1eb8eac46382d5bbebb2394879f9568b5df
DIST enet-1.3.17.tar.gz 703278 BLAKE2B d31838a173f629a2216f59173c259cf7cb35985913c5f8f016641ceb189dc20308effa206f03391cafde842ad6e43ec1776d38ce02283bd5990ccf38eadf4d6b SHA512 efa0cb093a6ca295e5012a4fdebc5ffd6516a66a967e97b386b72781b18ce4a118c9bf94e87adbbdcd0ed441e22c62a05c24ff39fd6b475919e8efe9ab4715e4
diff --git a/net-libs/enet/enet-1.3.13.ebuild b/net-libs/enet/enet-1.3.13.ebuild
deleted file mode 100644
index 0e307002387..00000000000
--- a/net-libs/enet/enet-1.3.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Relatively thin, simple and robust network communication layer on top of UDP"
-HOMEPAGE="http://enet.bespin.org/"
-SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.3/7"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
-IUSE="static-libs"
-
-RDEPEND="!${CATEGORY}/${PN}:0"
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 7334d2f06e4..8bc8c1b2bd3 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,3 +1,2 @@
-DIST glib-networking-2.68.1.tar.xz 237876 BLAKE2B 11d982a3d65ae5793a3b6c30cf31737ede5879aa3747416253bacc34d62a1ada944a718223300d63a5b37615492929e63c1c0cad6ef34775ee95e49f6769dc04 SHA512 da38b64e6709c864e1c6a60989d86439e0afb1dbf7b7f60a67f58cf430ae354ef9fe7465e74790b0c2827d2f1c39a250db4372d98fab6ab8d73946a7f51e3b22
-DIST glib-networking-2.68.2.tar.xz 239040 BLAKE2B 2b65a63205d3071d05898ca869ae117c9b9fd548b19d9a1c82869a1eb54b77113f8908cd32108f4ca851cc0975ed34c16df04906b5b3c1f9a9a03574187ba929 SHA512 5c2d485332ff1b5a4d0f257b4e7a371b0bfe899b98ee4157845e5f5d3f10cf6f2df891407396edb6955420064dbaa57a5dc3c62c6392881cff05332db925d32d
-DIST glib-networking-2.70.0.tar.xz 259808 BLAKE2B ebd423e9f93fc362cb6cece503de8f579c5c6de460e50f073107017ec0dc35cdd2f38fb780651dc7b68dd833500052c83bfba08e6c4b69c9aca1955f9aa7c7c2 SHA512 c9f8126e3466470ad8e1d588d56b843a4fa4738619a795e6772d95282c54a8356a916a3b0a0b6994606d8a6841ecb0637230f14575ed95ea68bff8f3f81aea71
+DIST glib-networking-2.70.1.tar.xz 261312 BLAKE2B bd0fb33e1ad359b36f78c8003ceb15290a9403d978400573ec7caabc44851f83f080d651085b85f7a5836a39c12c499222d8f9ad5bde51e5b24f6344332be1f7 SHA512 a06b4df4481f95193f9ed4be6d39bbe9ecaf4de8e11a48750f7110d4cfa71aa56b7ec5b36af70b7128150447f1a39ce3aeadf71e2ac516f61708f1212f8f855d
+DIST glib-networking-2.72.0.tar.xz 265060 BLAKE2B 2ffb25b059db40fcf9b65b104cd50d81dda9482bc75031d62c10f70eaaa2e9fcfcdfb2b718253255a2565d7b6bc9ead2214167d1b5f482c0ddd3af8573dd2ef5 SHA512 2b42aebcf496f51604005f6f3243ed7e613ab3d485742b7d8af10e103b07eefd8931cc86c1cb021889fe1415ad98bf4d877a3f33203cb53688cc2c41373a8ce4
diff --git a/net-libs/glib-networking/files/glib-networking-2.70.0-time_t-32-bit.patch b/net-libs/glib-networking/files/glib-networking-2.70.0-time_t-32-bit.patch
deleted file mode 100644
index fc9ccea1395..00000000000
--- a/net-libs/glib-networking/files/glib-networking-2.70.0-time_t-32-bit.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Workaround/fix test failure on 32-bit arches. Should be in release
-after 2.70.0.
-
-https://gitlab.gnome.org/GNOME/glib-networking/-/commit/4f8ca86a0e460794188c3355f0c7cc11fdbe4229.patch
-
-From: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Tue, 21 Sep 2021 17:07:44 +0000
-Subject: [PATCH] tests: Accept GNUTLS' workaround for limited size of time_t
-
---- a/tls/tests/certificate.c
-+++ b/tls/tests/certificate.c
-@@ -672,6 +672,12 @@ test_certificate_not_valid_before (void)
- g_object_unref (cert);
- }
-
-+/* On 32-bit, GNUTLS caps expiry times at 2037-12-31 23:23:23 to avoid
-+ * overflowing time_t. Hopefully by 2037, either 32-bit will finally have
-+ * died out, or GNUTLS will rethink its approach to
-+ * https://gitlab.com/gnutls/gnutls/-/issues/370 */
-+#define GNUTLS_32_BIT_NOT_VALID_AFTER_MAX 2145914603
-+
- static void
- test_certificate_not_valid_after (void)
- {
-@@ -686,7 +692,16 @@ test_certificate_not_valid_after (void)
- actual = g_tls_certificate_get_not_valid_after (cert);
- g_assert_nonnull (actual);
- actual_str = g_date_time_format_iso8601 (actual);
-+
-+#if SIZEOF_TIME_T <= 4
-+ if (g_date_time_to_unix (actual) == GNUTLS_32_BIT_NOT_VALID_AFTER_MAX)
-+ g_test_incomplete ("not-valid-after date not representable on 32-bit");
-+ else
-+ g_assert_cmpstr (actual_str, ==, EXPECTED_NOT_VALID_AFTER);
-+#else
- g_assert_cmpstr (actual_str, ==, EXPECTED_NOT_VALID_AFTER);
-+#endif
-+
- g_free (actual_str);
- g_date_time_unref (actual);
- g_object_unref (cert);
---- a/tls/tests/meson.build
-+++ b/tls/tests/meson.build
-@@ -69,6 +69,7 @@ foreach backend: backends
- test_cflags = cflags + [
- '-DBACKEND="@0@"'.format(backend),
- '-DBACKEND_IS_' + backend.to_upper(),
-+ '-DSIZEOF_TIME_T=@0@'.format(cc.sizeof('time_t', prefix: '#include <time.h>')),
- ]
-
- if backend == 'openssl'
-GitLab
diff --git a/net-libs/glib-networking/glib-networking-2.68.1.ebuild b/net-libs/glib-networking/glib-networking-2.68.1.ebuild
deleted file mode 100644
index 566f954f9f9..00000000000
--- a/net-libs/glib-networking/glib-networking-2.68.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson-multilib xdg
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/glib-networking"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+gnome +libproxy +ssl test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
- >=dev-libs/glib-2.67.0:2[${MULTILIB_USEDEP}]
- libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
- >=net-libs/gnutls-3.6.5:=[${MULTILIB_USEDEP}]
- ssl? ( app-misc/ca-certificates )
- gnome? ( gnome-base/gsettings-desktop-schemas )
-"
-DEPEND="${RDEPEND}
- test? ( net-libs/gnutls[pkcs11] )
-"
-BDEPEND="
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- test? ( sys-apps/dbus )
-"
-
-src_prepare() {
- xdg_src_prepare
-
- if ! use test ; then
- # Don't build tests unconditionally
- # This is a hack to avoid needing gnutls[pkcs11] when USE=-test
- # It may become a real runtime dependency in future
- # Please check!
- # bug #777462
- sed -i "/^subdir('tls\/tests')/d" meson.build || die
- fi
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Dgnutls=enabled
- -Dopenssl=disabled
- $(meson_feature libproxy)
- $(meson_feature gnome gnome_proxy)
- -Dinstalled_tests=false
- -Dstatic_modules=false
- )
- meson_src_configure
-}
-
-multilib_src_test() {
- dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- multilib_pkg_postinst() {
- gnome2_giomodule_cache_update \
- || die "Update GIO modules cache failed (for ${ABI})"
- }
- multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-
- multilib_pkg_postrm() {
- gnome2_giomodule_cache_update \
- || die "Update GIO modules cache failed (for ${ABI})"
- }
- multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/net-libs/glib-networking/glib-networking-2.68.2.ebuild b/net-libs/glib-networking/glib-networking-2.70.1.ebuild
index 8c43ea3df5f..6c14700027e 100644
--- a/net-libs/glib-networking/glib-networking-2.68.2.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.70.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ RESTRICT="!test? ( test )"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
- >=dev-libs/glib-2.67.0:2[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.69.0:2[${MULTILIB_USEDEP}]
libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
>=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}]
ssl? ( app-misc/ca-certificates )
diff --git a/net-libs/glib-networking/glib-networking-2.70.0.ebuild b/net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild
index 8bdcf6b9b5c..845eea9072f 100644
--- a/net-libs/glib-networking/glib-networking-2.70.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit gnome.org gnome2-utils meson-multilib xdg
@@ -30,12 +30,9 @@ BDEPEND="
test? ( sys-apps/dbus )
"
-PATCHES=(
- "${FILESDIR}"/${P}-time_t-32-bit.patch
-)
-
src_prepare() {
- xdg_src_prepare
+ default
+ xdg_environment_reset
if ! use test ; then
# Don't build tests unconditionally
@@ -43,7 +40,7 @@ src_prepare() {
# It may become a real runtime dependency in future
# Please check!
# bug #777462
- sed -i "/^subdir('tls\/tests')/d" meson.build || die
+ sed -i "/^subdir('tests')/d" tls/meson.build || die
fi
}
diff --git a/net-libs/gnet/files/gnet-2.0.8-autotools.patch b/net-libs/gnet/files/gnet-2.0.8-autotools.patch
new file mode 100644
index 00000000000..760e41398fa
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-autotools.patch
@@ -0,0 +1,37 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,6 +7,7 @@
+
+ # Init autoconf and automake
+ AC_INIT([gnet], [2.0.8], [gnet@gnetlibrary.org])
++AC_CONFIG_MACRO_DIR([macros])
+ AC_CANONICAL_SYSTEM
+ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+ AM_MAINTAINER_MODE
+@@ -127,7 +128,6 @@
+ ###############################
+ # Check for programs
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_LIBTOOL_WIN32_DLL
+@@ -551,9 +551,6 @@
+ if test "x$GCC" = "xyes"; then
+ CFLAGS="$CFLAGS -Wall -Wstrict-prototypes \
+ -Wmissing-prototypes -Wmissing-declarations"
+- if test "x$enable_debug" = "xyes"; then
+- CFLAGS="$CFLAGS -Werror"
+- fi
+
+ if test "x$enable_ansi" = "xyes"; then
+ CFLAGS="$CFLAGS -ansi"
+@@ -610,7 +607,7 @@
+ # Outputs
+ ###############################
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
diff --git a/net-libs/gnet/gnet-2.0.8-r3.ebuild b/net-libs/gnet/gnet-2.0.8-r4.ebuild
index 27d0d63139f..9beafdec55d 100644
--- a/net-libs/gnet/gnet-2.0.8-r3.ebuild
+++ b/net-libs/gnet/gnet-2.0.8-r4.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-GCONF_DEBUG="yes"
+EAPI=8
+
+GNOME2_EAUTORECONF="yes"
GNOME_TARBALL_SUFFIX="bz2"
-inherit autotools epatch gnome2
+inherit gnome2
DESCRIPTION="A simple network library"
HOMEPAGE="https://wiki.gnome.org/Projects/GNetLibrary"
@@ -18,51 +19,42 @@ RESTRICT="!test? ( test )"
# FIXME: automagic use of valgrind
RDEPEND=">=dev-libs/glib-2.6:2"
-DEPEND="${RDEPEND}
- >=dev-libs/check-0.9.11
- >=dev-util/gtk-doc-am-1.2
- virtual/pkgconfig
-"
# FIXME: check should only be needed with USE 'test', bug #349301
# test? ( >=dev-libs/check-0.9.7 )"
+DEPEND="${RDEPEND}
+ >=dev-libs/check-0.9.11"
+BDEPEND="
+ >=dev-util/gtk-doc-am-1.2
+ virtual/pkgconfig"
-src_prepare() {
+PATCHES=(
# Do not leak main context reference, from master
- epatch "${FILESDIR}"/${PN}-2.0.8-context-leak.patch
+ "${FILESDIR}"/${PN}-2.0.8-context-leak.patch
# Fix usage of check framework, bug #296849, from master
# Disable this patch, bug 698654
- # epatch "${FILESDIR}"/${PN}-2.0.8-check-usage-update.patch
+ # "${FILESDIR}"/${PN}-2.0.8-check-usage-update.patch
# ifdef around network tests code, refs. bug #320759
- epatch "${FILESDIR}"/${PN}-2.0.8-network-tests.patch
+ "${FILESDIR}"/${PN}-2.0.8-network-tests.patch
# Do not hardcode glib patch in pkgconfig file, debian bug #652165
- epatch "${FILESDIR}"/${PN}-2.0.8-fix-pkgconfig-abuse.patch
+ "${FILESDIR}"/${PN}-2.0.8-fix-pkgconfig-abuse.patch
# Compatibility with recent check releases, bug #498046
- epatch "${FILESDIR}"/${PN}-2.0.8-unittest-build.patch
+ "${FILESDIR}"/${PN}-2.0.8-unittest-build.patch
# gnetlibrary.org has been adandoned, from master
- epatch "${FILESDIR}"/${PN}-2.0.8-test-existing-domain.patch
+ "${FILESDIR}"/${PN}-2.0.8-test-existing-domain.patch
# Do not depend on a running HTTP server on port 80 for unittest
- epatch "${FILESDIR}"/${PN}-2.0.8-unittest-service.patch
-
- # Do not pass silly cflags with USE=debug, bug #320759
- sed -i \
- -e 's:-Werror::' \
- -e '/AM_PROG_CC_STDC/d' \
- -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
- configure.ac || die
+ "${FILESDIR}"/${PN}-2.0.8-unittest-service.patch
- # bug #672170
- AT_M4DIR="macros" eautoreconf
- gnome2_src_prepare
-}
+ # Do not pass silly cflags with USE=debug, bug #320759, #672170
+ "${FILESDIR}"/${PN}-2.0.8-autotools.patch
+)
src_configure() {
- DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README* TODO"
# Do not enable network tests in an ebuild environment
gnome2_src_configure \
--disable-static \
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 33509ec3204..f2053884734 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-online-accounts-3.40.0.tar.xz 860724 BLAKE2B 47f22af85b701854396c462df04b9ba2e004ee4a954619916240fef0f8139e3a37608bb9c16e4cfabbb6fc863e7448678a48865620c0293d231f9b125fe9c904 SHA512 ac90226023e2a69ad9cd12faf637844a029814282f164cc905810bf54af6693069b9019ca58211deb8487f6a32886eb072a1223fca32bc4e3fe0bc91ce8f2d6c
DIST gnome-online-accounts-3.40.1.tar.xz 861220 BLAKE2B 668af9cca8524e25b4f65f41983c527e0cac167317c28f6c451c9c9a6cea18a5774c42acd1cf80cfc707ed62524d1381039fd4f16e3e506d4789372a3db85f4f SHA512 ee7835efe6e1afd6a13f823e17eb93e4a3c55e90764f93a766270ef64f07ed18eff2fce325d8248783d7c6f1c0a7a7fe7512ebb7a8bc0a3e3b33b9037a75b088
+DIST gnome-online-accounts-3.44.0.tar.xz 859564 BLAKE2B 6131094df19d5f282491bd19a97f6e0248b10a5c4db19962a6804523101fb86d6bed7523b46cef91328e0f3c7b6496068594de0689ab1fcb63fd8fb80eece49c SHA512 e70a83b557b816dc7eb22bcd1e4a263044a16c981dfa945a529250ea76e743c9cc73f2ecd4f3006d28a4f3161c7a15dba8bd1416b413c28f4d86d0192755e809
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild
index f012afee23f..1bb0801290c 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
LICENSE="LGPL-2+"
SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
IUSE="debug gnome +introspection kerberos +vala"
REQUIRED_USE="vala? ( introspection )"
@@ -59,7 +59,10 @@ src_prepare() {
src_configure() {
# TODO: Give users a way to set the G/FB/Windows Live secrets
- gnome2_src_configure \
+
+ # CONFIG_SHELL for bashisms in bug #829494, patch submitted upstream.
+ # Can be removed in future.
+ CONFIG_SHELL="${BROOT}/bin/bash" gnome2_src_configure \
--disable-static \
--enable-backend \
--enable-documentation \
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild
index 90a80a4489e..433f793133e 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-VALA_USE_DEPEND="vapigen"
+EAPI=8
inherit gnome2 vala
@@ -11,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
LICENSE="LGPL-2+"
SLOT="0/1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
IUSE="debug gnome +introspection kerberos +vala"
REQUIRED_USE="vala? ( introspection )"
@@ -53,13 +52,16 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- use vala && vala_src_prepare
+ use vala && vala_setup
gnome2_src_prepare
}
src_configure() {
# TODO: Give users a way to set the G/FB/Windows Live secrets
- gnome2_src_configure \
+
+ # CONFIG_SHELL for bashisms in bug #829494, patch submitted upstream.
+ # Can be removed in future.
+ CONFIG_SHELL="${BROOT}/bin/bash" gnome2_src_configure \
--disable-static \
--enable-backend \
--enable-documentation \
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index a6767fb17fe..cdc465872bb 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1 +1,4 @@
DIST gnutls-3.7.2.tar.xz 6091508 BLAKE2B f408ff65f2e08cf294b449dfac64a272a8ba40e987618960f57ee36c167a25974711ab8d11bdbd6335fbf18ac902a79b5c6b40bb6a37f4ee07549832d0611df2 SHA512 5d01d561a05379da71e4847e30ba13c2abe09f7a5c4359fd539d8bd19abad0ce87120f82ee7b6264e787bd3edbc5ae16beffa892983cbc3d59f11a1811c10329
+DIST gnutls-3.7.3.tar.xz 6119292 BLAKE2B 811e6fbb62fbd35fa63e66cfcbfc3bf899cea5cece1d2a68bc650f507df0f7be9f59c707c90fa19b7ef5a52455a663da49682704e0884af06075c566afbfc0bf SHA512 3ace744affe23e284342658d6d2d2de49dd50065489cbc8be18fc7d38187253e5268ca54027ce5cd517056c249ac039a7481e4548cec04325de37ae85617d077
+DIST gnutls-3.7.5.tar.xz 6321392 BLAKE2B e7b2da643dc8d5160d1872655ed6771b89587d62132eccfe0b7ce0cc9e81daa27b3608608df3301787d89148a27d321266ac52c1fde06afd2e821575e8805403 SHA512 2e4898e6aeff4f82abd48e6a442f5c9ebe4ecaeb0c038b76e2da8e468f6a7ae37fef5e8de17d90346f29aa0b56a08abf67fe8b81ba09dcf4612cc3b97b830bec
+DIST gnutls-3.7.5.tar.xz.sig 685 BLAKE2B 0a7fdeae9b10382e962c5ea7b49fbb2c0829203bded123597b7718b0cd9483204498a05556da82518f40a4775c90a9b275afdbb4d6a65e7a9396bd0c40ca522a SHA512 1110b859299d13c5121f9c68d6faf099a62b13500cd1c994ac6dea49d69c29a351fd4de42bb66fe01d2e6feef9c3fbd344e8eec0a409c804699d3f7956fe28ff
diff --git a/net-libs/gnutls/gnutls-3.7.3-r1.ebuild b/net-libs/gnutls/gnutls-3.7.3-r1.ebuild
new file mode 100644
index 00000000000..3781157905b
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.7.3-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
+HOMEPAGE="https://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-3 LGPL-2.1+"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
+
+REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
+ dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+ >=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
+ >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
+ dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
+ guile? ( >=dev-scheme/guile-2:=[networking] )
+ nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
+ pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
+ idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ test? (
+ seccomp? ( sys-libs/libseccomp )
+ )"
+BDEPEND=">=virtual/pkgconfig-0-r1
+ doc? ( dev-util/gtk-doc )
+ nls? ( sys-devel/gettext )
+ valgrind? ( dev-util/valgrind )
+ test-full? (
+ app-crypt/dieharder
+ >=app-misc/datefudge-1.22
+ dev-libs/softhsm:2[-bindist(-)]
+ net-dialup/ppp
+ net-misc/socat
+ )"
+
+DOCS=( README.md doc/certtool.cfg )
+
+HTML_DOCS=()
+
+pkg_setup() {
+ # bug #520818
+ export TZ=UTC
+
+ use doc && HTML_DOCS+=(
+ doc/gnutls.html
+ )
+}
+
+src_prepare() {
+ default
+
+ # don't try to use system certificate store on macOS, it is
+ # confusingly ignoring our ca-certificates and more importantly
+ # fails to compile in certain configurations
+ sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
+
+ # Use sane .so versioning on FreeBSD.
+ elibtoolize
+}
+
+multilib_src_configure() {
+ LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+ local libconf=()
+
+ # TPM needs to be tested before being enabled
+ libconf+=(
+ --without-tpm
+ --without-tpm2
+ )
+
+ # hardware-accel is disabled on OSX because the asm files force
+ # GNU-stack (as doesn't support that) and when that's removed ld
+ # complains about duplicate symbols
+ [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+ # Cygwin as does not understand these asm files at all
+ [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+ local myeconfargs=(
+ $(multilib_native_enable manpages)
+ $(multilib_native_use_enable doc gtk-doc)
+ $(multilib_native_use_enable doc)
+ $(multilib_native_use_enable guile)
+ $(multilib_native_use_enable seccomp seccomp-tests)
+ $(multilib_native_use_enable test tests)
+ $(multilib_native_use_enable test-full full-test-suite)
+ $(multilib_native_use_enable tools)
+ $(multilib_native_use_enable valgrind valgrind-tests)
+ $(use_enable cxx)
+ $(use_enable dane libdane)
+ $(use_enable nls)
+ $(use_enable openssl openssl-compatibility)
+ $(use_enable sslv2 ssl2-support)
+ $(use_enable sslv3 ssl3-support)
+ $(use_enable static-libs static)
+ $(use_enable tls-heartbeat heartbeat-support)
+ $(use_with idn)
+ $(use_with pkcs11 p11-kit)
+ --disable-rpath
+ --with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+ --with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
+ --without-included-libtasn1
+ $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+ )
+ ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -type f -name '*.la' -delete || die
+
+ if use examples; then
+ docinto examples
+ dodoc doc/examples/*.c
+ fi
+}
diff --git a/net-libs/gnutls/gnutls-3.7.5.ebuild b/net-libs/gnutls/gnutls-3.7.5.ebuild
new file mode 100644
index 00000000000..b8d1b4ecd56
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.7.5.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnutls.asc
+inherit libtool multilib-minimal verify-sig
+
+DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
+HOMEPAGE="https://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )"
+
+LICENSE="GPL-3 LGPL-2.1+"
+SLOT="0/30.30" # <libgnutls.so number>.<libgnutlsxx.so number>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib zstd"
+
+REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
+ dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+ >=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
+ >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
+ brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] )
+ dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
+ guile? ( >=dev-scheme/guile-2:=[networking] )
+ nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
+ pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
+ idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )
+ zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+ zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ test? (
+ seccomp? ( sys-libs/libseccomp )
+ )"
+BDEPEND="
+ dev-util/gtk-doc-am
+ >=virtual/pkgconfig-0-r1
+ doc? ( dev-util/gtk-doc )
+ nls? ( sys-devel/gettext )
+ valgrind? ( dev-util/valgrind )
+ test-full? (
+ app-crypt/dieharder
+ >=app-misc/datefudge-1.22
+ dev-libs/softhsm:2[-bindist(-)]
+ net-dialup/ppp
+ net-misc/socat
+ )
+ verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20220320 )"
+
+DOCS=( README.md doc/certtool.cfg )
+
+HTML_DOCS=()
+
+pkg_setup() {
+ # bug #520818
+ export TZ=UTC
+
+ use doc && HTML_DOCS+=(
+ doc/gnutls.html
+ )
+}
+
+src_prepare() {
+ default
+
+ # don't try to use system certificate store on macOS, it is
+ # confusingly ignoring our ca-certificates and more importantly
+ # fails to compile in certain configurations
+ sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
+
+ # Use sane .so versioning on FreeBSD.
+ elibtoolize
+}
+
+multilib_src_configure() {
+ LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+ local libconf=()
+
+ # TPM needs to be tested before being enabled
+ # Note that this may add a libltdl dep when enabled. Check configure.ac.
+ libconf+=(
+ --without-tpm
+ --without-tpm2
+ )
+
+ # hardware-accel is disabled on OSX because the asm files force
+ # GNU-stack (as doesn't support that) and when that's removed ld
+ # complains about duplicate symbols
+ [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+ # Cygwin as does not understand these asm files at all
+ [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+ # -fanalyzer substantially slows down the build and isn't useful for
+ # us. It's useful for upstream as it's static analysis, but it's not
+ # useful when just getting something built.
+ export gl_cv_warn_c__fanalyzer=no
+
+ local myeconfargs=(
+ $(multilib_native_enable manpages)
+ $(multilib_native_use_enable doc gtk-doc)
+ $(multilib_native_use_enable doc)
+ $(multilib_native_use_enable guile)
+ $(multilib_native_use_enable seccomp seccomp-tests)
+ $(multilib_native_use_enable test tests)
+ $(multilib_native_use_enable test-full full-test-suite)
+ $(multilib_native_use_enable tools)
+ $(multilib_native_use_enable valgrind valgrind-tests)
+ $(use_enable cxx)
+ $(use_enable dane libdane)
+ $(use_enable nls)
+ $(use_enable openssl openssl-compatibility)
+ $(use_enable sslv2 ssl2-support)
+ $(use_enable sslv3 ssl3-support)
+ $(use_enable static-libs static)
+ $(use_enable tls-heartbeat heartbeat-support)
+ $(use_with brotli)
+ $(use_with idn)
+ $(use_with pkcs11 p11-kit)
+ $(use_with zlib)
+ $(use_with zstd)
+ --disable-rpath
+ --with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+ --with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
+ --without-included-libtasn1
+ $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+ )
+ ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -type f -name '*.la' -delete || die
+
+ if use examples; then
+ docinto examples
+ dodoc doc/examples/*.c
+ fi
+}
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index de9a58df59b..8f171c8ee7f 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -5,6 +5,9 @@
<email>base-system@gentoo.org</email>
</maintainer>
<use>
+ <flag name="brotli">
+ Enable brotli decompression support via <pkg>app-arch/brotli</pkg>
+ </flag>
<flag name="dane">
Build libgnutls-dane, implementing DNS-based Authentication of
Named Entities. Requires <pkg>net-dns/unbound</pkg>
diff --git a/net-libs/google-cloud-cpp/Manifest b/net-libs/google-cloud-cpp/Manifest
index 144c9ba8b13..77a6384d7fc 100644
--- a/net-libs/google-cloud-cpp/Manifest
+++ b/net-libs/google-cloud-cpp/Manifest
@@ -1,8 +1,5 @@
DIST google-cloud-cpp-0.10.0.tar.gz 2189161 BLAKE2B 1e599478db3f280cddc4232c7e6005c7b5a48b1f22aecc8a99dc60f461dad349d343b40e6545680e7b211ea40a07c9b069052c2a6e36cb7279e400cdebfa95a3 SHA512 9a1774dcc39d1626c8a9cf8630fe3b3110df7e21e452c7b137e1911d10b304997571aadff5fc0216715729db4a29621066a5236a0b2cb027bba4ce3c56492fb3
-DIST google-cloud-cpp-0.2.0.tar.gz 687020 BLAKE2B 45c09c7cb5b9cc93c87e6d1faedf04f29ae81196dda95660abeadeaaf522376b4e50fd42489476c081e8de7336202d3883ab276c0e2334f1ad1b0e4e1f90fdb8 SHA512 ded3b564ef264a8bff4d81b08f2a97462e063127bf75a006bc7b18d18cfaee2f3cbe5957fe2c56cec06da5a7765854444fad8cd5045579c416c5f3de8462382e
-DIST google-cloud-cpp-0.5.0.tar.gz 1050893 BLAKE2B 6e96e2ca3f518f3c417d9d395001a42182aaeacdbbcfedc636387dbccedf5e570367bc66e5b3fecbe53d5b61e51b53709b83da90718826ac643fb2c43c1723c6 SHA512 48c5f4828bc85ae2c4bfe52b5bb51ff5da6a4cd6759f819aefaf9c23d7fffeb0a10390274f0e83f030f66f59a364c05583240e426143073187f104345e0b05d5
-DIST google-cloud-cpp-0.9.0.tar.gz 2209532 BLAKE2B 33b297d4836cf171833a4481b567d22f44aacdb0afd5422ec7da7f3c47fc1284a4a7723e306508c7dc7cc595166f040abe00a92eed58a07dfed77b94f99e9889 SHA512 b62051b9396efe8af8063d28ac958524b762a90c053f82030834bd38f018f0755487f6b39ceb5a0082d7cbf8784854c4effd81de27633086857330dc9bda182b
+DIST google-cloud-cpp-1.36.0.tar.gz 4522003 BLAKE2B f436935b3a95fa911fb04429ee20b0712eeaf58f8ebfdd1b75f848e19ffa88d17b1be1d917f5693f1996ce6eaff6bd6053958c2b20cf29370164bccf2794c76c SHA512 a9885f9e0726de64eaee0376f3d1ed3a00c32919f2b9a911479206f2965a62eea5ff292b459f61eae97d5d2fe336c410c615296fcb0c7506faf45c57bd6f8871
+DIST googleapis-28c6bb97cac6f16c69879be4e655674a74b886ef.tar.gz 5448352 BLAKE2B 0421ba9506e931d0bd7b01011832a91235f04ae825489021204da17d543671994e68dfecd97eeb8ee90f42726450d375955e1458e7dfba8551854c036bdc6069 SHA512 59f4d78c268280323314b8d471d4877cacc4238bfac3a769aa86cedd22d79ebeb50f2aaa8a60f9264976d12ef629a2a3d1a0da1c0d6723ec08f517ef0fae9450
DIST googleapis-6a3277c0656219174ff7c345f31fb20a90b30b97.tar.gz 746503 BLAKE2B c0cba88c19c658ba7e9e65b80557903f8ded280d25438120b32f8c29a714b58a527c9218f0f73b53646949ecc073d873fee712b370b95523bdea5c28747eeb25 SHA512 92795397dfb9a6aa931be7b191ee91f9f2678a7175dea6babf19a50f61923373d288832cf10edf1ff252ca5148fe649c1bf95535e7c21513129495afae4c0ff7
-DIST googleapis-79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2.tar.gz 874997 BLAKE2B c837323124d26364c83dba72d4f73f3147ad117468b271e8d9502991c1f9a7b20d4f5405351147b65e99c57d207a2b8c1471228d2060ad238ade5159be1b009e SHA512 774e56fc30a4daf2e88d8d3b6747c1ac369d016e9d52527565b88d93252a22597339c17e612304f8823867da4b6df4b58a42dc9d4d480fc59962ee5314a85ab8
-DIST nlohmann-json-3.1.2-json.hpp 595822 BLAKE2B 510278344a510a516606f84aea53c682a64a7d1f4703e41503a1688e7c62ab1df8f197a697bd1149e958d21ab986d1b42cb78db6261b07239d9587756813acf5 SHA512 05df0ad3338f0bca885c0aa9da523922b99016986a9b01426b13888c0febd83bf1f6f063886f6c75f8a656ef79abac6292fe442dc05b1897d546ba5b70be48a5
DIST nlohmann-json-3.4.0-json.hpp 705920 BLAKE2B 9a22a6420f818038d8c4b352fb92ff0f0041b76232ef8665686399d184cfc62caffb60b4ccf1d8d33ae428839a70fece959f94795d71803623405d041efc9a13 SHA512 a1bdb4b434ee34cbc360e0203f500b25e15d7e1a6d25ea6e3bd3b56a5e7ec47d8c0bbe074930b7a07d6ceaf2112eefa24da9c1f0595aaf12c88697048238166d
diff --git a/net-libs/google-cloud-cpp/files/0001-Make-the-install-target-work.patch b/net-libs/google-cloud-cpp/files/0001-Make-the-install-target-work.patch
deleted file mode 100644
index f84cb4be3c2..00000000000
--- a/net-libs/google-cloud-cpp/files/0001-Make-the-install-target-work.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur google-cloud-cpp-0.2.0.orig/google/cloud/storage/CMakeLists.txt google-cloud-cpp-0.2.0/google/cloud/storage/CMakeLists.txt
---- google-cloud-cpp-0.2.0.orig/google/cloud/storage/CMakeLists.txt 2018-09-28 00:39:41.170482472 +0800
-+++ google-cloud-cpp-0.2.0/google/cloud/storage/CMakeLists.txt 2018-09-28 00:42:09.679979597 +0800
-@@ -321,7 +321,7 @@
- PATTERN "testing/*"
- EXCLUDE)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version_info.h DESTINATION
-- include/storage/client)
-+ include/google/cloud/storage)
-
- # Setup global variables used in the following *.in files.
- set(GOOGLE_CLOUD_CPP_CONFIG_VERSION_MAJOR ${STORAGE_CLIENT_VERSION_MAJOR})
diff --git a/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch b/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch
deleted file mode 100644
index a1b9a166ea3..00000000000
--- a/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ef34b197dd23833c0dde9ea20f62681dbafa7a9b Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Fri, 7 Sep 2018 21:19:11 +0800
-Subject: [PATCH 1/2] cmake: Fix GOOGLE_CLOUD_CPP_GRPC_PROVIDER=pkg-config
-
-The grpc_cpp_plugin executable needs to be marked imported otherwise
-cmake will try (and fail) to build it. Also the location variable was
-typo'd.
-
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- cmake/IncludeGrpc.cmake | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/IncludeGrpc.cmake b/cmake/IncludeGrpc.cmake
-index 36dcfe5c..c18f5cbc 100644
---- a/cmake/IncludeGrpc.cmake
-+++ b/cmake/IncludeGrpc.cmake
-@@ -225,9 +225,8 @@ elseif("${GOOGLE_CLOUD_CPP_GRPC_PROVIDER}" STREQUAL "pkg-config")
- ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Release
- ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug)
- mark_as_advanced(PROTOC_GRPCPP_PLUGIN_EXECUTABLE)
-- add_executable(grpc_cpp_plugin ${PROTOC_GRPC_PLUGIN_EXECUTABLE})
-+ add_executable(grpc_cpp_plugin IMPORTED)
- set_property(TARGET grpc_cpp_plugin
-- PROPERTY IMPORTED_LOCATION
-- ${PROTOC_GRPCPP_CPP_PLUGIN_EXECUTABLE})
-+ PROPERTY IMPORTED_LOCATION ${PROTOC_GRPCPP_PLUGIN_EXECUTABLE})
-
- endif ()
---
-2.16.4
-
diff --git a/net-libs/google-cloud-cpp/files/0002-cmake-set-library-soversions.patch b/net-libs/google-cloud-cpp/files/0002-cmake-set-library-soversions.patch
deleted file mode 100644
index 74a57711ed6..00000000000
--- a/net-libs/google-cloud-cpp/files/0002-cmake-set-library-soversions.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From b1d6f58033be92661f91b221b878e333eb02fd7f Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Fri, 7 Sep 2018 22:35:24 +0800
-Subject: [PATCH 2/2] cmake: set library soversions
-
-Set library soversions so CMake sets the symlinks and soversions
-properly. Install the cmake files in the correct dir.
-
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- google/cloud/CMakeLists.txt | 7 +++++++
- google/cloud/bigtable/CMakeLists.txt | 14 ++++++++++++++
- google/cloud/firestore/CMakeLists.txt | 12 ++++++++++--
- google/cloud/storage/CMakeLists.txt | 9 ++++++++-
- 4 files changed, 39 insertions(+), 3 deletions(-)
-
-diff --git a/google/cloud/CMakeLists.txt b/google/cloud/CMakeLists.txt
-index 3f3f8742..442f4e17 100644
---- a/google/cloud/CMakeLists.txt
-+++ b/google/cloud/CMakeLists.txt
-@@ -98,6 +98,13 @@ target_include_directories(google_cloud_cpp_common
- $<INSTALL_INTERFACE:include>)
- target_compile_options(google_cloud_cpp_common
- PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
-+set_target_properties(
-+ google_cloud_cpp_common
-+ PROPERTIES
-+ VERSION
-+ ${GOOGLE_CLOUD_CPP_VERSION_MAJOR}.${GOOGLE_CLOUD_CPP_VERSION_MINOR}.${GOOGLE_CLOUD_CPP_VERSION_PATCH}
-+ SOVERSION
-+ ${GOOGLE_CLOUD_CPP_VERSION_MAJOR})
-
- include(CreateBazelConfig)
- create_bazel_config(google_cloud_cpp_common)
-diff --git a/google/cloud/bigtable/CMakeLists.txt b/google/cloud/bigtable/CMakeLists.txt
-index 9ed778eb..fd9c8797 100644
---- a/google/cloud/bigtable/CMakeLists.txt
-+++ b/google/cloud/bigtable/CMakeLists.txt
-@@ -102,6 +102,13 @@ target_include_directories(bigtable_protos
- $<INSTALL_INTERFACE:include>)
- target_compile_options(bigtable_protos
- PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
-+set_target_properties(
-+ bigtable_protos
-+ PROPERTIES
-+ VERSION
-+ ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH}
-+ SOVERSION
-+ ${BIGTABLE_CLIENT_VERSION_MAJOR})
- add_library(bigtable::protos ALIAS bigtable_protos)
-
- # Enable unit tests
-@@ -206,6 +213,13 @@ target_include_directories(bigtable_client
- $<INSTALL_INTERFACE:include>)
- target_compile_options(bigtable_client
- PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
-+set_target_properties(
-+ bigtable_client
-+ PROPERTIES
-+ VERSION
-+ ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH}
-+ SOVERSION
-+ ${BIGTABLE_CLIENT_VERSION_MAJOR})
- add_library(bigtable::client ALIAS bigtable_client)
-
- include(CreateBazelConfig)
-diff --git a/google/cloud/firestore/CMakeLists.txt b/google/cloud/firestore/CMakeLists.txt
-index 88c5ad6d..c69e48fd 100644
---- a/google/cloud/firestore/CMakeLists.txt
-+++ b/google/cloud/firestore/CMakeLists.txt
-@@ -62,6 +62,13 @@ target_include_directories(firestore_client
- $<INSTALL_INTERFACE:include>)
- target_compile_options(firestore_client
- PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
-+set_target_properties(
-+ firestore_client
-+ PROPERTIES
-+ VERSION
-+ ${FIRESTORE_CLIENT_VERSION_MAJOR}.${FIRESTORE_CLIENT_VERSION_MINOR}.${FIRESTORE_CLIENT_VERSION_PATCH}
-+ SOVERSION
-+ ${FIRESTORE_CLIENT_VERSION_MAJOR})
- add_library(firestore::client ALIAS firestore_client)
-
- include(CreateBazelConfig)
-@@ -104,7 +111,8 @@ install(TARGETS
-
- # The exports can only be installed if all the dependencies are installed. CMake
- # needs to know where the submodules will be installed from,
--install(EXPORT firestore-targets DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake)
-+install(EXPORT firestore-targets
-+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/firestore_client")
-
- install(TARGETS firestore_client
- EXPORT firestore-targets
-@@ -142,4 +150,4 @@ install(
- FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config.cmake"
- "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config-version.cmake"
- DESTINATION
-- ${CMAKE_INSTALL_DATAROOTDIR}/cmake)
-+ "${CMAKE_INSTALL_LIBDIR}/cmake/firestore_client")
-diff --git a/google/cloud/storage/CMakeLists.txt b/google/cloud/storage/CMakeLists.txt
-index cef3954b..912391cc 100644
---- a/google/cloud/storage/CMakeLists.txt
-+++ b/google/cloud/storage/CMakeLists.txt
-@@ -205,6 +205,13 @@ target_include_directories(storage_client
- $<INSTALL_INTERFACE:include>)
- target_compile_options(storage_client
- PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
-+set_target_properties(
-+ storage_client
-+ PROPERTIES
-+ VERSION
-+ ${STORAGE_CLIENT_VERSION_MAJOR}.${STORAGE_CLIENT_VERSION_MINOR}.${STORAGE_CLIENT_VERSION_PATCH}
-+ SOVERSION
-+ ${STORAGE_CLIENT_VERSION_MAJOR})
-
- add_library(storage_client_testing
- testing/canonical_errors.h
-@@ -315,7 +322,7 @@ install(TARGETS storage_client
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
--install(DIRECTORY . DESTINATION include/storage/client
-+install(DIRECTORY . DESTINATION include/google/cloud/storage/client
- FILES_MATCHING
- PATTERN "*.h"
- PATTERN "testing/*"
---
-2.16.4
-
diff --git a/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.5.0-openssl.patch b/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.5.0-openssl.patch
deleted file mode 100644
index a5579909e8a..00000000000
--- a/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.5.0-openssl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur google-cloud-cpp-0.5.0.orig/google/cloud/storage/CMakeLists.txt google-cloud-cpp-0.5.0/google/cloud/storage/CMakeLists.txt
---- google-cloud-cpp-0.5.0.orig/google/cloud/storage/CMakeLists.txt 2019-01-30 14:01:05.657031402 +0800
-+++ google-cloud-cpp-0.5.0/google/cloud/storage/CMakeLists.txt 2019-01-30 14:01:19.969968164 +0800
-@@ -215,9 +215,6 @@
- Crc32c::crc32c
- CURL::CURL
- Threads::Threads
-- OpenSSL::SSL
-- OpenSSL::Crypto
-- ZLIB::ZLIB
- PRIVATE storage_common_options)
- target_include_directories(storage_client
- PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r1.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r2.ebuild
index b1fb2095c0c..b441242910a 100644
--- a/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r1.ebuild
+++ b/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit cmake-utils
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake
JSON_VER="3.4.0"
GOOGLEAPIS_COMMIT="6a3277c0656219174ff7c345f31fb20a90b30b97"
@@ -36,11 +37,11 @@ PATCHES=(
src_configure() {
local mycmakeargs=(
-DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
- -DBUILD_SHARED_LIBS=ON
-DBUILD_TESTING=OFF
+ -DCMAKE_CXX_STANDARD=17
)
- cmake-utils_src_configure
+ cmake_src_configure
mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die
cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die
@@ -56,5 +57,5 @@ src_test() {
-E internal_parse_rfc3339_test
)
- cmake-utils_src_test
+ cmake_src_test
}
diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0.ebuild
deleted file mode 100644
index 0575f7a04ab..00000000000
--- a/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-JSON_VER="3.4.0"
-GOOGLEAPIS_COMMIT="6a3277c0656219174ff7c345f31fb20a90b30b97"
-
-DESCRIPTION="Google Cloud Client Library for C++"
-HOMEPAGE="https://cloud.google.com/"
-SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp
- https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="test"
-RDEPEND="dev-libs/protobuf:=
- dev-libs/crc32c
- net-misc/curl
- net-libs/grpc:="
-DEPEND="${RDEPEND}
- dev-cpp/gtest"
-
-DOCS=( README.md )
-PATCHES=(
- "${FILESDIR}/google-cloud-cpp-0.5.0-openssl.patch"
- "${FILESDIR}/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_TESTING=OFF
- )
-
- cmake-utils_src_configure
-
- mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die
- cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die
-
- mkdir -p "${BUILD_DIR}/external/googleapis/src/" || die
- cp "${DISTDIR}/googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" \
- "${BUILD_DIR}/external/googleapis/src/${GOOGLEAPIS_COMMIT}.tar.gz" || die
-}
-
-src_test() {
- # test fails
- local myctestargs=(
- -E internal_parse_rfc3339_test
- )
-
- cmake-utils_src_test
-}
diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild
deleted file mode 100644
index fe66dc867de..00000000000
--- a/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-JSON_VER="3.1.2"
-GOOGLEAPIS_COMMIT="79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2"
-
-DESCRIPTION="Google Cloud Client Library for C++"
-HOMEPAGE="https://cloud.google.com/"
-SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp
- https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/protobuf:=
- net-misc/curl
- net-libs/grpc"
-DEPEND="${RDEPEND}
- dev-cpp/gtest"
-
-DOCS=( README.md )
-PATCHES=(
- "${FILESDIR}/0001-Make-the-install-target-work.patch"
- "${FILESDIR}/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch"
- "${FILESDIR}/0002-cmake-set-library-soversions.patch"
-)
-
-src_prepare() {
- rm -rf "${S}/third_party/googleapis/" || die
- mv "${WORKDIR}/googleapis-${GOOGLEAPIS_COMMIT}/" "${S}/third_party/googleapis/" || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=package
- -DGOOGLE_CLOUD_CPP_GRPC_PROVIDER=pkg-config
- -DBUILD_SHARED_LIBS=ON
- )
-
- cmake-utils_src_configure
-
- mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die
- cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die
-}
-
-src_test() {
- # test fails
- local myctestargs=(
- -E internal_parse_rfc3339_test
- )
-
- cmake-utils_src_test
-}
diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.5.0.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.5.0.ebuild
deleted file mode 100644
index 4e651cbb6b2..00000000000
--- a/net-libs/google-cloud-cpp/google-cloud-cpp-0.5.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-JSON_VER="3.4.0"
-GOOGLEAPIS_COMMIT="6a3277c0656219174ff7c345f31fb20a90b30b97"
-
-DESCRIPTION="Google Cloud Client Library for C++"
-HOMEPAGE="https://cloud.google.com/"
-SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp
- https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="test"
-RDEPEND="dev-cpp/gtest
- dev-libs/protobuf:=
- dev-libs/crc32c
- net-misc/curl
- net-libs/grpc"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-PATCHES=(
- "${FILESDIR}/google-cloud-cpp-0.5.0-openssl.patch"
-)
-
-src_prepare() {
- rm -rf "${S}/third_party/googleapis/" || die
- mv "${WORKDIR}/googleapis-${GOOGLEAPIS_COMMIT}/" "${S}/third_party/googleapis/" || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DGOOGLE_CLOUD_CPP_CRC32C_PROVIDER=package
- -DGOOGLE_CLOUD_CPP_CURL_PROVIDER=package
- -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=package
- -DGOOGLE_CLOUD_CPP_GRPC_PROVIDER=pkg-config
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_TESTING=OFF
- )
-
- cmake-utils_src_configure
-
- mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die
- cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die
-}
-
-src_test() {
- # test fails
- local myctestargs=(
- -E internal_parse_rfc3339_test
- )
-
- cmake-utils_src_test
-}
diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-1.36.0.ebuild
index 0575f7a04ab..d0954a056cf 100644
--- a/net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild
+++ b/net-libs/google-cloud-cpp/google-cloud-cpp-1.36.0.ebuild
@@ -1,49 +1,51 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit cmake-utils
+inherit cmake
-JSON_VER="3.4.0"
-GOOGLEAPIS_COMMIT="6a3277c0656219174ff7c345f31fb20a90b30b97"
+# From cmake/GoogleapisConfig.cmake
+GOOGLEAPIS_COMMIT="28c6bb97cac6f16c69879be4e655674a74b886ef"
DESCRIPTION="Google Cloud Client Library for C++"
HOMEPAGE="https://cloud.google.com/"
SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp
https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
+# Tests need a GCP account
RESTRICT="test"
-RDEPEND="dev-libs/protobuf:=
+RDEPEND="dev-cpp/abseil-cpp:=
+ dev-cpp/nlohmann_json
+ dev-libs/protobuf:=
dev-libs/crc32c
+ dev-libs/openssl:=
+ dev-libs/re2:=
net-misc/curl
- net-libs/grpc:="
+ net-libs/grpc:=
+ sys-libs/zlib"
DEPEND="${RDEPEND}
- dev-cpp/gtest"
+ dev-cpp/gtest
+ test? (
+ dev-cpp/benchmark
+ )"
DOCS=( README.md )
-PATCHES=(
- "${FILESDIR}/google-cloud-cpp-0.5.0-openssl.patch"
- "${FILESDIR}/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch"
-)
src_configure() {
local mycmakeargs=(
- -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_TESTING=OFF
+ -DGOOGLE_CLOUD_CPP_ENABLE_WERROR=OFF
+ -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF
+ -DBUILD_TESTING=$(usex test)
+ -DCMAKE_CXX_STANDARD=17
)
- cmake-utils_src_configure
-
- mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die
- cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die
+ cmake_src_configure
mkdir -p "${BUILD_DIR}/external/googleapis/src/" || die
cp "${DISTDIR}/googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" \
@@ -56,5 +58,5 @@ src_test() {
-E internal_parse_rfc3339_test
)
- cmake-utils_src_test
+ cmake_src_test
}
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index d12fa3b2570..f85ff4f4e4c 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,4 +1,4 @@
-DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B c306fbe60f5191fe957efb35c75574e00b1948777795e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85 SHA512 fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7
DIST grpc-1.38.1.tar.gz 8294961 BLAKE2B dca22ef4517ad122815522985e0d1c9b35789302056ea896c3ccc1163725835cf1f925b344467185edd6c86a65808bbe8243721834c0fd4f209216109b7c2fe7 SHA512 1f9b6baea4790836d32da6a27ec1491c015d47f2a48ef8732dada0ef45f4dfed412597c8a09dfc0778b16c7300618d42013679094e05cb5922bfae57adedaaa2
DIST grpc-1.41.0.tar.gz 8347643 BLAKE2B e8c0e32d3cfc75413bfcd0bfbd95a5dc592d11f629e63618619ba307a76a62668c1c21efda45836aef8fb6a1912da0c300f3d4cd41f8b93344fa1768a86df6e6 SHA512 bc353bfd8cc10d8b992e4cf680c656ef6ddbcecbaa640c94e9255664d532926e48f3839afc98ef6278ae4e2eb54d166ac67fec7315dc1d08640845ed8120d902
DIST grpc-1.41.1.tar.gz 8346512 BLAKE2B fbb453f7ab398ac843b19922b7e3f71121bc9ba44b3e0c558796dc519dbbc5d34e31d1059bfa7552fefdd7c05d5a8b03645f5c5257e73126ba14a73bec0b1fb1 SHA512 17d4c0867a51e33c029bcce86371f8e1d4680ba78fe4f02fb63b8614e9c5f7f6078c22b7c56c63c6ff461429a70d2ec87cb3c0d30c897a88321fe7f26de6e052
+DIST grpc-1.43.0.tar.gz 8540919 BLAKE2B dc78026129a5d23e864c92a210e8de845a4bad886071a76d527730108da155d290612f1e54cec15d69f55713f37f377e6bff844b16b5deef64c7d8bb31195652 SHA512 e0471aa355d311a40c9d29d7101bf8e22b89ac675d4914c38e617d3213b61107487ef20ca80d7cff8093b548f4a976526298e1f32959ae6ce3c088d45ecc9781
diff --git a/net-libs/grpc/grpc-1.41.1.ebuild b/net-libs/grpc/grpc-1.41.1.ebuild
index e9f7052206f..94fa8a8a5f6 100644
--- a/net-libs/grpc/grpc-1.41.1.ebuild
+++ b/net-libs/grpc/grpc-1.41.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
SLOT="0/19.141"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
IUSE="doc examples test"
# look for submodule versions in third_party dir
diff --git a/net-libs/grpc/grpc-1.37.1-r2.ebuild b/net-libs/grpc/grpc-1.43.0.ebuild
index 468f9b7a6ac..157b09370a9 100644
--- a/net-libs/grpc/grpc-1.37.1-r2.ebuild
+++ b/net-libs/grpc/grpc-1.43.0.ebuild
@@ -13,16 +13,17 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
-SLOT="0/15.137"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+SLOT="0/21.143"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="doc examples test"
# look for submodule versions in third_party dir
RDEPEND="
- =dev-cpp/abseil-cpp-20200923*:=[cxx17(+)]
- >=dev-libs/re2-0.2021.04.01:=
+ =dev-cpp/abseil-cpp-20211102.0*:=
+ >=dev-libs/re2-0.2021.11.01:=
>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
- >=dev-libs/protobuf-3.15.2:=
+ >=dev-libs/protobuf-3.18.1:=
+ dev-libs/xxhash
>=net-dns/c-ares-1.15.0:=
sys-libs/zlib:=
"
@@ -77,7 +78,6 @@ src_configure() {
-DgRPC_ZLIB_PROVIDER=package
-DgRPC_BUILD_TESTS=$(usex test)
-DCMAKE_CXX_STANDARD=17
- $(usex test '-DgRPC_GFLAGS_PROVIDER=package' '')
$(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '')
)
cmake_src_configure
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index 339a7f98ba4..1d819981dcc 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,3 +1 @@
-DIST gssdp-1.2.3.tar.xz 62032 BLAKE2B 761a9e0df8289a595d882497bdda6d180f19328d0e97076446286e34e7735d1b1d07fc0299618955f7d92732d11d533a59cf4012f5167c4610c9856583f06770 SHA512 abce2473995a996b0adc74ced77cb2158cc997ed70edb0c25fbddd85fe9e6afc6bf7f996bbba7a6ed5268dfbe9207ae12f2e6989efe2e8e10cc25293df347e82
-DIST gssdp-1.3.0.tar.xz 1202916 BLAKE2B af771b4163c8671d1496cedabe5845eed0b12a8dd23aa226c61ca19ad1d83bca7d504ea36f9e8b09b5079373261043c121a8ac09a909f4430be0d5a5eaa995f1 SHA512 6004ee73898e5effb98dd78af116bf4b92735712f0237c57302ebbda82d77c1cfe182e0e6ef7a8c6defd7a66ac76531d0bff740d2a41cfba8ed365b88a539c85
-DIST gssdp-1.3.1.tar.xz 1141580 BLAKE2B 3d43c1cf9bb9e418ac831b09579e6940540e0ab2124d1f75989648e39b03aec612898340511b2c965573973531adbe8f489d33447a85aac761dcbe8906325abb SHA512 b253c5bd38956a02fe1f4cd77d7c868a573c1a7e25115137ae0753c7dfdebc38cd7a3c3fee1520c1c091c60283d556f646b5c715e56f013b2fe209c63a994b56
+DIST gssdp-1.4.0.1.tar.xz 1229264 BLAKE2B b94e46c79ad0615f976bad4b8efe9dbcaa27105b3189ee23ff349002d175ff83b0a9507846a23f0d8b5ed1e98381658f863a77bec6beff83933ebae5458a6b0e SHA512 c2132b27f49071941be1ad9bd1e642b8b82341aac7e10b87d8a9a0ed3d88759ab6730a4a05ddb904af5e0799602c470b9e83a987c72ec3c1444b7aaef0e36ad8
diff --git a/net-libs/gssdp/gssdp-1.2.3.ebuild b/net-libs/gssdp/gssdp-1.2.3.ebuild
deleted file mode 100644
index 689c160c9ce..00000000000
--- a/net-libs/gssdp/gssdp-1.2.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="GObject-based API for handling resource discovery and announcement over SSDP"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2+"
-SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
-IUSE="gtk-doc +introspection gtk vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
- >=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}]
- >=net-libs/libsoup-2.26.1:2.4[${MULTILIB_USEDEP},introspection?]
- gtk? ( >=x11-libs/gtk+-3.12:3 )
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- gtk-doc? ( >=dev-util/gtk-doc-1.14
- app-text/docbook-xml-dtd:4.1.2 )
- virtual/pkgconfig
- vala? (
- $(vala_depend)
- net-libs/libsoup:2.4[vala]
- )
-"
-
-src_prepare() {
- use vala && vala_src_prepare
- xdg_src_prepare
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_native_use_bool gtk-doc gtk_doc)
- $(meson_native_use_bool gtk sniffer)
- $(meson_native_use_bool introspection)
- $(meson_native_use_bool vala vapi)
- -Dexamples=false
- )
- meson_src_configure
-}
diff --git a/net-libs/gssdp/gssdp-1.3.1.ebuild b/net-libs/gssdp/gssdp-1.3.1.ebuild
deleted file mode 100644
index c76385775f8..00000000000
--- a/net-libs/gssdp/gssdp-1.3.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="GObject-based API for handling resource discovery and announcement over SSDP"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gssdp"
-
-LICENSE="LGPL-2+"
-SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="gtk-doc +introspection gtk vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
- >=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}]
- >=net-libs/libsoup-2.26.1:2.4[${MULTILIB_USEDEP},introspection?]
- gtk? ( gui-libs/gtk:4 )
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- gtk-doc? (
- >=dev-util/gi-docgen-2021.1
- app-text/docbook-xml-dtd:4.1.2
- )
- virtual/pkgconfig
- vala? (
- $(vala_depend)
- net-libs/libsoup:2.4[vala]
- )
-"
-
-src_prepare() {
- use vala && vala_src_prepare
- xdg_src_prepare
-}
-
-multilib_src_configure() {
- local emesonargs=(
- # Never use gi-docgen subproject
- --wrap-mode nofallback
-
- $(meson_native_use_bool gtk-doc gtk_doc)
- $(meson_native_use_bool gtk sniffer)
- $(meson_native_use_bool introspection)
- $(meson_native_use_bool vala vapi)
- -Dexamples=false
- )
- meson_src_configure
-}
-
-multilib_src_install_all() {
- if use gtk-doc ; then
- mv "${ED}"/usr/share/doc/{gssdp-1.2/reference,${PF}/html} || die
- rmdir "${ED}"/usr/share/doc/gssdp-1.2
- fi
-}
diff --git a/net-libs/gssdp/gssdp-1.3.0.ebuild b/net-libs/gssdp/gssdp-1.4.0.1.ebuild
index a71c9b505b2..e3a621c091c 100644
--- a/net-libs/gssdp/gssdp-1.3.0.ebuild
+++ b/net-libs/gssdp/gssdp-1.4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/g
LICENSE="LGPL-2+"
SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
IUSE="gtk-doc +introspection gtk vala"
REQUIRED_USE="vala? ( introspection )"
@@ -55,7 +55,8 @@ multilib_src_configure() {
multilib_src_install_all() {
if use gtk-doc ; then
- mv "${ED}"/usr/share/doc/{gssdp-1.2/reference,${PF}/html} || die
+ mv "${ED}"/usr/share/doc/{gssdp-1.2,${PF}} || die
+ mv "${ED}"/usr/share/doc/${PF}/{reference,html} || die
rmdir "${ED}"/usr/share/doc/gssdp-1.2
fi
}
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index df8b90de30b..33c4db829ef 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1 +1 @@
-DIST gtk-vnc-1.2.0.tar.xz 218024 BLAKE2B 8e13886826eebc3261271b94e15c504f82b15681417e70cc6b54b824ceff4de20a470460c5176abb2df04f325389a08032f40b49cfc3429c290d6d7255fc56d2 SHA512 830c614afa6540397352da864ad32a5687ccce5dc1e2150220c9a7fc3c7b0fbcbb3770e06b5fed75602d830bc9a9d40855fa8b6d8b65f740fc7a53bbdfce6edb
+DIST gtk-vnc-1.3.0.tar.xz 220488 BLAKE2B ea5070cc396fe4ef52fe980b766658f1a4f82eb7dec52856ab79836363c8fdb48827d52c0df7edb2c943f5087fcfd87898aa43457f7cbf5a544a4c7063f84f3d SHA512 ff25c19a1cbd4588990f1f3a2448fd2e0b694b933ca1a7be9565188db78055efe13f90ad1243bf8237d6a29d38987d7b3e77344e50d09191207b09200b01f5df
diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch
deleted file mode 100644
index eba775dd3a5..00000000000
--- a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From e540fbc34d6bbfe3e84f1d9c33deaacc2326c7c9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jakub=20Jank=C5=AF?= <jjanku@redhat.com>
-Date: Mon, 26 Apr 2021 17:38:13 +0200
-Subject: [PATCH 1/3] build: improve --with-coroutine=auto choice
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When the required ucontext functions aren't found, switch to gthread
-coroutines instead of failing during the build.
-
-These functions are absent from the POSIX.1-2008.
-
-Fixes: https://gitlab.gnome.org/GNOME/gtk-vnc/-/issues/11
-
-Signed-off-by: Jakub Janků <jjanku@redhat.com>
----
- meson.build | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 8052d43..e9829e6 100644
---- a/meson.build
-+++ b/meson.build
-@@ -43,8 +43,20 @@ cc = meson.get_compiler('c')
-
- coroutine = get_option('with-coroutine')
-
-+uctx_args = []
-+if host_machine.system() == 'darwin'
-+ uctx_args += ['-D_XOPEN_SOURCE=600']
-+endif
-+has_ucontext = true
-+foreach uctx_func : ['makecontext', 'swapcontext', 'getcontext']
-+ if not cc.has_function(uctx_func, prefix: '#include <ucontext.h>', args: uctx_args)
-+ has_ucontext = false
-+ break
-+ endif
-+endforeach
-+
- if coroutine == 'auto'
-- if host_machine.system() == 'windows'
-+ if host_machine.system() == 'windows' or not has_ucontext
- coroutine = 'gthread'
- else
- coroutine = 'ucontext'
-@@ -52,6 +64,9 @@ if coroutine == 'auto'
- endif
-
- if coroutine == 'ucontext'
-+ if not has_ucontext
-+ error('ucontext requested, but not available')
-+ endif
- conf_data.set('WITH_UCONTEXT', true)
- elif coroutine != 'gthread'
- error('Unknown coroutine backend')
---
-2.26.3
-
diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
deleted file mode 100644
index bd72b572792..00000000000
--- a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.gnome.org/GNOME/gtk-vnc/-/merge_requests/15
-
-From 4609ad35b6dc11f016ac3a50158eeef7f19d9889 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 5 Apr 2020 00:05:49 +0300
-Subject: [PATCH 3/3] meson: Find python explicitly to honor downstream python
- choice
-
----
- src/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 5306fb9..247c597 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -319,7 +319,7 @@ gtk_vnc_sources = gtk_vnc_gir_sources + gvnc_marshal + [
- 'vncdisplaykeymap.c',
- ]
-
--python = import('python').find_installation()
-+python = import('python').find_installation('python3')
- keymaps = [
- 'xorgevdev',
- 'xorgkbd',
---
-2.26.3
-
diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch
deleted file mode 100644
index fd305f777c5..00000000000
--- a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://gitlab.gnome.org/GNOME/gtk-vnc/-/merge_requests/14
-
-From bdab05584bab5c2ecdd508df49b03e80aedd19fc Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Wed, 28 Apr 2021 17:16:54 -0400
-Subject: [PATCH 2/3] meson: Fix configuration failure with
- -Dwith-vala=disabled
-
-Otherwise with_vala is not defined, and meson setup results in
-
- src/meson.build:169:5: ERROR: Unknown variable "with_vala".
----
- meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index e9829e6..777876c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -318,12 +318,11 @@ gir = find_program('g-ir-scanner', required: get_option('introspection'))
- with_gir = gir.found()
-
- vala_opt = get_option('with-vala')
-+with_vala = false
- if not vala_opt.disabled()
- if not with_gir
- if vala_opt.enabled()
- error('Vala API requires GObject introspection (-Dintrospection=true)')
-- else
-- with_vala = false
- endif
- else
- with_vala = add_languages('vala', required: vala_opt)
---
-2.26.3
-
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild
index e879d2277a2..92a3dcb5794 100644
--- a/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit gnome.org vala meson python-any-r1 xdg
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="+introspection pulseaudio sasl +vala"
REQUIRED_USE="vala? ( introspection )"
@@ -40,12 +40,6 @@ BDEPEND="
vala? ( $(vala_depend) )
"
-PATCHES=(
- "${FILESDIR}"/${P}-build-improve-with-coroutine-auto-choice.patch
- "${FILESDIR}"/${P}-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
- "${FILESDIR}"/${P}-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch
-)
-
src_prepare() {
vala_src_prepare
xdg_src_prepare
diff --git a/net-libs/gupnp-av/Manifest b/net-libs/gupnp-av/Manifest
index 5a13aeb0795..dfb79ffb198 100644
--- a/net-libs/gupnp-av/Manifest
+++ b/net-libs/gupnp-av/Manifest
@@ -1,3 +1 @@
-DIST gupnp-av-0.12.11.tar.xz 373052 BLAKE2B 3c324f790f0ffbcbd6cbf3b95dfdaf9dce51c6bf7bea3051fd5ded31b930dd6ff7b77b16a297cf54a49e738c195fd208dd4e83961f5ee3d302dc84f37b36924c SHA512 f6fb8897ccdb589446d8c83c5fe66918f0f569a624287881aaf41d928e429e41f3306443e24ef4d43d3ddffb24da2ad2c058cd39211176558c9cd7acd7af0ff7
-DIST gupnp-av-0.13.0.tar.xz 91584 BLAKE2B 96f4a452f199d48c72cf65a7fa0ef6eb59488862f87a7bf7d1eaaa79289e89bab43718c4a4e94f1d6a71ddf65071c1c1b3aa49c180ba068928b1740bb7a3c8d1 SHA512 8ff5dcacaa5893290c263ba8be2613da6853e074e2afcbc3e111dbff8c9b9d7edbd3772341bc370a1db06b4ba815fd6071158f61a832e2e8f2a51d66d5d8f230
-DIST gupnp-av-0.13.1.tar.xz 93040 BLAKE2B 31901d8e15afdb789aa71cdc114e3472870526dd221ed18d503f43a9590235e5f2af896d87ac2747f8d9dac8b7f27f8b055bd0d5d18838add87162ae9c6289df SHA512 e99485d5d232227f57156cafdfb8a30dab135a0d88eb7d041e475d45e1ab4329d25c50f5528a4ba33e0ceb792fd1de3ec2b8ead597d5720fd0827bce42dcd312
+DIST gupnp-av-0.14.0.tar.xz 93128 BLAKE2B d66ba820aabf82be37a8c19a64adbacc863b495cb6a68849ee236cbe6956cc94fc992a3d4f351d165efaa8257ece2f3173dd845d2a9313bc9ff1a97a178d9632 SHA512 b357b5413d3e01e4ecaf9dbdf5f5f15555506aed662154d03c6232f0c82c4a49543deddf34350a204d467c1a33fed04e406500fd51d6e412d32ac909e974e041
diff --git a/net-libs/gupnp-av/gupnp-av-0.12.11.ebuild b/net-libs/gupnp-av/gupnp-av-0.12.11.ebuild
deleted file mode 100644
index 5711803797e..00000000000
--- a/net-libs/gupnp-av/gupnp-av-0.12.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2"
-SLOT="0/2" # subslot: soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=net-libs/libsoup-2.28.2:2.4[introspection?]
- dev-libs/libxml2
- introspection? ( >=dev-libs/gobject-introspection-1.36:= )
- !net-libs/gupnp-vala
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.10
- virtual/pkgconfig
- introspection? ( $(vala_depend) )
-"
-
-src_prepare() {
- use introspection && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- $(use_enable introspection) \
- --disable-static
-}
diff --git a/net-libs/gupnp-av/gupnp-av-0.13.1.ebuild b/net-libs/gupnp-av/gupnp-av-0.13.1.ebuild
deleted file mode 100644
index 2d691e8af56..00000000000
--- a/net-libs/gupnp-av/gupnp-av-0.13.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson vala
-
-DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp-av"
-
-LICENSE="LGPL-2"
-SLOT="0/3" # subslot: soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="gtk-doc +introspection"
-
-RDEPEND="
- >=dev-libs/glib-2.58:2
- >=net-libs/libsoup-2.28.2:2.4[introspection?]
- dev-libs/libxml2
- introspection? ( >=dev-libs/gobject-introspection-1.36:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- introspection? ( $(vala_depend) )
-"
-
-src_prepare() {
- use introspection && vala_src_prepare
- default
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use introspection)
- $(meson_use introspection vapi)
- $(meson_use gtk-doc gtk_doc)
- )
- meson_src_configure
-}
diff --git a/net-libs/gupnp-av/gupnp-av-0.13.0.ebuild b/net-libs/gupnp-av/gupnp-av-0.14.0.ebuild
index d8baf6de158..46ae3f74a27 100644
--- a/net-libs/gupnp-av/gupnp-av-0.13.0.ebuild
+++ b/net-libs/gupnp-av/gupnp-av-0.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/g
LICENSE="LGPL-2"
SLOT="0/3" # subslot: soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="gtk-doc +introspection"
RDEPEND="
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 180253c4d69..f79fb2a2022 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,2 +1 @@
-DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
DIST gupnp-igd-1.2.0.tar.xz 26100 BLAKE2B a72117b1c3ac3cd95d797b5d7a21b333a46d161bf22bc9649c1649fee6301f16824b0068ee094cfeb31ea283ca0aae8c2369c331fe956f59586ae00fd48c5825 SHA512 0129e743b09cc773b997e0f09d7ab84481d114d52ab273b1e9957960e6a47d686d600492b916970f3b2d3d30c36b68e1e4d049eb7be5d44101a56b90dd5f0af9
diff --git a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
deleted file mode 100644
index c70bf6fea48..00000000000
--- a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 1 Dec 2018 21:33:21 +0100
-Subject: [PATCH] Swtich to new GUPnP API
-
----
- configure.ac | 2 +-
- gupnp-igd-1.0-uninstalled.pc.in | 2 +-
- gupnp-igd-1.0.pc.in | 2 +-
- libgupnp-igd/Makefile.am | 2 +-
- tests/gtest/gupnp-simple-igd.c | 6 ++++--
- 5 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f03921f..aa7f0ca 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11,7 +11,7 @@ AC_STDC_HEADERS
- AC_PROG_LIBTOOL
- AC_FUNC_MMAP
-
--PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0)
-+PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0)
-
- # glib-genmarshal
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
-diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in
-index 483956f..6db3bee 100644
---- a/gupnp-igd-1.0-uninstalled.pc.in
-+++ b/gupnp-igd-1.0-uninstalled.pc.in
-@@ -5,7 +5,7 @@ includedir=${pcfiledir}/
-
- Name: gupnp-igd-1.0
- Description: GUPnP Simple IGD library
--Requires: gupnp-1.0
-+Requires: gupnp-1.2
- Version: @VERSION@
- Libs: ${libdir}/libgupnp-av-1.0.la
- Cflags: -I${includedir}
-diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in
-index 6660d63..aa74ed3 100644
---- a/gupnp-igd-1.0.pc.in
-+++ b/gupnp-igd-1.0.pc.in
-@@ -5,7 +5,7 @@ includedir=@includedir@
-
- Name: gupnp-igd-1.0
- Description: GUPnP Simple IGD library
--Requires: gupnp-1.0
-+Requires: gupnp-1.2
- Version: @VERSION@
- Libs: -L${libdir} -lgupnp-igd-1.0
- Cflags: -I${includedir}/gupnp-igd-1.0
-diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am
-index fe020b5..e10d857 100644
---- a/libgupnp-igd/Makefile.am
-+++ b/libgupnp-igd/Makefile.am
-@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0
- GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES)
- GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES) $(libgupnp_igd_inc_HEADERS)
- GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0
--GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0
-+GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2
- GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir)
-
- if HAVE_INTROSPECTION
-diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
-index 9b32b2a..d051d13 100644
---- a/tests/gtest/gupnp-simple-igd.c
-+++ b/tests/gtest/gupnp-simple-igd.c
-@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd,
- GUPnPDeviceInfo *subdev1;
- GUPnPDeviceInfo *subdev2;
- const gchar *xml_path = ".";
-+ GError *error = NULL;
-
- g_signal_connect (igd, "context-available",
- G_CALLBACK (ignore_non_localhost), NULL);
-
- if (mainctx)
- g_main_context_push_thread_default (mainctx);
-- context = gupnp_context_new (NULL, "lo", 0, NULL);
-+ context = gupnp_context_new ("lo", 0, NULL);
- g_assert (context);
-
- if (g_getenv ("XML_PATH"))
-@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd,
- gupnp_context_host_path (context, "WANPPPConnection.xml", "/WANPPPConnection.xml");
- */
-
-- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path);
-+ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path, &error);
- g_assert (dev);
-+ g_assert (error == NULL);
-
- subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev),
- "urn:schemas-upnp-org:device:WANDevice:1");
---
-2.24.1
-
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
deleted file mode 100644
index 664a38dca04..00000000000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome.org multilib-minimal xdg
-
-DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
-HOMEPAGE="http://gupnp.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1.2" # pkg-config file links in gupnp API, so some consumers of gupnp-igd need to be relinked for it
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=net-libs/gssdp-1.2:0=[${MULTILIB_USEDEP}]
- >=net-libs/gupnp-1.2:0=[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.10 )
-"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.10
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-# The only existing test is broken
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-gupnp-1.2.patch # needs eautoreconf, https://gitlab.gnome.org/GNOME/gupnp-igd/merge_requests/1
-)
-
-src_prepare() {
- xdg_src_prepare
- eautoreconf
-}
-
-multilib_src_configure() {
- # python is old-style bindings; use introspection and pygobject instead
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --disable-gtk-doc \
- --disable-python \
- $(multilib_native_use_enable introspection)
-
- if multilib_is_native_abi; then
- ln -s "${S}"/doc/html doc/html || die
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild b/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
index 64f21fc9312..1b9cd1ffa98 100644
--- a/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://gupnp.org https://gitlab.gnome.org/GNOME/gupnp-igd"
LICENSE="LGPL-2.1+"
SLOT="0/1.2" # pkg-config file links in gupnp API, so some consumers of gupnp-igd need to be relinked for it
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
IUSE="gtk-doc +introspection"
RDEPEND="
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 8d1d26d7127..d96546f02f4 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,2 +1 @@
-DIST gupnp-1.2.7.tar.xz 142928 BLAKE2B 094e9569c501ae32def1335c8129d5585a2bec37d86c2317a2c9b2d965db5ce0ae6c19017bd44fb718709cf068f93ed75d08ab7e30c5f265e1ce45a9a9352897 SHA512 83d012989f9aab578c9bdb4dd95d316003938a39cc997949622b56523dd7081e09093c48c0016d738ca0040a00b3e6218ba59cad9e49e05f4106213160e7c409
-DIST gupnp-1.3.1.tar.xz 152484 BLAKE2B bfed35567da37f420568ae90acb8c33674f5ef754d00722ce11ec381c602f7aee86502276a3e6bb04abd98d49826ff11518bf6283d2c4be9c4ddf48fb880627f SHA512 ee632d42803cb689926839336c2427c9622c40d1a43e69ef4c48dd26714649d544772697b4a440861dc896a13faba6793b02b7b9ab7c5288b6cf125abbb2d477
+DIST gupnp-1.4.3.tar.xz 154812 BLAKE2B b41a8805853061399412f5eb7267e9913adb3054ebf8a3bd78f6df4c1607d4a944654f3bc6e154fefa98f1289a80055d0feb0168801d83a1ad59c25f5fcac784 SHA512 1963ce917458168c8bc5d669ee30a4071d83d3768ce1be8cbbd81c767853ca01950623a88628a0b1e403d1cce1f0bbc9df80acf4b75f91bfc0403e0d0e6bcedb
diff --git a/net-libs/gupnp/gupnp-1.2.7.ebuild b/net-libs/gupnp/gupnp-1.2.7.ebuild
deleted file mode 100644
index 1bc7fdb240a..00000000000
--- a/net-libs/gupnp/gupnp-1.2.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org meson-multilib python-single-r1 vala xdg
-
-DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
-SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
-
-IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ?? ( connman networkmanager )
-"
-
-# prefix: uuid dependency can be adapted to non-linux platforms
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.66:2[${MULTILIB_USEDEP}]
- >=net-libs/gssdp-1.2.3:0=[introspection?,${MULTILIB_USEDEP}]
- >=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
- >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- gtk-doc? ( >=dev-util/gtk-doc-1.14
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xml-dtd:4.2 )
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- virtual/pkgconfig
- !connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
- vala? ( $(vala_depend)
- >=net-libs/gssdp-1.2.3:0[vala]
- net-libs/libsoup:2.4[vala]
- )
-"
-
-src_prepare() {
- use introspection && vala_src_prepare
- xdg_src_prepare
-}
-
-multilib_src_configure() {
- local backend=system
- use kernel_linux && backend=linux
- use connman && backend=connman
- use networkmanager && backend=network-manager
-
- local emesonargs=(
- -Dcontext_manager=${backend}
- $(meson_native_use_bool introspection)
- $(meson_native_use_bool vala vapi)
- $(meson_native_use_bool gtk-doc gtk_doc)
- -Dexamples=false
- )
- meson_src_configure
-}
-
-multilib_src_install_all() {
- python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2
-}
diff --git a/net-libs/gupnp/gupnp-1.3.1.ebuild b/net-libs/gupnp/gupnp-1.4.3.ebuild
index a221091df02..c1d291ef2e7 100644
--- a/net-libs/gupnp/gupnp-1.3.1.ebuild
+++ b/net-libs/gupnp/gupnp-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -13,9 +13,9 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/g
LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
-IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
+IUSE="connman gtk-doc +introspection networkmanager vala"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( connman networkmanager )
"
diff --git a/net-libs/ignition-transport/Manifest b/net-libs/ignition-transport/Manifest
index bd26b45c87e..51f871dbe00 100644
--- a/net-libs/ignition-transport/Manifest
+++ b/net-libs/ignition-transport/Manifest
@@ -1 +1 @@
-DIST ignition-transport8_8.1.0.tar.gz 663459 BLAKE2B aa3acbf280b6ebdfc7a734521df4edf8724fe24cf92de81e4dd5bf33d65257c929417af205a44b731a878111a3586fef1e9d5b27df0b7343e402424108a22598 SHA512 eb64f18721190fcb79a5b45746fd44fa24274c6fe6c5021dd9306c15a327873377d07d4aa770633982038b84da650d3d0c8a56169222c0c88fa1318314fc4529
+DIST ignition-transport8_8.2.1.tar.gz 606719 BLAKE2B 7a7c1af30c3d30a2a0e946c7af39bc7711d75acbae665922167dc1431cbd104c369c34eabd5a651d08f2134492f024b851bbce47831db851567b2f7e0c1b9514 SHA512 517e1e35f1fbc5b2300f1e158de33b9076a8295762c327dca001fbc6373c5794754ba3d05d084140e207930f57a0e34c6e97f2491fe5dc645957f666289260a9
diff --git a/net-libs/ignition-transport/ignition-transport-8.1.0.ebuild b/net-libs/ignition-transport/ignition-transport-8.2.1.ebuild
index 7adee87f2cc..0d785702f14 100644
--- a/net-libs/ignition-transport/ignition-transport-8.1.0.ebuild
+++ b/net-libs/ignition-transport/ignition-transport-8.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/net-libs/jreen/Manifest b/net-libs/jreen/Manifest
deleted file mode 100644
index e2a20d6a22d..00000000000
--- a/net-libs/jreen/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jreen-1.3.0.tar.gz 287827 BLAKE2B 93204ed95d93377be6515ef2f1cf5eaba7194d168a3dda3ceee036693fead1db36c2e34c94aca7ba46dd859f6a29646719f867582a381b730c527cfc7e877474 SHA512 7b8267aa7d0e18c28dfeb6a1c7c0495d87bd2712fe10a0c6283f0cf89b72d2c67f98f97a812c9f34496af43eb00ddd94b7e60e942634fb03d0119f94a3d08464
diff --git a/net-libs/jreen/jreen-1.3.0-r1.ebuild b/net-libs/jreen/jreen-1.3.0-r1.ebuild
deleted file mode 100644
index ebb04f64dd7..00000000000
--- a/net-libs/jreen/jreen-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="https://github.com/euroelessar/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~ppc ~x86"
-else
- GIT_ECLASS="git-r3"
- EGIT_REPO_URI="https://github.com/euroelessar/${PN}.git"
-fi
-
-inherit cmake ${GIT_ECLASS}
-
-DESCRIPTION="Qt XMPP library"
-HOMEPAGE="https://github.com/euroelessar/jreen"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5
- media-libs/speex
- net-libs/libgsasl
- sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DJREEN_FORCE_QT4=OFF
- )
- cmake_src_configure
-}
diff --git a/net-libs/jreen/metadata.xml b/net-libs/jreen/metadata.xml
deleted file mode 100644
index 50d1e852742..00000000000
--- a/net-libs/jreen/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">euroelessar/jreen</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index a296b9b972a..fae73226a52 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,2 +1,3 @@
DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
DIST ldns-1.8.0.tar.gz 1283220 BLAKE2B f916a8c76d788ac7c52aea8bfe675ad4c614a0c6fb011b61f5a27d4a5dc1a2adb33b5c6992b4813b3758c9b7cceab1c77f8c1d66baaa4de993f23888bce69df1 SHA512 54b306160bb7fd76d181f4be0a13134017f6f98ae96e0c954409f31f262e9dbe611c4b76fb6dff47bb6155c652ed8d026b52a50dfcf611e54d9c204b314c4fd6
+DIST ldns-1.8.1.tar.gz 1284971 BLAKE2B ae01ef32571fe3996ddd41f911815239abb704ea1dee479fa612bfd701ca369222ab709923f014662248988cb4452a75bc5debad47d2b0386dc59169b353e6a3 SHA512 600f8e221716742caf439a425008827aef1814fc1d9e751f8f492d0235ff45ca48df90abba17979bac9f4485947bb9fe8102924d9cebe6cb56d5b788e1c4bd14
diff --git a/net-libs/ldns/files/ldns-1.8.1-pkgconfig.patch b/net-libs/ldns/files/ldns-1.8.1-pkgconfig.patch
new file mode 100644
index 00000000000..7731ff6af7a
--- /dev/null
+++ b/net-libs/ldns/files/ldns-1.8.1-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- a/packaging/libldns.pc.in
++++ b/packaging/libldns.pc.in
+@@ -8,6 +8,6 @@
+ URL: http://www.nlnetlabs.nl/projects/ldns
+ Version: @PACKAGE_VERSION@
+ Requires:
++Requires.private: libcrypto libssl
+ Libs: -L${libdir} -lldns
+-Libs.private: @LDFLAGS@
+ Cflags: -I${includedir}
diff --git a/net-libs/ldns/ldns-1.7.1-r5.ebuild b/net-libs/ldns/ldns-1.7.1-r5.ebuild
index 66e436d22ec..7c59ee0cdac 100644
--- a/net-libs/ldns/ldns-1.7.1-r5.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10} )
inherit multilib-minimal python-single-r1
-DESCRIPTION="a library with the aim to simplify DNS programming in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+DESCRIPTION="A library with the aim to simplify DNS programming in C"
+HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/3"
diff --git a/net-libs/ldns/ldns-1.7.1-r6.ebuild b/net-libs/ldns/ldns-1.7.1-r6.ebuild
index a0986afdac4..ecce27585a1 100644
--- a/net-libs/ldns/ldns-1.7.1-r6.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r6.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10} )
inherit multilib-minimal python-single-r1
-DESCRIPTION="a library with the aim to simplify DNS programming in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+DESCRIPTION="A library with the aim to simplify DNS programming in C"
+HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/3"
diff --git a/net-libs/ldns/ldns-1.8.0-r1.ebuild b/net-libs/ldns/ldns-1.8.0-r1.ebuild
index 5bf3f018928..1f6ae5d7b84 100644
--- a/net-libs/ldns/ldns-1.8.0-r1.ebuild
+++ b/net-libs/ldns/ldns-1.8.0-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10} )
inherit python-single-r1 autotools multilib-minimal
-DESCRIPTION="a library with the aim to simplify DNS programming in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+DESCRIPTION="A library with the aim to simplify DNS programming in C"
+HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax"
# configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/ldns/ldns-1.8.0-r2.ebuild b/net-libs/ldns/ldns-1.8.0-r4.ebuild
index 88e154dc8a7..93ba0aee830 100644
--- a/net-libs/ldns/ldns-1.8.0-r2.ebuild
+++ b/net-libs/ldns/ldns-1.8.0-r4.ebuild
@@ -1,32 +1,36 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10} )
inherit python-single-r1 autotools multilib-minimal
-DESCRIPTION="a library with the aim to simplify DNS programming in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+DESCRIPTION="A library with the aim to simplify DNS programming in C"
+HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+dane doc +ecdsa ed25519 ed448 examples gost python static-libs vim-syntax"
# configure will die if ecdsa is enabled and ssl is not
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
"
-RDEPEND="
+COMMON_DEPEND="
python? ( ${PYTHON_DEPS} )
>=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}]
+ examples? ( net-libs/libpcap )
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
python? ( dev-lang/swig )
doc? ( app-doc/doxygen )
"
+RDEPEND="${COMMON_DEPEND}
+ !<net-dns/ldns-utils-1.8.0-r2
+"
RESTRICT="test" # 1.6.9 has no test directory
@@ -58,8 +62,8 @@ multilib_src_configure() {
$(multilib_native_use_with python pyldnsx) \
--with-ssl="${EPREFIX}"/usr \
--enable-sha2 \
- --without-drill \
- --without-examples \
+ $(multilib_native_with drill) \
+ $(multilib_native_use_with examples) \
${dane_ta_usage} \
--disable-rpath
}
@@ -107,8 +111,4 @@ multilib_src_install_all() {
insinto /usr/share/vim/vimfiles/ftdetect
doins libdns.vim
fi
-
- einfo
- elog "Install net-dns/ldns-utils if you want drill and examples"
- einfo
}
diff --git a/net-libs/ldns/ldns-1.8.1.ebuild b/net-libs/ldns/ldns-1.8.1.ebuild
new file mode 100644
index 00000000000..d274002ab98
--- /dev/null
+++ b/net-libs/ldns/ldns-1.8.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit python-single-r1 multilib-minimal
+
+DESCRIPTION="A library with the aim to simplify DNS programming in C"
+HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc examples python static-libs"
+
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+BDEPEND="
+ python? ( dev-lang/swig )
+ doc? ( app-doc/doxygen )
+"
+DEPEND="
+ python? ( ${PYTHON_DEPS} )
+ >=dev-libs/openssl-1.1.1l-r1:0=[${MULTILIB_USEDEP},static-libs?]
+ examples? ( net-libs/libpcap )
+"
+RDEPEND="${DEPEND}
+ !<net-dns/ldns-utils-1.8.0-r2
+"
+
+RESTRICT="test" # missing test directory
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/ldns-config
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/ldns-1.8.1-pkgconfig.patch"
+ )
+ default
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable static-libs static) \
+ $(multilib_native_use_with python pyldns) \
+ $(multilib_native_use_with python pyldnsx) \
+ --with-ssl="${EPREFIX}"/usr \
+ $(multilib_native_with drill) \
+ $(multilib_native_use_with examples) \
+ --disable-rpath
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi && use doc ; then
+ emake doxygen
+ fi
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi && use doc ; then
+ dodoc -r doc/html
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc Changelog README*
+
+ find "${D}" -name '*.la' -delete || die
+ use python && python_optimize
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins libdns.vim
+}
diff --git a/net-libs/libad9361-iio/libad9361-iio-0.2.ebuild b/net-libs/libad9361-iio/libad9361-iio-0.2.ebuild
index 630cb27fb6e..50286e07793 100644
--- a/net-libs/libad9361-iio/libad9361-iio-0.2.ebuild
+++ b/net-libs/libad9361-iio/libad9361-iio-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ if [ "${PV}" = "9999" ]; then
inherit git-r3
else
SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~riscv ~x86"
fi
LICENSE="LGPL-2.1"
diff --git a/net-libs/libaxc/Manifest b/net-libs/libaxc/Manifest
index 248c57f93c7..4ecd71f036b 100644
--- a/net-libs/libaxc/Manifest
+++ b/net-libs/libaxc/Manifest
@@ -1,3 +1,4 @@
DIST libaxc-0.3.4.tar.gz 40198 BLAKE2B 78fc122eefbc5c6173bdad5cf31734cf95b750c09bddede5b2656a88bede3d6c25fb22af5447681c58eb1f296ee326480e22aacb843d951f1bd7a6933155432a SHA512 7b6b5466ee89d78d3c3a2e7cf961dfb3310bff01947e69e906c83ff97e89d1bdc0e2e92f7bd0d4b48a97af91409f435a4fd869229af5b67b2f66ba464bbfd7b8
DIST libaxc-0.3.5.tar.gz 40418 BLAKE2B bcafe30c295fb6c5bd075cc7ecb9b81dcb094301a65d51ec7bcff82159c4fecdc6a4a64530e81c429803c8e267c3d6f6ccede8b5fda7d920af1c10c3806d66f0 SHA512 7708c136dfd57cc799ac467bea010ddbdcfe78a4cdae3c5882f97de7674e38e5f183f94fd42dd2df74dfec451f1822ef43122321aca46c042d5355b74e128694
DIST libaxc-0.3.6.tar.gz 40488 BLAKE2B e59d73e0011b11c0e594297d15353f0e7c378c5ce29c2f747f0a10f7ac302abbe8a0e6f3cad37a652a5a4763d15f393e2cbd7272c4249883c0c99640d18ab518 SHA512 0e02282e42597eaf641fcd620c103c4892b26120f9aec442ce61b99e2a5042d62213bed7786aede296e1024fea26ef9a21950d96a9a520ca6a5d5c524620f42d
+DIST libaxc-0.3.7.tar.gz 41742 BLAKE2B e43220745cbf1e3f375c69218cc0c5bc944e2fbfd1ca2a79be38d8cac9206609f757b8afbf5d5a1411ad29cddbb8edf9cf67b570fe152d91e77e070ddbf4666f SHA512 e9982a54307ebc4fbecdd6482e0ccc9b1d5539047f455f66a4f25c067e2da8eba782163ccf0ad8aac8b11867da5d7efb309c403cdfed464e6865d3e03e09ea11
diff --git a/net-libs/libaxc/libaxc-0.3.7.ebuild b/net-libs/libaxc/libaxc-0.3.7.ebuild
new file mode 100644
index 00000000000..564171853f9
--- /dev/null
+++ b/net-libs/libaxc/libaxc-0.3.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="axc-${PV}"
+DESCRIPTION="Client library for libsignal-protocol-c"
+HOMEPAGE="https://github.com/gkdr/axc"
+SRC_URI="https://github.com/gkdr/axc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3" # not GPL-3+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+ dev-db/sqlite
+ dev-libs/glib
+ dev-libs/libgcrypt
+ net-libs/libsignal-protocol-c
+ "
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-util/cmocka )
+ "
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+RESTRICT="!test? ( test )"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+ rm -R lib || die # unbundle libsignal-protocol-c
+ default
+}
+
+src_compile() {
+ local make_args=(
+ PREFIX=/usr
+
+ AR="$(tc-getAR)"
+ CC="$(tc-getCC)"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ )
+ emake "${make_args[@]}"
+}
+
+src_test() {
+ # TODO: Test failures seem to be ignored in the upstream Makefile?
+ # e.g. https://github.com/gkdr/axc/blob/master/Makefile#L153
+ emake CC="$(tc-getCC)" test
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX=/usr install
+
+ # Respect libdir other than /usr/lib, e.g. /usr/lib64
+ local libdir="$(get_libdir)"
+ if [[ ${libdir} != lib ]]; then
+ mv "${ED}"/usr/{lib,${libdir}} || die
+ sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \
+ -i "${ED}/usr/${libdir}/pkgconfig/libaxc.pc" || die
+ fi
+
+ einstalldocs
+
+ if ! use static-libs ; then
+ rm "${ED}/usr/${libdir}/libaxc.a" || die
+ fi
+}
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 01ce4fdf2a1..04ebc2d345a 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,6 +1,10 @@
DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781bba6ad014ae14859f1e0bab3080c59a18910cf7447eb56da4b17a0e1843fdd3669d22636df9e4ddcc4526e4293bfd86dc884983a29a5f76c SHA512 7ee27da3d26be0e93ecddff7bb21ef1746bcdb07f9a2b0ea48065367b4c44391e974e04a21e511c05fca8f55971ab8e3c3ac01a3775cc52a537d9e10966d9871
DIST bitcoin-0.21.1.knots20210629.patches.tar.xz 623916 BLAKE2B c6b669270b7f9718c8452a1c28280b6005edee299a3ab8d754dbf722d021576871ddce200342bf157dd5158c058686aa3dde913970779d8c2e560b8df772821c SHA512 ba058554453efc7ad036b8cc945ba403a6bd4e30dae0fbcee7fbe2f0ce90854a867fe49b0522595c081930d406bdf56987982f403fc8299b3c776eea4672abae
+DIST bitcoin-21.2.knots20210629.patches.tar.xz 711680 BLAKE2B da49c6ab075b2478482daeafefcad507f12718e4ed2af847e64aa30ff0839876b9a5b68bc53f2327c9e18df51870d50f7e7d6b2215d5fde1d147567d9d60ffa5 SHA512 e0386f2712053475548c3d7fa927117d1fefa27d447c1398bec152e601a9be0af7a1b03f83f5345b03af252b372091548ce75075f42e4831f4e85f622531962b
+DIST bitcoin-22.0.knots20211108.patches.tar.xz 1318256 BLAKE2B d6e56bc0ca1d706e99e7f42d8f335f016335b6bf3637c733d993696872f0a4c655cc58fc0394dfdf9916e13f0d7fbdcebf25fbdc9a165227e3c59133033644c0 SHA512 daab5860b7c7e137b6bf350cdc153e6e19172e49935640d1f6fe1f1be1e4df805b1db7fd30b0f95a560106956adab70cc6282fe933ae9de153cb971dd280f83d
DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46
+DIST bitcoin-v0.21.2.tar.gz 7768110 BLAKE2B fe8616235caba29ebf3a36d1a8484d5d534db0f7a6486822e88f8322eb9b7220b1c7539feee5b9486129eb97d5a6810b8542e627a6bf3451094821f56cd8d9f8 SHA512 4b3554b0f4a5f68d42a9bec273558098239c5b8be35248d1957d00076a8c57bf3d6cfb7af57b7340b0df7aea49c9bf2607a58cbb1573482527be4bd6da812dc0
+DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild
new file mode 100644
index 00000000000..2fa948c0c2f
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+BITCOINCORE_COMMITHASH="af591f2068d0363c92d9756ca39c43db85e5804c"
+KNOTS_PV="${PV}.knots20210629"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Bitcoin Core consensus library"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+ https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v0.${PV}.tar.gz
+ https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm knots"
+
+DEPEND="
+ >dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ >=sys-devel/automake-1.13
+"
+
+DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+ if use knots; then
+ elog "You are building ${PN} from Bitcoin Knots."
+ elog "For more information, see:"
+ elog "https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+ else
+ elog "You are building ${PN} from Bitcoin Core."
+ elog "For more information, see:"
+ elog "https://bitcoincore.org/en/2021/09/29/release-0.${PV}/"
+ fi
+ if has_version "<${CATEGORY}/${PN}-0.21.1" ; then
+ ewarn "CAUTION: BITCOIN PROTOCOL CHANGE INCLUDED"
+ ewarn "This release adds enforcement of the Taproot protocol change to the Bitcoin"
+ ewarn "rules, beginning in November. Protocol changes require user consent to be"
+ ewarn "effective, and if enforced inconsistently within the community may compromise"
+ ewarn "your security or others! If you do not know what you are doing, learn more"
+ ewarn "before November. (You must make a decision either way - simply not upgrading"
+ ewarn "is insecure in all scenarios.)"
+ ewarn "To learn more, see https://bitcointaproot.cc"
+ fi
+}
+
+src_prepare() {
+ local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+ eapply "${knots_patchdir}/${KNOTS_P}_p1-syslibs.patch"
+
+ if use knots; then
+ eapply "${knots_patchdir}/${KNOTS_P}_p2-fixes.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}_p3-features.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}_p4-branding.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}_p5-ts.patch"
+ fi
+
+ eapply_user
+
+ eautoreconf
+ rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+ local my_econf=(
+ $(use_enable asm)
+ --without-qtdbus
+ --without-qrencode
+ --without-miniupnpc
+ --disable-tests
+ --disable-wallet
+ --disable-zmq
+ --with-libs
+ --disable-util-cli
+ --disable-util-tx
+ --disable-util-wallet
+ --disable-bench
+ --without-daemon
+ --without-gui
+ --disable-fuzz
+ --disable-ccache
+ --disable-static
+ --with-system-libsecp256k1
+ )
+ econf "${my_econf[@]}"
+}
+
+src_install() {
+ default
+
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild
new file mode 100644
index 00000000000..a0b6796e935
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+BITCOINCORE_COMMITHASH="a0988140b71485ad12c3c3a4a9573f7c21b1eff8"
+KNOTS_PV="${PV}.knots20211108"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Bitcoin Core consensus library"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+ https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+ https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm knots"
+
+RDEPEND="
+ >dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=sys-devel/automake-1.13
+ || ( >=sys-devel/gcc-7[cxx] >=sys-devel/clang-5 )
+"
+
+DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+ if use knots; then
+ elog "You are building ${PN} from Bitcoin Knots."
+ elog "For more information, see:"
+ elog "https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+ else
+ elog "You are building ${PN} from Bitcoin Core."
+ elog "For more information, see:"
+ elog "https://bitcoincore.org/en/2021/09/13/release-${PV}/"
+ fi
+ if has_version "<${CATEGORY}/${PN}-0.21.1" ; then
+ ewarn "CAUTION: BITCOIN PROTOCOL CHANGE INCLUDED"
+ ewarn "This release adds enforcement of the Taproot protocol change to the Bitcoin"
+ ewarn "rules, beginning in November. Protocol changes require user consent to be"
+ ewarn "effective, and if enforced inconsistently within the community may compromise"
+ ewarn "your security or others! If you do not know what you are doing, learn more"
+ ewarn "before November. (You must make a decision either way - simply not upgrading"
+ ewarn "is insecure in all scenarios.)"
+ ewarn "To learn more, see https://bitcointaproot.cc"
+ fi
+
+ if [[ ${MERGE_TYPE} != "binary" ]] ; then
+ if ! test-flag-CXX -std=c++17 ; then
+ die "Building ${CATEGORY}/${P} requires at least GCC 7 or Clang 5"
+ fi
+ fi
+}
+
+src_prepare() {
+ local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+ eapply "${knots_patchdir}/${KNOTS_P}_p1-syslibs.patch"
+
+ if use knots; then
+ eapply "${knots_patchdir}/${KNOTS_P}_p2-fixes.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}_p3-features.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}_p4-branding.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}_p5-ts.patch"
+ fi
+
+ default
+
+ eautoreconf
+ rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+ local my_econf=(
+ $(use_enable asm)
+ --without-qtdbus
+ --disable-ebpf
+ --without-natpmp
+ --without-qrencode
+ --without-miniupnpc
+ --disable-tests
+ --disable-wallet
+ --disable-zmq
+ --with-libs
+ --disable-util-cli
+ --disable-util-tx
+ --disable-util-util
+ --disable-util-wallet
+ --disable-bench
+ --without-daemon
+ --without-gui
+ --disable-fuzz
+ --disable-fuzz-binary
+ --disable-ccache
+ --disable-static
+ --with-system-libsecp256k1
+ )
+ econf "${my_econf[@]}"
+}
+
+src_install() {
+ default
+
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libbloom/libbloom-1.5-r2.ebuild b/net-libs/libbloom/libbloom-1.5-r2.ebuild
index 9be6bd8a03a..17be8bdca71 100644
--- a/net-libs/libbloom/libbloom-1.5-r2.ebuild
+++ b/net-libs/libbloom/libbloom-1.5-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit toolchain-funcs
-DESCRIPTION="A simple and small bloom filter implementation in plain C."
+DESCRIPTION="A simple and small bloom filter implementation in plain C"
HOMEPAGE="https://github.com/jvirkki/libbloom"
SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/net-libs/libbloom/libbloom-1.6.ebuild b/net-libs/libbloom/libbloom-1.6.ebuild
index 4ba1dfabf23..a792f191fa4 100644
--- a/net-libs/libbloom/libbloom-1.6.ebuild
+++ b/net-libs/libbloom/libbloom-1.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit toolchain-funcs
-DESCRIPTION="A simple and small bloom filter implementation in plain C."
+DESCRIPTION="A simple and small bloom filter implementation in plain C"
HOMEPAGE="https://github.com/jvirkki/libbloom"
SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index db5113ea61a..512e1bc72a5 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,3 +1 @@
-DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
-DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
DIST libbtbb-2020-12-R1.tar.gz 308434 BLAKE2B 0f802f3c5eef0c434d0468a72104cf63e6bf5f29467e1606d2892751cd8b4824639e3847c0b8305ace926667434e668d75b6d4544e8e026b07872bafbb09c90b SHA512 a3dc2c8d27e4b85aae4847ac39f871ecf800ebf911aacd01682da6c50b13f3247c7d683bce855f2cf59b56a29c661223a2c22e98a8d86e8edaccd57af282bac6
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
deleted file mode 100644
index 23524a6f4e3..00000000000
--- a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
- inherit git-r3
-else
- MY_PV=${PV/\./-}
- MY_PV=${MY_PV/./-R}
- S=${WORKDIR}/${PN}-${MY_PV}
- SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="static-libs wireshark-plugins"
-
-RDEPEND="
- wireshark-plugins? (
- >=net-analyzer/wireshark-1.8.3-r1:=
- )
-"
-DEPEND="${RDEPEND}
- wireshark-plugins? ( dev-libs/glib
- virtual/pkgconfig )"
-
-get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
-
-which_plugins() {
- if has_version '>=net-analyzer/wireshark-2.2.0'; then
- plugins=""
- elif has_version '>=net-analyzer/wireshark-1.12.0'; then
- plugins="btbb btbredr"
- elif has_version '<net-analyzer/wireshark-1.12.0'; then
- plugins="btbb btle btsm"
- fi
-}
-
-src_prepare() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake-utils_src_prepare
-
- if use wireshark-plugins; then
- which_plugins
- for i in ${plugins}
- do
- sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_prepare
- done
- fi
-}
-
-src_configure() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- local mycmakeargs=(
- -DENABLE_PYTHON=OFF
- -DBUILD_STATIC_LIB=$(usex static-libs)
- -DBUILD_ROOT="${ED}"
- )
- cmake-utils_src_configure
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- local mycmakeargs=(
- -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
- )
- cmake-utils_src_configure
- done
- fi
-}
-
-src_compile() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake-utils_src_compile
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_compile
- done
- fi
-}
-
-src_test() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake-utils_src_test
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_test
- done
- fi
-}
-
-src_install() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake-utils_src_install
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_install
- done
- fi
-}
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
deleted file mode 100644
index f4a117ca300..00000000000
--- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
- inherit git-r3
-else
- MY_PV=${PV/\./-}
- MY_PV=${MY_PV/./-R}
- S=${WORKDIR}/${PN}-${MY_PV}
- SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
- KEYWORDS="amd64 arm x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="static-libs wireshark-plugins"
-
-RDEPEND="
- wireshark-plugins? (
- >=net-analyzer/wireshark-1.8.3-r1:=
- )
-"
-DEPEND="${RDEPEND}
- wireshark-plugins? ( dev-libs/glib
- virtual/pkgconfig )"
-
-get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
-
-which_plugins() {
- if has_version '>=net-analyzer/wireshark-2.2.0'; then
- plugins=""
- elif has_version '>=net-analyzer/wireshark-1.12.0'; then
- plugins="btbb btbredr"
- elif has_version '<net-analyzer/wireshark-1.12.0'; then
- plugins="btbb btle btsm"
- fi
-}
-
-src_prepare() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake-utils_src_prepare
-
- if use wireshark-plugins; then
- which_plugins
- for i in ${plugins}
- do
- sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_prepare
- done
- fi
-}
-
-src_configure() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- local mycmakeargs=(
- -DENABLE_PYTHON=OFF
- -DBUILD_STATIC_LIB=$(usex static-libs)
- -DBUILD_ROOT="${ED}"
- )
- cmake-utils_src_configure
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- local mycmakeargs=(
- -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
- )
- cmake-utils_src_configure
- done
- fi
-}
-
-src_compile() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake-utils_src_compile
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_compile
- done
- fi
-}
-
-src_test() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake-utils_src_test
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_test
- done
- fi
-}
-
-src_install() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake-utils_src_install
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_install
- done
- fi
-}
diff --git a/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
new file mode 100644
index 00000000000..c6a7e694e72
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library to decode Bluetooth baseband packets"
+HOMEPAGE="https://github.com/greatscottgadgets/libbtbb"
+
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
+ inherit git-r3
+else
+ MY_PV=${PV/\./-}
+ MY_PV=${MY_PV/./-R}
+ SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+ S="${WORKDIR}"/${PN}-${MY_PV}
+ KEYWORDS="amd64 arm x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="static-libs"
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_PYTHON=OFF
+ -DBUILD_STATIC_LIB=$(usex static-libs)
+ )
+ cmake_src_configure
+}
diff --git a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
deleted file mode 100644
index edbf18eed8f..00000000000
--- a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
- inherit git-r3
-else
- MY_PV=${PV/\./-}
- MY_PV=${MY_PV/./-R}
- S=${WORKDIR}/${PN}-${MY_PV}
- SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="static-libs wireshark-plugins"
-
-RDEPEND="
- wireshark-plugins? (
- >=net-analyzer/wireshark-1.8.3-r1:=
- )
-"
-DEPEND="${RDEPEND}
- wireshark-plugins? ( dev-libs/glib
- virtual/pkgconfig )"
-
-get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
-
-which_plugins() {
- if has_version '>=net-analyzer/wireshark-2.2.0'; then
- plugins=""
- elif has_version '>=net-analyzer/wireshark-1.12.0'; then
- plugins="btbb btbredr"
- elif has_version '<net-analyzer/wireshark-1.12.0'; then
- plugins="btbb btle btsm"
- fi
-}
-
-src_prepare() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake_src_prepare
-
- if use wireshark-plugins; then
- which_plugins
- for i in ${plugins}
- do
- sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake_src_prepare
- done
- fi
-}
-
-src_configure() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- local mycmakeargs=(
- -DENABLE_PYTHON=OFF
- -DBUILD_STATIC_LIB=$(usex static-libs)
- -DBUILD_ROOT="${ED}"
- )
- cmake_src_configure
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- local mycmakeargs=(
- -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
- )
- cmake_src_configure
- done
- fi
-}
-
-src_compile() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake_src_compile
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake_src_compile
- done
- fi
-}
-
-src_test() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake_src_test
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake_src_test
- done
- fi
-}
-
-src_install() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake_src_install
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake_src_install
- done
- fi
-}
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index edbf18eed8f..9085d00e99e 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,150 +1,32 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
+DESCRIPTION="Library to decode Bluetooth baseband packets"
+HOMEPAGE="https://github.com/greatscottgadgets/libbtbb"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
inherit git-r3
else
MY_PV=${PV/\./-}
MY_PV=${MY_PV/./-R}
- S=${WORKDIR}/${PN}-${MY_PV}
SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+ S="${WORKDIR}"/${PN}-${MY_PV}
KEYWORDS="~amd64 ~arm ~x86"
fi
LICENSE="GPL-2"
SLOT="0/${PV}"
-IUSE="static-libs wireshark-plugins"
-
-RDEPEND="
- wireshark-plugins? (
- >=net-analyzer/wireshark-1.8.3-r1:=
- )
-"
-DEPEND="${RDEPEND}
- wireshark-plugins? ( dev-libs/glib
- virtual/pkgconfig )"
-
-get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
-
-which_plugins() {
- if has_version '>=net-analyzer/wireshark-2.2.0'; then
- plugins=""
- elif has_version '>=net-analyzer/wireshark-1.12.0'; then
- plugins="btbb btbredr"
- elif has_version '<net-analyzer/wireshark-1.12.0'; then
- plugins="btbb btle btsm"
- fi
-}
-
-src_prepare() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake_src_prepare
-
- if use wireshark-plugins; then
- which_plugins
- for i in ${plugins}
- do
- sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake_src_prepare
- done
- fi
-}
+IUSE="static-libs"
src_configure() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
local mycmakeargs=(
-DENABLE_PYTHON=OFF
-DBUILD_STATIC_LIB=$(usex static-libs)
- -DBUILD_ROOT="${ED}"
)
cmake_src_configure
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- local mycmakeargs=(
- -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
- )
- cmake_src_configure
- done
- fi
-}
-
-src_compile() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake_src_compile
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake_src_compile
- done
- fi
-}
-
-src_test() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake_src_test
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake_src_test
- done
- fi
-}
-
-src_install() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake_src_install
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- if has_version '>=net-analyzer/wireshark-2.0'; then
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
- else
- CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
- fi
- BUILD_DIR="${WORKDIR}"/${i}_build
- cmake_src_install
- done
- fi
}
diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml
index d7061daf597..52a7dfec9b4 100644
--- a/net-libs/libbtbb/metadata.xml
+++ b/net-libs/libbtbb/metadata.xml
@@ -5,9 +5,6 @@
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
- <use>
- <flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag>
- </use>
<upstream>
<remote-id type="github">greatscottgadgets/libbtbb</remote-id>
<remote-id type="sourceforge">libbtbb</remote-id>
diff --git a/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild b/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
index d6114f0e9bf..0d69d8f7b40 100644
--- a/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
+++ b/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit cmake-utils
+EAPI=8
+inherit cmake
DATE=20150311
MY_PV="${PV/.${DATE}_p/+${DATE}-}"
@@ -22,19 +22,21 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}-debian-${MY_PX}"
+PATCHES=( "${S}"/debian/patches/ )
+
src_prepare() {
- rm -f "${S}"/debian/patches/0001*.patch || die
- eapply "${S}"/debian/patches/*.patch
+ cmake_src_prepare
+ sed -i -e "/^version=/s/=.*$/=${MY_PX}/" version.sh || die
sed -e 's%#include <ipset%#include <libcorkipset%' \
-e 's%#include "ipset%#include "libcorkipset%' \
-i include/ipset/*.h \
*/*/*/*.c \
*/*/*/*.c.in \
*/*/*.c */*.c || die
- sed -i -e "s/-Werror/-Wextra/" CMakeLists.txt || die
+ sed -e "s/-Werror/-Wextra/" \
+ -e "/^add_subdirectory(docs)/d" \
+ -i CMakeLists.txt || die
mv include/{,libcork}ipset || die
-
- cmake-utils_src_prepare
}
diff --git a/net-libs/libdom/libdom-0.4.1-r1.ebuild b/net-libs/libdom/libdom-0.4.1-r1.ebuild
index 7cc2bb687a4..4d56bfc61de 100644
--- a/net-libs/libdom/libdom-0.4.1-r1.ebuild
+++ b/net-libs/libdom/libdom-0.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="expat test xml"
RESTRICT="!test? ( test )"
diff --git a/net-libs/libecap/libecap-1.0.1.ebuild b/net-libs/libecap/libecap-1.0.1.ebuild
index bca73f55ae0..a7c1ad4fa87 100644
--- a/net-libs/libecap/libecap-1.0.1.ebuild
+++ b/net-libs/libecap/libecap-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.e-cap.org/archive/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
RDEPEND="!net-libs/libecap:0
!net-libs/libecap:0.2"
diff --git a/net-libs/libesmtp/libesmtp-9999.ebuild b/net-libs/libesmtp/libesmtp-9999.ebuild
index c117af101c9..2701484ef98 100644
--- a/net-libs/libesmtp/libesmtp-9999.ebuild
+++ b/net-libs/libesmtp/libesmtp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,11 +14,16 @@ else
SRC_URI="https://github.com/libesmtp/libESMTP/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/libESMTP-${PV}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/7"
+# 0/7 was a snapshot before 1.1.0
+# The SONAME was fixed just before the 1.1.0 release was made
+# ... but a patch was needed to get it exactly right too
+# so, we're on 0/8 now, even though ABI compatibility actually remained
+# in terms of symbols with the original <1.1.0.
+SLOT="0/8"
IUSE="ssl static-libs threads"
RDEPEND="ssl? ( >=dev-libs/openssl-1.1.0:0= )"
diff --git a/net-libs/libgfbgraph/Manifest b/net-libs/libgfbgraph/Manifest
index d1d22499dfa..ead3b0e1861 100644
--- a/net-libs/libgfbgraph/Manifest
+++ b/net-libs/libgfbgraph/Manifest
@@ -1,2 +1 @@
-DIST gfbgraph-0.2.4.tar.xz 39520 BLAKE2B 71ce5a091b5ab7d27b7b5353ff76cb67c90a358371f1afe41a561bab195c7e01353854fbd28c3970c3179ded24daf41f7150f70b5efcb1c81aac89de9fed2c88 SHA512 e6d63e56f4d67b59b0abbfb9dfe3aad8b142023413246015a84078c76f631eaa6e9fa7eb5771f64156ea01e160eb07b17783059e449036b372b4bcb26751ff68
DIST gfbgraph-0.2.5.tar.xz 283632 BLAKE2B 7a229e098623613c3c758dd7d9d4802cf82a6b8c7f6c81ad8de2392597d13b6db9978ef1794321aa6915f9065dca030e58ef1569d64f956a7048846e996cea23 SHA512 c3a1168935272377c211d95e4efcb8ed56d129589bcaa6e0d7b5dff7ca916f0c63dc30eb1a903aea3de51cb109ae787e985bdd9485fb97cd1b5b6971bea01a1e
diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
deleted file mode 100644
index f3649d47e70..00000000000
--- a/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="gfbgraph"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="A GObject library for Facebook Graph API"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libgfbgraph/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="+introspection"
-
-DEPEND="
- dev-libs/glib:2
- dev-libs/json-glib[introspection?]
- net-libs/libsoup:2.4[introspection?]
- net-libs/gnome-online-accounts
- net-libs/rest:0.7[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- dev-util/gtk-doc
- >=dev-util/gtk-doc-am-1.14
- virtual/pkgconfig
-"
-# gtk-doc needed for autoreconf
-
-src_prepare() {
- # Test requires a credentials.ini file.
- # https://gitlab.gnome.org/GNOME/libgfbgraph/-/issues/7#note_802926
- sed -i -e 's:TESTS = gtestutils:TESTS =:' tests/Makefile.am || die
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_enable introspection)
-}
-
-src_install() {
- gnome2_src_install
- # Remove files installed in the wrong place
- # Also, already done by portage
- # https://bugzilla.gnome.org/show_bug.cgi?id=752581
- rm -rf "${ED}"/usr/doc
-}
diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild
index adc704afe62..68894bb99e0 100644
--- a/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild
+++ b/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgfbgraph/"
LICENSE="LGPL-2.1+"
SLOT="0.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="+introspection"
DEPEND="
diff --git a/net-libs/libgsasl/libgsasl-1.10.0.ebuild b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
index c397cf421f6..95721765609 100644
--- a/net-libs/libgsasl/libgsasl-1.10.0.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ LICENSE="GPL-3 LGPL-3"
SLOT="0"
# Before giving keywords, please check https://www.gnu.org/software/gsasl/ to see
# if it's a stable release or not!
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="idn gcrypt kerberos nls ntlm static-libs"
DEPEND="
diff --git a/net-libs/libhackrf/libhackrf-2021.03.1.ebuild b/net-libs/libhackrf/libhackrf-2021.03.1.ebuild
index 94e14cca15c..8021c6bcf61 100644
--- a/net-libs/libhackrf/libhackrf-2021.03.1.ebuild
+++ b/net-libs/libhackrf/libhackrf-2021.03.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
else
S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
SRC_URI="https://github.com/greatscottgadgets/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
- KEYWORDS="amd64 ~arm ~ppc x86"
+ KEYWORDS="amd64 ~arm ~ppc ~riscv x86"
fi
LICENSE="BSD"
diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index 2748b0f2383..3e5d822e6f3 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1 +1,2 @@
DIST libhtp-0.5.39.tar.gz 499233 BLAKE2B fec9e2b0dd867becde972e9e2bf572a21d90acc747a8ee8338e2fe68240d690706db01b12c3cf8c6bf1b5d4415da4e4a5bf92a056e1dff96f54a9ac569906712 SHA512 2c62b0a9a2f69f999a58acade362e5fcd9d85da5c720a403b0b6e7352981a206781f123aaa2f730803f2ea6088b4491d58b3c2783f8b32e4cfe1517d812e66ff
+DIST libhtp-0.5.40.tar.gz 499564 BLAKE2B 37239d8d0afb6841c54bab1669a17ec7336b10998f8835ef91cf9556dd7449991ce6fb04a408d16b431ba6327b32f6f509a79a4c79ffc6e88e555fcf2e9f2cce SHA512 e60ad9c2bbdb0aea0966b4d672353ae68aa1fde4dfb3ad4eabc3b9ebf7907685cf583a2b66e5bfc080c5833a2fc3c593e0cd025c62051f6fe13f89d450bab18b
diff --git a/net-libs/libhtp/libhtp-0.5.40.ebuild b/net-libs/libhtp/libhtp-0.5.40.ebuild
new file mode 100644
index 00000000000..c105c3aaa52
--- /dev/null
+++ b/net-libs/libhtp/libhtp-0.5.40.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="security-aware parser for the HTTP protocol and the related bits and pieces"
+HOMEPAGE="https://github.com/OISF/libhtp"
+SRC_URI="https://github.com/OISF/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+IUSE="debug"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # The debug configure logic is broken.
+ ECONF_SOURCE=${S} \
+ econf \
+ $(usex debug '--enable-debug' '') \
+ --disable-static
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name '*.la' -delete || die "Failed to remove .la files"
+}
diff --git a/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch b/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch
index 763693e21b8..4373666c8ee 100644
--- a/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch
+++ b/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch
@@ -1,3 +1,6 @@
+https://git.netsurf-browser.org/libhubbub.git/commit/?id=c0c4d702b5560c0590d73af4ea055514cab38e4f
+https://bugs.gentoo.org/699746
+https://bugs.gentoo.org/694042
diff -u -rb libhubbub-0.3.6/test.o/tokeniser2.c libhubbub-0.3.6/test/tokeniser2.c
--- libhubbub-0.3.6/test.o/tokeniser2.c 2019-06-26 22:39:57.000000000 +0200
+++ libhubbub-0.3.6/test/tokeniser2.c 2019-11-06 13:09:02.321068038 +0200
diff --git a/net-libs/libhubbub/libhubbub-0.3.7.ebuild b/net-libs/libhubbub/libhubbub-0.3.7.ebuild
index f5f01b8ad5f..b2416650628 100644
--- a/net-libs/libhubbub/libhubbub-0.3.7.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
IUSE="doc test"
BDEPEND="
diff --git a/net-libs/libident/libident-0.32-r1.ebuild b/net-libs/libident/libident-0.32-r1.ebuild
index 6f49ea50ba4..e225b30168e 100644
--- a/net-libs/libident/libident-0.32-r1.ebuild
+++ b/net-libs/libident/libident-0.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://people.via.ecp.fr/~rem/libident/${P}.tar.bz2"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
src_prepare() {
default
diff --git a/net-libs/libiio/libiio-0.21.ebuild b/net-libs/libiio/libiio-0.21.ebuild
index 66f1603cbe6..bd8c312d30a 100644
--- a/net-libs/libiio/libiio-0.21.ebuild
+++ b/net-libs/libiio/libiio-0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then
inherit git-r3
else
SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~riscv ~x86"
fi
LICENSE="LGPL-2.1"
diff --git a/net-libs/libircclient/libircclient-1.10.ebuild b/net-libs/libircclient/libircclient-1.10.ebuild
index 97426993338..9b134f6df9d 100644
--- a/net-libs/libircclient/libircclient-1.10.ebuild
+++ b/net-libs/libircclient/libircclient-1.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv sparc x86"
IUSE="doc ipv6 ssl static-libs threads"
DEPEND="ssl? (
diff --git a/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch b/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch
new file mode 100644
index 00000000000..987544ffca6
--- /dev/null
+++ b/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.ac b/configure.ac
+index 5fe1deb..9efe153 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,6 +140,8 @@ if test x"$libiscsi_cv_HAVE_SG_IO" = x"yes"; then
+ AC_DEFINE(HAVE_SG_IO,1,[Whether we have SG_IO support])
+ fi
+
++AC_ARG_WITH([rdma], AS_HELP_STRING([--with-rdma], [Build with rdma support]))
++
+ AC_CACHE_CHECK([for iSER support],libiscsi_cv_HAVE_LINUX_ISER,[
+ AC_TRY_COMPILE([
+ #include <infiniband/verbs.h>
+@@ -147,10 +149,10 @@ AC_TRY_COMPILE([
+ #include <rdma/rdma_verbs.h>],
+ [int ibv = IBV_WC_SEND;],
+ libiscsi_cv_HAVE_LINUX_ISER=yes,libiscsi_cv_HAVE_LINUX_ISER=no)])
+-if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes"; then
++if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes" && test "x$with_rdma" = "xyes"; then
+ AC_DEFINE(HAVE_LINUX_ISER,1,[Whether we have iSER support])
+ fi
+-AM_CONDITIONAL([HAVE_LINUX_ISER], [test $libiscsi_cv_HAVE_LINUX_ISER = yes])
++AM_CONDITIONAL([HAVE_LINUX_ISER], [test "x$with_rdma" = "xyes"])
+
+ AC_CACHE_CHECK([whether libcunit is available],
+ [ac_cv_have_cunit],
diff --git a/net-libs/libiscsi/libiscsi-1.19.0.ebuild b/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild
index bbf7c504a2c..62962ce3a2c 100644
--- a/net-libs/libiscsi/libiscsi-1.19.0.ebuild
+++ b/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
else
SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-remove-ld-iscsi.patch.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
DESCRIPTION="iscsi client library and utilities"
@@ -19,14 +19,17 @@ HOMEPAGE="https://github.com/sahlberg/libiscsi"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
+IUSE="rdma"
-RDEPEND="dev-libs/libgcrypt:0="
+RDEPEND="dev-libs/libgcrypt:0=
+ rdma? ( sys-cluster/rdma-core )"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-1.18.0-fno-common.patch
"${FILESDIR}"/${PN}-1.18.0-fno-common-2.patch
"${FILESDIR}"/${PN}-1.18.0-fno-common-3.patch
+ "${FILESDIR}"/${PN}-1.19.0-fix-rdma-automagic.patch
"${WORKDIR}"/${P}-remove-ld-iscsi.patch
)
@@ -38,7 +41,7 @@ src_prepare() {
src_configure() {
econf \
--enable-manpages \
- --disable-static \
+ $(use_with rdma) \
--disable-werror
}
diff --git a/net-libs/libiscsi/metadata.xml b/net-libs/libiscsi/metadata.xml
index fae5428e41b..509c77fde33 100644
--- a/net-libs/libiscsi/metadata.xml
+++ b/net-libs/libiscsi/metadata.xml
@@ -5,4 +5,7 @@
<upstream>
<remote-id type="github">sahlberg/libiscsi</remote-id>
</upstream>
+ <use>
+ <flag name="rdma">Enable infiniband support via <pkg>sys-cluster/rdma-core</pkg></flag>
+ </use>
</pkgmetadata>
diff --git a/net-libs/libisds/libisds-0.11.1.ebuild b/net-libs/libisds/libisds-0.11.1-r1.ebuild
index adb792d3684..d555e6ef693 100644
--- a/net-libs/libisds/libisds-0.11.1.ebuild
+++ b/net-libs/libisds/libisds-0.11.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,7 +24,7 @@ RDEPEND="
openssl? ( dev-libs/openssl:= )
!openssl? (
app-crypt/gnupg
- app-crypt/gpgme
+ app-crypt/gpgme:=
dev-libs/libgcrypt:=
)"
DEPEND="${RDEPEND}
diff --git a/net-libs/libisds/libisds-9999.ebuild b/net-libs/libisds/libisds-9999.ebuild
index 05e9b62f830..6056df0b359 100644
--- a/net-libs/libisds/libisds-9999.ebuild
+++ b/net-libs/libisds/libisds-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,7 +24,7 @@ RDEPEND="
openssl? ( dev-libs/openssl:= )
!openssl? (
app-crypt/gnupg
- app-crypt/gpgme
+ app-crypt/gpgme:=
dev-libs/libgcrypt:=
)"
DEPEND="${RDEPEND}
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 3c247844239..4c3e1ba06a8 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,2 +1,2 @@
-DIST libktorrent-21.08.3.tar.xz 607028 BLAKE2B 1d0a1c2ddb406e709669bc0adb9812c510d8e02c9b325a9ad41d8523cf29bedbbf6d8209151fbc119412b239cf9a8b2907e34faf4c992f5f2f0bd10235f7cf2f SHA512 7c07b470b447497adf8faf0f17004d88130fb243682e28a34b6b86c1520e3cf09044401707f0014a229e589a93caf67efdc83f711580979e6e9603fa3892c5ec
-DIST libktorrent-21.11.90.tar.xz 605964 BLAKE2B c19b7f5d4ef19a60421cec17ed6eecbff3ec31a1b7b21f2732f1055289719460aed603fac05af901c76a32a5499917524307a60545026f2cab505998ca08c23f SHA512 28e4fc098baed6b9f7f07befa8a10cfa4d6ce30b55b5c09aa3bedc40089efd7bc02b69a53adc84c3c7404dd788dec6c86271edafaa6e8e1076998191072f9a49
+DIST libktorrent-21.12.3.tar.xz 605960 BLAKE2B a4c0d7d1942647a759cd3890cb675ee6ccddf3b875836f91b1006f51230b15f0b55bdffd8b79f6c96af8f30f611cf6d8cd5a7677a39a8aedb17d3c0705f19186 SHA512 04ff8cfa6a945eeb36d88972e530371b011ba664eb742436ffbb5a09c10ae25053fc3553d6d80b9d68f65a9deee65595b0554bd3ab0f2b71414c621ddd28d2d1
+DIST libktorrent-22.04.1.tar.xz 606348 BLAKE2B 3f3512166f811e0bec314540b68188c2ee5371a25288ebbd7bef0ecacc3eab24ea8b88a60413b890187516c0e736471829ee3012b64b4343e634f08ec88ee53f SHA512 242711535a9e70cd46287a49f28010ab12bc3fe4a8812fad2e145bc722803697bd396a2bfa346e104b6ee198f508ce82252401aac8eb658e9b0046dafcdf520d
diff --git a/net-libs/libktorrent/libktorrent-21.08.3.ebuild b/net-libs/libktorrent/libktorrent-21.12.3.ebuild
index 8d194a8f2fc..015e5c3bd2f 100644
--- a/net-libs/libktorrent/libktorrent-21.08.3.ebuild
+++ b/net-libs/libktorrent/libktorrent-21.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
ECM_TEST="forceoptional"
KDE_GEAR="true"
KDE_ORG_CATEGORY="network"
-KFMIN=5.84.0
+KFMIN=5.88.0
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/net-libs/libktorrent/libktorrent-21.11.90.ebuild b/net-libs/libktorrent/libktorrent-22.04.1.ebuild
index 580da05f4f0..4adfd65b596 100644
--- a/net-libs/libktorrent/libktorrent-21.11.90.ebuild
+++ b/net-libs/libktorrent/libktorrent-22.04.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,8 +6,8 @@ EAPI=8
ECM_TEST="forceoptional"
KDE_GEAR="true"
KDE_ORG_CATEGORY="network"
-KFMIN=5.88.0
-QTMIN=5.15.2
+KFMIN=5.92.0
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 6246723ee12..f7a54766367 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -1,2 +1 @@
-DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
DIST liblockfile-1.17.tar.gz 69834 BLAKE2B a3c88174d96fb84dc1226102a1678aecec35945b89adb6e143f32674188ff7406f89b05f7219748bf0e9c6207ff3b28b5b800706ffc11b733c294e1e1c232784 SHA512 2169ac2219950d6ec7def6b5cc712cc04d1a185dc9c09b364c8d47b7b3d15c3482a2200b591872da87eb784717b2ba3537fbc39d7075c329cc8ba48039473a83
diff --git a/net-libs/liblockfile/liblockfile-1.16.ebuild b/net-libs/liblockfile/liblockfile-1.16.ebuild
deleted file mode 100644
index 3140e575a8b..00000000000
--- a/net-libs/liblockfile/liblockfile-1.16.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Implements functions designed to lock the standard mailboxes"
-HOMEPAGE="https://github.com/miquels/liblockfile"
-SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="acct-group/mail"
-DEPEND="${RDEPEND}"
-
-DOCS=( Changelog README )
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.16-makefile.patch"
-)
-
-src_prepare() {
- default
-
- # I don't feel like making the Makefile portable
- [[ ${CHOST} == *-darwin* ]] \
- && cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
-
- eautoreconf
-}
-
-src_configure() {
- local grp=mail
- if use prefix ; then
- # we never want to use LDCONFIG
- export LDCONFIG=${EPREFIX}/bin/true
- # in unprivileged installs this is "mail"
- grp=$(id -g)
- fi
- local myeconfargs=(
- --with-mailgroup=${grp}
- --enable-shared
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
- if ! use static-libs ; then
- find "${ED}" -type f -name "*.a" -delete || die
- fi
-}
diff --git a/net-libs/liblockfile/liblockfile-1.17.ebuild b/net-libs/liblockfile/liblockfile-1.17.ebuild
index 82d39902f7c..d2fcc989d6a 100644
--- a/net-libs/liblockfile/liblockfile-1.17.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="acct-group/mail"
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index 9fca404f8e1..cfef3e37f43 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,2 +1,2 @@
-DIST libmbim-1.24.8.tar.xz 517872 BLAKE2B ba4d44ea18ecb412d046b1c1cbd1167bd1cf0a1430486dbf760731950b088e66b25c5c870f2e1a49ea78e43bc15fdbac9efed56afa35127d33f6377325677386 SHA512 32a1ed379fb2799c8490058a16f819620290c2a08d0dacacdc7db4a31fb66a4d9c449b4b2d8fd6de898da28815a6c32e3d97a802970115ac2869e7fec0d841af
-DIST libmbim-1.26.0.tar.xz 554672 BLAKE2B b020ea81d6f06bad4c655b285423075873ea01ad253c8eb79fe6e0ce8511d6a8c684c4d8541a64dcc23b46211de117f867d5b405f08942e904156304ce746779 SHA512 b987b3271166eabda7d6767b4b3cd8f34b07ea6a43d5ed1d7cf083561b0e57affeec175a155e5bf8b998dd60f49a303cf54ad6eda146df7483cabe099c401c27
+DIST libmbim-1.26.2.tar.xz 561096 BLAKE2B 11e5339b63dbaca8fb6d31ce2afaf4897774aa4b531cfbb09bb400f64ab975495093b711d0a836feff86e3d9fc72ae2b85ab5cd84fab3d266e0fecf1129125d0 SHA512 7cce1fa6ff5630a1cc565a2198544de9f4a1db20b30304fac96de6c698eaf56b17fe6ccb089151623d4484d88fda6abe980bced19dfbf0d3ef425fc954fb5844
+DIST libmbim-1.26.4.tar.xz 566188 BLAKE2B 96fb932e89455364eec39d879256eb10efd4fafc18c0dc69619b3a73cea1e62e3ea50b828c2785082e6422c39d8775c9bc1c084db3aaafdf054b1e7aa7d6929f SHA512 a530a3611aa353d7b7a4a3d845a8a8b08e508004f44e9bc63a4c04729589397e264a5dca499ebb7c57f135e6848909d78124c4799bd932c24271c57824c3b5d8
diff --git a/net-libs/libmbim/libmbim-1.26.0.ebuild b/net-libs/libmbim/libmbim-1.26.2.ebuild
index 1ff3ec9dae7..c45f611c94b 100644
--- a/net-libs/libmbim/libmbim-1.26.0.ebuild
+++ b/net-libs/libmbim/libmbim-1.26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/net-libs/libmbim/libmbim-1.24.8.ebuild b/net-libs/libmbim/libmbim-1.26.4.ebuild
index 141c3f44d2f..81724693c40 100644
--- a/net-libs/libmbim/libmbim-1.24.8.ebuild
+++ b/net-libs/libmbim/libmbim-1.26.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1
@@ -12,16 +12,13 @@ SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 x86"
-IUSE="udev"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
-RDEPEND=">=dev-libs/glib-2.48:2
- udev? ( dev-libs/libgudev:= )"
+RDEPEND=">=dev-libs/glib-2.56:2"
DEPEND="${RDEPEND}"
BDEPEND="
${PYTHON_DEPS}
dev-util/glib-utils
- dev-util/gtk-doc-am
virtual/pkgconfig
"
@@ -29,8 +26,7 @@ src_configure() {
econf \
--disable-Werror \
--disable-static \
- --disable-gtk-doc \
- $(use_with udev)
+ --disable-gtk-doc
}
src_install() {
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 5fdb923bbc7..a4ca0686a14 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,3 +1,5 @@
DIST libmicrohttpd-0.9.68.tar.gz 1884342 BLAKE2B 3f74c48917fa19753a617242fa07b99a69510a14a802609d038964d927516f8f52b4330d0eee2c7b98096b2d840158e4945310edef290224ea256d9616fb4d94 SHA512 9daaab5fb35fef6f2a19b7e08eeb8473aeb0a67631808a8d7a7f78a09cb621ca5d32dbbbca616865a40afb92f8c6495f9e2ba1674880af8011a2bc798c070a13
DIST libmicrohttpd-0.9.72.tar.gz 1693553 BLAKE2B 24d9284d8cab65d4a5b6b7f3a5b860dfd8cf69b21e44ee05ae2f7561b766a72d2dbb7f57849a31c22454e211befa74e058f78814b79e7876b3d14c7252ab5800 SHA512 9695e2fb08785e4b60342226ef3a0af22da4d80f127e7db9ec80ce844f70d0d781b30af207d58d8eb691b85a5fe4691cb9ecf887ca86f5e059a05259ae041316
DIST libmicrohttpd-0.9.73.tar.gz 1738675 BLAKE2B 63845b1b7fa0aa8ce29e9917521e10bd59fa0d27658e87ef3273d5014adf5cd9514a2d84465a573df03b44dcd50da7d157ef9c4952107ebba49efdfb398476c2 SHA512 473996b087ac6734ab577a1c7681c6c0b0136e04e34e13c3b50fd758358c1516017ad79097e0c57792786f6dd0208834374c09238113efed13bb4be11ef649d3
+DIST libmicrohttpd-0.9.74.tar.gz 1962057 BLAKE2B 6751696740e2893b6ad1ecf5f6e6716dc4b053f788ca1c9c76a25051437942cd975dc0ee428a65af58da04f4cca41c4ed79cdd335b3f90d1dd52651185ee42dc SHA512 86e8b88e064f17557455617975888993a285f4de6d4051cb837ef3e7328d3718001ef280473d306724dd85a01e1787fca099d4bd18e5d78b766e41a3a9f126ef
+DIST libmicrohttpd-0.9.75.tar.gz 1952076 BLAKE2B 419d7b7113edbcc54eec3e3b6da92d040e15b451bde4e1372b368fdd87277c85daddc295bc71d25bf02135921a8716876e9536c9dee286fa29b66bfb8167ebd2 SHA512 4dc62ed191342a61cc2767171bb1ff4050f390db14ef7100299888237b52ea0b04b939c843878fe7f5daec2b35a47b3c1b7e7c11fb32d458184fe6b19986a37c
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
index da4a05bb291..281d4b60221 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 x86"
IUSE="+epoll ssl static-libs test"
RESTRICT="!test? ( test )"
-RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
+RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:=[${MULTILIB_USEDEP}] )"
# We disable tests below because they're broken,
# but if enabled, we'll need this.
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
index 52e14e5dad1..98e6e1b1a34 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
IUSE="+epoll ssl static-libs test thread-names"
RESTRICT="!test? ( test )"
-RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
+RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:=[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
test? ( net-misc/curl[ssl?] )
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
index 689aaa6c4df..40a1b1ecad6 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
IUSE="+epoll ssl static-libs test thread-names"
RESTRICT="!test? ( test )"
-RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
+RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:=[${MULTILIB_USEDEP}] )"
# libcurl and the curl binary are used during tests on CHOST
DEPEND="${RDEPEND}
test? ( net-misc/curl[ssl?] )"
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild
new file mode 100644
index 00000000000..ab61a1435f6
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit multilib-minimal
+
+MY_P="${P/_/}"
+
+DESCRIPTION="Small C library to run an HTTP server as part of another application"
+HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="LGPL-2.1+"
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+epoll ssl static-libs test +thread-names"
+RESTRICT="!test? ( test )"
+
+RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:=[${MULTILIB_USEDEP}] )"
+# libcurl and the curl binary are used during tests on CHOST
+DEPEND="${RDEPEND}
+ test? ( net-misc/curl[ssl?] )"
+BDEPEND="ssl? ( virtual/pkgconfig )"
+
+DOCS=( AUTHORS NEWS COPYING README ChangeLog )
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" \
+ econf \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ --disable-nls \
+ --enable-bauth \
+ --enable-dauth \
+ --disable-examples \
+ --enable-messages \
+ --enable-postprocessor \
+ --enable-httpupgrade \
+ --disable-experimental \
+ --disable-heavy-tests \
+ $(use_enable thread-names) \
+ $(use_enable epoll) \
+ $(use_enable test curl) \
+ $(use_enable ssl https) \
+ $(use_with ssl gnutls)
+}
+
+multilib_src_install_all() {
+ default
+
+ if ! use static-libs; then
+ find "${ED}" -name '*.la' -delete || die
+ fi
+}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
new file mode 100644
index 00000000000..44dad816e53
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit multilib-minimal
+
+MY_P="${P/_/}"
+
+DESCRIPTION="Small C library to run an HTTP server as part of another application"
+HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="LGPL-2.1+"
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+epoll ssl static-libs test +thread-names"
+RESTRICT="!test? ( test )"
+
+RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:=[${MULTILIB_USEDEP}] )"
+# libcurl and the curl binary are used during tests on CHOST
+DEPEND="${RDEPEND}
+ test? ( net-misc/curl[ssl?] )"
+BDEPEND="ssl? ( virtual/pkgconfig )"
+
+DOCS=( AUTHORS NEWS COPYING README ChangeLog )
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" \
+ econf \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ --disable-nls \
+ --enable-bauth \
+ --enable-dauth \
+ --disable-examples \
+ --enable-messages \
+ --enable-postprocessor \
+ --enable-httpupgrade \
+ --disable-experimental \
+ --disable-heavy-tests \
+ $(use_enable thread-names) \
+ $(use_enable epoll) \
+ $(use_enable test curl) \
+ $(use_enable ssl https) \
+ $(use_with ssl gnutls)
+}
+
+multilib_src_install_all() {
+ default
+
+ if ! use static-libs; then
+ find "${ED}" -name '*.la' -delete || die
+ fi
+}
diff --git a/net-libs/libmirisdr/libmirisdr-9999.ebuild b/net-libs/libmirisdr/libmirisdr-9999.ebuild
deleted file mode 100644
index 8d31071e499..00000000000
--- a/net-libs/libmirisdr/libmirisdr-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_REPO_URI="git://git.osmocom.org/libmirisdr"
-inherit cmake git-r3
-
-DESCRIPTION="Software for the Mirics MSi2500 + MSi001 SDR platform"
-HOMEPAGE="http://cgit.osmocom.org/libmirisdr/"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="doc static-libs"
-
-RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_install() {
- cmake_src_install
- use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libmirisdr.a
-}
diff --git a/net-libs/libmirisdr/metadata.xml b/net-libs/libmirisdr/metadata.xml
deleted file mode 100644
index a8b192c4391..00000000000
--- a/net-libs/libmirisdr/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>zerochaos@gentoo.org</email>
-<name>Rick Farina</name>
-</maintainer>
-<maintainer type="project">
-<email>radio@gentoo.org</email>
-<name>Radio</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest
index 683230c1cd3..96fb88ed5c8 100644
--- a/net-libs/libmnl/Manifest
+++ b/net-libs/libmnl/Manifest
@@ -1 +1,4 @@
DIST libmnl-1.0.4.tar.bz2 301270 BLAKE2B e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 SHA512 e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9
+DIST libmnl-1.0.4.tar.bz2.sig 543 BLAKE2B f69e72a1fef9688bae27ca9934e835cc42bb725d930cd2c4c46672328ed0d797a3fa95e1e9adf2adf4f1725f30ed55047e61d7848a9eae0974f0b0e661dc35bf SHA512 0cdce209d63d318cc1e842d84d48776c4c23eb297ba8415030a3b086550f13778e2c80197b2e7170414619595002d403fddc08ff13327c0ac732ff2d5080c19c
+DIST libmnl-1.0.5.tar.bz2 314791 BLAKE2B 760ec6f7eaf3f2c6be6edf848551e4c7d16ae7cbe49f9cde297f5df06174fb7f9f490118942225558f0a89dabe9a4901c1b3b23fa1203132e36b86e6332564d6 SHA512 16fa48e74c9da7724a85c655dfb0abd8369392627934639d65de951543e1447ac3e048d231248f1ce8861443c2ef62654a85a81feeedbbffaf2e5744f6cf4c9f
+DIST libmnl-1.0.5.tar.bz2.sig 566 BLAKE2B 4454f969cbc21f86c12905eb80dd7237f368bbb30e38202ef114edf77806091cda164870e825aca4305a925077d181662724412f8475866c7fbe2572b0b1da50 SHA512 bb75ae3b5520d8b9372d70da7c1a27fa3d8e50a26a05fe56397dead4d7d5ad4003e6e576becd1200a5c9ed42fe5a97273acc8c50f1fd3181688f0d0b8c607dfc
diff --git a/net-libs/libmnl/libmnl-1.0.4.ebuild b/net-libs/libmnl/libmnl-1.0.4.ebuild
index 0e9c2adbd8c..c77ab06f821 100644
--- a/net-libs/libmnl/libmnl-1.0.4.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.4.ebuild
@@ -1,18 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit usr-ldscript
+inherit usr-ldscript verify-sig
DESCRIPTION="Minimalistic netlink library"
HOMEPAGE="https://netfilter.org/projects/libmnl/"
-SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
LICENSE="LGPL-2.1"
SLOT="0/0.2.0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
IUSE="examples static-libs"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
src_configure() {
econf $(use_enable static-libs static)
diff --git a/net-libs/libmnl/libmnl-1.0.5.ebuild b/net-libs/libmnl/libmnl-1.0.5.ebuild
new file mode 100644
index 00000000000..097c768c00f
--- /dev/null
+++ b/net-libs/libmnl/libmnl-1.0.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit verify-sig
+
+DESCRIPTION="Minimalistic netlink library"
+HOMEPAGE="https://netfilter.org/projects/libmnl/"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
+
+LICENSE="LGPL-2.1"
+SLOT="0/0.2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux"
+IUSE="examples"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+
+ if use examples; then
+ find examples/ -name 'Makefile*' -delete || die
+ dodoc -r examples/
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/net-libs/libmrss/libmrss-0.19.2-r1.ebuild b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
index c3688713068..05c56f50afa 100644
--- a/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
+++ b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86"
IUSE="doc examples"
RDEPEND="
diff --git a/net-libs/libnatpmp/libnatpmp-20150609.ebuild b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
index 4c214c0cc10..1d54c02fab0 100644
--- a/net-libs/libnatpmp/libnatpmp-20150609.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
PATCHES=( "${FILESDIR}"/${PN}-20150609-gentoo.patch )
diff --git a/net-libs/libnet/metadata.xml b/net-libs/libnet/metadata.xml
index 1a870bc24ac..e9e59b74644 100644
--- a/net-libs/libnet/metadata.xml
+++ b/net-libs/libnet/metadata.xml
@@ -23,5 +23,6 @@ and libpcap).
</longdescription>
<upstream>
<remote-id type="sourceforge">libnet-dev</remote-id>
+ <remote-id type="cpe">cpe:/a:libnet_project:libnet</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest
index 3b2bbaf918f..5d83c233600 100644
--- a/net-libs/libnetconf2/Manifest
+++ b/net-libs/libnetconf2/Manifest
@@ -1,2 +1 @@
-DIST libnetconf2-2.0.19.tar.gz 300454 BLAKE2B 7ff97dcc964124f93631b2fe08f9f713deb698e7d591ca245f9638f32a19915ce6e8cf9e7170bcd6059369926044a705fc03ef18e28baba8eef1c8296bb52d8e SHA512 0e53d4803b8a5d3ff041b393487c71ca09878fa47cbe3ac4d1f26cf45f2ede80992964e339747435003c3bc61053f4b6297a29d6e2a5511ba6b4e93edb3ce136
-DIST libnetconf2-2.0.24.tar.gz 301111 BLAKE2B ffc4dffd797e4589a5892f3cf80d6a373808ee48c00e46a37ff02082c721c49b27aa06962e962698d3b443e08e9cba55b4205cc6e76958df325c6fc5a38fed22 SHA512 05cba691bc47e49abf747a36a6dcc978a4163fd155a90609315585201e4e4d20c9a30b683180f5cf03aac5b6a37933917e61a895067dd172b8de2142ec542dfc
+DIST libnetconf2-2.1.7.tar.gz 302011 BLAKE2B b83faebb8d04d9ecaa0bc3aa1fed1bc3b94388d1a6dbc8d3e8c2ff2bb73dc57a460eaf9cc7bf2d07a8e09ef612826417990d8c70bab9c58f9cb71b53766b035b SHA512 fd46a3c31a062324e6c9f2d66006ba8cd852ccb389bf8749d1d0d085b880409e1e373d1d1f2d79c1d88f5eaa72d56195889c07863d0eab1607da89484e21b86f
diff --git a/net-libs/libnetconf2/libnetconf2-2.0.24.ebuild b/net-libs/libnetconf2/libnetconf2-2.0.24.ebuild
deleted file mode 100644
index 831ee0c2cca..00000000000
--- a/net-libs/libnetconf2/libnetconf2-2.0.24.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C library for building NETCONF servers and clients"
-HOMEPAGE="https://github.com/CESNET/libnetconf2"
-SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/openssl:0=
- >=net-libs/libyang-2.0.112:=
- net-libs/libssh:0=[server]
- virtual/libcrypt:="
-DEPEND="${RDEPEND}
- test? ( dev-util/cmocka )"
-BDEPEND="
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )"
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_TESTS=$(usex test)
- -DENABLE_VALGRIND_TESTS=OFF
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- use doc && cmake_src_compile doc
-}
-
-src_install() {
- cmake_src_install
-
- use doc && dodoc -r doc/.
-}
diff --git a/net-libs/libnetconf2/libnetconf2-2.0.19.ebuild b/net-libs/libnetconf2/libnetconf2-2.1.7.ebuild
index d5a64fa35f3..c0fe8e2c018 100644
--- a/net-libs/libnetconf2/libnetconf2-2.0.19.ebuild
+++ b/net-libs/libnetconf2/libnetconf2-2.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,13 +11,13 @@ SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/openssl:0=
- >=net-libs/libyang-2.0.97:=
+ >=net-libs/libyang-2.0.164
net-libs/libssh:0=[server]
virtual/libcrypt:="
DEPEND="${RDEPEND}
diff --git a/net-libs/libnetfilter_acct/Manifest b/net-libs/libnetfilter_acct/Manifest
index 00a0ca995aa..a432148991f 100644
--- a/net-libs/libnetfilter_acct/Manifest
+++ b/net-libs/libnetfilter_acct/Manifest
@@ -1 +1,2 @@
DIST libnetfilter_acct-1.0.3.tar.bz2 296999 BLAKE2B c696a5830c2445fd8369182c413a8144f4b0d669dd8ef57e59d54bd8ad406e15bec72ede8d2ee0d7bbb61fbc2218380168e03ed62daaef9e026cbe83e79982c2 SHA512 5ca332840663941182343fdc0d5e45116bba71a97a913db0b385ea37ef31a04f8267a2279b7a2862ce338c6eeb093bb3ef9908f57770e64acf5d2b2266d3bfe5
+DIST libnetfilter_acct-1.0.3.tar.bz2.sig 543 BLAKE2B 1f219bacf8a65777ddeb2888591694925c77cc6270b9e943161acc2265eec16a43c2228bd1889194f35f3ebd1a493dce9f9ce1ddd397d1fe2f5bb18095296ed0 SHA512 61f55142ff52101d838d99f6a48f525c1189d7249e781f81a809f8df17c909567ceeed0d51d01ea743ecad127327d7cf5fdbb42560d3e7eb5c075376b69f4b06
diff --git a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
index f29d830b8c1..b2114726a93 100644
--- a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
+++ b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
@@ -1,24 +1,27 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit linux-info
+inherit linux-info verify-sig
DESCRIPTION="Library providing interface to extended accounting infrastructure"
HOMEPAGE="https://netfilter.org/projects/libnetfilter_acct/"
-SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 x86 ~amd64-linux"
IUSE="examples"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
RDEPEND="
net-libs/libmnl
"
DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig
+ verify-sig? ( sec-keys/openpgp-keys-netfilter )"
DOCS=( README )
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index a13a4b37635..96c531bff9e 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -1,3 +1,3 @@
-DIST libnetfilter_conntrack-1.0.6.tar.bz2 422998 BLAKE2B 7153593e2b6f5e03a5f4579948b0d28e9ab88d39ebe08e97fe8be0eb3f10f64b36d0f85e9e35408019ab22404b3452e4c6d7b2812ea316031f3e0c4367c23019 SHA512 05b3b63928d46ed114048848c48094a762c6a7acc93fcdbe9473e82cc67851ef1a0d33b68b8fd388271b76b519c4d2ac93fd802043fa9a9da46cda5b262a1fc7
-DIST libnetfilter_conntrack-1.0.7.tar.bz2 346219 BLAKE2B 85388bb2b185fa04ce697b07675cfbd84836873a9d09092b16bba318e93da56085ea5a4726a908ed5d1974aa524bee0f912e2be23f6a4c9e9e46641baf0c6a18 SHA512 5be5ed5daba385d11123a4e497c6334c6bb7e668594e667f85596619afe607f8783c088934098a4c07557d86f9b9157ff67d28541c8f4a80a5454307b979c22b
DIST libnetfilter_conntrack-1.0.8.tar.bz2 331750 BLAKE2B 614f8d80863d6f7d8110b5faf68debe3a9ba0c6737f02fa0de9d0e53d30771581becb052e7cd990b0632e9264cb9cdeb2af26a41e2b1ab9421218ec616e1f8d8 SHA512 ddc70e7e3f2d764ed1e115e4a03fe8848b8c04bd69eea0952e63131dd4dae3c23f33b8be518673e1ec3b5dbf708f5f86eac97be46fe265d95386a5e902bd0b82
+DIST libnetfilter_conntrack-1.0.9.tar.bz2 373177 BLAKE2B 701393338a0bf852b97d80a1e4ab078dea741f7181246b3dafcbe8cff287b5b9fae72c1c50867ea71baab83fa842471b2c7054fb4702bf35900a352078de8f3a SHA512 e8b03425aaba3b72e6034c215656c34176d0550c08e0455aaeb1365d9141505d0c4feaa8978c8ccf2b7af9db6c9e874ceb866347e533b41cb03a189884f4004c
+DIST libnetfilter_conntrack-1.0.9.tar.bz2.sig 566 BLAKE2B 0f80f00858093ed5e9aac190fbb1ac5ac1dde60e6767b65adda49ed79fb7fb6cc7caea51793d8930a927d9b7a75d263851dd5741d6d408a8b56d3ea5b73da20e SHA512 83ed38f68bd38cf70d9c245a7f17373751ff9099ceff3066812b282b7426edf2eee79da8f5aea896b119327059008ff4a531b3dfdcd79d49944bea4079e67e1f
diff --git a/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-musl.patch b/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-musl.patch
new file mode 100644
index 00000000000..e1ce87df4e8
--- /dev/null
+++ b/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-musl.patch
@@ -0,0 +1,46 @@
+https://git.netfilter.org/libnetfilter_conntrack/patch/?id=21ee35dde73aec5eba35290587d479218c6dd824
+
+From: Robert Marko <robimarko@gmail.com>
+Date: Thu, 24 Feb 2022 15:01:11 +0100
+Subject: conntrack: fix build with kernel 5.15 and musl
+
+Currently, with kernel 5.15 headers and musl building is failing with
+redefinition errors due to a conflict between the kernel and musl headers.
+
+Musl is able to suppres the conflicting kernel header definitions if they
+are included after the standard libc ones, however since ICMP definitions
+were moved into a separate internal header to avoid duplication this has
+stopped working and is breaking the builds.
+
+It seems that the issue is that <netinet/in.h> which contains the UAPI
+suppression defines is included in the internal.h header and not in the
+proto.h which actually includes the kernel ICMP headers and thus UAPI
+supression defines are not present.
+
+Solve this by moving the <netinet/in.h> include before the ICMP kernel
+includes in the proto.h
+
+Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file")
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+Signed-off-by: Florian Westphal <fw@strlen.de>
+--- a/include/internal/internal.h
++++ b/include/internal/internal.h
+@@ -14,7 +14,6 @@
+ #include <arpa/inet.h>
+ #include <time.h>
+ #include <errno.h>
+-#include <netinet/in.h>
+
+ #include <libnfnetlink/libnfnetlink.h>
+ #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
+--- a/include/internal/proto.h
++++ b/include/internal/proto.h
+@@ -2,6 +2,7 @@
+ #define _NFCT_PROTO_H_
+
+ #include <stdint.h>
++#include <netinet/in.h>
+ #include <linux/icmp.h>
+ #include <linux/icmpv6.h>
+
+cgit v1.2.3
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
deleted file mode 100644
index 3ef261d55d2..00000000000
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info
-
-DESCRIPTION="Programming interface (API) to the in-kernel connection tracking state table"
-HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/"
-SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="static-libs"
-
-RDEPEND="
- >=net-libs/libmnl-1.0.3
- >=net-libs/libnfnetlink-1.0.0
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=( README )
-
-pkg_setup() {
- linux-info_pkg_setup
-
- if kernel_is lt 2 6 18 ; then
- die "${PN} requires at least 2.6.18 kernel version"
- fi
-
- # netfilter core team has changed some option names with kernel 2.6.20
- if kernel_is lt 2 6 20 ; then
- CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
- else
- CONFIG_CHECK="~NF_CT_NETLINK"
- fi
-
- check_extra_config
-}
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
index 3ef261d55d2..a42aa6f12fe 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static-libs"
RDEPEND="
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.ebuild
index 62ad204c78d..cdd38b015fb 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit linux-info
+inherit linux-info verify-sig
DESCRIPTION="Programming interface (API) to the in-kernel connection tracking state table"
HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/"
-SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static-libs"
-
-RDEPEND="
- >=net-libs/libmnl-1.0.3
- >=net-libs/libnfnetlink-1.0.0
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+
+RDEPEND=">=net-libs/libmnl-1.0.3
+ >=net-libs/libnfnetlink-1.0.0"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ verify-sig? ( sec-keys/openpgp-keys-netfilter )"
DOCS=( README )
+PATCHES=(
+ "${FILESDIR}"/${P}-musl.patch
+)
+
pkg_setup() {
linux-info_pkg_setup
@@ -41,3 +43,9 @@ pkg_setup() {
check_extra_config
}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libnetfilter_cthelper/Manifest b/net-libs/libnetfilter_cthelper/Manifest
index 7a341812b1a..b5d31681bd1 100644
--- a/net-libs/libnetfilter_cthelper/Manifest
+++ b/net-libs/libnetfilter_cthelper/Manifest
@@ -1 +1,4 @@
DIST libnetfilter_cthelper-1.0.0.tar.bz2 275229 BLAKE2B 622a4e27629d97a0ab2b5032e972914f2ab8764ab60ab7090b173ceabfe9648e09452e931dacb822090c5f816b553b8e73b8f8a4ee431db9f6dd092d9d4283ee SHA512 f0372daee0edbf4c27ee80eadd4ce786a4b67b39c0b9d22e88bc9adcbdffd6676eb9df01b933ee64d2fcea9c05a9ca9070c94e907277d69acbd22ae9a3c74e45
+DIST libnetfilter_cthelper-1.0.0.tar.bz2.sig 543 BLAKE2B 827f11d4f9b666e46d486f04711009a62ec8880cc230ab87960a0cf0ff8410394e188d3102d5278059e6ba6aae827684d2ec8c0031bcddbae0a470c2165cc50a SHA512 048a0789f50b9dbb8f56776ec700657d7eabd16b442197755bc37201076b51279b8016bfb45543c51da0d023daa8b022e198bf28d004991fc1bd97192021d4c2
+DIST libnetfilter_cthelper-1.0.1.tar.bz2 291739 BLAKE2B cc5ae85dca896c0b8b1b704e0c5cc201677f48c2765520dc992a1b218d1334e04c592ba48cf06efe32a5089c7ad70fa44cbb2b40f2e8400d7ef9d2976a6425ee SHA512 f0591edd579aee92b62446e2b8fef6af9c404848c42c8da76850bb01aec3567442612f53cf8d3af6ba4d6d920487bff310a4e547bccf595478b1f96b4280eada
+DIST libnetfilter_cthelper-1.0.1.tar.bz2.sig 566 BLAKE2B 2904ddbe9bea0ea4a126bdd286a0d3eaf8e850e49cb3cb0ec196d424bbf91b89abe8ada8c1c5db29b5764c2d003de1212885a9f6676fee454237801ba02bc5a4 SHA512 991f1e20673eb290fc9b4b35c5dd0c27223398e560f4807b5497fc6b69780594cbae026481dbdf1862a25da7537f60b7d938038a8310cf3b0cd207ca1d3672e6
diff --git a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
index 6d07d30b277..20c16c74911 100644
--- a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
+++ b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit linux-info
+inherit linux-info verify-sig
DESCRIPTION="Userspace library for interface to user-space helper for conntrack"
HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_cthelper/"
-SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
-BDEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig
+ verify-sig? ( sec-keys/openpgp-keys-netfilter )"
RDEPEND="net-libs/libmnl:="
DEPEND="${RDEPEND}"
diff --git a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.1-r1.ebuild b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.1-r1.ebuild
new file mode 100644
index 00000000000..9905370b8f6
--- /dev/null
+++ b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit linux-info verify-sig
+
+DESCRIPTION="Userspace library for interface to user-space helper for conntrack"
+HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_cthelper/"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="net-libs/libmnl:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+
+CONFIG_CHECK="~NF_CT_NETLINK_HELPER"
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ kernel_is lt 3 6 0 && ewarn "requires at least 3.6.0 kernel version"
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libnetfilter_cttimeout/Manifest b/net-libs/libnetfilter_cttimeout/Manifest
index 0a61fe59365..3a7df1c6db6 100644
--- a/net-libs/libnetfilter_cttimeout/Manifest
+++ b/net-libs/libnetfilter_cttimeout/Manifest
@@ -1 +1,4 @@
DIST libnetfilter_cttimeout-1.0.0.tar.bz2 275065 BLAKE2B 8b0f952bcd4184141a434abe25f807ad07bb74713a3506d335c5368ddce2809596c77e5e534337d897fb6268afa137f6d98cfd314b0b33b4996e4a0df4d8eba6 SHA512 d64f592be022d02b6e6627470f9aed75114b0c7177012d31d868ee7eb39fca330a7638c9a209ff489d4a8c0549b8fcfd33582c6d36ee519b920cf27429301c85
+DIST libnetfilter_cttimeout-1.0.0.tar.bz2.sig 543 BLAKE2B bc9e58c48d2a1337a52b8f1a48ada14e9799d811b6134c52f71c31fbca72451defbc7c74c9676ac1dec2487cbb7f9a8ec692579b9383306e54d8c95dcf038cfc SHA512 0b1ef30da8a5871a526243285d176194959d79d96eb50e0e126ec363926fb6e8d3ae13375fc52fb496cdf2c326d77587656d1316c5aebf8c4683b380740beeef
+DIST libnetfilter_cttimeout-1.0.1.tar.bz2 292649 BLAKE2B b51d631ee6b4c3bb34cf1394e2a3216a6ac4d89773bafecd058b31bdf78bf5eb255d3cb2539ca591f64c95cdf7f0db720a5b78e90009e0c7c208219ed454686f SHA512 3f7886b2b8c67fb45d9f6d03f8a327d0f04072abf75ec0fa310f4a321a1749607e79b48f47c8b8488f9833734689419264afada0cbc1f0360a5ae9e17d4a1100
+DIST libnetfilter_cttimeout-1.0.1.tar.bz2.sig 566 BLAKE2B eecbb2c7453ab1db598c4e02e7a0d5c29d68cb2788537ce22783bc0856ed6f6c64d66cdd9e2438fa901ebaf1c5dcad6b3a816678de2410cd414a5bf387f8ced0 SHA512 da491294392d94ddf7f1267607bc631ffc564a9e21b439b60a13b7d1259b7a80bc0d4f70208a79f0b674c26ac434c924216775bbe968d56bce5f3fa587eef3fb
diff --git a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
index 85aa46b43eb..a81fcb8e124 100644
--- a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
+++ b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit linux-info
+inherit linux-info verify-sig
DESCRIPTION="netlink interface for conntrack timeout infrastructure in kernel's packet filter"
HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_cttimeout/"
-SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
-BDEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig
+ verify-sig? ( sec-keys/openpgp-keys-netfilter )"
RDEPEND="net-libs/libmnl:="
DEPEND="${RDEPEND}"
diff --git a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.1.ebuild b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.1.ebuild
new file mode 100644
index 00000000000..0375729fdf5
--- /dev/null
+++ b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit linux-info verify-sig
+
+DESCRIPTION="netlink interface for conntrack timeout infrastructure in kernel's packet filter"
+HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_cttimeout/"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="net-libs/libmnl:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+
+CONFIG_CHECK="~NF_CT_NETLINK_TIMEOUT"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ kernel_is lt 3 4 0 && ewarn "requires at least 3.4.0 kernel version"
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libnetfilter_log/Manifest b/net-libs/libnetfilter_log/Manifest
index 7172f053243..296aa95820a 100644
--- a/net-libs/libnetfilter_log/Manifest
+++ b/net-libs/libnetfilter_log/Manifest
@@ -1 +1,3 @@
DIST libnetfilter_log-1.0.1.tar.bz2 262545 BLAKE2B 4dcc7ff5deef95fc657a956556a1ff389cddaae3eaabed9c77cb7028793d5a0e377d2d02d55000ec853300b94164943436d658f42344a6314432b2f8f965fb8e SHA512 4088b9bf055fb4cd5f2e201a46a00def7642116b5d1695a371936b7b45eb93877944456506b45761bf2f3f81b40c161c1ecdcfb90532009f073dac3cedc6f436
+DIST libnetfilter_log-1.0.2.tar.bz2 304022 BLAKE2B 5976dc484f8a5dc7b5484f12c9913acd9cf7600844f321da6105805b05ad7176d88185c4770bf9ac167c8525b01f1cd8cbc560f77a7cb8b1f129f9f6983b5bb1 SHA512 6b33718b1dd7f4504bceae14001da3a652cec46a6725a5dee83a7b55028cfa8e768cba917f968a5d5b60fd9ff04edf6040ef271a68e5fb65858bf73f4f9ccf23
+DIST libnetfilter_log-1.0.2.tar.bz2.sig 566 BLAKE2B f4e3de583d9e0612bfc5932654d287154117fe720c28eb220fbc19c4e6cd8d57c66b92159d13949b035a2479a466110e38b0334f49dcf9b9fc0cb4c41ed79aa1 SHA512 b9a40fa08fa5d29a907522add329ea5268f2ef09274b5be3d30ab7e6a0c6aad915d8e8d7c5d708947a86c4a7fe950439ab536ec5ed78198f5b6b839de2f0ab35
diff --git a/net-libs/libnetfilter_log/libnetfilter_log-1.0.2.ebuild b/net-libs/libnetfilter_log/libnetfilter_log-1.0.2.ebuild
new file mode 100644
index 00000000000..06b3692e3eb
--- /dev/null
+++ b/net-libs/libnetfilter_log/libnetfilter_log-1.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info verify-sig
+
+DESCRIPTION="Interface to packets that have been logged by the kernel packet filter"
+HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_log/"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ~riscv ~sparc x86"
+IUSE="doc"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+
+RDEPEND=">=net-libs/libnfnetlink-1.0.0
+ >=net-libs/libmnl-1.0.3"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+
+CONFIG_CHECK="~NETFILTER_NETLINK_LOG"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version"
+}
+
+src_configure() {
+ econf \
+ $(use_enable doc html-doc) \
+ $(use_enable doc man-pages)
+}
diff --git a/net-libs/libnetfilter_queue/Manifest b/net-libs/libnetfilter_queue/Manifest
index e5407949ebe..8a101f457b7 100644
--- a/net-libs/libnetfilter_queue/Manifest
+++ b/net-libs/libnetfilter_queue/Manifest
@@ -1,3 +1,4 @@
DIST libnetfilter_queue-1.0.3.tar.bz2 314857 BLAKE2B c25b0395b13af3cecb960c39bcbc4f10a3f203aad7acaeb277346423310700d9abb5b8a65f27b008e5f45194aa6e0fd6a99c8ad25a1e3200904be70c5c6ddaa4 SHA512 1d9e0202878bc0ae26ceecd0f4fa4c21f89056e5671d46949f92f21c155d589958b7775760fc837547da34eb9a81e537e95c770d25c166e709dad16de4ca452e
DIST libnetfilter_queue-1.0.4.tar.bz2 312699 BLAKE2B 29d553c36af551cbaa3b1b4382ad38d6ea7402efafa5ff4ae99c6f05d0ddd15d24b007a4ccdcbc21b8bd9cea28859668a27a6fae4e6534f68dea79d6d0a02789 SHA512 5d81d8e8190a80c9b42bc851a87cc4f749709803b8c9964508013bafb033f1b51b65222a244885f321a2be90517c6a636533ff72b653935a2b8d819560a51187
DIST libnetfilter_queue-1.0.5.tar.bz2 313856 BLAKE2B 0d7806fd23961f6b80f6ef63faf0fe10307a34495337a7f6dd4f0eb76b5ba8a96292b86285e0740f83414417810e47f47b1400c7d83fb4d8fc6f58954f4bd9df SHA512 732a44b602e5efaa4f5582ea25ff8f5ec8f4dca5c0e725cd93fe2d441db80416b25c6018147be90acb262d7428eb5b21b3f7b5920e612d115061ec6a19d67f85
+DIST libnetfilter_queue-1.0.5.tar.bz2.sig 590 BLAKE2B d8b5b3ae82fe2722db8a0c200a75146b70f79b7eafb34ddba8349f7f38f02eb5546eee9ae31920f5b7301787a2866a908199b69f8465fe1b6e45ebdc5fb7ae13 SHA512 65558652c7d54087eb1b5a37f7574bcca3495e5ee6587c7b555a7fe6e118007cf9431a66ed5280ce272890c659eb171570e0d0cbb733cf969ae8b44a1d541687
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
index 149830904d0..482541e1499 100644
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit linux-info
+inherit linux-info verify-sig
DESCRIPTION="API to packets that have been queued by the kernel packet filter"
HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_queue/"
-SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
IUSE="doc static-libs"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
RDEPEND="
>=net-libs/libmnl-1.0.3
@@ -23,6 +25,7 @@ DEPEND="
BDEPEND="
doc? ( app-doc/doxygen )
virtual/pkgconfig
+ verify-sig? ( sec-keys/openpgp-keys-netfilter )
"
CONFIG_CHECK="~NETFILTER_NETLINK_QUEUE"
diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest
index 2f7130224cf..9283a501e18 100644
--- a/net-libs/libnfnetlink/Manifest
+++ b/net-libs/libnfnetlink/Manifest
@@ -1,2 +1,5 @@
DIST 04aef8a4dedf267dd5744afb134ef8046e77f613-musl-fix-includes.patch 677 BLAKE2B 189c57ffc8eeb6a83e46fd1d53390e977294f7d3a269d3ffab07e1fce04083a7b4b956e93e02f4f81ce6db4ec5be785b16d1c75ed7e0b4fef9883154d9407e18 SHA512 fc452e2924fa4de66e104229bc05a663c253148fb1c0bd62e5454a907877ffb084ba6a04e38bf4ef71a4e58041f4a242001a8029aefbe97ccc00e3bfcb7bba41
DIST libnfnetlink-1.0.1.tar.bz2 320641 BLAKE2B 18d6f702afffa1bf2cb6978426f4a1aeab8692a288686c099eb7dfabff23648b4b0f1ac14b4661f16e3d50b6e7d29090d58ce715dac107acb12648e93c5df4f3 SHA512 2ec2cd389c04e21c8a02fb3f6d6f326fc33ca9589577f1739c23d883fe2ee9feaa16e83b6ed09063ad886432e49565dc3256277d035260aca5aab17954b46104
+DIST libnfnetlink-1.0.1.tar.bz2.sig 543 BLAKE2B e82c79edc77aa68b99549491650eb1888ef81c186918a452d813fb3b793b76e0334a909161a5b1b56a71ffe51b3293f6b0fe5d36b33c473dd50fa222a0844cb0 SHA512 f3ef8429e3da1bca815b186e96dfee93317f7a5712c63a4cc404648a0ee77353fae058a519681bdf684e82d1a230e717f4d34e8eaf0318e9a76dd05104fdf382
+DIST libnfnetlink-1.0.2.tar.bz2 298844 BLAKE2B 81c954f6ca2738b321e9319d20741aa15376e88e5f7a0ce1cfa2b02cd104f98d020ab6206bfbc79fc66655f8e40a17bfb65cbce0b1684d9373b809de5a433fc4 SHA512 a5e9ae22831f1d17703f83953f3b0ef898e8b3fa7f0f771b038db51816ddae3158574380ac4d45c09fb8fbb8677e2ccdcc5c4736e3b09de06eac99f899130854
+DIST libnfnetlink-1.0.2.tar.bz2.sig 566 BLAKE2B 9e87fc7917dd2f8b29de642ef819bca957bd6223417e167e21770450ce2eeff717ab06079ac75c689184f9188e785b663fca81cdda30b87310bfb1b456b03dd2 SHA512 3dcb980fb209c9faa9774f0393bc3b4b5fa6e899330f0d0dcb92307984f696b869de27c22dd54d7f181bddd72e104b38e8617af6bb3d6fe992a96da172b10457
diff --git a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
index 53e90911786..338e11cddd3 100644
--- a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit linux-info
+inherit linux-info verify-sig
PATCH_BLOB=04aef8a4dedf267dd5744afb134ef8046e77f613
PATCH_FN=${PATCH_BLOB}-musl-fix-includes.patch
@@ -12,11 +12,15 @@ DESCRIPTION="the low-level library for netfilter related kernel/userspace commun
HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
SRC_URI="
http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
- https://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch -> ${PATCH_FN}"
+ https://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch -> ${PATCH_FN}
+ verify-sig? ( http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
PATCHES=( "${DISTDIR}/${PATCH_FN}" )
@@ -40,6 +44,12 @@ pkg_setup() {
check_extra_config
}
+src_unpack() {
+ default
+
+ use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig}
+}
+
src_configure() {
econf --disable-static
}
diff --git a/net-libs/libnfnetlink/libnfnetlink-1.0.2.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.2.ebuild
new file mode 100644
index 00000000000..2480c324f33
--- /dev/null
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit linux-info verify-sig
+
+DESCRIPTION="The low-level library for netfilter related kernel/userspace communication"
+HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
+SRC_URI="
+ https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ if kernel_is lt 2 6 18 ; then
+ ewarn "${PN} requires at least 2.6.18 kernel version"
+ fi
+
+ #netfilter core team has changed some option names with kernel 2.6.20
+ error_common=' is not set when it should be. You can activate it in the Core Netfilter Configuration'
+ if kernel_is lt 2 6 20 ; then
+ CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
+ ERROR_IP_NF_CONNTRACK_NETLINK="CONFIG_IP_NF_CONNTRACK_NETLINK:\t${error_common}"
+ else
+ CONFIG_CHECK="~NF_CT_NETLINK"
+ ERROR_NF_CT_NETLINK="CONFIG_NF_CT_NETLINK:\t${error_common}"
+ fi
+
+ check_extra_config
+}
+
+src_unpack() {
+ default
+
+ use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig}
+}
+
+src_install() {
+ default
+
+ # No static archives
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
deleted file mode 100644
index 5c73486bf1a..00000000000
--- a/net-libs/libnfsidmap/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch
deleted file mode 100644
index 6ef12d44e44..00000000000
--- a/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-for toupper and such
-
---- a/nss.c
-+++ b/nss.c
-@@ -34,6 +34,7 @@
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#include <ctype.h>
- #include <sys/types.h>
- #include <errno.h>
- #include <unistd.h>
---- a/libnfsidmap.c
-+++ b/libnfsidmap.c
-@@ -37,6 +37,7 @@
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#include <ctype.h>
- #include <sys/types.h>
- #include <errno.h>
- #include <unistd.h>
diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.27-getgrouplist.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.27-getgrouplist.patch
deleted file mode 100644
index 9a8f0a487ae..00000000000
--- a/net-libs/libnfsidmap/files/libnfsidmap-0.27-getgrouplist.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-http://bugs.gentoo.org/169909
-
---- libnfsidmap-0.27/configure.ac
-+++ libnfsidmap-0.27/configure.ac
-@@ -63,7 +63,7 @@
-
- # Checks for library functions.
- AC_FUNC_MALLOC
--AC_CHECK_FUNCS([strchr strdup])
-+AC_CHECK_FUNCS([strchr strdup getgrouplist])
-
- AC_CONFIG_FILES([Makefile])
- AC_CONFIG_FILES([libnfsidmap.pc])
---- libnfsidmap-0.27/getgrouplist.c
-+++ libnfsidmap-0.27/getgrouplist.c
-@@ -0,0 +1,88 @@
-+/*
-+ * getgrouplist.c
-+ *
-+ * if system does not provide the non-standard getgrouplist, we will emulate
-+ * it via POSIX standard functions
-+ *
-+ * Copyright (c) 1991, 1993
-+ * The Regents of the University of California. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+#include <sys/types.h>
-+#include <grp.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#ifndef HAVE_GETGROUPLIST
-+static
-+int
-+getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
-+{
-+ const struct group *grp;
-+ int i, maxgroups, ngroups, ret;
-+
-+ ret = 0;
-+ ngroups = 0;
-+ maxgroups = *grpcnt;
-+ /*
-+ * When installing primary group, duplicate it;
-+ * the first element of groups is the effective gid
-+ * and will be overwritten when a setgid file is executed.
-+ */
-+ groups[ngroups++] = agroup;
-+ if (maxgroups > 1)
-+ groups[ngroups++] = agroup;
-+ /*
-+ * Scan the group file to find additional groups.
-+ */
-+ setgrent();
-+ while ((grp = getgrent()) != NULL) {
-+ for (i = 0; i < ngroups; i++) {
-+ if (grp->gr_gid == groups[i])
-+ goto skip;
-+ }
-+ for (i = 0; grp->gr_mem[i]; i++) {
-+ if (!strcmp(grp->gr_mem[i], uname)) {
-+ if (ngroups >= maxgroups) {
-+ ret = -1;
-+ break;
-+ }
-+ groups[ngroups++] = grp->gr_gid;
-+ break;
-+ }
-+ }
-+skip:
-+ ;
-+ }
-+ endgrent();
-+ *grpcnt = ngroups;
-+ return (ret);
-+}
-+#endif
---- libnfsidmap-0.27/nss.c
-+++ libnfsidmap-0.27/nss.c
-@@ -51,6 +51,8 @@
- #include "cfg.h"
- #include <syslog.h>
-
-+#include "getgrouplist.c"
-+
- /*
- * NSS Translation Methods
- *
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
deleted file mode 100644
index e93e96fb27f..00000000000
--- a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="NFSv4 ID <-> name mapping library"
-HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
-#SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
-SRC_URI="https://fedorapeople.org/~steved/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="ldap static-libs"
-
-DEPEND="ldap? ( net-nds/openldap )"
-RDEPEND="
- ${DEPEND}
- !<net-fs/nfs-utils-1.2.2
- !net-fs/idmapd
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.27-getgrouplist.patch #169909
- "${FILESDIR}"/${PN}-0.21-headers.patch
-)
-
-src_prepare() {
- default
- # Ideally the build would use -DLIBDIR=$(libdir) at build time.
- sed -i \
- -e "/PATH_PLUGINS/s:/usr/lib/libnfsidmap:${EPREFIX}/usr/$(get_libdir)/libnfsidmap:" \
- libnfsidmap.c || die #504666
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable ldap)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- insinto /etc
- doins idmapd.conf
-
- # remove useless files
- rm -f "${ED%/}"/usr/$(get_libdir)/libnfsidmap/*.{a,la}
- use static-libs || find "${ED%/}"/usr -name '*.la' -delete || die
-}
diff --git a/net-libs/libnfsidmap/metadata.xml b/net-libs/libnfsidmap/metadata.xml
deleted file mode 100644
index 73dda144f9a..00000000000
--- a/net-libs/libnfsidmap/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 492e21041f0..2e2c24425e7 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,2 +1,2 @@
-DIST libnftnl-1.2.0.tar.bz2 388751 BLAKE2B 6f61e7af8e50577029b1cf5ba7260f3803a64c410c7d35be8bbf3b6f9445d9db3be367442f56fb81f3ed49bc3efeab8dd2ed51bab4a1e4427f552d48e4bb559a SHA512 2a068e7eab308442bbfba5325f3aebeb874c142b029ff5906cadf63a1f879b20930bc55cd9554c5d256a0642f0f5a6d36177d9ae88cf507ab5dfc7fabffbb380
DIST libnftnl-1.2.1.tar.bz2 395299 BLAKE2B 9f525eb540ed959075199aab4b4217bdcf0f67d6744e58d7eab9f7a50aca2d22c6d65419b15c98d24772ef020c3ed2662eba7a0812a5919a840cee5aa589b056 SHA512 cabe6896210c451d7917d1abde5e73a65594d53f011486f75dd7be5b4804c49d10f0e508675e091e1faf0363b82670b3f3a167a85db91d52742dc69445888b6a
+DIST libnftnl-1.2.1.tar.bz2.sig 566 BLAKE2B dd37a52dc185ef2e8af8f0fe32037a03bf8f50101d566be1d40217ea092ec1a9af08281b22193bb274a1ad462c081980ccc8da35c76d910cf0d613ecb0235449 SHA512 dc589d7fcd7d4b0e5e7d50b02967f265ef11b2de69018c8eb264251eb5fab4b4fabb147b8b934f29cdbf66e7bee3f030ef9f02b5872bd76c4cf3523f7e38b94b
diff --git a/net-libs/libnftnl/libnftnl-1.2.0-r1.ebuild b/net-libs/libnftnl/libnftnl-1.2.0-r1.ebuild
deleted file mode 100644
index 412e1e9f3a4..00000000000
--- a/net-libs/libnftnl/libnftnl-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info usr-ldscript
-
-DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
-HOMEPAGE="https://netfilter.org/projects/nftables/"
-
-if [[ ${PV} =~ ^[9]{4,}$ ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.netfilter.org/${PN}"
-else
- SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/11" # libnftnl.so version
-IUSE="examples static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=net-libs/libmnl-1.0.4:="
-BDEPEND="virtual/pkgconfig"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- if kernel_is ge 3 13; then
- CONFIG_CHECK="~NF_TABLES"
- linux-info_pkg_setup
- else
- eerror "This package requires kernel version 3.13 or newer to work properly."
- fi
-}
-
-src_prepare() {
- default
- [[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- gen_usr_ldscript -a nftnl
- find "${ED}" -type f -name '*.la' -delete || die
-
- if use examples; then
- find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/net-libs/libnftnl/libnftnl-1.2.1.ebuild b/net-libs/libnftnl/libnftnl-1.2.1.ebuild
index 75e1ab39a6c..27da09b2ed0 100644
--- a/net-libs/libnftnl/libnftnl-1.2.1.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools linux-info usr-ldscript
+inherit autotools linux-info usr-ldscript verify-sig
DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
HOMEPAGE="https://netfilter.org/projects/nftables/"
@@ -12,8 +12,11 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.netfilter.org/${PN}"
else
- SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+ BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
fi
LICENSE="GPL-2"
@@ -23,7 +26,8 @@ IUSE="examples static-libs test"
RESTRICT="!test? ( test )"
RDEPEND=">=net-libs/libmnl-1.0.4:="
-BDEPEND="virtual/pkgconfig"
+BDEPEND+="
+ virtual/pkgconfig"
DEPEND="${RDEPEND}"
pkg_setup() {
diff --git a/net-libs/libnftnl/libnftnl-9999.ebuild b/net-libs/libnftnl/libnftnl-9999.ebuild
index 75e1ab39a6c..215d4c56908 100644
--- a/net-libs/libnftnl/libnftnl-9999.ebuild
+++ b/net-libs/libnftnl/libnftnl-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools linux-info usr-ldscript
+inherit autotools linux-info usr-ldscript verify-sig
DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
HOMEPAGE="https://netfilter.org/projects/nftables/"
@@ -12,8 +12,11 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.netfilter.org/${PN}"
else
- SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+ BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
fi
LICENSE="GPL-2"
@@ -23,7 +26,8 @@ IUSE="examples static-libs test"
RESTRICT="!test? ( test )"
RDEPEND=">=net-libs/libmnl-1.0.4:="
-BDEPEND="virtual/pkgconfig"
+BDEPEND+="
+ virtual/pkgconfig"
DEPEND="${RDEPEND}"
pkg_setup() {
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index dc6cbc3cb4d..29fa9063962 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -1 +1,3 @@
DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
+DIST libnice-0.1.18.tar.gz 439791 BLAKE2B 6bb68bb1484b4a622a580bc9c66b8be260d2615b211cf7991cb50a9f692df525cd0c3c9fc54ef86534426f396f8d2201966cdacfd3f69ff27193971f95886540 SHA512 08bac05874708f7e7a669d28727d8951a10c464b22dd6fada1a4644850bcf5c4cc022cce46bb24c806086a7869b274c4c7d3d6ddaa9ed0ce0bc2c47f72933227
+DIST libnice-0.1.19.tar.gz 453407 BLAKE2B 7bffde82a3e55d9aeeaadd159d944346a5192871e7f574e278dc43e8171e5fde472cd28186777a0b6cddd8bde34e035794b1c6b8f152c7fb4fae5202025bfdac SHA512 1c63cc0b7655186fd6f83da4dd607183d6ccfab9b7ad7189c1bea2ba7413183f24076aba5d6c7231d2ab3fbd471827256729a8a0c0d1bda48803586e68b3778b
diff --git a/net-libs/libnice/libnice-0.1.18.ebuild b/net-libs/libnice/libnice-0.1.18.ebuild
new file mode 100644
index 00000000000..331cc388a3b
--- /dev/null
+++ b/net-libs/libnice/libnice-0.1.18.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson-multilib xdg
+
+DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)"
+HOMEPAGE="https://nice.freedesktop.org/wiki/"
+SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+gnutls +introspection +upnp"
+
+RDEPEND="
+ >=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+ gnutls? ( >=net-libs/gnutls-2.12.0:0=[${MULTILIB_USEDEP}] )
+ !gnutls? (
+ dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+ upnp? ( >=net-libs/gupnp-igd-0.2.4:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ virtual/pkgconfig
+"
+
+multilib_src_configure() {
+ # gstreamer plugin split off into media-plugins/gst-plugins-libnice
+ local emesonargs=(
+ -Dgstreamer=disabled
+ -Dcrypto-library=$(usex gnutls gnutls openssl)
+ $(meson_native_use_feature introspection)
+ $(meson_feature upnp gupnp)
+ )
+
+ meson_src_configure
+
+ #if multilib_is_native_abi; then
+ # ln -s {"${S}"/,}docs/reference/libnice/html || die
+ #fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+}
diff --git a/net-libs/libnice/libnice-0.1.19.ebuild b/net-libs/libnice/libnice-0.1.19.ebuild
new file mode 100644
index 00000000000..228a38e0d2e
--- /dev/null
+++ b/net-libs/libnice/libnice-0.1.19.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson-multilib xdg
+
+DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)"
+HOMEPAGE="https://nice.freedesktop.org/wiki/"
+SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+gnutls gtk-doc +introspection +upnp"
+
+RDEPEND="
+ >=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+ gnutls? ( >=net-libs/gnutls-2.12.0:0=[${MULTILIB_USEDEP}] )
+ !gnutls? (
+ dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+ upnp? ( >=net-libs/gupnp-igd-0.2.4:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc
+ app-text/docbook-xml-dtd:4.1.2 )
+"
+
+multilib_src_configure() {
+ # gstreamer plugin split off into media-plugins/gst-plugins-libnice
+ local emesonargs=(
+ -Dgstreamer=disabled
+ -Dcrypto-library=$(usex gnutls gnutls openssl)
+ $(meson_native_use_feature introspection)
+ $(meson_feature upnp gupnp)
+ $(meson_native_use_feature gtk-doc gtk_doc)
+ )
+
+ meson_src_configure
+}
+
+multilib_src_install_all() {
+ einstalldocs
+}
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index a12c6bfcb8d..9469393608a 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -1 +1,2 @@
DIST libnids-1.24.tar.gz 151021 BLAKE2B ce545a8e3f4b61284ef7f2e6d1ce37aa537adef2686281468b4aaa509479d58073b9f6a5fbb7f03e33fa28ec18c01c8af49e0ce8a2d314ba5da5cbbba0fd7dcc SHA512 2046900023e853d7dbd7061c9f47d8a8ba26320991ca34198249019c1b9a6f75010574f9f022d02976272a384cf769394c4cc3ae536fc6164716cadc4770bb53
+DIST libnids-1.26.tar.gz 146172 BLAKE2B c84329a8da493f49d340d263835070c948a00d8400cd3e7a2a727b567f672b7af8017446281879ec19cb6d9e89eb07564c463fdf0521aa441ad5dc6ac2b97c73 SHA512 d582287f2c64241895ae437e501e92ef68adc8eac1a3df597d089634b994faee35d8b1cc018bbf20ced440bcd286af28f48c6f88da740a7c3de935ce3723561d
diff --git a/net-libs/libnids/files/libnids-1.26-revert-SONAME-bump.patch b/net-libs/libnids/files/libnids-1.26-revert-SONAME-bump.patch
new file mode 100644
index 00000000000..dc6abccd8c8
--- /dev/null
+++ b/net-libs/libnids/files/libnids-1.26-revert-SONAME-bump.patch
@@ -0,0 +1,26 @@
+From 0f07fe39585971b4c59f3a9b235e68d9c68184e3 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 14 Dec 2021 01:30:00 +0000
+Subject: [PATCH] Revert SONAME bump
+
+Bug: https://github.com/MITRECND/libnids/issues/9
+---
+ src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index e7b6dd8..e72a5da 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -13,7 +13,7 @@ includedir = @includedir@
+ libdir = @libdir@
+ mandir = @mandir@
+ LIBSTATIC = libnids.a
+-LIBSHARED = libnids.so.1.26
++LIBSHARED = libnids.so.1.24
+
+ CC = @CC@
+ CFLAGS = @CFLAGS@ -DLIBNET_VER=@LIBNET_VER@ -DHAVE_ICMPHDR=@ICMPHEADER@ -DHAVE_TCP_STATES=@TCPSTATES@ -DHAVE_BSD_UDPHDR=@HAVE_BSD_UDPHDR@
+--
+2.34.1
+
diff --git a/net-libs/libnids/libnids-1.26-r1.ebuild b/net-libs/libnids/libnids-1.26-r1.ebuild
new file mode 100644
index 00000000000..364e3468fe7
--- /dev/null
+++ b/net-libs/libnids/libnids-1.26-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="An implementation of an E-component of Network Intrusion Detection System"
+HOMEPAGE="https://github.com/MITRECND/libnids http://libnids.sourceforge.net/"
+SRC_URI="https://github.com/MITRECND/libnids/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+ mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+glib +libnet static-libs"
+
+RDEPEND="!net-libs/libnids:1.1
+ net-libs/libpcap
+ glib? ( dev-libs/glib:2 )
+ libnet? ( >=net-libs/libnet-1.1.0-r3 )"
+DEPEND="${RDEPEND}"
+BDEPEND="glib? ( virtual/pkgconfig )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.24-ldflags.patch
+ "${FILESDIR}"/${PN}-1.24-libdir.patch
+ "${FILESDIR}"/${PN}-1.24-static-libs.patch
+ "${FILESDIR}"/${PN}-1.24-no-inline.patch
+ "${FILESDIR}"/${PN}-1.26-revert-SONAME-bump.patch
+)
+
+src_prepare() {
+ default
+ eautoconf
+}
+
+src_configure() {
+ tc-export AR
+
+ append-flags -fno-strict-aliasing
+
+ econf \
+ --enable-shared \
+ $(usex glib '' --disable-libglib) \
+ $(use_enable libnet)
+}
+
+src_compile() {
+ emake shared $(usex static-libs static '')
+}
+
+src_install() {
+ local tgt
+ for tgt in _installshared $(usex static-libs _install ''); do
+ emake install_prefix="${D}" ${tgt}
+ done
+
+ dodoc CHANGES CREDITS MISC README doc/*
+}
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index 0e9bf559782..cd17ab7d487 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -1,2 +1,3 @@
-DIST libnma-1.8.30.tar.xz 1386248 BLAKE2B 7021e85595819b0cbd44b8c62087f49a5ecccc4bb230820d9a0159bf33b904df4f5c8021a79822c37d0933bdcde790a44f6d960b7f5f504e7506849aed35d54c SHA512 4d8f93d035fca4252e5c5dafc756ee6bc8f1d302aaeca77c5c0acb5d7f6cd4214224fb48e2706e69084c5a714aafa7837769be17d0642cc29eded9eb175a1107
-DIST libnma-1.8.32.tar.xz 1368492 BLAKE2B e91317259f79140803d5b99b23bafddebcb46a72b80c1fec912341aee377920ada3688864ede2aa3d492ef994de9b8f02e391fef98e0bbb61f296541338ad0cd SHA512 65244a8901322bc17d48c9cb809080790d5af0195b79becf0317da77b6c6a0fde3f8d3b752f5d7e59a5dba0970f4499077c5d9d6776912a72748290b8ac98e11
+DIST libnma-1.8.34.tar.xz 1342040 BLAKE2B e81004cf97832bdd010869fd7a801ceda42b96a70a0bd0aa50f821f7e3c361716f8075ec8ae82a224b6f617ee9b3f177239a53dd9eb982dd49da409d97671fd9 SHA512 aca1e24a852072e65d1fba910613981373bb7bb7869b2e44abc9e41c527d234273f034215d62889a265aa3327ad2cce0cea7368b025df97dab12bff098310aaf
+DIST libnma-1.8.36.tar.xz 1368748 BLAKE2B b60f3d383e5a55a766be8f8df71eb710d68b388c5ec0b946789856504327f6a8093943cc7b58dba992883099a899f3f55c70e5275d495610e79cef8e3e97d1b8 SHA512 c3f675d773d1be9006c01c3149751c8da1d5d08467be6d9aa921da3d867fdc9e8b26c7e6c9bd46a6cfd38a7eb721f8bcc209b43d9789a0b55c6029e11ca0fd22
+DIST libnma-1.8.38.tar.xz 1347004 BLAKE2B 108fc7d0a01ca72c84a738f831d442d82990f7b82301de3a47d8331af1e080a33c10806fb75830463fbfb8a4a1f556cdf5272ee52dbc4616ea3dbca1959cd128 SHA512 0421c598ccb6e3659f182b596eec76ffd695e51c11fd11b8325c2d08cb259536d7e74c11bbaac3ccb841016a0bc69a87f1c682b934a9eb569a74116e677eba63
diff --git a/net-libs/libnma/libnma-1.8.32.ebuild b/net-libs/libnma/libnma-1.8.34.ebuild
index 83317236981..5cfe6178ffa 100644
--- a/net-libs/libnma/libnma-1.8.32.ebuild
+++ b/net-libs/libnma/libnma-1.8.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ DEPEND="
app-text/iso-codes
net-misc/mobile-broadband-provider-info
>=dev-libs/glib-2.38:2
- >=x11-libs/gtk+-3.10:3[introspection?]
+ >=x11-libs/gtk+-3.12:3[introspection?]
>=net-misc/networkmanager-1.7[introspection?]
pkcs11? ( >=app-crypt/gcr-3.14:= )
introspection? ( >=dev-libs/gobject-introspection-1.56:= )
diff --git a/net-libs/libnma/libnma-1.8.30.ebuild b/net-libs/libnma/libnma-1.8.36.ebuild
index 98ccac03799..024459425f6 100644
--- a/net-libs/libnma/libnma-1.8.30.ebuild
+++ b/net-libs/libnma/libnma-1.8.36.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit gnome.org gnome2-utils meson xdg vala
@@ -13,13 +13,14 @@ SLOT="0"
# pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
IUSE="gtk-doc +introspection +pkcs11 vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
DEPEND="
+ >=gui-libs/gtk-4.0:4
app-text/iso-codes
net-misc/mobile-broadband-provider-info
>=dev-libs/glib-2.38:2
- >=x11-libs/gtk+-3.10:3[introspection?]
+ >=x11-libs/gtk+-3.12:3[introspection?]
>=net-misc/networkmanager-1.7[introspection?]
pkcs11? ( >=app-crypt/gcr-3.14:= )
introspection? ( >=dev-libs/gobject-introspection-1.56:= )
@@ -38,15 +39,17 @@ BDEPEND="
"
src_prepare() {
- use vala && vala_src_prepare
- xdg_src_prepare
+ default
+ use vala && vala_setup
+ xdg_environment_reset
}
src_configure() {
local emesonargs=(
- -Dlibnma_gtk4=false
+ -Dlibnma_gtk4=true
$(meson_use pkcs11 gcr)
-Dmore_asserts=0
+ -Dgcr_gtk4=false
-Diso_codes=true
-Dmobile_broadband_provider_info=true
-Dld_gc=false
diff --git a/net-libs/libnma/libnma-1.8.38.ebuild b/net-libs/libnma/libnma-1.8.38.ebuild
new file mode 100644
index 00000000000..76713c40ed0
--- /dev/null
+++ b/net-libs/libnma/libnma-1.8.38.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg vala
+
+DESCRIPTION="NetworkManager GUI library"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
+IUSE="gtk-doc +introspection +pkcs11 vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+ >=gui-libs/gtk-4.0:4
+ app-text/iso-codes
+ net-misc/mobile-broadband-provider-info
+ >=dev-libs/glib-2.38:2
+ >=x11-libs/gtk+-3.12:3[introspection?]
+ >=net-misc/networkmanager-1.7[introspection?]
+ pkcs11? ( >=app-crypt/gcr-3.14:= )
+ introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+"
+RDEPEND="${DEPEND}
+ !<gnome-extra/nm-applet-1.16.0" # gschema moved to here before nm-applet-1.16.0
+BDEPEND="
+ dev-libs/libxml2
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc
+ app-text/docbook-xml-dtd:4.3 )
+ vala? ( $(vala_depend)
+ net-misc/networkmanager[vala]
+ )
+"
+
+src_prepare() {
+ default
+ use vala && vala_setup
+ xdg_environment_reset
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dlibnma_gtk4=true
+ $(meson_use pkcs11 gcr)
+ -Dmore_asserts=0
+ -Dgcr_gtk4=false
+ -Diso_codes=true
+ -Dmobile_broadband_provider_info=true
+ -Dld_gc=false
+ $(meson_use gtk-doc gtk_doc)
+ $(meson_use introspection)
+ $(meson_use vala vapi)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/net-libs/libnpupnp/Manifest b/net-libs/libnpupnp/Manifest
index c5effee7484..77be72307f4 100644
--- a/net-libs/libnpupnp/Manifest
+++ b/net-libs/libnpupnp/Manifest
@@ -1 +1,2 @@
DIST libnpupnp-4.1.5.tar.gz 545672 BLAKE2B 75f3236cd18324ffa35215f152ef2b84d81b4bc81b9c73488e7274ecb5d76918f0ef328edcf089d81202e92f4fa3922bfe46d6eb3e9a1bbd065858bf6e5cff60 SHA512 a7b2f620c846f2127220a062eab76f2c06b3eee4503d9f4922d7d6342feea19381be1486bf1cb033c44275f83ab90be3f8f2c09f0ec6f0af7367c314023c889e
+DIST libnpupnp-4.2.1.tar.gz 544987 BLAKE2B dee3b5ffb0a3005c1ac9a262df61c8823f59cb0e1b204776ff4f7a465b5caf226a6149315af0862b397607bd07783c2f876fd143090cc92174e081d9a4dbd585 SHA512 89c83bf05e64684432698b36a2152b4b35e8cffd7e4ef12046289533bc54f014ab0275190e98e79338efe8ebee03d6e7e20a032d1d293b2eb01bf5e0f9e6154f
diff --git a/net-libs/libnpupnp/libnpupnp-4.1.5-r1.ebuild b/net-libs/libnpupnp/libnpupnp-4.1.5-r1.ebuild
new file mode 100644
index 00000000000..e43e9d04e31
--- /dev/null
+++ b/net-libs/libnpupnp/libnpupnp-4.1.5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
+HOMEPAGE="https://framagit.org/medoc92/npupnp"
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-libs/expat
+ net-libs/libmicrohttpd
+ net-misc/curl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-client \
+ --enable-debug \
+ --enable-device \
+ --enable-gena \
+ --enable-ipv6 \
+ --enable-optssdp \
+ --enable-reuseaddr \
+ --enable-soap \
+ --enable-ssdp \
+ --enable-tools \
+ --enable-webserver
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libnpupnp/libnpupnp-4.2.1.ebuild b/net-libs/libnpupnp/libnpupnp-4.2.1.ebuild
new file mode 100644
index 00000000000..e43e9d04e31
--- /dev/null
+++ b/net-libs/libnpupnp/libnpupnp-4.2.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
+HOMEPAGE="https://framagit.org/medoc92/npupnp"
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-libs/expat
+ net-libs/libmicrohttpd
+ net-misc/curl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-client \
+ --enable-debug \
+ --enable-device \
+ --enable-gena \
+ --enable-ipv6 \
+ --enable-optssdp \
+ --enable-reuseaddr \
+ --enable-soap \
+ --enable-ssdp \
+ --enable-tools \
+ --enable-webserver
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libnsl/libnsl-2.0.0-r1.ebuild b/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
index 99b3fb7a8a1..01b37a84383 100644
--- a/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/releases/download/v${PV}/${P}.tar.xz"
# changes.
SLOT="0/3"
LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
DEPEND=">=net-libs/libtirpc-1.2.0:=[${MULTILIB_USEDEP}]"
diff --git a/net-libs/libnxml/libnxml-0.18.3-r1.ebuild b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
index 0d411264df2..1f4b284d7de 100644
--- a/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
+++ b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 ~sparc x86"
IUSE="doc examples"
RDEPEND="net-misc/curl"
diff --git a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
index db045636e13..f0475e3b43d 100644
--- a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
+++ b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="C library implementing the OAuth secure authentication protocol"
-HOMEPAGE="http://liboauth.sourceforge.net/"
+HOMEPAGE="https://liboauth.sourceforge.io/"
SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
LICENSE="|| ( GPL-2 MIT )"
diff --git a/net-libs/libomemo/Manifest b/net-libs/libomemo/Manifest
index 910b73b7249..5ca884943e1 100644
--- a/net-libs/libomemo/Manifest
+++ b/net-libs/libomemo/Manifest
@@ -1 +1,3 @@
DIST libomemo-0.7.1.tar.gz 23770 BLAKE2B a3909650e399075f62026bd048a667a276a6cd7197ac18ddf9e3c12f57e5fd9cb2f5532ba69d0836af87e1415a5ffdc1746cf90a596dcf255265a64e921f039d SHA512 e5769dee4db7be246853e47e29ded9eefad2f62422951ce5dd0c1acee3bb92131c0423f09bc716be0f55fb02c747f07a6d5b2c656bdfeee0ee148252c51a1050
+DIST libomemo-0.8.0.tar.gz 25743 BLAKE2B 9b13aaaa21f16425fcecf963e187c5b686986e6bb01255c78042ea64e48d2c75a06729d1ad6e6b26d62d191e7d99305b7a8f1e07078221c6d14a12f587bf0743 SHA512 ff90de81928754f56bd2c6f3fcc83c13bb87d346e9bbedd6327bec33aab61a79061a709d541082723840205eb631b1a5493a43a5824e9e87e257d370692a606b
+DIST libomemo-0.8.1.tar.gz 28648 BLAKE2B b75ad298946dff680705ba0927293ea30cb8bf616a417c6584cef9f84e0894c5581462782a4b1003bf9e530695eea10bba9f37ae94e957a0008a35c862f17f62 SHA512 452c7ff9eb809de37df24bd0857c30c1e1ed1d4638c8338bb101f6d5a31be700f174f4fe65fb8ccd5358a674f8397a0eb54d8e03abfdce57cea60bcd4959f40a
diff --git a/net-libs/libomemo/libomemo-0.8.0.ebuild b/net-libs/libomemo/libomemo-0.8.0.ebuild
new file mode 100644
index 00000000000..14c96fe495e
--- /dev/null
+++ b/net-libs/libomemo/libomemo-0.8.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Implementation of OMEMO (XEP-0384) in C"
+HOMEPAGE="https://github.com/gkdr/libomemo"
+SRC_URI="https://github.com/gkdr/libomemo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+ dev-db/sqlite
+ dev-libs/glib
+ dev-libs/libgcrypt
+ dev-libs/mxml
+ "
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ test? ( dev-util/cmocka )
+ "
+
+RESTRICT="!test? ( test )"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_compile() {
+ emake PREFIX=/usr
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX=/usr install
+
+ # Respect libdir other than /usr/lib, e.g. /usr/lib64
+ local libdir="$(get_libdir)"
+ if [[ ${libdir} != lib ]]; then
+ mv "${D}"/usr/{lib,${libdir}} || die
+ sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \
+ -i "${D}/usr/${libdir}/pkgconfig/libomemo.pc" || die
+ fi
+
+ einstalldocs
+
+ if ! use static-libs ; then
+ rm "${D}/usr/${libdir}/libomemo.a" || die
+ fi
+}
diff --git a/net-libs/libomemo/libomemo-0.8.1.ebuild b/net-libs/libomemo/libomemo-0.8.1.ebuild
new file mode 100644
index 00000000000..5871eea1c6c
--- /dev/null
+++ b/net-libs/libomemo/libomemo-0.8.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Implementation of OMEMO (XEP-0384) in C"
+HOMEPAGE="https://github.com/gkdr/libomemo"
+SRC_URI="https://github.com/gkdr/libomemo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-db/sqlite
+ dev-libs/glib
+ dev-libs/libgcrypt
+ dev-libs/mxml
+ "
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ test? ( dev-util/cmocka )
+ "
+
+RESTRICT="!test? ( test )"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_configure() {
+ local mycmakeargs=(
+ -DOMEMO_WITH_TESTS=$(usex test)
+ )
+ cmake_src_configure
+}
diff --git a/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild
index 78a00cfa66f..fce5afb5010 100644
--- a/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild
+++ b/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="git://git.osmocom.org/${PN}"
else
SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86"
fi
LICENSE="GPL-2"
diff --git a/net-libs/libosmocore/Manifest b/net-libs/libosmocore/Manifest
deleted file mode 100644
index 4f227d41061..00000000000
--- a/net-libs/libosmocore/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libosmocore-0.10.2.tar.bz2 646555 BLAKE2B 62dbabdbb8a397662b618863aade394ef4638dd266e059ef4c6fa54364aba60db29cce1fc6c2692af095f32b3ce186ee5b788598595fe2128f0d04caad9d83d2 SHA512 a42db3467faec9c814efe40ae8cf4a41e610b97cac04c1da30c211f116e1f7907117aaab89aca8af3dcd8aedc2be73c9e1c194b9062d33856de02feddf4bda22
diff --git a/net-libs/libosmocore/files/libosmocore-0.6.0-automake-1.13.patch b/net-libs/libosmocore/files/libosmocore-0.6.0-automake-1.13.patch
deleted file mode 100644
index c61ecac1f33..00000000000
--- a/net-libs/libosmocore/files/libosmocore-0.6.0-automake-1.13.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libosmocore-0.6.0/configure.ac
-+++ libosmocore-0.6.0/configure.ac
-@@ -77,7 +77,7 @@
- CHECK_TM_INCLUDES_TM_GMTOFF
-
- dnl Generate the output
--AC_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- AC_ARG_ENABLE(talloc,
- [AS_HELP_STRING(
diff --git a/net-libs/libosmocore/libosmocore-0.10.2.ebuild b/net-libs/libosmocore/libosmocore-0.10.2.ebuild
deleted file mode 100644
index 3ac080827d7..00000000000
--- a/net-libs/libosmocore/libosmocore-0.10.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
-HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-else
- SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-IUSE="pcsc-lite"
-
-RDEPEND="
- sys-libs/talloc
- pcsc-lite? ( sys-apps/pcsc-lite )
-"
-
-DEPEND="${RDEPEND}
- app-doc/doxygen
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.6.0-automake-1.13.patch" )
-
-src_prepare() {
- default_src_prepare
- # set correct version in pkgconfig files
- sed -i "s/UNKNOWN/${PV}/" git-version-gen || die
-
- eautoreconf
-}
-
-src_configure() {
- append-flags -fcommon
- econf \
- $(use_enable pcsc-lite pcsc)
-}
diff --git a/net-libs/libosmocore/libosmocore-9999.ebuild b/net-libs/libosmocore/libosmocore-9999.ebuild
deleted file mode 100644
index 3ac080827d7..00000000000
--- a/net-libs/libosmocore/libosmocore-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
-HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-else
- SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-IUSE="pcsc-lite"
-
-RDEPEND="
- sys-libs/talloc
- pcsc-lite? ( sys-apps/pcsc-lite )
-"
-
-DEPEND="${RDEPEND}
- app-doc/doxygen
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.6.0-automake-1.13.patch" )
-
-src_prepare() {
- default_src_prepare
- # set correct version in pkgconfig files
- sed -i "s/UNKNOWN/${PV}/" git-version-gen || die
-
- eautoreconf
-}
-
-src_configure() {
- append-flags -fcommon
- econf \
- $(use_enable pcsc-lite pcsc)
-}
diff --git a/net-libs/libosmocore/metadata.xml b/net-libs/libosmocore/metadata.xml
deleted file mode 100644
index 0329d3de81a..00000000000
--- a/net-libs/libosmocore/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>radio@gentoo.org</email>
- <name>Radio</name>
- </maintainer>
- <use>
- <flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg></flag>
- </use>
-</pkgmetadata>
diff --git a/net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch b/net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch
new file mode 100644
index 00000000000..1aa60f478b8
--- /dev/null
+++ b/net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/836572
+--- a/tests/regression/client/client.c
++++ b/tests/regression/client/client.c
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ #include <syscall.h>
+ #include <sys/epoll.h>
++#include <sys/socket.h>
+ #include <sys/types.h>
+ #include <sys/un.h>
+ #include <unistd.h>
diff --git a/net-libs/libotr/libotr-4.1.1.ebuild b/net-libs/libotr/libotr-4.1.1.ebuild
index c4976292c2c..aae1bbc9b0c 100644
--- a/net-libs/libotr/libotr-4.1.1.ebuild
+++ b/net-libs/libotr/libotr-4.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
HOMEPAGE="https://otr.cypherpunks.ca"
@@ -10,21 +10,20 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
RDEPEND="
dev-libs/libgcrypt:0=
dev-libs/libgpg-error:0="
DEPEND="${RDEPEND}"
-src_configure() {
- econf --disable-static
-}
+PATCHES=(
+ "${FILESDIR}/${PN}-4.1.1-fix-build-with-libgcrypt-1.10.patch"
+)
src_install() {
default
dodoc UPGRADING
# no static archives, #465686
- find "${D}" -name '*.la' -delete || die
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index e973952f7f2..87ff3b25645 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,4 +1,2 @@
-DIST libpcap-1.10.0-upstream.tar.gz 934559 BLAKE2B 54e809af242b18d600b88f29bbe31b01784b5160366242f313908b58dfb1e6ee2ceae8d359f730881e15c1b26ed90c553869dffb25a74eb3cea9f597dd490b1d SHA512 007710386ff3435ef97fc99293076eae3c39b424e986141184c712b0285f8589357a1b25085f7eba28730de04312042c724d193934a399797e95a56f5301da7f
-DIST libpcap-1.10.0-upstream.tar.gz.sig 442 BLAKE2B f19ca45bbeee39ef1b3f8a8e8d8d9f24ad43e503430a3fa969a8ce668cb7926e1d19adb7e7cf11fff9dafa09b04507052ccc98f7b2a81f053ff01ec6c7ec8f87 SHA512 8a13aef00120080793da800f038d13124d412dfcfae6c0a952bcab544b50c8b69f6a672438bbe5bcdbfeda2e0d541bccefefbfc69f94e1635c0e9eaf77f19902
DIST libpcap-1.10.1-upstream.tar.gz 935221 BLAKE2B 0ec028e5d026a97b92ba6f23f88daf36b827eee08a752a0162fbabd1b5a2a70141ec403b6ff26dc3eb25ca5c6630c9c2f60f05b33161770da3d5e829c4eecdc6 SHA512 56c314f19c2b857742bf8abcb1e78066986aaa95cec339b75a3c8b70a9fa2b5167da98708352f9ec97a1cea2700cfb4e040bda108d58ac46cec9b7deab88d171
DIST libpcap-1.10.1-upstream.tar.gz.sig 442 BLAKE2B b76bf3c40a923b6c8fb9a356dff49a90e30dd0b0d785f138ac56bf1a41ad3a6fcfa3d5b3d28c12543857c5616b8938108b06313e35e4474d50991b72d9d371c8 SHA512 f9807efd11d99524b247981e5f4f02e1ffbeaa8468a9a22c66f9931a894071b9182164807b9fd11436883d36e8b0c6cc62302852005d958e34b5236e20caa33d
diff --git a/net-libs/libpcap/libpcap-1.10.0-r1.ebuild b/net-libs/libpcap/libpcap-1.10.0-r1.ebuild
deleted file mode 100644
index 13d40b16ff9..00000000000
--- a/net-libs/libpcap/libpcap-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap"
-
-if [[ ${PV} == *9999* ]] ; then
- EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
- inherit git-r3
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
- inherit verify-sig
-
- # Note: drop -upstream on bump, this is just because we switched to the official
- # distfiles for verify-sig
- SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
- SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
-
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="bluetooth dbus netlink rdma remote static-libs usb yydebug"
-
-RDEPEND="
- bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
- dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
- remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] )
- rdma? ( sys-cluster/rdma-core )
- usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-devel/flex
- virtual/yacc
- dbus? ( virtual/pkgconfig )
-"
-
-if [[ ${PV} != *9999* ]] ; then
- BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
-fi
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
- "${FILESDIR}"/${PN}-1.10.0-usbmon.patch
-)
-
-src_prepare() {
- default
-
- if ! [[ -f VERSION ]]; then
- echo ${PV} > VERSION || die
- fi
-
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" \
- econf \
- $(use_enable bluetooth) \
- $(use_enable dbus) \
- $(use_enable rdma) \
- $(use_enable remote) \
- $(use_enable usb) \
- $(use_enable yydebug) \
- $(use_with netlink libnl) \
- --enable-ipv6
-}
-
-multilib_src_compile() {
- emake all shared
-}
-
-multilib_src_install_all() {
- dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
-
- # remove static libraries (--disable-static does not work)
- if ! use static-libs; then
- find "${ED}" -name '*.a' -exec rm {} + || die
- fi
-
- find "${ED}" -name '*.la' -delete || die
-
- # We need this to build pppd on G/FBSD systems
- if [[ "${USERLAND}" == "BSD" ]]; then
- insinto /usr/include
- doins pcap-int.h portability.h
- fi
-}
diff --git a/net-libs/libpcap/libpcap-1.10.1-r1.ebuild b/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
index c275946be98..bf74c32ad09 100644
--- a/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,7 +20,7 @@ else
SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="BSD"
@@ -43,7 +43,7 @@ BDEPEND="
"
if [[ ${PV} != *9999* ]] ; then
- BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
fi
PATCHES=(
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 02b3408cddf..b0ff8fb28a1 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ else
SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="BSD"
@@ -41,7 +41,7 @@ BDEPEND="
"
if [[ ${PV} != *9999* ]] ; then
- BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
fi
PATCHES=(
diff --git a/net-libs/libproxy/files/libproxy-0.4.17-mozjs.patch b/net-libs/libproxy/files/libproxy-0.4.17-mozjs.patch
new file mode 100644
index 00000000000..cf31c77ae53
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.17-mozjs.patch
@@ -0,0 +1,15 @@
+Enable mozjs detection.
+Backported from https://github.com/libproxy/libproxy/commit/66b30ef388a45f66f9b118d51cc76b53fdb8bbf4
+Bug: https://bugs.gentoo.org/811858
+
+--- a/libproxy/cmake/modules.cmk
++++ b/libproxy/cmake/modules.cmk
+@@ -44,7 +44,7 @@ if(NM_FOUND)
+ set(NM_BUILD 1)
+ endif(NM_FOUND)
+ px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES})
+-px_module(pacrunner_mozjs 0 ${BIPR} ${MOZJS_LIBRARIES})
++px_module(pacrunner_mozjs "${MOZJS_FOUND}" ${BIPR} ${MOZJS_LIBRARIES})
+ px_module(pacrunner_natus "${NATUS_FOUND}" ${BIPR} ${NATUS_LIBRARIES})
+ px_module(pacrunner_webkit "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES})
+ px_module(wpad_dns_alias 1 1)
diff --git a/net-libs/libproxy/libproxy-0.4.17.ebuild b/net-libs/libproxy/libproxy-0.4.17-r1.ebuild
index 4777e3c49fc..0f5687d4a18 100644
--- a/net-libs/libproxy/libproxy-0.4.17.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -44,6 +44,9 @@ PATCHES=(
# prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
# https://github.com/libproxy/libproxy/issues/28
"${FILESDIR}/${PN}-0.4.16-avoid-nm-build-dep.patch"
+
+ # enable mozjs detection, bug #811858
+ "${FILESDIR}/${PN}-0.4.17-mozjs.patch"
)
multilib_src_configure() {
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index d0793884956..9f62b4a5210 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=(python3_{7,8,9})
+PYTHON_COMPAT=( python3_{8..10} )
inherit multilib-minimal python-any-r1
DESCRIPTION="C library for the Public Suffix List"
diff --git a/net-libs/libpsl/libpsl-0.21.1.ebuild b/net-libs/libpsl/libpsl-0.21.1.ebuild
index 379fbf8773d..a64f5cc0f2d 100644
--- a/net-libs/libpsl/libpsl-0.21.1.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=(python3_{7,8,9})
+PYTHON_COMPAT=( python3_{8..10} )
inherit multilib-minimal python-any-r1
DESCRIPTION="C library for the Public Suffix List"
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 3b55b67f92d..feac217b35e 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,3 +1,2 @@
-DIST libqmi-1.28.6.tar.xz 1192736 BLAKE2B 30330a8d085b26fc461c6fec2cfa58757e91093243aed8a4ac6df53a7656881f295a800979ff8fd42b815f96fafd128848765ecfb163e8101ac9c9a52eaaf507 SHA512 f4f7022e8c9b60618062548ec97450d98a5125dbd0e26df3dfb8bda5ab19a1f4c7864d35f7bd77217a4fe5562ce665fa613902b1d2185680bfa5d0c1e229e6dd
-DIST libqmi-1.30.0.tar.xz 1237944 BLAKE2B 862a7f12d458d7fce53596ec12e6e20d41a8378e6d9fd44535ea54b409f7020d33f5b3bab08ce583452e11abcbf5af48cc3a24a5fd382c7a833c435327c91614 SHA512 e0cf97f1ebc27feb68033d19b8bc146c41d134782c3eeefb1dd3502b08e493d8c484835235a7877854c1a9c2524ed6cc31aa1b897b873d0662f494a771b2c98f
-DIST libqmi-1.30.2.tar.xz 1239408 BLAKE2B be762988dcb40cdc29a9024989de0da42d3246c970ee63caba4f3a722b52e478879c177097165e880a48a7151d01f8f30e82d5a769258bd7c9cba9a24b0157a2 SHA512 e34e9cb4b49df6eac555e6493cfc89aaf6f9be3fbfb0b19a5fb6b69c81768fda499a6438b1a4f39b84a350899721c6a04c4195985077ac35da0036794bc59367
+DIST libqmi-1.30.4.tar.xz 1241912 BLAKE2B 561a2d4afd1b65955176490337e4f2335b0468010f0af546ea6026441224fa2713c2e7ed6aab958cb2657755247b75529d390155ef0bfc3aabba738755d28f23 SHA512 969c3e3fc8086c38e9192070eca155f5309947cdd1cfc9b883c27d80c6af2d069098a59e193bf1786260ab4fe4d05375555b5081dd173a88b33d84d409fa4a59
+DIST libqmi-1.30.6.tar.xz 1242612 BLAKE2B 318af914b595f0442f7929be53c128dcd111e12913814bb52e683fff814b7aa00a32d40f8eae367db469a7adef6c146fb692d5908951cec4337f21e9a266a400 SHA512 6dc9819bb45063ea827b989e99e8e889db0ce6ebec62586003ea385bd54bd76f3e79d63e3f2b57e19da5f42ed87d7aa11aa024a805ec86a6b203981eb7922a76
diff --git a/net-libs/libqmi/libqmi-1.28.6.ebuild b/net-libs/libqmi/libqmi-1.28.6.ebuild
deleted file mode 100644
index c62b2a064cc..00000000000
--- a/net-libs/libqmi/libqmi-1.28.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3 autotools
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
-else
- KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
- SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
-fi
-
-DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi"
-
-LICENSE="LGPL-2"
-SLOT="0/5.7" # soname of libqmi-glib.so
-IUSE="gtk-doc +mbim"
-
-RDEPEND=">=dev-libs/glib-2.48
- dev-libs/libgudev
- mbim? ( >=net-libs/libmbim-1.18.0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )"
-[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
- default
- [[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
- local myconf=(
- --disable-Werror
- --disable-static
- --disable-qrtr # libqrtr-glib not packaged
- $(use_enable mbim mbim-qmux)
- $(use_enable gtk-doc)
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libqmi/libqmi-1.30.2.ebuild b/net-libs/libqmi/libqmi-1.30.4.ebuild
index 4a0b1ecaf10..26eef8f4e6f 100644
--- a/net-libs/libqmi/libqmi-1.30.2.ebuild
+++ b/net-libs/libqmi/libqmi-1.30.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/net-libs/libqmi/libqmi-1.30.0.ebuild b/net-libs/libqmi/libqmi-1.30.6.ebuild
index c48a2bddbb4..a73bf3b1aab 100644
--- a/net-libs/libqmi/libqmi-1.30.0.ebuild
+++ b/net-libs/libqmi/libqmi-1.30.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/net-libs/libquotient/libquotient-0.6.11.ebuild b/net-libs/libquotient/libquotient-0.6.11-r1.ebuild
index f18a7ff7294..6e9390a9239 100644
--- a/net-libs/libquotient/libquotient-0.6.11.ebuild
+++ b/net-libs/libquotient/libquotient-0.6.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,14 +12,14 @@ S="${WORKDIR}/libQuotient-${PV}"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
IUSE=""
DEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
+ dev-qt/qtnetwork:5[ssl]
"
RDEPEND="${DEPEND}"
diff --git a/net-libs/libsearpc/libsearpc-3.2.0-r2.ebuild b/net-libs/libsearpc/libsearpc-3.2.0-r2.ebuild
index 14a1c15737b..638a1f5f322 100644
--- a/net-libs/libsearpc/libsearpc-3.2.0-r2.ebuild
+++ b/net-libs/libsearpc/libsearpc-3.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}
diff --git a/net-libs/libsignal-protocol-c/metadata.xml b/net-libs/libsignal-protocol-c/metadata.xml
index 1c2c8657b8d..3c725997cff 100644
--- a/net-libs/libsignal-protocol-c/metadata.xml
+++ b/net-libs/libsignal-protocol-c/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>andrey_utkin@gentoo.org</email>
- <name>Andrey Utkin</name>
- </maintainer>
<maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
index b2523bed1cc..7deab5160a6 100644
--- a/net-libs/libslirp/Manifest
+++ b/net-libs/libslirp/Manifest
@@ -1 +1,2 @@
DIST libslirp-4.6.1.tar.gz 135569 BLAKE2B 7a890912f2a8ce9d6820870e2d29b9c7a2253c403c2bcb127a38e02b2b81d1e262f34571c8a4c05fbf46874b9b2967cb5597cabe169ad54f12702fdd8b90bb3c SHA512 04a9dd88cd58c849a24b9cff405d951952760d99ea2bef0b070463dff088d79f44557a13c9427ba0043f58d4b9e06b68ff64a4f23a7b0d66df594e32e1521cae
+DIST libslirp-4.7.0.tar.gz 143251 BLAKE2B f3e1c3a31f09462d79ca6c663a05bde02b075090f3a5f7bc69fef3c72b8517c11a123ad7b46f4b2855cbc9a7a5dbde8d1cb2d5e3e2a9d7eedbe570c200f8bcc6 SHA512 387f4a6dad240ce633df2640bb49c6cb0041c8b3afc8d0ef38186d385f00dd9e4ef4443e93e1b71dbf05e22892b6f2771a87a202e815d8ec899ab5c147a1f09f
diff --git a/net-libs/libslirp/libslirp-4.6.1.ebuild b/net-libs/libslirp/libslirp-4.6.1.ebuild
index 66229c71584..272a78bb0d4 100644
--- a/net-libs/libslirp/libslirp-4.6.1.ebuild
+++ b/net-libs/libslirp/libslirp-4.6.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit meson
-KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm64 ~m68k ~ppc ppc64 ~riscv x86"
MY_P="${PN}-v${PV}"
SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A TCP-IP emulator used to provide virtual networking services."
+DESCRIPTION="A TCP-IP emulator used to provide virtual networking services"
HOMEPAGE="https://gitlab.freedesktop.org/slirp/libslirp"
LICENSE="BSD"
diff --git a/net-libs/libslirp/libslirp-4.7.0.ebuild b/net-libs/libslirp/libslirp-4.7.0.ebuild
new file mode 100644
index 00000000000..8af6b877d67
--- /dev/null
+++ b/net-libs/libslirp/libslirp-4.7.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+KEYWORDS="~amd64 ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~x86"
+MY_P="${PN}-v${PV}"
+SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A TCP-IP emulator used to provide virtual networking services"
+HOMEPAGE="https://gitlab.freedesktop.org/slirp/libslirp"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/glib:="
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ echo "${PV}" > .tarball-version || die
+ echo -e "#!${BASH}\necho -n \$(cat '${S}/.tarball-version')" > build-aux/git-version-gen || die
+ default
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddefault_library=$(usex static-libs both shared)
+ )
+ meson_src_configure
+}
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index eeda67948b9..542bf80551d 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,4 +1,4 @@
-DIST libsoup-2.72.0.tar.xz 1477940 BLAKE2B e63a26aa29a4a34c4e4b0a2713818db52b206b04b56d99391648351f87a62dc3455020e8eb0312ef17b2b7d047a7d5731905ecc214085afd4eff25fefa30782b SHA512 ca16772d0d318c4be0c4859db1e32baffa2231b4732f3bf9814aa405febde86395a0fb8bfa1635d70a7b5853d2567403920b9b0d0f5c3c179294352af27e91de
-DIST libsoup-2.74.0.tar.xz 1498224 BLAKE2B c03b817a7a7f708480581aad258e5e24c541c6c2f39e48c51597d67c729b3a0722ef094916ad841904a0cafc67f12ad20d05b74ac41aeb174cb79b49fdd0977e SHA512 d78374c31631d7d1fb30ceb7c6016ab970cb321b06191d3463f178ceea9dacd08c828b8f16f5a30c185489ebfbc93ff9da09ae4978be3e3ff11bf7ee95a2a9a6
-DIST libsoup-2.74.1.tar.xz 1496188 BLAKE2B 6f15415d5d4d68fa1f7167363cbed77dee9d4feea226357389209c96367c27c554fdc81fa25bcc8ce02290d6781dc2cc99298342349aada9ad9e32a10727c641 SHA512 107726e069becc0a79904905a10a0ceb0c010fcae57ee86fbb838e6edf58abfc464c8e6c3afb610e495d9c2a24ec6b4ba4c023921611642a9d3c89627daa154b
-DIST libsoup-3.0.2.tar.xz 1518728 BLAKE2B 17a476b08a78c06885de5bb63650b7232541bbb70aaa00a9ae67641b0a2d83fc726d8ef24c0c1cc1ca010b645e184bf7f17ced459d41e01a031712bf21108833 SHA512 0853d094555b3cff2a48f16ea1058ba55f9475ac1e0c1515792101e387596cdd8e3d69947eb4056b69b3cbee5d09111e99c3e684d207180d8e64b23a238f181f
+DIST libsoup-2.74.2.tar.xz 1497356 BLAKE2B b05e5d06e20a95042334c79e3a633ec43db0e7444b425f8577045fbdee7b78bd697e743f4283ed79265bbe538145a541ef2ef55636ae235667a89d00910d5bf2 SHA512 6f9da3296364e210103093cef9ef34fb40f694a8ef90966fc1fbd834c11f3db1031784a0901e9181bf3124e0682708148bd3598a31d60f1cce61eaae2e19ba7a
+DIST libsoup-3.0.4.tar.xz 1523336 BLAKE2B 5df12a2bafdd36905fd2122b1123ce630ffad93de5965eb2f3e47f85f3bc3169e8c005e245ee9ba72433fc735d7b24b304bac55b800bce59506961976a57f634 SHA512 4e6c226dfd8dd3fb2568affdbf88b8f0ad52903198c1dfc808c4cba1c0479442581953b5fb83166a3a198fb861618b62f165a4544b5daaed094bbeeff94a48ff
+DIST libsoup-3.0.5.tar.xz 1528824 BLAKE2B 952b72e81d61d4aca2a5c035bafa37deb3ddd26a35a285aa2c09731b60b675a9f90bc185abd4787c16e8e9fb1007ae633a6f91c6e58df9eddb04249b503adc13 SHA512 38d1ba57bcd390385950cf79cfe6781d9ad59e5f75f2c080adac976f2fcfa020cbada1e63fedd780b1efe33a53fb7563b73fd38f011c462d92a90988e4fed9b8
+DIST libsoup-3.0.6.tar.xz 1527232 BLAKE2B 28a2aec2323686af692bfcee3126c76b8506c7721b81bd3beb276b488ec6c26498e4b1396ea6d3537cf00a203cbca2798ea414c4d2227f9c520660fc61459804 SHA512 4de84b3c251b6fe75903b1cd2647ac22055f799382a186efe6f45d3f75bf6c82040f0aaceb40d0019769cf1c0295511eb0afbbc7236e93b168ed70c2ae975a89
diff --git a/net-libs/libsoup/files/3.0.2-fix-leak.patch b/net-libs/libsoup/files/3.0.2-fix-leak.patch
deleted file mode 100644
index cad804a7a03..00000000000
--- a/net-libs/libsoup/files/3.0.2-fix-leak.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c7e251644c618ce5193881b2a16374ababc2ccf8 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 11 Nov 2021 16:47:34 +0200
-Subject: [PATCH] connection: Fix memory leak in new_tls_connection
-
----
- libsoup/soup-connection.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libsoup/soup-connection.c b/libsoup/soup-connection.c
-index f2e35f47..38a91e46 100644
---- a/libsoup/soup-connection.c
-+++ b/libsoup/soup-connection.c
-@@ -585,6 +585,7 @@ new_tls_connection (SoupConnection *conn,
- "advertised-protocols", advertised_protocols->pdata,
- NULL);
-
-+ g_object_unref (tls_interaction);
- g_ptr_array_unref (advertised_protocols);
-
- if (!tls_connection)
---
-2.32.0
-
diff --git a/net-libs/libsoup/libsoup-2.72.0-r1.ebuild b/net-libs/libsoup/libsoup-2.74.2.ebuild
index af1cd5f7bfd..c8a8e7e509d 100644
--- a/net-libs/libsoup/libsoup-2.72.0-r1.ebuild
+++ b/net-libs/libsoup/libsoup-2.74.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/net-libs/libsoup/libsoup-3.0.2.ebuild b/net-libs/libsoup/libsoup-3.0.4.ebuild
index 42bc6d7a296..e6bf69b822a 100644
--- a/net-libs/libsoup/libsoup-3.0.2.ebuild
+++ b/net-libs/libsoup/libsoup-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -51,7 +51,6 @@ BDEPEND="
# net-libs/glib-networking[ssl])"
PATCHES=(
- "${FILESDIR}"/${PV}-fix-leak.patch
# Disable apache tests until they are usable on Gentoo, bug #326957
"${FILESDIR}"/disable-apache-tests.patch
)
@@ -83,7 +82,6 @@ multilib_src_configure() {
$(meson_native_use_feature introspection)
$(meson_native_use_feature vala vapi)
$(meson_native_use_bool gtk-doc gtk_doc)
- # TODO: Tests fail with network-sandbox or 32bit (upstream issue #236) for 2.99.9
$(meson_use test tests)
-Dinstalled_tests=false
$(meson_feature sysprof)
diff --git a/net-libs/libsoup/libsoup-2.74.1.ebuild b/net-libs/libsoup/libsoup-3.0.5.ebuild
index 5bf1131885f..84e2cca340d 100644
--- a/net-libs/libsoup/libsoup-2.74.1.ebuild
+++ b/net-libs/libsoup/libsoup-3.0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-VALA_USE_DEPEND="vapigen"
+EAPI=8
+VALA_MIN_API_VERSION="0.54" # requires gio-2.0.vapi generated from glib-2.70+
inherit gnome.org meson-multilib vala xdg
@@ -10,19 +10,18 @@ DESCRIPTION="HTTP client/server library for GNOME"
HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
LICENSE="LGPL-2.1+"
-SLOT="2.4"
+SLOT="3.0"
-# TODO: Default enable brotli at some point? But in 2.70.0 not advertised to servers yet - https://gitlab.gnome.org/GNOME/libsoup/issues/146
-IUSE="brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
+IUSE="+brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
RESTRICT="!test? ( test )"
REQUIRED_USE="vala? ( introspection )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
DEPEND="
- >=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.69.1:2[${MULTILIB_USEDEP}]
+ net-libs/nghttp2:=[${MULTILIB_USEDEP}]
>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] )
>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
@@ -32,7 +31,7 @@ DEPEND="
samba? ( net-fs/samba )
"
RDEPEND="${DEPEND}
- >=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
+ >=net-libs/glib-networking-2.70_alpha[ssl?,${MULTILIB_USEDEP}]
"
BDEPEND="
dev-libs/glib
@@ -42,6 +41,7 @@ BDEPEND="
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
vala? ( $(vala_depend) )
+ test? ( >=net-libs/gnutls-3.6.0[pkcs11] )
"
# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
@@ -56,8 +56,9 @@ PATCHES=(
)
src_prepare() {
- use vala && vala_src_prepare
- xdg_src_prepare
+ default
+ use vala && vala_setup
+ xdg_environment_reset
# https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname
sed -e '/hsts/d' -i tests/meson.build || die
}
@@ -65,7 +66,7 @@ src_prepare() {
src_configure() {
# FIXME: we need addpredict to workaround bug #324779 until
# root cause (bug #249496) is solved
- # But necessary while apache tests are disabled
+ # But unnecessary while apache tests are disabled
#addpredict /usr/share/snmp/mibs/.index
multilib-minimal_src_configure
@@ -79,13 +80,13 @@ multilib_src_configure() {
$(meson_feature brotli)
-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
-Dtls_check=false # disables check, we still rdep on glib-networking
- -Dgnome=false
$(meson_native_use_feature introspection)
$(meson_native_use_feature vala vapi)
$(meson_native_use_bool gtk-doc gtk_doc)
$(meson_use test tests)
-Dinstalled_tests=false
$(meson_feature sysprof)
+ $(meson_feature test pkcs11_tests)
)
meson_src_configure
}
diff --git a/net-libs/libsoup/libsoup-2.74.0.ebuild b/net-libs/libsoup/libsoup-3.0.6.ebuild
index 5bf1131885f..84e2cca340d 100644
--- a/net-libs/libsoup/libsoup-2.74.0.ebuild
+++ b/net-libs/libsoup/libsoup-3.0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-VALA_USE_DEPEND="vapigen"
+EAPI=8
+VALA_MIN_API_VERSION="0.54" # requires gio-2.0.vapi generated from glib-2.70+
inherit gnome.org meson-multilib vala xdg
@@ -10,19 +10,18 @@ DESCRIPTION="HTTP client/server library for GNOME"
HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
LICENSE="LGPL-2.1+"
-SLOT="2.4"
+SLOT="3.0"
-# TODO: Default enable brotli at some point? But in 2.70.0 not advertised to servers yet - https://gitlab.gnome.org/GNOME/libsoup/issues/146
-IUSE="brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
+IUSE="+brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
RESTRICT="!test? ( test )"
REQUIRED_USE="vala? ( introspection )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
DEPEND="
- >=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.69.1:2[${MULTILIB_USEDEP}]
+ net-libs/nghttp2:=[${MULTILIB_USEDEP}]
>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] )
>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
@@ -32,7 +31,7 @@ DEPEND="
samba? ( net-fs/samba )
"
RDEPEND="${DEPEND}
- >=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
+ >=net-libs/glib-networking-2.70_alpha[ssl?,${MULTILIB_USEDEP}]
"
BDEPEND="
dev-libs/glib
@@ -42,6 +41,7 @@ BDEPEND="
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
vala? ( $(vala_depend) )
+ test? ( >=net-libs/gnutls-3.6.0[pkcs11] )
"
# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
@@ -56,8 +56,9 @@ PATCHES=(
)
src_prepare() {
- use vala && vala_src_prepare
- xdg_src_prepare
+ default
+ use vala && vala_setup
+ xdg_environment_reset
# https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname
sed -e '/hsts/d' -i tests/meson.build || die
}
@@ -65,7 +66,7 @@ src_prepare() {
src_configure() {
# FIXME: we need addpredict to workaround bug #324779 until
# root cause (bug #249496) is solved
- # But necessary while apache tests are disabled
+ # But unnecessary while apache tests are disabled
#addpredict /usr/share/snmp/mibs/.index
multilib-minimal_src_configure
@@ -79,13 +80,13 @@ multilib_src_configure() {
$(meson_feature brotli)
-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
-Dtls_check=false # disables check, we still rdep on glib-networking
- -Dgnome=false
$(meson_native_use_feature introspection)
$(meson_native_use_feature vala vapi)
$(meson_native_use_bool gtk-doc gtk_doc)
$(meson_use test tests)
-Dinstalled_tests=false
$(meson_feature sysprof)
+ $(meson_feature test pkcs11_tests)
)
meson_src_configure
}
diff --git a/net-libs/libssh/libssh-0.9.6.ebuild b/net-libs/libssh/libssh-0.9.6.ebuild
index 62788702358..5bfd45be2d1 100644
--- a/net-libs/libssh/libssh-0.9.6.ebuild
+++ b/net-libs/libssh/libssh-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index ba3c105ee10..2801869f419 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild b/net-libs/libssh2/libssh2-1.10.0.ebuild
index ff53c923466..64664f5917e 100644
--- a/net-libs/libssh2/libssh2-1.10.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="gcrypt mbedtls zlib"
REQUIRED_USE="?? ( gcrypt mbedtls )"
# Tests try to set containers up using docker (and fail for some reason).
diff --git a/net-libs/libtirpc/libtirpc-1.3.2.ebuild b/net-libs/libtirpc/libtirpc-1.3.2.ebuild
index ec87a461675..1db380303e0 100644
--- a/net-libs/libtirpc/libtirpc-1.3.2.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="ipv6 kerberos static-libs"
RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 5a73b357628..b3072cc7412 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,8 +1,6 @@
-DIST libtorrent-1.2.10.tar.gz 3586008 BLAKE2B 71971124930462feb5f5083fed38ccadcfd1a2aed0d000a06cd7e0898b40a1451722cd79fdf0b1da3477047b26c7f7e3c1f74086a141770a7d143c916e96b6bb SHA512 e6de939fb6527783695e0b6623ddbe27f85842a36c0899b93ea0284cb3c6f3d14b8c39e29316adb3bf9acac7804f38385cc06854a32df28e7f4f6839af9f382d
-DIST libtorrent-1.2.11.tar.gz 3591610 BLAKE2B fab5d780dc5e1a855b60326cefdca6bcfb7459d4d37429e1c475434ca6ca2f465ffb6188ff519f49f2612941fe4806152511400a1c6fe121ade3ed35c6f40a79 SHA512 d502286f67bf462f14169daafe12b94ca723598530c85360c3a4b3c73535202b63632036248fdecc942cb559e66e6a5cb5afa830dc78bbff72a6c9a330710b62
-DIST libtorrent-1.2.12.tar.gz 3604064 BLAKE2B e0eb00aba90e3d5e3ba1bf3984e2eb606583007137288ccf93961185744ccc2a69922063a9004a2ebe627d7657c582eaee9f7ad2971de0dc41351bd59ed23953 SHA512 78be4c12e12f593154eda0960aaf9583fe27310e0223dbb21220400c5339744c9b2b11afa880fea30f77b4c0d07345937ff8a20d58d2d4ed7dcda84601380e20
DIST libtorrent-1.2.14.tar.gz 3614077 BLAKE2B 423cd0c467510e3b4d33485ea108912a90ef0d66746e6f912eeb07930e7091d1ce8e28953a48dab3bb03c6232a9e958be423d4563bd63c083ec1423c4753b3df SHA512 9ba7d8a271ecc7330ae9c794f3966a6d1677b9d2a02a24df8b6e63daa4d5c0a7ef88607a73b417247b4afc5195e46cd0ca75859358f9e50915af56b3ed19f322
-DIST libtorrent-1.2.9.tar.gz 3584800 BLAKE2B 5160056e227a54992ca4e490ffe0088d080aa9bade7a76f55eac26a644bab720c39a70b90d94f465ec711893249a084d9f77fa496be770585094b9b3ea4a1cdd SHA512 c547d96470f6a89f22adc0f5579ffb98b877a46f0a163698c49f1de57f23af60a7b0d3c1ca482e3ed8d3e35124d14a1d16a53e455f4d69f347fcb33c6ded75a8
-DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc
+DIST libtorrent-rasterbar-1.2.15.tar.gz 4163049 BLAKE2B 282d6cf19897706f96d68c75df3c1f5f004df38c07ca2fcaa760f0004512dc8759ea47d4e0c96ff4d8ac2d23569a05507c5dd0667d83c702e14825a0d9ffcd0e SHA512 c409c53ec9c299a05b51ab61d7df1209803cbd6070f0a014dd6fb42c30f6f5230ea90848330f901c61816bc70901e618409acacc95bb0e5acb7f81211d001fa2
DIST libtorrent-rasterbar-2.0.4-ssl-tests-certs.patch.bz2 26530 BLAKE2B 0958f11be84860cfb0e9224901a6052d9acb80edbd9f9e6eeb2e621e30e75fac4c4db64c71573b7c7f91761e74b9c5781ef8d1a202aef06cd92e3edb15d9f810 SHA512 f3afc4e0857838a44fa3671d657b5f669194c504d07d8f72ca5ddc060786127e3d6ad4ae9efa39e9f02fbe396f4785a1755dd1fd9607c1cef31aa60574b3511e
DIST libtorrent-rasterbar-2.0.4.tar.gz 4311319 BLAKE2B fee8255d46d5ca019cd487b57fc6003744c208ea5e78873b925f53881667c55c506d302fc7ae6cd5b5d5e776cfe059b714db94d16dd28cfc7939ec6f4fa4e5fa SHA512 66ce3c3369b1d2a83654727c23022d38b070b8bc3ad83b1001e2cfad945acbaa4d61990094bc758886967cd305ca2213b60b1b0523b5106c42d4701d8cff8db1
+DIST libtorrent-rasterbar-2.0.5.tar.gz 4407260 BLAKE2B 71c64879be103326fe438ba6b11b672fb0d631ed0de4eb23c2595f3596b522693594ded9f8733c7827dd668e285cb5099cad78bcd437ec184837eafbd39b356f SHA512 be5b812135dada957e565085b5bdda06827c8427f78a4468ef263e1a1e33d3a0bbba7ac27235f0d17ae6087d54311281e3b1975eef81cda514acc8329862dc04
+DIST libtorrent-rasterbar-2.0.6.tar.gz 4431174 BLAKE2B 4951a102b68a5a7ba9a98d771ca638e8438b2aeaa95f5d7bf616542c7a02d28e184ee1bf5b7a55cd91a068cd2d4e9756c479e4ddb5eabe89d8aa833d70aa7502 SHA512 4a5d710706040ef6193967dbb13998cb0ddebe7e95c3bf8aec0812876027c68c32b001fd3f07cd4ff1b819660a8d46ae8c7077e72caf92572288a51cdec7daea
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch
new file mode 100644
index 00000000000..93e14963e36
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch
@@ -0,0 +1,46 @@
+From feb911a19c8a66bf13915973649d3a4f5d729f12 Mon Sep 17 00:00:00 2001
+From: arvidn <arvid@libtorrent.org>
+Date: Sun, 12 Dec 2021 21:52:15 +0100
+Subject: [PATCH] update allocator sizes for boost-1.78
+
+---
+ include/libtorrent/aux_/allocating_handler.hpp | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/include/libtorrent/aux_/allocating_handler.hpp b/include/libtorrent/aux_/allocating_handler.hpp
+index 726032e085c..7096dfd2e67 100644
+--- a/include/libtorrent/aux_/allocating_handler.hpp
++++ b/include/libtorrent/aux_/allocating_handler.hpp
+@@ -77,11 +77,11 @@ namespace libtorrent { namespace aux {
+ constexpr std::size_t openssl_write_cost = 0;
+ #endif
+
+- constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + 102 + 8 * sizeof(void*);
+- constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + 102 + 8 * sizeof(void*);
+- constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 144 + 8 * sizeof(void*);
+- constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 168 + 8 * sizeof(void*);
+- constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 160;
++ constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + 102 + 9 * sizeof(void*);
++ constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + 102 + 9 * sizeof(void*);
++ constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 144 + 9 * sizeof(void*);
++ constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 168 + 9 * sizeof(void*);
++ constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 168;
+ constexpr std::size_t abort_handler_max_size = tracking + debug_tick + 104;
+ constexpr std::size_t submit_handler_max_size = tracking + debug_tick + 104;
+ constexpr std::size_t deferred_handler_max_size = tracking + debug_tick + 112;
+@@ -124,12 +124,12 @@ namespace libtorrent { namespace aux {
+ #endif
+ constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 168;
+ constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 168;
+- constexpr std::size_t udp_handler_max_size = tracking + 160;
+- constexpr std::size_t utp_handler_max_size = tracking + 184;
++ constexpr std::size_t udp_handler_max_size = tracking + 168;
++ constexpr std::size_t utp_handler_max_size = tracking + 192;
+ constexpr std::size_t abort_handler_max_size = tracking + 72;
+ constexpr std::size_t submit_handler_max_size = tracking + 72;
+ constexpr std::size_t deferred_handler_max_size = tracking + 80;
+- constexpr std::size_t tick_handler_max_size = tracking + 128;
++ constexpr std::size_t tick_handler_max_size = tracking + 136;
+ #endif
+
+ enum HandlerName
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild
deleted file mode 100644
index 982c7a1fdd1..00000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools flag-o-matic distutils-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/libtorrent-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/libtorrent-libtorrent-${PV}"
-
-RDEPEND="
- dev-libs/boost:=[threads(+)]
- virtual/libiconv
- examples? ( !net-p2p/mldonkey )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- )
- ssl? (
- dev-libs/openssl:0=
- )
-"
-DEPEND="${RDEPEND}
- sys-devel/libtool
-"
-
-src_prepare() {
- mkdir -p "${S}"/build-aux || die
- touch "${S}"/build-aux/config.rpath || die
- append-cxxflags -std=c++14
- eautoreconf
-
- default
-
- # bug 578026
- # prepend -L${S}/... to ensure bindings link against the lib we just built
- sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
- # prepend -I${S}/... to ensure bindings use the right headers
- sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
- use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable debug export-all)
- $(use_enable debug logging)
- $(use_enable dht)
- $(use_enable examples)
- $(use_enable ssl encryption)
- $(use_enable static-libs static)
- $(use_enable test tests)
- --with-boost
- --with-libiconv
- --enable-logging
- )
- econf "${myeconfargs[@]}"
-
- if use python; then
- python_configure() {
- econf "${myeconfargs[@]}" \
- --enable-python-binding \
- --with-boost-python="boost_${EPYTHON/./}"
- # git rid of c++11
- sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
- mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
- }
- distutils-r1_src_configure
- fi
-}
-
-src_compile() {
- default
-
- python_compile() {
- cd "${BUILD_DIR}/../bindings/python" || die
- distutils-r1_python_compile
- }
- use python && distutils-r1_src_compile
-}
-
-src_install() {
- use doc && HTML_DOCS+=( "${S}"/docs )
-
- default
-
- python_install() {
- cd "${BUILD_DIR}/../bindings/python" || die
- distutils-r1_python_install
- }
- use python && distutils-r1_src_install
-
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild
deleted file mode 100644
index 6f2a7293980..00000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools flag-o-matic distutils-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorrent-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/libtorrent-${PV}"
-
-RDEPEND="
- dev-libs/boost:=[threads(+)]
- virtual/libiconv
- examples? ( !net-p2p/mldonkey )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- )
- ssl? (
- dev-libs/openssl:0=
- )
-"
-DEPEND="${RDEPEND}
- sys-devel/libtool
-"
-
-src_prepare() {
- mkdir -p "${S}"/build-aux || die
- touch "${S}"/build-aux/config.rpath || die
- append-cxxflags -std=c++14
- eautoreconf
-
- default
-
- # bug 578026
- # prepend -L${S}/... to ensure bindings link against the lib we just built
- sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
- # prepend -I${S}/... to ensure bindings use the right headers
- sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
- use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable debug export-all)
- $(use_enable debug logging)
- $(use_enable dht)
- $(use_enable examples)
- $(use_enable ssl encryption)
- $(use_enable static-libs static)
- $(use_enable test tests)
- --with-boost="${ESYSROOT}/usr"
- --with-libiconv
- --enable-logging
- )
- econf "${myeconfargs[@]}"
-
- if use python; then
- python_configure() {
- econf "${myeconfargs[@]}" \
- --enable-python-binding \
- --with-boost-python="boost_${EPYTHON/./}"
- # git rid of c++11
- sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
- mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
- }
- distutils-r1_src_configure
- fi
-}
-
-src_compile() {
- default
-
- python_compile() {
- cd "${BUILD_DIR}/../bindings/python" || die
- distutils-r1_python_compile
- }
- use python && distutils-r1_src_compile
-}
-
-src_install() {
- use doc && HTML_DOCS+=( "${S}"/docs )
-
- default
-
- python_install() {
- cd "${BUILD_DIR}/../bindings/python" || die
- distutils-r1_python_install
- }
- use python && distutils-r1_src_install
-
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12-r1.ebuild
deleted file mode 100644
index 9a57948f717..00000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools flag-o-matic distutils-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorrent-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/libtorrent-${PV}"
-
-RDEPEND="
- dev-libs/boost:=[threads(+)]
- virtual/libiconv
- examples? ( !net-p2p/mldonkey )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- )
- ssl? (
- dev-libs/openssl:0=
- )
-"
-DEPEND="${RDEPEND}
- sys-devel/libtool
-"
-
-src_prepare() {
- mkdir -p "${S}"/build-aux || die
- touch "${S}"/build-aux/config.rpath || die
- append-cxxflags -std=c++14
- eautoreconf
-
- default
-
- # bug 578026
- # prepend -L${S}/... to ensure bindings link against the lib we just built
- sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
- # prepend -I${S}/... to ensure bindings use the right headers
- sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
- use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable debug export-all)
- $(use_enable debug logging)
- $(use_enable dht)
- $(use_enable examples)
- $(use_enable ssl encryption)
- $(use_enable static-libs static)
- $(use_enable test tests)
- --with-boost="${ESYSROOT}/usr"
- --with-libiconv
- --enable-logging
- )
- econf "${myeconfargs[@]}"
-
- if use python; then
- python_configure() {
- econf "${myeconfargs[@]}" \
- --enable-python-binding \
- --with-boost-python="boost_${EPYTHON/./}"
- # git rid of c++11
- sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
- mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
- }
- distutils-r1_src_configure
- fi
-}
-
-src_compile() {
- default
-
- python_compile() {
- cd "${BUILD_DIR}/../bindings/python" || die
- distutils-r1_python_compile
- }
- use python && distutils-r1_src_compile
-}
-
-src_install() {
- use doc && HTML_DOCS+=( "${S}"/docs )
-
- default
-
- python_install() {
- cd "${BUILD_DIR}/../bindings/python" || die
- distutils-r1_python_install
- }
- use python && distutils-r1_src_install
-
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild
new file mode 100644
index 00000000000..94e0b8f3d96
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/10"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+IUSE="+dht debug python ssl test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-libs/boost:=[threads(+)]
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-libs/boost[python,${PYTHON_USEDEP}]
+ ')
+ )
+ ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="python? (
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ )"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -Dbuild_examples=OFF
+ -Ddht=$(usex dht ON OFF)
+ -Dencryption=$(usex ssl ON OFF)
+ -Dlogging=$(usex debug ON OFF)
+ -Dpython-bindings=$(usex python ON OFF)
+ -Dbuild_tests=$(usex test ON OFF)
+ )
+
+ # We need to drop the . from the Python version to satisfy Boost's
+ # FindBoost.cmake module, bug #793038.
+ use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" )
+
+ cmake_src_configure
+}
+
+src_test() {
+ local myctestargs=(
+ # Needs running UPnP server
+ -E "test_upnp"
+ )
+
+ # Checked out Fedora's test workarounds for inspiration
+ # https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
+ LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
+}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6-r1.ebuild
deleted file mode 100644
index 185c08bbf39..00000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools distutils-r1
-
-MY_PV=$(ver_rs 1-2 '_')
-MY_P=${PN/-rasterbar}-${MY_PV}
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/boost:=[threads(+)]
- virtual/libiconv
- examples? ( !net-p2p/mldonkey )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- )
- ssl? (
- dev-libs/openssl:0=
- )
-"
-DEPEND="${RDEPEND}
- sys-devel/libtool
-"
-
-S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
-
-src_prepare() {
- mkdir "${S}"/build-aux/ || die
- touch "${S}"/build-aux/config.rpath || die
- eautoreconf
-
- default
-
- # bug 578026
- # prepend -L${S}/... to ensure bindings link against the lib we just built
- sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
- # prepend -I${S}/... to ensure bindings use the right headers
- sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
- use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable debug export-all)
- $(use_enable dht)
- $(use_enable examples)
- $(use_enable ssl encryption)
- $(use_enable static-libs static)
- $(use_enable test tests)
- --with-boost
- --with-libiconv
- --enable-logging
- )
- econf "${myeconfargs[@]}"
-
- if use python; then
- python_configure() {
- econf "${myeconfargs[@]}" \
- --enable-python-binding \
- --with-boost-python="boost_${EPYTHON/./}"
- }
- distutils-r1_src_configure
- fi
-}
-
-src_compile() {
- default
-
- python_compile() {
- cd "${BUILD_DIR}/../bindings/python" || die
- distutils-r1_python_compile
- }
- use python && distutils-r1_src_compile
-}
-
-src_install() {
- use doc && HTML_DOCS+=( "${S}"/docs )
-
- default
-
- python_install() {
- cd "${BUILD_DIR}/../bindings/python" || die
- distutils-r1_python_install
- }
- use python && distutils-r1_src_install
-
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9-r1.ebuild
deleted file mode 100644
index 982c7a1fdd1..00000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools flag-o-matic distutils-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/libtorrent-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/libtorrent-libtorrent-${PV}"
-
-RDEPEND="
- dev-libs/boost:=[threads(+)]
- virtual/libiconv
- examples? ( !net-p2p/mldonkey )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- )
- ssl? (
- dev-libs/openssl:0=
- )
-"
-DEPEND="${RDEPEND}
- sys-devel/libtool
-"
-
-src_prepare() {
- mkdir -p "${S}"/build-aux || die
- touch "${S}"/build-aux/config.rpath || die
- append-cxxflags -std=c++14
- eautoreconf
-
- default
-
- # bug 578026
- # prepend -L${S}/... to ensure bindings link against the lib we just built
- sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
- # prepend -I${S}/... to ensure bindings use the right headers
- sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
- use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable debug export-all)
- $(use_enable debug logging)
- $(use_enable dht)
- $(use_enable examples)
- $(use_enable ssl encryption)
- $(use_enable static-libs static)
- $(use_enable test tests)
- --with-boost
- --with-libiconv
- --enable-logging
- )
- econf "${myeconfargs[@]}"
-
- if use python; then
- python_configure() {
- econf "${myeconfargs[@]}" \
- --enable-python-binding \
- --with-boost-python="boost_${EPYTHON/./}"
- # git rid of c++11
- sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
- mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
- }
- distutils-r1_src_configure
- fi
-}
-
-src_compile() {
- default
-
- python_compile() {
- cd "${BUILD_DIR}/../bindings/python" || die
- distutils-r1_python_compile
- }
- use python && distutils-r1_src_compile
-}
-
-src_install() {
- use doc && HTML_DOCS+=( "${S}"/docs )
-
- default
-
- python_install() {
- cd "${BUILD_DIR}/../bindings/python" || die
- distutils-r1_python_install
- }
- use python && distutils-r1_src_install
-
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5-r1.ebuild
new file mode 100644
index 00000000000..f1f8aea0e52
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+# gnutls removed because totally broken with at least Python bindings: bug #830846
+# (they expect openssl?)
+IUSE="+dht debug python ssl test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-libs/boost:=[threads(+)]
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-libs/boost[python,${PYTHON_USEDEP}]
+ ')
+ )
+ ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="python? (
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-boost-1.78.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_CXX_STANDARD=17
+ -DBUILD_SHARED_LIBS=ON
+ -Dbuild_examples=OFF
+ -Ddht=$(usex dht ON OFF)
+ -Dencryption=$(usex ssl ON OFF)
+ -Dgnutls=OFF
+ -Dlogging=$(usex debug ON OFF)
+ -Dpython-bindings=$(usex python ON OFF)
+ -Dbuild_tests=$(usex test ON OFF)
+ )
+
+ # We need to drop the . from the Python version to satisfy Boost's
+ # FindBoost.cmake module, bug #793038.
+ use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" )
+
+ cmake_src_configure
+}
+
+src_test() {
+ local myctestargs=(
+ # Needs running UPnP server
+ -E "test_upnp"
+ )
+
+ # Checked out Fedora's test workarounds for inspiration
+ # https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
+ LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
+}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild
new file mode 100644
index 00000000000..03981e30ef7
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2.0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+dht debug gnutls python ssl test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-libs/boost:=[threads(+)]
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-libs/boost[python,${PYTHON_USEDEP}]
+ ')
+ )
+ ssl? (
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? ( dev-libs/openssl:= )
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="python? (
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-boost-1.78.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_CXX_STANDARD=17
+ -DBUILD_SHARED_LIBS=ON
+ -Dbuild_examples=OFF
+ -Ddht=$(usex dht ON OFF)
+ -Dencryption=$(usex ssl ON OFF)
+ -Dgnutls=$(usex gnutls ON OFF)
+ -Dlogging=$(usex debug ON OFF)
+ -Dpython-bindings=$(usex python ON OFF)
+ -Dbuild_tests=$(usex test ON OFF)
+ )
+
+ # We need to drop the . from the Python version to satisfy Boost's
+ # FindBoost.cmake module, bug #793038.
+ use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" )
+
+ cmake_src_configure
+}
+
+src_test() {
+ local myctestargs=(
+ # Needs running UPnP server
+ -E "test_upnp"
+ )
+
+ # Checked out Fedora's test workarounds for inspiration
+ # https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
+ LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
+}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.6.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.6.ebuild
new file mode 100644
index 00000000000..f2ff6a9b628
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.6.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+dht debug gnutls python ssl test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-libs/boost:=[threads(+)]
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-libs/boost[python,${PYTHON_USEDEP}]
+ ')
+ )
+ ssl? (
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? ( dev-libs/openssl:= )
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="python? (
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ )"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_CXX_STANDARD=17
+ -DBUILD_SHARED_LIBS=ON
+ -Dbuild_examples=OFF
+ -Ddht=$(usex dht ON OFF)
+ -Dencryption=$(usex ssl ON OFF)
+ -Dgnutls=$(usex gnutls ON OFF)
+ -Dlogging=$(usex debug ON OFF)
+ -Dpython-bindings=$(usex python ON OFF)
+ -Dbuild_tests=$(usex test ON OFF)
+ )
+
+ # We need to drop the . from the Python version to satisfy Boost's
+ # FindBoost.cmake module, bug #793038.
+ use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" )
+
+ cmake_src_configure
+}
+
+src_test() {
+ local myctestargs=(
+ # Needs running UPnP server
+ -E "test_upnp"
+ )
+
+ # Checked out Fedora's test workarounds for inspiration
+ # https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
+ LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
+}
diff --git a/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild
index fe37a9e1054..5d3d38cc366 100644
--- a/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
# subslot.
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
IUSE="debug ssl test"
RESTRICT="!test? ( test )"
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 53a961ba3b9..b1de7ff5ca5 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,2 +1,3 @@
DIST libtrace-4.0.15_p1.tar.gz 1891845 BLAKE2B 08faf395f5fdda21829b89a9276649b297d2266ef10d2162b588b39d4d8d2da1306c74bb180d63b92f4422bb157fb451d34cd8167f0bff42322776e3b1ee0e7c SHA512 82f18b03e824f3ac89330854c3659244106ab5323f5e7a43ec7d2280f6ad3d427a906708688469b3f5aa479d11fef99a4bbecea585b81c916029132375582a4e
DIST libtrace-4.0.17_p1.tar.gz 1961123 BLAKE2B be961bc58496414415b9affb0a6b77e5f234b92196fb719f3a2e8058ae80ade90977c44d57c75d37cbf26ff2e0c8816a4b376b77b6e44d13833960c6095b7e2c SHA512 85280edd515acf52361c34ebe5324fd95f4fafc72aa22c2c8bd43a6bca9a6b5fc9a046480fc760bb39d8b577532ed416caf10a630cea9465d305f2ed4dcb318e
+DIST libtrace-4.0.18_p1.tar.gz 1963425 BLAKE2B fdacd4a44f899dc49fe9571d8e695cd726ea07d1c0595bd7c1f59d53721bd5610126924323c9c7098caf65276219e61265e5e05f23b4a92ae6377268c618202f SHA512 fc2979fa56b0eee25149a3571d0a06e2a46ab6d6fa419b2fc37635ebcf4a8814250005c4dfc5dddb5fb6aa9c74161ab4f475a037e021388054bb62f414b9c5d2
diff --git a/net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch b/net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch
new file mode 100644
index 00000000000..b536302c30b
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch
@@ -0,0 +1,133 @@
+https://github.com/LibtraceTeam/libtrace/pull/201
+
+From dde6c39e5808f06f1450b03e7c682edb0f1290cf Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 8 Feb 2022 05:30:32 +0000
+Subject: [PATCH 1/3] build: fix bashism in configure
+
+configures have a shebang of #!/bin/sh so need to work with a POSIX-compliant
+shell; let's use = instead of == which will have the same effect on both Bash
+and said shells (like dash).
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 95d63fdc..dbbaabb7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -305,7 +305,7 @@ AC_ARG_WITH(xdp, AS_HELP_STRING(--with-xdp, include XDP capture support),
+
+ if test "$want_xdp" != no; then
+ AC_CHECK_LIB(elf, elf_begin, elffound=1, elffound=0)
+- if test "$elffound" == 1; then
++ if test "$elffound" = 1; then
+ # check for libbpf
+ AC_CHECK_LIB(bpf, xsk_socket__create, bpffound=1, bpffound=0, -lelf)
+
+
+From 1525a42b386da02bda3982cf6e8b472f57f8ac34 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 8 Feb 2022 05:32:59 +0000
+Subject: [PATCH 2/3] build: make NUMA support optional
+
+This avoids an 'automagic dependency' [0] on NUMA. This is helpful for
+downstreams to ensure we don't miss dependencies or when we may not
+want to enable support for a feature even though a dependency is enabled.
+
+Gentoo has shipped this patch for quite some time.
+
+[0] https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Automagic_dependencies
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.in | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index dbbaabb7..6fbff150 100644
+--- a/configure.in
++++ b/configure.in
+@@ -518,7 +518,23 @@ AC_CHECK_DECL([PACKET_FANOUT],
+ [[#include <linux/if_packet.h>]])
+
+ # If we use DPDK we might be able to use libnuma
+-AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0)
++AC_ARG_WITH(numa,
++ AS_HELP_STRING(--with-numa,include NUMA support),
++[
++ if test "$withval" = no
++ then
++ want_numa=no
++ else
++ want_numa=yes
++ fi
++],[
++ # Default to building without NUMA
++ want_numa=yes
++])
++
++if test "$want_numa" != no; then
++ AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0)
++fi
+
+ # Need libwandder for ETSI live decoding
+ AC_CHECK_LIB(wandder, init_wandder_decoder, have_wandder=1, have_wandder=0)
+
+From 153254413ae3cd6a62ee7d8b5eae189e84ebc066 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 8 Feb 2022 05:34:05 +0000
+Subject: [PATCH 3/3] build: use pkg-config to find ncurses
+
+ncurses can be built in a variety of configurations, but the motivating case
+for Gentoo was "split tinfo" where libtinfo is no longer included within
+libncurses.
+
+Use pkg-config to find where ncurses is installed and the required libraries
+needed to link against it (which will include -ltinfo if required).
+
+We've been shipping this patch in Gentoo for quite some time.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.in | 4 ++++
+ tools/tracetop/Makefile.am | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 6fbff150..cbb94d55 100644
+--- a/configure.in
++++ b/configure.in
+@@ -79,6 +79,8 @@ AC_PROG_INSTALL
+ AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc)
+ AM_PROG_LEX
+
++PKG_PROG_PKG_CONFIG
++
+ # All our source files for function replacements are in lib/
+ AC_CONFIG_LIBOBJ_DIR(lib)
+
+@@ -916,6 +918,8 @@ if (test "$use_llvm" != "no"); then
+ fi
+ fi
+
++PKG_CHECK_MODULES(ncurses,ncurses,have_ncurses=yes,have_ncurses=no)
++
+ AC_ARG_WITH([ncurses],
+ AC_HELP_STRING([--with-ncurses], [build tracetop (requires ncurses)]))
+
+diff --git a/tools/tracetop/Makefile.am b/tools/tracetop/Makefile.am
+index 2ebbc3a7..a2eb2797 100644
+--- a/tools/tracetop/Makefile.am
++++ b/tools/tracetop/Makefile.am
+@@ -6,6 +6,6 @@ bin_PROGRAMS = tracetop
+ include ../Makefile.tools
+
+ tracetop_SOURCES = tracetop.cc
+-tracetop_LDADD = -lncurses
++tracetop_LDADD = @ncurses_LIBS@
+ tracetop_CPPFLAGS = -fno-strict-aliasing $(AM_CFLAGS)
+ endif
+
diff --git a/net-libs/libtrace/libtrace-4.0.18_p1.ebuild b/net-libs/libtrace/libtrace-4.0.18_p1.ebuild
new file mode 100644
index 00000000000..b43bb405d52
--- /dev/null
+++ b/net-libs/libtrace/libtrace-4.0.18_p1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A library and tools for trace processing"
+HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
+SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_p/-}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# doxygen is always needed for man pages, but USE=doc controls installing docs themselves
+# (not man pages)
+IUSE="doc ncurses numa"
+
+RDEPEND=">=net-libs/libpcap-0.8
+ dev-libs/libyaml
+ dev-libs/openssl:=
+ net-libs/wandio
+ ncurses? ( sys-libs/ncurses:= )
+ numa? ( sys-process/numactl )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-doc/doxygen[dot]
+ sys-devel/flex
+ virtual/os-headers
+ virtual/pkgconfig
+ virtual/yacc"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0.18_p1-build-system.patch
+)
+
+src_prepare() {
+ default
+
+ mv configure.{in,ac} || die
+
+ eautoreconf
+
+ # Comment out FILE_PATTERNS definition (bug #706230)
+ if has_version ~app-doc/doxygen-1.8.16; then
+ sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
+ fi
+
+ # Update doxygen configuration
+ doxygen -u docs/libtrace.doxygen.in || die
+}
+
+src_configure() {
+ econf \
+ $(use_with ncurses) \
+ $(use_with numa) \
+ --with-man \
+ --without-dpdk
+}
+
+src_install() {
+ default
+
+ if use doc ; then
+ docinto html
+ dodoc -r docs/doxygen/html
+ fi
+
+ find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index a4442cccbb0..d28f0129732 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,2 +1 @@
DIST libupnp-1.14.12.tar.gz 788299 BLAKE2B 721c10f9fa4ffc60743b4ebf8be566ea595931cb1f2a2448d8e3cecfc787abfb855cb16256eaaa10ce6a901cd5e5b3d14672610841b2a718d5dd003ccfd3c2f0 SHA512 aab17aa12f15d110bfab20cbcbae5f54926b6ca7a30bce10b9287cd39919a06a5e9f1493405e1d561c0d58ba46926f87009df891e4e4f37097df1c3c67635ca9
-DIST libupnp-1.14.7.tar.gz 785084 BLAKE2B 539388737dda0dd037cb50fbc1cca8bcdc43d1d706bdb7da19d1a184cfd61f3d585d9beef2a9c8c33f2cb2640a8479210ad6c358abd7193f304509df574e912c SHA512 92dd80d1bbaa64e6d3909c5bce73d0340fcd3a3c1d247a634bd48ec077ba0ce0b8224d1a670a66f6a8c591e31a54f15526071d62ae5460e85d582d7b6b67c674
diff --git a/net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch b/net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch
deleted file mode 100644
index dbcfd5e2cc2..00000000000
--- a/net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/upnp/inc/ithread.h
-+++ b/upnp/inc/ithread.h
-@@ -304,12 +304,8 @@
- * Returns EINVAL if the kind is not supported.
- * See man page for pthread_mutexattr_setkind_np
- *****************************************************************************/
--#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
-- #define ithread_mutexattr_setkind_np pthread_mutexattr_settype
--#else
-- #define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
--#endif /* UPNP_USE_RWLOCK */
--
-+#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
-+#define ithread_mutexattr_settype pthread_mutexattr_settype
- /****************************************************************************
- * Function: ithread_mutexattr_getkind_np
- *
-@@ -329,12 +325,8 @@
- * Always returns 0.
- * See man page for pthread_mutexattr_getkind_np
- *****************************************************************************/
--#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
-- #define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
--#else
-- #define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
--#endif /* UPNP_USE_RWLOCK */
--
-+#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
-+#define ithread_mutexattr_gettype pthread_mutexattr_gettype
- /****************************************************************************
- * Function: ithread_mutex_init
- *
diff --git a/net-libs/libupnp/libupnp-1.14.7.ebuild b/net-libs/libupnp/libupnp-1.14.7.ebuild
deleted file mode 100644
index 4dcf90126cf..00000000000
--- a/net-libs/libupnp/libupnp-1.14.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-MY_PN="pupnp"
-
-DESCRIPTION="An Portable Open Source UPnP Development Kit"
-HOMEPAGE="http://pupnp.sourceforge.net/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-release-${PV}"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux"
-IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
-
-# bug 733750
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-1.14.7-glibc-2.34.patch" )
-
-src_prepare() {
- default
-
- # fix tests
- chmod +x ixml/test/test_document.sh || die
-
- eautoreconf
-}
-
-src_configure() {
- use x86-fbsd && append-flags -O1
- # w/o docdir to avoid sandbox violations
- econf $(use_enable debug) \
- $(use_enable blocking-tcp blocking-tcp-connections) \
- $(use_enable ipv6) \
- $(use_enable reuseaddr) \
- $(use_enable static-libs static) \
- $(use_enable samples)
-}
-
-src_install() {
- default
-
- if ! use static-libs ; then
- find "${D}" -name '*.la' -delete || die
- fi
-}
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 58a721aea77..e78e2da6e0c 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1 +1 @@
-DIST libwebsockets-4.3.0.tar.gz 15605272 BLAKE2B 6ea48fedf3755f55885f32bc289513182cf735472c161f15d720a76ddfa54e5e2c2d93a343f98d941d14b88f8ca8a13039922f8669b85562c5c0c4312f878b98 SHA512 7f183cb0417a902cb18e76431a8580d87db09c973483f3a129e138e4644b9d0e78e0539e985dc6286d9fe429edea7f63147864dc0413cf8e40fca3d67f9c3c42
+DIST libwebsockets-4.3.1.tar.gz 15607585 BLAKE2B 420343dd358e4ca45d0cadde7f0a6398dbd5043c4cd2c1a70f32dc9b5ef4cb222239971c4ce758ee156deac4d06bd18289a8e975a7f41508abfdcb05870994f6 SHA512 3cc2daadd7d2587ce946209a31741662d98367f0f9f77a1555497bef6fc6acc6cb97f5196d6ecef2d13828bb5613c60cccada03d9a01a5c970a9cfd25baeb0ae
diff --git a/net-libs/libwebsockets/libwebsockets-4.3.0.ebuild b/net-libs/libwebsockets/libwebsockets-4.3.1.ebuild
index 5c1d4449fa6..48932f3cb20 100644
--- a/net-libs/libwebsockets/libwebsockets-4.3.0.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index c269392d3dd..ebeb2f50a5e 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,2 +1 @@
-DIST libyang-2.0.112.tar.gz 1075308 BLAKE2B 13c5dee1817f93ec24580d24cfc5d1c066de54dec3d1de60e6f7d67caad527b13e40864301d5e5086b3d92b8769e200674168dd874bc2c786bd5101ec3aa958f SHA512 5da463b86656b9fc944925777a488b3306ef1a1e7efdaf4af677960a04b5544605126bb7e0441e55686b80f97fca70fe86605d0e7c64f634b4297dcc7bd779db
-DIST libyang-2.0.97.tar.gz 1066042 BLAKE2B 24ad593b4d4db2c54bf083d3f3469b17de8734aded878d167e383a5e7edb964706a48707e2f0847c7cd4f613b6c1e298325710c4b074f4a3fa1102e22265d632 SHA512 f97f29703f49ef22d04ecf3071d4437417ca95fd0cc2a696269ff646076cca15236874c40ef6a891f1ed4a1173600ba4c6cdd5e0879356b53414c4f0c415c389
+DIST libyang-2.0.164.tar.gz 1120619 BLAKE2B 7b9fc93ae4c7d42c3d818a26448bf1f7fc8df21634668f46e14256d094997ef22f74ae5e8f46807692e1bab176dd14d9d3036712013bf83716f6069664a74436 SHA512 016e450110e968665195bec692ef1eca6889636de79bd873f74cddde6a58859ac1df4d1fb2bc3024ff05d82ff4c2b0f4eb8df06ddfd4b04d3a0c5f5fed44af65
diff --git a/net-libs/libyang/libyang-2.0.112.ebuild b/net-libs/libyang/libyang-2.0.112.ebuild
deleted file mode 100644
index f34f5a45518..00000000000
--- a/net-libs/libyang/libyang-2.0.112.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="YANG data modeling language library"
-HOMEPAGE="https://github.com/CESNET/libyang"
-SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/libpcre2[${MULTILIB_USEDEP}]"
-DEPEND="
- ${RDEPEND}
- test? ( dev-util/cmocka )
-"
-BDEPEND="
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )
-"
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_TESTS=$(usex test)
- -DENABLE_VALGRIND_TESTS=OFF
- )
- cmake_src_configure
-}
-
-multilib_src_compile() {
- cmake_src_compile
-
- multilib_is_native_abi && use doc && cmake_src_compile doc
-}
-
-multilib_src_install_all() {
- use doc && dodoc -r doc/.
-}
diff --git a/net-libs/libyang/libyang-2.0.97.ebuild b/net-libs/libyang/libyang-2.0.164.ebuild
index 2b0dd6643d2..9ce1420009a 100644
--- a/net-libs/libyang/libyang-2.0.97.ebuild
+++ b/net-libs/libyang/libyang-2.0.164.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/net-libs/libzapojit/libzapojit-0.0.3.ebuild b/net-libs/libzapojit/libzapojit-0.0.3-r1.ebuild
index c5f25a502ef..8697fd59be7 100644
--- a/net-libs/libzapojit/libzapojit-0.0.3.ebuild
+++ b/net-libs/libzapojit/libzapojit-0.0.3-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=8
inherit gnome2
@@ -11,8 +10,8 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libzapojit"
LICENSE="LGPL-2.1"
SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
IUSE="+introspection"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
RDEPEND="
>=dev-libs/glib-2.28:2
@@ -23,7 +22,8 @@ RDEPEND="
introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
>=dev-util/gtk-doc-am-1.11
>=dev-util/intltool-0.35.0
sys-devel/gettext
@@ -34,6 +34,5 @@ DEPEND="${RDEPEND}
src_configure() {
gnome2_src_configure \
- --disable-static \
$(use_enable introspection)
}
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index e1ff682afff..5a762f8d133 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -1 +1,2 @@
DIST loudmouth-1.5.3.tar.bz2 375974 BLAKE2B c9707fe18560104456a624a61437240a16bb6bbaf544cdf775f6d6c64fdbeb6eb8f7042eb13fcdeb36c89bb8d9522c2eba02c24987757c0f0ac8748d92a2b166 SHA512 ab6b16b4e644b69cdb7d8df1753d1bb5b43c2f1e76944e639339169b332e1b5c6a4246053c5b8a579ee9b53c845cef610b0040dfdffeb857180b6bab71adfcce
+DIST loudmouth-1.5.4.tar.bz2 361323 BLAKE2B 1d8453625262e4f9dc8d603619b71cac073831462164a10a92a5118c212293ae4ad9a0ca276b07b7919a0aebce633b4afaabb015ecf4b33e7c641a4273edc64a SHA512 49a08f0130b9ee56f07586d244504c81242723865a136b03e1049f32b1aa1e6c49e9b76b38f0cfb812ef4c66f73b7d83914a58e9a93e0496207e06c2b5efa9d8
diff --git a/net-libs/loudmouth/files/loudmouth-1.5.4-freeaddrinfo-musl.patch b/net-libs/loudmouth/files/loudmouth-1.5.4-freeaddrinfo-musl.patch
new file mode 100644
index 00000000000..f75714a7505
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.5.4-freeaddrinfo-musl.patch
@@ -0,0 +1,40 @@
+https://github.com/mcabber/loudmouth/pull/46
+
+From f32119e1408c742da9a1862805d76d222937756d Mon Sep 17 00:00:00 2001
+From: psykose <alice@ayaya.dev>
+Date: Thu, 21 Apr 2022 18:23:32 +0000
+Subject: [PATCH] fix macro define for freeaddrinfo with asyncns
+
+previously, this define was only made in lm-asyncns-resolver.c, which
+does not propagate it to lm-resolver.c, where freeaddrinfo() is used.
+this means that when asyncns support is used, the standard libc
+freeaddrinfo() is called on an addrinfo acquired from
+asyncns_getaddrinfo, which is undefined behaviour, and leads to a
+segfault on musl libc.
+--- a/loudmouth/lm-asyncns-resolver.c
++++ b/loudmouth/lm-asyncns-resolver.c
+@@ -21,7 +21,6 @@
+ #include <string.h>
+ #ifdef HAVE_ASYNCNS
+ #include <asyncns.h>
+-#define freeaddrinfo(x) asyncns_freeaddrinfo(x)
+
+ /* Needed on Mac OS X */
+ #if HAVE_ARPA_NAMESER_COMPAT_H
+--- a/loudmouth/lm-asyncns-resolver.h
++++ b/loudmouth/lm-asyncns-resolver.h
+@@ -19,8 +19,14 @@
+ #ifndef __LM_ASYNCNS_RESOLVER_H__
+ #define __LM_ASYNCNS_RESOLVER_H__
+
++#include <config.h>
++
+ #include <glib-object.h>
+
++#ifdef HAVE_ASYNCNS
++#define freeaddrinfo(x) asyncns_freeaddrinfo(x)
++#endif
++
+ #include "lm-resolver.h"
+
+ G_BEGIN_DECLS
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
index 4a48f8ae0e7..13e7508b5b2 100644
--- a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://mcabber.com/files/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~ppc-macos"
IUSE="asyncns ssl openssl static-libs test"
RESTRICT="!test? ( test )"
diff --git a/net-libs/loudmouth/loudmouth-1.5.4.ebuild b/net-libs/loudmouth/loudmouth-1.5.4.ebuild
new file mode 100644
index 00000000000..bd960d3f5db
--- /dev/null
+++ b/net-libs/loudmouth/loudmouth-1.5.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Lightweight C Jabber library"
+HOMEPAGE="https://mcabber.com"
+SRC_URI="https://mcabber.com/files/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+IUSE="asyncns ssl openssl test"
+RESTRICT="!test? ( test )"
+
+# Automagic libidn dependency
+RDEPEND=">=dev-libs/glib-2.16:2
+ net-dns/libidn:=
+ ssl? (
+ !openssl? ( >=net-libs/gnutls-1.4.0:0= )
+ openssl? ( dev-libs/openssl:0= )
+ )
+ asyncns? ( >=net-libs/libasyncns-0.3 )"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/check )"
+BDEPEND="dev-util/glib-utils
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.4-freeaddrinfo-musl.patch
+)
+
+src_configure() {
+ local myconf
+
+ if use ssl; then
+ if ! use openssl; then
+ myconf="${myconf} --with-ssl=gnutls"
+ else
+ myconf="${myconf} --with-ssl=openssl"
+ fi
+ else
+ myconf="${myconf} --with-ssl=no"
+ fi
+
+ # --with-compile-warnings=yes to avoid default =error
+ econf \
+ $(use_with asyncns) \
+ --with-compile-warnings=yes \
+ ${myconf}
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/loudmouth/metadata.xml b/net-libs/loudmouth/metadata.xml
index b54ff2f9f0e..88fdcd4e46d 100644
--- a/net-libs/loudmouth/metadata.xml
+++ b/net-libs/loudmouth/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>andrey_utkin@gentoo.org</email>
- <name>Andrey Utkin</name>
- </maintainer>
+ <!-- maintainer-needed -->
<use>
<flag name="asyncns">Use <pkg>net-libs/libasyncns</pkg> for asynchronous name resolution.</flag>
<flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> support instead of gnutls (which is the default).</flag>
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 1551b46251f..a950cc4ae91 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,3 +1,3 @@
-DIST mbedtls-2.16.11.tar.gz 2692209 BLAKE2B 9d7bccfc0d1bc5a038b6dcb866722a27362c229a5f1b515396aabbb53e77cfe36525446fb2557c817772810f24335a51c9a5c45bcfa866d8a07ff4e96498dbde SHA512 b35de49ce596b549b5e85b6affdf2cf1360fb8b0d4e551636a91a4923b1cb212dce7880d575d40c73d5682afe8bb893312d803798ce8f807842a2aab8e2ba2ee
-DIST mbedtls-2.27.0.tar.gz 4212185 BLAKE2B 31840e5a518643495f319cac8e0c876bdca5dbdee6524d30cace3538d5fb5ba7847dd653f61f775f5c3c384ac0533afdbf6172b3e523db515eceecc29fadd2da SHA512 9503ef75f08d2574e0800b2e3b6f030461cbd97c74863a20e5688ced7558b0b6f87cbe33cbd003e69c825d0321393fe9b00b0be190ab408138414b99d5102994
-DIST mbedtls-3.0.0.tar.gz 4163127 BLAKE2B 5d94124a251dbcc38de614319f93c6f0346de516fd944c765ab3e60d46fba8fbbdba7a6f9e00f5f0550137301b4de98795851df788e367c4fcf03abb981d3c63 SHA512 be11878d82fc93d0847718514f4887c68d7b186c54682316c4a01082583a917b81f9760bb708aab72bf37148581a8dbc9f7048faf745cd2e1cd7e5bf8c48abad
+DIST mbedtls-2.16.12.tar.gz 2702190 BLAKE2B 3cbe0bcfd0eca279d9b4b3816416b8e778f0aa38d368d810701e65140f0d1524afabe4fd1a1a65297f872a7dfafb7d2feeb7382fe8ea2b180f24551ceac53c26 SHA512 40c4487cc40afcf929bc7158d735a869ebada41c811f63a10d74e9b9644960e2a0aeb7c7c9841c0aef815425990847d47e7f42f9bafe0b2a959e769e3d74ebe9
+DIST mbedtls-2.28.0.tar.gz 3712239 BLAKE2B 1141465bc5b73e7fd94bbd02c79290093fd075626be93aea839a54ebff81fb00917f0a4fe7911fee983a36147fa4922d258714a330b40b0da4764a3b2419df8b SHA512 2ddc161caeebe8bf1e8cf23c398f65ceff699eb6487a7bcaf6a665879aac5458e21e26b06370085cbdae6ce6b5394afece656aa6307bbb3f5b701bcb41f3dd64
+DIST mbedtls-3.1.0.tar.gz 3766628 BLAKE2B a52e8fb9a3b88c1cf7cb0c8f5598f90a1c9ca05dbc399432293c3acb77aaf0a1b92a9792bda986b47e925736b21c83de1c891b21d45fd2dc8cb5d7d1b09168e7 SHA512 c374fafad89f8793ed1a302634a403b855317d9759377d4bade13c61857d0317a2fc144ab3a9aaee52901ff7a3c4b4b0e7e81ebe5510ab4d228103def01ae628
diff --git a/net-libs/mbedtls/mbedtls-2.16.11.ebuild b/net-libs/mbedtls/mbedtls-2.16.12.ebuild
index 8ddca1907c0..0ad3fec46cf 100644
--- a/net-libs/mbedtls/mbedtls-2.16.11.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.12.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${P}
LICENSE="Apache-2.0"
SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
+IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -34,6 +34,7 @@ enable_mbedtls_option() {
}
src_prepare() {
+ use cmac && enable_mbedtls_option MBEDTLS_CMAC_C
use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
diff --git a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.28.0-r1.ebuild
index fc18e8b6b04..388cc9abaff 100644
--- a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.28.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,9 +11,9 @@ SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
S=${WORKDIR}/${PN}-${P}
LICENSE="Apache-2.0"
-SLOT="0/7.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
+SLOT="0/7.14.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -34,6 +34,7 @@ enable_mbedtls_option() {
}
src_prepare() {
+ use cmac && enable_mbedtls_option MBEDTLS_CMAC_C
use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
diff --git a/net-libs/mbedtls/mbedtls-3.0.0.ebuild b/net-libs/mbedtls/mbedtls-3.1.0.ebuild
index 54ef48f6e4f..54ef48f6e4f 100644
--- a/net-libs/mbedtls/mbedtls-3.0.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-3.1.0.ebuild
diff --git a/net-libs/mbedtls/metadata.xml b/net-libs/mbedtls/metadata.xml
index abf57a31dfb..a39a95180bc 100644
--- a/net-libs/mbedtls/metadata.xml
+++ b/net-libs/mbedtls/metadata.xml
@@ -10,6 +10,9 @@
cryptographic library written in C and targeted at embedded systems.
</longdescription>
<use>
+ <flag name="cmac">Enable block cipher-based message authentication
+ code algorithm
+ </flag>
<flag name="havege">Enable the HAVEGE random generator.
Warning: the HAVEGE random generator is not suitable for
virtualized environments
diff --git a/net-libs/miniupnpc/metadata.xml b/net-libs/miniupnpc/metadata.xml
index a3c057ba374..c89549110c7 100644
--- a/net-libs/miniupnpc/metadata.xml
+++ b/net-libs/miniupnpc/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>mgorny@gentoo.org</email>
- <name>Michał Górny</name>
-</maintainer>
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">miniupnp/miniupnp</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild
index fc6f2fcdf34..eb241b980d0 100644
--- a/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,13 +12,13 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
LICENSE="BSD"
SLOT="0/17"
-KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="ipv6 kernel_linux"
+KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="ipv6"
RDEPEND=""
BDEPEND="
kernel_linux? ( sys-apps/lsb-release sys-apps/which )
- verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+ verify-sig? ( sec-keys/openpgp-keys-miniupnp )"
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 505e78a99b9..ee024387d46 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1 +1,4 @@
DIST nDPI-3.4.tar.gz 37976087 BLAKE2B 49e25586671a91278d90775c3dbc881ce4ca9ae4afd3108b1caff3b0d38251808bcd52ead253f451474195994fbf94658f70241acedb23c35a475df3b15c4a20 SHA512 ed5a22b6ddc14ad707a18a0bd96746c1df489969faaa42016fa9aad8d414fc4ee303b96cac15c3ba86f484a80a0aaa2dd1be5f92be672912e0e0d30da4bdad4c
+DIST nDPI-4.0-patches.tar.bz2 8744 BLAKE2B 48bfb2cf240823b64ab15a3f8a21acece878102ebb4cc807648b264ef091107a05d66fc672cccd1bc721ad3ea0edde786a1f133dfc84c91422604a9929e327ed SHA512 99a780c18c048ceec29c42828c420fe3f9624906eaef70f92af6abdbf7bc29133e048d7f8de85d8b73aa6667066e7ab5843fa293221d5ec8bbe87803dde83db6
+DIST nDPI-4.0.tar.gz 120053617 BLAKE2B ea0f333bd62622c1ab792137f9bbf2e35cb3790aae191c5caeaea36c7ce376bfa84633e99e321c16bcfbe5812d6674b825bdc4197297cee76064ed88f344a577 SHA512 2526041bc02a210e65bad31323a66167d79a37d14697cf4459054cc54715e53f9673b0000cefa6b452bbe3b3e6c25f0bafcf59d24323d210e2ce6782d9153f81
+DIST nDPI-4.2.tar.gz 126559327 BLAKE2B 079267939083e788ce8b13e89b194504031e4c3e628df335ece7aab72cc80b8d8538badd45dac9fdaeeed8cd5dd19a81fece9c1157cba9a91dfa130abef61473 SHA512 c58b228b7de2b5fa111234bb065f9be259cd0282d0058f5985180aab6567c9a18e3453ce9062bd3c057a096ec3dfdc21b7c9680e0148e34af10f707530d853b8
diff --git a/net-libs/nDPI/nDPI-4.0-r1.ebuild b/net-libs/nDPI/nDPI-4.0-r1.ebuild
new file mode 100644
index 00000000000..4be4dd426cc
--- /dev/null
+++ b/net-libs/nDPI/nDPI-4.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/ntop/${PN}"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.bz2"
+
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0/$(ver_cut 1)"
+
+DEPEND="dev-libs/json-c:=
+ dev-libs/libgcrypt:=
+ dev-libs/libgpg-error
+ net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${WORKDIR}"/${P}-patches/
+)
+
+# Also sent a patch upstream https://github.com/ntop/nDPI/pull/1392 for
+# AR/CC etc but doesn't apply cleanly (at all) to 4.0.
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \
+ src/lib/Makefile.in || die
+
+ eautoreconf
+
+ # Should be able to drop in next version.
+ # Taken from autogen.sh (bug #704074):
+ sed -i \
+ -e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
+ -e "s/#define VERSION/#define NDPI_VERSION/g" \
+ configure || die
+}
+
+src_test() {
+ pushd tests || die
+
+ ./do.sh || die "Failed tests"
+ ./do-unit.sh || die "Failed unit tests"
+
+ popd || die
+}
+
+src_install() {
+ default
+
+ rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die
+}
diff --git a/net-libs/nDPI/nDPI-4.2.ebuild b/net-libs/nDPI/nDPI-4.2.ebuild
new file mode 100644
index 00000000000..a7730e61c25
--- /dev/null
+++ b/net-libs/nDPI/nDPI-4.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/ntop/${PN}"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0/$(ver_cut 1)"
+
+DEPEND="dev-libs/json-c:=
+ dev-libs/libgcrypt:=
+ dev-libs/libgpg-error
+ net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \
+ src/lib/Makefile.in || die
+
+ eautoreconf
+}
+
+src_test() {
+ pushd tests || die
+
+ ./do.sh || die "Failed tests"
+ ./do-unit.sh || die "Failed unit tests"
+
+ popd || die
+}
+
+src_install() {
+ default
+
+ rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die
+}
diff --git a/net-libs/nDPI/nDPI-9999.ebuild b/net-libs/nDPI/nDPI-9999.ebuild
index bd4ac3459b8..a7730e61c25 100644
--- a/net-libs/nDPI/nDPI-9999.ebuild
+++ b/net-libs/nDPI/nDPI-9999.ebuild
@@ -1,58 +1,50 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit autotools git-r3
+inherit autotools
DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
HOMEPAGE="https://www.ntop.org/"
-EGIT_REPO_URI="https://github.com/ntop/${PN}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="static-libs"
-
-DEPEND="
- dev-libs/json-c:=
- net-libs/libpcap
-"
-RDEPEND="
- ${DEPEND}
-"
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/ntop/${PN}"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0/$(ver_cut 1)"
+
+DEPEND="dev-libs/json-c:=
+ dev-libs/libgcrypt:=
+ dev-libs/libgpg-error
+ net-libs/libpcap"
+RDEPEND="${DEPEND}"
src_prepare() {
- eval $(grep '^NDPI_MAJOR=' autogen.sh)
- eval $(grep '^NDPI_MINOR=' autogen.sh)
- eval $(grep '^NDPI_PATCH=' autogen.sh)
- NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}"
-
- sed \
- -e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \
- -e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \
- -e "s/@NDPI_PATCH@/${NDPI_PATCH}/g" \
- -e "s/@NDPI_VERSION_SHORT@/${NDPI_VERSION_SHORT}/g" \
- < "${S}/configure.seed" \
- > "${S}/configure.ac" || die
+ default
sed -i \
-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \
src/lib/Makefile.in || die
- default
eautoreconf
+}
- # Taken from autogen.sh (bug #704074):
- sed -i \
- -e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
- -e "s/#define VERSION/#define NDPI_VERSION/g" \
- configure || die
+src_test() {
+ pushd tests || die
+
+ ./do.sh || die "Failed tests"
+ ./do-unit.sh || die "Failed unit tests"
+
+ popd || die
}
src_install() {
default
- if ! use static-libs; then
- rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
- fi
+
+ rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die
}
diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index 3e6a65c8c9e..6516fa15f56 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -1,2 +1,2 @@
-DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a
DIST i2psource_0.9.50.tar.bz2 32409456 BLAKE2B 0c45b48ae6e1957b6c5d828757c70489d260fe15276559e5c366c68c10274b9020b2978bf0674a8628638f41b1e269af0c4d35c20c1f0cee419857c0c803dd82 SHA512 2d6b1d3ed4d32af36d0d3b257dca6fad981e3fa0cd3e45b8227e76e57de092c11ff7c239e879739d330ae809bcf6c71640de32de0c52c54ef8597f0c0e1467ec
+DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.48.ebuild b/net-libs/nativebiginteger/nativebiginteger-1.6.1.ebuild
index e0d376b7aa6..7832660291b 100644
--- a/net-libs/nativebiginteger/nativebiginteger-0.9.48.ebuild
+++ b/net-libs/nativebiginteger/nativebiginteger-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,11 +7,11 @@ inherit java-pkg-2 toolchain-funcs
DESCRIPTION="jbigi library used by net-vpn/i2p"
HOMEPAGE="https://geti2p.net"
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+SRC_URI="https://files.i2p-projekt.de/${PV}/i2psource_${PV}.tar.bz2"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index adc5a07fec8..61c84779543 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,5 +1,2 @@
-DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
-DIST neon-0.31.0.tar.gz 867476 BLAKE2B 84981d0fcca97bfa495f9e8cbf060a06e04c931ce3b5eca41ff1d76a47fd863139b8bf3e102c5e4e8d22d5cffcebc64cee9b8f746f8d6669f0cbccf124fed9cc SHA512 62c55e16609d657ac56bb4a2fd32a10ffa72d5694aa1369be533491a6683034ed42843d5f19ed06cf8c1b7b8ba11b74f9839cdfeef4afc3b2d7b11372ed85cd2
-DIST neon-0.31.1.tar.gz 867810 BLAKE2B 7b7d0c8ab635446c98f3db7072f1dabbb74ad9f579086f209bb3af5460363520be38886a299d22dc0f27a091f322c6d5972a00d4e6c612c710dca12e7620f850 SHA512 00d7297c102ee828d84eb28c9b6a57e66290904acf5327f8a6d3d1759ffacf88329bb2157dcef418c69e93d1370ccbd591829da06c01c3f44aea6c7b92462c13
DIST neon-0.31.2.tar.gz 867914 BLAKE2B 8ae1301dd5f9ac1a6b518f99919a1b7e7b7c6499413b523ff82e00d364d6d9c5ad96875795330e2fd9c42a42b073e3eea51b6cc0ee9e9a21850763f0cdd0b97e SHA512 1e402b40a0445f68ed24d2697ee60d21636f61ebc98edcde37ff9e26c54430acabf3969ac22a942d1dd51bddee0f312c04073b423b0af3a3e7c9bf60cd53e48c
-DIST neon-0.32.1.tar.gz 880434 BLAKE2B 91b942cb0d7184f4da26d7d45e846a0f80aa834226e5ff0689df75650da79cbfad0854c718dbffdd31cc0f09f25458ea37ca39bb38071643a6a609ef6102b896 SHA512 a231865c3aad3668f6effded97a58eb981655f64c71b0954fcb2e667bdec50895d11bf296f4f454bd63e6ce9b02c2fd13cbb17cb82631e16f100000ecd7e1977
+DIST neon-0.32.2.tar.gz 880651 BLAKE2B 3629eee38e10ada5e001bf0afb77c70814083bf553596fc150a6cf21f0b66cf4de28841b242f68faaeb44fa5e0ad260939102b015d2a543ef59012876256b364 SHA512 2580a3c8c3cf4aff2d399f72a721ccfb4e68434ef92da4af8103c126812d779b9fbe5cafbab512c79f4365bbb3d3eac61568748136470e86f7aa7b98b27053c8
diff --git a/net-libs/neon/metadata.xml b/net-libs/neon/metadata.xml
index f53db81ccb5..5fd2d0a22b8 100644
--- a/net-libs/neon/metadata.xml
+++ b/net-libs/neon/metadata.xml
@@ -3,10 +3,11 @@
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
+ <name>Arfrever Frehtes Taifersar Arahesis</name>
</maintainer>
<maintainer type="person" proxied="proxy">
- <email>floppym@gentoo.org</email>
- <name>Mike Gilbert</name>
+ <email>jsmolic@gentoo.org</email>
+ <name>Jakov Smolić</name>
</maintainer>
<longdescription>
Neon is an HTTP and WebDAV client library for Unix systems, with a C
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
deleted file mode 100644
index 0579d7c523d..00000000000
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2001-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools libtool multilib-minimal
-
-DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="https://notroj.github.io/neon/"
-SRC_URI="http://webdav.org/neon/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/27"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
-RESTRICT="test"
-
-RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
- !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
- libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] )
- nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] )
- ssl? (
- gnutls? (
- app-misc/ca-certificates
- net-libs/gnutls:0=[${MULTILIB_USEDEP}]
- )
- !gnutls? (
- dev-libs/openssl:0=[${MULTILIB_USEDEP}]
- )
- pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
- )
- zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/neon-config
-)
-
-src_prepare() {
- # Use CHOST-prefixed version of xml2-config for cross-compilation.
- sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed"
-
- # Fix compatibility with OpenSSL >=1.1.
- sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"
-
- eapply_user
-
- AT_M4DIR="macros" eautoreconf
-
- elibtoolize
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myconf=()
-
- if has_version sys-libs/glibc; then
- einfo "Enabling SSL library thread-safety using POSIX threads..."
- myconf+=(--enable-threadsafe-ssl=posix)
- fi
-
- if use expat; then
- myconf+=(--with-expat)
- else
- myconf+=(--with-libxml2)
- fi
-
- if use ssl; then
- if use gnutls; then
- myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt")
- else
- myconf+=(--with-ssl=openssl)
- fi
- fi
-
- econf \
- --enable-shared \
- $(use_with kerberos gssapi) \
- $(use_with libproxy) \
- $(use_enable nls) \
- $(use_with pkcs11 pakchois) \
- $(use_enable static-libs static) \
- $(use_with zlib) \
- "${myconf[@]}"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install-{config,headers,lib,man,nls}
-
- if multilib_is_native_abi && use doc; then
- (
- docinto html
- dodoc -r doc/html/*
- )
- fi
-}
-
-multilib_src_install_all() {
- find "${D}" -name "*.la" -type f -delete || die
-
- dodoc AUTHORS BUGS NEWS README THANKS TODO
-}
diff --git a/net-libs/neon/neon-0.31.0.ebuild b/net-libs/neon/neon-0.31.0.ebuild
deleted file mode 100644
index adbc8e2dcc7..00000000000
--- a/net-libs/neon/neon-0.31.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2001-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool multilib-minimal
-
-DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="https://notroj.github.io/neon/"
-SRC_URI="http://webdav.org/neon/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/27"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
-RESTRICT="test"
-
-RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
- !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
- libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] )
- nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] )
- ssl? (
- gnutls? (
- app-misc/ca-certificates
- net-libs/gnutls:0=[${MULTILIB_USEDEP}]
- )
- !gnutls? (
- dev-libs/openssl:0=[${MULTILIB_USEDEP}]
- )
- pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
- )
- zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/neon-config
-)
-
-src_prepare() {
- # Use CHOST-prefixed version of xml2-config for cross-compilation.
- sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed"
-
- # Fix compatibility with OpenSSL >=1.1.
- sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"
-
- eapply_user
-
- AT_M4DIR="macros" eautoreconf
-
- elibtoolize
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myconf=()
-
- if has_version sys-libs/glibc; then
- einfo "Enabling SSL library thread-safety using POSIX threads..."
- myconf+=(--enable-threadsafe-ssl=posix)
- fi
-
- if use expat; then
- myconf+=(--with-expat)
- else
- myconf+=(--with-libxml2)
- fi
-
- if use ssl; then
- if use gnutls; then
- myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt")
- else
- myconf+=(--with-ssl=openssl)
- fi
- fi
-
- econf \
- --enable-shared \
- $(use_with kerberos gssapi) \
- $(use_with libproxy) \
- $(use_enable nls) \
- $(use_with pkcs11 pakchois) \
- $(use_enable static-libs static) \
- $(use_with zlib) \
- "${myconf[@]}"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install-{config,headers,lib,man,nls}
-
- if multilib_is_native_abi && use doc; then
- (
- docinto html
- dodoc -r doc/html/*
- )
- fi
-}
-
-multilib_src_install_all() {
- find "${D}" -name "*.la" -type f -delete || die
-
- dodoc AUTHORS BUGS NEWS README.md THANKS TODO
-}
diff --git a/net-libs/neon/neon-0.32.1.ebuild b/net-libs/neon/neon-0.32.1.ebuild
deleted file mode 100644
index 92ef286a912..00000000000
--- a/net-libs/neon/neon-0.32.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2001-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool multilib-minimal
-
-DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="https://notroj.github.io/neon/"
-SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/27"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
-RESTRICT="test"
-
-RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
- !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
- libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] )
- nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] )
- ssl? (
- gnutls? (
- app-misc/ca-certificates
- net-libs/gnutls:0=[${MULTILIB_USEDEP}]
- )
- !gnutls? (
- dev-libs/openssl:0=[${MULTILIB_USEDEP}]
- )
- pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
- )
- zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- app-text/docbook-xml-dtd:4.5
- app-text/xmlto
- virtual/pkgconfig
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/neon-config
-)
-
-src_prepare() {
- # Use CHOST-prefixed version of xml2-config for cross-compilation.
- sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed"
-
- # Fix compatibility with OpenSSL >=1.1.
- sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"
-
- eapply_user
-
- AT_M4DIR="macros" eautoreconf
-
- elibtoolize
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myconf=()
-
- if has_version sys-libs/glibc; then
- einfo "Enabling SSL library thread-safety using POSIX threads..."
- myconf+=(--enable-threadsafe-ssl=posix)
- fi
-
- if use expat; then
- myconf+=(--with-expat)
- else
- myconf+=(--with-libxml2)
- fi
-
- if use ssl; then
- if use gnutls; then
- myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt")
- else
- myconf+=(--with-ssl=openssl)
- fi
- fi
-
- econf \
- --enable-shared \
- $(use_with kerberos gssapi) \
- $(use_with libproxy) \
- $(use_enable nls) \
- $(use_with pkcs11 pakchois) \
- $(use_enable static-libs static) \
- $(use_with zlib) \
- "${myconf[@]}"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install-{config,headers,lib,man,nls}
-
- if multilib_is_native_abi && use doc; then
- (
- docinto html
- dodoc -r doc/html/*
- )
- fi
-}
-
-multilib_src_install_all() {
- find "${D}" -name "*.la" -type f -delete || die
-
- dodoc AUTHORS BUGS NEWS README.md THANKS TODO
-}
diff --git a/net-libs/neon/neon-0.31.1.ebuild b/net-libs/neon/neon-0.32.2.ebuild
index a6ad1025fb5..6d6ce09d19a 100644
--- a/net-libs/neon/neon-0.31.1.ebuild
+++ b/net-libs/neon/neon-0.32.2.ebuild
@@ -1,21 +1,28 @@
-# Copyright 2001-2021 Gentoo Authors
+# Copyright 2001-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI="8"
inherit autotools libtool multilib-minimal
DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="https://notroj.github.io/neon/"
+HOMEPAGE="https://notroj.github.io/neon/ https://github.com/notroj/neon"
SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/27"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
-RESTRICT="test"
-
-RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +expat gnutls kerberos libproxy nls pkcs11 ssl test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig
+ test? (
+ ssl? (
+ dev-libs/openssl:0
+ pkcs11? ( dev-libs/nss )
+ )
+ )"
+DEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
!expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] )
@@ -25,25 +32,24 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
app-misc/ca-certificates
net-libs/gnutls:0=[${MULTILIB_USEDEP}]
)
- !gnutls? (
- dev-libs/openssl:0=[${MULTILIB_USEDEP}]
- )
+ !gnutls? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
)
zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+RDEPEND="${DEPEND}"
MULTILIB_CHOST_TOOLS=(
/usr/bin/neon-config
)
-src_prepare() {
- # Use CHOST-prefixed version of xml2-config for cross-compilation.
- sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed"
+DOCS=( AUTHORS BUGS NEWS README.md THANKS TODO )
- # Fix compatibility with OpenSSL >=1.1.
- sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"
+src_prepare() {
+ if use gnutls; then
+ # Ignore failure of test pkcs11.
+ # https://github.com/notroj/neon/issues/72
+ sed -e "s/T(pkcs11)/T_XFAIL(pkcs11)/" -i test/ssl.c || die
+ fi
eapply_user
@@ -82,7 +88,6 @@ multilib_src_configure() {
$(use_with libproxy) \
$(use_enable nls) \
$(use_with pkcs11 pakchois) \
- $(use_enable static-libs static) \
$(use_with zlib) \
"${myconf[@]}"
}
@@ -91,15 +96,12 @@ multilib_src_install() {
emake DESTDIR="${D}" install-{config,headers,lib,man,nls}
if multilib_is_native_abi && use doc; then
- (
- docinto html
- dodoc -r doc/html/*
- )
+ dodoc -r doc/html
fi
}
multilib_src_install_all() {
- find "${D}" -name "*.la" -type f -delete || die
+ find "${ED}" -name "*.la" -delete || die
- dodoc AUTHORS BUGS NEWS README.md THANKS TODO
+ einstalldocs
}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 9b5f2c56362..575ac2674bd 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,2 +1,3 @@
DIST nghttp2-1.45.1.tar.xz 4017852 BLAKE2B 17bc5e0a6270494a0296da7f1394d0b89666ca42ad04bcce097740da2b30cdc575f17e681a8320dc2a2161eeebb753f22f228a340fc7cd690fa883d29149bcd8 SHA512 320a8c9f29b58c55df98be4312d415bc406edbdfb0765aa37570cdb472a84f40c4f95a51c44c5488363c16ad6815c75b5503b32e43d94724c54117ff583c7150
DIST nghttp2-1.46.0.tar.xz 4024972 BLAKE2B 85fe1259b791ff7cda163265f553e0aac8a10ef6674cf6152d5bc7747c7f4f3bc6e9d9c0472534dd7185f093936efed1b4632da64d426b6a7ac432657e8579a1 SHA512 fcf3573bcc421705190c7cf0e3230f6f3028b669cb2976d29cfeb73e706deaae91ce60d0a615472e3f296454049ea5798f1e8defdd260a98895e94fea6a7a16b
+DIST nghttp2-1.47.0.tar.xz 4028580 BLAKE2B 4f5302701c8d8a89c3ae72cbb8acb4cbcbe32cd0e2995643e0b669cf802ae28e8f6e52b2d59f69f87e0d12fc64a73c251edbe01c2b0eca2676626a9e456df93f SHA512 ad6266a15789fec966db6be8ac0b9ee6cca257a3bb91fdd34a58acf0e472643a571941b5974d16c98f6ac5bfa6a03c4b70a6dff222fb0cd50909178b7e94ce48
diff --git a/net-libs/nghttp2/nghttp2-1.47.0.ebuild b/net-libs/nghttp2/nghttp2-1.47.0.ebuild
new file mode 100644
index 00000000000..97b642d84a6
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.47.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=8
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+ inherit autotools git-r3
+else
+ SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
+
+RESTRICT="!test? ( test )"
+
+SSL_DEPEND="
+ >=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
+"
+RDEPEND="
+ cxx? (
+ ${SSL_DEPEND}
+ dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
+ )
+ hpack-tools? ( >=dev-libs/jansson-2.5:= )
+ jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
+ utils? (
+ ${SSL_DEPEND}
+ >=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+ net-dns/c-ares:=[${MULTILIB_USEDEP}]
+ )
+ xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+ [[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --disable-examples
+ --disable-failmalloc
+ --disable-python-bindings
+ --disable-werror
+ --without-cython
+ $(use_enable cxx asio-lib)
+ $(use_enable debug)
+ $(multilib_native_use_enable hpack-tools)
+ $(use_enable static-libs static)
+ $(use_enable threads)
+ $(multilib_native_use_enable utils app)
+ $(multilib_native_use_with jemalloc)
+ $(multilib_native_use_with xml libxml2)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ if ! use static-libs ; then
+ find "${ED}"/usr -type f -name '*.la' -delete || die
+ fi
+}
diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index 736d30a7873..dcab15c68bd 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -1 +1,7 @@
+DIST ngtcp2-0.1.0.tar.xz 540132 BLAKE2B df59b4632110f118e0ae27c709fee24be65216d5461ad73901fb7f7450afe17a255acda10473a39ac45a34c2810728c50e39dcde9a71c48eb843d5d628b70b8c SHA512 935c37fe08bb625b39d4355322df54cedc180584c46b7816a84b2715f777a49590cd0434ed062fabec55df1a2c5332e7edf6335bd071599b053d6f404ce260b8
+DIST ngtcp2-0.2.1.tar.xz 554280 BLAKE2B 243599cde08eeb5833d4836cfe3a1b1ea3b9cd339d6f424899fe5bf10599c1e34a8002130c6b5b6378e99bd9c6ec87e2d8eebd6a439ed4f0df59238504ea6eb6 SHA512 8570f84eaa21190c2abd8140bbaa5495e06331cbc60efb42466eab218d3ac42f51810e0cf2a15bf81d16139de26728ee5009db66930e23bf6732252b7bf38737
+DIST ngtcp2-0.3.0.tar.xz 570876 BLAKE2B 645d09b2b33076d93bfffb79eba347cda5d0d782e1321138f436fe776808b3a51a0a2fc5599ecfe67b4db87b3e653b3e37293f746dabe7ae50cc32cd929c08f7 SHA512 3e37c269fba0261dc1514095104725064c078cc0dc66c0cfb8b536a8e3fe474888ca6a88b02c176689d94ddabf7acad14e1e8dea121da93f18bbe261169b0ee9
+DIST ngtcp2-0.3.1.tar.xz 566612 BLAKE2B 9b9b2e8a671e924bb13d41874c5f5a940fdde352b2f0ac60c41fbb9478bd03c070baecbe3e867ecce73e6671309a93b3696410ea3a965ea618349391e963ae0a SHA512 8c5beae1b257272212dcfaf9d8b56e728ba0b08e0c2f2f27d9f5049c8278a60bdcd97df140e5661793a65a936ce556f5afa55f05fd5b60c647d47dadc4a4cdc3
+DIST ngtcp2-0.4.0.tar.xz 573692 BLAKE2B 9eb428a19a7e6a42dc6344f7569dbb33cb083028c25c34c9bec0999a7f055d1ee1173ffae500ddcdca60e20d508b7b56f2489e9af03e10284611179b5098ce16 SHA512 5ce0933a6e53ce29a0d007f487aad11f068d9450ada10af6e5639c891a292977bf4bc57ccf0b5782b8e6e84292859faf3d409de49038b586c74205acc3a391ee
+DIST ngtcp2-0.5.0.tar.xz 570732 BLAKE2B 3e1e11a8e65afb6ff3e7c790545a889459ffaeccd2a93085634b55a2124143a96750b06e3bc494c5311664b9f35adb57784dc164756f7026dbca4a25c33acdf6 SHA512 bd30005126b11165741d2295252c5fe9ca82b1f1cebf9d0064b79f4bf7778b62e39e241063f80b5ad2d5fa859b5f799f938958cf8963d1b1c8477c2202c1ec71
DIST ngtcp2-0_pre20190912.tar.gz 302984 BLAKE2B 906b248b0c19395288ed2c5ad55c8d42a9df9d76458104785c1013b9ebfaf1b92a4b87ced8755377fcb627018cf8854be0e4687e4c8a23ae994e5a21f466f739 SHA512 91b93575143960af421e8bd37d686602905fa3093750cfbbe3af1b20d743318281d22162676dc451562768ca08b6d0767b1dc28f3f8f6733235ebd76015a05bb
diff --git a/net-libs/ngtcp2/metadata.xml b/net-libs/ngtcp2/metadata.xml
index 71f915056b8..4b6987e8ad5 100644
--- a/net-libs/ngtcp2/metadata.xml
+++ b/net-libs/ngtcp2/metadata.xml
@@ -8,4 +8,7 @@
<upstream>
<remote-id type="github">ngtcp2/ngtcp2</remote-id>
</upstream>
+ <use>
+ <flag name="openssl">Provide SSL support using OpenSSL (requires <pkg>dev-libs/openssl</pkg>)</flag>
+ </use>
</pkgmetadata>
diff --git a/net-libs/ngtcp2/ngtcp2-0.1.0.ebuild b/net-libs/ngtcp2/ngtcp2-0.1.0.ebuild
new file mode 100644
index 00000000000..7e8e166f726
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-0.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~hppa"
+fi
+
+DESCRIPTION="Implementation of the IETF QUIC Protocol"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE="ssl test"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="ssl? ( >=dev-libs/openssl-1.1.1:0= )
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+RDEPEND=""
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=$(usex !ssl)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
+ )
+ cmake_src_configure
+}
+
+multilib_src_test() {
+ cmake_build check
+}
diff --git a/net-libs/ngtcp2/ngtcp2-0.2.1.ebuild b/net-libs/ngtcp2/ngtcp2-0.2.1.ebuild
new file mode 100644
index 00000000000..a828f15d1ad
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-0.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~hppa"
+fi
+
+DESCRIPTION="Implementation of the IETF QUIC Protocol"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE="+gnutls openssl +ssl test"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-3.7.2:0= )
+ openssl? (
+ >=dev-libs/openssl-1.1.1:0=
+ )
+ )"
+DEPEND="${RDEPEND}
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DENABLE_GNUTLS=$(usex gnutls)
+ -DENABLE_OPENSSL=$(usex openssl)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
+ )
+ cmake_src_configure
+}
+
+multilib_src_test() {
+ cmake_build check
+}
diff --git a/net-libs/ngtcp2/ngtcp2-0.3.0.ebuild b/net-libs/ngtcp2/ngtcp2-0.3.0.ebuild
new file mode 100644
index 00000000000..a828f15d1ad
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-0.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~hppa"
+fi
+
+DESCRIPTION="Implementation of the IETF QUIC Protocol"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE="+gnutls openssl +ssl test"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-3.7.2:0= )
+ openssl? (
+ >=dev-libs/openssl-1.1.1:0=
+ )
+ )"
+DEPEND="${RDEPEND}
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DENABLE_GNUTLS=$(usex gnutls)
+ -DENABLE_OPENSSL=$(usex openssl)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
+ )
+ cmake_src_configure
+}
+
+multilib_src_test() {
+ cmake_build check
+}
diff --git a/net-libs/ngtcp2/ngtcp2-0.3.1.ebuild b/net-libs/ngtcp2/ngtcp2-0.3.1.ebuild
new file mode 100644
index 00000000000..a828f15d1ad
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-0.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~hppa"
+fi
+
+DESCRIPTION="Implementation of the IETF QUIC Protocol"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE="+gnutls openssl +ssl test"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-3.7.2:0= )
+ openssl? (
+ >=dev-libs/openssl-1.1.1:0=
+ )
+ )"
+DEPEND="${RDEPEND}
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DENABLE_GNUTLS=$(usex gnutls)
+ -DENABLE_OPENSSL=$(usex openssl)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
+ )
+ cmake_src_configure
+}
+
+multilib_src_test() {
+ cmake_build check
+}
diff --git a/net-libs/ngtcp2/ngtcp2-0.4.0.ebuild b/net-libs/ngtcp2/ngtcp2-0.4.0.ebuild
new file mode 100644
index 00000000000..a828f15d1ad
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-0.4.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~hppa"
+fi
+
+DESCRIPTION="Implementation of the IETF QUIC Protocol"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE="+gnutls openssl +ssl test"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-3.7.2:0= )
+ openssl? (
+ >=dev-libs/openssl-1.1.1:0=
+ )
+ )"
+DEPEND="${RDEPEND}
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DENABLE_GNUTLS=$(usex gnutls)
+ -DENABLE_OPENSSL=$(usex openssl)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
+ )
+ cmake_src_configure
+}
+
+multilib_src_test() {
+ cmake_build check
+}
diff --git a/net-libs/ngtcp2/ngtcp2-0.5.0.ebuild b/net-libs/ngtcp2/ngtcp2-0.5.0.ebuild
new file mode 100644
index 00000000000..a828f15d1ad
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-0.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~hppa"
+fi
+
+DESCRIPTION="Implementation of the IETF QUIC Protocol"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE="+gnutls openssl +ssl test"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-3.7.2:0= )
+ openssl? (
+ >=dev-libs/openssl-1.1.1:0=
+ )
+ )"
+DEPEND="${RDEPEND}
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DENABLE_GNUTLS=$(usex gnutls)
+ -DENABLE_OPENSSL=$(usex openssl)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
+ )
+ cmake_src_configure
+}
+
+multilib_src_test() {
+ cmake_build check
+}
diff --git a/net-libs/ngtcp2/ngtcp2-9999.ebuild b/net-libs/ngtcp2/ngtcp2-9999.ebuild
index e1fef793bf0..a828f15d1ad 100644
--- a/net-libs/ngtcp2/ngtcp2-9999.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
CMAKE_ECLASS=cmake
inherit cmake-multilib
@@ -19,20 +19,27 @@ HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
LICENSE="MIT"
SLOT="0/0"
-IUSE="ssl test"
+IUSE="+gnutls openssl +ssl test"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) )"
BDEPEND="virtual/pkgconfig"
-DEPEND="ssl? ( >=dev-libs/openssl-1.1.1:0= )
+RDEPEND="
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-3.7.2:0= )
+ openssl? (
+ >=dev-libs/openssl-1.1.1:0=
+ )
+ )"
+DEPEND="${RDEPEND}
test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-RDEPEND=""
RESTRICT="!test? ( test )"
multilib_src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=$(usex !ssl)
+ -DENABLE_GNUTLS=$(usex gnutls)
+ -DENABLE_OPENSSL=$(usex openssl)
-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
)
cmake_src_configure
}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 21f44c4d3d5..0c6c3c7600c 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,10 +1,5 @@
-DIST node-v12.22.5.tar.xz 23654908 BLAKE2B ca4f304e31f091ae656142035851d6e4427d8b2ddd2a69506dec96efbb1269a19a08e9ab8d44dfe10f8429bc239e4102f3f030adb25e9c41901c7d94b53e88c8 SHA512 80f3c673a1f2af7fffd6aaa556c06b8225034c8413e1a738c19d491aff1b3e6ed388df66ecbff88e4bfbefe1013dac7e3beb301456c2099b6a954ba468b21883
-DIST node-v12.22.6.tar.xz 23664904 BLAKE2B 04dd4fd4cbe39642a1c3dd8639a4d9e3362055f56bc2565303d0095cda1655033ba4e0ce5a969647d2be73df13ddbcccc4907825a94a41b45c0723b3c02ca980 SHA512 d107f1ff7073d2db9f0198f14b0523870e9b262c71055de2e03fba54f87bc98a57dad43d902c0b349957df21de71dc066133d4831eb7eb07f4e548d0ac724fb2
-DIST node-v12.22.7.tar.xz 23661696 BLAKE2B aa162e2aee98568c207b11a27651cefdf6444568ad0c0dc602d63a6767fc7d00d10e93626168b334d6fe1774fc8da420ed05b9d2ce485f0ec3544d992bfb5b83 SHA512 7697b409537114abf14a3847fffd8952fd35f54569bfa84ba527f231ac1defced5d11fe7bc39ff8ec7cccb282d584ff50a33bcbba16474c6a125808a29104222
DIST node-v14.17.5.tar.xz 33585724 BLAKE2B cf79397caad8c81e4096f344f9fdb88d8ecea44b97fe208256dfd4afb750ecdf52142a2dc0430285b9d5117bdd43fa5ce42b4418926eec4d2c7f0a5f5d1a1539 SHA512 9d62c8946d05862d96a13a71b241a097b9f592a9e5f7362c81d8f3c74e7c5546a308b4c74bef34a66cafeef5d1a87d9d3e5ae8bb87d470c1ecf5abb8de0dedb5
DIST node-v14.17.6.tar.xz 33606464 BLAKE2B c2c449e5eaf8214d7ed4bfab8db0208034cee1d08ef0e1fca478c30fc5cf95be037eb141080dbcfbe4fc58ef734457747dcbd0fe585a0536f9c0bec495435f25 SHA512 581c5698112426042fbf54fa793e56a30cae0c54ce8f23af6ac20d73c69a4f1166c5410f357c5a7b0409a773f99e3b9291e4afffd53b3c0e00569725dc4c47d3
-DIST node-v14.18.0.tar.xz 33698388 BLAKE2B 0a26aac559f2cd44d863b5375bc26692f1abf121c368df040041c9916e56410c3c919be377f099651e9a5e27bad972705d02a20f108f527cf23044e8ba95dd78 SHA512 0603e2466bf89b57e404e2992dda25012866a347489fb811a9757aea07056fc4f346236adf44a56d52c442f5f298f4dfdfc961f8582cd194d062beeb80c60cbf
-DIST node-v14.18.1.tar.xz 33693816 BLAKE2B 310a53a7319620d8ff77b4e5947c7f2196efe96eb0d4311c8fb91b500331128750096e7b0471def73bee00cfa6a9da968cc8176b1d46d06d14c3409dedb9203b SHA512 a92d6f392e960008efd0c1f48471a3e294aa5292065fb31acc62723e8924f7f1a22bb02f3ab51a440f6e190bdee3c1667a275808c6b76d053a77aa6d7ad68aef
-DIST node-v16.10.0.tar.xz 34046720 BLAKE2B e745443a4707eca97ebfc0d3cb8e697f64cd3eb98a419debde79100291ab64306d2c7cbda6ce1bfe6174cbc53880ddbda2965b0b6b8aa4b4b278781f002da277 SHA512 278f3e29f14362c017fbfa768bf0aa54cd208048741622413a67d3277e35fbdbc099fb84ce1de77837616e0e6f485916ccc771a7bee0b2ac5d30b4d4a6cf94f6
-DIST node-v16.13.0.tar.xz 33502788 BLAKE2B d30a63e77ef3b423bfa3a43299f7f6576ee5b0544757d1dbf233cbbc4bc9c70971927283ca87497add5ed05c9bf5d5501b36992cd242468fcd12e7f950ee29c2 SHA512 5d840fa49e8e637398f20b166b590a57e1070fd04c62bcb9b2d56646cf5a97719a70dbd9e0e29a548a268ac84c9a6c63c02ed6d38536ed45d82ffb96896a61c0
-DIST node-v16.9.1.tar.xz 34026992 BLAKE2B 8bb0d75ab91a00d5b03a31ded17a6b8845894630185d353ded616bf8435b672ea5cef06b4ca5bd01bb3536c5c50774f6ad0aa08a0fa8cbb00d8866e29561c2ab SHA512 e570c39fffa5d79c8d3fa1fe90ece53b22729af6e882416a35b54362be7169eeb3d37cf8be69ee1b748a981b1fbc725d8c85a739bc5cb0b22d6d2e313ab646ac
+DIST node-v14.19.0.tar.xz 34486868 BLAKE2B 12e571a366c1d4b2475ef258e338f516bb81e9c08f7e6b7f951decbf371028cdcf32c72181d8504d0890496eaecce0d6b23437b8dad6c6e498d30bf6636bd1e7 SHA512 80573fa3a0882c1f2a40b991f187f49714748ca4c56c78133e2d2be0322f201816eb059a1a7d38ea8a925229c1b1324d0ffc28ff4002d0115bfae44fe87efe97
+DIST node-v16.14.2.tar.xz 34332624 BLAKE2B 756895f81ecabbacf30b1e513890d100192c367443a5d041cd3e383985acb6fae189213f44b7a533b43d1b759d5a2677a5ee787c72d3abdb480879d6d24cc95e SHA512 b97274f6e0d63f19e01497c43af36e6561f019e7b0b5b4f6ea19d0fbe2cb4d3c514c06f49e237d1e327936db03c3f437ae0d0b2f830a35f1b7c3a723fbe2a1be
+DIST node-v18.1.0.tar.xz 36841136 BLAKE2B 77cc028f61391c483cf9bdff09a2101790119257ceee5b6702347aee771c7ed9656458f482bceb89d9921a598b9e2134ef6c424e6c879934dce9bcc85fbb3552 SHA512 edaf830b90b74ff7e8d1098f7f09cff91dc60738bfc612f6847bd7ac283ca76453f624057f64ba3ddcc86804bfbd652eaf8eae1398118220fd54fbf9c0a0e49c
diff --git a/net-libs/nodejs/files/nodejs-12.20.1-fix_ppc64_crashes.patch b/net-libs/nodejs/files/nodejs-12.20.1-fix_ppc64_crashes.patch
deleted file mode 100644
index 0982d3c81c2..00000000000
--- a/net-libs/nodejs/files/nodejs-12.20.1-fix_ppc64_crashes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Backport of https://github.com/nodejs/node/pull/33866 to nodejs-12
-
---- a/deps/v8/src/compiler/backend/instruction-selector.cc
-+++ b/deps/v8/src/compiler/backend/instruction-selector.cc
-@@ -2788,7 +2788,7 @@
- switch (call_descriptor->kind()) {
- case CallDescriptor::kCallAddress: {
- int misc_field = static_cast<int>(call_descriptor->ParameterCount());
--#if defined(_AIX)
-+#if ABI_USES_FUNCTION_DESCRIPTORS
- // Highest misc_field bit is used on AIX to indicate if a CFunction call
- // has function descriptor or not.
- misc_field |= call_descriptor->HasFunctionDescriptor()
---- a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
-+++ b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
-@@ -1026,7 +1026,7 @@
- Label start_call;
- bool isWasmCapiFunction =
- linkage()->GetIncomingDescriptor()->IsWasmCapiFunction();
--#if defined(_AIX)
-+#if ABI_USES_FUNCTION_DESCRIPTORS
- // AIX/PPC64BE Linux uses a function descriptor
- int kNumParametersMask = kHasFunctionDescriptorBitMask - 1;
- num_parameters = kNumParametersMask & misc_field;
---- a/deps/v8/src/execution/simulator.h
-+++ b/deps/v8/src/execution/simulator.h
-@@ -122,7 +122,7 @@
-
- DISABLE_CFI_ICALL Return Call(Args... args) {
- // When running without a simulator we call the entry directly.
--#if V8_OS_AIX
-+#if ABI_USES_FUNCTION_DESCRIPTORS
- // AIX ABI requires function descriptors (FD). Artificially create a pseudo
- // FD to ensure correct dispatch to generated code. The 'volatile'
- // declaration is required to avoid the compiler from not observing the
-@@ -134,7 +134,7 @@
- return fn(args...);
- #else
- return fn_ptr_(args...);
--#endif // V8_OS_AIX
-+#endif // ABI_USES_FUNCTION_DESCRIPTORS
- }
- #endif // USE_SIMULATOR
-
diff --git a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
deleted file mode 100644
index 5f0df09b6e2..00000000000
--- a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/deps/v8/third_party/jinja2/tests.py
-+++ b/deps/v8/third_party/jinja2/tests.py
-@@ -10,7 +10,7 @@
- """
- import operator
- import re
--from collections import Mapping
-+from collections.abc import Mapping
- from jinja2.runtime import Undefined
- from jinja2._compat import text_type, string_types, integer_types
- import decimal
---- a/deps/v8/third_party/jinja2/runtime.py
-+++ b/deps/v8/third_party/jinja2/runtime.py
-@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
-
- # register the context as mapping if possible
- try:
-- from collections import Mapping
-+ from collections.abc import Mapping
- Mapping.register(Context)
- except ImportError:
- pass
---- a/deps/v8/third_party/jinja2/sandbox.py
-+++ b/deps/v8/third_party/jinja2/sandbox.py
-@@ -14,7 +14,7 @@
- """
- import types
- import operator
--from collections import Mapping
-+from collections.abc import Mapping
- from jinja2.environment import Environment
- from jinja2.exceptions import SecurityError
- from jinja2._compat import string_types, PY2
-@@ -79,7 +79,7 @@ except ImportError:
- pass
-
- #: register Python 2.6 abstract base classes
--from collections import MutableSet, MutableMapping, MutableSequence
-+from collections.abc import MutableSet, MutableMapping, MutableSequence
- _mutable_set_types += (MutableSet,)
- _mutable_mapping_types += (MutableMapping,)
- _mutable_sequence_types += (MutableSequence,)
---- a/deps/v8/third_party/jinja2/utils.py
-+++ b/deps/v8/third_party/jinja2/utils.py
-@@ -482,7 +482,7 @@ class LRUCache(object):
-
- # register the LRU cache as mutable mapping if possible
- try:
-- from collections import MutableMapping
-+ from collections.abc import MutableMapping
- MutableMapping.register(LRUCache)
- except ImportError:
- pass
---- a/tools/inspector_protocol/jinja2/runtime.py
-+++ b/tools/inspector_protocol/jinja2/runtime.py
-@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
-
- # register the context as mapping if possible
- try:
-- from collections import Mapping
-+ from collections.abc import Mapping
- Mapping.register(Context)
- except ImportError:
- pass
---- a/tools/inspector_protocol/jinja2/sandbox.py
-+++ b/tools/inspector_protocol/jinja2/sandbox.py
-@@ -14,7 +14,7 @@
- """
- import types
- import operator
--from collections import Mapping
-+from collections.abc import Mapping
- from jinja2.environment import Environment
- from jinja2.exceptions import SecurityError
- from jinja2._compat import string_types, PY2
-@@ -79,7 +79,7 @@ except ImportError:
- pass
-
- #: register Python 2.6 abstract base classes
--from collections import MutableSet, MutableMapping, MutableSequence
-+from collections.abc import MutableSet, MutableMapping, MutableSequence
- _mutable_set_types += (MutableSet,)
- _mutable_mapping_types += (MutableMapping,)
- _mutable_sequence_types += (MutableSequence,)
---- a/tools/inspector_protocol/jinja2/tests.py
-+++ b/tools/inspector_protocol/jinja2/tests.py
-@@ -10,7 +10,7 @@
- """
- import operator
- import re
--from collections import Mapping
-+from collections.abc import Mapping
- from jinja2.runtime import Undefined
- from jinja2._compat import text_type, string_types, integer_types
- import decimal
diff --git a/net-libs/nodejs/files/nodejs-14.19.0-global-npm-config.patch b/net-libs/nodejs/files/nodejs-14.19.0-global-npm-config.patch
new file mode 100644
index 00000000000..09d9dbe47be
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-14.19.0-global-npm-config.patch
@@ -0,0 +1,20 @@
+diff --git a/deps/npm/lib/config/core.js b/deps/npm/lib/config/core.js
+index 36420b3450..0afb0b6792 100644
+--- a/deps/npm/lib/config/core.js
++++ b/deps/npm/lib/config/core.js
+@@ -151,11 +151,10 @@ function load_ (builtin, rc, cli, cb) {
+ // Eg, `npm config get globalconfig --prefix ~/local` should
+ // return `~/local/etc/npmrc`
+ // annoying humans and their expectations!
+- if (conf.get('prefix')) {
+- var etc = path.resolve(conf.get('prefix'), 'etc')
+- defaults.globalconfig = path.resolve(etc, 'npmrc')
+- defaults.globalignorefile = path.resolve(etc, 'npmignore')
+- }
++ // gentoo deviates wrt global config; store in /etc/npm
++ var globalconfig = path.resolve('/etc', 'npm')
++ defaults.globalconfig = path.resolve(globalconfig, 'npmrc')
++ defaults.globalignorefile = path.resolve(globalconfig, 'npmignore')
+
+ conf.addFile(conf.get('globalconfig'), 'global')
+
diff --git a/net-libs/nodejs/files/nodejs-16.4.2-paxmarking.patch b/net-libs/nodejs/files/nodejs-16.4.2-paxmarking.patch
new file mode 100644
index 00000000000..41abd1f1917
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-16.4.2-paxmarking.patch
@@ -0,0 +1,113 @@
+diff -urNp node-v15.8.0-orig/node.gyp node-v15.8.0-dwok/node.gyp
+--- node-v15.8.0-orig/node.gyp 2021-02-24 22:21:44.202911780 +0100
++++ node-v15.8.0-dwok/node.gyp 2021-02-24 22:25:34.298281739 +0100
+@@ -53,7 +53,9 @@
+ 'deps/cjs-module-lexer/dist/lexer.js',
+ ],
+ 'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
++ 'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
+ 'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
++ 'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
+ 'conditions': [
+ ['GENERATOR == "ninja"', {
+ 'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'
+@@ -291,10 +293,24 @@
+ ],
+ 'actions': [
+ {
++ 'action_name': 'run_pax_mkcodecache',
++ 'inputs': [
++ '<(mkcodecache_exec)',
++ ],
++ 'outputs': [
++ '<(mkcodecache_u_exec)',
++ ],
++ 'action': [
++ 'bash',
++ '-c',
++ 'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
++ ],
++ },
++ {
+ 'action_name': 'run_mkcodecache',
+ 'process_outputs_as_sources': 1,
+ 'inputs': [
+- '<(mkcodecache_exec)',
++ '<(mkcodecache_u_exec)',
+ ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
+@@ -316,10 +332,24 @@
+ ],
+ 'actions': [
+ {
++ 'action_name': 'run_pax_mksnapshot',
++ 'inputs': [
++ '<(node_mksnapshot_exec)',
++ ],
++ 'outputs': [
++ '<(node_mksnapshot_u_exec)',
++ ],
++ 'action': [
++ 'bash',
++ '-c',
++ 'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
++ ],
++ },
++ {
+ 'action_name': 'node_mksnapshot',
+ 'process_outputs_as_sources': 1,
+ 'inputs': [
+- '<(node_mksnapshot_exec)',
++ '<(node_mksnapshot_u_exec)',
+ ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
+diff -urNp node-v15.8.0-orig/tools/v8_gypfiles/v8.gyp node-v15.8.0-dwok/tools/v8_gypfiles/v8.gyp
+--- node-v15.8.0-orig/tools/v8_gypfiles/v8.gyp 2021-02-24 22:21:44.654910571 +0100
++++ node-v15.8.0-dwok/tools/v8_gypfiles/v8.gyp 2021-02-24 22:25:54.834224791 +0100
+@@ -9,6 +9,7 @@
+ 'v8_vector_stores%': 0,
+ 'v8_embed_script%': "",
+ 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
++ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
+ 'v8_os_page_size%': 0,
+ 'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
+ 'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',
+@@ -1430,7 +1431,7 @@
+ ],
+ }, # bytecode_builtins_list_generator
+ {
+- 'target_name': 'mksnapshot',
++ 'target_name': 'mksnapshot_u',
+ 'type': 'executable',
+ 'dependencies': [
+ 'v8_base_without_compiler',
+@@ -1449,6 +1450,27 @@
+ 'toolsets': ['host'],
+ }],
+ ],
++ }, # mksnapshot_u
++ {
++ 'target_name': 'mksnapshot',
++ 'type': 'none',
++ 'dependencies': ['mksnapshot_u'],
++ 'actions': [
++ {
++ 'action_name': 'paxmark_mksnapshot',
++ 'inputs': [
++ '<(mksnapshot_u_exec)',
++ ],
++ 'outputs': [
++ '<(mksnapshot_exec)',
++ ],
++ 'action': [
++ 'bash',
++ '-c',
++ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)'
++ ],
++ },
++ ],
+ }, # mksnapshot
+ {
+ 'target_name': 'torque',
diff --git a/net-libs/nodejs/files/nodejs-18.0.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-18.0.0-paxmarking.patch
new file mode 100644
index 00000000000..c778d172938
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-18.0.0-paxmarking.patch
@@ -0,0 +1,113 @@
+diff -urNp node-v15.8.0-orig/node.gyp node-v15.8.0-dwok/node.gyp
+--- node-v15.8.0-orig/node.gyp 2021-02-24 22:21:44.202911780 +0100
++++ node-v15.8.0-dwok/node.gyp 2021-02-24 22:25:34.298281739 +0100
+@@ -55,7 +55,9 @@
+ 'deps/undici/undici.js',
+ ],
+ 'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
++ 'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
+ 'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
++ 'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
+ 'conditions': [
+ ['GENERATOR == "ninja"', {
+ 'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'
+@@ -293,10 +295,24 @@
+ ],
+ 'actions': [
+ {
++ 'action_name': 'run_pax_mkcodecache',
++ 'inputs': [
++ '<(mkcodecache_exec)',
++ ],
++ 'outputs': [
++ '<(mkcodecache_u_exec)',
++ ],
++ 'action': [
++ 'bash',
++ '-c',
++ 'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
++ ],
++ },
++ {
+ 'action_name': 'run_mkcodecache',
+ 'process_outputs_as_sources': 1,
+ 'inputs': [
+- '<(mkcodecache_exec)',
++ '<(mkcodecache_u_exec)',
+ ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
+@@ -340,10 +356,24 @@
+ }, {
+ 'actions': [
+ {
++ 'action_name': 'run_pax_mksnapshot',
++ 'inputs': [
++ '<(node_mksnapshot_exec)',
++ ],
++ 'outputs': [
++ '<(node_mksnapshot_u_exec)',
++ ],
++ 'action': [
++ 'bash',
++ '-c',
++ 'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
++ ],
++ },
++ {
+ 'action_name': 'node_mksnapshot',
+ 'process_outputs_as_sources': 1,
+ 'inputs': [
+- '<(node_mksnapshot_exec)',
++ '<(node_mksnapshot_u_exec)',
+ ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
+diff -urNp node-v15.8.0-orig/tools/v8_gypfiles/v8.gyp node-v15.8.0-dwok/tools/v8_gypfiles/v8.gyp
+--- node-v15.8.0-orig/tools/v8_gypfiles/v8.gyp 2021-02-24 22:21:44.654910571 +0100
++++ node-v15.8.0-dwok/tools/v8_gypfiles/v8.gyp 2021-02-24 22:25:54.834224791 +0100
+@@ -9,6 +9,7 @@
+ 'v8_vector_stores%': 0,
+ 'v8_embed_script%': "",
+ 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
++ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
+ 'v8_os_page_size%': 0,
+ 'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
+ 'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',
+@@ -1413,7 +1414,7 @@
+ ],
+ }, # bytecode_builtins_list_generator
+ {
+- 'target_name': 'mksnapshot',
++ 'target_name': 'mksnapshot_u',
+ 'type': 'executable',
+ 'dependencies': [
+ 'v8_base_without_compiler',
+@@ -1432,6 +1433,27 @@
+ 'toolsets': ['host'],
+ }],
+ ],
++ }, # mksnapshot_u
++ {
++ 'target_name': 'mksnapshot',
++ 'type': 'none',
++ 'dependencies': ['mksnapshot_u'],
++ 'actions': [
++ {
++ 'action_name': 'paxmark_mksnapshot',
++ 'inputs': [
++ '<(mksnapshot_u_exec)',
++ ],
++ 'outputs': [
++ '<(mksnapshot_exec)',
++ ],
++ 'action': [
++ 'bash',
++ '-c',
++ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)'
++ ],
++ },
++ ],
+ }, # mksnapshot
+ {
+ 'target_name': 'torque',
diff --git a/net-libs/nodejs/files/nodejs-99999999-llhttp.patch b/net-libs/nodejs/files/nodejs-99999999-llhttp.patch
deleted file mode 100644
index 1b6eb9fb7fa..00000000000
--- a/net-libs/nodejs/files/nodejs-99999999-llhttp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/node.gypi
-+++ b/node.gypi
-@@ -169,11 +169,15 @@
-
- [ 'node_shared_http_parser=="false"', {
- 'dependencies': [
-- 'deps/http_parser/http_parser.gyp:http_parser',
-- 'deps/llhttp/llhttp.gyp:llhttp'
-+ 'deps/http_parser/http_parser.gyp:http_parser'
- ],
- } ],
-
-+ [ '"true"', { 'dependencies': [
-+ 'deps/llhttp/llhttp.gyp:llhttp'
-+ ],
-+ }],
-+
- [ 'node_shared_cares=="false"', {
- 'dependencies': [ 'deps/cares/cares.gyp:cares' ],
- }],
diff --git a/net-libs/nodejs/nodejs-12.22.5-r1.ebuild b/net-libs/nodejs/nodejs-12.22.5-r1.ebuild
deleted file mode 100644
index 1e716cbf5e8..00000000000
--- a/net-libs/nodejs/nodejs-12.22.5-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/nodejs/node"
- SLOT="0"
-else
- SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
- SLOT="0/$(ver_cut 1)"
- KEYWORDS="amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos"
- S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
- inspector? ( icu ssl )
- npm? ( ssl )
- system-ssl? ( ssl )
-"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=app-arch/brotli-1.0.9:=
- >=dev-libs/libuv-1.39.0:=
- >=net-dns/c-ares-1.17.2:=
- >=net-libs/http-parser-2.9.3:=
- >=net-libs/nghttp2-1.40.0:=
- sys-libs/zlib
- icu? ( >=dev-libs/icu-64.2:= )
- system-ssl? (
- >=dev-libs/openssl-1.1.1:0=
- <dev-libs/openssl-3.0.0_beta1:0=
- )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- sys-apps/coreutils
- virtual/pkgconfig
- systemtap? ( dev-util/systemtap )
- test? ( net-misc/curl )
-"
-DEPEND="
- ${RDEPEND}
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
- "${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch
- "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
- "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
- "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
- "${FILESDIR}"/${PN}-99999999-llhttp.patch
-)
-
-pkg_pretend() {
- (use x86 && ! use cpu_flags_x86_sse2) && \
- die "Your CPU doesn't support the required SSE2 instruction."
-
- if [[ ${MERGE_TYPE} != "binary" ]]; then
- if use lto; then
- if tc-is-gcc; then
- if [[ $(gcc-major-version) -ge 11 ]]; then
- # Bug #787158
- die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
- fi
- else
- # configure.py will abort on this later if we do not
- die "${PN} only supports LTO for gcc"
- fi
- fi
- fi
-}
-
-src_prepare() {
- tc-export CC CXX PKG_CONFIG
- export V=1
- export BUILDTYPE=Release
-
- # fix compilation on Darwin
- # https://code.google.com/p/gyp/issues/detail?id=260
- sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
- # less verbose install output (stating the same as portage, basically)
- sed -i -e "/print/d" tools/install.py || die
-
- # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
- local LIBDIR=$(get_libdir)
- sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
- sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
- # Avoid writing a depfile, not useful
- sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
- sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
- # Known-to-fail test of a deprecated, legacy HTTP parser. Just don't bother.
- rm -f test/parallel/test-http-transfer-encoding-smuggling-legacy.js
-
- # debug builds. change install path, remove optimisations and override buildtype
- if use debug; then
- sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
- BUILDTYPE=Debug
- fi
-
- default
-}
-
-src_configure() {
- xdg_environment_reset
-
- # LTO compiler flags are handled by configure.py itself
- filter-flags '-flto*'
-
- local myconf=(
- --shared-brotli
- --shared-cares
- --shared-http-parser
- --shared-libuv
- --shared-nghttp2
- --shared-zlib
- )
- use debug && myconf+=( --debug )
- use lto && myconf+=( --enable-lto )
- use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
- use inspector || myconf+=( --without-inspector )
- use npm || myconf+=( --without-npm )
- use snapshot || myconf+=( --without-node-snapshot )
- if use ssl; then
- use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
- else
- myconf+=( --without-ssl )
- fi
-
- local myarch=""
- case ${ABI} in
- amd64) myarch="x64";;
- arm) myarch="arm";;
- arm64) myarch="arm64";;
- ppc64) myarch="ppc64";;
- x32) myarch="x32";;
- x86) myarch="ia32";;
- *) myarch="${ABI}";;
- esac
-
- GYP_DEFINES="linux_use_gold_flags=0
- linux_use_bundled_binutils=0
- linux_use_bundled_gold=0" \
- "${EPYTHON}" configure.py \
- --prefix="${EPREFIX}"/usr \
- --dest-cpu=${myarch} \
- $(use_with systemtap dtrace) \
- "${myconf[@]}" || die
-}
-
-src_compile() {
- emake -C out mksnapshot
- pax-mark m "out/${BUILDTYPE}/mksnapshot"
- emake -C out
-}
-
-src_install() {
- local LIBDIR="${ED}/usr/$(get_libdir)"
- default
-
- pax-mark -m "${ED}"/usr/bin/node
-
- # set up a symlink structure that node-gyp expects..
- dodir /usr/include/node/deps/{v8,uv}
- dosym . /usr/include/node/src
- for var in deps/{uv,v8}/include; do
- dosym ../.. /usr/include/node/${var}
- done
-
- if use doc; then
- docinto html
- dodoc -r "${S}"/doc/*
- fi
-
- if use npm; then
- dodir /etc/npm
-
- # Install bash completion for `npm`
- # We need to temporarily replace default config path since
- # npm otherwise tries to write outside of the sandbox
- local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
- sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
- local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
- "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
- newbashcomp "${tmp_npm_completion_file}" npm
- sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
- # Move man pages
- doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
- # Clean up
- rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
- rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
- local find_exp="-or -name"
- local find_name=()
- for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
- ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
- "*.md" "*.markdown" "*.bat" "*.cmd"; do
- find_name+=( ${find_exp} "${match}" )
- done
-
- # Remove various development and/or inappropriate files and
- # useless docs of dependend packages.
- find "${LIBDIR}"/node_modules \
- \( -type d -name examples \) -or \( -type f \( \
- -iname "LICEN?E*" \
- "${find_name[@]}" \
- \) \) -exec rm -rf "{}" \;
- fi
-
- mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
- if has usersandbox ${FEATURES}; then
- rm -f "${S}"/test/parallel/test-fs-mkdir.js
- ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
- "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
- fi
-
- out/${BUILDTYPE}/cctest || die
- "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
- elog "The global npm config lives in /etc/npm. This deviates slightly"
- elog "from upstream which otherwise would have it live in /usr/etc/."
- elog ""
- elog "Protip: When using node-gyp to install native modules, you can"
- elog "avoid having to download extras by doing the following:"
- elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-12.22.6.ebuild b/net-libs/nodejs/nodejs-12.22.6.ebuild
deleted file mode 100644
index fc7f6f38aaa..00000000000
--- a/net-libs/nodejs/nodejs-12.22.6.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/nodejs/node"
- SLOT="0"
-else
- SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
- SLOT="0/$(ver_cut 1)"
- KEYWORDS="amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos"
- S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
- inspector? ( icu ssl )
- npm? ( ssl )
- system-ssl? ( ssl )
-"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=app-arch/brotli-1.0.9:=
- >=dev-libs/libuv-1.39.0:=
- >=net-dns/c-ares-1.17.2:=
- >=net-libs/http-parser-2.9.3:=
- >=net-libs/nghttp2-1.40.0:=
- sys-libs/zlib
- icu? ( >=dev-libs/icu-64.2:= )
- system-ssl? (
- >=dev-libs/openssl-1.1.1:0=
- <dev-libs/openssl-3.0.0_beta1:0=
- )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- sys-apps/coreutils
- virtual/pkgconfig
- systemtap? ( dev-util/systemtap )
- test? ( net-misc/curl )
-"
-DEPEND="
- ${RDEPEND}
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
- "${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch
- "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
- "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
- "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
- "${FILESDIR}"/${PN}-99999999-llhttp.patch
-)
-
-pkg_pretend() {
- (use x86 && ! use cpu_flags_x86_sse2) && \
- die "Your CPU doesn't support the required SSE2 instruction."
-
- if [[ ${MERGE_TYPE} != "binary" ]]; then
- if use lto; then
- if tc-is-gcc; then
- if [[ $(gcc-major-version) -ge 11 ]]; then
- # Bug #787158
- die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
- fi
- else
- # configure.py will abort on this later if we do not
- die "${PN} only supports LTO for gcc"
- fi
- fi
- fi
-}
-
-src_prepare() {
- tc-export CC CXX PKG_CONFIG
- export V=1
- export BUILDTYPE=Release
-
- # fix compilation on Darwin
- # https://code.google.com/p/gyp/issues/detail?id=260
- sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
- # less verbose install output (stating the same as portage, basically)
- sed -i -e "/print/d" tools/install.py || die
-
- # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
- local LIBDIR=$(get_libdir)
- sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
- sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
- # Avoid writing a depfile, not useful
- sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
- sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
- # Known-to-fail test of a deprecated, legacy HTTP parser. Just don't bother.
- rm -f test/parallel/test-http-transfer-encoding-smuggling-legacy.js
-
- # debug builds. change install path, remove optimisations and override buildtype
- if use debug; then
- sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
- BUILDTYPE=Debug
- fi
-
- default
-}
-
-src_configure() {
- xdg_environment_reset
-
- # LTO compiler flags are handled by configure.py itself
- filter-flags '-flto*'
-
- local myconf=(
- --shared-brotli
- --shared-cares
- --shared-http-parser
- --shared-libuv
- --shared-nghttp2
- --shared-zlib
- )
- use debug && myconf+=( --debug )
- use lto && myconf+=( --enable-lto )
- use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
- use inspector || myconf+=( --without-inspector )
- use npm || myconf+=( --without-npm )
- use snapshot || myconf+=( --without-node-snapshot )
- if use ssl; then
- use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
- else
- myconf+=( --without-ssl )
- fi
-
- local myarch=""
- case ${ABI} in
- amd64) myarch="x64";;
- arm) myarch="arm";;
- arm64) myarch="arm64";;
- ppc64) myarch="ppc64";;
- x32) myarch="x32";;
- x86) myarch="ia32";;
- *) myarch="${ABI}";;
- esac
-
- GYP_DEFINES="linux_use_gold_flags=0
- linux_use_bundled_binutils=0
- linux_use_bundled_gold=0" \
- "${EPYTHON}" configure.py \
- --prefix="${EPREFIX}"/usr \
- --dest-cpu=${myarch} \
- $(use_with systemtap dtrace) \
- "${myconf[@]}" || die
-}
-
-src_compile() {
- emake -C out mksnapshot
- pax-mark m "out/${BUILDTYPE}/mksnapshot"
- emake -C out
-}
-
-src_install() {
- local LIBDIR="${ED}/usr/$(get_libdir)"
- default
-
- pax-mark -m "${ED}"/usr/bin/node
-
- # set up a symlink structure that node-gyp expects..
- dodir /usr/include/node/deps/{v8,uv}
- dosym . /usr/include/node/src
- for var in deps/{uv,v8}/include; do
- dosym ../.. /usr/include/node/${var}
- done
-
- if use doc; then
- docinto html
- dodoc -r "${S}"/doc/*
- fi
-
- if use npm; then
- dodir /etc/npm
-
- # Install bash completion for `npm`
- # We need to temporarily replace default config path since
- # npm otherwise tries to write outside of the sandbox
- local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
- sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
- local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
- "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
- newbashcomp "${tmp_npm_completion_file}" npm
- sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
- # Move man pages
- doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
- # Clean up
- rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
- rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
- local find_exp="-or -name"
- local find_name=()
- for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
- ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
- "*.md" "*.markdown" "*.bat" "*.cmd"; do
- find_name+=( ${find_exp} "${match}" )
- done
-
- # Remove various development and/or inappropriate files and
- # useless docs of dependend packages.
- find "${LIBDIR}"/node_modules \
- \( -type d -name examples \) -or \( -type f \( \
- -iname "LICEN?E*" \
- "${find_name[@]}" \
- \) \) -exec rm -rf "{}" \;
- fi
-
- mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
- if has usersandbox ${FEATURES}; then
- rm -f "${S}"/test/parallel/test-fs-mkdir.js
- ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
- "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
- fi
-
- out/${BUILDTYPE}/cctest || die
- "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
- elog "The global npm config lives in /etc/npm. This deviates slightly"
- elog "from upstream which otherwise would have it live in /usr/etc/."
- elog ""
- elog "Protip: When using node-gyp to install native modules, you can"
- elog "avoid having to download extras by doing the following:"
- elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-12.22.7.ebuild b/net-libs/nodejs/nodejs-12.22.7.ebuild
deleted file mode 100644
index b76dbf7ea80..00000000000
--- a/net-libs/nodejs/nodejs-12.22.7.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/nodejs/node"
- SLOT="0"
-else
- SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
- SLOT="0/$(ver_cut 1)"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv ~x86 ~amd64-linux ~x64-macos"
- S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
- inspector? ( icu ssl )
- npm? ( ssl )
- system-ssl? ( ssl )
-"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=app-arch/brotli-1.0.9:=
- >=dev-libs/libuv-1.39.0:=
- >=net-dns/c-ares-1.17.2:=
- >=net-libs/http-parser-2.9.3:=
- >=net-libs/nghttp2-1.40.0:=
- sys-libs/zlib
- icu? ( >=dev-libs/icu-64.2:= )
- system-ssl? (
- >=dev-libs/openssl-1.1.1:0=
- <dev-libs/openssl-3.0.0_beta1:0=
- )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- sys-apps/coreutils
- virtual/pkgconfig
- systemtap? ( dev-util/systemtap )
- test? ( net-misc/curl )
-"
-DEPEND="
- ${RDEPEND}
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
- "${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch
- "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
- "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
- "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
- "${FILESDIR}"/${PN}-99999999-llhttp.patch
-)
-
-pkg_pretend() {
- (use x86 && ! use cpu_flags_x86_sse2) && \
- die "Your CPU doesn't support the required SSE2 instruction."
-
- if [[ ${MERGE_TYPE} != "binary" ]]; then
- if use lto; then
- if tc-is-gcc; then
- if [[ $(gcc-major-version) -ge 11 ]]; then
- # Bug #787158
- die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
- fi
- else
- # configure.py will abort on this later if we do not
- die "${PN} only supports LTO for gcc"
- fi
- fi
- fi
-}
-
-src_prepare() {
- tc-export CC CXX PKG_CONFIG
- export V=1
- export BUILDTYPE=Release
-
- # fix compilation on Darwin
- # https://code.google.com/p/gyp/issues/detail?id=260
- sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
- # less verbose install output (stating the same as portage, basically)
- sed -i -e "/print/d" tools/install.py || die
-
- # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
- local LIBDIR=$(get_libdir)
- sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
- sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
- # Avoid writing a depfile, not useful
- sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
- sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
- # Known-to-fail test of a deprecated, legacy HTTP parser. Just don't bother.
- rm -f test/parallel/test-http-transfer-encoding-smuggling-legacy.js
-
- # debug builds. change install path, remove optimisations and override buildtype
- if use debug; then
- sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
- BUILDTYPE=Debug
- fi
-
- default
-}
-
-src_configure() {
- xdg_environment_reset
-
- # LTO compiler flags are handled by configure.py itself
- filter-flags '-flto*'
-
- local myconf=(
- --shared-brotli
- --shared-cares
- --shared-http-parser
- --shared-libuv
- --shared-nghttp2
- --shared-zlib
- )
- use debug && myconf+=( --debug )
- use lto && myconf+=( --enable-lto )
- use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
- use inspector || myconf+=( --without-inspector )
- use npm || myconf+=( --without-npm )
- use snapshot || myconf+=( --without-node-snapshot )
- if use ssl; then
- use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
- else
- myconf+=( --without-ssl )
- fi
-
- local myarch=""
- case ${ABI} in
- amd64) myarch="x64";;
- arm) myarch="arm";;
- arm64) myarch="arm64";;
- ppc64) myarch="ppc64";;
- x32) myarch="x32";;
- x86) myarch="ia32";;
- *) myarch="${ABI}";;
- esac
-
- GYP_DEFINES="linux_use_gold_flags=0
- linux_use_bundled_binutils=0
- linux_use_bundled_gold=0" \
- "${EPYTHON}" configure.py \
- --prefix="${EPREFIX}"/usr \
- --dest-cpu=${myarch} \
- $(use_with systemtap dtrace) \
- "${myconf[@]}" || die
-}
-
-src_compile() {
- emake -C out mksnapshot
- pax-mark m "out/${BUILDTYPE}/mksnapshot"
- emake -C out
-}
-
-src_install() {
- local LIBDIR="${ED}/usr/$(get_libdir)"
- default
-
- pax-mark -m "${ED}"/usr/bin/node
-
- # set up a symlink structure that node-gyp expects..
- dodir /usr/include/node/deps/{v8,uv}
- dosym . /usr/include/node/src
- for var in deps/{uv,v8}/include; do
- dosym ../.. /usr/include/node/${var}
- done
-
- if use doc; then
- docinto html
- dodoc -r "${S}"/doc/*
- fi
-
- if use npm; then
- dodir /etc/npm
-
- # Install bash completion for `npm`
- # We need to temporarily replace default config path since
- # npm otherwise tries to write outside of the sandbox
- local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
- sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
- local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
- "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
- newbashcomp "${tmp_npm_completion_file}" npm
- sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
- # Move man pages
- doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
- # Clean up
- rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
- rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
- local find_exp="-or -name"
- local find_name=()
- for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
- ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
- "*.md" "*.markdown" "*.bat" "*.cmd"; do
- find_name+=( ${find_exp} "${match}" )
- done
-
- # Remove various development and/or inappropriate files and
- # useless docs of dependend packages.
- find "${LIBDIR}"/node_modules \
- \( -type d -name examples \) -or \( -type f \( \
- -iname "LICEN?E*" \
- "${find_name[@]}" \
- \) \) -exec rm -rf "{}" \;
- fi
-
- mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
- if has usersandbox ${FEATURES}; then
- rm -f "${S}"/test/parallel/test-fs-mkdir.js
- ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
- "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
- fi
-
- out/${BUILDTYPE}/cctest || die
- "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
- elog "The global npm config lives in /etc/npm. This deviates slightly"
- elog "from upstream which otherwise would have it live in /usr/etc/."
- elog ""
- elog "Protip: When using node-gyp to install native modules, you can"
- elog "avoid having to download extras by doing the following:"
- elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-14.18.0.ebuild b/net-libs/nodejs/nodejs-14.18.0.ebuild
deleted file mode 100644
index 745a7dace6a..00000000000
--- a/net-libs/nodejs/nodejs-14.18.0.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/nodejs/node"
- SLOT="0"
-else
- SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
- SLOT="0/$(ver_cut 1)"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv ~x86 ~amd64-linux ~x64-macos"
- S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
- npm? ( ssl )
- system-icu? ( icu )
- system-ssl? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
- >=dev-libs/libuv-1.40.0:=
- >=net-dns/c-ares-1.17.2:=
- >=net-libs/nghttp2-1.41.0:=
- sys-libs/zlib
- system-icu? ( >=dev-libs/icu-67:= )
- system-ssl? (
- >=dev-libs/openssl-1.1.1:0=
- <dev-libs/openssl-3.0.0_beta1:0=
- )"
-BDEPEND="${PYTHON_DEPS}
- sys-apps/coreutils
- virtual/pkgconfig
- systemtap? ( dev-util/systemtap )
- test? ( net-misc/curl )
- pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
- "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
- "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
- "${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
-)
-
-pkg_pretend() {
- (use x86 && ! use cpu_flags_x86_sse2) && \
- die "Your CPU doesn't support the required SSE2 instruction."
-
- if [[ ${MERGE_TYPE} != "binary" ]]; then
- if use lto; then
- if tc-is-gcc; then
- if [[ $(gcc-major-version) -ge 11 ]]; then
- # Bug #787158
- die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
- fi
- else
- # configure.py will abort on this later if we do not
- die "${PN} only supports LTO for gcc"
- fi
- fi
- fi
-}
-
-src_prepare() {
- tc-export AR CC CXX PKG_CONFIG
- export V=1
- export BUILDTYPE=Release
-
- # fix compilation on Darwin
- # https://code.google.com/p/gyp/issues/detail?id=260
- sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
- # less verbose install output (stating the same as portage, basically)
- sed -i -e "/print/d" tools/install.py || die
-
- # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
- local LIBDIR=$(get_libdir)
- sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
- sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
- # Avoid writing a depfile, not useful
- sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
- sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
- # debug builds. change install path, remove optimisations and override buildtype
- if use debug; then
- sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
- BUILDTYPE=Debug
- fi
-
- # We need to disable mprotect on two files when it builds Bug 694100.
- use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
- # All this test does is check if the npm CLI produces warnings of any sort,
- # failing if it does. Overkill, much? Especially given one possible warning
- # is that there is a newer version of npm available upstream (yes, it does
- # use the network if available), thus making it a real possibility for this
- # test to begin failing one day even though it was fine before.
- rm -f test/parallel/test-release-npm.js
-
- default
-}
-
-src_configure() {
- xdg_environment_reset
-
- # LTO compiler flags are handled by configure.py itself
- filter-flags '-flto*'
-
- local myconf=(
- --shared-brotli
- --shared-cares
- --shared-libuv
- --shared-nghttp2
- --shared-zlib
- )
- use debug && myconf+=( --debug )
- use lto && myconf+=( --enable-lto )
- if use system-icu; then
- myconf+=( --with-intl=system-icu )
- elif use icu; then
- myconf+=( --with-intl=full-icu )
- else
- myconf+=( --with-intl=none )
- fi
- use inspector || myconf+=( --without-inspector )
- use npm || myconf+=( --without-npm )
- use snapshot || myconf+=( --without-node-snapshot )
- if use ssl; then
- use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
- else
- myconf+=( --without-ssl )
- fi
-
- local myarch=""
- case ${ABI} in
- amd64) myarch="x64";;
- arm) myarch="arm";;
- arm64) myarch="arm64";;
- ppc64) myarch="ppc64";;
- x32) myarch="x32";;
- x86) myarch="ia32";;
- *) myarch="${ABI}";;
- esac
-
- GYP_DEFINES="linux_use_gold_flags=0
- linux_use_bundled_binutils=0
- linux_use_bundled_gold=0" \
- "${EPYTHON}" configure.py \
- --prefix="${EPREFIX}"/usr \
- --dest-cpu=${myarch} \
- $(use_with systemtap dtrace) \
- "${myconf[@]}" || die
-}
-
-src_compile() {
- emake -C out
-}
-
-src_install() {
- local LIBDIR="${ED}/usr/$(get_libdir)"
- default
-
- pax-mark -m "${ED}"/usr/bin/node
-
- # set up a symlink structure that node-gyp expects..
- dodir /usr/include/node/deps/{v8,uv}
- dosym . /usr/include/node/src
- for var in deps/{uv,v8}/include; do
- dosym ../.. /usr/include/node/${var}
- done
-
- if use doc; then
- docinto html
- dodoc -r "${S}"/doc/*
- fi
-
- if use npm; then
- dodir /etc/npm
-
- # Install bash completion for `npm`
- # We need to temporarily replace default config path since
- # npm otherwise tries to write outside of the sandbox
- local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
- sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
- local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
- "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
- newbashcomp "${tmp_npm_completion_file}" npm
- sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
- # Move man pages
- doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
- # Clean up
- rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
- rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
- local find_exp="-or -name"
- local find_name=()
- for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
- ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
- "*.md" "*.markdown" "*.bat" "*.cmd"; do
- find_name+=( ${find_exp} "${match}" )
- done
-
- # Remove various development and/or inappropriate files and
- # useless docs of dependend packages.
- find "${LIBDIR}"/node_modules \
- \( -type d -name examples \) -or \( -type f \( \
- -iname "LICEN?E*" \
- "${find_name[@]}" \
- \) \) -exec rm -rf "{}" \;
- fi
-
- mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
- if has usersandbox ${FEATURES}; then
- rm -f "${S}"/test/parallel/test-fs-mkdir.js
- ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
- "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
- fi
-
- out/${BUILDTYPE}/cctest || die
- "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-14.18.1.ebuild b/net-libs/nodejs/nodejs-14.19.0.ebuild
index 745a7dace6a..20db05ccbc2 100644
--- a/net-libs/nodejs/nodejs-14.18.1.ebuild
+++ b/net-libs/nodejs/nodejs-14.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]]; then
else
SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
SLOT="0/$(ver_cut 1)"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv ~x86 ~amd64-linux ~x64-macos"
+ KEYWORDS="amd64 ~arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos"
S="${WORKDIR}/node-v${PV}"
fi
@@ -50,10 +50,9 @@ BDEPEND="${PYTHON_DEPS}
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
- "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
+ "${FILESDIR}"/${P}-global-npm-config.patch
)
pkg_pretend() {
diff --git a/net-libs/nodejs/nodejs-16.13.0.ebuild b/net-libs/nodejs/nodejs-16.14.2.ebuild
index b7c26db64cb..d5a7de09fe1 100644
--- a/net-libs/nodejs/nodejs-16.13.0.ebuild
+++ b/net-libs/nodejs/nodejs-16.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]]; then
else
SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
SLOT="0/$(ver_cut 1)"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+ KEYWORDS="~amd64 ~arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
S="${WORKDIR}/node-v${PV}"
fi
@@ -96,7 +96,7 @@ src_prepare() {
fi
# We need to disable mprotect on two files when it builds Bug 694100.
- use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+ use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-16.4.2-paxmarking.patch )
# All this test does is check if the npm CLI produces warnings of any sort,
# failing if it does. Overkill, much? Especially given one possible warning
diff --git a/net-libs/nodejs/nodejs-16.9.1.ebuild b/net-libs/nodejs/nodejs-16.9.1.ebuild
deleted file mode 100644
index 895cf7cc0b4..00000000000
--- a/net-libs/nodejs/nodejs-16.9.1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/nodejs/node"
- SLOT="0"
-else
- SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
- SLOT="0/$(ver_cut 1)"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
- S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
- npm? ( ssl )
- system-icu? ( icu )
- system-ssl? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
- >=dev-libs/libuv-1.40.0:=
- >=net-dns/c-ares-1.17.2:=
- >=net-libs/nghttp2-1.41.0:=
- sys-libs/zlib
- system-icu? ( >=dev-libs/icu-67:= )
- system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
-BDEPEND="${PYTHON_DEPS}
- sys-apps/coreutils
- virtual/pkgconfig
- systemtap? ( dev-util/systemtap )
- test? ( net-misc/curl )
- pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
- "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
- "${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
-)
-
-pkg_pretend() {
- (use x86 && ! use cpu_flags_x86_sse2) && \
- die "Your CPU doesn't support the required SSE2 instruction."
-
- if [[ ${MERGE_TYPE} != "binary" ]]; then
- if use lto; then
- if tc-is-gcc; then
- if [[ $(gcc-major-version) -ge 11 ]]; then
- # Bug #787158
- die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
- fi
- fi
- fi
- fi
-}
-
-src_prepare() {
- tc-export AR CC CXX PKG_CONFIG
- export V=1
- export BUILDTYPE=Release
-
- # fix compilation on Darwin
- # https://code.google.com/p/gyp/issues/detail?id=260
- sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
- # less verbose install output (stating the same as portage, basically)
- sed -i -e "/print/d" tools/install.py || die
-
- # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
- local LIBDIR=$(get_libdir)
- sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
- sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
- # Avoid writing a depfile, not useful
- sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
- sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
- # debug builds. change install path, remove optimisations and override buildtype
- if use debug; then
- sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
- BUILDTYPE=Debug
- fi
-
- # We need to disable mprotect on two files when it builds Bug 694100.
- use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
- # All this test does is check if the npm CLI produces warnings of any sort,
- # failing if it does. Overkill, much? Especially given one possible warning
- # is that there is a newer version of npm available upstream (yes, it does
- # use the network if available), thus making it a real possibility for this
- # test to begin failing one day even though it was fine before.
- rm -f test/parallel/test-release-npm.js
-
- default
-}
-
-src_configure() {
- xdg_environment_reset
-
- # LTO compiler flags are handled by configure.py itself
- filter-flags '-flto*'
-
- local myconf=(
- --shared-brotli
- --shared-cares
- --shared-libuv
- --shared-nghttp2
- --shared-zlib
- )
- use debug && myconf+=( --debug )
- use lto && myconf+=( --enable-lto )
- if use system-icu; then
- myconf+=( --with-intl=system-icu )
- elif use icu; then
- myconf+=( --with-intl=full-icu )
- else
- myconf+=( --with-intl=none )
- fi
- use inspector || myconf+=( --without-inspector )
- use npm || myconf+=( --without-npm )
- use snapshot || myconf+=( --without-node-snapshot )
- if use ssl; then
- use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
- else
- myconf+=( --without-ssl )
- fi
-
- local myarch=""
- case ${ABI} in
- amd64) myarch="x64";;
- arm) myarch="arm";;
- arm64) myarch="arm64";;
- lp64*) myarch="riscv64";;
- ppc64) myarch="ppc64";;
- x32) myarch="x32";;
- x86) myarch="ia32";;
- *) myarch="${ABI}";;
- esac
-
- GYP_DEFINES="linux_use_gold_flags=0
- linux_use_bundled_binutils=0
- linux_use_bundled_gold=0" \
- "${EPYTHON}" configure.py \
- --prefix="${EPREFIX}"/usr \
- --dest-cpu=${myarch} \
- $(use_with systemtap dtrace) \
- "${myconf[@]}" || die
-}
-
-src_compile() {
- emake -C out
-}
-
-src_install() {
- local LIBDIR="${ED}/usr/$(get_libdir)"
- default
-
- pax-mark -m "${ED}"/usr/bin/node
-
- # set up a symlink structure that node-gyp expects..
- dodir /usr/include/node/deps/{v8,uv}
- dosym . /usr/include/node/src
- for var in deps/{uv,v8}/include; do
- dosym ../.. /usr/include/node/${var}
- done
-
- if use doc; then
- docinto html
- dodoc -r "${S}"/doc/*
- fi
-
- if use npm; then
- keepdir /etc/npm
-
- # Install bash completion for `npm`
- local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
- "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
- newbashcomp "${tmp_npm_completion_file}" npm
-
- # Move man pages
- doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
- # Clean up
- rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
- rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
- local find_exp="-or -name"
- local find_name=()
- for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
- ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
- "*.md" "*.markdown" "*.bat" "*.cmd"; do
- find_name+=( ${find_exp} "${match}" )
- done
-
- # Remove various development and/or inappropriate files and
- # useless docs of dependend packages.
- find "${LIBDIR}"/node_modules \
- \( -type d -name examples \) -or \( -type f \( \
- -iname "LICEN?E*" \
- "${find_name[@]}" \
- \) \) -exec rm -rf "{}" \;
- fi
-
- mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
- if has usersandbox ${FEATURES}; then
- rm -f "${S}"/test/parallel/test-fs-mkdir.js
- ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
- "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
- fi
-
- out/${BUILDTYPE}/cctest || die
- "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-16.10.0.ebuild b/net-libs/nodejs/nodejs-18.1.0.ebuild
index 895cf7cc0b4..f546bf353cf 100644
--- a/net-libs/nodejs/nodejs-16.10.0.ebuild
+++ b/net-libs/nodejs/nodejs-18.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]]; then
else
SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
SLOT="0/$(ver_cut 1)"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
S="${WORKDIR}/node-v${PV}"
fi
@@ -47,7 +47,6 @@ BDEPEND="${PYTHON_DEPS}
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
)
@@ -97,7 +96,7 @@ src_prepare() {
fi
# We need to disable mprotect on two files when it builds Bug 694100.
- use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+ use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.0.0-paxmarking.patch )
# All this test does is check if the npm CLI produces warnings of any sort,
# failing if it does. Overkill, much? Especially given one possible warning
diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
index a777910ea00..96ba317c4d8 100644
--- a/net-libs/ntirpc/Manifest
+++ b/net-libs/ntirpc/Manifest
@@ -1 +1,2 @@
DIST ntirpc-3.4.tar.gz 387376 BLAKE2B db4d0fd22f1ea46da6e40a613848f9fd396bd85cf01968f5ab976627ab787e8d1bc2a57a8bb87f2ffcaf63b8e59c6ea41145ed9ccafc66d4ba420a15c9a78901 SHA512 913bc9f3208ddb667a7fab6e06585ba15ac3dd1979a15846f49114f54a270c2174a00afc3009d6158851aed779046743dd1ea704227122079164c07b394c01ad
+DIST ntirpc-4.0.tar.gz 388389 BLAKE2B b997430a119c900cfd8792af530d7baec629d7afa076838ca22b83631a461df2f267c6b786582bbefc98db870d054f37c9e9c0c3201f9a130f3f3806168043c1 SHA512 7bafad650bcebbf53a9958abdcacb8dfa9ac46c9798ac39e82c2ae3215b3e5b5a6b916bb95e3c70e7bc1a09b26a46b00bad236b2400538e9695b1c347f0672d9
diff --git a/net-libs/ntirpc/metadata.xml b/net-libs/ntirpc/metadata.xml
index 32ce65debaa..39ab041d91a 100644
--- a/net-libs/ntirpc/metadata.xml
+++ b/net-libs/ntirpc/metadata.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
-</maintainer>
-<use>
- <flag name="gssapi">Include support for RPCSEC GSS</flag>
- <flag name="rdma">Include support for RDMA RPC</flag>
-</use>
-<upstream>
- <remote-id type="github">nfs-ganesha/ntirpc</remote-id>
-</upstream>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="gssapi">Include support for RPCSEC GSS</flag>
+ <flag name="rdma">Include support for RDMA RPC</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">nfs-ganesha/ntirpc</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-libs/ntirpc/ntirpc-3.4.ebuild b/net-libs/ntirpc/ntirpc-3.4-r1.ebuild
index 6e63e824706..e7d899f9943 100644
--- a/net-libs/ntirpc/ntirpc-3.4.ebuild
+++ b/net-libs/ntirpc/ntirpc-3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,8 +17,8 @@ IUSE="gssapi rdma"
# Since the GSS option only controls some extra files to be enabled,
# there's nothing to list in the depend string for it.
RDEPEND="
- dev-libs/userspace-rcu
- rdma? ( sys-fabric/librdmacm )
+ dev-libs/userspace-rcu:=
+ rdma? ( sys-cluster/rdma-core )
"
DEPEND="
${RDEPEND}
diff --git a/net-libs/ntirpc/ntirpc-4.0-r1.ebuild b/net-libs/ntirpc/ntirpc-4.0-r1.ebuild
new file mode 100644
index 00000000000..e7d899f9943
--- /dev/null
+++ b/net-libs/ntirpc/ntirpc-4.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
+HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
+SRC_URI="https://github.com/nfs-ganesha/ntirpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gssapi rdma"
+
+# Since the GSS option only controls some extra files to be enabled,
+# there's nothing to list in the depend string for it.
+RDEPEND="
+ dev-libs/userspace-rcu:=
+ rdma? ( sys-cluster/rdma-core )
+"
+DEPEND="
+ ${RDEPEND}
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_GSS="$(usex gssapi)"
+ -DUSE_RPC_RDMA="$(usex rdma)"
+ )
+ cmake_src_configure
+}
diff --git a/net-libs/obby/Manifest b/net-libs/obby/Manifest
deleted file mode 100644
index 9f3d472062e..00000000000
--- a/net-libs/obby/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST obby-0.4.8.tar.gz 530525 BLAKE2B 81a309763a0720139e91670e03d5107da13ab097e2443b7882c774cfcea1c1a9f8a084e7214590fadc1402c490dcabc9db36a8d9d7090955617980c0732f2b5f SHA512 39cd01e74f8df805bd6f077afab023f70f6da16d421dd0d12abc82972a9ec3e2563cc4ef6bf99c74b59f1c96e18eb3d5065f8b07add8ecb56c26601715f184d0
diff --git a/net-libs/obby/metadata.xml b/net-libs/obby/metadata.xml
deleted file mode 100644
index bef24d2c233..00000000000
--- a/net-libs/obby/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-libs/obby/obby-0.4.8-r1.ebuild b/net-libs/obby/obby-0.4.8-r1.ebuild
deleted file mode 100644
index e6086411026..00000000000
--- a/net-libs/obby/obby-0.4.8-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic multilib
-
-DESCRIPTION="Library for collaborative text editing"
-HOMEPAGE="http://gobby.0x539.de/"
-SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="ipv6 nls static-libs zeroconf"
-
-RDEPEND="
- net-libs/net6
- dev-libs/libsigc++:2
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
-"
-
-src_configure() {
- append-cxxflags -std=c++11
- econf \
- $(use_enable ipv6) \
- $(use_enable nls) \
- $(use_enable static-libs static) \
- $(use_with zeroconf)
-}
-
-src_install() {
- default
- use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib${PN}.la
-}
diff --git a/net-libs/onion/Manifest b/net-libs/onion/Manifest
deleted file mode 100644
index 18f3c70c622..00000000000
--- a/net-libs/onion/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST onion-0.8.tar.gz 344347 BLAKE2B c43bbbf31d29ccc99d2969c7c8dc9aec8d5e514cc785091e3e0e6d1fc1d5db5f8561d5c2c745b4150a493b607c6c271d669e7ca541f72bf4d8872beeba00b220 SHA512 c40a36346de7dee6e98d0b5c38b5e133606046e29bacb06a0055a361013077ec0f6adb04dfcbf2f4ce0b72317c9ed918573299aed8760f069dcfd7c211a302d7
diff --git a/net-libs/onion/files/protos.patch b/net-libs/onion/files/protos.patch
deleted file mode 100644
index 59050a95c4e..00000000000
--- a/net-libs/onion/files/protos.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Prototypes do not match, fixes some build failures.
-
-Index: onion-0.8/src/onion/poller_libev.c
-===================================================================
---- onion-0.8.orig/src/onion/poller_libev.c
-+++ onion-0.8/src/onion/poller_libev.c
-@@ -75,7 +75,7 @@ void onion_poller_slot_set_timeout(onion
- el->timeout=timeout_ms;
- }
- /// Sets the polling type: read/write/other. O_POLL_READ | O_POLL_WRITE | O_POLL_OTHER
--void onion_poller_slot_set_type(onion_poller_slot *el, int type){
-+void onion_poller_slot_set_type(onion_poller_slot *el, onion_poller_slot_type_e type){
- el->type=0;
- if (type&O_POLL_READ)
- el->type|=EV_READ;
-Index: onion-0.8/src/onion/poller_libevent.c
-===================================================================
---- onion-0.8.orig/src/onion/poller_libevent.c
-+++ onion-0.8/src/onion/poller_libevent.c
-@@ -77,7 +77,7 @@ void onion_poller_slot_set_timeout(onion
- el->timeout=timeout_ms;
- }
- /// Sets the polling type: read/write/other. O_POLL_READ | O_POLL_WRITE | O_POLL_OTHER
--void onion_poller_slot_set_type(onion_poller_slot *el, int type){
-+void onion_poller_slot_set_type(onion_poller_slot *el, onion_poller_slot_type_e type){
- el->type=EV_PERSIST;
- if (type&O_POLL_READ)
- el->type|=EV_READ;
diff --git a/net-libs/onion/metadata.xml b/net-libs/onion/metadata.xml
deleted file mode 100644
index a9a869a84ec..00000000000
--- a/net-libs/onion/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>aballier@gentoo.org</email>
- <name>Alexis Ballier</name>
- </maintainer>
- <use>
- <flag name="libev">Use <pkg>dev-libs/libev</pkg> as thread poller instead of Linux's epoll.</flag>
- <flag name="libevent">Use <pkg>dev-libs/libevent</pkg> as thread poller instead of libev or Linux's epoll.</flag>
- <flag name="boehm-gc">Add <pkg>dev-libs/boehm-gc</pkg> support for memory allocations.</flag>
- <flag name="redis">Add support for redis sessions.</flag>
- </use>
- <upstream>
- <remote-id type="github">davidmoreno/onion</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-libs/onion/onion-0.8.ebuild b/net-libs/onion/onion-0.8.ebuild
deleted file mode 100644
index a283da472b8..00000000000
--- a/net-libs/onion/onion-0.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/davidmoreno/onion"
-fi
-
-inherit ${SCM} cmake-utils
-
-DESCRIPTION="C library to create simple HTTP servers and Web Applications"
-HOMEPAGE="https://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-else
- KEYWORDS="~amd64"
- SRC_URI="https://github.com/davidmoreno/onion/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="|| ( GPL-2+ Apache-2.0 ) AGPL-3"
-SLOT="0"
-IUSE="
- gnutls pam png jpeg xml systemd sqlite boehm-gc
- test examples cxx libev libevent
- redis
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= )
- pam? ( sys-libs/pam )
- png? ( media-libs/libpng:0= x11-libs/cairo )
- jpeg? ( virtual/jpeg:0 )
- xml? ( dev-libs/libxml2:2 sys-libs/zlib )
- systemd? ( sys-apps/systemd )
- sqlite? ( dev-db/sqlite:3 )
- boehm-gc? ( dev-libs/boehm-gc )
- libev? ( dev-libs/libev )
- !libev? ( libevent? ( dev-libs/libevent ) )
- redis? ( dev-libs/hiredis )
-"
-DEPEND="${RDEPEND}
- test? ( net-misc/curl )
-"
-REQUIRED_USE="test? ( examples )"
-
-PATCHES=( "${FILESDIR}/protos.patch" )
-
-src_configure() {
- use test || echo '' > tests/CMakeLists.txt
- local mycmakeargs=(
- "-DONION_USE_SSL=$(usex gnutls)"
- "-DONION_USE_PAM=$(usex pam)"
- "-DONION_USE_PNG=$(usex png)"
- "-DONION_USE_JPEG=$(usex jpeg)"
- "-DONION_USE_XML2=$(usex xml)"
- "-DONION_USE_SYSTEMD=$(usex systemd)"
- "-DONION_USE_SQLITE3=$(usex sqlite)"
- "-DONION_USE_GC=$(usex boehm-gc)"
- "-DONION_USE_TESTS=$(usex test)"
- "-DONION_EXAMPLES=$(usex examples)"
- "-DONION_USE_BINDINGS_CPP=$(usex cxx)"
- "-DONION_USE_REDIS=$(usex redis)"
- "-DONION_POLLER=$(usex libev libev "$(usex libevent libevent default)")"
- )
- cmake-utils_src_configure
-}
diff --git a/net-libs/onion/onion-9999.ebuild b/net-libs/onion/onion-9999.ebuild
deleted file mode 100644
index 10ba2b76bbf..00000000000
--- a/net-libs/onion/onion-9999.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/davidmoreno/onion"
-fi
-
-inherit ${SCM} cmake-utils
-
-DESCRIPTION="C library to create simple HTTP servers and Web Applications"
-HOMEPAGE="https://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-else
- KEYWORDS="~amd64"
- SRC_URI="https://github.com/davidmoreno/onion/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="|| ( GPL-2+ Apache-2.0 ) AGPL-3"
-SLOT="0"
-IUSE="
- gnutls pam png jpeg xml systemd sqlite boehm-gc
- test examples cxx libev libevent
- redis
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= )
- pam? ( sys-libs/pam )
- png? ( media-libs/libpng:0= x11-libs/cairo )
- jpeg? ( virtual/jpeg:0 )
- xml? ( dev-libs/libxml2:2 sys-libs/zlib )
- systemd? ( sys-apps/systemd )
- sqlite? ( dev-db/sqlite:3 )
- boehm-gc? ( dev-libs/boehm-gc )
- libev? ( dev-libs/libev )
- !libev? ( libevent? ( dev-libs/libevent ) )
- redis? ( dev-libs/hiredis )
-"
-DEPEND="${RDEPEND}
- test? ( net-misc/curl )
-"
-REQUIRED_USE="test? ( examples )"
-
-src_configure() {
- use test || echo '' > tests/CMakeLists.txt
- local mycmakeargs=(
- "-DONION_USE_SSL=$(usex gnutls)"