Marking 2.10.0-r1 stable (x86). Adding new revision with support for the 'esd' USE flag (related to bug #6920).

(Portage version: 2.0.51.22-r1)

6 files changed, 169 insertions, 9 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 66e509afa649..7fb250db0f2a 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.100 2005/07/12 03:38:37 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.101 2005/07/19 16:56:45 leonardop Exp $
+
+*gnome-session-2.10.0-r2 (19 Jun 2005)
+
+  19 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gnome-session-2.10.0-r2.ebuild,
+  files/gnome-session-2.10.0-esd_switch.patch:
+  New revision, including a patch to enable/disable esound support, related
+  to bug #6920.
+
+  19 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gnome-session-2.10.0-r1.ebuild:
+  Stable on x86.
 
   12 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
   gnome-session-2.10.0.ebuild:
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 552dba7a2f13..6c1f07102f2a 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,12 +1,16 @@
+MD5 edd821b653ba6b18cc4d016d88ddab2c ChangeLog 13087
+MD5 de0916723b662066469693a04c1b08c6 gnome-session-2.10.0-r1.ebuild 1626
+MD5 ed1327c52ef8638f33707a7e6e316e3f gnome-session-2.10.0-r2.ebuild 1888
 MD5 c9b685052085b1c022785575a65aa502 gnome-session-2.8.1.ebuild 1580
-MD5 2f61315998f15356e87a16a30c52a446 gnome-session-2.10.0-r1.ebuild 1627
-MD5 a3cda804af81fb76f22546c2b3bdbc73 ChangeLog 12980
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 4499ec98ae9a50f5de83b8ce43411a80 gnome-session-2.10.0.ebuild 1586
+MD5 1bb87598122e62746a64c0ded124b6db .gnome-session-2.10.0-r2.ebuild.swp 12288
 MD5 b10dbd1b6388f5fdf9feee0e56525ea5 files/Gnome 2464
-MD5 b6e2c49cdafa0d5d8fe9ab4e28f5fc3d files/gnome-session-2.8.1-hide_splash.patch 1469
-MD5 20d1fd1924d8b4f8aed2a43547bd77db files/digest-gnome-session-2.8.1 133
-MD5 9c41a7c69837eba927f8d546d3c13b8d files/gnome-session-2.6-schema_defaults.patch 1484
 MD5 1472ffe4555c4aab66d8359a4031544d files/gnome-session-2.10.0-schema_defaults.patch 648
-MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0 134
 MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0-r1 134
+MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0 134
+MD5 20d1fd1924d8b4f8aed2a43547bd77db files/digest-gnome-session-2.8.1 133
+MD5 ef9c116121d03af45e5f6f00050da2d6 files/gnome-session-2.10.0-esd_switch.patch 1910
+MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0-r2 134
+MD5 9c41a7c69837eba927f8d546d3c13b8d files/gnome-session-2.6-schema_defaults.patch 1484
+MD5 b6e2c49cdafa0d5d8fe9ab4e28f5fc3d files/gnome-session-2.8.1-hide_splash.patch 1469
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.10.0-r2 b/gnome-base/gnome-session/files/digest-gnome-session-2.10.0-r2
new file mode 100644
index 000000000000..c3bc29871e81
--- /dev/null
+++ b/gnome-base/gnome-session/files/digest-gnome-session-2.10.0-r2
@@ -0,0 +1,2 @@
+MD5 cbeb2db49dac11bf8088e6b025265fff gnome-session-2.10.0.tar.bz2 796754
+MD5 f02a80d3f1435547a479312c15cc1030 gentoo-splash.png 78064
diff --git a/gnome-base/gnome-session/files/gnome-session-2.10.0-esd_switch.patch b/gnome-base/gnome-session/files/gnome-session-2.10.0-esd_switch.patch
new file mode 100644
index 000000000000..b634da936f26
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.10.0-esd_switch.patch
@@ -0,0 +1,70 @@
+diff -NurdB gnome-session-2.10.0/configure.in gnome-session-2.10.0-patched/configure.in
+--- gnome-session-2.10.0/configure.in	2005-03-07 06:35:25.000000000 -0500
++++ gnome-session-2.10.0-patched/configure.in	2005-07-19 07:56:41.000000000 -0500
+@@ -47,15 +47,40 @@
+ 
+ dnl pkg-config dependency checks
+ 
++PKG_PROG_PKG_CONFIG()
++
+ dnl We first check for esound and audiofile (which has conditional
+ dnl support built in)
+ 
+-ESOUND_MODULE="esound >= $ESOUND_REQUIRED"
+-PKG_CHECK_MODULES(SOUND_TEST, $ESOUND_MODULE, [
++AC_MSG_CHECKING([whether ESounD support is requested])
++AC_ARG_ENABLE([esd],
++	AS_HELP_STRING([--enable-esd],[Enable ESounD (default=yes)]),
++	[enable_esd=$enableval],
++	[enable_esd=yes])
++AC_MSG_RESULT([$enable_esd])
++
++if test x$enable_esd = xyes; then
++	ESOUND_MODULE="esound >= $ESOUND_REQUIRED"
++	PKG_CHECK_MODULES(SOUND_TEST, $ESOUND_MODULE)
+ 	AC_DEFINE(HAVE_ESD, 1, [Define if you have the ESound Daemon])
+-],[
++
++	ESDSERVERDIR=`$PKG_CONFIG --variable=esd_serverdir esound`
++	old_path=$PATH
++	if test x"$ESDSERVERDIR" != x; then
++		PATH=$ESDSERVERDIR:$PATH
++	fi
++
++	AC_PATH_PROG(ESD_SERVER, esd, no)
++	if test x"$ESD_SERVER" = xno; then
++		AC_MSG_ERROR([esd executable not found in your path - should be installed with ESound])
++	fi
++
++	AC_SUBST(ESD_SERVER)
++	PATH=$old_path
++
++else
+ 	ESOUND_MODULE=""
+-])
++fi
+ 
+ PKG_CHECK_MODULES(GNOME_SESSION, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $ESOUND_MODULE)
+ 
+@@ -92,21 +117,6 @@
+ 	
+ AC_SUBST(GNOME_KEYRING_DAEMON)
+ 
+-# esd
+-ESDSERVERDIR=`$PKG_CONFIG --variable=esd_serverdir esound`
+-old_path=$PATH
+-if test x"$ESDSERVERDIR" != x; then
+-   PATH=$ESDSERVERDIR:$PATH
+-fi
+-
+-AC_PATH_PROG(ESD_SERVER, esd, no)
+-if test x"$ESD_SERVER" = xno; then
+-  AC_MSG_ERROR([esd executable not found in your path - should be installed with ESound])
+-fi
+-
+-AC_SUBST(ESD_SERVER)
+-PATH=$old_path
+-
+ dnl X development libraries check
+ 
+ #
diff --git a/gnome-base/gnome-session/gnome-session-2.10.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-2.10.0-r1.ebuild
index e040a2b24ab2..9ca6d529fc00 100644
--- a/gnome-base/gnome-session/gnome-session-2.10.0-r1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.10.0-r1.ebuild,v 1.2 2005/07/08 11:24:07 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.10.0-r1.ebuild,v 1.3 2005/07/19 16:56:46 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -10,7 +10,7 @@ SRC_URI="${SRC_URI} mirror://gentoo/gentoo-splash.png"
 
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="ipv6"
 
 RDEPEND=">=x11-libs/gtk+-2.3.1
diff --git a/gnome-base/gnome-session/gnome-session-2.10.0-r2.ebuild b/gnome-base/gnome-session/gnome-session-2.10.0-r2.ebuild
new file mode 100644
index 000000000000..4ba1a17e281e
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-2.10.0-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.10.0-r2.ebuild,v 1.1 2005/07/19 16:56:46 leonardop Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI} mirror://gentoo/gentoo-splash.png"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+IUSE="esd ipv6"
+
+RDEPEND=">=x11-libs/gtk+-2.3.1
+	esd? ( >=media-sound/esound-0.2.26 )
+	>=gnome-base/libgnomeui-2.2
+	>=sys-apps/tcp-wrappers-7.6
+	>=gnome-base/gconf-2
+	gnome-base/gnome-keyring"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.10.40
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.29
+	!gnome-base/gnome-core"
+# gnome-base/gnome-core overwrite /usr/bin/gnome-session
+
+G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable esd)"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+USE_DESTDIR="1"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd ${S}
+
+	# Patch for logout dialog and automatic session save now reverted. See bug
+	# #95745. Patch to set the Gentoo splash by default in the gconf key
+	# (#42687)
+	epatch ${FILESDIR}/${P}-schema_defaults.patch
+
+	# Implement switch to enable/disable esound support. See bug #6920.
+	epatch ${FILESDIR}/${P}-esd_switch.patch
+
+	# Hide the splash after defaults have been loaded, a temp workaround
+	# for http://bugzilla.gnome.org/show_bug.cgi?id=116814
+	epatch ${FILESDIR}/${PN}-2.8.1-hide_splash.patch
+
+	einfo "Running aclocal"
+	aclocal || die "Aclocal failed"
+	einfo "Running autoconf"
+	autoconf || die "Autoconf failed"
+	einfo "Running libtoolize"
+	libtoolize --copy --force
+}
+
+src_install() {
+
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe ${FILESDIR}/Gnome
+
+	# Our own splash for world domination
+	insinto /usr/share/pixmaps/splash/
+	doins ${DISTDIR}/gentoo-splash.png
+
+}