gentoo resync : 22.12.2021

2 files changed, 82 insertions, 0 deletions

diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index d507bbc91fc3..b8cf5f8bf4b7 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -2,7 +2,9 @@ AUX glib-networking-2.70.0-time_t-32-bit.patch 1837 BLAKE2B dbe1ae6dc1e3ba4f0033
 DIST glib-networking-2.68.1.tar.xz 237876 BLAKE2B 11d982a3d65ae5793a3b6c30cf31737ede5879aa3747416253bacc34d62a1ada944a718223300d63a5b37615492929e63c1c0cad6ef34775ee95e49f6769dc04 SHA512 da38b64e6709c864e1c6a60989d86439e0afb1dbf7b7f60a67f58cf430ae354ef9fe7465e74790b0c2827d2f1c39a250db4372d98fab6ab8d73946a7f51e3b22
 DIST glib-networking-2.68.2.tar.xz 239040 BLAKE2B 2b65a63205d3071d05898ca869ae117c9b9fd548b19d9a1c82869a1eb54b77113f8908cd32108f4ca851cc0975ed34c16df04906b5b3c1f9a9a03574187ba929 SHA512 5c2d485332ff1b5a4d0f257b4e7a371b0bfe899b98ee4157845e5f5d3f10cf6f2df891407396edb6955420064dbaa57a5dc3c62c6392881cff05332db925d32d
 DIST glib-networking-2.70.0.tar.xz 259808 BLAKE2B ebd423e9f93fc362cb6cece503de8f579c5c6de460e50f073107017ec0dc35cdd2f38fb780651dc7b68dd833500052c83bfba08e6c4b69c9aca1955f9aa7c7c2 SHA512 c9f8126e3466470ad8e1d588d56b843a4fa4738619a795e6772d95282c54a8356a916a3b0a0b6994606d8a6841ecb0637230f14575ed95ea68bff8f3f81aea71
+DIST glib-networking-2.70.1.tar.xz 261312 BLAKE2B bd0fb33e1ad359b36f78c8003ceb15290a9403d978400573ec7caabc44851f83f080d651085b85f7a5836a39c12c499222d8f9ad5bde51e5b24f6344332be1f7 SHA512 a06b4df4481f95193f9ed4be6d39bbe9ecaf4de8e11a48750f7110d4cfa71aa56b7ec5b36af70b7128150447f1a39ce3aeadf71e2ac516f61708f1212f8f855d
 EBUILD glib-networking-2.68.1.ebuild 1983 BLAKE2B 57f0697fa0db6c58187cb1dd748c31bd039a8999b7b1abdf330c2405e80bf203cbccc86fde0bd69fcf76499d69265ae2c079c6c43dc238ba5cfaef4014a7b375 SHA512 b1a5877223e456e2518c86d9c14128588a1ce169c30d7b5870b6d9ccb93d5f1f3dd2d06bbb5ee07421c1cfcfda07a22fcdfafc974e85afa4b001b190062e9680
 EBUILD glib-networking-2.68.2.ebuild 1983 BLAKE2B 21b2aa19571376085bcb9138188a4b743b62f81bd164b800a79d0f13f80925c2471e53a70b0c29430c7e17c5f19ba27c2be1faf383f70f5e20cd1b0131258c65 SHA512 6326da990fb32f4d480bafad98c30255da69bceca9b30c44f958a90c189e4c9cfe144c0482160ebd13d3142c3d96bd3d47f75cfc76a88ca422592bf592a6cc22
 EBUILD glib-networking-2.70.0.ebuild 2043 BLAKE2B 3c953ae769632b8548c127589adcc65e076c2fe02991a9350eb808fc7f211b1a2da68dd3d6c0aedb8a7f208d0a0c22ad9ef074935960f624cb3b280dd7ff4d72 SHA512 eb8c01bbea519f28e3f9556c932bdca981a2d7618225f069809b8a3378f196b49a28ccce4efe05dd26fb59ca8c348227216d0f5da4ed72dfd191a184730e7f12
+EBUILD glib-networking-2.70.1.ebuild 1990 BLAKE2B ea40834d7f4c62b5b574614f09d13172c98d7b1583d43d31cf18dfd090c62cfb4de3b98b8f9d1c141c2bb4737be4b3d35d7484b518bfb5064092618878ae45c6 SHA512 07c97ce0f54b012fc3865685f55572209a4641dad84072a5044e8a76747a26f136494a106b0b8780508fccb7e1ea2092c912d494de763b907c37d6d792a91c61
 MISC metadata.xml 482 BLAKE2B 6476d4ef1f145739fddc035541725994d4866553b56bb34606863d23c615b33f63db35368ba382fcf9846cb485ee050d850596fc91c72551c5f3798ce240910c SHA512 3dcd22ea3b3fb78f11aead9e57d3a30e4f60e468209729c9e4c4647bf6c8e9163dfaae1a99ca00fed1e46f5288f73c2eb671f480fcc8349366daaa6670357983
diff --git a/net-libs/glib-networking/glib-networking-2.70.1.ebuild b/net-libs/glib-networking/glib-networking-2.70.1.ebuild
new file mode 100644
index 000000000000..860454cb0242
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.70.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson-multilib xdg
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.69.0:2[${MULTILIB_USEDEP}]
+	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+	>=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}]
+	ssl? ( app-misc/ca-certificates )
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+"
+DEPEND="${RDEPEND}
+	test? ( net-libs/gnutls[pkcs11] )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+src_prepare() {
+	xdg_src_prepare
+
+	if ! use test ; then
+		# Don't build tests unconditionally
+		# This is a hack to avoid needing gnutls[pkcs11] when USE=-test
+		# It may become a real runtime dependency in future
+		# Please check!
+		# bug #777462
+		sed -i "/^subdir('tls\/tests')/d" meson.build || die
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgnutls=enabled
+		-Dopenssl=disabled
+		$(meson_feature libproxy)
+		$(meson_feature gnome gnome_proxy)
+		-Dinstalled_tests=false
+		-Dstatic_modules=false
+	)
+	meson_src_configure
+}
+
+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
+}