commit: 5ec086c2ab61eeed4f1fb75eb3231cfb3b556b67 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Dec 4 16:45:24 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Dec 4 16:47:55 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ec086c2
sys-power/upower-pm-utils: Remove last-rited pkg Closes: https://bugs.gentoo.org/596988 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> profiles/package.mask | 4 - sys-power/upower-pm-utils/Manifest | 1 - ...-utils-0.9.23-always_use_pm-utils_backend.patch | 27 ------ ...0.9.23-clamp_percentage_for_overfull_batt.patch | 72 --------------- ...upower-pm-utils-0.9.23-create-dir-runtime.patch | 34 ------- .../upower-pm-utils-0.9.23-fix-segfault.patch | 24 ----- sys-power/upower-pm-utils/metadata.xml | 7 -- .../upower-pm-utils-0.9.23-r2.ebuild | 101 --------------------- 8 files changed, 270 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 1d75588a265..34a42c4929e 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -392,10 +392,6 @@ sys-auth/bioapi sys-auth/tfm-fingerprint sys-auth/pam_bioapi -# Pacho Ramos <[email protected]> (04 Nov 2018) -# Dead for ages, not needed anymore (#596988). Removal in a month. -sys-power/upower-pm-utils - # Andreas Sturmlechner <[email protected]> (03 Nov 2018) # Breaks revdeps (GDir and GDirEntry split from gfile.h into new gdir.h) # See tracker: https://bugs.gentoo.org/670222 diff --git a/sys-power/upower-pm-utils/Manifest b/sys-power/upower-pm-utils/Manifest deleted file mode 100644 index 27515c195f3..00000000000 --- a/sys-power/upower-pm-utils/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST upower-0.9.23.tar.xz 425804 BLAKE2B 981fbc076ba969a0b19919b45a19ccc48fb19717ec61810d4df28341dae55d29937b89cd895882946eff8dde08e0bed3aadec1da22cbe40ee48334b3901efeb8 SHA512 526ef95e43faf61744ba2bbf80bae23bc5c8672130563a87a7f18f00d85b16e2069814ad70dd66ce6ce698037b522d78579cc2135e2af0c2a636230cfa662c6d diff --git a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-always_use_pm-utils_backend.patch b/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-always_use_pm-utils_backend.patch deleted file mode 100644 index b1cb5c7334e..00000000000 --- a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-always_use_pm-utils_backend.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: Always use the pm-utils backend for now - Redirecting the suspend / hibernate request to logind requires systemd - to be running, as logind tries to start the suspend.target / - hibernate.target via the D-Bus interface provided by systemd. - The availability of logind does not necessarily imply that systemd is - available since we made logind D-Bus activatable under sysvinit. - Also, the systemd version currently in unstable (v44) is too old and - doesn't provide that functionality yet. - Ubuntu ships a very basic implementation of that D-Bus inferface in - systemd-shim which can be run under sysvinit. But we don't have that - package in Debian (yet). - For now, it's the safest option to just continue using the old - pm-utils backend always. -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718493 -diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c -index b9f75f5..595a1b2 100644 ---- a/src/linux/up-backend.c -+++ b/src/linux/up-backend.c -@@ -51,7 +51,7 @@ - - #ifdef ENABLE_DEPRECATED - --#define LOGIND_AVAILABLE() (access("/run/systemd/seats/", F_OK) >= 0) -+#define LOGIND_AVAILABLE() (FALSE) - - #define SD_HIBERNATE_COMMAND "gdbus call --system --dest org.freedesktop.login1 --object-path /org/freedesktop/login1 --method org.freedesktop.login1.Manager.Hibernate 'true'" - #define SD_SUSPEND_COMMAND "gdbus call --system --dest org.freedesktop.login1 --object-path /org/freedesktop/login1 --method org.freedesktop.login1.Manager.Suspend 'true'" diff --git a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-clamp_percentage_for_overfull_batt.patch b/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-clamp_percentage_for_overfull_batt.patch deleted file mode 100644 index 6e643c42de5..00000000000 --- a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-clamp_percentage_for_overfull_batt.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b8fe9902f3c6c50ca6a23e24fcea99582beebc65 Mon Sep 17 00:00:00 2001 -From: Martin Pitt <[email protected]> -Date: Tue, 22 Oct 2013 08:02:51 +0000 -Subject: linux: Clamp percentage for overfull batteries - -Some batteries report energy > energy_full and a percentage ("capacity" -attribute) > 100%. Clamp these within 0 and 100% for both plausibility as well -as to avoid setting an out-of-range property which would then become 0%. - -https://launchpad.net/bugs/1240673 ---- -diff --git a/src/linux/integration-test b/src/linux/integration-test -index 8489bf3..4be1922 100755 ---- a/src/linux/integration-test -+++ b/src/linux/integration-test -@@ -442,6 +442,39 @@ class Tests(unittest.TestCase): - self.assertEqual(self.get_dbus_property('OnLowBattery'), False) - self.stop_daemon() - -+ def test_battery_overfull(self): -+ '''battery which reports a > 100% percentage for a full battery''' -+ -+ self.testbed.add_device('power_supply', 'BAT0', None, -+ ['type', 'Battery', -+ 'present', '1', -+ 'status', 'Full', -+ 'current_now', '1000', -+ 'charge_now', '11000000', -+ 'charge_full', '10000000', -+ 'charge_full_design', '11000000', -+ 'capacity', '110', -+ 'voltage_now', '12000000'], []) -+ -+ self.start_daemon() -+ devs = self.proxy.EnumerateDevices() -+ self.assertEqual(len(devs), 1) -+ bat0_up = devs[0] -+ -+ # should clamp percentage -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 100.0) -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'IsPresent'), True) -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'State'), -+ UP_DEVICE_STATE_FULLY_CHARGED) -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Energy'), 132.0) -+ # should adjust EnergyFull to reality, not what the battery claims -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFull'), 132.0) -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFullDesign'), 132.0) -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Voltage'), 12.0) -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'PowerSupply'), True) -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Type'), 2) -+ self.stop_daemon() -+ - def test_battery_temperature(self): - '''battery which reports temperature''' - -diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c -index 8020277..b953d65 100644 ---- a/src/linux/up-device-supply.c -+++ b/src/linux/up-device-supply.c -@@ -708,6 +708,10 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply) - /* get a precise percentage */ - if (sysfs_file_exists (native_path, "capacity")) { - percentage = sysfs_get_double (native_path, "capacity"); -+ if (percentage < 0.0f) -+ percentage = 0.0f; -+ if (percentage > 100.0f) -+ percentage = 100.0f; - /* for devices which provide capacity, but not {energy,charge}_now */ - if (energy < 0.1f && energy_full > 0.0f) - energy = energy_full * percentage / 100; --- -cgit v0.9.0.2-2-gbebe diff --git a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-create-dir-runtime.patch b/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-create-dir-runtime.patch deleted file mode 100644 index 34340d44ec3..00000000000 --- a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-create-dir-runtime.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b9cff29978113aefe3ad18521f383f12ab099a34 Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi <[email protected]> -Date: Tue, 25 Feb 2014 09:43:04 +0000 -Subject: Create the history directory at runtime - -In addition to build time - this increases compatibilty with OSTree, -which starts out with an empty /var. - -Signed-off-by: Richard Hughes <[email protected]> ---- -diff --git a/src/up-history.c b/src/up-history.c -index f9d0fdf..795b093 100644 ---- a/src/up-history.c -+++ b/src/up-history.c -@@ -414,6 +414,7 @@ up_history_set_directory (UpHistory *history, const gchar *dir) - { - g_free (history->priv->dir); - history->priv->dir = g_strdup (dir); -+ g_mkdir_with_parents (dir, 0755); - } - - /** -@@ -887,7 +888,8 @@ up_history_init (UpHistory *history) - history->priv->data_time_full = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); - history->priv->data_time_empty = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); - history->priv->max_data_age = UP_HISTORY_DEFAULT_MAX_DATA_AGE; -- history->priv->dir = g_build_filename (HISTORY_DIR, NULL); -+ -+ up_history_set_directory (history, HISTORY_DIR); - } - - /** --- -cgit v0.9.0.2-2-gbebe diff --git a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-fix-segfault.patch b/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-fix-segfault.patch deleted file mode 100644 index 3e897632077..00000000000 --- a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-fix-segfault.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0d64bbddaa0078ef148d609a3cfad854cf00d7de Mon Sep 17 00:00:00 2001 -From: Martin Pitt <[email protected]> -Date: Fri, 08 Nov 2013 13:59:50 +0000 -Subject: lib: Fix segfault on getting property when daemon is not running - -This fixes "upower --version" when the daemon is not running, and thus the -client proxy is NULL. ---- -diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c -index 35d7b5d..17fb02d 100644 ---- a/libupower-glib/up-client.c -+++ b/libupower-glib/up-client.c -@@ -322,6 +322,9 @@ up_client_get_property (GObject *object, - UpClient *client; - client = UP_CLIENT (object); - -+ if (client->priv->proxy == NULL) -+ return; -+ - switch (prop_id) { - case PROP_DAEMON_VERSION: - g_value_set_string (value, up_client_glue_get_daemon_version (client->priv->proxy)); --- -cgit v0.9.0.2-2-gbebe diff --git a/sys-power/upower-pm-utils/metadata.xml b/sys-power/upower-pm-utils/metadata.xml deleted file mode 100644 index 95e86c12108..00000000000 --- a/sys-power/upower-pm-utils/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - </maintainer> -</pkgmetadata> diff --git a/sys-power/upower-pm-utils/upower-pm-utils-0.9.23-r2.ebuild b/sys-power/upower-pm-utils/upower-pm-utils-0.9.23-r2.ebuild deleted file mode 100644 index 6359e7400a3..00000000000 --- a/sys-power/upower-pm-utils/upower-pm-utils-0.9.23-r2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils systemd - -DESCRIPTION="The upstream upower 0.9 git branch for use with sys-power/pm-utils" -HOMEPAGE="https://upower.freedesktop.org/"; -SRC_URI="https://upower.freedesktop.org/releases/upower-${PV}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="+introspection ios kernel_FreeBSD kernel_linux" - -COMMON_DEPEND=">=dev-libs/dbus-glib-0.100 - >=dev-libs/glib-2.22 - sys-apps/dbus - >=sys-auth/polkit-0.110 - introspection? ( dev-libs/gobject-introspection ) - kernel_linux? ( - virtual/libusb:1 - virtual/libgudev:= - virtual/udev - ios? ( - >=app-pda/libimobiledevice-1:= - >=app-pda/libplist-1:= - ) - ) - !sys-power/upower" -RDEPEND="${COMMON_DEPEND} - kernel_linux? ( >=sys-power/pm-utils-1.4.1-r2 )" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - dev-util/intltool - >=sys-devel/gettext-0.17 - virtual/pkgconfig" - -QA_MULTILIB_PATHS="usr/lib/upower/.*" - -DOCS="AUTHORS HACKING NEWS README" - -S=${WORKDIR}/upower-${PV} - -src_prepare() { - sed -i -e '/DISABLE_DEPRECATED/d' configure || die - - # https://bugs.freedesktop.org/show_bug.cgi?id=79565 - # https://bugzilla.xfce.org/show_bug.cgi?id=10931 - # Same effect as Debian -no_deprecation_define.patch, they patch .h, we patch .pc - sed -i -e 's|Cflags: |&-DUPOWER_ENABLE_DEPRECATED |' upower-glib.pc.in || die - - # From upstream 0.9 git branch: - epatch \ - "${FILESDIR}"/${P}-create-dir-runtime.patch \ - "${FILESDIR}"/${P}-fix-segfault.patch \ - "${FILESDIR}"/${P}-clamp_percentage_for_overfull_batt.patch - - # From Debian: - epatch "${FILESDIR}"/${P}-always_use_pm-utils_backend.patch -} - -src_configure() { - local backend myconf - - if use kernel_linux; then - backend=linux - myconf="--enable-deprecated" - elif use kernel_FreeBSD; then - backend=freebsd - else - backend=dummy - fi - - econf \ - --libexecdir="${EPREFIX}"/usr/lib/upower \ - --localstatedir="${EPREFIX}"/var \ - $(use_enable introspection) \ - --disable-static \ - ${myconf} \ - --enable-man-pages \ - --disable-tests \ - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \ - --with-backend=${backend} \ - $(use_with ios idevice) \ - "$(systemd_with_utildir)" \ - "$(systemd_with_unitdir)" -} - -src_install() { - default - - # https://bugs.gentoo.org/487400 - insinto /usr/share/doc/${PF}/html/UPower - doins doc/html/* - dosym /usr/share/doc/${PF}/html/UPower /usr/share/gtk-doc/html/UPower - - keepdir /var/lib/upower #383091 - prune_libtool_files -}
