gentoo resync : 05.04.2018

3 files changed, 15 insertions, 13 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index e4bac3253ad8..c4c61431701a 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,5 +1,5 @@
-DIST fwupd-1.0.4.tar.gz 1555679 BLAKE2B 75282437169cbb5a0da8d4c296ddd4fe62e32f4bd4d4b6d386b57708869a1dfc591a991c4c17dba5dac80f84e7238181b0beed654da453f72cc8e92f9513d3df SHA512 20f24253c4ee5c90d6d262ebe5c515bea78c6cc3720e78bdcff04c1b02500a79de583886ce0ae6c48d24b9c3d9638c4c5896d57d2efc0b77346317ba53924d2a
 DIST fwupd-1.0.5.tar.gz 1564037 BLAKE2B 1b97cf35e2531fc11b901f061dc30ac0c6b745f32f0b2f756e428509121ac3269d8d51c273566290cba2b840c890ce1274a268d46c35bd6486a932454c2d2cfa SHA512 dbbd0ae574c493de5d89f58e0050e44fd3cd1353807131d7e821ae02cffd4da594855df0ed35e9ceb72bdfc9c4b670e022d184c24897bf2ed370ce545c578621
-EBUILD fwupd-1.0.4.ebuild 2447 BLAKE2B 41d784772438221fd54e43a66ca563742bd2dbb3d5771394a0e3b283e52149532d86f43c8810da7e659a0201209e2c3579053553b155365bdb3424268988cc54 SHA512 4a4441e3da906e7fde5face91abc2f792ccf9a8ee8070a9a4fe5baea108ab40841955b160f7923cc4456b8ef88039108ffbd685301d4a7a9095d66f12e818c61
+DIST fwupd-1.0.6.tar.gz 1569675 BLAKE2B 1e6b4acc52696cc08086647ce69d4901e78201817423a53f1a6af5f9c5b7be658a5f343c88aa358788aa9d51859b29d8ea7269ec855841652a37a88ba577e01e SHA512 8daaf5d5cb91260c443448a874f92d948bf878dc44c586dbd4a75323dd834ba3b106fe570e30c7a0aefe4c4a7008b6db1ec2948a948b3fb94906ef1fe3f2e35a
 EBUILD fwupd-1.0.5.ebuild 2447 BLAKE2B 41d784772438221fd54e43a66ca563742bd2dbb3d5771394a0e3b283e52149532d86f43c8810da7e659a0201209e2c3579053553b155365bdb3424268988cc54 SHA512 4a4441e3da906e7fde5face91abc2f792ccf9a8ee8070a9a4fe5baea108ab40841955b160f7923cc4456b8ef88039108ffbd685301d4a7a9095d66f12e818c61
-MISC metadata.xml 738 BLAKE2B 53421e28e9d5b0d92a29b909ea234c22d38992979bc1f3d34781f9956a1250ba68e6f6c88f951ad1b029cc020d02ab80e7ab50bc5115084f53069e93985e37ba SHA512 d598e706e5d818a91f91589cf4e16f484e3bb574e1b778b681f1d927bc6014600841169f46765a325c5e27ee8360151e8c2ae2701f9ef1e826807ec924698124
+EBUILD fwupd-1.0.6.ebuild 2487 BLAKE2B b752c547e695bfec356468b7fb5089ca75f75e3ea3c782acc50200024a0adc46d51ab1906d00e1a812fe10c9855ea48093e6005c5f94bee73997ff2804c5fb46 SHA512 6cf5280743a7123c18f0be9c58021d08d36a09f39251386ba1f34232b40471cbed9830b38dda676806098b280d8ed48c1d7328c7dcb048d2df0994903b66174e
+MISC metadata.xml 834 BLAKE2B c71e6a3c51d232413bc726375abfc6716b82a8228644c0032aae613936b47f0aa44d61c7c4d34b00b78b70dab6a1e8a0e8cb9d19ba0555cdee231310fb60230f SHA512 ac8f92d0d9dee26834fb46635451a7b053866d01614ea53f00d37281d34165d462aeb867cc770006b2abbcefa0051eeb3fa2cc9751c0017c72d31fedf6587a90
diff --git a/sys-apps/fwupd/fwupd-1.0.4.ebuild b/sys-apps/fwupd/fwupd-1.0.6.ebuild
index c5747fe2cd8f..bf7962018270 100644
--- a/sys-apps/fwupd/fwupd-1.0.4.ebuild
+++ b/sys-apps/fwupd/fwupd-1.0.6.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
 
-inherit meson python-single-r1 xdg-utils
+inherit meson python-single-r1 vala xdg-utils
 
 DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
 HOMEPAGE="https://fwupd.org"
@@ -15,24 +15,24 @@ LICENSE="GPL-2+"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc gpg +man systemd test uefi uefi_labels"
+IUSE="colorhug dell doc gpg +man pkcs7 systemd test uefi uefi_labels"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 "
 
 RDEPEND="
 	${PYTHON_DEPS}
-	app-crypt/gpgme
+	app-arch/libarchive:=
 	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.6.13[introspection]
+	>=dev-libs/appstream-glib-0.6.13:=[introspection]
 	>=dev-libs/glib-2.45.8:2
 	dev-libs/libgpg-error
-	dev-libs/libgudev
+	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	>=net-libs/libsoup-2.51.92:2.4
+	>=net-libs/libsoup-2.51.92:2.4[introspection]
 	>=sys-auth/polkit-0.103
 	virtual/libelf:0=
 	colorhug? ( >=x11-misc/colord-1.2.12:0= )
@@ -44,6 +44,7 @@ RDEPEND="
 		app-crypt/gpgme
 		dev-libs/libgpg-error
 	)
+	pkcs7? ( net-libs/gnutls:= )
 	systemd? ( >=sys-apps/systemd-231 )
 	!systemd? ( >=sys-auth/consolekit-1.0.0 )
 	uefi? ( >=sys-apps/fwupdate-5 )
@@ -61,19 +62,18 @@ DEPEND="
 	app-arch/gcab
 	app-arch/libarchive
 	virtual/pkgconfig
+	$(vala_depend)
 	doc? ( dev-util/gtk-doc )
 	man? ( app-text/docbook-sgml-utils )
 	test? ( net-libs/gnutls[tools] )
 "
 
-# tests require some ominous "certtool" which has not been packages for Gentoo yet
-RESTRICT="test"
-
 REQUIRED_USE="dell? ( uefi )"
 
 src_prepare() {
 	default
 	sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
+	vala_src_prepare
 }
 
 src_configure() {
@@ -83,10 +83,11 @@ src_configure() {
 		-Dgpg="$(usex gpg true false)"
 		-Dgtkdoc="$(usex doc true false)"
 		-Dman="$(usex man true false)"
+		-Dpkcs7="$(usex pkcs7 true false)"
 		-Dplugin_colorhug="$(usex colorhug true false)"
 		-Dplugin_dell="$(usex dell true false)"
 		-Dplugin_synaptics="$(usex dell true false)"
-		# requires libtbtfwu which is not packaged yet
+		# requires libtbtfwu which is not packaged (yet?)
 		-Dplugin_thunderbolt=false
 		-Dplugin_uefi="$(usex uefi true false)"
 		-Dplugin_uefi-labels="$(usex uefi_labels true false)"
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index dd10e28c07e5..db5cd052b861 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -11,6 +11,7 @@
     <flag name="dell">Enable Dell-specific support.</flag>
     <flag name="gpg">Enable GPG support.</flag>
     <flag name="man">Build and install man pages</flag>
+    <flag name="pkcs7">Enable PKCS7 verification support via <pkg>net-libs/gnutls</pkg>.</flag>
     <flag name="uefi">Enable UEFI support</flag>
     <flag name="uefi_labels">Enable UEFI labels support</flag>
   </use>