gentoo resync : 25.11.2020

3 files changed, 206 insertions, 0 deletions

diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 322c2ca5359b..37f5cd348ce8 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,10 +1,12 @@
 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.15-gcc-11.patch 3850 BLAKE2B 365313af90b676d471bf7d5b2fe13358d3fdc902e6dc7da37a56b5f186d36b61fd730d5b15511e29aec8a332c1ab622c98e27237d29b31a2448909c308e6da82 SHA512 dc211ddd3e68ed62f505297ffab08ebd6733b1bb9fa1376b69e69e7db67a875067b802209334d7901994eac115b692eda30abc284dd2fc42f0ce9678fcbcc581
 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.15.tar.gz 93084 BLAKE2B 9aa86403eaf4e1791958013c2739e251c61f11da40e66b3296b33a7f380828895f621175add5efb3cd17222ff016941801c25c2d70c19ef3a6652510268a0b3d SHA512 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b
 EBUILD libproxy-0.4.15-r1.ebuild 2708 BLAKE2B a2f4f66d4fb604cf4d3bbd2ab3f7cc336f36152f00ce82028a677e9d269755f75dc118976394e0ad0fbf594f1d1e9d3f2445eeafd3fb7b61854e4a4c5ce4573f SHA512 774fe0a0356d7975a010667270923726a645dd9cd803fcb112e600e0de069282a5cd625f00f196e7112ac24b68e914e62baab5e09c9a9521dac0f540932aecac
+EBUILD libproxy-0.4.15-r2.ebuild 2749 BLAKE2B 731c5c169fdb244d023fe13c3a527ff5bab3e3d1ad06ebf133f7cb735ccfff5af55627def215ef6bc2caf1d2d33fb4c3fc71086e9bc6b0705c19e1bb59de81da SHA512 1923237894e97d2ff10bfde1a281718489b1dbd90883b27b1a0b30066923ff558c9ad3cc4b5e83696f01d92b92656bc7356877187efc242b212eadb840cf7fdb
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch b/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch
new file mode 100644
index 000000000000..2d40a6c1600d
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch
@@ -0,0 +1,118 @@
+https://bugs.gentoo.org/732700
+https://github.com/libproxy/libproxy/issues/127
+
+--- a/libproxy/extension_config.hpp
++++ b/libproxy/extension_config.hpp
+@@ -31,7 +31,7 @@ using namespace libmodman;
+ class DLL_PUBLIC config_extension : public extension<config_extension> {
+ public:
+ 	// Abstract methods
+-	virtual vector<url>      get_config(const url &dst) throw (runtime_error)=0;
++	virtual vector<url>      get_config(const url &dst)=0;
+ 
+ 	// Virtual methods
+ 	virtual string   get_ignore(const url &dst);
+--- a/libproxy/extension_pacrunner.cpp
++++ b/libproxy/extension_pacrunner.cpp
+@@ -30,7 +30,7 @@ pacrunner_extension::~pacrunner_extension() {
+ 	if (this->pr) delete this->pr;
+ }
+ 
+-pacrunner* pacrunner_extension::get(string pac, const url& pacurl) throw (bad_alloc) {
++pacrunner* pacrunner_extension::get(string pac, const url& pacurl) {
+ 	if (this->pr) {
+ 		if (this->last == pac)
+ 			return this->pr;
+--- a/libproxy/extension_pacrunner.hpp
++++ b/libproxy/extension_pacrunner.hpp
+@@ -26,7 +26,7 @@
+ #define PX_PACRUNNER_MODULE_EZ(name, symb, smod) \
+ 	class name ## _pacrunner_extension : public pacrunner_extension { \
+ 	protected: \
+-		virtual pacrunner* create(string pac, const url& pacurl) throw (bad_alloc) { \
++		virtual pacrunner* create(string pac, const url& pacurl) { \
+ 			return new name ## _pacrunner(pac, pacurl); \
+ 		} \
+ 	}; \
+@@ -41,13 +41,13 @@ class DLL_PUBLIC pacrunner {
+ public:
+ 	pacrunner(string pac, const url& pacurl);
+ 	virtual ~pacrunner() {};
+-	virtual string run(const url& url) throw (bad_alloc)=0;
++	virtual string run(const url& url)=0;
+ };
+ 
+ class DLL_PUBLIC pacrunner_extension : public extension<pacrunner_extension, true> {
+ public:
+ 	// Virtual methods
+-	virtual pacrunner* get(string pac, const url& pacurl) throw (bad_alloc);
++	virtual pacrunner* get(string pac, const url& pacurl);
+ 	virtual ~pacrunner_extension();
+ 
+ 	// Final methods
+@@ -55,7 +55,7 @@ public:
+ 
+ protected:
+ 	// Abstract methods
+-	virtual pacrunner* create(string pac, const url& pacurl) throw (bad_alloc)=0;
++	virtual pacrunner* create(string pac, const url& pacurl)=0;
+ 
+ private:
+ 	pacrunner* pr;
+--- a/libproxy/modules/config_envvar.cpp
++++ b/libproxy/modules/config_envvar.cpp
+@@ -24,7 +24,7 @@ using namespace libproxy;
+ 
+ class envvar_config_extension : public config_extension {
+ public:
+-	vector<url> get_config(const url &dst) throw (runtime_error) {
++	vector<url> get_config(const url &dst) {
+ 		const char *proxy = NULL;
+                 vector<url> response;
+ 
+--- a/libproxy/modules/config_sysconfig.cpp
++++ b/libproxy/modules/config_sysconfig.cpp
+@@ -124,7 +124,7 @@ public:
+ 	~sysconfig_config_extension() {
+ 	}
+    
+-	vector<url> get_config(const url &dst) throw (runtime_error) {
++	vector<url> get_config(const url &dst) {
+ 		map<string,string>::const_iterator it = _data.find("PROXY_ENABLED");
+ 		vector<url> response;
+ 
+--- a/libproxy/url.cpp
++++ b/libproxy/url.cpp
+@@ -115,7 +115,7 @@ string url::encode(const string &data, const string &valid_reserved) {
+ 	return encoded.str();
+ }
+ 
+-url::url(const string &url) throw(parse_error)
++url::url(const string &url)
+ 	: m_orig(url), m_port(0), m_ips(NULL) {
+ 	size_t idx = 0;
+ 	size_t hier_part_start, hier_part_end;
+@@ -298,7 +298,7 @@ url& url::operator=(const url& url) {
+ 	return *this;
+ }
+ 
+-url& url::operator=(string strurl) throw (parse_error) {
++url& url::operator=(string strurl) {
+ 	url tmp(strurl);
+ 	*this = tmp;
+ 	return *this;
+--- a/libproxy/url.hpp
++++ b/libproxy/url.hpp
+@@ -50,10 +50,10 @@ public:
+ 
+ 	~url();
+ 	url(const url& url);
+-	url(const string& url) throw (parse_error);
++	url(const string& url);
+ 	bool operator==(const url& url) const;
+ 	url& operator=(const url& url);
+-	url& operator=(string url) throw (parse_error);
++	url& operator=(string url);
+ 
+ 	string   get_host()     const;
+ 	sockaddr const* const* get_ips(bool usedns);
diff --git a/net-libs/libproxy/libproxy-0.4.15-r2.ebuild b/net-libs/libproxy/libproxy-0.4.15-r2.ebuild
new file mode 100644
index 000000000000..cbec1147443c
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.4.15-r2.ebuild
@@ -0,0 +1,86 @@
+# 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"
+
+	# backports from git master:
+	"${FILESDIR}"/${P}-python-3.7.patch # find python-3.7 and 3.8 as well
+	"${FILESDIR}"/${P}-mozjs-52-{1,2}.patch
+	"${FILESDIR}"/${P}-gcc-11.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
+}