[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     7ba73930829c392ecd11a8e46f887214c3a3ae33
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  7 06:59:18 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Aug  7 06:59:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ba73930

Revert "sys-apps/fwupd: Removed old."

This reverts commit 91276380d72eecaa0e99e53a405040da7088c64d.

Bad commit message.

 sys-apps/fwupd/Manifest                            |  1 -
 .../{fwupd-0.9.6.ebuild => fwupd-0.9.5.ebuild}     | 33 +++++++---------------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 1cf657cb18b..953b366d497 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,2 +1 @@
 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

diff --git a/sys-apps/fwupd/fwupd-0.9.6.ebuild b/sys-apps/fwupd/fwupd-0.9.5.ebuild
similarity index 65%
rename from sys-apps/fwupd/fwupd-0.9.6.ebuild
rename to sys-apps/fwupd/fwupd-0.9.5.ebuild
index 56caf6635a2..8599c3e634c 100644
--- a/sys-apps/fwupd/fwupd-0.9.6.ebuild
+++ b/sys-apps/fwupd/fwupd-0.9.5.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit meson python-single-r1 xdg-utils
+inherit meson
 
 DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
 HOMEPAGE="http://www.fwupd.org"
@@ -15,17 +13,16 @@ 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 elf +man systemd uefi"
 
 RDEPEND="
 	app-crypt/gpgme
 	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.6.13[introspection]
+	>=dev-libs/appstream-glib-0.6.13
 	>=dev-libs/glib-2.45.8:2
 	dev-libs/libgpg-error
 	dev-libs/libgudev
-	>=dev-libs/libgusb-0.2.9[introspection]
+	dev-libs/libgusb
 	>=net-libs/libsoup-2.51.92:2.4
 	>=sys-auth/polkit-0.103
 	colorhug? ( >=x11-misc/colord-1.2.12:0= )
@@ -33,22 +30,10 @@ RDEPEND="
 		sys-libs/efivar
 		>=sys-libs/libsmbios-2.3.3
 	)
-	elf? ( virtual/libelf:0= )
-	systemd? ( >=sys-apps/systemd-231 )
+	elf? ( dev-libs/libelf )
+	systemd? ( sys-apps/systemd )
 	!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}
@@ -61,8 +46,11 @@ DEPEND="
 
 REQUIRED_USE="dell? ( uefi )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9-polkit_its_files.patch"
+)
+
 src_configure() {
-	xdg_environment_reset
 	local emesonargs=(
 		-Denable-colorhug="$(usex colorhug true false)"
 		-Denable-consolekit="$(usex systemd false true)"
@@ -74,7 +62,6 @@ src_configure() {
 		# 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
 }