From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CAAA258973 for ; Sat, 16 Jan 2016 10:48:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61FE121C01A; Sat, 16 Jan 2016 10:48:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE33021C01A for ; Sat, 16 Jan 2016 10:48:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF6F5340B27 for ; Sat, 16 Jan 2016 10:48:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A30CCFB for ; Sat, 16 Jan 2016 10:48:06 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1452941274.94531ada58478e128210df44a83e35bba465e54f.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2-r1.ebuild gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2.ebuild X-VCS-Directories: gnome-extra/cinnamon-settings-daemon/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 94531ada58478e128210df44a83e35bba465e54f X-VCS-Branch: master Date: Sat, 16 Jan 2016 10:48:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 027eb480-1890-48c3-9728-a19c249cc2f1 X-Archives-Hash: d2dae75cc13125d1eee143f38b72d38e commit: 94531ada58478e128210df44a83e35bba465e54f Author: Pacho Ramos gentoo org> AuthorDate: Sat Jan 16 10:42:04 2016 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sat Jan 16 10:47:54 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94531ada gnome-extra/cinnamon-settings-daemon: Both upower packages are supported by upstream (#571722 by Oleg). Package-Manager: portage-2.2.26 ...-daemon-2.8.2.ebuild => cinnamon-settings-daemon-2.8.2-r1.ebuild} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2-r1.ebuild similarity index 95% rename from gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2.ebuild rename to gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2-r1.ebuild index c578786..4235b31 100644 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2.ebuild +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2-r1.ebuild @@ -46,8 +46,9 @@ RDEPEND=" x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) - systemd? ( sys-apps/systemd:0= >=sys-power/upower-0.9.11:= ) - !systemd? ( sys-auth/consolekit:0= sys-power/upower-pm-utils ) + || ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils ) + systemd? ( sys-apps/systemd:0= ) + !systemd? ( sys-auth/consolekit:0= ) " DEPEND="${RDEPEND} dev-libs/libxml2:2