gnome-base/gnome-panel: Sync with tree

2 files changed, 68 insertions, 42 deletions

diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 789e554..093b974 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1 +1,3 @@
-EBUILD gnome-panel-9999.ebuild 2001 RMD160 332e01d5297ed535db83667fa2c5f42d66da706a SHA1 d0b1d93b4c70a8051c33574141de7718ed5f0c66 SHA256 9ace651867f41c053fbcfc8112dbd1290a04b5410e10404d4039886c62042314
+DIST gnome-panel-2.24.2-logout+po.tar.bz2 75365 RMD160 dadb220e3505fdd37bbddd332a760f6d3fa9498a SHA1 1eb32102d62ee6e5ef4420a41e0647a0d3768a72 SHA256 2e67af4d204ff65092d6b37abbfe41d7baea0fc27b1ed46aa7eb3494c2d53ee6
+DIST gnome-panel-2.26.1-po.patch.bz2 74923 RMD160 8d5ef69ba9789a83eb5d00c2c7f4309c565ec37b SHA1 56b2bf2220ca25c638b4d009aa3ab57bb76f1dde SHA256 720539ee1b0e85fa6f668bce30c45120b6b821e980fedf8049b99c145d0b509c
+EBUILD gnome-panel-9999.ebuild 2748 RMD160 55c166af3bc0d58006da50ad154464a40048b96f SHA1 a4c9ed1d9cab8bee47e8757eba7b8ff0ce9a314a SHA256 b49b464fbeced78c28689b6c6b543b19899b3c0a6e79e16ac7f237d991df0d94
diff --git a/gnome-base/gnome-panel/gnome-panel-9999.ebuild b/gnome-base/gnome-panel/gnome-panel-9999.ebuild
index a311abb..4ec123c 100644
--- a/gnome-base/gnome-panel/gnome-panel-9999.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-9999.ebuild
@@ -1,68 +1,91 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.26.1.ebuild,v 1.3 2009/05/13 14:22:12 dang Exp $
 
-inherit gnome2 gnome2-live
+EAPI="2"
+GCONF_DEBUG="no"
 
+inherit autotools eutils gnome2 gnome2-live
+
+MY_P="${PN}-2.24.2"
 DESCRIPTION="The GNOME panel"
 HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${MY_P}-logout+po.tar.bz2
+	mirror://gentoo/${PN}-2.26.1-po.patch.bz2"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc eds networkmanager policykit"
 
-RDEPEND=">=gnome-base/gnome-desktop-2.12
-		 >=x11-libs/pango-1.15.4
-		 >=dev-libs/glib-2.15.6
-		 >=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/cairo-1.0.0
-		 eds? ( >=gnome-extra/evolution-data-server-1.6 )
-		 networkmanager? ( >=net-misc/networkmanager-0.6 )
-		 policykit? (
-			>=sys-auth/policykit-0.7
-			>=gnome-extra/policykit-gnome-0.7 )"
+RDEPEND=">=gnome-base/gnome-desktop-2.24.0
+	>=x11-libs/pango-1.15.4
+	>=dev-libs/glib-2.18.0
+	>=x11-libs/gtk+-2.15.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.20.4
+	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 )
+	policykit? (
+		>=sys-auth/policykit-0.7
+		>=gnome-extra/policykit-gnome-0.7 )"
 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 )"
+	>=dev-lang/perl-5
+	gnome-base/gnome-common
+	>=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
+	>=dev-util/gtk-doc-am-1
+	doc? ( >=dev-util/gtk-doc-1 )"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
+PATCHES="${WORKDIR}/${MY_P}-logout.patch
+${WORKDIR}/${P}-po.patch
+${FILESDIR}/${PN}-2.24.3-daylight.patch
+${FILESDIR}/${PN}-2.24.3-shutdown.patch"
+
 pkg_setup() {
 	G2CONF="${G2CONF}
-			--disable-scrollkeeper
-			--with-in-process-applets=clock,notification-area,wncklet
-			$(use_enable policykit polkit)
-			$(use_enable networkmanager network-manager)
-			$(use_enable eds)"
+		--disable-scrollkeeper
+		--disable-schemas-install
+		--with-in-process-applets=clock,notification-area,wncklet
+		$(use_enable policykit polkit)
+		$(use_enable networkmanager network-manager)
+		$(use_enable eds)"
+}
+
+src_prepare() {
+	# Allow logout/shutdown without gnome-session 2.24, bug #246170
+	echo "gnome-panel/panel-logout.c" >> po/POTFILES.in
+
+	gnome2-live_src_prepare
 }
 
 pkg_postinst() {
-	local entries="/etc/gconf/schemas/panel-default-setup.entries"
+	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)
+		GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")"
 
 		"${gconftool}" --direct --config-source \
 			"${GCONF_CONFIG_SOURCE}" --load="${entries}"
@@ -71,4 +94,5 @@ pkg_postinst() {
 	# Calling this late so it doesn't process the GConf schemas file we already
 	# took care of.
 	gnome2_pkg_postinst
+	gnome2-live_pkg_postinst
 }