gentoo resync : 13.01.2018

4 files changed, 22 insertions, 115 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index a6b26866160e..e0070cf3f0a6 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,7 +1,5 @@
-DIST fwupd-1.0.0.tar.gz 1466486 BLAKE2B 284f17eb9150251ca012f5b09eed925a397d77375f6d4ab1d0872b6a3c1c7ded4f76d8d8c158797154696b04e8856b9ddd1b185dd0df8465c50d93beeaa3335a SHA512 6bf5e691b2d958b28e6002bfbc06bd19440876aea8dc55f761e10e039141e12df14a6ec8c2f2479b82770feeee4a15296229dd662653841bb0b41d4ea61fa422
-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
+DIST fwupd-1.0.3.tar.gz 1534438 BLAKE2B b578bc4f8a53bd596f13a2bc45e5229b30a9aacb837fe3ef3b267eaaf5e8e277c21b9c2b915495d5b58a36b386b9b223ff219cfe2082ca6d18fae2cbd37b1ff9 SHA512 4a39c6d2da5ca83f9bf2a6aba9a63cd716622f6bfda4760c7abdc73932d86dc41305cc8780b3292b208c285fddda6edd926d58d2c90847e34130e6f145b5c6b7
 EBUILD fwupd-1.0.2.ebuild 2468 BLAKE2B 3e2171512869cfb08ba0121dabcdeb527acd5da45248506a6c03558d622d1ec3d13a07da08d68bdb3a27b9228db8f82edf773510cafe7c21b13ed52f54200269 SHA512 2d640bf0f2e71955c75a99cbdf856a30f8d48cfcd027c9b2b6515edf0227d5baf4764fabf672bb4a3840f5a3cd19abf2a245b53c35e4e5043bb05b67a53a5d12
-MISC metadata.xml 838 BLAKE2B 94e61de164b7858afceebb163391c113e557d7d962c40650ac2e45a334e2347ad5ee42123ca5e878693a0768ca9819ce29e64650b0dae6d0e49c558d46550ba3 SHA512 22e958ed755f3d824fed8f164fb20943947ff1038382e8983104e15c4b0b57540f940da6933a2a121e4795ddafba817cecf0fde92e563d5b875574c268eb4f4c
+EBUILD fwupd-1.0.3.ebuild 2468 BLAKE2B ae4b1a59eb7e81f6faf75b7df3b1a7bb446df4207dee13f286a86b0783029e9da3b9f34453305b77eacaa96358c24546cd4eb0086505d82192e7a0fd30011da5 SHA512 3fccd7b9c663b765bd07c2eef41a10e4d4a4f8085901f5c3e510e00810a8eb3e52d45c0bf2b63b72abcf1005b883676f2a82f818aede3cf136df8cb1406db612
+MISC metadata.xml 738 BLAKE2B 53421e28e9d5b0d92a29b909ea234c22d38992979bc1f3d34781f9956a1250ba68e6f6c88f951ad1b029cc020d02ab80e7ab50bc5115084f53069e93985e37ba SHA512 d598e706e5d818a91f91589cf4e16f484e3bb574e1b778b681f1d927bc6014600841169f46765a325c5e27ee8360151e8c2ae2701f9ef1e826807ec924698124
diff --git a/sys-apps/fwupd/fwupd-1.0.1.ebuild b/sys-apps/fwupd/fwupd-1.0.1.ebuild
deleted file mode 100644
index c102d10d91b7..000000000000
--- a/sys-apps/fwupd/fwupd-1.0.1.ebuild
+++ /dev/null
@@ -1,93 +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 test 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 )
-	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
-}
-
-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-synaptics="$(usex dell true false)"
-		-Denable-systemd="$(usex systemd true false)"
-		# requires libtbtfwu which is not packaged yet
-		-Denable-thunderbolt=false
-		-Denable-tests="$(usex test true 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.3.ebuild
index c102d10d91b7..de768b752cdd 100644
--- a/sys-apps/fwupd/fwupd-1.0.0.ebuild
+++ b/sys-apps/fwupd/fwupd-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc elf +man systemd test uefi uefi_labels"
+IUSE="colorhug dell doc gpg +man systemd test uefi uefi_labels"
 REQUIRED_USE="
 	uefi_labels? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -30,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 )
@@ -75,19 +79,19 @@ src_prepare() {
 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-synaptics="$(usex dell 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-tests="$(usex test true 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 a6f7b5108871..dd10e28c07e5 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -9,8 +9,6 @@
     <flag name="colorhug">Enable ColorHug support through
       <pkg>x11-misc/colord</pkg> package.</flag>
     <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>