From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-power/upower/files/, sys-power/upower/
Date: Wed, 7 Mar 2018 11:37:43 +0000 (UTC) [thread overview]
Message-ID: <1520422652.e1abeb2227734f962443a5a217d75eb773f8da1d.kensington@gentoo> (raw)
commit: e1abeb2227734f962443a5a217d75eb773f8da1d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 7 11:37:06 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar 7 11:37:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1abeb22
sys-power/upower: remove 0.99.4 and 0.99.6
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-power/upower/Manifest | 2 -
.../upower/files/upower-0.99.4-copy-paste.patch | 28 -------
.../upower/files/upower-0.99.4-timer-stats.patch | 42 ----------
sys-power/upower/upower-0.99.4-r1.ebuild | 95 ----------------------
sys-power/upower/upower-0.99.4.ebuild | 84 -------------------
sys-power/upower/upower-0.99.6.ebuild | 86 --------------------
6 files changed, 337 deletions(-)
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 67de54da3f1..3ab9abf0de4 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,4 +1,2 @@
-DIST upower-0.99.4.tar.xz 426292 BLAKE2B 2a574fc9e8ad9d92c65b4159a9861afdccdb53f07506440374b10f7ad31aa31d1c1c964efa80d3d0fdb81ea0524021982da0359115eeacd3ccf1e16158ade553 SHA512 b3fdee5ccf5f4d0c69e227f543272f6952119132814e27bc8f112716b8d36b5e07741a87bcf02203e80ef910cad9ddffa1adecb338c9a9aaa5e1038b62be07f3
DIST upower-0.99.5.tar.xz 432344 BLAKE2B 048471cee61e57ee673e2ba2e2f826ef1770291ca5b7a02adcce11acd78f96a3aa443b5f66abc595ce6578ca59a15a940b0c4924b443babc798fa54f4f629564 SHA512 2fb06bea69455f538146576665e36c5b91eb18b119fa77e29d383fcb2a86ea58650b82e258f157d03c40147ecb12ea545997199580f0e24847ac6ea04d46e5ea
-DIST upower-0.99.6.tar.xz 432056 BLAKE2B 7e62a2649806ac6bd59547aedd04572080ec9ba9700c2dd80287127f099b79aedcf206e4813ff8c6e68417eddaf79b881b69a80fc6fcbca4f276cc908c90d185 SHA512 7e7256491ecb5d3f04abf41f05a761b79761c8868a1aedadfc5085c3b9cf15f6099c1494596e6a24b0951511bc7cac074e93ebb2b84abb9fb7a4374483052d3f
DIST upower-0.99.7.tar.xz 447832 BLAKE2B 3342f38552a5eb6abffc6b15803db0e8a24e6a3345fe1007f3a5fa66dd06ddebacf2352a751f7a3adf7ee0fe28797d7a1c5b3ec27cd190aabed17e2c7070a438 SHA512 a1ad200e715284eae815580bba3faad480f7f13401f6ff1a2e7446172796a2413990ce2b553de713ddc530849b2dff1f0ddc12fbd2fd9b55510bbb644d2340a4
diff --git a/sys-power/upower/files/upower-0.99.4-copy-paste.patch b/sys-power/upower/files/upower-0.99.4-copy-paste.patch
deleted file mode 100644
index 6afe9b7a983..00000000000
--- a/sys-power/upower/files/upower-0.99.4-copy-paste.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Tue, 23 Feb 2016 09:51:07 +0100
-Subject: daemon: fix get_critical_action()
-
-Fix copy&paste error from e7e9156f that called the wrong _complete_ function
-for up_daemon_get_critical_action().
-
-https://bugs.freedesktop.org/show_bug.cgi?id=94262
-
-diff --git a/src/up-daemon.c b/src/up-daemon.c
-index be14cbe..e95f904 100644
---- a/src/up-daemon.c
-+++ b/src/up-daemon.c
-@@ -435,8 +435,8 @@ up_daemon_get_critical_action (UpExportedDaemon *skeleton,
- GDBusMethodInvocation *invocation,
- UpDaemon *daemon)
- {
-- up_exported_daemon_complete_get_display_device (skeleton, invocation,
-- up_backend_get_critical_action (daemon->priv->backend));
-+ up_exported_daemon_complete_get_critical_action (skeleton, invocation,
-+ up_backend_get_critical_action (daemon->priv->backend));
- return TRUE;
- }
-
---
-cgit v0.10.2
-
diff --git a/sys-power/upower/files/upower-0.99.4-timer-stats.patch b/sys-power/upower/files/upower-0.99.4-timer-stats.patch
deleted file mode 100644
index 2ac44205459..00000000000
--- a/sys-power/upower/files/upower-0.99.4-timer-stats.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 798588a480eaae50368bed75fc78f8314523b2a3 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Sun, 23 Apr 2017 20:22:02 +0100
-Subject: Do not spin in a loop when /proc/timer_stats cannot be written
-
-Only set up the polling once the write has succeeded.
-
-Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=100626
-
-diff --git a/src/up-wakeups.c b/src/up-wakeups.c
-index 1bc3c7b..99433dd 100644
---- a/src/up-wakeups.c
-+++ b/src/up-wakeups.c
-@@ -626,6 +626,13 @@ up_wakeups_timerstats_enable (UpWakeups *wakeups)
-
- g_debug ("enabling timer stats");
-
-+ /* enable timer stats */
-+ file = fopen (UP_WAKEUPS_SOURCE_USERSPACE, "w");
-+ if (file == NULL)
-+ return FALSE;
-+ fprintf (file, "1\n");
-+ fclose (file);
-+
- /* setup polls */
- wakeups->priv->poll_kernel_id =
- g_timeout_add_seconds (UP_WAKEUPS_POLL_INTERVAL_KERNEL,
-@@ -637,11 +644,6 @@ up_wakeups_timerstats_enable (UpWakeups *wakeups)
- (GSourceFunc) up_wakeups_poll_userspace_cb, wakeups);
- g_source_set_name_by_id (wakeups->priv->poll_userspace_id, "[upower] up_wakeups_poll_userspace_cb");
-
-- file = fopen (UP_WAKEUPS_SOURCE_USERSPACE, "w");
-- if (file == NULL)
-- return FALSE;
-- fprintf (file, "1\n");
-- fclose (file);
- wakeups->priv->polling_enabled = TRUE;
- return TRUE;
- }
---
-cgit v0.10.2
-
diff --git a/sys-power/upower/upower-0.99.4-r1.ebuild b/sys-power/upower/upower-0.99.4-r1.ebuild
deleted file mode 100644
index 3d9123df0d9..00000000000
--- a/sys-power/upower/upower-0.99.4-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune systemd
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
-HOMEPAGE="https://upower.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/releases/${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 ~x86-fbsd"
-
-# 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? (
- virtual/libusb:1
- virtual/libgudev:=
- 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=(
- # Fix calling the wrong _complete_ function for up_daemon_get_critical_action()
- # (from 'master')
- "${FILESDIR}"/${P}-copy-paste.patch
-
- # Do not spin in a loop when /proc/timer_stats cannot be written
- # (from 'master')
- "${FILESDIR}"/${P}-timer-stats.patch
-)
-
-src_prepare() {
- default
- sed -i -e '/DISABLE_DEPRECATED/d' configure || die
-}
-
-src_configure() {
- local backend myconf
-
- if use kernel_linux; then
- backend=linux
- elif use kernel_FreeBSD; then
- backend=freebsd
- else
- backend=dummy
- fi
-
- econf \
- $(use_enable doc gtk-doc) \
- --libexecdir="${EPREFIX}"/usr/lib/${PN} \
- --localstatedir="${EPREFIX}"/var \
- $(use_enable introspection) \
- --disable-static \
- ${myconf} \
- --enable-man-pages \
- --disable-tests \
- --with-backend=${backend} \
- $(use_with ios idevice) \
- --with-systemdutildir="$(systemd_get_utildir)" \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
- default
- keepdir /var/lib/upower #383091
- prune_libtool_files
-}
diff --git a/sys-power/upower/upower-0.99.4.ebuild b/sys-power/upower/upower-0.99.4.ebuild
deleted file mode 100644
index 76b2424c803..00000000000
--- a/sys-power/upower/upower-0.99.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
-HOMEPAGE="https://upower.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/releases/${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 ~x86-fbsd"
-
-# 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? (
- virtual/libusb:1
- virtual/libgudev:=
- 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"
-
-src_prepare() {
- sed -i -e '/DISABLE_DEPRECATED/d' configure || die
-}
-
-src_configure() {
- local backend myconf
-
- if use kernel_linux; then
- backend=linux
- elif use kernel_FreeBSD; then
- backend=freebsd
- else
- backend=dummy
- fi
-
- econf \
- $(use_enable doc gtk-doc) \
- --libexecdir="${EPREFIX}"/usr/lib/${PN} \
- --localstatedir="${EPREFIX}"/var \
- $(use_enable introspection) \
- --disable-static \
- ${myconf} \
- --enable-man-pages \
- --disable-tests \
- --with-backend=${backend} \
- $(use_with ios idevice) \
- "$(systemd_with_utildir)" \
- "$(systemd_with_unitdir)"
-}
-
-src_install() {
- default
- keepdir /var/lib/upower #383091
- prune_libtool_files
-}
diff --git a/sys-power/upower/upower-0.99.6.ebuild b/sys-power/upower/upower-0.99.6.ebuild
deleted file mode 100644
index a884fe3466c..00000000000
--- a/sys-power/upower/upower-0.99.6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune systemd
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
-HOMEPAGE="https://upower.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/releases/${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 ~x86-fbsd"
-
-# 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? (
- virtual/libusb:1
- virtual/libgudev:=
- 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 )
-
-src_prepare() {
- default
- 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
- keepdir /var/lib/upower #383091
- prune_libtool_files
-}
next reply other threads:[~2018-03-07 11:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-07 11:37 Michael Palimaka [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-20 22:38 [gentoo-commits] repo/gentoo:master commit in: sys-power/upower/files/, sys-power/upower/ Matt Turner
2019-05-04 9:50 Pacho Ramos
2019-01-20 13:40 Pacho Ramos
2018-10-13 9:06 Pacho Ramos
2017-06-18 9:30 Pacho Ramos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1520422652.e1abeb2227734f962443a5a217d75eb773f8da1d.kensington@gentoo \
--to=kensington@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox