commit:     80ef2a190ca5d5854e01f98087bc0a1c4213051c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  5 06:29:19 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 06:29:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ef2a19

sys-apps/fwupd: Removed old.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/fwupd/Manifest                           |  2 -
 sys-apps/fwupd/files/fwupd-0.9.2-no_systemd.patch | 77 -----------------------
 sys-apps/fwupd/fwupd-0.8.0.ebuild                 | 74 ----------------------
 sys-apps/fwupd/fwupd-0.9.2.ebuild                 | 65 -------------------
 4 files changed, 218 deletions(-)

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index b1bd46fd110..ff15da82ca8 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,4 +1,2 @@
-DIST fwupd-0.8.0.tar.gz 1296361 SHA256 
b9c7550778747a2c47270ae518c65ab1111f749bbbd8f058ed7177201b414c10 SHA512 
76c52a6902a6a4d651ad8e3694edf9d21320197baa7faf84fe1d4809e8e5990db43ae949a90bd72df6110d0df77f5181bd425a846c22f5ef749b9b6dac045bf8
 WHIRLPOOL 
e7bdbd74f500257cf674cf7131c90e345dc7e2596ae14bbc3b11ff236ce633bb104ed7237fab974cc7c5c6edebcbe678816e8653dc04370614a1c54d0cb5b977
-DIST fwupd-0.9.2.tar.gz 1313712 SHA256 
a5a7a9886b0efbea57cbcbc841923a9272e4f26dd8658a8e1a90f6eec371cce1 SHA512 
14dd3e7ee34f2bda0ed03d141715166ba7b4e69443f2ffd056e17a834d42ef8caa56d729b273e3890936c9b768c10ee6fbcf0d7e7d336c957901b93832ffe9c2
 WHIRLPOOL 
305e84be8c12a8f4da7897f7bb8c5599a608de315c90c5399c05637c65667f83e7187d851156643ebec7e402f3aecab320f02f4c2c1b69554b20561ce2a08b64
 DIST fwupd-0.9.4.tar.gz 1355237 SHA256 
ac6c02df4a00d541a205f17c0fa681cc5fe9161dd20cc28045c28cbe43b042e0 SHA512 
f4a0b46f7689744b6ddac698b8908f6711b9318ccca9576eadf1fd9f00b266be9e8723309286505173b1f10f170542b67ff67d0ebf3678b23fc9bf8fed03f8ae
 WHIRLPOOL 
d4fe5c2cc997b72dc940fda5e01eece69e3a8e86b29b11766afcf806de693e7e5cc6603ecb5cd3c5a82c39344c583d061018e12ddbaa5b459195e5ed51c52459
 DIST fwupd-0.9.5.tar.gz 1389768 SHA256 
876bb4c1cc5b27bb5f30e1c5d81522c82554738bede9a811f9e352966e58453e SHA512 
2a8ca8da2fffa71bdaa44b82aff1a4151441b8496793101d7d0b1ab984bfbb10a3a94c4ebae5cfc17241364ab7aed051252a70543ebe6a82dd8bdb5c6f52863d
 WHIRLPOOL 
b7d606acd35a58e25ee94045557899b1c9ea30941024cfb17bf3226f39dab7961c802abafc9ca6320e21ea1ca3792a0bd37fa942476dfd0b37c4ce3b4fe28b5b

diff --git a/sys-apps/fwupd/files/fwupd-0.9.2-no_systemd.patch 
b/sys-apps/fwupd/files/fwupd-0.9.2-no_systemd.patch
deleted file mode 100644
index 354b5e5800e..00000000000
--- a/sys-apps/fwupd/files/fwupd-0.9.2-no_systemd.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- fwupd-0.9.2/data/meson.build
-+++ fwupd-0.9.2/data/meson.build
-@@ -38,20 +38,22 @@
-                           'system-services'),
- )
- 
--# replace @bindir@
--configure_file(
--  input : 'fwupd-offline-update.service.in',
--  output : 'fwupd-offline-update.service',
--  configuration : con2,
--  install: true,
--  install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
--)
-+if get_option('with-systemd') and systemd.found()
-+  # replace @bindir@
-+  configure_file(
-+    input : 'fwupd-offline-update.service.in',
-+    output : 'fwupd-offline-update.service',
-+    configuration : con2,
-+    install: true,
-+    install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
-+  )
- 
--# replace @localstatedir@ and @bootdir@
--configure_file(
--  input : 'fwupd.service.in',
--  output : 'fwupd.service',
--  configuration : con2,
--  install: true,
--  install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
--)
-+  # replace @localstatedir@ and @bootdir@
-+  configure_file(
-+    input : 'fwupd.service.in',
-+    output : 'fwupd.service',
-+    configuration : con2,
-+    install: true,
-+    install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
-+  )
-+endif
---- fwupd-0.9.2/meson.build
-+++ fwupd-0.9.2/meson.build
-@@ -127,13 +127,17 @@
- gpgme = cc.find_library('gpgme')
- gpgerror = cc.find_library('libgpg-error')
- libm = cc.find_library('libm', required: false)
--systemd = dependency('systemd')
- udev = dependency('udev')
- 
- if valgrind.found()
-   conf.set('HAVE_VALGRIND', '1')
- endif
- 
-+if get_option('with-systemd')
-+  systemd = dependency('systemd')
-+  conf.set('HAVE_SYSTEMD', '1')
-+endif
-+
- if get_option('enable-colorhug')
-   colorhug = dependency('colorhug', version : '>= 1.2.12')
-   conf.set('HAVE_COLORHUG', '1')
-@@ -220,4 +224,6 @@
-   message('git not found, you will not be able to run `ninja dist`')
- endif
- 
--meson.add_install_script('meson_post_install.sh', 
systemd.get_pkgconfig_variable('systemdsystemunitdir'), localstatedir)
-+if get_option('with-systemd') and systemd.found()
-+  meson.add_install_script('meson_post_install.sh', 
systemd.get_pkgconfig_variable('systemdsystemunitdir'), localstatedir)
-+endif
---- fwupd-0.9.2/meson_options.txt
-+++ fwupd-0.9.2/meson_options.txt
-@@ -5,3 +5,4 @@
- option('enable-dell', type : 'boolean', value : true, description : 'enable 
Dell-specific support')
- option('enable-thunderbolt', type : 'boolean', value : true, description : 
'enable Thunderbolt support')
- option('with-bootdir', type : 'string', value : '/boot/efi', description : 
'Directory for EFI system partition')
-+option('with-systemd', type : 'boolean', value : true, description : 'Install 
systemd unit files')

diff --git a/sys-apps/fwupd/fwupd-0.8.0.ebuild 
b/sys-apps/fwupd/fwupd-0.8.0.ebuild
deleted file mode 100644
index 34825f2201f..00000000000
--- a/sys-apps/fwupd/fwupd-0.8.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools udev systemd
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and 
reliable"
-HOMEPAGE="http://www.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 nls uefi"
-
-RDEPEND="
-       app-crypt/gpgme
-       dev-db/sqlite
-       dev-libs/appstream-glib
-       >=dev-libs/glib-2.45.8:2
-       dev-libs/libgpg-error
-       dev-libs/libgudev
-       dev-libs/libgusb
-       >=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.0
-       )
-       elf? ( dev-libs/libelf )
-       uefi? ( >=sys-apps/fwupdate-5 )
-"
-DEPEND="
-       ${RDEPEND}
-       app-arch/gcab
-       app-arch/libarchive
-       app-text/docbook-sgml-utils
-       dev-util/gtk-doc
-       virtual/pkgconfig
-"
-
-REQUIRED_USE="dell? ( uefi )"
-
-src_prepare() {
-       default
-
-       # Don't look for gtk-doc if doc USE is unset (breaks automake)
-       if ! use doc ; then
-               sed 's@^GTK_DOC_CHECK@#\0@' -i configure.ac || die
-               sed '/gtk-doc\.make/d' \
-                       -i {.,docs/{libdfu,libfwupd}}/Makefile.am || die
-       fi
-
-       eautoreconf
-}
-
-src_configure() {
-       local myeconfargs=(
-               # requires libtbtfwu which is not packaged yet
-               --disable-thunderbolt
-               --with-systemdunitdir="$(systemd_get_systemunitdir)"
-               --with-udevrulesdir="$(get_udevdir)"/rules.d
-               $(use_enable colorhug)
-               $(use_enable dell)
-               $(use_enable dell synaptics)
-               $(use_enable elf libelf)
-               $(use_enable nls)
-               $(use_enable uefi)
-       )
-       econf "${myeconfargs[@]}"
-}

diff --git a/sys-apps/fwupd/fwupd-0.9.2.ebuild 
b/sys-apps/fwupd/fwupd-0.9.2.ebuild
deleted file mode 100644
index 32c27850e81..00000000000
--- a/sys-apps/fwupd/fwupd-0.9.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson udev systemd
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and 
reliable"
-HOMEPAGE="http://www.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 elf systemd uefi"
-
-RDEPEND="
-       app-crypt/gpgme
-       dev-db/sqlite
-       dev-libs/appstream-glib
-       >=dev-libs/glib-2.45.8:2
-       dev-libs/libgpg-error
-       dev-libs/libgudev
-       dev-libs/libgusb
-       >=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.0
-       )
-       elf? ( dev-libs/libelf )
-       systemd? ( sys-apps/systemd )
-       uefi? ( >=sys-apps/fwupdate-5 )
-"
-DEPEND="
-       ${RDEPEND}
-       app-arch/gcab
-       app-arch/libarchive
-       app-text/docbook-sgml-utils
-       dev-util/gtk-doc
-       virtual/pkgconfig
-"
-
-REQUIRED_USE="dell? ( uefi )"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-0.9-polkit_its_files.patch"
-       "${FILESDIR}/${PN}-0.9.2-no_systemd.patch"
-)
-
-src_configure() {
-       local emesonargs=(
-               # requires libtbtfwu which is not packaged yet
-               -Denable-thunderbolt=false
-               -Dwith-systemd="$(usex systemd true false)"
-               -Dwith-udevrulesdir="$(get_udevdir)"/rules.d
-               -Denable-colorhug="$(usex colorhug true false)"
-               -Denable-dell="$(usex dell true false)"
-               -Denable-libelf="$(usex elf true false)"
-               -Denable-uefi="$(usex uefi true false)"
-       )
-       meson_src_configure
-}

Reply via email to