gentoo resync : 15.01.2020

4 files changed, 3 insertions, 118 deletions

diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index fb41596b01e8..5863f03dcc63 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,8 +1,5 @@
-AUX 2.58.0-disable-failing-tests.patch 1879 BLAKE2B 6821bf4e1e18f085759c9ac19ff80a53d7b3e0c1af03db84faa2a19a6b7076ba129a00db47a0513e412e66a853b27c4e389622799843d2b0ab8a37e2fbe314d3 SHA512 18894abf35e3e750282d8563e5fac8f8ea2306ced81909a8aca6a55f3a8075c4e13c69706814c257b486a32fa4b5f02ae3696cd04d468e0d2838b7ff74228a94
-DIST glib-networking-2.58.0.tar.xz 172632 BLAKE2B 2b1e478ecac7ffb25f0d4e319fc71f7a0c6d9bd4181a5e8abb310d11774491312b0ff1c81b9d8b383ae0b236ece89253d6bd222740199d816c94ea557b4e3511 SHA512 d9cfd97ef9905eceb1f807a7d18c648fcf148214bf3fc55c718c5bcd6fb0afc429ab5b7bf72e83cf959d5ce7f145ce17952c1288d4225cc99d3c6ad66e4494ff
 DIST glib-networking-2.60.3.tar.xz 185132 BLAKE2B 8bbe2b8afb779bac99bd554c384bdbf9e197e9b71dc6fe213cdd4352d95ce19d1c9786747ba5c721fc35bdda3e1325e9620c1ef15ca1fa1e294aad9ab3f9a4bc SHA512 06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f
 DIST glib-networking-2.60.4.tar.xz 185628 BLAKE2B b10fecb88f09c4c33718a923f6ae5790baada485b4dd3637b0ae9bf5f831b74ac4b87fc398eed4c4a88b7069e4c5bc9a58c04ccbffc056648baa58b43d4489a3 SHA512 db1019c0fc712c0702679146bdd9490101cec63796792a33c7fc7fe26a85d343cfb11f718601a8d3bd91167505bbe60333cc01999a0496826c31681bb8dd4032
-EBUILD glib-networking-2.58.0.ebuild 1957 BLAKE2B 6ad5a0626dd10c4873d7542eb66a2b73dd85fa33a07cbad6432052a99e8ffdf569c51b71fd3a7017ffa57f19e6eed53a32ea60769200ca8516312dfe1377d432 SHA512 96d76192155ec43464d04df7ebdd19f6eeee5112bdc7812faaca211aef15b9fb88ba994d73e5f1fe5066eee1f7c20ec1bb2585c8924bd3de01d6cac44596c713
-EBUILD glib-networking-2.60.3.ebuild 1770 BLAKE2B efcc58a1e29857deeda29f1aa72bde1c2728d86907f9b6a74cb3150365a1aca1e4b0e9bc51a6188c3e0e9706d25b1c6dda4fcdfa4565261e04347060046ac331 SHA512 d63448bb31a095ddb67d3680f3948da49360d99833be7a2ee533e0ca6c8bc8d05a29ecc3b297ae84b023469288ca2c92ce2799e2ff1494c1a13f33b0fe1016ca
+EBUILD glib-networking-2.60.3.ebuild 1769 BLAKE2B fecd9867d1fa1964a8dbb23150682931d1ea195897d3d93c3f2303505f4b2ab97025413c36bdffe677b10e95c709a1ed6bb4ca8439351ea517a4f5c39e849b6d SHA512 67bef7c6e15116b927a42463bd86a319c8a70964eb9544698163d7fa8fad5706824a4a61f5517c90cf3dfbce4e0f822e37e1276b3569bc5495f89de3ec0b9136
 EBUILD glib-networking-2.60.4.ebuild 1780 BLAKE2B a32b7d6c7ab3a32d8d182ff4c9da4d6db43de26d3c9a0c57cafd6b61c1c254f9b19880931580e78b2c323e6b271e7e937660a08f281241f4b303401f8d0dd47e SHA512 0169e55c4053938fdf226d0a8d04ffb80652b5ee729b1abf9b883dab08e45bacfae18ec486d680d6e580d7af2b8f9ba35674e2f0f87fdd02a1280c66231186e9
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/files/2.58.0-disable-failing-tests.patch b/net-libs/glib-networking/files/2.58.0-disable-failing-tests.patch
deleted file mode 100644
index c3802392e3b5..000000000000
--- a/net-libs/glib-networking/files/2.58.0-disable-failing-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7fd8c24182ea054d6d890b6f6325e63458a10392 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 17 Jan 2019 21:03:06 +0200
-Subject: [PATCH] tests: Disable test that fails with gnutls-3.6 (or in
- general)
-
-Tests for TLS 1.3 are still problematic on 2.58.x releases; should
-be better once 2.60 comes out, but the changes are still being worked
-on and would cause regressions for real world programs right now if
-backported.
----
- tls/tests/connection.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/tls/tests/connection.c b/tls/tests/connection.c
-index 6087efc..accca78 100644
---- a/tls/tests/connection.c
-+++ b/tls/tests/connection.c
-@@ -2017,14 +2017,10 @@ main (int   argc,
-               setup_connection, test_client_auth_connection, teardown_connection);
-   g_test_add ("/tls/connection/client-auth-rehandshake", TestConnection, NULL,
-               setup_connection, test_client_auth_rehandshake, teardown_connection);
--  g_test_add ("/tls/connection/client-auth-failure", TestConnection, NULL,
--              setup_connection, test_client_auth_failure, teardown_connection);
-   g_test_add ("/tls/connection/client-auth-fail-missing-client-private-key", TestConnection, NULL,
-               setup_connection, test_client_auth_fail_missing_client_private_key, teardown_connection);
-   g_test_add ("/tls/connection/client-auth-request-cert", TestConnection, NULL,
-               setup_connection, test_client_auth_request_cert, teardown_connection);
--  g_test_add ("/tls/connection/client-auth-request-fail", TestConnection, NULL,
--              setup_connection, test_client_auth_request_fail, teardown_connection);
-   g_test_add ("/tls/connection/no-database", TestConnection, NULL,
-               setup_connection, test_connection_no_database, teardown_connection);
-   g_test_add ("/tls/connection/failed", TestConnection, NULL,
--- 
-2.17.0
-
diff --git a/net-libs/glib-networking/glib-networking-2.58.0.ebuild b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
deleted file mode 100644
index 7111b4ab1667..000000000000
--- a/net-libs/glib-networking/glib-networking-2.58.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson multilib-minimal xdg
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+gnome +libproxy +ssl test"
-RESTRICT="!test? ( test )"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
-	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
-	>=net-libs/gnutls-3:=[${MULTILIB_USEDEP}]
-	ssl? ( app-misc/ca-certificates )
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/meson-0.46
-	>=sys-devel/gettext-0.19.8
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( sys-apps/dbus )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-disable-failing-tests.patch # shouldn't be needed with 2.60
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_use libproxy libproxy_support)
-		$(meson_use gnome gnome_proxy_support)
-		-Dpkcs11_support=false # deprecated, functionality should be available without it; removed in next version
-		-Dinstalled_tests=false
-		-Dstatic_modules=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	multilib_pkg_postrm() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/net-libs/glib-networking/glib-networking-2.60.3.ebuild b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
index 56e52d93134e..0ccd2dcbcbfd 100644
--- a/net-libs/glib-networking/glib-networking-2.60.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]