gentoo resync : 18.11.2018

3 files changed, 140 insertions, 8 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 73ed937f94b6..1655df103245 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,6 +1,8 @@
 AUX fwupd 291 BLAKE2B e8125cdf0cb70adb3e9fb962383da71a101816764a022c13de2812f501bddabeea87a35eeb18096fb748d17f61592d8714661efb5bbad2b0393b76902ed1f3bf SHA512 ad569d342cf14290d4924582af92c7d634139cf04eb1d981b4a4573ed56a8f9115914adefa925c8486e1126dd4fbed36a786aad4afd07de14dd6cbdf7982b766
-DIST fwupd-1.1.2.tar.gz 1690384 BLAKE2B 988c27dbc522b27f03c94072aa85930f77d5b115aea93e485e9da853cea4f37a44aa6f8af542b24e5cd2f1ba65f4ede52e2f15dc2a366d2fa27370d8bda76164 SHA512 f9ca8d34608ee7b7fd2047c9897a898a8680da096db2fb123e698c9b5443d4285d91d67aa1fb928f3c653e9a6d3646a0228a0a630f9262b80e47525591b5659e
 DIST fwupd-1.1.3.tar.gz 1731079 BLAKE2B 7de39c00d96b9bed29e7ee04c46f71ed033c53e2b132bfd220b932217ab3bb5c6b0bc24adc594cf2f27c483e22e7366aa90172db93757fcb48894b9573269bca SHA512 7f0899cfeb5119c35d7eacdafdc3367de1d2da29942d0099983a05f633ae95a28e16c00b46ad405f1ac60e679cf6bd5dcad2869c2bd48f936ea2c29a3c235c27
-EBUILD fwupd-1.1.2-r1.ebuild 3215 BLAKE2B 4573ec59c93dd5d399bc2a2cdbb8743ced4f842084d34a553e1631693d204d4b8439e915b73de1a1b67726c335dec41128708e82463bdecd05855835a8c0b1fa SHA512 419bbfb78209be21f077b78e5c7a8a9c62ee52358fd0aa22a76d6ff866ff4f80446053f0c45b55b644e40082f49981b78d75d61d07065485bec7c7b7ab4ae628
+DIST fwupd-1.1.4.tar.gz 1729782 BLAKE2B af8a1046d6ab9098ee7b09bc1c9677b2256909fdb6cef3e1632e920f962246b94ae7b8c8c4cb5c90088845d836c27cb98c7b8c05bad8f6a213029c220856e602 SHA512 7c14efd044f575c600ee4734c6721b8990603296a8ef2ec7643691e1b47598c12afd31e0c25a0dae69719e2c375fc1f18a6073f20b3c1b91400a046de52e8a28
+DIST fwupd-1.2.0.tar.gz 1746711 BLAKE2B 7611f0d501f897392cba0f6ca877265c634d723b9804e640b7824b35773c16117e574dd7eb336c626de6dcd7360112acac2aa5da828c28aff7954b0935bec60d SHA512 88e543cb06522b4af2d62addea77ab0d2a119409e0c36c5034bc4c035c73fdfd8565723a3993f04510491645174064d0bb9b2937553ced8528f29257d9a902e9
 EBUILD fwupd-1.1.3.ebuild 3214 BLAKE2B c4c1d20d591e7eae1f6a75c73b497a6c384218ba0bdcad2e567528f75878cb21590ec0e9526809b514bbc69621373373bd28ce90ed53878080301283097cc760 SHA512 8bf8ff7f1ffd74364632945a0e82e5a0bdeea0f5cc38aeca82d7b3a738da54d2997940bcea624e53af8c43982b06f28ae0629486033c5c03bc71c3f10beecd95
+EBUILD fwupd-1.1.4.ebuild 3227 BLAKE2B 8f83bfc9b1a16fee38110175ea53419d99e373e1b333c51cc87f76babca9ac7a8c596c8c0d06ddf959797feca60cb9ece2231c53f37b3f7a5a1a8f7b0f485998 SHA512 a7e505ffe6b6e5a1d45c323fafb198446b9d2994b53755318893d19fe757bd8be40ac7f521affba7a83c3e2958bf070ae86dc30b1f9be6dce3cde05138912517
+EBUILD fwupd-1.2.0.ebuild 3181 BLAKE2B da56c804e52ffa95ab1a470241df62793ed5abd118e1c7b918e4823876c6124195521bcff623839ba365372ed819ed9eb9e3b014628e540c0648dd96b1421793 SHA512 35818f63f15c92997d4bd060eca6eb4c25e2e8e1cab567843536059712530ff85cedfc7d61cce6f36e3f7163513e84cd6001c18434a83707963bbbc48c91cef4
 MISC metadata.xml 948 BLAKE2B 8578206c4d73e98035e7af30868d299d8dc06db4ead6c60e7d5027f4f4de2db2fbb3e7fb351b4c936bc076559691af8a431df9f52a3613179b98da0305f62455 SHA512 0eeb5d9923b201a0803368b709586dd46615441300d764140e08fcfdf70189ee197d66ec603b5a9c26b8ec48fed960964c7844bd33cc50747042391e94196c31
diff --git a/sys-apps/fwupd/fwupd-1.1.2-r1.ebuild b/sys-apps/fwupd/fwupd-1.1.4.ebuild
index cf830c23b5d5..e8497bb3e4e2 100644
--- a/sys-apps/fwupd/fwupd-1.1.2-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.1.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # Package requires newer meson than eclass provides
 MESON_AUTO_DEPEND="no"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit meson python-single-r1 vala xdg-utils
 
@@ -68,9 +68,6 @@ 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 )
 	man? ( app-text/docbook-sgml-utils )
@@ -78,6 +75,12 @@ DEPEND="
 	test? ( net-libs/gnutls[tools] )
 "
 
+BDEPEND="
+	>=dev-util/meson-0.43.0
+	>=dev-util/ninja-1.7.2
+	virtual/pkgconfig
+"
+
 # required for fwupd daemon to run.
 # NOT a build time dependency. The build system does not check for dbus.
 PDEPEND="sys-apps/dbus"
diff --git a/sys-apps/fwupd/fwupd-1.2.0.ebuild b/sys-apps/fwupd/fwupd-1.2.0.ebuild
new file mode 100644
index 000000000000..d4554549eb08
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.2.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Package requires newer meson than eclass provides
+MESON_AUTO_DEPEND="no"
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit meson python-single-r1 vala 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 +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	dell? ( uefi )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-arch/gcab
+	app-arch/libarchive:=
+	dev-db/sqlite
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/json-glib
+	dev-libs/libgpg-error
+	dev-libs/libgudev:=
+	>=dev-libs/libgusb-0.2.9[introspection]
+	>=dev-libs/libxmlb-0.1.3
+	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[introspection]
+	>=sys-auth/polkit-0.103
+	virtual/libelf:0=
+	colorhug? ( >=x11-misc/colord-1.2.12:0= )
+	dell? (
+		sys-libs/efivar
+		>=sys-libs/libsmbios-2.4.0
+	)
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	nvme? ( sys-libs/efivar )
+	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
+	redfish? (
+		sys-libs/efivar
+	)
+	systemd? ( >=sys-apps/systemd-211 )
+	!systemd? ( >=sys-auth/consolekit-1.0.0 )
+	thunderbolt? ( sys-apps/thunderbolt-software-user-space )
+	uefi? (
+		media-libs/fontconfig
+		media-libs/freetype
+		sys-boot/gnu-efi
+		>=sys-libs/efivar-33
+		x11-libs/cairo
+	)
+"
+DEPEND="
+	${RDEPEND}
+	$(vala_depend)
+	doc? ( dev-util/gtk-doc )
+	man? ( app-text/docbook-sgml-utils )
+	nvme? (	>=sys-kernel/linux-headers-4.4 )
+	test? ( net-libs/gnutls[tools] )
+"
+
+BDEPEND="
+	>=dev-util/meson-0.46.0
+	>=dev-util/ninja-1.7.2
+	virtual/pkgconfig
+"
+
+# required for fwupd daemon to run.
+# NOT a build time dependency. The build system does not check for dbus.
+PDEPEND="sys-apps/dbus"
+
+src_prepare() {
+	default
+	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
+}
+
+src_configure() {
+	xdg_environment_reset
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dconsolekit="$(usex systemd false true)"
+		-Dgpg="$(usex gpg true false)"
+		-Dgtkdoc="$(usex doc true false)"
+		-Dman="$(usex man true false)"
+		-Dpkcs7="$(usex pkcs7 true false)"
+		-Dplugin_dell="$(usex dell true false)"
+		-Dplugin_nvme="$(usex nvme true false)"
+		-Dplugin_redfish="$(usex redfish true false)"
+		-Dplugin_synaptics="$(usex dell true false)"
+		-Dplugin_thunderbolt="$(usex thunderbolt true false)"
+		-Dplugin_uefi="$(usex uefi true false)"
+		-Dsystemd="$(usex systemd true false)"
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	doinitd "${FILESDIR}"/${PN}
+}
+
+pkg_postinst() {
+	elog "In case you are using openrc as init system"
+	elog "and you're upgrading from <fwupd-1.1.0, you"
+	elog "need to start the fwupd daemon via the openrc"
+	elog "init script that comes with this package."
+}