gentoo resync : 16.09.2021

3 files changed, 87 insertions, 2 deletions

diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index bde1cbdd1404..8759714be5d3 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,5 +1,7 @@
 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.rc.tar.xz 259756 BLAKE2B 4ba60ab836e5859fa658b0c21bfccaa67e9c665dd86245c9ff9b9ba251239b9c5a3d17aabc56527a32f46142bd4d7100188946d4a05ee0cc8c99e3c281322ae5 SHA512 eacd31370c397900ccd850a4ea19adc8ee6de10847792d975263b6163c5b354f92022fe3ac6ba94e2f4c1b0ca1535cd4600c445809ee42a83ff4b393260ae7e5
 EBUILD glib-networking-2.68.1.ebuild 1983 BLAKE2B 57f0697fa0db6c58187cb1dd748c31bd039a8999b7b1abdf330c2405e80bf203cbccc86fde0bd69fcf76499d69265ae2c079c6c43dc238ba5cfaef4014a7b375 SHA512 b1a5877223e456e2518c86d9c14128588a1ce169c30d7b5870b6d9ccb93d5f1f3dd2d06bbb5ee07421c1cfcfda07a22fcdfafc974e85afa4b001b190062e9680
 EBUILD glib-networking-2.68.2.ebuild 1990 BLAKE2B 29807f8e6ff7998f584130127d1da2177897b65ad9d196dd6089daa1ace034be7d99ae4c69a7e787e162232f3ae62b5cb2aea55cdacf777b03929e9190174cf5 SHA512 50a2224242df368dfefa2b3826056e802427d1482a3b4d31d555d6892852ad7fd57fdf6d564c8a21460a4407ae68001badda4db839cc754181ce91cab4275e53
-MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
+EBUILD glib-networking-2.70_rc.ebuild 2175 BLAKE2B fa20fda5d1333311b666bddb0abead02c7fa740d52aa72cad56ef75e77ec727ca30387d08ff90d9aa88fb158564d5f4d18db6dbfd0af6608ba14bcc470b7e20b SHA512 02a81ebb9c730f251c851d6a86fc5900fdd603234981029975b5b00902bad981866421fa224ef1e49b3405530a7eead05ead13728b323fe44d51c971b5e6ffeb
+MISC metadata.xml 482 BLAKE2B 6476d4ef1f145739fddc035541725994d4866553b56bb34606863d23c615b33f63db35368ba382fcf9846cb485ee050d850596fc91c72551c5f3798ce240910c SHA512 3dcd22ea3b3fb78f11aead9e57d3a30e4f60e468209729c9e4c4647bf6c8e9163dfaae1a99ca00fed1e46f5288f73c2eb671f480fcc8349366daaa6670357983
diff --git a/net-libs/glib-networking/glib-networking-2.70_rc.ebuild b/net-libs/glib-networking/glib-networking-2.70_rc.ebuild
new file mode 100644
index 000000000000..60ee5f67b82b
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.70_rc.ebuild
@@ -0,0 +1,83 @@
+# 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"
+MY_PV=${PV/_/.}
+SRC_URI="mirror://gnome/sources/${GNOME_ORG_MODULE}/$(ver_cut 1-2)/${GNOME_ORG_MODULE}-${MY_PV}.tar.${GNOME_TARBALL_SUFFIX}"
+S="${WORKDIR}/${GNOME_ORG_MODULE}-${MY_PV}"
+
+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
+}
diff --git a/net-libs/glib-networking/metadata.xml b/net-libs/glib-networking/metadata.xml
index a1db58dba3a7..83497cd4b751 100644
--- a/net-libs/glib-networking/metadata.xml
+++ b/net-libs/glib-networking/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>gnome@gentoo.org</email>