gentoo resync : 03.03.2021

3 files changed, 2 insertions, 85 deletions

diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index f6b0ed8c1b2c..3c7be38422cd 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -2,8 +2,6 @@ AUX libproxy-0.4.10-disable-pac-test.patch 1017 BLAKE2B f8f7b2e48f587725539cdb12
 AUX libproxy-0.4.12-macosx.patch 3387 BLAKE2B 6c16cc9bd73255c106413708db7f88a6391ffbc4617461edf8fdbe6bf6bfe8ce194f7770e25c5eeeeacd14302aaf76f0c8a30793277d459b118bed838f81d1c6 SHA512 bb815f33745fe1304139f5da2502d157f049ce896ebc2dd5a62c012877c9a3e6bf850a47438a919a910f27ef49c20f9666a3da5a7386641d3250e58f481c2753
 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.16.tar.gz 95534 BLAKE2B 163f4fa359758a2186802683005b7d2bbd68933d2512f2c4a284912b6d07e3aa288613e3b473d1bd8d9fe941033da634490c78367692a489da31184dd4dc3cb8 SHA512 28bca7c86e486d08ddc1699e562dd98366b569ec9a7a965f7d15d265ede508575e6eae43abde1778f46d55c3304d32218d891d01ba6a8c360820412748ed5ca1
 DIST libproxy-0.4.17.tar.gz 95542 BLAKE2B 70b78c90aebb0ea308d105ec6d2c61bb54dea36df2d99db835f29c6ffa91168c15e73e01823b799a37fa89a9cb6fca51013ea057006b608fa2a79f4056a5d3c5 SHA512 589045538a78dc7453335ed61c60adad3352b840b224885d4a58ae284e52224ae3ff2eebd77df57aebbc3ae75d7b6d69a825f24f01c19e75bf0a3345dce53126
-EBUILD libproxy-0.4.16-r1.ebuild 2547 BLAKE2B d4b60bb6f82bbea5bc8fa93c58800e4ff96053c9440e4b515b42664fbb7b556cac52869b9c2455c55caa41e94192ff30e88a3be9e9516335b20b147b79398196 SHA512 7896b08565b3fb6f36ab7039f98ee5ad11fadda51fbde1aa64faa177a61d22fcfcace208c675d5c9961c573d088323d47de7c07fb4cd297bac4fbd232ab884bd
-EBUILD libproxy-0.4.17.ebuild 2558 BLAKE2B 54cb229a6f3743f41052910ed52b90e8ede7fe35db0125f05a7c24d3dbb3810afb20eb5c1de591d13cbf24d865d181abc59b66dd68b5371517216112a0eed5df SHA512 7256609c6e1f1bc69e37a7eee23fed6fd257d2471e76e83a137e97d7d8d0774cdb55d2cfeb9a987576fe655b491ac6713454dd04430ed25706712913d8d5e421
+EBUILD libproxy-0.4.17.ebuild 2555 BLAKE2B 916164c55b0c6f3309a0b7da8424573471a516859ceb8102d6bd3e623498fd6de4d159bc2190a6805519413f650eb9f1c3a01837a3ebce38839888721e26ec55 SHA512 8f4ea4ce77da46d937e7218d4f329db3e51a1bab26a2c63b94beb69c7e2ee2d3a15f9b02039b0d8ae9c2e621ec44c739af033bb040d497d321d453c3a7024883
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/libproxy-0.4.16-r1.ebuild b/net-libs/libproxy/libproxy-0.4.16-r1.ebuild
deleted file mode 100644
index 8ed586d917b7..000000000000
--- a/net-libs/libproxy/libproxy-0.4.16-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 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 ~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}/${P}-avoid-nm-build-dep.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.17.ebuild b/net-libs/libproxy/libproxy-0.4.17.ebuild
index c85655ee2052..05856b011b36 100644
--- a/net-libs/libproxy/libproxy-0.4.17.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="gnome kde mono networkmanager spidermonkey test webkit"
 
 RESTRICT="!test? ( test )"