commit:     00fe55e395882d4f57c553bc2743c9fef4b5b25a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 13:52:35 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 13:55:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00fe55e3

sys-apps/fwupd: Removed old.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 sys-apps/fwupd/Manifest                            |  2 -
 .../fwupd/files/fwupd-0.9-polkit_its_files.patch   | 65 -----------------
 sys-apps/fwupd/fwupd-0.9.5-r1.ebuild               | 84 ----------------------
 sys-apps/fwupd/fwupd-0.9.6.ebuild                  | 80 ---------------------
 4 files changed, 231 deletions(-)

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index e7c4cecc34f..9284cbb49bd 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,5 +1,3 @@
-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 BLAKE2B 
3320c540d5395c28ab778d40e5a9901f877a7606b5e5188a7bc8e1c17648916c52e752363f07e01e5381894feb9df7034064bebb62a9088fbaf8affd01685d34
 SHA512 
f89455563d8d587bee6c6f4a9a1ff75401d803a89087ddb73b9260e2578e581bdc315593b7bb3466318a52123383c9499cba2fe3ead0fe13efd40d907a753345
 DIST fwupd-1.0.2.tar.gz 1516078 BLAKE2B 
bdc0d54fa0058a329d409debd41c4f83f7036669b3356ca82d86a1233ca567841b1758adeb8f8abbfb7f9bda004934ba970747da413dc4862e459792a42745ec
 SHA512 
52773590255b0a120c56f5f8b58243e88fcc322d8f2348b5f463db4107aebd4df2769103e003d095b1d0571c598c0274af0b7da4a248e4dd1786156697170e06

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 999df1cba25..00000000000
--- 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 <[email protected]>
-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.5-r1.ebuild 
b/sys-apps/fwupd/fwupd-0.9.5-r1.ebuild
deleted file mode 100644
index 1f4146f8c86..00000000000
--- a/sys-apps/fwupd/fwupd-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,84 +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 )"
-
-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)"
-               -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-0.9.6.ebuild 
b/sys-apps/fwupd/fwupd-0.9.6.ebuild
deleted file mode 100644
index 19962f03252..00000000000
--- 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
-}

Reply via email to