Removing gnome-main-menu stuff, not using it anymore, so won't maintain

svn path=/; revision=150

13 files changed, 0 insertions, 675 deletions

diff --git a/gnome-extra/gnome-main-menu/Manifest b/gnome-extra/gnome-main-menu/Manifest
deleted file mode 100644
index eeb21e0..0000000
--- a/gnome-extra/gnome-main-menu/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX 03-configure.in-remove-gtk-doc.patch 275 RMD160 ec622845ded0b8e375e51b5b18f55466fd5d37d6 SHA1 496a777c80a8481551d96cc770870874280fa8e8 SHA256 f46b2136783562b4a4e5433067df27a6efff65764f20f163f2f1e694647cf944
-AUX 03-tracker-search.patch 714 RMD160 daa5b0e6d26930edc0c53394e99286dd761b4021 SHA1 9faf44d33f002d5ebdbb93b212c6f429d933d83c SHA256 7c9477a924f30c0a869b8232b6f6b575a614d02f046c52896ef75468558d571f
-AUX 04-disable-search.patch 595 RMD160 6d50cf4442e34119909e47a11157d985a098681d SHA1 2e51810689bee5b69b13276c3bec3810418b7b4c SHA256 b901cdd617380c3024b7f8c8aaedfd3e84115ede27ff33ec67c427f9a692eced
-AUX gnome-main-menu-gentooifications.patch 641 RMD160 beaa96f51ddd91d02ef3b8b6b44aa50c7eb16551 SHA1 001b7ed095222a655fc3766d188ffc8fac8e4afa SHA256 e39c1af38cf70393bead0e2e69df0bb70fa4259059a01ade0c6fa91716b48df1
-AUX gnome-main-menu-libssui.patch 1558 RMD160 11d9c5e14f3934bbae8819823569b29351ef425d SHA1 3f4fa94baf1f08f91ddd3021b8a51e6457a0788d SHA256 3d5728ad444c398b0354ad73d811c5f5e837af552a5db0a7d623ada35231bcba
-DIST gnome-main-menu-0.9.9.tar.bz2 577138 RMD160 e0a8571dc175321536f5d9a62e5b2f6911527605 SHA1 f97c79da9ead64411f3c975efdc8716208c07d39 SHA256 403062abf3288cb00c5e3105c6b4ebe867301016c0f06111bd4d954c9fce7fe7
-EBUILD gnome-main-menu-0.9.9.ebuild 1983 RMD160 5e985b38de2c69d2e5a0e0e7584fb7fd9358d620 SHA1 e5a5f306337580eeb69cf92c70c05562a7e4e2cc SHA256 aae82e6fb70d5b77a4bc4e7fe91d83765a36de468bb566e4f0699819cbf5c4cd
-EBUILD gnome-main-menu-9999.ebuild 2121 RMD160 38ad508d36aabb1fb2d68c6d135e5636eeddb406 SHA1 c79eef8965fa7a0fa758abdeeb836e8ad6e4516b SHA256 2c8b7ef57c2161b56343deee7a27183f3c9de6d4b6a04f62673a4f32d5a487aa
diff --git a/gnome-extra/gnome-main-menu/files/03-configure.in-remove-gtk-doc.patch b/gnome-extra/gnome-main-menu/files/03-configure.in-remove-gtk-doc.patch
deleted file mode 100644
index 97b97e1..0000000
--- a/gnome-extra/gnome-main-menu/files/03-configure.in-remove-gtk-doc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru slab-orig/configure.in slab/configure.in
---- configure.in 
-+++ configure.in 
-@@ -154,8 +154,6 @@
- dnl End: Nautilus Extension
- dnl ==============================================
- 
--GTK_DOC_CHECK(1.0)
--
- AC_CONFIG_FILES([
- Makefile
- application-browser/etc/Makefile
-
diff --git a/gnome-extra/gnome-main-menu/files/03-tracker-search.patch b/gnome-extra/gnome-main-menu/files/03-tracker-search.patch
deleted file mode 100644
index 172f782..0000000
--- a/gnome-extra/gnome-main-menu/files/03-tracker-search.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: main-menu/etc/slab.schemas.in.in
-===================================================================
---- main-menu/etc/slab.schemas.in.in	(revision 278)
-+++ main-menu/etc/slab.schemas.in.in	(working copy)
-@@ -77,7 +77,7 @@
- 			<applyto>/desktop/gnome/applications/main-menu/search_command</applyto>
- 			<owner>gnome-main-menu</owner>
- 			<type>string</type>
--			<default>beagle-search SEARCH_STRING</default>
-+			<default>tracker-search-tool SEARCH_STRING</default>
- 			<locale name="C">
- 				<short>This is the command to execute when the search entry is used.</short>
- 				<long>This is the command to execute when the search entry is used.  SEARCH_STRING is replaced with the entered search text.</long>
diff --git a/gnome-extra/gnome-main-menu/files/04-disable-search.patch b/gnome-extra/gnome-main-menu/files/04-disable-search.patch
deleted file mode 100644
index d5c3ce7..0000000
--- a/gnome-extra/gnome-main-menu/files/04-disable-search.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: main-menu/etc/slab.schemas.in.in
-===================================================================
---- main-menu/etc/slab.schemas.in.in	(revision 278)
-+++ main-menu/etc/slab.schemas.in.in	(working copy)
-@@ -186,7 +186,7 @@
- 			<applyto>/desktop/gnome/applications/main-menu/lock-down/search_area_visible</applyto>
- 			<owner>gnome-main-menu</owner>
- 			<type>bool</type>
--			<default>true</default>
-+			<default>false</default>
- 			<locale name="C">
- 				<short>lock-down status for the search area</short>
- 				<long>set to true if the search area should be visible and active.</long>
diff --git a/gnome-extra/gnome-main-menu/files/gnome-main-menu-gentooifications.patch b/gnome-extra/gnome-main-menu/files/gnome-main-menu-gentooifications.patch
deleted file mode 100644
index e276fee..0000000
--- a/gnome-extra/gnome-main-menu/files/gnome-main-menu-gentooifications.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- main-menu/etc/applications.xbel 
-+++ main-menu/etc/applications.xbel 
-@@ -3,7 +3,7 @@
-       xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-       xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
- >
--  <bookmark href="MozillaFirefox.desktop" added="2007-01-16T05:51:22Z" modified="2007-01-16T05:51:22Z" visited="2007-01-16T05:51:22Z">
-+  <bookmark href="mozilla-firefox-2.0.desktop" added="2007-01-16T05:51:22Z" modified="2007-01-16T05:51:22Z" visited="2007-01-16T05:51:22Z">
-     <info>
-       <metadata owner="http://freedesktop.org">
-         <mime:mime-type type="application/x-desktop"/>
-
diff --git a/gnome-extra/gnome-main-menu/files/gnome-main-menu-libssui.patch b/gnome-extra/gnome-main-menu/files/gnome-main-menu-libssui.patch
deleted file mode 100644
index 4e98916..0000000
--- a/gnome-extra/gnome-main-menu/files/gnome-main-menu-libssui.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- main-menu/etc/system-items.xbel 
-+++ main-menu/etc/system-items.xbel 
-@@ -56,7 +56,7 @@
-       </metadata>
-     </info>
-   </bookmark>
--  <bookmark href="gnome-session-kill.desktop" added="2007-01-16T05:53:36Z" modified="2007-01-16T05:53:36Z" visited="2007-01-16T05:53:36Z">
-+  <bookmark href="gnome-session-logout.desktop" added="2007-01-16T05:53:36Z" modified="2007-01-16T05:53:36Z" visited="2007-01-16T05:53:36Z">
-     <title>Logout</title>
-     <info>
-       <metadata owner="http://freedesktop.org">
-@@ -65,7 +65,21 @@
-           <bookmark:group>rank-4</bookmark:group>
-         </bookmark:groups>
-         <bookmark:applications>
--          <bookmark:application name="Logout" exec="gnome-session-save --kill" timestamp="1168926816" count="1"/>
-+          <bookmark:application name="Logout" exec="libssui-tool --logout" timestamp="1168926816" count="1"/>
-+        </bookmark:applications>
-+      </metadata>
-+    </info>
-+  </bookmark>
-+  <bookmark href="gnome-session-shutdown.desktop" added="2007-01-16T05:53:36Z" modified="2007-01-16T05:53:36Z" visited="2007-01-16T05:53:36Z">
-+    <title>Shutdown</title>
-+    <info>
-+      <metadata owner="http://freedesktop.org">
-+        <mime:mime-type type="application/x-desktop"/>
-+        <bookmark:groups>
-+          <bookmark:group>rank-5</bookmark:group>
-+        </bookmark:groups>
-+        <bookmark:applications>
-+          <bookmark:application name="Shutdown" exec="libssui-tool --shutdown" timestamp="1168926816" count="1"/>
-         </bookmark:applications>
-       </metadata>
-     </info>
-
diff --git a/gnome-extra/gnome-main-menu/gnome-main-menu-0.9.9.ebuild b/gnome-extra/gnome-main-menu/gnome-main-menu-0.9.9.ebuild
deleted file mode 100644
index 0aa3b33..0000000
--- a/gnome-extra/gnome-main-menu/gnome-main-menu-0.9.9.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2000-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="The new Desktop Menu from SUSE"
-HOMEPAGE="http://www.novell.com/products/desktop/preview.html"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="beagle doc libssui nautilus tracker"
-
-RDEPEND=">=dev-libs/glib-2.8.0
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-desktop-2
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/librsvg-2
-	>=gnome-base/eel-2
-	>=gnome-base/gnome-menus-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgtop-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	dev-libs/dbus-glib
-	=net-misc/networkmanager-0.6*
-	sys-apps/hal
-	x11-libs/cairo
-	x11-libs/pango
-	libssui? ( >=gnome-extra/libssui-0.5.6 )
-	nautilus? ( >=gnome-base/nautilus-2.6
-		>=gnome-base/gnome-vfs-2 )
-	tracker? ( app-misc/tracker )"
-
-DEPEND="${RDEPEND}
-	doc? (
-		dev-util/gtk-doc
-	)"
-
-src_unpack() {
-	gnome2_src_unpack
-	cd ${S}
-
-	gnome2_omf_fix
-
-	epatch "${FILESDIR}"/gnome-main-menu-gentooifications.patch
-	use libssui && epatch "${FILESDIR}"/gnome-main-menu-libssui.patch
-	use doc || epatch "${FILESDIR}"/03-configure.in-remove-gtk-doc.patch
-	if use tracker && ! use beagle ; then
-		epatch ${FILESDIR}/03-tracker-search.patch
-	elif ! use tracker && ! use beagle ; then
-		epatch ${FILESDIR}/04-disable-search.patch
-	fi
-
-	G2CONF="`use_enable nautilus nautilus-extension`"
-	intltoolize --force || die "intloolize failed"
-	eautoreconf || die "eautoreconf failed"
-}
-
-pkg_postinst() {
-
-	elog
-	elog " If you want to have recent applications-support working, you should "
-	elog " also use the patched gnome-panel and gnome-desktop packages from this "
-	elog " overlay "
-	elog
-	if use tracker && use beagle ; then
-		ewarn " You have both beagle and tracker set in your USE flags. "
-		ewarn " Beagle will be used by default. If you would like to use "
-		ewarn " tracker, emerge this package with the beagle USE flag unset. "
-	fi
-}
diff --git a/gnome-extra/gnome-main-menu/gnome-main-menu-9999.ebuild b/gnome-extra/gnome-main-menu/gnome-main-menu-9999.ebuild
deleted file mode 100644
index a9bb1c6..0000000
--- a/gnome-extra/gnome-main-menu/gnome-main-menu-9999.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2000-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools eutils subversion gnome2
-
-DESCRIPTION="The new Desktop Menu from SUSE"
-HOMEPAGE="http://www.novell.com/products/desktop/preview.html"
-
-# Have to set SRC_URI blank or gnome2 eclass tries to fetch package
-SRC_URI=""
-
-ESVN_REPO_URI="http://svn.gnome.org/svn/gnome-main-menu/trunk"
-
-S="${WORKDIR}/${PN}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="beagle doc libssui nautilus tracker"
-
-RDEPEND=">=dev-libs/glib-2.12
-	>=x11-libs/gtk+-2.13.3
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-desktop-2
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/librsvg-2
-	>=gnome-base/gnome-menus-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgtop-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	dev-libs/dbus-glib
-	>=net-misc/networkmanager-0.7
-	sys-apps/hal
-	x11-libs/cairo
-	x11-libs/pango
-	libssui? ( >=gnome-extra/libssui-0.5.6 )
-	nautilus? ( >=gnome-base/nautilus-2.6 )
-	tracker? ( app-misc/tracker )"
-
-DEPEND="${RDEPEND}
-	doc? (
-		dev-util/gtk-doc
-	)"
-
-src_unpack() {
-	subversion_src_unpack
-	cd ${S}
-
-	gnome2_omf_fix
-
-	epatch "${FILESDIR}"/gnome-main-menu-gentooifications.patch
-	use libssui && epatch "${FILESDIR}"/gnome-main-menu-libssui.patch
-	use doc || epatch "${FILESDIR}"/03-configure.in-remove-gtk-doc.patch
-	if use tracker && ! use beagle ; then
-		epatch ${FILESDIR}/03-tracker-search.patch
-	elif ! use tracker && ! use beagle ; then
-		epatch ${FILESDIR}/04-disable-search.patch
-	fi
-
-	G2CONF="`use_enable nautilus nautilus-extension`"
-	intltoolize --force || die "intloolize failed"
-	eautoreconf || die "eautoreconf failed"
-}
-
-pkg_postinst() {
-
-	elog
-	elog " If you want to have recent applications-support working, you should "
-	elog " also use the patched gnome-panel and gnome-desktop packages from this "
-	elog " overlay "
-	elog
-	if use tracker && use beagle ; then
-		ewarn " You have both beagle and tracker set in your USE flags. "
-		ewarn " Beagle will be used by default. If you would like to use "
-		ewarn " tracker, emerge this package with the beagle USE flag unset. "
-	fi
-}
diff --git a/gnome-extra/libssui/Manifest b/gnome-extra/libssui/Manifest
deleted file mode 100644
index 96cd5cc..0000000
--- a/gnome-extra/libssui/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-AUX libssui-missing-options.patch 9072 RMD160 71bd385844734caeae2dc8868968fcdd6470ae95 SHA1 9c20fae585fa950f87e65fa782260cccb167d9fe SHA256 0187698c4cae22290601c6d3fe9ec29540708c5b7d56b0d2d9884e8ce25f6c5b
-MD5 2abfaf85c42bbce4f1fa62d632b43e26 files/libssui-missing-options.patch 9072
-RMD160 71bd385844734caeae2dc8868968fcdd6470ae95 files/libssui-missing-options.patch 9072
-SHA256 0187698c4cae22290601c6d3fe9ec29540708c5b7d56b0d2d9884e8ce25f6c5b files/libssui-missing-options.patch 9072
-AUX libssui-pm-dbus.patch 1531 RMD160 d0c1796e909dd58d5a4e37ac2c1e888594c394a9 SHA1 ce3e510843559344609203e559c6abe865ea5af1 SHA256 a22b43286f3a9b94137d4609ac671d59f8893f8afa7db68c36c00d2058c42b25
-MD5 eaa9f55652f21deca1e1dec77305e856 files/libssui-pm-dbus.patch 1531
-RMD160 d0c1796e909dd58d5a4e37ac2c1e888594c394a9 files/libssui-pm-dbus.patch 1531
-SHA256 a22b43286f3a9b94137d4609ac671d59f8893f8afa7db68c36c00d2058c42b25 files/libssui-pm-dbus.patch 1531
-AUX libssui-wrong-icon.patch 867 RMD160 eea4cd9dea5888d22a87d977ba4b37481e9caf96 SHA1 f0d5d5ec0e9d06b66de63e86d612365c4622a6a0 SHA256 b5ba1046b68879780761b64d70d9a401c3b3940430e6cc38803ebd283cdc87dd
-MD5 0a5e57f7dc2ff300477d9c870244010a files/libssui-wrong-icon.patch 867
-RMD160 eea4cd9dea5888d22a87d977ba4b37481e9caf96 files/libssui-wrong-icon.patch 867
-SHA256 b5ba1046b68879780761b64d70d9a401c3b3940430e6cc38803ebd283cdc87dd files/libssui-wrong-icon.patch 867
-DIST libssui-0.5.7.tar.gz 419490 RMD160 de642c5ab869796b5b515baafd38a39924dc7b0f SHA1 a2498f67c07fb7c10a50a5caaac5363666a6d792 SHA256 60bd3eed9a14c9567e5eadd0ea12ead313426432c591691ef9a61aae372cd78d
-EBUILD libssui-0.5.7.ebuild 739 RMD160 32c7face76365351daaed216841d49066f781512 SHA1 2a24b106770d92559cea37e80ca2bbb7026d02f1 SHA256 d6b7196077cbc09907d3f1f26ed49cf5a0ad0a6fd65b30097637bd5943fb1b6a
-MD5 876e8e46d966b6c20ff89e89db90d0ae libssui-0.5.7.ebuild 739
-RMD160 32c7face76365351daaed216841d49066f781512 libssui-0.5.7.ebuild 739
-SHA256 d6b7196077cbc09907d3f1f26ed49cf5a0ad0a6fd65b30097637bd5943fb1b6a libssui-0.5.7.ebuild 739
-MD5 3ad4501f2d46fed0acc78f6d1940f934 files/digest-libssui-0.5.7 241
-RMD160 16e0bd7c927e823145a14f6ed6b3d8cbe66feb56 files/digest-libssui-0.5.7 241
-SHA256 f914af79cadade95aaa17695750d527bb07cd6e2181ba52ef014f0c2b38f613f files/digest-libssui-0.5.7 241
diff --git a/gnome-extra/libssui/files/libssui-missing-options.patch b/gnome-extra/libssui/files/libssui-missing-options.patch
deleted file mode 100644
index 7f415bf..0000000
--- a/gnome-extra/libssui/files/libssui-missing-options.patch
+++ /dev/null
@@ -1,305 +0,0 @@
---- libssui-0.5.7/src/logout-dialog.c
-+++ libssui-0.5.7/src/logout-dialog.c
-@@ -190,7 +190,6 @@
- //	GdkWindow	*parent;
- 	int monitor = 0;
- 	int selected_option;
--	gboolean	haveOption = FALSE;
- 
- 	//	gsm_verbose ("display_gui: showing logout dialog\n");
- 
-@@ -257,7 +256,6 @@
- 
- 	if(dlg_option & SSUI_OPTION_LOGOUT)
- 	{
--		haveOption = TRUE;
- 		image = NULL;
- 		if(gtk_icon_theme_has_icon(iconTheme, "system-log-out"))
- 		{
-@@ -295,7 +293,6 @@
- 
- 	if(dlg_option & SSUI_OPTION_LOCK)
- 	{
--		haveOption = TRUE;
- 		image = NULL;
- 		if(gtk_icon_theme_has_icon(iconTheme, "system-lock-screen"))
- 		{
-@@ -333,150 +330,154 @@
- 
- 	if(dlg_option & SSUI_OPTION_SHUTDOWN)
- 	{
--		if(gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN))
-+		image = NULL;
-+		if(gtk_icon_theme_has_icon(iconTheme, "system-shutdown"))
- 		{
--			image = NULL;
--			if(gtk_icon_theme_has_icon(iconTheme, "system-shutdown"))
--			{
--				themePixbuf = gtk_icon_theme_load_icon(iconTheme,
--						"system-shutdown", 48, 0, &error);
--				if(themePixbuf != NULL)
--					image = gtk_image_new_from_pixbuf(themePixbuf);
--				else
--					image = NULL;
--			}
--			else if(gtk_icon_theme_has_icon(iconTheme, "gnome-shutdown"))
--			{
--				themePixbuf = gtk_icon_theme_load_icon(iconTheme,
--						"gnome-shutdown", 48, 0, &error);
--				if(themePixbuf != NULL)
--					image = gtk_image_new_from_pixbuf(themePixbuf);
--				else
--					image = NULL;
--			}
--			if(image == NULL)
--			{
--				image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION,
--						GTK_ICON_SIZE_DIALOG);
--			}
--			tile = ssui_get_tile(image, _("_Shutdown"),
--					_("Ends your session and turns off the computer."));
--			g_signal_connect (G_OBJECT (tile), "clicked",
--					G_CALLBACK (shutdown_button_clicked), logoutDlg);
-+			themePixbuf = gtk_icon_theme_load_icon(iconTheme,
-+					"system-shutdown", 48, 0, &error);
-+			if(themePixbuf != NULL)
-+				image = gtk_image_new_from_pixbuf(themePixbuf);
-+			else
-+				image = NULL;
-+		}
-+		else if(gtk_icon_theme_has_icon(iconTheme, "gnome-shutdown"))
-+		{
-+			themePixbuf = gtk_icon_theme_load_icon(iconTheme,
-+					"gnome-shutdown", 48, 0, &error);
-+			if(themePixbuf != NULL)
-+				image = gtk_image_new_from_pixbuf(themePixbuf);
-+			else
-+				image = NULL;
-+		}
-+		if(image == NULL)
-+		{
-+			image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION,
-+					GTK_ICON_SIZE_DIALOG);
-+		}
-+		tile = ssui_get_tile(image, _("_Shutdown"),
-+				_("Ends your session and turns off the computer."));
-+		g_signal_connect (G_OBJECT (tile), "clicked",
-+				G_CALLBACK (shutdown_button_clicked), logoutDlg);
- 
--			gtk_box_pack_start (GTK_BOX (vbox), tile, TRUE, TRUE, 0);
--			gtk_widget_show_all(tile);
-+		if(!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN))
-+		{
-+			gtk_widget_set_sensitive(tile, FALSE);
- 		}
-+
-+		gtk_box_pack_start (GTK_BOX (vbox), tile, TRUE, TRUE, 0);
-+		gtk_widget_show_all(tile);
- 	}
- 
- 
- 
- 	if(dlg_option & SSUI_OPTION_RESTART)
- 	{
--		if(gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT))
-+		image = NULL;
-+		if(gtk_icon_theme_has_icon(iconTheme, "stock_refresh"))
- 		{
--			haveOption = TRUE;
--			image = NULL;
--			if(gtk_icon_theme_has_icon(iconTheme, "stock_refresh"))
--			{
--				themePixbuf = gtk_icon_theme_load_icon(iconTheme,
--						"stock_refresh", 48, 0, &error);
--				if(themePixbuf != NULL)
--					image = gtk_image_new_from_pixbuf(themePixbuf);
--				else
--					image = NULL;
--			}
--			else if(gtk_icon_theme_has_icon(iconTheme, "gnome-reboot"))
--			{
--				themePixbuf = gtk_icon_theme_load_icon(iconTheme,
--						"gnome-reboot", 48, 0, &error);
--				if(themePixbuf != NULL)
--					image = gtk_image_new_from_pixbuf(themePixbuf);
--				else
--					image = NULL;
--			}
--			if(image == NULL)
--			{
--				image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION,
--						GTK_ICON_SIZE_DIALOG);
--			}
--			tile = ssui_get_tile(image, _("_Restart"),
--					_("Ends your session and restarts the computer."));
--			g_signal_connect (G_OBJECT (tile), "clicked",
--					G_CALLBACK (restart_button_clicked), logoutDlg);
-+			themePixbuf = gtk_icon_theme_load_icon(iconTheme,
-+					"stock_refresh", 48, 0, &error);
-+			if(themePixbuf != NULL)
-+				image = gtk_image_new_from_pixbuf(themePixbuf);
-+			else
-+				image = NULL;
-+		}
-+		else if(gtk_icon_theme_has_icon(iconTheme, "gnome-reboot"))
-+		{
-+			themePixbuf = gtk_icon_theme_load_icon(iconTheme,
-+					"gnome-reboot", 48, 0, &error);
-+			if(themePixbuf != NULL)
-+				image = gtk_image_new_from_pixbuf(themePixbuf);
-+			else
-+				image = NULL;
-+		}
-+		if(image == NULL)
-+		{
-+			image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION,
-+					GTK_ICON_SIZE_DIALOG);
-+		}
-+		tile = ssui_get_tile(image, _("_Restart"),
-+				_("Ends your session and restarts the computer."));
-+		g_signal_connect (G_OBJECT (tile), "clicked",
-+				G_CALLBACK (restart_button_clicked), logoutDlg);
- 
--			gtk_box_pack_start (GTK_BOX (vbox), tile, TRUE, TRUE, 0);
--			gtk_widget_show_all(tile);
-+		if(!gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT))
-+		{
-+			gtk_widget_set_sensitive(tile, FALSE);
- 		}
-+
-+		gtk_box_pack_start (GTK_BOX (vbox), tile, TRUE, TRUE, 0);
-+		gtk_widget_show_all(tile);
- 	}
- 
- 
- 
- 	if(dlg_option & SSUI_OPTION_SLEEP)
- 	{
--		if(panel_power_manager_can_suspend(powerManager))
-+		image = NULL;
-+		if(gtk_icon_theme_has_icon(iconTheme, "sleep"))
- 		{
--			haveOption = TRUE;
--			image = NULL;
--			if(gtk_icon_theme_has_icon(iconTheme, "sleep"))
--			{
--				themePixbuf = gtk_icon_theme_load_icon(iconTheme,
--						"sleep", 48, 0, &error);
--				if(themePixbuf != NULL)
--					image = gtk_image_new_from_pixbuf(themePixbuf);
--				else
--					image = NULL;
--			}
--			if(image == NULL)
--			{
--				image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION,
--						GTK_ICON_SIZE_DIALOG);
--			}
--			tile = ssui_get_tile(image, _("Slee_p"),
--					_("Suspends your session quickly, using minimal power while the computer stands by."));
--			g_signal_connect (G_OBJECT (tile), "clicked",
--					G_CALLBACK (sleep_button_clicked), logoutDlg);
-+			themePixbuf = gtk_icon_theme_load_icon(iconTheme,
-+					"sleep", 48, 0, &error);
-+			if(themePixbuf != NULL)
-+				image = gtk_image_new_from_pixbuf(themePixbuf);
-+			else
-+				image = NULL;
-+		}
-+		if(image == NULL)
-+		{
-+			image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION,
-+					GTK_ICON_SIZE_DIALOG);
-+		}
-+		tile = ssui_get_tile(image, _("Slee_p"),
-+				_("Suspends your session quickly, using minimal power while the computer stands by."));
-+		g_signal_connect (G_OBJECT (tile), "clicked",
-+				G_CALLBACK (sleep_button_clicked), logoutDlg);
- 
--			gtk_box_pack_start (GTK_BOX (vbox), tile, TRUE, TRUE, 0);
--			gtk_widget_show_all(tile);
-+		if(!panel_power_manager_can_suspend(powerManager))
-+		{
-+			gtk_widget_set_sensitive(tile, FALSE);
- 		}
-+
-+		gtk_box_pack_start (GTK_BOX (vbox), tile, TRUE, TRUE, 0);
-+		gtk_widget_show_all(tile);
- 	}
- 
- 
- 	if(dlg_option & SSUI_OPTION_HIBERNATE)
- 	{
--		if(panel_power_manager_can_hibernate(powerManager))
-+		image = NULL;
-+		if(gtk_icon_theme_has_icon(iconTheme, "drive-harddisk"))
- 		{
--			haveOption = TRUE;
--			image = NULL;
--			if(gtk_icon_theme_has_icon(iconTheme, "drive-harddisk"))
--			{
--				themePixbuf = gtk_icon_theme_load_icon(iconTheme,
--						"drive-harddisk", 48, 0, &error);
--				if(themePixbuf != NULL)
--					image = gtk_image_new_from_pixbuf(themePixbuf);
--				else
--					image = NULL;
--			}
--			if(image == NULL)
--			{
--				image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION,
--						GTK_ICON_SIZE_DIALOG);
--			}
--			tile = ssui_get_tile(image, _("Hi_bernate"),
--					_("Suspends your session, using no power until the computer is restarted."));
--			g_signal_connect (G_OBJECT (tile), "clicked",
--					G_CALLBACK (hibernate_button_clicked), logoutDlg);
-+			themePixbuf = gtk_icon_theme_load_icon(iconTheme,
-+					"drive-harddisk", 48, 0, &error);
-+			if(themePixbuf != NULL)
-+				image = gtk_image_new_from_pixbuf(themePixbuf);
-+			else
-+				image = NULL;
-+		}
-+		if(image == NULL)
-+		{
-+			image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION,
-+					GTK_ICON_SIZE_DIALOG);
-+		}
-+		tile = ssui_get_tile(image, _("Hi_bernate"),
-+				_("Suspends your session, using no power until the computer is restarted."));
-+		g_signal_connect (G_OBJECT (tile), "clicked",
-+				G_CALLBACK (hibernate_button_clicked), logoutDlg);
- 
--			gtk_box_pack_start (GTK_BOX (vbox), tile, TRUE, TRUE, 0);
--			gtk_widget_show_all(tile);
-+		if(!panel_power_manager_can_hibernate(powerManager))
-+		{
-+			gtk_widget_set_sensitive(tile, FALSE);
- 		}
-+
-+		gtk_box_pack_start (GTK_BOX (vbox), tile, TRUE, TRUE, 0);
-+		gtk_widget_show_all(tile);
- 	}
- 
- 
- 	if(dlg_option & SSUI_OPTION_SWITCH)
- 	{
--		haveOption = TRUE;
- 		image = NULL;
- 		if(gtk_icon_theme_has_icon(iconTheme, "config-users"))
- 		{
-@@ -551,12 +552,7 @@
- 	do
- 	{
- 
--	// if there are any options available to display above, show the 
--	// dialog, otherwise don't show it at all
--	if(haveOption) 
--		response = gtk_dialog_run (GTK_DIALOG (logoutDlg));
--	else
--		response = GTK_RESPONSE_CANCEL;
-+	response = gtk_dialog_run (GTK_DIALOG (logoutDlg));
- 
- 	showDialog = FALSE;
- 
diff --git a/gnome-extra/libssui/files/libssui-pm-dbus.patch b/gnome-extra/libssui/files/libssui-pm-dbus.patch
deleted file mode 100644
index 1caee60..0000000
--- a/gnome-extra/libssui/files/libssui-pm-dbus.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/gnome-session-code/panel-power-manager.c
-+++ src/gnome-session-code/panel-power-manager.c
-@@ -129,7 +129,7 @@
- 	                                   const char        *new_owner,
- 	                                   PanelPowerManager *manager)
- {
--	if (strcmp (name, "org.gnome.PowerManager") != 0)
-+	if (strcmp (name, "org.freedesktop.PowerManagement") != 0)
- 		return;
- 
- 	if (manager->priv->gpm_proxy != NULL) {
-@@ -189,9 +189,9 @@
- 		manager->priv->gpm_proxy =
- 			dbus_g_proxy_new_for_name_owner (
- 					manager->priv->dbus_connection,
--					"org.gnome.PowerManager",
--					"/org/gnome/PowerManager",
--					"org.gnome.PowerManager",
-+					"org.freedesktop.PowerManagement",
-+					"/org/freedesktop/PowerManagement",
-+					"org.freedesktop.PowerManagement",
- 					&connection_error);
- 
- 		if (manager->priv->gpm_proxy == NULL) {
-@@ -324,8 +324,7 @@
- 	}
- 
- 	can_suspend = FALSE;
--//	if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanSuspend",
--	if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "AllowedSuspend",
-+	if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanSuspend",
- 				&error,
- 				G_TYPE_INVALID,
- 				G_TYPE_BOOLEAN, &can_suspend, G_TYPE_INVALID)) {
-@@ -356,8 +355,7 @@
- 	}
- 
- 	can_hibernate = FALSE;
--//	if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanHibernate",
--	if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "AllowedHibernate",
-+	if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanHibernate",
- 				&error,
- 				G_TYPE_INVALID,
- 				G_TYPE_BOOLEAN, &can_hibernate, G_TYPE_INVALID)) {
diff --git a/gnome-extra/libssui/files/libssui-wrong-icon.patch b/gnome-extra/libssui/files/libssui-wrong-icon.patch
deleted file mode 100644
index 1bcc87b..0000000
--- a/gnome-extra/libssui/files/libssui-wrong-icon.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/logout-dialog.c
-+++ src/logout-dialog.c
-@@ -331,19 +331,19 @@
- 	if(dlg_option & SSUI_OPTION_SHUTDOWN)
- 	{
- 		image = NULL;
--		if(gtk_icon_theme_has_icon(iconTheme, "system-shutdown"))
-+		if(gtk_icon_theme_has_icon(iconTheme, "gnome-shutdown"))
- 		{
- 			themePixbuf = gtk_icon_theme_load_icon(iconTheme,
--					"system-shutdown", 48, 0, &error);
-+					"gnome-shutdown", 48, 0, &error);
- 			if(themePixbuf != NULL)
- 				image = gtk_image_new_from_pixbuf(themePixbuf);
- 			else
- 				image = NULL;
- 		}
--		else if(gtk_icon_theme_has_icon(iconTheme, "gnome-shutdown"))
-+		else if(gtk_icon_theme_has_icon(iconTheme, "system-shutdown"))
- 		{
- 			themePixbuf = gtk_icon_theme_load_icon(iconTheme,
--					"gnome-shutdown", 48, 0, &error);
-+					"system-shutdown", 48, 0, &error);
- 			if(themePixbuf != NULL)
- 				image = gtk_image_new_from_pixbuf(themePixbuf);
- 			else
diff --git a/gnome-extra/libssui/libssui-0.5.7.ebuild b/gnome-extra/libssui/libssui-0.5.7.ebuild
deleted file mode 100644
index 5b06b86..0000000
--- a/gnome-extra/libssui/libssui-0.5.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils gnome2
-
-DESCRIPTION="New logout dialog by Novell"
-HOMEPAGE="http://code.google.com/p/libssui/"
-SRC_URI="http://libssui.googlecode.com/files/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2.6.0
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-vfs-2
-	>=sys-apps/dbus-0.60"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Update to newer dbus calls from GNOME Power Manager
-	epatch ${FILESDIR}/${PN}-pm-dbus.patch
-	epatch ${FILESDIR}/${PN}-missing-options.patch
-	epatch ${FILESDIR}/${PN}-wrong-icon.patch
-
-}
-