gentoo resync : 14.07.2018

4 files changed, 29 insertions, 23 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index a37d11ad3ace..a44c1926b1ff 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,5 +1,5 @@
-DIST fwupd-1.0.6.tar.gz 1569675 BLAKE2B 1e6b4acc52696cc08086647ce69d4901e78201817423a53f1a6af5f9c5b7be658a5f343c88aa358788aa9d51859b29d8ea7269ec855841652a37a88ba577e01e SHA512 8daaf5d5cb91260c443448a874f92d948bf878dc44c586dbd4a75323dd834ba3b106fe570e30c7a0aefe4c4a7008b6db1ec2948a948b3fb94906ef1fe3f2e35a
 DIST fwupd-1.0.8.tar.gz 1584132 BLAKE2B 7744d14a02bd9847c0c1efe8ff8365abccf9d5213150687815d3e1236844ec71dbf161e5f5d7be32103c3613640680b5b2a017f1a60a30df93fc55bf5d765f74 SHA512 11bdc1dd77697b690e849bde59e54cf289cde32f410f9f7e8911a874f0a265b091ac2e335f784f54b64f835f2750a63a74092cc5eaf7a6c70eaa6d06995d131e
-EBUILD fwupd-1.0.6.ebuild 2487 BLAKE2B b752c547e695bfec356468b7fb5089ca75f75e3ea3c782acc50200024a0adc46d51ab1906d00e1a812fe10c9855ea48093e6005c5f94bee73997ff2804c5fb46 SHA512 6cf5280743a7123c18f0be9c58021d08d36a09f39251386ba1f34232b40471cbed9830b38dda676806098b280d8ed48c1d7328c7dcb048d2df0994903b66174e
-EBUILD fwupd-1.0.8.ebuild 2621 BLAKE2B 1996f358cf376ae14baaace3623a987e7a045bfcb9a3d3d38895c429e298439d71bec424feb03288309c0f47dbbf6014a8ecd1262e827f7c8d95f753870b2ad9 SHA512 792633ec3514a0189ea83da3e6e1a1e52b13a491b3e29b93329e014ffb750554636c3c17dc09eae4cdac0eb98f37b20e1e78477d89009185e5b3b31a46608b6e
-MISC metadata.xml 834 BLAKE2B c71e6a3c51d232413bc726375abfc6716b82a8228644c0032aae613936b47f0aa44d61c7c4d34b00b78b70dab6a1e8a0e8cb9d19ba0555cdee231310fb60230f SHA512 ac8f92d0d9dee26834fb46635451a7b053866d01614ea53f00d37281d34165d462aeb867cc770006b2abbcefa0051eeb3fa2cc9751c0017c72d31fedf6587a90
+DIST fwupd-1.1.0.tar.gz 1636214 BLAKE2B 492c33eb54852dd7d73f511dd6e5aa222b35e1898105bbfb291e1095c3968101597185cff2a1889e9da5728fdd0c8d4638e7e2102b12cf7659a1b6612ca0e9b7 SHA512 058d4564cf922b5056f6197261d77b97db7238a1658d69d9b29bec70a44542a5a131071935747e0cc963661a61b242ca98375ed8da920f819d37a706aec0c2ae
+EBUILD fwupd-1.0.8-r1.ebuild 2571 BLAKE2B 319b1a34fdd87aadffcd39e73713b09b1cdf5191582c71bd2192fe07a4db3494a4108f92fa331c7cb5ab12725ece340df8dad94cd4544cf10cf0b3af3b8015c8 SHA512 4a42e8c3d1b860b7936b320b78d2e453f4412312d412176dc53f3dce0f8ce28311d2ec79dc2eedc381f46ddfe332c35e97e49775bdea9f1f07c600fd5ae866cc
+EBUILD fwupd-1.1.0.ebuild 2583 BLAKE2B 30a1ffe9ec7a4f6ae154c24478568c2b12c841e3fc16d1ee390edcc09379982c99aeddec75d7ae56e9e95db5776a579111a6cf9686ee20b3802605a7f8e93acc SHA512 447ce527e8aa2ee6bf629f9840dbbaa10826c1697503866928e0f58ebd2db0ce89de931cbbdb36af4ff52e8b31b2acf1fb89f56cde3093c5190875f8596dfee2
+MISC metadata.xml 889 BLAKE2B d567f74fb461b0740d21bbc1e2b37692928aa2dbab77250743b898b6aaab8579bea218d4aa1fe379f45422d7ca4b9b81fbcd6bb2c8c41b586b27c0b30f71715a SHA512 80c84c24df419837825e4dc4453dc360c32f4e3eef3d117fe51a8675717ebd6f64bae27df6221895d86d9f099092c3c7e9e5b7650851722ccfc927a874bec001
diff --git a/sys-apps/fwupd/fwupd-1.0.8.ebuild b/sys-apps/fwupd/fwupd-1.0.8-r1.ebuild
index b1dbd1d0395c..da2b82c2bba9 100644
--- a/sys-apps/fwupd/fwupd-1.0.8.ebuild
+++ b/sys-apps/fwupd/fwupd-1.0.8-r1.ebuild
@@ -88,13 +88,12 @@ src_configure() {
 		-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?)
 		-Dplugin_thunderbolt=false
 		-Dplugin_uefi="$(usex uefi true false)"
-		-Dplugin_uefi-labels="$(usex uefi_labels true false)"
+		-Dplugin_uefi_labels="$(usex uefi_labels true false)"
 		-Dsystemd="$(usex systemd true false)"
 		-Dtests="$(usex test true false)"
 	)
diff --git a/sys-apps/fwupd/fwupd-1.0.6.ebuild b/sys-apps/fwupd/fwupd-1.1.0.ebuild
index bf7962018270..431667267fac 100644
--- a/sys-apps/fwupd/fwupd-1.0.6.ebuild
+++ b/sys-apps/fwupd/fwupd-1.1.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+# Package requires newer meson than eclass provides
+MESON_AUTO_DEPEND="no"
 PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
 
 inherit meson python-single-r1 vala xdg-utils
@@ -15,16 +17,17 @@ LICENSE="GPL-2+"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc gpg +man pkcs7 systemd test uefi uefi_labels"
+IUSE="colorhug dell doc gpg +man pkcs7 redfish systemd test uefi"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
+	dell? ( uefi )
 "
 
 RDEPEND="
 	${PYTHON_DEPS}
 	app-arch/libarchive:=
 	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.6.13:=[introspection]
+	>=dev-libs/appstream-glib-0.7.4:=[introspection]
 	>=dev-libs/glib-2.45.8:2
 	dev-libs/libgpg-error
 	dev-libs/libgudev:=
@@ -38,29 +41,32 @@ RDEPEND="
 	colorhug? ( >=x11-misc/colord-1.2.12:0= )
 	dell? (
 		sys-libs/efivar
-		>=sys-libs/libsmbios-2.3.3
+		>=sys-libs/libsmbios-2.4.0
 	)
 	gpg? (
 		app-crypt/gpgme
 		dev-libs/libgpg-error
 	)
-	pkcs7? ( net-libs/gnutls:= )
-	systemd? ( >=sys-apps/systemd-231 )
+	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
+	redfish? (
+		dev-libs/json-glib
+		sys-libs/efivar
+	)
+	systemd? ( >=sys-apps/systemd-211 )
 	!systemd? ( >=sys-auth/consolekit-1.0.0 )
-	uefi? ( >=sys-apps/fwupdate-5 )
-	uefi_labels? (
-		x11-libs/pango
-		x11-libs/cairo
-		media-libs/freetype
+	uefi? (
 		media-libs/fontconfig
-		media-fonts/dejavu
-		media-fonts/source-han-sans
+		media-libs/freetype
+		>=sys-libs/efivar-33
+		x11-libs/cairo
 	)
 "
 DEPEND="
 	${RDEPEND}
 	app-arch/gcab
 	app-arch/libarchive
+	>=dev-util/meson-0.41.0
+	>=dev-util/ninja-1.7.2
 	virtual/pkgconfig
 	$(vala_depend)
 	doc? ( dev-util/gtk-doc )
@@ -68,11 +74,12 @@ DEPEND="
 	test? ( net-libs/gnutls[tools] )
 "
 
-REQUIRED_USE="dell? ( uefi )"
-
 src_prepare() {
 	default
-	sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
+	sed -e "s/'--create'/'--absolute-name', '--create'/" \
+		-i data/tests/builder/meson.build || die
+	sed -e "/'-Werror',/d" \
+		-i plugins/uefi/efi/meson.build || die
 	vala_src_prepare
 }
 
@@ -84,13 +91,12 @@ src_configure() {
 		-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_redfish="$(usex redfish true false)"
 		-Dplugin_synaptics="$(usex dell true false)"
 		# requires libtbtfwu which is not packaged (yet?)
 		-Dplugin_thunderbolt=false
 		-Dplugin_uefi="$(usex uefi true false)"
-		-Dplugin_uefi-labels="$(usex uefi_labels true false)"
 		-Dsystemd="$(usex systemd true false)"
 		-Dtests="$(usex test true false)"
 	)
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index db5cd052b861..b15f190a058b 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -12,6 +12,7 @@
     <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="redfish">Install redfish plugin</flag>
     <flag name="uefi">Enable UEFI support</flag>
     <flag name="uefi_labels">Enable UEFI labels support</flag>
   </use>