[gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/, net-libs/libproxy/files/

[Andreas Sturmlechner]

commit:     94919576bc66fd8a8de264b075de7aecc7b39ab7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 09:02:01 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 08:01:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94919576

net-libs/libproxy: Drop 0.4.13-r2

Package-Manager: Portage-2.3.96, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-libs/libproxy/Manifest                         |  1 -
 .../files/libproxy-0.4.11-avoid-nm-build-dep.patch | 60 --------------
 .../libproxy/files/libproxy-0.4.12-mozjs.pc.patch  | 23 ------
 .../libproxy/files/libproxy-0.4.13-cmake-37.patch  | 27 -------
 net-libs/libproxy/libproxy-0.4.13-r2.ebuild        | 94 ----------------------
 5 files changed, 205 deletions(-)

diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 1e6520ca0b2..a35afe3e315 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,2 +1 @@
-DIST libproxy-0.4.13.tar.gz 89296 BLAKE2B 05e1c6a56e562a9fc8c8123bead6f3a264589f97895079f3d90cd0edd03d980c9b2bb0a4a3c2d2c2aa553e0ed0450863bd74236c00d94b9c42930efe9c37bff1 SHA512 babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42
 DIST libproxy-0.4.15.tar.gz 93084 BLAKE2B 9aa86403eaf4e1791958013c2739e251c61f11da40e66b3296b33a7f380828895f621175add5efb3cd17222ff016941801c25c2d70c19ef3a6652510268a0b3d SHA512 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b

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 59e368b696e..00000000000
--- 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@g.o>
-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 bf69fc31d93..00000000000
--- 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 d96879a7cba..00000000000
--- 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@××××.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 6e4fbc6bbb5..00000000000
--- 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 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'
-}