old

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

4 files changed, 0 insertions, 299 deletions

diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index f064e549687d..3dc20610c4d7 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,11 +1,7 @@
-AUX xfdesktop-4.6.1-assert.patch 1742 RMD160 75db711c603a9b7b43483e6e52d083582adf8536 SHA1 d60765a6cad7590290d662861cd01d8033dfa6de SHA256 f3d860ddf4c494af2908f98d52474bc303ce6b80702b4a9b615c14051ce3f2df
-AUX xfdesktop-4.6.1-automagic.patch 4713 RMD160 fa24b6347d40b39aba357035877c6138f4be744a SHA1 9d158b78567f778078e554e8ab608b8ddcffd8d4 SHA256 376c8e99893384fb2ed8dfd728cb93b867bfc52f4c3c1d15f07de1b704d52967
 AUX xfdesktop-4.6.2-assert.patch 814 RMD160 67f17f33a666979a0a06534c234b934e9fdd91c0 SHA1 75825df2a40741d5365dba2e28e9b98886e57776 SHA256 286fd511c18584d1ad855ec1c16684952370094e04b9889ede349f2d6fade17e
 AUX xfdesktop-4.6.2-automagic.patch 4766 RMD160 776129b86b3e90ed5f3d13b472b470c014d86acc SHA1 caaaa4e1d355aba3b3309036559fd47d06a69948 SHA256 fa2dbbf11671189f22e3937541f2ea2092c416784b3ddef13351065be6391099
 DIST gentoo-minimal-1280x1024.jpg 103489 RMD160 9d736c236c29c39836910337c6b9b62e0d217c08 SHA1 0ef26494879e6e4f4e66f9111ebfc1080423217b SHA256 6134b6eea65e6c8e996cfaab07d30050d66207a518d589bc9115f8342255c57b
-DIST xfdesktop-4.6.1.tar.bz2 3671378 RMD160 86785f706a65e443c5521179b68309b9aca0cb32 SHA1 c2c1b54acaae924077caa3cdffe449e3bb34b2bd SHA256 22aa4a654798dcfa728a9c0056486f73ae87a51239950c8f85aedef488cd571a
 DIST xfdesktop-4.6.2.tar.bz2 4480477 RMD160 744c6442c612f41f5567713c3e9265ee95dd2898 SHA1 cefcd1c1386d34386d4e900cbf88b7c24ef3bafb SHA256 cd760f95486ba3f1c6d0179bb10a4c21c99c1d459dd8265823fed85f7376a3fb
-EBUILD xfdesktop-4.6.1-r1.ebuild 2532 RMD160 6936b2cc50faacd650ebfcb42e53024eb0cd77a7 SHA1 ae33ff7205529d4866528d3aa62e77cbe16625cd SHA256 8a6b422f44c15fcf27d00e3e998ef3bf6bb21b90d74fd4e5b235ecc19746572c
 EBUILD xfdesktop-4.6.2.ebuild 2748 RMD160 acc8a23e22764e8ffbbb0fe55dd23ba8e506e890 SHA1 f6c34a613e5395fec7b57e934afdae6a6aec6901 SHA256 6332aaabbf735a4117fc616b2d3b65edae1edf91864d8b1139a0eefccf988265
 MISC ChangeLog 21564 RMD160 041a757dc92b87128f23a8e9492ae923f35826dc SHA1 a629a0e35313aa5fca5228aec342521f47d03f2c SHA256 a773c5c08074c1f114f3f2859b223ef54dc6b2b66287e24fcca97fbef5b8e03b
 MISC metadata.xml 276 RMD160 13b24c1b04cf3019681e2b6a455c4fd196ac7ac2 SHA1 b58ca6fb049d21778094471208bc75b4f9fbe704 SHA256 02ac0bb7333dd11cef3a53b2d3c3cc744406509d104d37bd8bd31641646d8ae4
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.6.1-assert.patch b/xfce-base/xfdesktop/files/xfdesktop-4.6.1-assert.patch
deleted file mode 100644
index 35fa6d26e2f7..000000000000
--- a/xfce-base/xfdesktop/files/xfdesktop-4.6.1-assert.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: xfdesktop-4.6.1/src/xfdesktop-icon-view.c
-===================================================================
---- xfdesktop-4.6.1.orig/src/xfdesktop-icon-view.c
-+++ xfdesktop-4.6.1/src/xfdesktop-icon-view.c
-@@ -2143,12 +2143,14 @@ xfdesktop_icon_view_paint_icon(Xfdesktop
-     GdkRectangle pix_area, text_area, intersection, adj_area;
-     const gchar *label;
-     guint16 row, col;
-+    gboolean ret = FALSE;
-     gchar x_offset = 0, y_offset = 0;
-     GdkColor *sh_text_col = NULL;
-     
-     /*TRACE("entering (%s)", xfdesktop_icon_peek_label(icon));*/
--    
--    g_return_if_fail(xfdesktop_icon_get_position(icon, &row, &col));
-+
-+    ret = xfdesktop_icon_get_position(icon, &row, &col);
-+    g_return_if_fail(ret);
-     
-     if(g_list_find(icon_view->priv->selected_icons, icon)) {
-         if(GTK_WIDGET_FLAGS(widget) & GTK_HAS_FOCUS)
-@@ -2494,8 +2496,10 @@ xfdesktop_grid_unset_position_free(Xfdes
-                                    XfdesktopIcon *icon)
- {
-     guint16 row, col;
--    
--    g_return_val_if_fail(xfdesktop_icon_get_position(icon, &row, &col), FALSE);
-+    gboolean ret = FALSE;
-+
-+    ret = xfdesktop_icon_get_position(icon, &row, &col);
-+    g_return_val_if_fail(ret, FALSE);
-     
-     return xfdesktop_grid_unset_position_free_raw(icon_view, row, col, icon);
- }
-@@ -2738,9 +2742,11 @@ xfdesktop_icon_view_add_item_internal(Xf
- {
-     guint16 row, col;
-     GdkRectangle fake_area;
-+    gboolean ret = FALSE;
-     
-     /* sanity check: at this point this should be taken care of */
--    g_return_if_fail(xfdesktop_icon_get_position(icon, &row, &col));
-+    ret = xfdesktop_icon_get_position(icon, &row, &col);
-+    g_return_if_fail(ret);
-     
-     xfdesktop_grid_unset_position_free(icon_view, icon);
-     
\ No newline at end of file
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.6.1-automagic.patch b/xfce-base/xfdesktop/files/xfdesktop-4.6.1-automagic.patch
deleted file mode 100644
index b70f1df3f9e7..000000000000
--- a/xfce-base/xfdesktop/files/xfdesktop-4.6.1-automagic.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff -ur xfdesktop-4.6.1.orig/modules/menu/desktop-menu.c xfdesktop-4.6.1/modules/menu/desktop-menu.c
---- xfdesktop-4.6.1.orig/modules/menu/desktop-menu.c	2009-02-26 00:32:50.000000000 +0200
-+++ xfdesktop-4.6.1/modules/menu/desktop-menu.c	2009-09-23 14:10:16.000000000 +0300
-@@ -63,7 +63,7 @@
- #include <libxfcegui4/libxfcegui4.h>
- #include <libxfce4menu/libxfce4menu.h>
- 
--#ifdef HAVE_THUNAR_VFS
-+#ifdef ENABLE_FILE_ICONS
- #include <thunar-vfs/thunar-vfs.h>
- #endif
- 
-@@ -82,7 +82,7 @@
- 	
-     gint idle_id;  /* source id for idled generation */
-     
--#ifdef HAVE_THUNAR_VFS
-+#ifdef ENABLE_FILE_ICONS
-     GList *monitors;
- #endif
- } XfceDesktopMenu;
-@@ -134,7 +134,7 @@
-         desktop_menu->idle_id = g_idle_add(_generate_menu_idled, desktop_menu);
- }
- 
--#ifdef HAVE_THUNAR_VFS
-+#ifdef ENABLE_FILE_ICONS
- 
- static void
- desktop_menu_something_changed(ThunarVfsMonitor *monitor,
-@@ -443,7 +443,7 @@
- xfce_desktop_menu_new_impl(const gchar *menu_file,
-                            gboolean deferred)
- {
--#ifdef HAVE_THUNAR_VFS
-+#ifdef ENABLE_FILE_ICONS
-     static XfceMenuMonitorVTable monitor_vtable = {
-         NULL, /*desktop_menu_xfce_menu_monitor_file,*/
-         desktop_menu_xfce_menu_monitor_directory,
-@@ -460,7 +460,7 @@
-     else
-         desktop_menu->filename = xfce_desktop_get_menufile();
-     
--#ifdef HAVE_THUNAR_VFS
-+#ifdef ENABLE_FILE_ICONS
-     thunar_vfs_init();
-     xfce_menu_monitor_set_vtable(&monitor_vtable, desktop_menu);
- #endif
-@@ -469,7 +469,7 @@
-         desktop_menu->idle_id = g_idle_add(_generate_menu_idled, desktop_menu);
-     else {
-         if(!_generate_menu(desktop_menu)) {
--#ifdef HAVE_THUNAR_VFS
-+#ifdef ENABLE_FILE_ICONS
-             xfce_menu_monitor_set_vtable(NULL, NULL);
- #endif
-             g_free(desktop_menu);
-@@ -595,7 +595,7 @@
-     g_return_if_fail(desktop_menu != NULL);
-     TRACE("dummy");
-     
--#ifdef HAVE_THUNAR_VFS
-+#ifdef ENABLE_FILE_ICONS
-     xfce_menu_monitor_set_vtable(NULL, NULL);
- #endif
-     
-diff -ur xfdesktop-4.6.1.orig/modules/menu/Makefile.am xfdesktop-4.6.1/modules/menu/Makefile.am
---- xfdesktop-4.6.1.orig/modules/menu/Makefile.am	2009-01-13 00:03:21.000000000 +0200
-+++ xfdesktop-4.6.1/modules/menu/Makefile.am	2009-09-23 14:04:57.000000000 +0300
-@@ -15,11 +15,15 @@
- 	$(LIBXFCE4MENU_CFLAGS) \
- 	$(LIBX11_CFLAGS) \
- 	$(LIBXFCEGUI4_CFLAGS) \
--	$(THUNAR_VFS_CFLAGS) \
- 	-DSYSCONFDIR=\"$(sysconfdir)\" \
- 	-DDATADIR=\"$(datadir)\" \
- 	-DBINDIR=\"$(bindir)\"
- 
-+if ENABLE_FILE_ICONS
-+xfce4_desktop_menu_la_CFLAGS += \
-+	$(THUNAR_VFS_CFLAGS)
-+endif
-+
- xfce4_desktop_menu_la_DEPENDENCIES = \
- 	$(top_builddir)/common/libxfdesktop-menu-utils.la
- 
-@@ -40,5 +44,9 @@
- 	$(LIBXFCE4MENU_LIBS) \
- 	$(LIBX11_LDFLAGS) \
- 	$(LIBX11_LIBS) \
--	$(LIBXFCEGUI4_LIBS) \
-+	$(LIBXFCEGUI4_LIBS)
-+
-+if ENABLE_FILE_ICONS
-+xfce4_desktop_menu_la_LIBADD += \
- 	$(THUNAR_VFS_LIBS)
-+endif
-diff -ur xfdesktop-4.6.1.orig/panel-plugin/desktop-menu-plugin.c xfdesktop-4.6.1/panel-plugin/desktop-menu-plugin.c
---- xfdesktop-4.6.1.orig/panel-plugin/desktop-menu-plugin.c	2009-02-26 00:33:00.000000000 +0200
-+++ xfdesktop-4.6.1/panel-plugin/desktop-menu-plugin.c	2009-09-23 14:09:30.000000000 +0300
-@@ -53,7 +53,7 @@
- #include <libxfce4panel/xfce-panel-plugin.h>
- #include <libxfce4panel/xfce-panel-convenience.h>
- 
--#ifdef HAVE_THUNAR_VFS
-+#ifdef ENABLE_FILE_ICONS
- #include <thunar-vfs/thunar-vfs.h>
- #endif
- 
-@@ -896,7 +896,7 @@
- desktop_menu_plugin_preinit(int argc,
-                             char **argv)
- {
--#ifdef HAVE_THUNAR_VFS
-+#ifdef ENABLE_FILE_ICONS
-     g_thread_init(NULL);
- #endif
-     return TRUE;
-@@ -1018,7 +1018,7 @@
-     
-     xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-     
--#ifdef HAVE_THUNAR_VFS
-+#ifdef ENABLE_FILE_ICONS
-     thunar_vfs_init();
- #endif
-     
-diff -ur xfdesktop-4.6.1.orig/panel-plugin/Makefile.am xfdesktop-4.6.1/panel-plugin/Makefile.am
---- xfdesktop-4.6.1.orig/panel-plugin/Makefile.am	2009-01-13 00:03:12.000000000 +0200
-+++ xfdesktop-4.6.1/panel-plugin/Makefile.am	2009-09-23 14:04:38.000000000 +0300
-@@ -9,11 +9,15 @@
- 	$(LIBX11_CFLAGS) \
- 	$(LIBXFCEGUI4_CFLAGS) \
- 	$(LIBXFCE4PANEL_CFLAGS) \
--	$(THUNAR_VFS_CFLAGS) \
- 	-DDATADIR=\"$(datadir)\" \
- 	-DLOCALEDIR=\"$(localedir)\" \
- 	-DBINDIR=\"$(bindir)\"
- 
-+if ENABLE_FILE_ICONS
-+xfce4_menu_plugin_CFLAGS += \
-+	$(THUNAR_VFS_CFLAGS)
-+endif
-+
- xfce4_menu_plugin_DEPENDENCIES = \
- 	$(top_builddir)/common/libxfdesktop-menu.la \
- 	$(top_builddir)/common/libxfdesktop.la
-@@ -23,8 +27,12 @@
- 	$(top_builddir)/common/libxfdesktop.la \
- 	$(LIBX11_LIBS) \
- 	$(LIBXFCEGUI4_LIBS) \
--	$(LIBXFCE4PANEL_LIBS) \
-+	$(LIBXFCE4PANEL_LIBS)
-+
-+if ENABLE_FILE_ICONS
-+xfce4_menu_plugin_LDADD += \
- 	$(THUNAR_VFS_LIBS)
-+endif
- 
- if HAVE_CYGWIN
- xfce4_menu_plugin_LDFLAGS = \
diff --git a/xfce-base/xfdesktop/xfdesktop-4.6.1-r1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.6.1-r1.ebuild
deleted file mode 100644
index a840d0728dc8..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.6.1-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.6.1-r1.ebuild,v 1.13 2010/08/23 22:28:52 ssuominen Exp $
-
-EAPI=2
-EAUTORECONF=yes
-inherit xfconf
-
-DESCRIPTION="Desktop manager for Xfce4"
-HOMEPAGE="http://www.xfce.org/projects/xfdesktop"
-SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2
-	branding? ( http://www.gentoo.org/images/backgrounds/gentoo-minimal-1280x1024.jpg )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+branding debug doc xfce_plugins_menu thunar"
-
-LINGUAS="be ca cs da de el es et eu fi fr he hu it ja ko nb_NO nl pa pl pt_BR ro ru sk sv tr uk vi zh_CN zh_TW"
-
-for X in ${LINGUAS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND="gnome-base/libglade
-	x11-libs/libX11
-	x11-libs/libSM
-	>=x11-libs/libwnck-2.12
-	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4util-4.6
-	>=xfce-base/libxfcegui4-4.6
-	>=xfce-base/libxfce4menu-4.6
-	>=xfce-base/xfconf-4.6
-	branding? ( >=x11-libs/gtk+-2.10:2[jpeg] )
-	thunar? ( >=xfce-base/thunar-1
-		>=xfce-base/exo-0.3.100
-		dev-libs/dbus-glib )
-	xfce_plugins_menu? ( =xfce-base/xfce4-panel-4.6* )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	dev-util/pkgconfig
-	doc? ( dev-libs/libxslt )"
-
-pkg_setup() {
-	XFCE_LOCALIZED_CONFIGS="/etc/xdg/xfce4/desktop/menu.xml
-		/etc/xdg/xfce4/desktop/xfce-registered-categories.xml"
-	XFCONF="--disable-dependency-tracking
-		--disable-static
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable thunar exo)
-		$(use_enable xfce_plugins_menu panel-plugin)
-		$(use_enable doc xsltproc)
-		$(xfconf_use_debug)"
-	DOCS="AUTHORS ChangeLog NEWS TODO README"
-	PATCHES=( "${FILESDIR}/${P}-automagic.patch"
-		"${FILESDIR}/${P}-assert.patch" )
-}
-
-src_prepare() {
-	if use branding; then
-		sed -i -e "s:xfce-stripes.png:gentoo-minimal-1280x1024.jpg:" \
-			common/xfdesktop-common.h || die "sed failed"
-	fi
-	xfconf_src_prepare
-}
-
-src_install() {
-	xfconf_src_install
-
-	if use branding; then
-		insinto /usr/share/xfce4/backdrops
-		doins "${DISTDIR}"/gentoo-minimal-1280x1024.jpg || die "doins failed"
-	fi
-
-	local config lang
-	for config in ${XFCE_LOCALIZED_CONFIGS}; do
-		for lang in ${LINGUAS}; do
-			local localized_config="${D}/${config}.${lang}"
-			if [[ -f ${localized_config} ]]; then
-				use "linguas_${lang}" || rm ${localized_config}
-			fi
-		done
-	done
-}