commit: 6633430d22c6a5049c8a2709b914d09efdb55453 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Nov 24 03:12:44 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Nov 24 07:20:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6633430d
net-libs/libproxy: drop 0.4.17-r1 Signed-off-by: Sam James <sam <AT> gentoo.org> net-libs/libproxy/Manifest | 1 - .../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, 215 deletions(-) diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest index 6d388cb8b367..a92c1f4d02d5 100644 --- a/net-libs/libproxy/Manifest +++ b/net-libs/libproxy/Manifest @@ -1,2 +1 @@ -DIST libproxy-0.4.17.tar.gz 95542 BLAKE2B 70b78c90aebb0ea308d105ec6d2c61bb54dea36df2d99db835f29c6ffa91168c15e73e01823b799a37fa89a9cb6fca51013ea057006b608fa2a79f4056a5d3c5 SHA512 589045538a78dc7453335ed61c60adad3352b840b224885d4a58ae284e52224ae3ff2eebd77df57aebbc3ae75d7b6d69a825f24f01c19e75bf0a3345dce53126 DIST libproxy-0.4.18.tar.gz 98037 BLAKE2B 12505cc7afe9ca27bb387df31d7368ed3ac83696255e6bd8fdbca1528fb6fe83510cdf7c6bda09939dcb55daefba24cf9c52435f664c6cba01daad87ddff3f2a SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754 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 <[email protected]> -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 <[email protected]> -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 - -* [email protected]: Rebased on top of 0.4.15 - also revert 423801295921ab1ec0d98565fcbc2635088d45da -* [email protected]: 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 <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-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 -}
