gentoo resync : 29.01.2021

2 files changed, 0 insertions, 87 deletions

diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index c91d7154adab..a268a550784f 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,6 +1,5 @@
 AUX libproxy-0.4.10-disable-pac-test.patch 1017 BLAKE2B f8f7b2e48f587725539cdb126a15fa2e6c2602bc270144236bb7279f9fda9a505a487f569fe7170733e8e6b7e78b8e1fa6892c0ff0be9b3937e9f96f7318bdbf SHA512 a0fa6520c60489675176ca7d5d750d0f54e020592743a3437c184939314b71be68803a7f1cb8cb584fb7ad6ee884c85bfb7905d4bb3e0536d535e990981e9ba9
 AUX libproxy-0.4.12-macosx.patch 3387 BLAKE2B 6c16cc9bd73255c106413708db7f88a6391ffbc4617461edf8fdbe6bf6bfe8ce194f7770e25c5eeeeacd14302aaf76f0c8a30793277d459b118bed838f81d1c6 SHA512 bb815f33745fe1304139f5da2502d157f049ce896ebc2dd5a62c012877c9a3e6bf850a47438a919a910f27ef49c20f9666a3da5a7386641d3250e58f481c2753
-AUX libproxy-0.4.15-avoid-nm-build-dep.patch 3445 BLAKE2B b5094d1b5869321a1fe4d289f5834f70a0422d001a583aa79eb3a9b1e3e84c3060098908c096398dd6186e9b00e88bceed1464952daa1e782ae862e0fc636e55 SHA512 6f0945337b9fe5586cc38e902526a5473e354143eb26db5a05c02a911ecc9de650f22a3f7b68cbb9e90e737f8001adaa1a6d17fcded5f7cab0462b14cc196111
 AUX libproxy-0.4.16-avoid-nm-build-dep.patch 3507 BLAKE2B ed5cd354a5a8b0c5d17c43dbce2f494273b75b842d8952269ce95839a5798a05cc745d1cd800fc4cef5964bb8e14b3607846a23fdbcff0db01045ddc81f3af35 SHA512 30aae07b6c42c20cf76b095fccf4177d35c4f4c99dea82ae8f97cb680f29ceaadc4aa1393f83a3eaee8706670f94b544bdec3cd48c43f9ce28a2777a1dd9053b
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
 DIST libproxy-0.4.16.tar.gz 95534 BLAKE2B 163f4fa359758a2186802683005b7d2bbd68933d2512f2c4a284912b6d07e3aa288613e3b473d1bd8d9fe941033da634490c78367692a489da31184dd4dc3cb8 SHA512 28bca7c86e486d08ddc1699e562dd98366b569ec9a7a965f7d15d265ede508575e6eae43abde1778f46d55c3304d32218d891d01ba6a8c360820412748ed5ca1
diff --git a/net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch
deleted file mode 100644
index e896baa3bacc..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.15-avoid-nm-build-dep.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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
----
- 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 b3211f2..d4436e1 100644
---- a/libproxy/cmake/modules.cmk
-+++ b/libproxy/cmake/modules.cmk
-@@ -38,10 +38,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          "${MOZJS_FOUND}"  ${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..4dc3d8d 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-0.9.6.4'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:
--- 
-2.25.0
-