Bump to 2.24.2-r1, fix locale patch, bug #252159.

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

3 files changed, 101 insertions, 5 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 30f612a91112..50b3e9cc6953 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.263 2008/12/21 22:43:22 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.264 2008/12/23 14:23:13 eva Exp $
+
+*gnome-panel-2.24.2-r1 (23 Dec 2008)
+
+  23 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-panel-2.24.2-r1.ebuild:
+  Bump to 2.24.2-r1, fix locale patch, bug #252159.
 
 *gnome-panel-2.24.2 (21 Dec 2008)
 
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index bf3e62db3260..d753f815691f 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -6,18 +6,20 @@ DIST gnome-panel-2.20.3.tar.bz2 2829469 RMD160 c3c2eb81b6baf7e5203bed288c0770175
 DIST gnome-panel-2.22.2.tar.bz2 3255261 RMD160 64a37f44b9f34f74d30f30aca349749a24c80859 SHA1 73752c3ce6224886c2381b0b13111253008bc6f7 SHA256 e1ecc0ddc5a09481deb2daa1f30fa14472bfed541db46bb4f49f3d0d728b0a45
 DIST gnome-panel-2.24.1-logout+po.tar.bz2 18545 RMD160 22b84e1136842cf263eb01b5b525003e2f9195de SHA1 6e2d8e7268d224c47b48baec227795ff34a1bb7a SHA256 72772d6aa60f9f4ead5d9e7c30e4b2372b662da08cef7d2d0be0cdca957d2bf7
 DIST gnome-panel-2.24.1.tar.bz2 3354268 RMD160 84e7ccd0425c567c9b800cdfecb653f206cdf768 SHA1 01a2376582ba81b006511279767cb74ecb3332af SHA256 35a845990a8f56da191615a82e22f1be47657476647f4fb5c5148668cc999907
+DIST gnome-panel-2.24.2-logout+po.tar.bz2 75365 RMD160 dadb220e3505fdd37bbddd332a760f6d3fa9498a SHA1 1eb32102d62ee6e5ef4420a41e0647a0d3768a72 SHA256 2e67af4d204ff65092d6b37abbfe41d7baea0fc27b1ed46aa7eb3494c2d53ee6
 DIST gnome-panel-2.24.2.tar.bz2 3353083 RMD160 1a7e447a57c9454a7ed77fde0315545f149b08e1 SHA1 29a7c1fdea1905cde0efeb3c98d36a86b84cb97b SHA256 0bce9329da4850344ca49a2c0f38f7987afcb98d29e52803a3de0a4664593c57
 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 2374 RMD160 f238d8d81194ce634e87ebfddec05759d26312ee SHA1 cc98789c739501385c756eacdabb0e67c2ef2fd6 SHA256 6311c0f646259373ad360009f64712c86e9e62e66cc68db5dc36dfc0b2d5c470
 EBUILD gnome-panel-2.24.1.ebuild 2052 RMD160 f43b0142c9b079b0e9b29b33d60d5bf7aa30f462 SHA1 a37e83c224a0647004a96f16147ee2ee64ac700b SHA256 5c73d039ed0f8d9a5194b647c555b98cc95feb19c90af4347be61b11b37b4efa
+EBUILD gnome-panel-2.24.2-r1.ebuild 2358 RMD160 7ec70679fb3ea469b64cc12a6a1e5c14703e0b1e SHA1 d422371484b182db2725ee9b4600477bbb427de6 SHA256 750dd9add314e99d4a590a5f63222ab01c35f041d861498b4789f52895837118
 EBUILD gnome-panel-2.24.2.ebuild 2379 RMD160 be9f6d81f885ccc627aa4d5364ffb9526c92750f SHA1 660c7ef126cbfe3d1064df8baf9d9f9ee5d70558 SHA256 ccbd55209972972865e0e62cad5301a04adf0ffc8fd539236bbe190219b7eedb
-MISC ChangeLog 35249 RMD160 02b19a1171d362b2fafe0526367fd5a40e265361 SHA1 00206a08fd5ae459c61ba15187fa0b3476cc0525 SHA256 3e6d4626e12cc3e6806607fb39c50e036b391d0851086571fe408921cd0c0305
+MISC ChangeLog 35427 RMD160 3345cda6af2fd860a356be562b639a3738fe9b70 SHA1 589a00ccaba1d8634b0010900782474ebe87ee6d SHA256 f73edcab89338e7e92b547ffaa7d29a28512ce2b788624afcfec47c01a2b281f
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklO1KAACgkQ1fmVwcYIWAaeHACePOtA8Y+GRe/64Nnz0eVm4Ges
-g28AoJlToGa4+s7WWRfZQtJG1g8HjI1X
-=oIJx
+iEYEARECAAYFAklQ9HYACgkQ1fmVwcYIWAb97ACfXw5wQM6CFz1jIp3YkOI0UreI
+NL0An3P2E972v4Qi1+P+pS0BFg2LJ9DR
+=6gJo
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-panel/gnome-panel-2.24.2-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.24.2-r1.ebuild
new file mode 100644
index 000000000000..9316f9072072
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-2.24.2-r1.ebuild
@@ -0,0 +1,88 @@
+# 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.2-r1.ebuild,v 1.1 2008/12/23 14:23:13 eva Exp $
+
+GCONF_DEBUG="no"
+
+inherit autotools gnome2
+
+DESCRIPTION="The GNOME panel"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${P}-logout+po.tar.bz2"
+
+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
+	>=dev-util/gtk-doc-am-1
+	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 "${WORKDIR}/${P}-logout.patch"
+	epatch "${WORKDIR}/${P}-po.patch"
+
+	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
+}