gentoo resync : 16.02.1018

3 files changed, 97 insertions, 0 deletions

diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 456259c5b917..b69a657508dc 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,3 +1,6 @@
+AUX 1.2-optional-vapi.patch 1417 BLAKE2B 69bb7480a352894ec9c96f0566972a87004801af378d4f1a5953228e3485a7a0fd497f55e03134bf446f44b89e3c8cee9547b7d6043da2af8e8daceeef01117b SHA512 2371a86ad9961937c625fd29a7f6229038ecf9ec48591ec0e152d17c9cb78c8524a31c7b667ecf9e630a84abbfc334541aec7be2d2b30b51c0fe286c0028a8c8
 DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
+DIST gcab-1.2.tar.xz 76088 BLAKE2B 4d8f04ec6211745e841b88e93c5d156843bce9ca8668daf9d39f1197c814d619f7e61b1e20d163c8631da36bf395776c3b20a91a0ec97ff7c609997fa84a538d SHA512 b5cc114f5cea21c21d9ef2009cefce700b5a7f97609e20aa455b84fcefe1693ce2566ddc58dc2b7c97f7db772f8ae3a2f3cc9a0e1d2c23d93d5fbee9101d3f64
 EBUILD gcab-0.8.ebuild 924 BLAKE2B e1d26430d255f52f12ae93d5a5b034e384aa049ef75bea44c9dee082519f6cc166d8e4dd9dd2041879397d896d375aefff345578c96a5c9a1e712e1ee05107b1 SHA512 af2f575805991c4737106b77212c9b3f241bcf6fdc0ddd50fa497c6e6e4d6bf3a61dad3800512b19e3028016fc226f0cfe777d72edc57da2afb45add3f398795
+EBUILD gcab-1.2.ebuild 1154 BLAKE2B 87357df96560ed1a7536a76325937373c49a9e41cfba98b173ac5947a77e51dba4010442936b2a804dc7de302174333ab0dc220a9874e259686de8464f75ee91 SHA512 ce1e8912e6f86556b184b896e7a477bda4a104dbc8624299f5fdc03bb493e95aa281266f9dd4a9826c9b4bca37116e78f94b93f1d09d6d19a67844ac821b6d0e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/files/1.2-optional-vapi.patch b/app-arch/gcab/files/1.2-optional-vapi.patch
new file mode 100644
index 000000000000..10a171926cb9
--- /dev/null
+++ b/app-arch/gcab/files/1.2-optional-vapi.patch
@@ -0,0 +1,44 @@
+From 5ac7272bba9635234fc08ab526b80a9f259d0fc6 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Tue, 12 Feb 2019 11:44:10 +0200
+Subject: [PATCH] build-sys: Support disabling vapi generation independent of
+ introspection
+
+---
+ libgcab/meson.build | 12 +++++++-----
+ meson_options.txt   |  1 +
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/libgcab/meson.build b/libgcab/meson.build
+index f939617..3c4ac68 100644
+--- a/libgcab/meson.build
++++ b/libgcab/meson.build
+@@ -93,9 +93,11 @@ if get_option('introspection')
+     ],
+     install : true
+   )
+-  gnome.generate_vapi('libgcab-1.0',
+-    sources: gir[0],
+-    packages : ['gio-2.0'],
+-    install : true,
+-  )
++  if get_option('vapi')
++    gnome.generate_vapi('libgcab-1.0',
++      sources: gir[0],
++      packages : ['gio-2.0'],
++      install : true,
++    )
++  endif
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index bbcbbea..b7ade3f 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,4 @@
+ option('docs', type : 'boolean', value : true, description : 'enable developer documentation')
+ option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data')
++option('vapi', type : 'boolean', value : true, description: 'generate Vala bindings (requires introspection)')
+ option('tests', type : 'boolean', value : true, description : 'enable tests')
+-- 
+2.17.0
+
diff --git a/app-arch/gcab/gcab-1.2.ebuild b/app-arch/gcab/gcab-1.2.ebuild
new file mode 100644
index 000000000000..734b3f1b4a88
--- /dev/null
+++ b/app-arch/gcab/gcab-1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
+HOMEPAGE="https://wiki.gnome.org/msitools"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE="gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/${PV}-optional-vapi.patch ) # https://gitlab.gnome.org/GNOME/gcab/merge_requests/1
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}