commit: 17712222fa4fd3359ca5d542b42c3954ecb5409f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Jul 16 10:14:47 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jul 16 11:23:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17712222
sys-power/upower: Drop 0.99.9-r1 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sys-power/upower/Manifest | 1 - .../files/upower-0.99.9-pending-charge1.patch | 33 -------- .../files/upower-0.99.9-pending-charge2.patch | 48 ----------- sys-power/upower/upower-0.99.9-r1.ebuild | 98 ---------------------- 4 files changed, 180 deletions(-) diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest index 5c19d802df7..5153b69a5b8 100644 --- a/sys-power/upower/Manifest +++ b/sys-power/upower/Manifest @@ -1,3 +1,2 @@ DIST upower-0.99.11.tar.xz 430128 BLAKE2B 77604d02a69de98e4c7b268d11d189aa42ace2d62b982fda9bc41131ce383ede32953ada31eae0bbfd1121600af5863924d48c636e60a28f505a6998dcac227c SHA512 67219a0beb98c97ac4512e4fe8ba83fc80a1035d1edb5367dda6911da50c672b047051f2f528e8703be29ab47547d92b6c71a7ef695226a1bdb5bc33e6d18803 DIST upower-0.99.12.tar.xz 423640 BLAKE2B 4c5c6357f0a2f8d721ebae9736912b1871a898c7ce65708626f9a9465cde87036ba6ab8050d97f5b9074d92e2700d8ed1e71b67f43cd6305eb4e89336f1b628f SHA512 9858a0e5f65271522cc5f36b0cd8722a5fb3effba37dbc5b22f08606701d4242ee54329d07460768004a24dc42705a84140ac6d9691afb7f09584b2e61fe3413 -DIST upower-0.99.9.tar.xz 448408 BLAKE2B 5fa2436f33c94cffb736d8e3fad433acf58954cf06ccd403a0361214be5afc45d79ea279f3c5c48dcd58b92ccaf995777c95987d1749fd8c8c8958317e439570 SHA512 45eb587b0e5ffcce88bad8c56bc5efa30559748913016a55d58313280f5159378e5fbb4a9842c3a6409257bb97822d235f96b03704268b8471455c93eb05fe2f diff --git a/sys-power/upower/files/upower-0.99.9-pending-charge1.patch b/sys-power/upower/files/upower-0.99.9-pending-charge1.patch deleted file mode 100644 index 9ce91c10a66..00000000000 --- a/sys-power/upower/files/upower-0.99.9-pending-charge1.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a074a5462ab9749ad4aaca52e0202602897660aa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprv...@endlessm.com> -Date: Thu, 1 Nov 2018 14:45:28 -0700 -Subject: [PATCH] daemon: Make comment more succinct - -This will help make it more clear when adding an extra state on the -following commit. It also makes the language consistent between the -different lines. There are no changes on the meaning of these lines nor -any functional changes on this commit. ---- - src/up-daemon.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/up-daemon.c b/src/up-daemon.c -index 1a5dddc..95fff6b 100644 ---- a/src/up-daemon.c -+++ b/src/up-daemon.c -@@ -209,9 +209,9 @@ up_daemon_update_display_battery (UpDaemon *daemon) - power_supply == FALSE) - continue; - -- /* If one battery is charging, then the composite is charging -- * If all batteries are discharging, then the composite is discharging -- * If all batteries are fully charged, then they're all fully charged -+ /* If one battery is charging, the composite is charging -+ * If all batteries are discharging, the composite is discharging -+ * If all batteries are fully charged, the composite is fully charged - * Everything else is unknown */ - if (state == UP_DEVICE_STATE_CHARGING) - state_total = UP_DEVICE_STATE_CHARGING; --- -2.18.1 - diff --git a/sys-power/upower/files/upower-0.99.9-pending-charge2.patch b/sys-power/upower/files/upower-0.99.9-pending-charge2.patch deleted file mode 100644 index a79ebac7ed1..00000000000 --- a/sys-power/upower/files/upower-0.99.9-pending-charge2.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a074631c0b1748c8a791c4f0dad99da75805a328 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprv...@endlessm.com> -Date: Mon, 15 Oct 2018 17:05:27 -0700 -Subject: [PATCH] daemon: Consider pending-charge when calculating the display - state - -Without this change if all batteries in the system are in the -pending-charge state, the display device state is set to unknown, and -its icon to battery-missing-symbolic. - -This change makes the pending-charge state be considered when -calculating the DisplayDevice state, setting it to pending-charge if at -least one battery in the system is pending-charge and no other is -charging or discharging. - -Closes: #81 -Closes: #19 ---- - src/up-daemon.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/up-daemon.c b/src/up-daemon.c -index 95fff6b..690f379 100644 ---- a/src/up-daemon.c -+++ b/src/up-daemon.c -@@ -210,14 +210,18 @@ up_daemon_update_display_battery (UpDaemon *daemon) - continue; - - /* If one battery is charging, the composite is charging -- * If all batteries are discharging, the composite is discharging -+ * If all batteries are discharging or pending-charge, the composite is discharging - * If all batteries are fully charged, the composite is fully charged -+ * If one battery is pending-charge and no other is charging or discharging, then the composite is pending-charge - * Everything else is unknown */ - if (state == UP_DEVICE_STATE_CHARGING) - state_total = UP_DEVICE_STATE_CHARGING; - else if (state == UP_DEVICE_STATE_DISCHARGING && - state_total != UP_DEVICE_STATE_CHARGING) - state_total = UP_DEVICE_STATE_DISCHARGING; -+ else if (state == UP_DEVICE_STATE_PENDING_CHARGE && -+ (state_total == UP_DEVICE_STATE_UNKNOWN || state_total == UP_DEVICE_STATE_PENDING_CHARGE)) -+ state_total = UP_DEVICE_STATE_PENDING_CHARGE; - else if (state == UP_DEVICE_STATE_FULLY_CHARGED && - state_total == UP_DEVICE_STATE_UNKNOWN) - state_total = UP_DEVICE_STATE_FULLY_CHARGED; --- -2.18.1 - diff --git a/sys-power/upower/upower-0.99.9-r1.ebuild b/sys-power/upower/upower-0.99.9-r1.ebuild deleted file mode 100644 index a67c244bb30..00000000000 --- a/sys-power/upower/upower-0.99.9-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit systemd xdg-utils - -DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics" -HOMEPAGE="https://upower.freedesktop.org/"; - -# No tarball released, use the same commit as Fedora -#SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"; -COMMIT="2282c7c0e53fb31816b824c9d1f547e8" -SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0/3" # based on SONAME of libupower-glib.so -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86" - -# gtk-doc files are not available as prebuilt in the tarball -IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux" - -COMMON_DEPS=" - >=dev-libs/dbus-glib-0.100 - >=dev-libs/glib-2.34:2 - sys-apps/dbus:= - introspection? ( dev-libs/gobject-introspection:= ) - kernel_linux? ( - dev-libs/libgudev:= - virtual/libusb:1 - virtual/udev - ios? ( - >=app-pda/libimobiledevice-1:= - >=app-pda/libplist-1:= - ) - ) -" -RDEPEND=" - ${COMMON_DEPS} - selinux? ( sec-policy/selinux-devicekit ) -" -DEPEND="${COMMON_DEPS} - doc? ( dev-util/gtk-doc ) - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - dev-util/intltool - >=sys-devel/gettext-0.17 - virtual/pkgconfig -" - -QA_MULTILIB_PATHS="usr/lib/${PN}/.*" - -DOCS=( AUTHORS HACKING NEWS README ) - -PATCHES=( - # daemon: Consider pending-charge when calculating the display state - # (from 'master') - "${FILESDIR}/${P}-pending-charge1.patch" - "${FILESDIR}/${P}-pending-charge2.patch" -) - -src_prepare() { - default - xdg_environment_reset - sed -i -e '/DISABLE_DEPRECATED/d' configure || die -} - -src_configure() { - local backend - - if use kernel_linux ; then - backend=linux - elif use kernel_FreeBSD ; then - backend=freebsd - else - backend=dummy - fi - - local myeconfargs=( - --disable-static - --disable-tests - --enable-man-pages - --libexecdir="${EPREFIX}"/usr/lib/${PN} - --localstatedir="${EPREFIX}"/var - --with-backend=${backend} - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --with-systemdutildir="$(systemd_get_utildir)" - $(use_enable doc gtk-doc) - $(use_enable introspection) - $(use_with ios idevice) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - keepdir /var/lib/upower #383091 -}
