Bump to 2.22.1.3. More fixes to the clock applet.

Package-Manager: portage-2.1.5_rc2

4 files changed, 103 insertions, 5 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index c4706a6d830b..45bbfa4fac24 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,12 @@
 # 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.249 2008/04/14 22:00:02 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.250 2008/04/19 20:47:13 eva Exp $
+
+*gnome-panel-2.22.1.3 (19 Apr 2008)
+
+  19 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-panel-2.22.1.2.ebuild, +gnome-panel-2.22.1.3.ebuild:
+  Bump to 2.22.1.3. More fixes to the clock applet.
 
 *gnome-panel-2.22.1.2 (13 Apr 2008)
 
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index ccca18d51de2..c0382c21445b 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,12 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gnome-panel-2.18.3.tar.bz2 2722555 RMD160 346c3e981de3af98632d43511545b1877cf9cb5e SHA1 a521b722a1cc753ea0fa3ed7dcf5262750235f9a SHA256 efb12148ace94612b47add4060dd9ae088b47e09e5c4c223f8ab7e1c7dcc9410
 DIST gnome-panel-2.20.3.tar.bz2 2829469 RMD160 c3c2eb81b6baf7e5203bed288c077017526d554c SHA1 7d2abba6a4aedd05418192b50573fb0a1efc6f1f SHA256 fa76158e659ab5d36f016ba9a5117c4d03680e7c94aa174fdcc03200fe2444c9
 DIST gnome-panel-2.22.0.tar.bz2 3267787 RMD160 e51efb1c1890e0b30257b8c7570c7d26e328b8e1 SHA1 4c96d8d7b88c438fd5850fd5aed19853ec6e9baf SHA256 8b2152b35e3d82a640c383b29e99a322595dca23269450ad8d3182bdd94b308a
 DIST gnome-panel-2.22.1.1.tar.bz2 3242400 RMD160 51504e979bb17344ef8bdb4e1a061a8d453a211f SHA1 af4fbf0e14b9e048f20854b8201203a13e6ece3a SHA256 9b6c7760bb81a5c1638b00fe68d377516e5b66264acfe838a2a9e416f8011bbf
 DIST gnome-panel-2.22.1.2.tar.bz2 3248915 RMD160 9fd7ed7282fa04569ff8f908d3c5f2faea73c89a SHA1 4f51f732d8162aa8f462e38458e3c8569f834222 SHA256 5f010fcdb8f88b669893b10b1b2f5c5362773153c41a835a811250590b2d710c
+DIST gnome-panel-2.22.1.3.tar.bz2 3251621 RMD160 a0c5149c48152d5a78a905112ddaaac511b7c75e SHA1 28a81f4e59a32295d2dfdc52f4becb7ce539ee3c SHA256 e072531f6a8d1523b06a41c838d22ea33b06e2e7f8a7770d92f5d1d3ce2bd7f6
 EBUILD gnome-panel-2.18.3.ebuild 1935 RMD160 feb16b6f7c842ed10315fea6abcc7bff53cc4f16 SHA1 531bc89496ecb17dcbfff33c58fec5de808fc1ec SHA256 5975f19aef2d06c866d5a7f23aed6a9cdf7744b92218b98afc041111d071ec5e
 EBUILD gnome-panel-2.20.3.ebuild 2098 RMD160 e5624d4d14172fcdcf4ad799f05f02f4d9be1c29 SHA1 855f3fb9efaf05dd37200c100c2b31e7c9004ef2 SHA256 07144b9c72fb207a7e29d9761f6de9337726089111afaea1b534e12ddbc7c400
 EBUILD gnome-panel-2.22.0.ebuild 2225 RMD160 e4997c33cb51ec91d3fae5d77d05ba5356752239 SHA1 4f07388f340942e3a0695c95245a40b3d587ce84 SHA256 1402e53e88173eddc466df2d1c6ce0c6c674eb4e34fcab84145af3186719c1f9
 EBUILD gnome-panel-2.22.1.1.ebuild 2227 RMD160 9d88bba4de55d8dea23c84cddeebf39e96379367 SHA1 4d5574a670f20c759219b1b1fa5780f8ece871d7 SHA256 7ca01b6d2275ea29d58505a6f0bb69f75e282c12a4b5d5f5ed536369944b1340
-EBUILD gnome-panel-2.22.1.2.ebuild 2228 RMD160 c854fa3bd39591949b1f915fecdc633dc169a4bb SHA1 a6162c7fda8b879406d099ab04528543f18c0c7a SHA256 c9a782bce593d5a72294a2e063f0b1cbd8e2049490711972f586edb1fb477ec1
-MISC ChangeLog 32975 RMD160 ff59d94d1d9748037dfeddf360bbf2b9ef4495c8 SHA1 744bd58db5023e7540424f26fb42354d1bf78173 SHA256 c18b834e7e3d51cac88268990d8ab119c1aeb57098d2f1c0aeea558eaef96e73
+EBUILD gnome-panel-2.22.1.2.ebuild 2233 RMD160 e7441718e8761c65c0b2ac6209e1e2158033dca6 SHA1 61c5ce3629deec48bf381d2db79418c433dd4b14 SHA256 42bf1f8e9e8c73813b2aa4a97182a8c1f9d06f7fbc66338fef23adc7815e125f
+EBUILD gnome-panel-2.22.1.3.ebuild 2233 RMD160 390016f44c372ad4edff18cb3ba30430ad5bce5e SHA1 9d45ebf0264d9e3d07029f435fcfbb919d9ecd19 SHA256 a57968a913eb58568295a1bbed16dd2514f202917810e33d9f91c8c1bc1c0420
+MISC ChangeLog 33179 RMD160 ccb5325dc7eaa329383c2667c22b0a47cab19a07 SHA1 71f2599d312fe51bc59e6aebdbf1a6d6a737472a SHA256 e276f7fd7ec7cf19bb6e3cf4e76a5592231297c83d27a37cf970282f486efa29
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgKWl8ACgkQ1fmVwcYIWAbBLACfVkqhHBWoEopVd+Ny0q7wNPR6
+H94AoInw6CoUONpcvF6bqFQYyRTOd+hP
+=C0+X
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-panel/gnome-panel-2.22.1.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.22.1.2.ebuild
index 7d1948bbc8e5..e19c35ad2501 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.22.1.2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.22.1.2.ebuild
@@ -1,6 +1,6 @@
 # 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.22.1.2.ebuild,v 1.1 2008/04/14 22:00:02 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.22.1.2.ebuild,v 1.2 2008/04/19 20:47:13 eva Exp $
 
 inherit autotools eutils gnome2
 
@@ -33,7 +33,7 @@ RDEPEND=">=gnome-base/gnome-desktop-2.12
 	x11-libs/libXau
 	>=x11-libs/cairo-1.0.0
 	eds? ( >=gnome-extra/evolution-data-server-1.6 )
-	networkmanager? ( net-misc/networkmanager )"
+	networkmanager? ( >=net-misc/networkmanager-0.6 )"
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.3.2
diff --git a/gnome-base/gnome-panel/gnome-panel-2.22.1.3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.22.1.3.ebuild
new file mode 100644
index 000000000000..bf8a417fe9ed
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-2.22.1.3.ebuild
@@ -0,0 +1,80 @@
+# 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.22.1.3.ebuild,v 1.1 2008/04/19 20:47:13 eva Exp $
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="The GNOME panel"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc eds networkmanager"
+
+RDEPEND=">=gnome-base/gnome-desktop-2.12
+	>=x11-libs/pango-1.15.4
+	>=dev-libs/glib-2.15.6
+	>=x11-libs/gtk+-2.11.3
+	>=dev-libs/libgweather-2.22.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.35
+	~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-polkit
+		--with-in-process-applets=clock,notification-area,wncklet
+		$(use_enable networkmanager network-manager)
+		$(use_enable eds)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# FIXME : uh yeah, this is nice
+	# We should patch in a switch here and send it upstream
+	sed -i 's:--load:-v:' "${S}/gnome-panel/Makefile.in" || die "sed failed"
+}
+
+pkg_postinst() {
+	local entries="/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)
+
+		"${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
+}