gentoo resync : 12.01.2019

4 files changed, 22 insertions, 141 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index ce0defa37243..d07a6cd23720 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,8 +1,6 @@
 AUX fwupd 291 BLAKE2B e8125cdf0cb70adb3e9fb962383da71a101816764a022c13de2812f501bddabeea87a35eeb18096fb748d17f61592d8714661efb5bbad2b0393b76902ed1f3bf SHA512 ad569d342cf14290d4924582af92c7d634139cf04eb1d981b4a4573ed56a8f9115914adefa925c8486e1126dd4fbed36a786aad4afd07de14dd6cbdf7982b766
-DIST fwupd-1.1.4.tar.gz 1729782 BLAKE2B af8a1046d6ab9098ee7b09bc1c9677b2256909fdb6cef3e1632e920f962246b94ae7b8c8c4cb5c90088845d836c27cb98c7b8c05bad8f6a213029c220856e602 SHA512 7c14efd044f575c600ee4734c6721b8990603296a8ef2ec7643691e1b47598c12afd31e0c25a0dae69719e2c375fc1f18a6073f20b3c1b91400a046de52e8a28
-DIST fwupd-1.2.0.tar.gz 1746711 BLAKE2B 7611f0d501f897392cba0f6ca877265c634d723b9804e640b7824b35773c16117e574dd7eb336c626de6dcd7360112acac2aa5da828c28aff7954b0935bec60d SHA512 88e543cb06522b4af2d62addea77ab0d2a119409e0c36c5034bc4c035c73fdfd8565723a3993f04510491645174064d0bb9b2937553ced8528f29257d9a902e9
-DIST fwupd-1.2.1.tar.gz 1754253 BLAKE2B 96938766758db32b00437e29c1b93870411687f7535102703faf4a09189dc4e90fd232794812d964895c12b0f63c86d0023ff1abcf9848059f04c12812158db9 SHA512 ce86c7b5e5c1a45a561f6fc195c3db861e29f9cd435df9e41a41ade94e2f9891508b0e32906df09fe074d383b5d7b6ac824201949f67e2c86c6c905eae550d78
-EBUILD fwupd-1.1.4.ebuild 3227 BLAKE2B 8f83bfc9b1a16fee38110175ea53419d99e373e1b333c51cc87f76babca9ac7a8c596c8c0d06ddf959797feca60cb9ece2231c53f37b3f7a5a1a8f7b0f485998 SHA512 a7e505ffe6b6e5a1d45c323fafb198446b9d2994b53755318893d19fe757bd8be40ac7f521affba7a83c3e2958bf070ae86dc30b1f9be6dce3cde05138912517
-EBUILD fwupd-1.2.0.ebuild 3181 BLAKE2B da56c804e52ffa95ab1a470241df62793ed5abd118e1c7b918e4823876c6124195521bcff623839ba365372ed819ed9eb9e3b014628e540c0648dd96b1421793 SHA512 35818f63f15c92997d4bd060eca6eb4c25e2e8e1cab567843536059712530ff85cedfc7d61cce6f36e3f7163513e84cd6001c18434a83707963bbbc48c91cef4
-EBUILD fwupd-1.2.1.ebuild 3082 BLAKE2B 470e13c0620a2e33a3efc29853078938a7685e3c5a09e9d9ec964db884a7241d45aac5a535531f1fbd54f895aa99ed220759893ed98ac6fe7285957284438034 SHA512 f00ec6d29dcb9998bfbc1540dc45113d34da8517a06693b48ec3aa7d4a500493aace3504b7d904cbc50eb9927e4f48173c6f187e215f871bedfcc3ec87ce1e6c
+DIST fwupd-1.2.2.tar.gz 1768003 BLAKE2B 83d91761b7dc71296def8a88eb356df687906278ad6e351dffce246a1473de4a141e84e959dd4a785a36a846fc6884d4c83f512e8ea96d7f1b8f9c5dd438d784 SHA512 34221c905a75f4b6d9ee66bc08a2ceb0d65debb71771b8e0eeed26593dff4f29a4080b7c3164535e862f91f370bb519ae2761dc1f62c6b6de3c6c51ef5f0af65
+DIST fwupd-1.2.3.tar.gz 1768734 BLAKE2B 898f0cf3d86295840ad3f5a3736d9b0aedb61f678ca10d93bbbd9240513ae09a2d8941e3d6844024a20652eec487c7237dea5e6813d8d7c969d2998a970d23c1 SHA512 fc4fbb3778f9ed82eec4f05905d611f34344fccd78d199348b9f8ca83fedc48d1503fc77eb0b85026d77f5f83de5f609d97d0a0c008f3280b0a97e942000ba59
+EBUILD fwupd-1.2.2-r1.ebuild 3282 BLAKE2B 257fa81a5b3f120ea7a40ce880755314fa22310ce5cbf21f2853ed4e59b262bf27db36a82e1f404734b439f30b44420d53d4271a507b9a2f619199f03dde108e SHA512 5455f670eae891b98e3b6175e966dbbe92d3574e86d3a5cea511d8830a46d06a44bc1ae07557513be2d0c4fdc30878e240974fb98d30bc1855260cd51f87df2f
+EBUILD fwupd-1.2.3.ebuild 3282 BLAKE2B 257fa81a5b3f120ea7a40ce880755314fa22310ce5cbf21f2853ed4e59b262bf27db36a82e1f404734b439f30b44420d53d4271a507b9a2f619199f03dde108e SHA512 5455f670eae891b98e3b6175e966dbbe92d3574e86d3a5cea511d8830a46d06a44bc1ae07557513be2d0c4fdc30878e240974fb98d30bc1855260cd51f87df2f
 MISC metadata.xml 948 BLAKE2B 8578206c4d73e98035e7af30868d299d8dc06db4ead6c60e7d5027f4f4de2db2fbb3e7fb351b4c936bc076559691af8a431df9f52a3613179b98da0305f62455 SHA512 0eeb5d9923b201a0803368b709586dd46615441300d764140e08fcfdf70189ee197d66ec603b5a9c26b8ec48fed960964c7844bd33cc50747042391e94196c31
diff --git a/sys-apps/fwupd/fwupd-1.1.4.ebuild b/sys-apps/fwupd/fwupd-1.1.4.ebuild
deleted file mode 100644
index e8497bb3e4e2..000000000000
--- a/sys-apps/fwupd/fwupd-1.1.4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.7.4:=[introspection]
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/libgpg-error
-	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[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? (
-		dev-libs/json-glib
-		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}
-	app-arch/gcab
-	app-arch/libarchive
-	$(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.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"
-
-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."
-}
diff --git a/sys-apps/fwupd/fwupd-1.2.1.ebuild b/sys-apps/fwupd/fwupd-1.2.2-r1.ebuild
index 7f9b147acd16..72cc697499b1 100644
--- a/sys-apps/fwupd/fwupd-1.2.1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -66,6 +66,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	$(vala_depend)
+	x11-libs/pango[introspection]
 	doc? ( dev-util/gtk-doc )
 	man? ( app-text/docbook-sgml-utils )
 	nvme? (	>=sys-kernel/linux-headers-4.4 )
@@ -114,6 +115,12 @@ src_configure() {
 src_install() {
 	meson_src_install
 	doinitd "${FILESDIR}"/${PN}
+
+	if ! use systemd ; then
+		# Don't timeout when fwupd is running (#673140)
+		sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+			-i "${ED}"/etc/${PN}/daemon.conf || die
+	fi
 }
 
 pkg_postinst() {
diff --git a/sys-apps/fwupd/fwupd-1.2.0.ebuild b/sys-apps/fwupd/fwupd-1.2.3.ebuild
index d4554549eb08..72cc697499b1 100644
--- a/sys-apps/fwupd/fwupd-1.2.0.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.3.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 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
@@ -33,7 +31,7 @@ RDEPEND="
 	dev-libs/libgpg-error
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection]
-	>=dev-libs/libxmlb-0.1.3
+	>=dev-libs/libxmlb-0.1.5
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
@@ -68,6 +66,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	$(vala_depend)
+	x11-libs/pango[introspection]
 	doc? ( dev-util/gtk-doc )
 	man? ( app-text/docbook-sgml-utils )
 	nvme? (	>=sys-kernel/linux-headers-4.4 )
@@ -75,8 +74,7 @@ DEPEND="
 "
 
 BDEPEND="
-	>=dev-util/meson-0.46.0
-	>=dev-util/ninja-1.7.2
+	>=dev-util/meson-0.47.0
 	virtual/pkgconfig
 "
 
@@ -117,6 +115,12 @@ src_configure() {
 src_install() {
 	meson_src_install
 	doinitd "${FILESDIR}"/${PN}
+
+	if ! use systemd ; then
+		# Don't timeout when fwupd is running (#673140)
+		sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+			-i "${ED}"/etc/${PN}/daemon.conf || die
+	fi
 }
 
 pkg_postinst() {