diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-01 21:06:00 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-01 21:06:00 +0000 |
commit | 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch) | |
tree | 53bf797418ac5e9b99c41ca0382c87b82421e5de /net-libs/libproxy | |
parent | 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff) |
gentoo new year resync : 01.01.2021
Diffstat (limited to 'net-libs/libproxy')
-rw-r--r-- | net-libs/libproxy/Manifest | 11 | ||||
-rw-r--r-- | net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch | 118 | ||||
-rw-r--r-- | net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-1.patch | 101 | ||||
-rw-r--r-- | net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-2.patch | 23 | ||||
-rw-r--r-- | net-libs/libproxy/files/libproxy-0.4.15-python-3.7.patch | 23 | ||||
-rw-r--r-- | net-libs/libproxy/libproxy-0.4.15-r1.ebuild | 85 | ||||
-rw-r--r-- | net-libs/libproxy/libproxy-0.4.16-r1.ebuild (renamed from net-libs/libproxy/libproxy-0.4.16.ebuild) | 2 | ||||
-rw-r--r-- | net-libs/libproxy/libproxy-0.4.17.ebuild (renamed from net-libs/libproxy/libproxy-0.4.15-r2.ebuild) | 9 |
8 files changed, 6 insertions, 366 deletions
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest index 6b73c4ef093a..0426de74e2d9 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.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 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.15.tar.gz 93084 BLAKE2B 9aa86403eaf4e1791958013c2739e251c61f11da40e66b3296b33a7f380828895f621175add5efb3cd17222ff016941801c25c2d70c19ef3a6652510268a0b3d SHA512 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b DIST libproxy-0.4.16.tar.gz 95534 BLAKE2B 163f4fa359758a2186802683005b7d2bbd68933d2512f2c4a284912b6d07e3aa288613e3b473d1bd8d9fe941033da634490c78367692a489da31184dd4dc3cb8 SHA512 28bca7c86e486d08ddc1699e562dd98366b569ec9a7a965f7d15d265ede508575e6eae43abde1778f46d55c3304d32218d891d01ba6a8c360820412748ed5ca1 -EBUILD libproxy-0.4.15-r1.ebuild 2708 BLAKE2B a2f4f66d4fb604cf4d3bbd2ab3f7cc336f36152f00ce82028a677e9d269755f75dc118976394e0ad0fbf594f1d1e9d3f2445eeafd3fb7b61854e4a4c5ce4573f SHA512 774fe0a0356d7975a010667270923726a645dd9cd803fcb112e600e0de069282a5cd625f00f196e7112ac24b68e914e62baab5e09c9a9521dac0f540932aecac -EBUILD libproxy-0.4.15-r2.ebuild 2749 BLAKE2B 731c5c169fdb244d023fe13c3a527ff5bab3e3d1ad06ebf133f7cb735ccfff5af55627def215ef6bc2caf1d2d33fb4c3fc71086e9bc6b0705c19e1bb59de81da SHA512 1923237894e97d2ff10bfde1a281718489b1dbd90883b27b1a0b30066923ff558c9ad3cc4b5e83696f01d92b92656bc7356877187efc242b212eadb840cf7fdb -EBUILD libproxy-0.4.16.ebuild 2566 BLAKE2B 37d861f9c4e4ecb1c270ec6b6f0ab416a383ae81bec4b6e0ff11a0b17cad46f5d141ff24c6369ced463bb13aa9ae4c03a12f53c6959b54db8537df4537127d56 SHA512 35e50fe449aae44bbf11ba027dd8cd36ab058bee01669284ad5de5c5a7dc19af5f7b54bccd9a879ed31292bec6a05ab30f2d0a6e49c593d8fcf1c2b51af13150 +DIST libproxy-0.4.17.tar.gz 95542 BLAKE2B 70b78c90aebb0ea308d105ec6d2c61bb54dea36df2d99db835f29c6ffa91168c15e73e01823b799a37fa89a9cb6fca51013ea057006b608fa2a79f4056a5d3c5 SHA512 589045538a78dc7453335ed61c60adad3352b840b224885d4a58ae284e52224ae3ff2eebd77df57aebbc3ae75d7b6d69a825f24f01c19e75bf0a3345dce53126 +EBUILD libproxy-0.4.16-r1.ebuild 2558 BLAKE2B 587bcca985dc750440dcd04ab7f87e87566fafc7e51a4af986bf8b4c982da4c43533ef4dc8e0755e2f6c1d1d0ebe333a998c6703704b0cc9529a0c31d1160335 SHA512 42c24f639c9512ee3dc370289c8d5f104ce3c7a167321a3c9c17ffdba38564d4506285d98297b3af283b8e7a7760d37a4a8b8a9fa52557ffa76c72168c9d717c +EBUILD libproxy-0.4.17.ebuild 2573 BLAKE2B e5c869a5a4fb44ca248eaf213526b6e91d0d0dcb46fcd6e18563356fb32f8a3e8074476afb1aec8efbf07a617ee81229ccd76db68f777e4725ca2443acb18c9a SHA512 d01e03fb21e1d3a273eb9b33628a193dc76c35c1ba7f0ad60f9323ef40520b8bd614f4ef9c007ec229cb539fb3a79c699184b5e02fbd35897e9191bb5b1dab6f 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 deleted file mode 100644 index 2d40a6c1600d..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch +++ /dev/null @@ -1,118 +0,0 @@ -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/files/libproxy-0.4.15-mozjs-52-1.patch b/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-1.patch deleted file mode 100644 index c2d0257d437f..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-1.patch +++ /dev/null @@ -1,101 +0,0 @@ -From f594720280b2e40d81fa6e286a0ef8868687ef7e Mon Sep 17 00:00:00 2001 -From: Pierre Lejeune <superheron@gmail.com> -Date: Sat, 30 Jun 2018 21:10:06 +0200 -Subject: [PATCH] Build with mozjs-52 - -Fixes #71 ---- - libproxy/cmake/modules/pacrunner_mozjs.cmk | 2 +- - libproxy/modules/pacrunner_mozjs.cpp | 19 +++++++------------ - 2 files changed, 8 insertions(+), 13 deletions(-) - -diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk -index c2ae3db..20857fb 100644 ---- a/libproxy/cmake/modules/pacrunner_mozjs.cmk -+++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk -@@ -9,7 +9,7 @@ if(WIN32) - elseif(NOT APPLE) - option(WITH_MOZJS "Search for MOZJS package" ON) - if (WITH_MOZJS) -- pkg_search_module(MOZJS mozjs-38) -+ pkg_search_module(MOZJS mozjs-52 mozjs-60) - if(MOZJS_FOUND) - include_directories(${MOZJS_INCLUDE_DIRS}) - link_directories(${MOZJS_LIBRARY_DIRS}) -diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp -index a70b2e9..ed07c69 100644 ---- a/libproxy/modules/pacrunner_mozjs.cpp -+++ b/libproxy/modules/pacrunner_mozjs.cpp -@@ -35,6 +35,7 @@ using namespace libproxy; - #pragma GCC diagnostic ignored "-Winvalid-offsetof" - #include <jsapi.h> - #pragma GCC diagnostic error "-Winvalid-offsetof" -+#include <js/Initialization.h> - #include <js/CallArgs.h> - - #include "pacutils.h" -@@ -111,17 +112,14 @@ class mozjs_pacrunner : public pacrunner { - mozjs_pacrunner(string pac, const url& pacurl) throw (bad_alloc) : pacrunner(pac, pacurl) { - - // Set defaults -- this->jsrun = nullptr; - this->jsctx = nullptr; - JS_Init(); - -- // Initialize Javascript runtime environment -- if (!(this->jsrun = JS_NewRuntime(1024 * 1024))) goto error; -- if (!(this->jsctx = JS_NewContext(this->jsrun, 1024 * 1024))) goto error; -+ // Initialize Javascript context -+ if (!(this->jsctx = JS_NewContext(1024 * 1024))) goto error; - { - JS::RootedValue rval(this->jsctx); - JS::CompartmentOptions compart_opts; -- compart_opts.setVersion(JSVERSION_LATEST); - - this->jsglb = new JS::Heap<JSObject*>(JS_NewGlobalObject( - this->jsctx, &cls, -@@ -139,16 +137,15 @@ class mozjs_pacrunner : public pacrunner { - JS::CompileOptions options(this->jsctx); - options.setUTF8(true); - -- JS::Evaluate(this->jsctx, global, options, JAVASCRIPT_ROUTINES, -- strlen(JAVASCRIPT_ROUTINES), &rval); -+ JS::Evaluate(this->jsctx, options, JAVASCRIPT_ROUTINES, -+ strlen(JAVASCRIPT_ROUTINES), JS::MutableHandleValue(&rval)); - - // Add PAC to the environment -- JS::Evaluate(this->jsctx, global, options, pac.c_str(), pac.length(), &rval); -+ JS::Evaluate(this->jsctx, options, pac.c_str(), pac.length(), JS::MutableHandleValue(&rval)); - return; - } - error: - if (this->jsctx) JS_DestroyContext(this->jsctx); -- if (this->jsrun) JS_DestroyRuntime(this->jsrun); - throw bad_alloc(); - } - -@@ -156,7 +153,6 @@ class mozjs_pacrunner : public pacrunner { - if (this->jsac) delete this->jsac; - if (this->jsglb) delete this->jsglb; - if (this->jsctx) JS_DestroyContext(this->jsctx); -- if (this->jsrun) JS_DestroyRuntime(this->jsrun); - JS_ShutDown(); - } - -@@ -178,7 +174,7 @@ class mozjs_pacrunner : public pacrunner { - JS::RootedObject global(this->jsctx,this->jsglb->get()); - bool result = JS_CallFunctionName(this->jsctx, global, "FindProxyForURL", args, &rval); - if (!result) return ""; -- -+ - char * tmpanswer = JS_EncodeString(this->jsctx, rval.toString()); - string answer = string(tmpanswer); - JS_free(this->jsctx, tmpanswer); -@@ -188,7 +184,6 @@ class mozjs_pacrunner : public pacrunner { - } - - private: -- JSRuntime *jsrun; - JSContext *jsctx; - JS::Heap<JSObject*> *jsglb; - JSAutoCompartment *jsac; diff --git a/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-2.patch b/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-2.patch deleted file mode 100644 index fc23ef2cf8e5..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-2.patch +++ /dev/null @@ -1,23 +0,0 @@ -From a9b052c6e30101fb0b702917f245a3e2a2f08366 Mon Sep 17 00:00:00 2001 -From: Laurent Bigonville <bigon@bigon.be> -Date: Tue, 2 Oct 2018 10:22:56 +0200 -Subject: [PATCH] Add call to JS::InitSelfHostedCode() - -This is needed otherwise mozjs crashes ---- - libproxy/modules/pacrunner_mozjs.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp -index ed07c69..38e7d46 100644 ---- a/libproxy/modules/pacrunner_mozjs.cpp -+++ b/libproxy/modules/pacrunner_mozjs.cpp -@@ -118,6 +118,8 @@ class mozjs_pacrunner : public pacrunner { - // Initialize Javascript context - if (!(this->jsctx = JS_NewContext(1024 * 1024))) goto error; - { -+ if (!JS::InitSelfHostedCode(this->jsctx)) goto error; -+ - JS::RootedValue rval(this->jsctx); - JS::CompartmentOptions compart_opts; - diff --git a/net-libs/libproxy/files/libproxy-0.4.15-python-3.7.patch b/net-libs/libproxy/files/libproxy-0.4.15-python-3.7.patch deleted file mode 100644 index 95e56c2fe25d..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.15-python-3.7.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 2d6da65598b90480b4a62c4633eda035ea51681f Mon Sep 17 00:00:00 2001 -From: David King <amigadave@amigadave.com> -Date: Wed, 27 Jun 2018 06:36:00 +0100 -Subject: [PATCH] python: support Python 3.7 and 3.8 - -Add 3.7 and 3.8 to the list of accepted Python 3 versions. ---- - cmake/FindPython3Interp.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/FindPython3Interp.cmake b/cmake/FindPython3Interp.cmake -index c6cbe3d..8e5e409 100644 ---- a/cmake/FindPython3Interp.cmake -+++ b/cmake/FindPython3Interp.cmake -@@ -39,7 +39,7 @@ - - unset(_Python3_NAMES) - --set(_Python3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+set(_Python3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - - if(Python3Interp_FIND_VERSION) - if(Python3Interp_FIND_VERSION_COUNT GREATER 1) diff --git a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild b/net-libs/libproxy/libproxy-0.4.15-r1.ebuild deleted file mode 100644 index ea1e91bfaa25..000000000000 --- a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# 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 -) - -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/libproxy/libproxy-0.4.16.ebuild b/net-libs/libproxy/libproxy-0.4.16-r1.ebuild index 2b8c9c9cd3fe..fa06d11f7f91 100644 --- a/net-libs/libproxy/libproxy-0.4.16.ebuild +++ b/net-libs/libproxy/libproxy-0.4.16-r1.ebuild @@ -24,7 +24,7 @@ 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:= ) + spidermonkey? ( dev-lang/spidermonkey:68 ) webkit? ( net-libs/webkit-gtk:4 ) " RDEPEND="${DEPEND} diff --git a/net-libs/libproxy/libproxy-0.4.15-r2.ebuild b/net-libs/libproxy/libproxy-0.4.17.ebuild index cbec1147443c..2597575d9eff 100644 --- a/net-libs/libproxy/libproxy-0.4.15-r2.ebuild +++ b/net-libs/libproxy/libproxy-0.4.17.ebuild @@ -24,7 +24,7 @@ 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:= ) + spidermonkey? ( dev-lang/spidermonkey:68 ) webkit? ( net-libs/webkit-gtk:4 ) " RDEPEND="${DEPEND} @@ -43,12 +43,7 @@ PATCHES=( # 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 + "${FILESDIR}/${PN}-0.4.16-avoid-nm-build-dep.patch" ) multilib_src_configure() { |