From c92d0cd2b34d17bce6d5bb4e3a4fc00af4193c99 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Nov 2022 13:10:40 +0000 Subject: gentoo auto-resync : 24:11:2022 - 13:10:39 --- net-libs/libproxy/Manifest | 5 -- .../files/libproxy-0.4.10-disable-pac-test.patch | 29 -------- .../files/libproxy-0.4.16-avoid-nm-build-dep.patch | 87 ---------------------- .../libproxy/files/libproxy-0.4.17-mozjs.patch | 15 ---- net-libs/libproxy/libproxy-0.4.17-r1.ebuild | 83 --------------------- 5 files changed, 219 deletions(-) delete mode 100644 net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch delete mode 100644 net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch delete mode 100644 net-libs/libproxy/files/libproxy-0.4.17-mozjs.patch delete mode 100644 net-libs/libproxy/libproxy-0.4.17-r1.ebuild (limited to 'net-libs/libproxy') diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest index 49f569681cfb..601446366ef3 100644 --- a/net-libs/libproxy/Manifest +++ b/net-libs/libproxy/Manifest @@ -1,12 +1,7 @@ -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.16-avoid-nm-build-dep.patch 3555 BLAKE2B 3df682dcacb157a1913d53a3358da5c4200de894270d38df4aa29997979b5e284e0207eed53db9c39ea85a528a037c832c44eb7167e433781d862b75ad0d47bf SHA512 a83dde4a161c96e2c059c88e5ae54d20f9348d583d43c94c5dbc5cb53887d75c845937a43f6597544a82c4162bba2ae8ed433ec6229504ddedf33ce146585683 -AUX libproxy-0.4.17-mozjs.patch 760 BLAKE2B df245777cd3b9a1d4c6ea30a691b64fde5fdb5dfd52246ed1356041a036e0c883c0f2388b86f56d892e67697a1e3a8fdde050a26480bb1e3962a77e599fa3e7f SHA512 54f1371bf74531d427114aa6d194f2ed2c9ec6288f14315b4adfa50a0d7722e948429f949b647fdf49cf47fb53c05bf3d45070d261330a83c4eb15b58e8309db AUX libproxy-0.4.18-Fix-building-without-duktape.patch 1006 BLAKE2B b6b8a704a61e59bca27946b55967a6b413a219811b632b7486c94d66e5d48c78baefbba2a8f12b44b3c926b2009fa4f6a82d0e74a79d5b0b9b2ba82cc327ee44 SHA512 f77d0223c3afabf9e64e09adf64de119edbd6a93458a070b2bca60e4efc58785c45cc1c09114d2edd4e8d9d1567dd96b14ee51748266b9eefc82e5ceafabd8c3 AUX libproxy-0.4.18-avoid-nm-build-dep.patch 3592 BLAKE2B 7f7f8af5aebbfb176b405db4c666e894b3adf879ba186f3f08a7b82508d67227905cd1fb31af761c8c0d24e362bfe84341243c2ce5fb6c1ea11dead16f6c9e0c SHA512 64a1823b1710ce3be1019ea077b5ce9e1b0f1ff97b8e940bb4187613af797d198ffcd1f66f21399b23a3a0b1133b7fc71ac80c86ff67bd1d9735abcfb5bcb61a AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f -DIST libproxy-0.4.17.tar.gz 95542 BLAKE2B 70b78c90aebb0ea308d105ec6d2c61bb54dea36df2d99db835f29c6ffa91168c15e73e01823b799a37fa89a9cb6fca51013ea057006b608fa2a79f4056a5d3c5 SHA512 589045538a78dc7453335ed61c60adad3352b840b224885d4a58ae284e52224ae3ff2eebd77df57aebbc3ae75d7b6d69a825f24f01c19e75bf0a3345dce53126 DIST libproxy-0.4.18.tar.gz 98037 BLAKE2B 12505cc7afe9ca27bb387df31d7368ed3ac83696255e6bd8fdbca1528fb6fe83510cdf7c6bda09939dcb55daefba24cf9c52435f664c6cba01daad87ddff3f2a SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754 -EBUILD libproxy-0.4.17-r1.ebuild 2630 BLAKE2B fd7ebcba568ff4e17759c9e23dce4c9d1fe7405f3e757064555a9da2e45ae73ea04c547f8e553689899f4fe2a16082f52b8e296ea492a7f640f577b42158e685 SHA512 3a6b1623e632803aeebcd3a4dae8d5cedbcb1bfe9c3e4beaf41dc5a4763c24d94d21b7ab8d60131ebd8d4296ba412f2f00f98a0a765079c65d9fb38fe1f82929 EBUILD libproxy-0.4.18.ebuild 2627 BLAKE2B 77d6085a807a75f2e5a676be132ef29f555152339aa1612aca8714df736904f1c803f03a20df0a2e94472f16f5bdfb439f477db1d84a270fd40eb6376be4c1bd SHA512 0584c5ffe9511e7a4c8178496e91a275aaeb79643e59ff119e3af3e4e64dcf05778448ecceed40239ffc1aa34adf2ca8260be4228dba2870630186469d3f46f4 MISC metadata.xml 770 BLAKE2B ae78ea34cf603f837bcb20532febb873d54c9f0e96867c82a2ab095fa94e8c1a1b64d83c6e4f29fbe26c5a21cc3d04b722add5fb88ab74a781ad15fc50f300ee SHA512 90c1cf64ad650e58e172832383a8ceaf396274610d65e0486f9fc19534dda1e5a4356b18139dc62483d7df46769143acd4ccfc35ebe0d18e64dc8a71bd5e5789 diff --git a/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch b/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch deleted file mode 100644 index 91658574134e..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5a1a8d2b920006e54d9de971999b443073f50843 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Tue, 16 Oct 2012 03:30:50 -0400 -Subject: [PATCH] Disable PAC test - -get-pac-test freezes when run from the ebuild, but succeeds when -building manually. Using Xemake/virtualx.eclass doesn't seem to help. ---- - libproxy/test/CMakeLists.txt | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/libproxy/test/CMakeLists.txt b/libproxy/test/CMakeLists.txt -index 8894425..69543a4 100644 ---- a/libproxy/test/CMakeLists.txt -+++ b/libproxy/test/CMakeLists.txt -@@ -17,10 +17,3 @@ if(WIN32) - target_link_libraries(url-encode ws2_32) - endif() - add_test(NAME url-encode COMMAND ${CMAKE_CURRENT_BINARY_DIR}/url-encode) -- --# Get PAC --if (NOT WIN32) --add_executable(get-pac-test ${CMAKE_CURRENT_SOURCE_DIR}/get-pac-test.cpp ${PROJECT_SOURCE_DIR}/url.cpp) --target_link_libraries(get-pac-test pthread) --add_test(NAME get-pac-test COMMAND ${CMAKE_CURRENT_BINARY_DIR}/get-pac-test) --endif() --- -1.7.12.3 - 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 deleted file mode 100644 index a50bcc130cc7..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch +++ /dev/null @@ -1,87 +0,0 @@ -https://github.com/libproxy/libproxy/issues/28 - -From 703ac16ea2b508dc16d433b3fd597fcd496d05c1 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -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 --#include - --// 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/files/libproxy-0.4.17-mozjs.patch b/net-libs/libproxy/files/libproxy-0.4.17-mozjs.patch deleted file mode 100644 index cf31c77ae53f..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.17-mozjs.patch +++ /dev/null @@ -1,15 +0,0 @@ -Enable mozjs detection. -Backported from https://github.com/libproxy/libproxy/commit/66b30ef388a45f66f9b118d51cc76b53fdb8bbf4 -Bug: https://bugs.gentoo.org/811858 - ---- a/libproxy/cmake/modules.cmk -+++ b/libproxy/cmake/modules.cmk -@@ -44,7 +44,7 @@ if(NM_FOUND) - set(NM_BUILD 1) - endif(NM_FOUND) - px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES}) --px_module(pacrunner_mozjs 0 ${BIPR} ${MOZJS_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}) - px_module(wpad_dns_alias 1 1) diff --git a/net-libs/libproxy/libproxy-0.4.17-r1.ebuild b/net-libs/libproxy/libproxy-0.4.17-r1.ebuild deleted file mode 100644 index 3fc67107a82b..000000000000 --- a/net-libs/libproxy/libproxy-0.4.17-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-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:68 ) - 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}/${PN}-0.4.16-avoid-nm-build-dep.patch" - - # enable mozjs detection, bug #811858 - "${FILESDIR}/${PN}-0.4.17-mozjs.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 -} -- cgit v1.2.3