New version for GNOME 2.26. Drop libgnome/libgnomeui dependencies. Real transparency in notification area. Clean up old revisions.

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

5 files changed, 59 insertions, 101 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 940ed9a1ac72..d37511bde0bc 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-panel
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.277 2009/04/27 13:58:15 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.278 2009/05/11 21:29:11 eva Exp $
+
+*gnome-panel-2.26.1 (11 May 2009)
+
+  11 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-panel-2.20.3.ebuild, -gnome-panel-2.22.2.ebuild,
+  -gnome-panel-2.24.3.ebuild, +gnome-panel-2.26.1.ebuild:
+  New version for GNOME 2.26. Drop libgnome/libgnomeui dependencies. Real
+  transparency in notification area. Clean up old revisions.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> gnome-panel-2.24.3-r1:
   Stable for HPPA (bug #260063).
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 1acaf05d43ce..fcc3f07136e7 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,12 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-panel-2.24.3-daylight.patch 1009 RMD160 6b84a6e00dbc350fd0bf4e1850940e7c925fb86b SHA1 87ccfb70d97038d2916d1074efb954f316be53ee SHA256 ea8c1598b5c6fddc751ee18a7aab34781aa82e936fc76b9304409304e5601a1f
 AUX gnome-panel-2.24.3-shutdown.patch 2548 RMD160 9fa99e6a7c310114af4f5d41160a3703fb3dac03 SHA1 fa2eb42aa677d8c4459903b50a1aa42def28ffb8 SHA256 ae5d2a04ae292966b6661e9cc73623cfd8204a8b3012b40c4274e449933e495e
 DIST gnome-panel-2.20.3.tar.bz2 2829469 RMD160 c3c2eb81b6baf7e5203bed288c077017526d554c SHA1 7d2abba6a4aedd05418192b50573fb0a1efc6f1f SHA256 fa76158e659ab5d36f016ba9a5117c4d03680e7c94aa174fdcc03200fe2444c9
-DIST gnome-panel-2.22.2.tar.bz2 3255261 RMD160 64a37f44b9f34f74d30f30aca349749a24c80859 SHA1 73752c3ce6224886c2381b0b13111253008bc6f7 SHA256 e1ecc0ddc5a09481deb2daa1f30fa14472bfed541db46bb4f49f3d0d728b0a45
 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
-EBUILD gnome-panel-2.20.3.ebuild 2035 RMD160 f4ca48ef67781a65a0f69d22bb5e6bbcb00d7a57 SHA1 06f46b76531f59b593b95cd2e58f1b65b336a0f4 SHA256 0500c02d1b24673b527167378f905bd7d9075c976a26ddacc358b71b94b8bbc6
-EBUILD gnome-panel-2.22.2.ebuild 2226 RMD160 53312444f344c505a3909211e359b7e7be0c9979 SHA1 519a275855f1d2c662291c5bd4a8f79a99346af1 SHA256 5ce3163f1f968bed9ebb00e6e2075c78957f555275e144422edeb96bb0c98377
+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
+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.24.3.ebuild 2557 RMD160 2a0e1586691161f96f1aa895408aa0a475e3c3d2 SHA1 ae3f4e4931b7dd4f04abcc7931df4f2ae4587bd3 SHA256 0c39aa2f6fe1d9f4cd56c43ffc2099bd64bcf99fdef0339545158ea1cc8595c8
-MISC ChangeLog 37452 RMD160 af2f5e8c497aadcf5a216b49480a3b1707d62c9e SHA1 037c1dbad9a3ca28131708283cde78efc60bc985 SHA256 d864b5307109461e3c3e225e22e9832f6839031e7efb55be9ad7c3d1b0233509
+EBUILD gnome-panel-2.26.1.ebuild 3165 RMD160 3b66d59af07906c24fbc33983417e135c4973019 SHA1 999f246f2c5ae5d0ce9344f9959bdc3e5cb34d71 SHA256 b0f66ef9465d9aaf22c247b26095c26315fba7567ac83ec237ebbe326d84a1b7
+MISC ChangeLog 37792 RMD160 ac5aea1b3903bd5a82a8f000935e28e4270dcab6 SHA1 2e7d823232b039e0d0b1fe0cc4b3af86e125c862 SHA256 d811a09f754121f1f0f656a5fbf2ddacb7bf73acafa4062834e397128d07c1de
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoImK0ACgkQ1fmVwcYIWAakbwCg7aVwLcn/9quEPrBcGw28rQl6
+t/4AoNv1nxylnDhmRV5ZqRqvJ2iaWUkt
+=bqYG
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-panel/gnome-panel-2.20.3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.20.3.ebuild
index e0c6738aeb46..76f293aa22c8 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.20.3.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.20.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.20.3.ebuild,v 1.10 2009/02/01 11:08:16 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.20.3.ebuild,v 1.11 2009/05/11 21:29:11 eva Exp $
 
 inherit eutils gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
-KEYWORDS="arm sh"
+KEYWORDS="sh"
 IUSE="doc eds"
 
 RDEPEND=">=gnome-base/gnome-desktop-2.12
diff --git a/gnome-base/gnome-panel/gnome-panel-2.22.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.22.2.ebuild
deleted file mode 100644
index feb43d9fa7e9..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.22.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.2.ebuild,v 1.9 2008/11/13 19:28:23 ranger 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
-}
diff --git a/gnome-base/gnome-panel/gnome-panel-2.24.3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.26.1.ebuild
index a2093f082419..3c8d47a40816 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.24.3.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.26.1.ebuild
@@ -1,26 +1,27 @@
 # 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.24.3.ebuild,v 1.3 2009/02/05 19:25:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.26.1.ebuild,v 1.1 2009/05/11 21:29:11 eva Exp $
 
 GCONF_DEBUG="no"
 
-inherit autotools gnome2
+inherit autotools eutils gnome2
 
 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/${MY_P}-logout+po.tar.bz2
+	mirror://gentoo/${P}-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"
+IUSE="doc eds networkmanager policykit"
 
-RDEPEND=">=gnome-base/gnome-desktop-2.12
+RDEPEND=">=gnome-base/gnome-desktop-2.24.0
 	>=x11-libs/pango-1.15.4
-	>=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.13.1
+	>=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
@@ -38,9 +39,13 @@ 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-0.6 )"
+	networkmanager? ( >=net-misc/networkmanager-0.6 )
+	policykit? (
+		>=sys-auth/policykit-0.7
+		>=gnome-extra/policykit-gnome-0.7 )"
 DEPEND="${RDEPEND}
-	app-text/scrollkeeper
+	>=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
@@ -55,7 +60,7 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-schemas-install
 		--with-in-process-applets=clock,notification-area,wncklet
-		--disable-polkit
+		$(use_enable policykit polkit)
 		$(use_enable networkmanager network-manager)
 		$(use_enable eds)"
 }
@@ -65,11 +70,26 @@ src_unpack() {
 
 	# Allow logout/shutdown without gnome-session 2.24, bug #246170
 	epatch "${WORKDIR}/${MY_P}-logout.patch"
-	epatch "${WORKDIR}/${MY_P}-po.patch"
+	epatch "${WORKDIR}/${P}-po.patch"
+	echo "gnome-panel/panel-logout.c" >> po/POTFILES.in
+
 	# Fixes build on BSD, bug #256859
-	epatch "${FILESDIR}/${P}-daylight.patch"
+	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
+
 	eautomake
 }