commit: 5a05ec26ffd5f6acd7fa998dbb5b2924fd4c0360 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Sun Apr 20 14:47:21 2014 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Sun Apr 20 15:48:27 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5a05ec26
gnome-base/gnome-session: QAed gnome-session-properties is no more. Fix a potential problem on install where xsltproc would not be found yet needed for configure to succeed due to --enable-man being the default. This is an issue inherited from previous ebuilds. * Avoid automagic for old upower, the rest of gnome 3.12 will pull a more modern version and we cannot have both on the system. * Drop unneeded patch. * Fix keywords. * Sync live ebuild. --- .../files/gnome-session-3.8.4-blacklist-nv25.patch | 22 ------------------ .../gnome-session/gnome-session-3.12.0.ebuild | 16 +++++++++---- gnome-base/gnome-session/gnome-session-9999.ebuild | 27 ++++++++++------------ 3 files changed, 24 insertions(+), 41 deletions(-) diff --git a/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch b/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch deleted file mode 100644 index 3f28c2b..0000000 --- a/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f11f157d507495589b0f4930f4fcc431c87bc121 Mon Sep 17 00:00:00 2001 -From: Ray Strode <rstr...@redhat.com> -Date: Tue, 12 Nov 2013 13:32:45 +0000 -Subject: data: blacklist nv25 - -It doesn't work very well. - -https://bugzilla.gnome.org/show_bug.cgi?id=711347 ---- -diff --git a/data/hardware-compatibility b/data/hardware-compatibility -index 927ba8b..48b7946 100644 ---- a/data/hardware-compatibility -+++ b/data/hardware-compatibility -@@ -27,3 +27,6 @@ - - # Gallium has softpipe; we explicitly enable llvmpipe - -softpipe -+ -+# nouveau vieux NV25 doesn't work too well -+-Mesa DRI nv25 --- -cgit v0.9.2 diff --git a/gnome-base/gnome-session/gnome-session-3.12.0.ebuild b/gnome-base/gnome-session/gnome-session-3.12.0.ebuild index cc3cd8d..bb2c3ff 100644 --- a/gnome-base/gnome-session/gnome-session-3.12.0.ebuild +++ b/gnome-base/gnome-session/gnome-session-3.12.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.10.1.ebuild,v 1.6 2014/03/29 21:00:14 tetromino Exp $ +# $Header: $ EAPI="5" GCONF_DEBUG="yes" @@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-session"; LICENSE="GPL-2 LGPL-2 FDL-1.1" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +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 @@ -58,6 +58,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40 + dev-libs/libxslt >=dev-util/intltool-0.40.6 virtual/pkgconfig !<gnome-base/gdm-2.20.4 @@ -69,14 +70,21 @@ DEPEND="${COMMON_DEPEND} # gnome-base/gdm does not provide gnome.desktop anymore src_configure() { + # 1. Avoid automagic on old upower releases + # 2. xsltproc is always checked due to man configure + # switch, even if USE=-doc gnome2_src_configure \ --disable-deprecation-flags \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ --enable-session-selector \ $(use_enable doc docbook-docs) \ $(use_enable gconf) \ $(use_enable ipv6) \ - $(use_enable systemd) + $(use_enable systemd) \ + UPOWER_CFLAGS="" \ + UPOWER_LIBS="" + # gnome-session-selector pre-generated man page is missing + #$(usex !doc XSLTPROC=$(type -P true)) } src_install() { diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-9999.ebuild index edfb7f4..263c849 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-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -33,7 +33,6 @@ COMMON_DEPEND=" >=dev-libs/json-glib-0.10 >=dev-libs/dbus-glib-0.76 >=gnome-base/gnome-desktop-3.9.91:3= - >=sys-power/upower-0.9.0 elibc_FreeBSD? ( dev-libs/libexecinfo ) virtual/opengl @@ -50,6 +49,7 @@ COMMON_DEPEND=" x11-apps/xdpyinfo gconf? ( >=gnome-base/gconf-2:2 ) + systemd? ( >=sys-apps/systemd-183:0= ) " # Pure-runtime deps from the session files should *NOT* be added here # Otherwise, things like gdm pull in gnome-shell @@ -60,12 +60,12 @@ 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-apps/systemd-183 ) !systemd? ( sys-auth/consolekit ) " DEPEND="${COMMON_DEPEND} >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40 + dev-libs/libxslt >=dev-util/intltool-0.40.6 virtual/pkgconfig !<gnome-base/gdm-2.20.4 @@ -76,25 +76,22 @@ DEPEND="${COMMON_DEPEND} # gnome-common needed for eautoreconf # gnome-base/gdm does not provide gnome.desktop anymore -src_prepare() { - # Allow people to configure startup apps, bug #464968, upstream bug #663767 - sed -i -e '/NoDisplay/d' data/gnome-session-properties.desktop.in.in || die - - # Blacklist nv25 (from 'master') - epatch "${FILESDIR}"/${PN}-3.8.4-blacklist-nv25.patch - - gnome2_src_prepare -} - src_configure() { + # 1. Avoid automagic on old upower releases + # 2. xsltproc is always checked due to man configure + # switch, even if USE=-doc gnome2_src_configure \ --disable-deprecation-flags \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ --enable-session-selector \ $(use_enable doc docbook-docs) \ $(use_enable gconf) \ $(use_enable ipv6) \ - $(use_enable systemd) + $(use_enable systemd) \ + UPOWER_CFLAGS="" \ + UPOWER_LIBS="" + # gnome-session-selector pre-generated man page is missing + #$(usex !doc XSLTPROC=$(type -P true)) } src_install() {
