[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/

[Gilles Dartiguelongue]

commit:     b521b22ccc54dbdaff57d8f4d0f21ff5981f8441
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 25 23:22:43 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Dec 25 23:23:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b521b22c

gnome-base/gnome-session: moved to gx86

    * Sync live ebuild with gx86 changes.

---
 .../gnome-session/gnome-session-3.6.2.ebuild       |  113 --------------------
 gnome-base/gnome-session/gnome-session-9999.ebuild |   23 +++--
 2 files changed, 16 insertions(+), 120 deletions(-)

diff --git a/gnome-base/gnome-session/gnome-session-3.6.2.ebuild b/gnome-base/gnome-session/gnome-session-3.6.2.ebuild
deleted file mode 100644
index 149656f..0000000
--- a/gnome-base/gnome-session/gnome-session-3.6.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# gdk-pixbuf used in the inhibit dialog
-COMMON_DEPEND=">=dev-libs/glib-2.33.4:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.90.7:3
-	>=dev-libs/json-glib-0.10
-	>=dev-libs/dbus-glib-0.76
-	>=sys-power/upower-0.9.0
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-
-	virtual/opengl
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	x11-apps/xdpyinfo
-
-	gconf? ( >=gnome-base/gconf-2:2 )"
-# Pure-runtime deps from the session files should *NOT* be added here
-# Otherwise, things like gdm pull in gnome-shell
-# gnome-themes-standard is needed for the failwhale dialog themeing
-# sys-apps/dbus[X] is needed for session management
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gnome-settings-daemon
-	>=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-util/intltool-0.40.6
-	virtual/pkgconfig
-	!<gnome-base/gdm-2.20.4
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt )"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--disable-deprecation-flags
-		--disable-schemas-compile
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(use_enable doc docbook-docs)
-		$(use_enable gconf)
-		$(use_enable ipv6)
-		$(use_enable systemd)"
-	gnome2_src_configure
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	dodir /usr/share/gnome/applications/
-	insinto /usr/share/gnome/applications/
-	doins "${FILESDIR}/defaults.list"
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
-	# This should be done here as discussed in bug #270852
-	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
-		ewarn "If you use a custom .xinitrc for your X session,"
-		ewarn "make sure that the commands in the xinitrc.d scripts are run."
-	fi
-}

diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-9999.ebuild
index 149656f..71a4ef7 100644
--- a/gnome-base/gnome-session/gnome-session-9999.ebuild
+++ b/gnome-base/gnome-session/gnome-session-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 
 inherit gnome2
@@ -26,7 +26,8 @@ IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
 # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
 # xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
 # gdk-pixbuf used in the inhibit dialog
-COMMON_DEPEND=">=dev-libs/glib-2.33.4:2
+COMMON_DEPEND="
+	>=dev-libs/glib-2.33.4:2
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-2.90.7:3
 	>=dev-libs/json-glib-0.10
@@ -47,7 +48,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.4:2
 	x11-misc/xdg-user-dirs-gtk
 	x11-apps/xdpyinfo
 
-	gconf? ( >=gnome-base/gconf-2:2 )"
+	gconf? ( >=gnome-base/gconf-2:2 )
+"
 # Pure-runtime deps from the session files should *NOT* be added here
 # Otherwise, things like gdm pull in gnome-shell
 # gnome-themes-standard is needed for the failwhale dialog themeing
@@ -58,24 +60,31 @@ RDEPEND="${COMMON_DEPEND}
 	>=x11-themes/gnome-themes-standard-2.91.92
 	sys-apps/dbus[X]
 	systemd? ( >=sys-apps/systemd-183 )
-	!systemd? ( sys-auth/consolekit )"
+	!systemd? ( sys-auth/consolekit )
+"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
 	>=sys-devel/gettext-0.10.40
 	>=dev-util/intltool-0.40.6
+	x11-libs/pango[X]
 	virtual/pkgconfig
 	!<gnome-base/gdm-2.20.4
 	doc? (
 		app-text/xmlto
-		dev-libs/libxslt )"
+		dev-libs/libxslt )
+"
 # gnome-common needed for eautoreconf
 # gnome-base/gdm does not provide gnome.desktop anymore
 
+src_prepare() {
+	# Silence errors due to weird checks for libX11
+	sed -e 's/\(PANGO_PACKAGES="\)pangox/\1/' -i configure.ac configure || die
+	gnome2_src_prepare
+}
+
 src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}
 		--disable-deprecation-flags
-		--disable-schemas-compile
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		$(use_enable doc docbook-docs)
 		$(use_enable gconf)