[gentoo-commits] proj/gnome:master commit in: net-libs/glib-networking/files/, net-libs/glib-networking/

[gentoo-commits] proj/gnome:master commit in: net-libs/glib-networking/files/, net-libs/glib-networking/

[Remi Cardona]

commit:     e31fc2a53b8b37c9ea2bdc9839b9bc6441d2004a
Author:     Rémi Cardona <remi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 20:32:12 2018 +0000
Commit:     Remi Cardona <remi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 20:35:11 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e31fc2a5

net-libs/glib-networking: bump to 2.56.0

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Manifest-Sign-Key: 0xE0663D48103108F8

 ....0-Fix-building-tls-plugin-without-pkcs11.patch | 57 +++++++++++++++
 .../glib-networking/glib-networking-2.56.0.ebuild  | 84 ++++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/net-libs/glib-networking/files/2.56.0-Fix-building-tls-plugin-without-pkcs11.patch b/net-libs/glib-networking/files/2.56.0-Fix-building-tls-plugin-without-pkcs11.patch
new file mode 100644
index 00000000..b460b248
--- /dev/null
+++ b/net-libs/glib-networking/files/2.56.0-Fix-building-tls-plugin-without-pkcs11.patch
@@ -0,0 +1,57 @@
+From 4e9bfe7e32767be5a18fc38734da09607f13799a Mon Sep 17 00:00:00 2001
+From: Tom Schoonjans <Tom.Schoonjans@diamond.ac.uk>
+Date: Tue, 13 Mar 2018 16:57:03 +0000
+Subject: [PATCH] Fix building tls plugin without pkcs11
+
+https://bugzilla.gnome.org/show_bug.cgi?id=794292
+---
+ meson.build           | 3 +--
+ tls/tests/meson.build | 7 ++++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f923e53..0eb39e3 100644
+--- a/meson.build
++++ b/meson.build
+@@ -92,6 +92,7 @@ pkg = import('pkgconfig')
+ po_dir = join_paths(meson.source_root(), 'po')
+ 
+ top_inc = include_directories('.')
++tls_inc = include_directories('tls')
+ 
+ subdir('po')
+ 
+@@ -113,8 +114,6 @@ if enable_libproxy_support or enable_gnome_proxy_support
+ endif
+ 
+ if enable_pkcs11_support
+-  tls_inc = include_directories('tls')
+-
+   subdir('tls/pkcs11')
+ endif
+ 
+diff --git a/tls/tests/meson.build b/tls/tests/meson.build
+index 7e1ae13..d3611c1 100644
+--- a/tls/tests/meson.build
++++ b/tls/tests/meson.build
+@@ -1,4 +1,7 @@
+-incs = [top_inc]
++incs = [
++  top_inc,
++  tls_inc
++]
+ 
+ deps = [
+   gio_dep,
+@@ -25,8 +28,6 @@ test_programs = [
+ ]
+ 
+ if enable_pkcs11_support
+-  incs += tls_inc
+-
+   pkcs11_deps = deps + [
+     libgiopkcs11_dep,
+     pkcs11_dep
+-- 
+2.17.0
+

diff --git a/net-libs/glib-networking/glib-networking-2.56.0.ebuild b/net-libs/glib-networking/glib-networking-2.56.0.ebuild
new file mode 100644
index 00000000..ba7d5709
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.56.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome-meson 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 test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
+	app-misc/ca-certificates
+	>=net-libs/gnutls-3:=[${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}] )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.19.4
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus[X] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/2.56.0-Fix-building-tls-plugin-without-pkcs11.patch
+)
+
+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() {
+	gnome-meson_src_configure \
+		-Dstatic_modules=false \
+		-Dca_certificates_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+		$(meson_use gnome gnome_proxy_support) \
+		$(meson_use libproxy libproxy_support) \
+		$(meson_use smartcard pkcs11_support)
+		# TODO gnutls is mandatory with meson
+}
+
+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 meson_src_test
+}
+
+multilib_src_install() {
+	gnome-meson_src_install
+}
+
+pkg_postinst() {
+	gnome-meson_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() {
+	gnome-meson_pkg_postrm
+
+	multilib_pkg_postrm() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postrm
+}