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 4791E138989 for ; Fri, 1 May 2015 14:31:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2865E0837; Fri, 1 May 2015 14:31:49 +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 5A69FE0837 for ; Fri, 1 May 2015 14:31:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A2E09340C47 for ; Fri, 1 May 2015 14:31:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 352AD98E for ; Fri, 1 May 2015 14:31:44 +0000 (UTC) From: "Ole Reifschneider" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ole Reifschneider" Message-ID: <1430490693.ca31ccdb82a4332695c60482776c82d60c361fb5.tranquility@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-session/gnome-session-3.16.0.ebuild gnome-base/gnome-session/gnome-session-9999.ebuild X-VCS-Directories: gnome-base/gnome-session/ X-VCS-Committer: tranquility X-VCS-Committer-Name: Ole Reifschneider X-VCS-Revision: ca31ccdb82a4332695c60482776c82d60c361fb5 X-VCS-Branch: master Date: Fri, 1 May 2015 14:31:44 +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: 4fc13367-7889-4bff-8502-9fe56a2c9217 X-Archives-Hash: dab271f5f0b14636cd153f654aaea3cb commit: ca31ccdb82a4332695c60482776c82d60c361fb5 Author: Ole Reifschneider gentoo org> AuthorDate: Fri May 1 14:31:33 2015 +0000 Commit: Ole Reifschneider gentoo org> CommitDate: Fri May 1 14:31:33 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ca31ccdb Bump gnome-session to 3.16.0 Package-Manager: portage-2.2.18 Manifest-Sign-Key: 7E8B4D42 ...ion-9999.ebuild => gnome-session-3.16.0.ebuild} | 30 +++++++++++----------- gnome-base/gnome-session/gnome-session-9999.ebuild | 19 +++++++++----- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-3.16.0.ebuild similarity index 79% copy from gnome-base/gnome-session/gnome-session-9999.ebuild copy to gnome-base/gnome-session/gnome-session-3.16.0.ebuild index 2e040da..8a5b21e 100644 --- a/gnome-base/gnome-session/gnome-session-9999.ebuild +++ b/gnome-base/gnome-session/gnome-session-3.16.0.ebuild @@ -1,25 +1,18 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.14.0-r2.ebuild,v 1.1 2015/03/22 17:50:31 tetromino Exp $ EAPI="5" GCONF_DEBUG="yes" inherit gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi DESCRIPTION="Gnome session manager" HOMEPAGE="https://git.gnome.org/browse/gnome-session" LICENSE="GPL-2 LGPL-2 FDL-1.1" SLOT="0" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -fi +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="doc elibc_FreeBSD gconf ipv6 systemd" # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and @@ -31,7 +24,6 @@ COMMON_DEPEND=" x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.90.7:3 >=dev-libs/json-glib-0.10 - >=dev-libs/dbus-glib-0.76 >=gnome-base/gnome-desktop-3.9.91:3= elibc_FreeBSD? ( dev-libs/libexecinfo ) @@ -60,7 +52,10 @@ RDEPEND="${COMMON_DEPEND} >=gnome-base/gsettings-desktop-schemas-0.1.7 >=x11-themes/gnome-themes-standard-2.91.92 sys-apps/dbus[X] - !systemd? ( sys-auth/consolekit ) + !systemd? ( + sys-auth/consolekit + >=dev-libs/dbus-glib-0.76 + ) " DEPEND="${COMMON_DEPEND} >=dev-lang/perl-5 @@ -87,6 +82,7 @@ src_configure() { $(use_enable gconf) \ $(use_enable ipv6) \ $(use_enable systemd) \ + $(use_enable !systemd consolekit) \ UPOWER_CFLAGS="" \ UPOWER_LIBS="" # gnome-session-selector pre-generated man page is missing @@ -100,9 +96,8 @@ src_install() { exeinto /etc/X11/Sessions doexe "${FILESDIR}/Gnome" - dodir /usr/share/gnome/applications/ - insinto /usr/share/gnome/applications/ - newins "${FILESDIR}/defaults.list-r2" defaults.list + insinto /usr/share/applications + newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list dodir /etc/X11/xinit/xinitrc.d/ exeinto /etc/X11/xinit/xinitrc.d/ @@ -110,6 +105,11 @@ src_install() { # This should be done here as discussed in bug #270852 newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome + + # Set XCURSOR_THEME from current dconf setting instead of installing + # default cursor symlink globally and affecting other DEs (bug #543488) + # https://bugzilla.gnome.org/show_bug.cgi?id=711703 + newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome } pkg_postinst() { diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-9999.ebuild index 2e040da..0a00fd7 100644 --- a/gnome-base/gnome-session/gnome-session-9999.ebuild +++ b/gnome-base/gnome-session/gnome-session-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -31,7 +31,6 @@ COMMON_DEPEND=" x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.90.7:3 >=dev-libs/json-glib-0.10 - >=dev-libs/dbus-glib-0.76 >=gnome-base/gnome-desktop-3.9.91:3= elibc_FreeBSD? ( dev-libs/libexecinfo ) @@ -60,7 +59,10 @@ RDEPEND="${COMMON_DEPEND} >=gnome-base/gsettings-desktop-schemas-0.1.7 >=x11-themes/gnome-themes-standard-2.91.92 sys-apps/dbus[X] - !systemd? ( sys-auth/consolekit ) + !systemd? ( + sys-auth/consolekit + >=dev-libs/dbus-glib-0.76 + ) " DEPEND="${COMMON_DEPEND} >=dev-lang/perl-5 @@ -87,6 +89,7 @@ src_configure() { $(use_enable gconf) \ $(use_enable ipv6) \ $(use_enable systemd) \ + $(use_enable !systemd consolekit) \ UPOWER_CFLAGS="" \ UPOWER_LIBS="" # gnome-session-selector pre-generated man page is missing @@ -100,9 +103,8 @@ src_install() { exeinto /etc/X11/Sessions doexe "${FILESDIR}/Gnome" - dodir /usr/share/gnome/applications/ - insinto /usr/share/gnome/applications/ - newins "${FILESDIR}/defaults.list-r2" defaults.list + insinto /usr/share/applications + newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list dodir /etc/X11/xinit/xinitrc.d/ exeinto /etc/X11/xinit/xinitrc.d/ @@ -110,6 +112,11 @@ src_install() { # This should be done here as discussed in bug #270852 newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome + + # Set XCURSOR_THEME from current dconf setting instead of installing + # default cursor symlink globally and affecting other DEs (bug #543488) + # https://bugzilla.gnome.org/show_bug.cgi?id=711703 + newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome } pkg_postinst() {