Bump to 2.26.2. Small bug fixes and translation updates.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 132 insertions, 5 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 557141a150ca..a9b81f69234d 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.280 2009/05/13 14:22:12 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.281 2009/05/28 22:20:56 eva Exp $
+
+  28 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-panel-2.26.2.ebuild:
+  Bump to 2.26.2. Small bug fixes and translation updates.
+
+*gnome-panel-2.26.2 (28 May 2009)
+
+  28 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-panel-2.26.2.ebuild:
+  Bump to 2.26.2. Small bug fixes and translation updates.
 
   13 May 2009; Daniel Gryniewicz <dang@gentoo.org>
   gnome-panel-2.26.1.ebuild:
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index cf66b1efab7b..19b851b774b5 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -8,15 +8,17 @@ DIST gnome-panel-2.24.2-logout+po.tar.bz2 75365 RMD160 dadb220e3505fdd37bbddd332
 DIST gnome-panel-2.24.3.tar.bz2 3354686 RMD160 ac38a86fd844d4e7d27c9785dc27a0327d83809f SHA1 46a115529c2e6ef5429e58e5389ad44660aff428 SHA256 2b52f9cd5b3e028f5e67b75af6c484f21cd208e4403041ea1b4d831d67fc21b0
 DIST gnome-panel-2.26.1-po.patch.bz2 74923 RMD160 8d5ef69ba9789a83eb5d00c2c7f4309c565ec37b SHA1 56b2bf2220ca25c638b4d009aa3ab57bb76f1dde SHA256 720539ee1b0e85fa6f668bce30c45120b6b821e980fedf8049b99c145d0b509c
 DIST gnome-panel-2.26.1.tar.bz2 3424402 RMD160 d540181806588e13b6cf540f47d4e2835670d7c8 SHA1 58ee6b53950183f7f1df805bd530bf894eacd128 SHA256 4e3b653d274c5150c5165eee84ec5cd6c0f0425407316ae01c6c166a13f320b2
+DIST gnome-panel-2.26.2.tar.bz2 2985531 RMD160 e3cc7f64ace7df7a133f2b4128c9b3e615b42634 SHA1 56ba614bad49597bff5127cf8b2a83944b9fabca SHA256 eb4140361c4d695e8c7c89af45e4e97ff4db329ee3b062609bcc8021a580f0e9
 EBUILD gnome-panel-2.20.3.ebuild 2031 RMD160 2ccea0f26daf5a8c141c9c576c7522065fa3c3dd SHA1 1a34a52f32db70872fd64eb19f80f5ea9b9a5c57 SHA256 12ec4bb9bcff4253887b392e3d58eb10e7fca44dceae5001145e37409815efe7
 EBUILD gnome-panel-2.24.3-r1.ebuild 2633 RMD160 7e6bd724c60b71e2ece1873fae700fada0ee4eb7 SHA1 ce121d960261c1dafd5aeba01b94827082b83169 SHA256 afbcdedf754a444a4f6ac0438773ec1d8123bf91041d990e1675058b4991f870
 EBUILD gnome-panel-2.26.1.ebuild 3177 RMD160 4fa8ca0cd1b2033f0894adde7c4aa091bae7b49c SHA1 4afb03edab2b5d5b6ce6ea8b5d8f70b92684e395 SHA256 c9f257aad0c60a1e1c141974321996a3da0b94f431e8f323089c757813d222eb
-MISC ChangeLog 38059 RMD160 9f27a428a9454de2672ca3584a08f937fec355a9 SHA1 1ebf1cc1d65b2ddd57f9b7ac72d8dadeaead205d SHA256 131e3330420b8ad6f592705c139acb1a1f8ab073c05f1160e650cd5ab282e783
+EBUILD gnome-panel-2.26.2.ebuild 3246 RMD160 780212610552de4b7093a95d725089de241f29f5 SHA1 8b7c2a6a8882c4c31e980a936c4f53e1b4f75376 SHA256 9beb85bf26d82cc9a427e8958d8417e730a2f54965f5966096f039d35c031c68
+MISC ChangeLog 38381 RMD160 bcce809d25f41bb438570aa647526a9022ac2501 SHA1 6a898f4083260f34472eb4b7114f030c75adbc91 SHA256 0c4ae0adfb59650089eed646c1f38845c33e97e0fe624b410020cc8ff912bcc0
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFKCtitomPajV0RnrERAolHAJoCRJTNjZyJKf0iwBfWwUOqgpmqMwCdGny6
-QhdN5+3Dyz9c2N7DYjnkXiY=
-=nzJA
+iEYEARECAAYFAkofDk4ACgkQ1fmVwcYIWAbmGwCfUr4ugR7P3yXkt2lrdaPB2/Wo
+hBIAoNXSv5ss0NBkUNVXTjWa1DGum431
+=5+W+
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-panel/gnome-panel-2.26.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.26.2.ebuild
new file mode 100644
index 000000000000..673ad5d50c28
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-2.26.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2009 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.26.2.ebuild,v 1.1 2009/05/28 22:20:56 eva Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+WANT_AUTOMAKE="1.10"
+
+inherit autotools eutils gnome2
+
+MY_P="${PN}-2.24.2"
+MY_P_PO="${PN}-2.26.1"
+DESCRIPTION="The GNOME panel"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${MY_P}-logout+po.tar.bz2
+	mirror://gentoo/${MY_P_PO}-po.patch.bz2"
+
+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 policykit"
+
+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}
+	>=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"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--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() {
+	gnome2_src_prepare
+
+	# Allow logout/shutdown without gnome-session 2.24, bug #246170
+	epatch "${WORKDIR}/${MY_P}-logout.patch"
+	epatch "${WORKDIR}/${MY_P_PO}-po.patch"
+	echo "gnome-panel/panel-logout.c" >> po/POTFILES.in
+
+	# Fixes build on BSD, bug #256859
+	epatch "${FILESDIR}/${PN}-2.24.3-daylight.patch"
+
+	# Fixes shutdown without gdm, bug #259138
+	epatch "${FILESDIR}/${PN}-2.24.3-shutdown.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+
+	# FIXME: tarball generated with broken gtk-doc, revisit me.
+	if use doc; then
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
+			-i gtk-doc.make || die "sed 1 failed"
+	else
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \
+			-i gtk-doc.make || die "sed 2 failed"
+	fi
+
+	AT_M4DIR="m4" 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
+}