Version bump. Raise dependency of gnome-desktop to 2.26, bug #272225. Small fixes, notably critical warning (bug #272012), translation updates.

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

3 files changed, 24 insertions, 12 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 533dde6037d4..452f32c16bde 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,13 @@
 # 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.282 2009/06/03 23:09:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.283 2009/07/09 21:14:07 eva Exp $
+
+*gnome-panel-2.26.3 (09 Jul 2009)
+
+  09 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-panel-2.26.1.ebuild, +gnome-panel-2.26.3.ebuild:
+  Version bump. Raise dependency of gnome-desktop to 2.26, bug #272225.
+  Small fixes, notably critical warning (bug #272012), translation updates.
 
   03 Jun 2009; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-panel-2.26.2.ebuild:
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 3fd17ec4185c..9257a220c1f6 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -7,18 +7,18 @@ DIST gnome-panel-2.20.3.tar.bz2 2829469 RMD160 c3c2eb81b6baf7e5203bed288c0770175
 DIST gnome-panel-2.24.2-logout+po.tar.bz2 75365 RMD160 dadb220e3505fdd37bbddd332a760f6d3fa9498a SHA1 1eb32102d62ee6e5ef4420a41e0647a0d3768a72 SHA256 2e67af4d204ff65092d6b37abbfe41d7baea0fc27b1ed46aa7eb3494c2d53ee6
 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
+DIST gnome-panel-2.26.3.tar.bz2 2988811 RMD160 07b961a2224c6de0253495c6aeefdb2fb4804c8e SHA1 8fdb1e47bef9f3de9c01f830a84ecf30fda3d48f SHA256 b50fa78df3e94327e6478fbf8d0addfc0dde1f2022ffc39066bb46040ad3778e
 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
 EBUILD gnome-panel-2.26.2.ebuild 3341 RMD160 4e0992f55ba20e07c840aef190e8f2d03addde07 SHA1 9eb9386981bed7802fb60ecdf3fe7a766e3b64cb SHA256 ba308797dab7e014bf1c898bcd988eaf0cff21be3000811994c9bb8aa786cb96
-MISC ChangeLog 38607 RMD160 6446e64f59a59d656ae49039225b4dd1b1285039 SHA1 c489ee850a6934a1de62ef79f6304a2f41d5a563 SHA256 942dd69dba377e41adf81e9956031570d075215b2f3e20054b3328e62a04da11
+EBUILD gnome-panel-2.26.3.ebuild 3360 RMD160 b240aedfa0c4353d80dd9942223acd3da3cd14b5 SHA1 f3d066a607f335c3b4cfd99a863b4a0667365c92 SHA256 025e4b428ed6219ccfffdfb346fcf86e63aa761953a87f32fe38c500da9a343b
+MISC ChangeLog 38903 RMD160 203c20188e41e54a3830d357beefe4b403c4ab38 SHA1 bb68524e72a8a62395245f91d4f502ea96e617f8 SHA256 8c5a2a7321a9c6b36d1b9e82f67946e566c8752c1aade47327cbd4ff1658bfb9
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkonApwACgkQ1fmVwcYIWAY4qQCeI3oPmehCEAqJquhKQC5D+wMU
-4bsAoJ6QYvgfUcL1mh7TzjWnK51lDVhI
-=KZJs
+iEYEARECAAYFAkpWXaUACgkQ1fmVwcYIWAb5wgCg2eBvJawC5SJFM6stSJKs6gNQ
+m1gAn1hGlKn0QYRfVshjgRYsXROLfQ9B
+=MCN9
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-panel/gnome-panel-2.26.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.26.3.ebuild
index 1c45d613817c..9e2802189804 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.26.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.26.3.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.3 2009/05/13 14:22:12 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.26.3.ebuild,v 1.1 2009/07/09 21:14:07 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -8,18 +8,19 @@ GCONF_DEBUG="no"
 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/${P}-po.patch.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
+RDEPEND=">=gnome-base/gnome-desktop-2.26.0
 	>=x11-libs/pango-1.15.4
 	>=dev-libs/glib-2.18.0
 	>=x11-libs/gtk+-2.15.1
@@ -58,6 +59,7 @@ DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
+		--disable-static
 		--disable-scrollkeeper
 		--disable-schemas-install
 		--with-in-process-applets=clock,notification-area,wncklet
@@ -71,7 +73,7 @@ src_prepare() {
 
 	# Allow logout/shutdown without gnome-session 2.24, bug #246170
 	epatch "${WORKDIR}/${MY_P}-logout.patch"
-	epatch "${WORKDIR}/${P}-po.patch"
+	epatch "${WORKDIR}/${MY_P_PO}-po.patch"
 	echo "gnome-panel/panel-logout.c" >> po/POTFILES.in
 
 	# Fixes build on BSD, bug #256859
@@ -91,7 +93,10 @@ src_prepare() {
 			-i gtk-doc.make || die "sed 2 failed"
 	fi
 
-	eautomake
+	# Make it libtool-1 compatible, bug #271652
+	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
+
+	AT_M4DIR="m4" eautoreconf
 }
 
 pkg_postinst() {