summaryrefslogtreecommitdiff
path: root/net-libs
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/libpcap/libpcap-1.9.1-r3.ebuild2
-rw-r--r--net-libs/libproxy/Manifest1
-rw-r--r--net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch85
-rw-r--r--net-libs/libproxy/libproxy-0.4.16.ebuild81
-rw-r--r--net-libs/librsync/Manifest6
-rw-r--r--net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch15
-rw-r--r--net-libs/librsync/files/librsync-0.9.7-format-security.patch20
-rw-r--r--net-libs/librsync/files/librsync-0.9.7-getopt.patch17
-rw-r--r--net-libs/librsync/files/librsync-0.9.7-huge-files.patch31
-rw-r--r--net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch19
-rw-r--r--net-libs/librsync/files/librsync-2.0.1-libdir.patch15
-rw-r--r--net-libs/librsync/librsync-0.9.7-r3.ebuild36
-rw-r--r--net-libs/librsync/librsync-2.0.1-r1.ebuild27
-rw-r--r--net-libs/librsync/librsync-2.0.2.ebuild27
-rw-r--r--net-libs/librsync/librsync-2.1.0.ebuild27
-rw-r--r--net-libs/librsync/librsync-2.2.1.ebuild27
-rw-r--r--net-libs/librsync/librsync-2.3.0.ebuild27
-rw-r--r--net-libs/librsync/librsync-2.3.1.ebuild2
-rw-r--r--net-libs/libslirp/Manifest1
-rw-r--r--net-libs/libslirp/libslirp-4.3.1-r1.ebuild2
-rw-r--r--net-libs/libslirp/libslirp-4.4.0.ebuild35
-rw-r--r--net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild2
-rw-r--r--net-libs/pjproject/metadata.xml8
-rw-r--r--net-libs/pjproject/pjproject-2.10-r1.ebuild (renamed from net-libs/pjproject/pjproject-2.10.ebuild)5
-rw-r--r--net-libs/signon-oauth2/signon-oauth2-0.25.ebuild2
25 files changed, 214 insertions, 306 deletions
diff --git a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
index b6903a431f01..d4e1a7d59bc3 100644
--- a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
RDEPEND="
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index a35afe3e3158..d879cde8ceec 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1 +1,2 @@
DIST libproxy-0.4.15.tar.gz 93084 BLAKE2B 9aa86403eaf4e1791958013c2739e251c61f11da40e66b3296b33a7f380828895f621175add5efb3cd17222ff016941801c25c2d70c19ef3a6652510268a0b3d SHA512 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b
+DIST libproxy-0.4.16.tar.gz 95534 BLAKE2B 163f4fa359758a2186802683005b7d2bbd68933d2512f2c4a284912b6d07e3aa288613e3b473d1bd8d9fe941033da634490c78367692a489da31184dd4dc3cb8 SHA512 28bca7c86e486d08ddc1699e562dd98366b569ec9a7a965f7d15d265ede508575e6eae43abde1778f46d55c3304d32218d891d01ba6a8c360820412748ed5ca1
diff --git a/net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch
new file mode 100644
index 000000000000..4a287955bbaf
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch
@@ -0,0 +1,85 @@
+From 703ac16ea2b508dc16d433b3fd597fcd496d05c1 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 29 Apr 2013 23:02:25 -0400
+Subject: [PATCH] Avoid build-time dependency on NetworkManager
+
+Needed to prevent a dependency loop:
+nm -> libsoup -> glib-networking -> libproxy -> nm
+
+https://bugs.gentoo.org/467696
+
+* asturm@gentoo.org: Rebased on top of 0.4.15
+ also revert 423801295921ab1ec0d98565fcbc2635088d45da
+* sam@gentoo.org: Rebased on top of 0.4.16
+ (same revert included)
+---
+ libproxy/cmake/modules.cmk | 6 ++---
+ .../cmake/modules/network_networkmanager.cmk | 5 +---
+ libproxy/modules/network_networkmanager.cpp | 23 ++++++++++++++-----
+ 3 files changed, 21 insertions(+), 13 deletions(-)
+
+diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk
+index 11d2d43..cc2b58f 100644
+--- a/libproxy/cmake/modules.cmk
++++ b/libproxy/cmake/modules.cmk
+@@ -40,10 +40,10 @@ px_module(config_w32reg "${WIN32}" 1)
+ px_module(ignore_domain 1 1)
+ px_module(ignore_hostname 1 1)
+ px_module(ignore_ip 1 1)
+-if(NM_FOUND OR NMold_FOUND)
++if(NM_FOUND)
+ set(NM_BUILD 1)
+-endif(NM_FOUND OR NMold_FOUND)
+-px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES}${NMold_LIBRARIES})
++endif(NM_FOUND)
++px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES})
+ px_module(pacrunner_mozjs 0 ${BIPR} ${MOZJS_LIBRARIES})
+ px_module(pacrunner_natus "${NATUS_FOUND}" ${BIPR} ${NATUS_LIBRARIES})
+ px_module(pacrunner_webkit "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES})
+diff --git a/libproxy/cmake/modules/network_networkmanager.cmk b/libproxy/cmake/modules/network_networkmanager.cmk
+index 6ef6ead..2586bbd 100644
+--- a/libproxy/cmake/modules/network_networkmanager.cmk
++++ b/libproxy/cmake/modules/network_networkmanager.cmk
+@@ -1,6 +1,3 @@
+ if (NOT WIN32 AND NOT APPLE)
+- px_check_modules(NM libnm dbus-1)
+- if (NOT NM_FOUND)
+- px_check_modules(NMold NetworkManager dbus-1)
+- endif (NOT NM_FOUND)
++ px_check_modules(NM dbus-1)
+ endif()
+diff --git a/libproxy/modules/network_networkmanager.cpp b/libproxy/modules/network_networkmanager.cpp
+index 546a8ee..317f1ab 100644
+--- a/libproxy/modules/network_networkmanager.cpp
++++ b/libproxy/modules/network_networkmanager.cpp
+@@ -23,13 +23,24 @@
+ using namespace libproxy;
+
+ #include <dbus/dbus.h>
+-#include <NetworkManager.h>
+
+-// Backwards compatibility: with the switch to libnm, NM_STATE_CONNECTED is no
+-// longer defined. NM_STATE_CONNECTED_GLOBAL appeared with NM 0.9 and was aliased
+-#ifndef NM_STATE_CONNECTED
+- #define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
+-#endif
++/*
++ * copy-pasted from NetworkManager-1.26.0's NetworkManager.h to prevent
++ * a circular dependency; https://bugs.gentoo.org/467696
++ */
++#define NM_DBUS_PATH "/org/freedesktop/NetworkManager"
++#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
++typedef enum {
++ NM_STATE_UNKNOWN = 0,
++ NM_STATE_ASLEEP = 10,
++ NM_STATE_DISCONNECTED = 20,
++ NM_STATE_DISCONNECTING = 30,
++ NM_STATE_CONNECTING = 40,
++ NM_STATE_CONNECTED_LOCAL = 50,
++ NM_STATE_CONNECTED_SITE = 60,
++ NM_STATE_CONNECTED_GLOBAL = 70,
++} NMState;
++#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
+
+ class networkmanager_network_extension : public network_extension {
+ public:
diff --git a/net-libs/libproxy/libproxy-0.4.16.ebuild b/net-libs/libproxy/libproxy-0.4.16.ebuild
new file mode 100644
index 000000000000..1373ea5f58a0
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.4.16.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic mono-env
+
+DESCRIPTION="Library for automatic proxy configuration management"
+HOMEPAGE="https://github.com/libproxy/libproxy"
+SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="gnome kde mono networkmanager spidermonkey test webkit"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+ mono? ( dev-lang/mono )
+ networkmanager? ( sys-apps/dbus:0[${MULTILIB_USEDEP}] )
+ spidermonkey? ( >=dev-lang/spidermonkey-52.0.0:= )
+ webkit? ( net-libs/webkit-gtk:4 )
+"
+RDEPEND="${DEPEND}
+ kde? ( kde-frameworks/kconfig:5 )
+"
+# avoid dependency loop, bug #467696
+PDEPEND="networkmanager? ( net-misc/networkmanager )"
+
+PATCHES=(
+ # get-pac-test freezes when run by the ebuild, succeeds when building
+ # manually; virtualx.eclass doesn't help :(
+ "${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch"
+
+ # https://github.com/libproxy/libproxy/issues/27
+ "${FILESDIR}/${PN}-0.4.12-macosx.patch"
+
+ # prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
+ # https://github.com/libproxy/libproxy/issues/28
+ "${FILESDIR}/${P}-avoid-nm-build-dep.patch"
+)
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_C_FLAGS="${CFLAGS}"
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+ -DWITH_NATUS=OFF
+ -DWITH_PYTHON2=OFF
+ # WITH_VALA just copies the .vapi file over and needs no deps,
+ # hence always enable it unconditionally
+ -DWITH_VALA=ON
+ -DWITH_WEBKIT=OFF
+ $(multilib_is_native_abi && usex mono -DGMCS_EXECUTABLE="${EPREFIX}"/usr/bin/mcs)
+ -DWITH_GNOME3=$(usex gnome)
+ -DWITH_KDE=$(usex kde)
+ -DWITH_DOTNET=$(multilib_is_native_abi && usex mono || echo OFF)
+ -DWITH_NM=$(usex networkmanager)
+ -DWITH_PERL=OFF # bug 705410, uses reserved target name "test"
+ -DWITH_PYTHON3=OFF # Major issue: https://github.com/libproxy/libproxy/issues/65
+ -DWITH_MOZJS=$(multilib_is_native_abi && usex spidermonkey || echo OFF)
+ -DBUILD_TESTING=$(usex test)
+ -DWITH_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo OFF)
+ )
+ cmake_src_configure
+}
+
+src_configure() {
+ [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_install_all() {
+ doman "${FILESDIR}"/proxy.1
+}
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 6411f3fc572d..a27831503d99 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -1,7 +1 @@
-DIST librsync-0.9.7.tar.gz 453802 BLAKE2B 0f8a7a758d847498876401aa04473946970be0257dc0cc4abce85adc7adb5d480d7a41e03d43f667e44ec646ce74a75dfa6b0c63c7f239338244b67eb432e31f SHA512 339362fd01c94411849d3e4a6e95db1bef6cffa0475b1af49d73f11be0421a12d4c73ecbf1a272af01b2a21cec81b4a801c1f7d735e107d0242707fb4c45f9ef
-DIST librsync-2.0.1.tar.gz 169765 BLAKE2B 3b3a109307dc03e567338709f1c3958a2ae7887165208848359677305f6a983edc1bc71c721dd3f414f77e0507426ae5bb59b9fde51595a92379227ac316127a SHA512 70c1ed0f3a8ad8c1201ce67b5411c4aabb4c78ba9d60e4ee658d9a8818c6511322abd53b583869b8927a29b0f105e1a5c9b05efa748eb435e8fc3b7be3344e04
-DIST librsync-2.0.2.tar.gz 174480 BLAKE2B e77d554ad08a852459fe2798249f47ca7f26849b4b8622c5b64f7f9b6d23f1fedc443f747c7988679a3548ea1f6fd2902c424717faaf73a5cfd7e19012a2d72d SHA512 5d2bc1d62b37e9ed7416203615d0a0e3c05c4c884b5da63eda10dd5c985845b500331bce226e4d45676729382c85b41528282e25d491afda31ba434ac0fefad7
-DIST librsync-2.1.0.tar.gz 175630 BLAKE2B effd2a8c79fae202921220db7581be1d9f7d278e6ee5155a23e586d9d4a7a27bbc4a50049ddca3b187a8e08451c6dcde7340d22be9fde0c2c12462392043fd8e SHA512 9b91f4b696c1d1cdacb5c0679c7df7a92641e0a6a599c2e5de2bc0af3052b2045bb16c40b072c40859074d792c78c57afb0817917fa9843b179befa4506ebf04
-DIST librsync-2.2.1.tar.gz 180649 BLAKE2B 6dd97a7f140655317c5258d9588ba831716a8909c0d145665b742640a02b317f8736c05b04106f7a221726680f9ccf0ec1bd9a7f760851a993b7783f93193804 SHA512 6581a4285ebcfa1c4dfecac2d6796dab736a4c66a7fb82863c778506073446d9a113d39de7eb29e845a484646f1d8fec29019338bce31a091b0acdc461ab1bcd
-DIST librsync-2.3.0.tar.gz 192493 BLAKE2B c9bb0f211d0d579bec3b7236cfac0ec1dcca6b87458c823430c588b4398b06a559e55e3b9ff8a9f635f7e79bb9c57fbb4b301b55c51c3a694287051557b45a16 SHA512 49b2243b7515a6e69abce438a27515a35ecfe327aee849514af539975418d24b7be2d2c2f8c753860f43bf9596c6a7833694e7d94c30f14093aa12363e0d7ffc
DIST librsync-2.3.1.tar.gz 194573 BLAKE2B e18c5d76b45701d881f64bf642ec40844bca507b99ab3161b1bf9446a7a0e2cc954d5d5b37a0d8894fabde2a8f6e2896ef1fc51942cf5c40b2f8a1bb94c20ee0 SHA512 89e5b5ad960b8036acce41df09f5e50601d7eb57d48a2bd21c4ee54a3a375f62ee514036b9a562277b5656735b84cadf6f54cbf48c364bbf0c04f2d95ae3b5a6
diff --git a/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch b/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch
deleted file mode 100644
index e87c3d8f67b5..000000000000
--- a/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix running tests with the parallel harness
-Author: Andrey Rahmatullin <wrar@wrar.name>
-Last-Update: 2013-06-26
-
---- a/testsuite/Makefile.am
-+++ b/testsuite/Makefile.am
-@@ -29,7 +29,7 @@ isprefix_driver_LDADD = ../isprefix.o # XXX: should link replaced functions
- # failed. Generally these tests should be ordered so that more basic
- # tests are run first.
-
--TESTS_ENVIRONMENT = $(SH) $(srcdir)/driver.sh
-+TEST_LOG_COMPILER = $(SH) $(srcdir)/driver.sh
-
- TESTS = \
- signature.test mutate.test sources.test isprefix.test \
diff --git a/net-libs/librsync/files/librsync-0.9.7-format-security.patch b/net-libs/librsync/files/librsync-0.9.7-format-security.patch
deleted file mode 100644
index e35980a4d7a0..000000000000
--- a/net-libs/librsync/files/librsync-0.9.7-format-security.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Always use a format string in printf
- Fix the warning: buf.c:216:9: error: format not a string literal and no
- format arguments [-Werror=format-security]
-Author: Andrey Rahmatullin <wrar@wrar.name>
-Forwarded: no
-Last-Update: 2012-02-05
-
-diff --git a/buf.c b/buf.c
-index 7f4e7a0..3a83f2b 100644
---- a/buf.c
-+++ b/buf.c
-@@ -213,7 +213,7 @@ rs_result rs_file_copy_cb(void *arg, rs_long_t pos, size_t *len, void **buf)
-
- got = fread(*buf, 1, *len, f);
- if (got == -1) {
-- rs_error(strerror(errno));
-+ rs_error("%s", strerror(errno));
- return RS_IO_ERROR;
- } else if (got == 0) {
- rs_error("unexpected eof on fd%d", fileno(f));
diff --git a/net-libs/librsync/files/librsync-0.9.7-getopt.patch b/net-libs/librsync/files/librsync-0.9.7-getopt.patch
deleted file mode 100644
index 0859089b970a..000000000000
--- a/net-libs/librsync/files/librsync-0.9.7-getopt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Patch by Daniel Baumann <daniel@debian.org> for librsync >= 0.9.7, which makes
-rdiff aware of -i and -z getopt options mentioned in --help output. For further
-information, please have a look to Debian bug ID #435894.
-
---- librsync-0.9.7/rdiff.c 2004-09-17 23:35:50.000000000 +0200
-+++ librsync-0.9.7/rdiff.c.getopt 2008-12-20 13:45:58.000000000 +0100
-@@ -97,8 +97,8 @@
- { "sum-size", 'S', POPT_ARG_INT, &strong_len },
- { "statistics", 's', POPT_ARG_NONE, &show_stats },
- { "stats", 0, POPT_ARG_NONE, &show_stats },
-- { "gzip", 0, POPT_ARG_NONE, 0, OPT_GZIP },
-- { "bzip2", 0, POPT_ARG_NONE, 0, OPT_BZIP2 },
-+ { "gzip", 'z', POPT_ARG_NONE, 0, OPT_GZIP },
-+ { "bzip2", 'i', POPT_ARG_NONE, 0, OPT_BZIP2 },
- { "paranoia", 0, POPT_ARG_NONE, &rs_roll_paranoia },
- { 0 }
- };
diff --git a/net-libs/librsync/files/librsync-0.9.7-huge-files.patch b/net-libs/librsync/files/librsync-0.9.7-huge-files.patch
deleted file mode 100644
index fef08941a44f..000000000000
--- a/net-libs/librsync/files/librsync-0.9.7-huge-files.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -urN librsync-0.9.7/mdfour.h librsync-0.9.7dev/mdfour.h
---- librsync-0.9.7/mdfour.h 2004-02-07 18:17:57.000000000 -0500
-+++ librsync-0.9.7dev/mdfour.h 2006-03-06 03:21:46.000000000 -0500
-@@ -24,7 +24,7 @@
- #include "types.h"
-
- struct rs_mdfour {
-- int A, B, C, D;
-+ unsigned int A, B, C, D;
- #if HAVE_UINT64
- uint64_t totalN;
- #else
-diff -urN librsync-0.9.7/patch.c librsync-0.9.7dev/patch.c
---- librsync-0.9.7/patch.c 2004-09-17 17:35:50.000000000 -0400
-+++ librsync-0.9.7dev/patch.c 2006-03-06 03:21:06.000000000 -0500
-@@ -214,12 +214,12 @@
- void *buf, *ptr;
- rs_buffers_t *buffs = job->stream;
-
-- len = job->basis_len;
--
- /* copy only as much as will fit in the output buffer, so that we
- * don't have to block or store the input. */
-- if (len > buffs->avail_out)
-+ if (job->basis_len > buffs->avail_out)
- len = buffs->avail_out;
-+ else
-+ len = job->basis_len;
-
- if (!len)
- return RS_BLOCKED;
diff --git a/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch b/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch
deleted file mode 100644
index 782597c8fe2b..000000000000
--- a/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix -Wimplicit-function-declaration warning in the test suite
- Fix the warning: isprefix.driver.c:43:5: warning: implicit declaration of
- function ‘strcmp’ [-Wimplicit-function-declaration]
-Author: Andrey Rahmatullin <wrar@wrar.name>
-Forwarded: no
-Last-Update: 2012-02-05
-
-diff --git a/testsuite/isprefix.driver.c b/testsuite/isprefix.driver.c
-index a9fd77b..df558c2 100644
---- a/testsuite/isprefix.driver.c
-+++ b/testsuite/isprefix.driver.c
-@@ -21,6 +21,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
-
- #include "isprefix.h"
-
diff --git a/net-libs/librsync/files/librsync-2.0.1-libdir.patch b/net-libs/librsync/files/librsync-2.0.1-libdir.patch
deleted file mode 100644
index 50460dfdbf12..000000000000
--- a/net-libs/librsync/files/librsync-2.0.1-libdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f40bf1d..b123d09 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -333,5 +333,9 @@ endif (ENABLE_COMPRESSION)
- set_target_properties(rsync PROPERTIES VERSION ${LIBRSYNC_VERSION}
- SOVERSION ${LIBRSYNC_MAJOR_VERSION})
--install(TARGETS rsync ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION lib)
-+
-+if (NOT TARGET_LIBDIR)
-+ set(TARGET_LIBDIR lib)
-+endif()
-+install(TARGETS rsync ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${TARGET_LIBDIR})
-
-
diff --git a/net-libs/librsync/librsync-0.9.7-r3.ebuild b/net-libs/librsync/librsync-0.9.7-r3.ebuild
deleted file mode 100644
index cb7a0da16ce7..000000000000
--- a/net-libs/librsync/librsync-0.9.7-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Flexible remote checksum-based differencing"
-HOMEPAGE="https://librsync.github.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-huge-files.patch
- "${FILESDIR}"/${P}-format-security.patch
- "${FILESDIR}"/${P}-getopt.patch
- "${FILESDIR}"/${P}-implicit-declaration.patch
- "${FILESDIR}"/${P}-fix-testsuite.patch
- )
-
-src_prepare() {
- sed \
- -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
- -i configure.ac || die
-
- autotools-utils_src_prepare
-}
diff --git a/net-libs/librsync/librsync-2.0.1-r1.ebuild b/net-libs/librsync/librsync-2.0.1-r1.ebuild
deleted file mode 100644
index 5d28a19d5528..000000000000
--- a/net-libs/librsync/librsync-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Remote delta-compression library"
-HOMEPAGE="https://librsync.github.io/"
-SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}"
-
-PATCHES=("${FILESDIR}"/${PN}-2.0.1-libdir.patch)
-
-src_configure() {
- local mycmakeargs=(
- -DTARGET_LIBDIR=$(get_libdir)
- )
-
- cmake-utils_src_configure
-}
diff --git a/net-libs/librsync/librsync-2.0.2.ebuild b/net-libs/librsync/librsync-2.0.2.ebuild
deleted file mode 100644
index 17d5c77e925e..000000000000
--- a/net-libs/librsync/librsync-2.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Remote delta-compression library"
-HOMEPAGE="https://librsync.github.io/"
-SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="
- dev-libs/popt
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_LIBB2=OFF
- )
-
- cmake-utils_src_configure
-}
diff --git a/net-libs/librsync/librsync-2.1.0.ebuild b/net-libs/librsync/librsync-2.1.0.ebuild
deleted file mode 100644
index 755db27d3f54..000000000000
--- a/net-libs/librsync/librsync-2.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Remote delta-compression library"
-HOMEPAGE="https://librsync.github.io/"
-SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="
- dev-libs/popt
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_LIBB2=OFF
- )
-
- cmake-utils_src_configure
-}
diff --git a/net-libs/librsync/librsync-2.2.1.ebuild b/net-libs/librsync/librsync-2.2.1.ebuild
deleted file mode 100644
index 4a6965cbd509..000000000000
--- a/net-libs/librsync/librsync-2.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Remote delta-compression library"
-HOMEPAGE="https://librsync.github.io/"
-SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="
- dev-libs/popt
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_LIBB2=OFF
- )
-
- cmake-utils_src_configure
-}
diff --git a/net-libs/librsync/librsync-2.3.0.ebuild b/net-libs/librsync/librsync-2.3.0.ebuild
deleted file mode 100644
index 4a6965cbd509..000000000000
--- a/net-libs/librsync/librsync-2.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Remote delta-compression library"
-HOMEPAGE="https://librsync.github.io/"
-SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="
- dev-libs/popt
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_LIBB2=OFF
- )
-
- cmake-utils_src_configure
-}
diff --git a/net-libs/librsync/librsync-2.3.1.ebuild b/net-libs/librsync/librsync-2.3.1.ebuild
index 43ebd4460f32..04df479a54d5 100644
--- a/net-libs/librsync/librsync-2.3.1.ebuild
+++ b/net-libs/librsync/librsync-2.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="LGPL-2.1"
SLOT="0/2.2"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="
dev-libs/popt
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
index b508e930c3ea..eaa6c1a9a550 100644
--- a/net-libs/libslirp/Manifest
+++ b/net-libs/libslirp/Manifest
@@ -1 +1,2 @@
DIST libslirp-4.3.1.tar.gz 127008 BLAKE2B de40980521a54367fda73b9a67a80159ff14e8ea073086d8df3b42028ffe778b62f0aabe2b3f0929e168c73c453a8eda3fe0bb866d22de5b0712775e9cece19f SHA512 fa38a5e508b00802538f8466b8b52fc4842d6f7f74caa399db1011c15bb37198678415147327a606e3f259fd5def9390012df1d4dc76e8869e9bb77ca6514005
+DIST libslirp-4.4.0.tar.gz 128453 BLAKE2B da747071c22522649627dd8b2e1cd621129a6898b2391d0da2a8f032068f129d11de3dc0e0f94ac38b36c79e2cc0c9508a3bd3e9a07beca914219146c82faec0 SHA512 27f5d41730a3070df4ead1af4ec42fdff141289e5072ec93053b9236d9197bc3f1a3a804c85eef08458ab47a0d4921457df57ece5aae42cab9f068ccda31f3ee
diff --git a/net-libs/libslirp/libslirp-4.3.1-r1.ebuild b/net-libs/libslirp/libslirp-4.3.1-r1.ebuild
index 90da793ff230..a8d758fa596d 100644
--- a/net-libs/libslirp/libslirp-4.3.1-r1.ebuild
+++ b/net-libs/libslirp/libslirp-4.3.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit meson
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc ~ppc64 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 general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
diff --git a/net-libs/libslirp/libslirp-4.4.0.ebuild b/net-libs/libslirp/libslirp-4.4.0.ebuild
new file mode 100644
index 000000000000..013229b4fd9c
--- /dev/null
+++ b/net-libs/libslirp/libslirp-4.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~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 general purpose TCP-IP emulator used by virtual machine hypervisors 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() {
+ default
+ echo "${PV}" > .tarball-version || die
+ echo -e "#!${BASH}\necho -n \$(cat '${S}/.tarball-version')" > build-aux/git-version-gen || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddefault_library=$(usex static-libs both shared)
+ )
+ meson_src_configure
+}
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
index c1581eabfdf5..4a48f8ae0e73 100644
--- a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://mcabber.com/files/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~ppc-macos"
IUSE="asyncns ssl openssl static-libs test"
RESTRICT="!test? ( test )"
diff --git a/net-libs/pjproject/metadata.xml b/net-libs/pjproject/metadata.xml
index c3ca056701df..ab734f781b49 100644
--- a/net-libs/pjproject/metadata.xml
+++ b/net-libs/pjproject/metadata.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="project">
+ <email>dev@liguros.net</email>
+ <name>Development</name>
+ </maintainer>
<maintainer type="person">
<email>jaco@uls.co.za</email>
<name>Jaco Kroon</name>
</maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
<use>
<flag name="amr">Inlcude AMR codec in the build</flag>
<flag name="epoll">Use /dev/epoll ioqueue on Linux (experimental)</flag>
diff --git a/net-libs/pjproject/pjproject-2.10.ebuild b/net-libs/pjproject/pjproject-2.10-r1.ebuild
index bd06ed552f6d..cb8904e54ee8 100644
--- a/net-libs/pjproject/pjproject-2.10.ebuild
+++ b/net-libs/pjproject/pjproject-2.10-r1.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2020 Liguros Authors
# Distributed under the terms of the GNU General Public License v2
-
EAPI=7
inherit autotools flag-o-matic
@@ -30,7 +29,7 @@ RDEPEND="net-libs/libsrtp:=
alsa? ( media-libs/alsa-lib )
amr? ( media-libs/opencore-amr )
- ffmpeg? ( virtual/ffmpeg:= )
+ ffmpeg? ( media-video/ffmpeg:= )
g729? ( media-libs/bcg729 )
gsm? ( media-sound/gsm )
ilbc? ( media-libs/libilbc )
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
index 76e60e083a28..90aad7e670c0 100644
--- a/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_P}.tar
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"