Bump to 2.24.1-r1, add patch to support setup with <gnome-session-2.24, bug #246170.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

4 files changed, 103 insertions, 2 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 4fe8256f1e00..0caa5410a371 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.260 2008/11/13 19:28:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.261 2008/11/16 21:00:31 eva Exp $
+
+*gnome-panel-2.24.1-r1 (16 Nov 2008)
+
+  16 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-panel-2.24.1-logout.patch.gz, +gnome-panel-2.24.1-r1.ebuild:
+  Bump to 2.24.1-r1, add patch to support setup with <gnome-session-2.24,
+  bug #246170.
 
   13 Nov 2008; Brent Baude <ranger@gentoo.org> gnome-panel-2.22.2.ebuild:
   Marking gnome-panel-2.22.2 ppc64 stable for bug 236971
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index f63425f7e903..65ca0c149cd6 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gnome-panel-2.24.1-logout.patch.gz 7181 RMD160 d61356aeb4bb96e0df30eb26303b1847793d8537 SHA1 2ad2c3a2b5c9d714d324e750f918023c3f5c85f4 SHA256 ff43145a3cc3187a52333ebc17aa1a0d390960e253fc3342e8e952e6578d9da7
 DIST gnome-panel-2.20.3.tar.bz2 2829469 RMD160 c3c2eb81b6baf7e5203bed288c077017526d554c SHA1 7d2abba6a4aedd05418192b50573fb0a1efc6f1f SHA256 fa76158e659ab5d36f016ba9a5117c4d03680e7c94aa174fdcc03200fe2444c9
 DIST gnome-panel-2.22.2.tar.bz2 3255261 RMD160 64a37f44b9f34f74d30f30aca349749a24c80859 SHA1 73752c3ce6224886c2381b0b13111253008bc6f7 SHA256 e1ecc0ddc5a09481deb2daa1f30fa14472bfed541db46bb4f49f3d0d728b0a45
 DIST gnome-panel-2.24.1.tar.bz2 3354268 RMD160 84e7ccd0425c567c9b800cdfecb653f206cdf768 SHA1 01a2376582ba81b006511279767cb74ecb3332af SHA256 35a845990a8f56da191615a82e22f1be47657476647f4fb5c5148668cc999907
 EBUILD gnome-panel-2.20.3.ebuild 2099 RMD160 bcf764d1cdd8297b0fe2338954dfa01442445756 SHA1 fbf2a9ccaf165cd651d2347ecd84defc36b8df0a SHA256 c03894138e2c35cb9295de6bcf90f912d0e986a02b9068a74daaea4ddab92885
 EBUILD gnome-panel-2.22.2.ebuild 2226 RMD160 53312444f344c505a3909211e359b7e7be0c9979 SHA1 519a275855f1d2c662291c5bd4a8f79a99346af1 SHA256 5ce3163f1f968bed9ebb00e6e2075c78957f555275e144422edeb96bb0c98377
+EBUILD gnome-panel-2.24.1-r1.ebuild 2231 RMD160 ed806469cde39b35b1b7977264971206d13f48f4 SHA1 7f7536bb4570b3ad0f09d351b3b063d416af05c1 SHA256 8bed1a0a42d88ef824a5e6ba9013513f7c59019b3dbe03d1bdef2b401b0710b9
 EBUILD gnome-panel-2.24.1.ebuild 2052 RMD160 f43b0142c9b079b0e9b29b33d60d5bf7aa30f462 SHA1 a37e83c224a0647004a96f16147ee2ee64ac700b SHA256 5c73d039ed0f8d9a5194b647c555b98cc95feb19c90af4347be61b11b37b4efa
-MISC ChangeLog 34693 RMD160 8359875ad43e69430573aef9acd4a6e9ce6e2f6e SHA1 99faa02e50c32225bcd2aaa2a8966842abe36f92 SHA256 44bbc3e429b8d7d4769132fd44efc592670428a3d41180a06dbb67df7e8d1d99
+MISC ChangeLog 34948 RMD160 61c0cd10f4b3f6ed9734329340ac6c9f761221ec SHA1 124546c2d974e3d7183dc8f9138fd40cec64d807 SHA256 5734394ab1b2670943d4294657effc318867172918e740626e867ab7ca92f20c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkgmBcACgkQ1fmVwcYIWAaIfQCbBXCcwpNJWwCzf/VPYTL+QLwG
+wnYAmwZA8d0Wt85LB40qU6zJj0TBthZP
+=eJCl
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.24.1-logout.patch.gz b/gnome-base/gnome-panel/files/gnome-panel-2.24.1-logout.patch.gz
new file mode 100644
index 000000000000..da56b16f9126
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-2.24.1-logout.patch.gz
diff --git a/gnome-base/gnome-panel/gnome-panel-2.24.1-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.24.1-r1.ebuild
new file mode 100644
index 000000000000..992db635d9a8
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-2.24.1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2008 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.24.1-r1.ebuild,v 1.1 2008/11/16 21:00:31 eva Exp $
+
+inherit autotools gnome2
+
+DESCRIPTION="The GNOME panel"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc eds networkmanager"
+
+RDEPEND=">=gnome-base/gnome-desktop-2.12
+	>=x11-libs/pango-1.15.4
+	>=dev-libs/glib-2.16.0
+	>=x11-libs/gtk+-2.13.1
+	>=dev-libs/libgweather-2.24.1
+	dev-libs/libxml2
+	>=gnome-base/libglade-2.5
+	>=gnome-base/libgnome-2.13
+	>=gnome-base/libgnomeui-2.5.4
+	>=gnome-base/libbonoboui-2.1.1
+	>=gnome-base/orbit-2.4
+	>=x11-libs/libwnck-2.19.5
+	>=gnome-base/gconf-2.6.1
+	>=gnome-base/gnome-menus-2.11.1
+	>=gnome-base/libbonobo-2
+	gnome-base/librsvg
+	>=dev-libs/dbus-glib-0.71
+	>=sys-apps/dbus-1.1.2
+	x11-libs/libXau
+	>=x11-libs/cairo-1.0.0
+	eds? ( >=gnome-extra/evolution-data-server-1.6 )
+	networkmanager? ( >=net-misc/networkmanager-0.6 )"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.3.2
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40
+	~app-text/docbook-xml-dtd-4.1.2
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--disable-schemas-install
+		--with-in-process-applets=clock,notification-area,wncklet
+		--disable-polkit
+		$(use_enable networkmanager network-manager)
+		$(use_enable eds)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Allow logout/shutdown without gnome-session 2.24, bug #246170
+	epatch "${FILESDIR}/${PN}-2.24.1-logout.patch.gz"
+
+	eautomake
+}
+
+pkg_postinst() {
+	local entries="${ROOT}etc/gconf/schemas/panel-default-setup.entries"
+	local gconftool="${ROOT}usr/bin/gconftool-2"
+
+	if [ -e "$entries" ]; then
+		einfo "setting panel gconf defaults..."
+
+		GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")"
+
+		"${gconftool}" --direct --config-source \
+			"${GCONF_CONFIG_SOURCE}" --load="${entries}"
+	fi
+
+	# Calling this late so it doesn't process the GConf schemas file we already
+	# took care of.
+	gnome2_pkg_postinst
+}