From 88c67422463256549317decd1f9817fbb048037c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 1 Mar 2011 14:13:14 +0100
Subject: [PATCH] gnome-panel: update to 2.91.90.

--HG--
branch : gnome3
---
 srcpkgs/gnome-panel/depends                   |   2 +-
 .../gnome-panel/gnome-panel-devel.template    |  60 +++-----
 srcpkgs/gnome-panel/template                  | 131 +++++++-----------
 xbps-src/common/mapping_shlib_binpkg.txt      |   5 +-
 4 files changed, 75 insertions(+), 123 deletions(-)

diff --git a/srcpkgs/gnome-panel/depends b/srcpkgs/gnome-panel/depends
index 071d27b792..6e8d7e9a54 100644
--- a/srcpkgs/gnome-panel/depends
+++ b/srcpkgs/gnome-panel/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=2.91.90"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/gnome-panel/gnome-panel-devel.template b/srcpkgs/gnome-panel/gnome-panel-devel.template
index a5d2798844..11d3a0cb5c 100644
--- a/srcpkgs/gnome-panel/gnome-panel-devel.template
+++ b/srcpkgs/gnome-panel/gnome-panel-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-panel-devel'.
 #
-short_desc="${sourcepkg} (development files)"
+short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
@@ -8,51 +8,37 @@ long_desc="${long_desc}
 Add_dependency run pkg-config
 Add_dependency run intltool
 Add_dependency run gnome-doc-utils
-Add_dependency run libbonoboui-devel
-Add_dependency run libgnomecanvas-devel
-Add_dependency run libgnome-devel
-Add_dependency run popt-devel
-Add_dependency run libart-devel
-Add_dependency run gtk+-devel
-Add_dependency run atk-devel
-Add_dependency run glib-devel
-Add_dependency run pango-devel
-Add_dependency run cairo-devel
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
-Add_dependency run libbonobo-devel
-Add_dependency run ORBit2-devel
-Add_dependency run GConf-devel
-Add_dependency run libX11-devel
-Add_dependency run libXau-devel
-Add_dependency run libwnck-devel
-Add_dependency run evolution-data-server-devel
-Add_dependency run libical-devel
-Add_dependency run libxml2-devel
-Add_dependency run libsoup-devel
-Add_dependency run librsvg-devel
-Add_dependency run dbus-glib-devel
-Add_dependency run gnome-desktop-devel
-Add_dependency run startup-notification-devel
-Add_dependency run polkit-devel
-Add_dependency run dbus-devel
-Add_dependency run libgweather-devel
 Add_dependency run libSM-devel
 Add_dependency run libICE-devel
+Add_dependency run gnome-desktop-devel
+Add_dependency run GConf-devel
 Add_dependency run gnome-menus-devel
-Add_dependency run libcanberra-devel
+Add_dependency run gtk+3-devel
+Add_dependency run atk-devel
+Add_dependency run glib-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run cairo-devel
+Add_dependency run pango-devel
+Add_dependency run dbus-glib-devel
 Add_dependency run libXrandr-devel
-Add_dependency run gnome-panel
+Add_dependency run libX11-devel
+Add_dependency run evolution-data-server-devel
+Add_dependency run libical-devel
+Add_dependency run librsvg-devel
+Add_dependency run dbus-devel
+Add_dependency run libgweather-devel
+Add_dependency run libwnck-devel
+Add_dependency run libpng-devel
+Add_dependency run freetype-devel
+Add_dependency run fontconfig-devel
+Add_dependency run libXau-devel
 
 do_install()
 {
-	install -d ${DESTDIR}/usr/lib/gnome-panel/modules
-	install -d ${DESTDIR}/usr/share
+	install -d ${DESTDIR}/usr/{lib,share}
 
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/lib*.a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/{gir*,idl,gtk-doc} ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/lib/gnome-panel/modules/*.a \
-		${DESTDIR}/usr/lib/gnome-panel/modules
+	mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
 }
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index bb0596cd63..4878c2b75a 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,118 +1,85 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
-version=2.32.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=2.91.90
+distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas
 --localstatedir=/var --enable-eds=auto"
 short_desc="GNOME Panel"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=8f7828eb7a21c817a73b697844a4e20256059b32386414a10f97d51e7d9fca5f
+checksum=3aad694e08a5ffe37245e20b9f901ac9f42321852ab2e96f8514240838124bdb
 long_desc="
- This packages common libraries for the GNOME desktop."
+ This packages the GNOME panel."
 
 gconf_schemas="
+panel-default-setup.entries
+panel-compatibility.schemas
+panel-global.schemas
+panel-general.schemas
+panel-toplevel.schemas
+panel-object.schemas
 clock.schemas
 fish.schemas
-panel-compatibility.schemas
-panel-general.schemas
-panel-global.schemas
-panel-object.schemas
-panel-toplevel.schemas
-window-list.schemas
-workspace-switcher.schemas"
+workspace-switcher.schemas
+window-list.schemas"
 
-gconf_entries="panel-default-setup.entries"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="gir-$pkgname $pkgname-devel"
 
 Add_dependency run glibc
-Add_dependency run libbonoboui
-Add_dependency run libgnomecanvas
-Add_dependency run libgnome
-Add_dependency run popt
-Add_dependency run libart
-Add_dependency run gtk+
-Add_dependency run atk
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
 Add_dependency run glib
+Add_dependency run atk
 Add_dependency run pango
 Add_dependency run cairo
+Add_dependency run libpng
+Add_dependency run gdk-pixbuf
 Add_dependency run freetype
 Add_dependency run fontconfig
-Add_dependency run libbonobo
-Add_dependency run ORBit2
-Add_dependency run GConf
-Add_dependency run libX11
-Add_dependency run libXau
-Add_dependency run libwnck
-Add_dependency run evolution-data-server
-Add_dependency run libical
-Add_dependency run libxml2
-Add_dependency run libsoup
-Add_dependency run librsvg
-Add_dependency run dbus-glib
-Add_dependency run gnome-desktop
-Add_dependency run startup-notification
-Add_dependency run polkit
-Add_dependency run dbus-libs
-Add_dependency run libgweather
 Add_dependency run libSM
 Add_dependency run libICE
-Add_dependency run gnome-menus
-Add_dependency run libcanberra
+Add_dependency run libX11
+Add_dependency run libXau
 Add_dependency run libXrandr
-Add_dependency run gdk-pixbuf
-Add_dependency run libpng
-Add_dependency run nspr
-Add_dependency run nss
-Add_dependency run sqlite
-Add_dependency run NetworkManager
+Add_dependency run librsvg
+Add_dependency run gtk+3
+Add_dependency run libical
+Add_dependency run GConf
+Add_dependency run libgweather
+Add_dependency run libwnck
+Add_dependency run evolution-data-server
+Add_dependency run gnome-menus
+Add_dependency run gnome-desktop
 
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gnome-doc-utils
-Add_dependency build libbonoboui-devel
-Add_dependency build libgnomecanvas-devel
-Add_dependency build libgnome-devel
-Add_dependency build popt-devel
-Add_dependency build libart-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build libpng-devel
-Add_dependency build nspr-devel
-Add_dependency build nss-devel
-Add_dependency build sqlite-devel
-Add_dependency build gtk+-devel				">=2.22.0_1"
-Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libbonobo-devel
-Add_dependency build ORBit2-devel
-Add_dependency build GConf-devel			">=2.32.0_1"
-Add_dependency build libX11-devel
-Add_dependency build libXau-devel
-Add_dependency build libwnck-devel
-Add_dependency build evolution-data-server-devel
-Add_dependency build libical-devel
-Add_dependency build libxml2-devel
-Add_dependency build libsoup-devel
-Add_dependency build librsvg-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build gnome-desktop-devel
-Add_dependency build startup-notification-devel
-Add_dependency build polkit-devel
-Add_dependency build dbus-devel
-Add_dependency build libgweather-devel
 Add_dependency build libSM-devel
 Add_dependency build libICE-devel
+Add_dependency build gnome-desktop-devel
+Add_dependency build GConf-devel
 Add_dependency build gnome-menus-devel
-Add_dependency build libcanberra-devel
+Add_dependency build gtk+3-devel
+Add_dependency build atk-devel
+Add_dependency build glib-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build cairo-devel
+Add_dependency build pango-devel
+Add_dependency build dbus-glib-devel
 Add_dependency build libXrandr-devel
-Add_dependency build NetworkManager-devel
-Add_dependency build which
-Add_dependency build diffutils
+Add_dependency build libX11-devel
+Add_dependency build evolution-data-server-devel
+Add_dependency build libical-devel
+Add_dependency build librsvg-devel
+Add_dependency build dbus-devel
+Add_dependency build libgweather-devel
+Add_dependency build libwnck-devel
+Add_dependency build libpng-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build libXau-devel
 
 Add_dependency full hicolor-icon-theme
+Add_dependency full desktop-file-utils
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 01803ccf24..930a55eca9 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -575,7 +575,7 @@ libecal-1.2.so			evolution-data-server	evolution-data-server-devel
 libedata-book-1.2.so		evolution-data-server	evolution-data-server-devel
 libedata-cal-1.2.so.11		evolution-data-server	evolution-data-server-devel
 libedataserver-1.2.so.14	evolution-data-server	evolution-data-server-devel
-libedataserverui-1.2.so.11	evolution-data-server	evolution-data-server-devel
+libedataserverui-3.0.so		evolution-data-server	evolution-data-server-devel
 libegroupwise-1.2.so.13		evolution-data-server	evolution-data-server-devel
 libgdata.so.11			evolution-data-server	evolution-data-server-devel
 libgdata-google-1.2.so		evolution-data-server	evolution-data-server-devel
@@ -588,8 +588,7 @@ libipq.so			iptables		iptables-devel
 libnm-util.so			NetworkManager		NetworkManager-devel
 libnm-glib.so			NetworkManager		NetworkManager-devel
 libnm-glib-vpn.so		NetworkManager		NetworkManager-devel
-libpanel-applet-2.so		gnome-panel		gnome-panel-devel
-libpanel-applet-3.so		gnome-panel		gnome-panel-devel
+libpanel-applet-4.so		gnome-panel		gnome-panel-devel
 libgnome-control-center.so	gnome-control-center	gnome-control-center-devel
 libboost_date_time.so.1.44	boost			boost-devel
 libboost_math_tr1f.so.1.44	boost			boost-devel