gentoo resync : 03.12.2017

7 files changed, 42 insertions, 170 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 6d4d52460442..809f116afe8f 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,10 +1,7 @@
-AUX fwupd-0.9-polkit_its_files.patch 2298 BLAKE2B 4ac967398d88f47640f6390dd6399c86958a42715628129d472353c2cddc382b44aa6f01d0853614fcf58fdb5d14208e495170b2c8bdca666ce423bd2b3c8e75 SHA512 032e081ef068834e131595a21481fd02b74dfb765ec2a4a080115b9c1f07914220cd197ba18c041def4b33a6784e168d7e77d45dc18700539d98a057e8fa1365
-DIST fwupd-0.9.5.tar.gz 1389768 SHA256 876bb4c1cc5b27bb5f30e1c5d81522c82554738bede9a811f9e352966e58453e SHA512 2a8ca8da2fffa71bdaa44b82aff1a4151441b8496793101d7d0b1ab984bfbb10a3a94c4ebae5cfc17241364ab7aed051252a70543ebe6a82dd8bdb5c6f52863d WHIRLPOOL b7d606acd35a58e25ee94045557899b1c9ea30941024cfb17bf3226f39dab7961c802abafc9ca6320e21ea1ca3792a0bd37fa942476dfd0b37c4ce3b4fe28b5b
-DIST fwupd-0.9.6.tar.gz 1404749 SHA256 cf406eb11b284cd89228db53bff787cb8468d4e14a910acdea4c995f04df2435 SHA512 d2098d2f14319728f1f2078126f68ee5b5cb2f32687428f61db13b01ad3904ea6c641c3758044229a7d1f48a0b96c7984a119d48a8ef5efc65e29e90476f4017 WHIRLPOOL 7854fd62fb87980c2d89d8341c85f4ddbf860c3cfbd0a1e541caac28c36f4499db1b2e78a42b7d8351a519bbb6d7ce2e75b3fa13672b5ca7b7f8e2cc35ceaf34
 DIST fwupd-1.0.0.tar.gz 1466486 SHA256 179ee1fb5c0099ba9bfb8c07178574cc7408297d2af80ddf483e9f147b30e31a SHA512 6bf5e691b2d958b28e6002bfbc06bd19440876aea8dc55f761e10e039141e12df14a6ec8c2f2479b82770feeee4a15296229dd662653841bb0b41d4ea61fa422 WHIRLPOOL 0db3183049921b8ac30b5855c3657d6c51a948bba2728178ed4932e18401f15f6af7178ac866a56347219b334385c826ce5cec0ac72ddcba799251b3f91468b9
-DIST fwupd-1.0.1.tar.gz 1498681 SHA256 9a4eeb37241f4b4e1eeade9d431e074f5324573e450ea9d2ef4af3fd8b59def3 SHA512 f89455563d8d587bee6c6f4a9a1ff75401d803a89087ddb73b9260e2578e581bdc315593b7bb3466318a52123383c9499cba2fe3ead0fe13efd40d907a753345 WHIRLPOOL 774ff9b64e6e37b12b48c987ed2515d958127883e84ae988a5b491a238fc6a486adf29d2b4d615ef2107eb87c915d1eed8deff8875c6cd749fb004b98f10f4c2
-EBUILD fwupd-0.9.5-r1.ebuild 2172 BLAKE2B e6c7408b2a2d894c8ea6e4cbc0587c2248dff253f0f4f9016ce1091411cefbac2cfd127703ca8eac78951867e61fc9e6f359c31442ecf29c2378c4ebd0648c60 SHA512 d4b49cb711efd77ef2835294a92e6c61d2f0d3d833758befe4c6dc264e879c60c20d2fc4463c7600b942ed73aad2b379e691008ab94cb31e9e8530b213c77ad3
-EBUILD fwupd-0.9.6.ebuild 2111 BLAKE2B 4c25db796be3495a27c13da311f5c7df8d9cec5af98ee2da4f281dce7deb9166e0768740ca260cb1cce994eddaff7b3ed0e8190dfa2414a8d344609c0924077e SHA512 8a62187f7aecdc16bda9d30751ac9f3767621ea6588f9c24e8b141f5e7a334f437a3eb473cb9f4929e9714d9bd9bd970abbbd2c224454580a3daf5570c2e46f0
-EBUILD fwupd-1.0.0.ebuild 2366 BLAKE2B 04386e98b68a2df831631b1b6a47dad18b0c709ede9ed8b8c3ea29bf505ffa2ac078a21cac51916599a5e760e0667b823c0fa2cbe6f45c708ddb2d2862087d62 SHA512 7a04646aefec3344873c3604ae7249538529817987361ffb47ac696c590c39a8e580414bc5a5e60f289ea8bc43a56c8f2c3a58243add2569f7fa4bd06b711b50
-EBUILD fwupd-1.0.1.ebuild 2366 BLAKE2B 04386e98b68a2df831631b1b6a47dad18b0c709ede9ed8b8c3ea29bf505ffa2ac078a21cac51916599a5e760e0667b823c0fa2cbe6f45c708ddb2d2862087d62 SHA512 7a04646aefec3344873c3604ae7249538529817987361ffb47ac696c590c39a8e580414bc5a5e60f289ea8bc43a56c8f2c3a58243add2569f7fa4bd06b711b50
-MISC metadata.xml 790 BLAKE2B acccebd5c400f0b0b47b79d18bb11f8a62f3558d145218afa95fafef7ac7e4e03ccabf9a7b0a199597e69e070e5acd808cac5a5ab7cedf14bf78f710c55e949e SHA512 5b0e4ce1e52ffc53059e995698820ad7f426a13e81bf9fb7f7e41f8c706839c5493bf72d3b75c55e8bf12be97dc6bde1a1a4eee473e8022e387b4256e6f67f49
+DIST fwupd-1.0.1.tar.gz 1498681 BLAKE2B 3320c540d5395c28ab778d40e5a9901f877a7606b5e5188a7bc8e1c17648916c52e752363f07e01e5381894feb9df7034064bebb62a9088fbaf8affd01685d34 SHA512 f89455563d8d587bee6c6f4a9a1ff75401d803a89087ddb73b9260e2578e581bdc315593b7bb3466318a52123383c9499cba2fe3ead0fe13efd40d907a753345
+DIST fwupd-1.0.2.tar.gz 1516078 BLAKE2B bdc0d54fa0058a329d409debd41c4f83f7036669b3356ca82d86a1233ca567841b1758adeb8f8abbfb7f9bda004934ba970747da413dc4862e459792a42745ec SHA512 52773590255b0a120c56f5f8b58243e88fcc322d8f2348b5f463db4107aebd4df2769103e003d095b1d0571c598c0274af0b7da4a248e4dd1786156697170e06
+EBUILD fwupd-1.0.0.ebuild 2466 BLAKE2B 150f5af501a5abd738a06f08b6e0b064062485df4cd5f256995c46ec9df5e4c41838627d8a6745c84df82dc432a488ebe4a2ab31b093271a9ba888b4c9e3ea23 SHA512 534111d6d6099592b10ba7b58cd6b7683bac7178abd0e43d3acf1403b3410461b1e7430c63a8254d2cb338d4c9e92422809601f1a1ecffc55c4db89e9b1464d9
+EBUILD fwupd-1.0.1.ebuild 2466 BLAKE2B 150f5af501a5abd738a06f08b6e0b064062485df4cd5f256995c46ec9df5e4c41838627d8a6745c84df82dc432a488ebe4a2ab31b093271a9ba888b4c9e3ea23 SHA512 534111d6d6099592b10ba7b58cd6b7683bac7178abd0e43d3acf1403b3410461b1e7430c63a8254d2cb338d4c9e92422809601f1a1ecffc55c4db89e9b1464d9
+EBUILD fwupd-1.0.2.ebuild 2468 BLAKE2B 3e2171512869cfb08ba0121dabcdeb527acd5da45248506a6c03558d622d1ec3d13a07da08d68bdb3a27b9228db8f82edf773510cafe7c21b13ed52f54200269 SHA512 2d640bf0f2e71955c75a99cbdf856a30f8d48cfcd027c9b2b6515edf0227d5baf4764fabf672bb4a3840f5a3cd19abf2a245b53c35e4e5043bb05b67a53a5d12
+MISC metadata.xml 838 BLAKE2B 94e61de164b7858afceebb163391c113e557d7d962c40650ac2e45a334e2347ad5ee42123ca5e878693a0768ca9819ce29e64650b0dae6d0e49c558d46550ba3 SHA512 22e958ed755f3d824fed8f164fb20943947ff1038382e8983104e15c4b0b57540f940da6933a2a121e4795ddafba817cecf0fde92e563d5b875574c268eb4f4c
diff --git a/sys-apps/fwupd/files/fwupd-0.9-polkit_its_files.patch b/sys-apps/fwupd/files/fwupd-0.9-polkit_its_files.patch
deleted file mode 100644
index 999df1cba252..000000000000
--- a/sys-apps/fwupd/files/fwupd-0.9-polkit_its_files.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 797e5672e64acd4f90cd52afca3bb192b28b4636 Mon Sep 17 00:00:00 2001
-From: Julian Liu <liu.julian@gmail.com>
-Date: Fri, 28 Apr 2017 18:09:20 +0800
-Subject: [PATCH] Add polkit's ITS files as Ubuntu doesn't not ship with it.
-
-Call msgfmt with custom_target for now as data_dir kargs for i18n.merge_file() not merged into master yet.
-(https://github.com/mesonbuild/meson/issues/1565)
----
- its/polkit.its     |  8 ++++++++
- its/polkit.loc     |  6 ++++++
- policy/meson.build | 12 ++++++++----
- 3 files changed, 22 insertions(+), 4 deletions(-)
- create mode 100644 its/polkit.its
- create mode 100644 its/polkit.loc
-
-diff --git a/its/polkit.its b/its/polkit.its
-new file mode 100644
-index 0000000..1c37e6b
---- /dev/null
-+++ b/its/polkit.its
-@@ -0,0 +1,8 @@
-+<?xml version="1.0"?>
-+<its:rules xmlns:its="http://www.w3.org/2005/11/its"
-+           version="2.0">
-+  <its:translateRule selector="//*" translate="no"/>
-+  <its:translateRule selector="//action/description |
-+                               //action/message"
-+                     translate="yes"/>
-+</its:rules>
-diff --git a/its/polkit.loc b/its/polkit.loc
-new file mode 100644
-index 0000000..c7427ec
---- /dev/null
-+++ b/its/polkit.loc
-@@ -0,0 +1,6 @@
-+<?xml version="1.0"?>
-+<locatingRules>
-+  <locatingRule name="polkit policy" pattern="*.policy">
-+    <documentRule localName="policyconfig" target="polkit.its"/>
-+  </locatingRule>
-+</locatingRules>
-diff --git a/policy/meson.build b/policy/meson.build
-index def8976..41da2db 100644
---- a/policy/meson.build
-+++ b/policy/meson.build
-@@ -1,11 +1,15 @@
- install_data('org.freedesktop.fwupd.rules',
-              install_dir : 'share/polkit-1/rules.d')
- 
--i18n.merge_file(
--  input: 'org.freedesktop.fwupd.policy.in',
-+envbin = find_program('env')
-+gettext_data_dir = 'GETTEXTDATADIRS=' + meson.source_root()
-+custom_target('org.freedesktop.fwupd.policy',
-   output: 'org.freedesktop.fwupd.policy',
--  type: 'xml',
--  po_dir: join_paths(meson.source_root(), 'po'),
-+  input: 'org.freedesktop.fwupd.policy.in',
-+  command: [envbin, gettext_data_dir, 'msgfmt', '--xml',
-+            '--template', '@INPUT@',
-+            '-d', join_paths(meson.source_root(), 'po'),
-+            '-o', '@OUTPUT@'],
-   install: true,
-   install_dir: join_paths(get_option('datadir'), 'polkit-1', 'actions')
- )
diff --git a/sys-apps/fwupd/fwupd-0.9.6.ebuild b/sys-apps/fwupd/fwupd-0.9.6.ebuild
deleted file mode 100644
index 19962f03252f..000000000000
--- a/sys-apps/fwupd/fwupd-0.9.6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit meson python-single-r1 xdg-utils
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc elf +man systemd uefi uefi_labels"
-REQUIRED_USE="uefi_labels? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-crypt/gpgme
-	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.6.13[introspection]
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/libgpg-error
-	dev-libs/libgudev
-	>=dev-libs/libgusb-0.2.9[introspection]
-	>=net-libs/libsoup-2.51.92:2.4
-	>=sys-auth/polkit-0.103
-	colorhug? ( >=x11-misc/colord-1.2.12:0= )
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.3.3
-	)
-	elf? ( virtual/libelf:0= )
-	systemd? ( >=sys-apps/systemd-231 )
-	!systemd? ( >=sys-auth/consolekit-1.0.0 )
-	uefi? ( >=sys-apps/fwupdate-5 )
-	uefi_labels? (
-		${PYTHON_DEPS}
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/pango
-		x11-libs/cairo
-		media-libs/freetype
-		media-libs/fontconfig
-		media-fonts/dejavu
-		media-fonts/source-han-sans
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/gcab
-	app-arch/libarchive
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
-"
-
-REQUIRED_USE="dell? ( uefi )"
-
-src_configure() {
-	xdg_environment_reset
-	local emesonargs=(
-		-Denable-colorhug="$(usex colorhug true false)"
-		-Denable-consolekit="$(usex systemd false true)"
-		-Denable-dell="$(usex dell true false)"
-		-Denable-doc="$(usex doc true false)"
-		-Denable-man="$(usex man true false)"
-		-Denable-libelf="$(usex elf true false)"
-		-Denable-systemd="$(usex systemd true false)"
-		# requires libtbtfwu which is not packaged yet
-		-Denable-thunderbolt=false
-		-Denable-uefi="$(usex uefi true false)"
-		-Denable-uefi-labels="$(usex uefi_labels true false)"
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/fwupd/fwupd-1.0.0.ebuild b/sys-apps/fwupd/fwupd-1.0.0.ebuild
index 6d4d3f01c65e..c102d10d91b7 100644
--- a/sys-apps/fwupd/fwupd-1.0.0.ebuild
+++ b/sys-apps/fwupd/fwupd-1.0.0.ebuild
@@ -62,6 +62,9 @@ DEPEND="
 	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() {
diff --git a/sys-apps/fwupd/fwupd-1.0.1.ebuild b/sys-apps/fwupd/fwupd-1.0.1.ebuild
index 6d4d3f01c65e..c102d10d91b7 100644
--- a/sys-apps/fwupd/fwupd-1.0.1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.0.1.ebuild
@@ -62,6 +62,9 @@ DEPEND="
 	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() {
diff --git a/sys-apps/fwupd/fwupd-0.9.5-r1.ebuild b/sys-apps/fwupd/fwupd-1.0.2.ebuild
index 1f4146f8c86e..c3bdbec6962f 100644
--- a/sys-apps/fwupd/fwupd-0.9.5-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.0.2.ebuild
@@ -15,8 +15,10 @@ LICENSE="GPL-2+"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc elf +man systemd uefi uefi_labels"
-REQUIRED_USE="uefi_labels? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="colorhug dell doc gpg +man systemd test uefi uefi_labels"
+REQUIRED_USE="
+	uefi_labels? ( ${PYTHON_REQUIRED_USE} )
+"
 
 RDEPEND="
 	app-crypt/gpgme
@@ -28,12 +30,16 @@ RDEPEND="
 	>=dev-libs/libgusb-0.2.9[introspection]
 	>=net-libs/libsoup-2.51.92:2.4
 	>=sys-auth/polkit-0.103
+	virtual/libelf:0=
 	colorhug? ( >=x11-misc/colord-1.2.12:0= )
 	dell? (
 		sys-libs/efivar
 		>=sys-libs/libsmbios-2.3.3
 	)
-	elf? ( virtual/libelf:0= )
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
 	systemd? ( >=sys-apps/systemd-231 )
 	!systemd? ( >=sys-auth/consolekit-1.0.0 )
 	uefi? ( >=sys-apps/fwupdate-5 )
@@ -57,28 +63,35 @@ DEPEND="
 	virtual/pkgconfig
 	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 )"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9-polkit_its_files.patch"
-)
+src_prepare() {
+	default
+	sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
+}
 
 src_configure() {
 	xdg_environment_reset
 	local emesonargs=(
-		-Denable-colorhug="$(usex colorhug true false)"
-		-Denable-consolekit="$(usex systemd false true)"
-		-Denable-dell="$(usex dell true false)"
-		-Denable-doc="$(usex doc true false)"
-		-Denable-man="$(usex man true false)"
-		-Denable-libelf="$(usex elf true false)"
-		-Denable-systemd="$(usex systemd true false)"
+		-Dconsolekit="$(usex systemd false true)"
+		-Dgpg="$(usex gpg true false)"
+		-Dgtkdoc="$(usex doc true false)"
+		-Dman="$(usex man 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
-		-Denable-thunderbolt=false
-		-Denable-uefi="$(usex uefi true false)"
-		-Denable-uefi-labels="$(usex uefi_labels true false)"
+		-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)"
 	)
 	meson_src_configure
 }
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index bad753d8cddc..a6f7b5108871 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="elf">Enable libelf support through
       <pkg>dev-libs/libelf</pkg> package.</flag>
+    <flag name="gpg">Enable GPG support.</flag>
     <flag name="man">Build and install man pages</flag>
     <flag name="uefi">Enable UEFI support</flag>
     <flag name="uefi_labels">Enable UEFI labels support</flag>