gentoo resync : 24.12.2018

3 files changed, 88 insertions, 3 deletions

diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 3d8f496fbfdf..c7e59f19c5eb 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,3 +1,5 @@
 DIST glib-networking-2.50.0.tar.xz 435380 BLAKE2B 02eea0692cf20c9b1df8efc7e65eb144675fa307851450d461a73df6ccd55cb2ad4e8db5790ca8b0a38a14e30391e583dada30e858154e7c5b7fa0970658410a SHA512 a1e9d28a546f83d461057f088ca2467a32be110f444c8ede1cbfeb20244637d8d5fb5b5b0ee4485feb517beebc3536671442bbfdd3ba01663b52e6da138bd7fe
-EBUILD glib-networking-2.50.0.ebuild 2297 BLAKE2B 3718d5152e81516797b18be99e7e15e5f440c2ef0d7e3ddd267a86f953050d7f9a6dcd989cea8762416a65e4e6a3e7cb7e6e246fd2ad8de454f78ebe324ec0ee SHA512 627eab8efae60e19bf1b74c3fb0a0846020cd26c75d58673694b5e5f739d8743fac59290f50351cbf6917ca837fb24e0f98dbe92a891e9b320c77e3c031895d5
+DIST glib-networking-2.54.1.tar.xz 441232 BLAKE2B 4697ac5fe248d12839d2a3c1340e2e699fa2ea65a9b5d741c50d069c904e82eb23feb89d648bc127959d9ac15e18d3a4cd2bd8b08202d48d33937affb9df13c9 SHA512 8356d835914e33df43f4f2bb6a915ddcd48dd0565e4d5bc1f1d692e9c3124ee4421b99f87f2586f74e9fed24ef7421159f3242fd1eb7bd74950bd25e860896ec
+EBUILD glib-networking-2.50.0.ebuild 2293 BLAKE2B c92ae68d866e7e2f802a979cd821249e35a0a75b69bb1818674ff15744802ce7516dc0ec8666393f3922579b39df3f17ee736f1a49e5c4a8f9d3b7db06c5157a SHA512 c7ff70b244989b2e179bcb43ab3a96f60fb5cdb7341db95b0ee08ed74619f537286d5d2fb9b0318e2d27b484837297a390f93eee07bfd324ea8248a5d80fa79e
+EBUILD glib-networking-2.54.1.ebuild 2303 BLAKE2B 89d5bcb3def0c2f317178a3f829a4b11e6ed7be8f8fd84c30ab7c557f745efb409c5ffaa8a4b25fef356d8db684e1da4043e421554b9868314eae753fa75002b SHA512 e189a1c150af2e8b8cfbc569b91c6cf27ece865ed6d6827baf39f5ce63bb6fbe985d70a9ec742827a49cc65cb95368f6858321db1cf63d2134b6576f81813ac1
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.50.0.ebuild b/net-libs/glib-networking/glib-networking-2.50.0.ebuild
index 9833c8f9bcb8..0042a4910c5e 100644
--- a/net-libs/glib-networking/glib-networking-2.50.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2+"
 SLOT="0"
 IUSE="+gnome +libproxy smartcard +ssl test"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.46.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/glib-networking/glib-networking-2.54.1.ebuild b/net-libs/glib-networking/glib-networking-2.54.1.ebuild
new file mode 100644
index 000000000000..d8202c0db40f
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.54.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="+gnome +libproxy smartcard +ssl test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.46.0:2[${MULTILIB_USEDEP}]
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+	smartcard? (
+		>=app-crypt/p11-kit-0.18.4[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-3:=[pkcs11,${MULTILIB_USEDEP}] )
+	ssl? (
+		app-misc/ca-certificates
+		>=net-libs/gnutls-3:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.19.4
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus[X] )
+"
+# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
+
+src_prepare() {
+	default
+	# Disable SSLv3 requiring fallback test, which fails with net-libs/gnutls[-sslv3], bug 595952
+	# https://bugzilla.gnome.org/show_bug.cgi?id=782853
+	sed -i -e '/\/tls\/connection\/fallback\/SSL/d' "${S}"/tls/tests/connection.c || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+		$(use_with gnome gnome-proxy) \
+		$(use_with libproxy) \
+		$(use_with smartcard pkcs11) \
+		$(use_with ssl gnutls)
+}
+
+multilib_src_test() {
+	# XXX: non-native tests fail if glib-networking is already installed.
+	# have no idea what's wrong. would appreciate some help.
+	multilib_is_native_abi || return 0
+
+	virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	gnome2_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() {
+	gnome2_pkg_postrm
+
+	multilib_pkg_postrm() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postrm
+}