gentoo Easter resync : 12.04.2020

6 files changed, 2 insertions, 211 deletions

diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 79adcca5bc17..b9ba464f8344 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,15 +1,10 @@
 AUX libproxy-0.4.10-disable-pac-test.patch 1017 BLAKE2B f8f7b2e48f587725539cdb126a15fa2e6c2602bc270144236bb7279f9fda9a505a487f569fe7170733e8e6b7e78b8e1fa6892c0ff0be9b3937e9f96f7318bdbf SHA512 a0fa6520c60489675176ca7d5d750d0f54e020592743a3437c184939314b71be68803a7f1cb8cb584fb7ad6ee884c85bfb7905d4bb3e0536d535e990981e9ba9
-AUX libproxy-0.4.11-avoid-nm-build-dep.patch 2062 BLAKE2B e563e162d5b393f2badeebd3e8ca477ca0e56dc7ac9c30807c1f685719b13d999f95748cb8c09d3424cc7f6bbfabf986fa14f784e753125557a2648043711068 SHA512 eb4b7e0b79ae89e611b3f3472cd17d2e05732e806c8fb85b7fb4afbb67e1653bab0706b4a29efd5079283372f975b2a1e1f987ffd2a099ce28ba7fe5362214b5
 AUX libproxy-0.4.12-macosx.patch 3387 BLAKE2B 6c16cc9bd73255c106413708db7f88a6391ffbc4617461edf8fdbe6bf6bfe8ce194f7770e25c5eeeeacd14302aaf76f0c8a30793277d459b118bed838f81d1c6 SHA512 bb815f33745fe1304139f5da2502d157f049ce896ebc2dd5a62c012877c9a3e6bf850a47438a919a910f27ef49c20f9666a3da5a7386641d3250e58f481c2753
-AUX libproxy-0.4.12-mozjs.pc.patch 781 BLAKE2B 9476a64b55fff7ec206042c42479c76bf1ca005f6fe93c621d307c2561c806c1d8718972bf787defc94fc4c9bb65a7c6a7d1e3ff1c2eab403c6290dc78d94e23 SHA512 30ad9224a5676b8ac8f50b56cdb61f2708225994bc26910eb07f58345423102116058a19273b16b462dec846b065925615251fe5fb7b2394f232dd66a013d230
-AUX libproxy-0.4.13-cmake-37.patch 954 BLAKE2B 156f95113351f42f4e48a741f13dcda3cb0cfa7e26409c7cdb1b3347b4e0e30afb4c06de371723180cb4533df5180563606055b2ccd0f1a4a9b314cd3c84951c SHA512 e1aeacb40f06e9137d1f82444961e1216479e7d44d18c9d4c16b09d0e0b0c92c2f77e4c37fe33a020695d5dc23b1e4b2e4617d25e7d878bb816c60f3bc78ed45
 AUX libproxy-0.4.15-avoid-nm-build-dep.patch 3445 BLAKE2B b5094d1b5869321a1fe4d289f5834f70a0422d001a583aa79eb3a9b1e3e84c3060098908c096398dd6186e9b00e88bceed1464952daa1e782ae862e0fc636e55 SHA512 6f0945337b9fe5586cc38e902526a5473e354143eb26db5a05c02a911ecc9de650f22a3f7b68cbb9e90e737f8001adaa1a6d17fcded5f7cab0462b14cc196111
 AUX libproxy-0.4.15-mozjs-52-1.patch 3771 BLAKE2B c5b760979a0c8188ada05e2842d65fd108451d57255c12e971a99f42e373e77c1ac069506085c1d8d20f395551b140dac77a0d33b009b760632921c9452c5d34 SHA512 6572bd725662533aa5a2660461606bc101bb75edfe21021a73f2faa4d3f5d91fb83637ac43e448ad124abfc1c6e59c82f96ae9cd571289767ee6c193be552fbf
 AUX libproxy-0.4.15-mozjs-52-2.patch 847 BLAKE2B 0b6b408b6745c6b4bf277549a8682db67b4db426e0fe87830c0ca51f9da3c0fc6afc39ee22f13af5c4e3abcf587765b1de0bddc508530302dded86eb1e547b8f SHA512 e1f3fd54ea7fba12d019fe9388236eba1afb73a7e9978c4bbcf9309f9d3aa246747f15e1e62a1d86eba05147b62b2d97d45d1b4547f08a01e4ddef8a8b0746ad
 AUX libproxy-0.4.15-python-3.7.patch 774 BLAKE2B fedb3b9c1f003a24706a8b9b66d70f3abe01dd26bdd25eacf7685247d262e02ae0b406d0a2871f12d8d1b92df5abcdf207d940fec91c964fb33d38b454a91d82 SHA512 4330e9043ed767accea8f6f74b6999017633c51d615b229e7a43e9ed468630c630653c6917a4196e8f05d285df383de3bb269a79db127d902d1c960f29d39246
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
-DIST libproxy-0.4.13.tar.gz 89296 BLAKE2B 05e1c6a56e562a9fc8c8123bead6f3a264589f97895079f3d90cd0edd03d980c9b2bb0a4a3c2d2c2aa553e0ed0450863bd74236c00d94b9c42930efe9c37bff1 SHA512 babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42
 DIST libproxy-0.4.15.tar.gz 93084 BLAKE2B 9aa86403eaf4e1791958013c2739e251c61f11da40e66b3296b33a7f380828895f621175add5efb3cd17222ff016941801c25c2d70c19ef3a6652510268a0b3d SHA512 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b
-EBUILD libproxy-0.4.13-r2.ebuild 3163 BLAKE2B b8592b68c9c8d37d033e4e9621f273c6cf15e2dc69e07f163b6d4033467d60bd5beb72611a13b5be73f98bde2435856874b8ec02f9390613c1c1fd91ace951bd SHA512 a65106522326e5a947af1ea74a5a0cb4a43ff4ebaf2e1571e2bf60a3208f45b94e4633a788091450b5e8f8e27f440ef57e415f5759e31bb22c9ac966153f1fd2
-EBUILD libproxy-0.4.15-r1.ebuild 2734 BLAKE2B 3c1f5e714da543a37febce031ad834583b0c7d6a6a84fa51ed180f22043411e05df17f5b51f5480a2818fddd54c8aed84625b90e2ad58283c86d588b331b72f1 SHA512 5cd5532f7e8e3881a93b129741fef5fb70085170cf91f90fa5b44e3917f42d4f7ad69fd63beb56f7781e83e9ee028f5c56baa53c9c844bbf2c35c8fbd6f7da32
+EBUILD libproxy-0.4.15-r1.ebuild 2730 BLAKE2B a4b5185d80761a70f8052ceeab5387339a8f9f5cf7140e86750baaf26c5548f622e54be3b73d62d405e6c9abb315d173da58a824da751312822372b13fc2164a SHA512 3a05503b93d5ae2c40e45e505710163ba62fc0c3d53d51226ee508da96aec0c78464562308a043b7f398ed7ddb21ed375c8d2670018c1e821ce4f510ae480bb0
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch
deleted file mode 100644
index 59e368b696eb..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 518214ee85e10c5bc99d3b115ae7ac9cc3fc14fc 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
----
- libproxy/cmake/modules/network_networkmanager.cmk |  4 ++--
- libproxy/modules/network_networkmanager.cpp       | 21 ++++++++++++++++++++-
- 2 files changed, 22 insertions(+), 3 deletions(-)
-
-diff --git a/libproxy/cmake/modules/network_networkmanager.cmk b/libproxy/cmake/modules/network_networkmanager.cmk
-index d9f9588..2586bbd 100644
---- a/libproxy/cmake/modules/network_networkmanager.cmk
-+++ b/libproxy/cmake/modules/network_networkmanager.cmk
-@@ -1,3 +1,3 @@
- if (NOT WIN32 AND NOT APPLE)
--  px_check_modules(NM NetworkManager dbus-1)
--endif()
-\ No newline at end of file
-+  px_check_modules(NM dbus-1)
-+endif()
-diff --git a/libproxy/modules/network_networkmanager.cpp b/libproxy/modules/network_networkmanager.cpp
-index 564c275..a03425b 100644
---- a/libproxy/modules/network_networkmanager.cpp
-+++ b/libproxy/modules/network_networkmanager.cpp
-@@ -23,7 +23,26 @@
- using namespace libproxy;
- 
- #include <dbus/dbus.h>
--#include <NetworkManager/NetworkManager.h>
-+
-+
-+/*
-+ * 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:
--- 
-1.8.2.1
-
diff --git a/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch b/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch
deleted file mode 100644
index bf69fc31d939..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/libproxy/cmake/modules/pacrunner_mozjs.cmk	2011-06-20 04:31:41.000000000 -0600
-+++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk	2013-03-24 19:20:17.910765954 -0600
-@@ -9,12 +9,18 @@
- elseif(NOT APPLE)
-   option(WITH_MOZJS "Search for MOZJS package" ON)
-   if (WITH_MOZJS)
--    pkg_search_module(MOZJS mozjs185)
-+    pkg_search_module(MOZJS mozjs187)
-     if(MOZJS_FOUND)
-       include_directories(${MOZJS_INCLUDE_DIRS})
-       link_directories(${MOZJS_LIBRARY_DIRS})
-     else()
--      set(MOZJS_FOUND 0)
-+      pkg_search_module(MOZJS mozjs185)
-+      if(MOZJS_FOUND)
-+        include_directories(${MOZJS_INCLUDE_DIRS})
-+        link_directories(${MOZJS_LIBRARY_DIRS})
-+      else()
-+        set(MOZJS_FOUND 0)
-+      endif()
-     endif()
-   else()
-     set(MOZJS_FOUND 0)
diff --git a/net-libs/libproxy/files/libproxy-0.4.13-cmake-37.patch b/net-libs/libproxy/files/libproxy-0.4.13-cmake-37.patch
deleted file mode 100644
index d96879a7cba6..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.13-cmake-37.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 72bda7188408bd3c2491ea664da294cc483220bc Mon Sep 17 00:00:00 2001
-From: Andrey Rakhmatullin <wrar@wrar.name>
-Date: Sun, 20 Nov 2016 18:40:49 +0500
-Subject: [PATCH] Set CMP0054 CMake policy to NEW.
-
-CMake 3.7 exports a "t" variable for all projects and because of that
-the elseif statement in cmake/CMakeCSharpInformation.cmake:311 works
-incorrectly if CMP0054 is not set to NEW (as "t" is expanded to the
-variable value).
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5313787..451e7a6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 2.6)
- if(POLICY CMP0011)
-    cmake_policy(SET CMP0011 NEW)
- endif(POLICY CMP0011)
-+if(POLICY CMP0054)
-+   cmake_policy(SET CMP0054 NEW)
-+endif(POLICY CMP0054)
- 
- # Make sure we look in our cmake folder for additional definitions
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake )
diff --git a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
deleted file mode 100644
index 191ad591cc0f..000000000000
--- a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils flag-o-matic mono-env python-r1
-
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# NOTE: mozjs/spidermonkey might still cause problems like #373397 ?
-CDEPEND="
-	gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	mono? ( dev-lang/mono )
-	networkmanager? ( sys-apps/dbus:0[${MULTILIB_USEDEP}] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	spidermonkey? ( >=dev-lang/spidermonkey-1.8.5:0= )
-	webkit? ( net-libs/webkit-gtk:4 )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig:0[${MULTILIB_USEDEP}]
-"
-RDEPEND="${CDEPEND}
-	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"
-
-	# prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
-	# https://github.com/libproxy/libproxy/issues/28
-	"${FILESDIR}/${PN}-0.4.11-avoid-nm-build-dep.patch"
-
-	# Gentoo's spidermonkey doesn't set Version: in mozjs18[57].pc
-	"${FILESDIR}/${PN}-0.4.12-mozjs.pc.patch"
-
-	# https://github.com/libproxy/libproxy/issues/27
-	"${FILESDIR}/${PN}-0.4.12-macosx.patch"
-
-	# bug 600254
-	"${FILESDIR}/${P}-cmake-37.patch"
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"$(multilib_is_native_abi && usex perl -DPERL_VENDORINSTALL=ON)"
-		# WITH_VALA just copies the .vapi file over and needs no deps,
-		# hence always enable it unconditionally
-		'-DWITH_VALA=ON'
-		"-DCMAKE_C_FLAGS=${CFLAGS}"
-		"-DCMAKE_CXX_FLAGS=${CXXFLAGS}"
-		"$(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=$(multilib_is_native_abi && usex perl || echo 'OFF')"
-		"-DWITH_PYTHON=$(multilib_is_native_abi	&& usex python || echo 'OFF')"
-		"-DWITH_MOZJS=$(multilib_is_native_abi && usex spidermonkey || echo 'OFF')"
-		"-DWITH_NATUS=OFF"
-		"-DWITH_WEBKIT=OFF"
-		"-DWITH_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo 'OFF')"
-		"-DBUILD_TESTING=$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
-
-	use python && python_setup
-	multilib-minimal_src_configure
-}
-
-multilib_src_install_all() {
-	doman "${FILESDIR}/proxy.1"
-	use python && python_foreach_impl python_domodule 'bindings/python/libproxy.py'
-}
diff --git a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild b/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
index 16852065bae6..735c770babe5 100644
--- a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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 )"