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

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 44 insertions, 96 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/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
 }