New beta version

(Portage version: 2.0.51.22-r2)

7 files changed, 179 insertions, 14 deletions

diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 8e5e8cbe2866..5fabe021edb9 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,12 +1,14 @@
 MD5 cb8adfff3d8c056031f0fb014124d099 ChangeLog 18441
 MD5 f7e2e4cf2f4edcca0070acfc88ebec43 gnome-panel-1.4.1.ebuild 1821
 MD5 1ab5abca58ed191a20538e5298dbf5bf gnome-panel-1.4.2-r2.ebuild 2079
-MD5 2b7852739e5647ed45bbbbbfd4d18a24 gnome-panel-2.6.2.ebuild 1553
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 e396d648e215308e9b6f3b10c57ffd00 gnome-panel-2.10.0-r1.ebuild 1896
 MD5 4bfe7ea07b71345aa8efe5fcbf148b5c gnome-panel-2.10.2.ebuild 1981
+MD5 2b7852739e5647ed45bbbbbfd4d18a24 gnome-panel-2.6.2.ebuild 1553
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 0e8264d57748ca300c41fb43c7374fc0 gnome-panel-2.11.91.ebuild 1952
 MD5 fae3355b5d711fc7eb4d3e3428a6b2ae files/digest-gnome-panel-1.4.1 70
 MD5 30ed8bbd528d5b284c0b489cd8c52210 files/digest-gnome-panel-1.4.2-r2 70
 MD5 a810fac56997cf9a6ee29adec5fb19cf files/digest-gnome-panel-2.10.0-r1 72
-MD5 afd54e022092a94648da54cd0c646241 files/digest-gnome-panel-2.6.2 71
 MD5 3fb66501747e994bb5ac1d787b52a02c files/digest-gnome-panel-2.10.2 72
+MD5 afd54e022092a94648da54cd0c646241 files/digest-gnome-panel-2.6.2 71
+MD5 9519d1c688ac6efb1156b207e75051a5 files/digest-gnome-panel-2.11.91 73
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.11.91 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.11.91
new file mode 100644
index 000000000000..161f837bc362
--- /dev/null
+++ b/gnome-base/gnome-panel/files/digest-gnome-panel-2.11.91
@@ -0,0 +1 @@
+MD5 6b44787f4970f10c42e031176aa65da7 gnome-panel-2.11.91.tar.bz2 2494229
diff --git a/gnome-base/gnome-panel/gnome-panel-2.11.91.ebuild b/gnome-base/gnome-panel/gnome-panel-2.11.91.ebuild
new file mode 100644
index 000000000000..fbf4377eb772
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-2.11.91.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.11.91.ebuild,v 1.1 2005/08/19 20:25:26 joem Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="The GNOME panel"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc eds static"
+
+RDEPEND=">=x11-libs/gtk+-2.7.1
+	>=x11-libs/libwnck-2.9.92
+	>=gnome-base/orbit-2.4
+	>=gnome-base/gnome-vfs-2.9.1
+	>=gnome-base/gnome-desktop-2.9.91
+	>=gnome-base/libbonoboui-2.1.1
+	>=gnome-base/libglade-2.5
+	>=gnome-base/libgnome-2.1.1
+	>=gnome-base/libgnomeui-2.5.4
+	>=gnome-base/gconf-2.6.1
+	>=gnome-base/gnome-menus-2.11.1
+	media-libs/libpng
+	eds? ( >=gnome-extra/evolution-data-server-1.1.4.2 )
+	!gnome-extra/system-tray-applet"
+# we need eds-1.1 for libecal-1.2
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.31
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+USE_DESTDIR="1"
+G2CONF="${G2CONF} $(use_enable eds) $(use_enable static) --disable-scrollkeeper"
+
+src_compile() {
+
+	gnome2_src_configure
+
+	# FIXME : uh yeah, this is nice
+	# We should patch in a switch here and send it upstream
+	sed -i 's:--load:-v:' gnome-panel/Makefile || die
+
+	emake || die
+
+}
+
+pkg_postinst() {
+
+	local entries="/etc/gconf/schemas/panel-default-setup.entries"
+	if [ -e "$entries" ]; then
+		einfo "setting panel gconf defaults..."
+		GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
+		${ROOT}/usr/bin/gconftool-2 --direct --config-source \
+			${GCONF_CONFIG_SOURCE} --load=${entries}
+		rm -f ${entries}
+	fi
+
+	local updater=`which gtk-update-icon-cache`
+	if [ -x "$updater" ]; then
+		einfo "Updating icon cache"
+		$updater -qf ${ROOT}/usr/share/icons/hicolor
+	fi
+
+	# Calling this late so it doesn't process the GConf schemas file we already
+	# took care of.
+	gnome2_pkg_postinst
+
+}
+
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index f1cd3081230f..95c9b67c9596 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,11 @@
 # 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.111 2005/08/19 19:46:36 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.112 2005/08/19 20:29:53 joem Exp $
+
+*gnome-session-2.11.91 (19 Aug 2005)
+
+  19 Aug 2005; Joe McCann <joem@gentoo.org> +gnome-session-2.11.91.ebuild:
+  New beta version
 
   19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
   gnome-session-2.10.0-r3.ebuild:
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 324703543f86..5db2aa699c69 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,16 +1,18 @@
-MD5 4499ec98ae9a50f5de83b8ce43411a80 gnome-session-2.10.0.ebuild 1586
+MD5 4cdad2a9578c7673e8d4bc89c339d6fa ChangeLog 14871
 MD5 1976d8749f4396a7a44fb78c8b2f8ef6 gnome-session-2.10.0-r2.ebuild 1992
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 1bb72e1082a198a93b245fa8dfec093c gnome-session-2.10.0-r3.ebuild 2127
-MD5 4cdad2a9578c7673e8d4bc89c339d6fa ChangeLog 14871
+MD5 4499ec98ae9a50f5de83b8ce43411a80 gnome-session-2.10.0.ebuild 1586
 MD5 c9b685052085b1c022785575a65aa502 gnome-session-2.8.1.ebuild 1580
-MD5 b6e2c49cdafa0d5d8fe9ab4e28f5fc3d files/gnome-session-2.8.1-hide_splash.patch 1469
-MD5 b3685e6ab1ec8736038735270ae11fb5 files/gnome-session-2.10.0-no_smproxy.patch 2103
-MD5 1472ffe4555c4aab66d8359a4031544d files/gnome-session-2.10.0-schema_defaults.patch 648
-MD5 20d1fd1924d8b4f8aed2a43547bd77db files/digest-gnome-session-2.8.1 133
-MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0-r2 134
-MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0 134
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 c5dc0f91391078e84d73b8ba9573d103 gnome-session-2.11.91.ebuild 2069
 MD5 b10dbd1b6388f5fdf9feee0e56525ea5 files/Gnome 2464
+MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0 134
+MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0-r2 134
+MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0-r3 134
+MD5 20d1fd1924d8b4f8aed2a43547bd77db files/digest-gnome-session-2.8.1 133
 MD5 ef9c116121d03af45e5f6f00050da2d6 files/gnome-session-2.10.0-esd_switch.patch 1910
+MD5 b3685e6ab1ec8736038735270ae11fb5 files/gnome-session-2.10.0-no_smproxy.patch 2103
+MD5 1472ffe4555c4aab66d8359a4031544d files/gnome-session-2.10.0-schema_defaults.patch 648
 MD5 9c41a7c69837eba927f8d546d3c13b8d files/gnome-session-2.6-schema_defaults.patch 1484
-MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0-r3 134
+MD5 b6e2c49cdafa0d5d8fe9ab4e28f5fc3d files/gnome-session-2.8.1-hide_splash.patch 1469
+MD5 978c8881fbbaaaba52db38c0dddfb7be files/digest-gnome-session-2.11.91 135
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.11.91 b/gnome-base/gnome-session/files/digest-gnome-session-2.11.91
new file mode 100644
index 000000000000..09888bd67ff9
--- /dev/null
+++ b/gnome-base/gnome-session/files/digest-gnome-session-2.11.91
@@ -0,0 +1,2 @@
+MD5 31db21bcf1bc19a33c620de06cee6073 gnome-session-2.11.91.tar.bz2 680273
+MD5 f02a80d3f1435547a479312c15cc1030 gentoo-splash.png 78064
diff --git a/gnome-base/gnome-session/gnome-session-2.11.91.ebuild b/gnome-base/gnome-session/gnome-session-2.11.91.ebuild
new file mode 100644
index 000000000000..fdda5c029b03
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-2.11.91.ebuild
@@ -0,0 +1,77 @@
+# 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.11.91.ebuild,v 1.1 2005/08/19 20:29:53 joem 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.17
+	dev-util/intltool
+	!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}/${PN}-2.10.0-schema_defaults.patch
+
+	# Implement switch to enable/disable esound support. See bug #6920.
+	epatch ${FILESDIR}/${PN}-2.10.0-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
+
+	export WANT_AUTOMAKE=1.7
+	cp aclocal.m4 old_macros.m4
+	einfo "Running aclocal"
+	aclocal -I . || die "aclocal failed"
+	einfo "Running autoconf"
+	autoconf || die "autoconf failed"
+	einfo "Running automake"
+	automake || die "automake 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
+
+}