old

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

3 files changed, 5 insertions, 202 deletions

diff --git a/xfce-base/libxfcegui4/ChangeLog b/xfce-base/libxfcegui4/ChangeLog
index d91cd6090135..52f07da8b917 100644
--- a/xfce-base/libxfcegui4/ChangeLog
+++ b/xfce-base/libxfcegui4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/libxfcegui4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.171 2012/04/14 07:54:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.172 2012/04/14 14:53:28 ssuominen Exp $
+
+  14 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -libxfcegui4-4.8.1-r1.ebuild, -files/libxfcegui4-4.8.1-deprecated.patch:
+  old
 
 *libxfcegui4-4.9.0 (14 Apr 2012)
 
diff --git a/xfce-base/libxfcegui4/files/libxfcegui4-4.8.1-deprecated.patch b/xfce-base/libxfcegui4/files/libxfcegui4-4.8.1-deprecated.patch
deleted file mode 100644
index 197f850b3a8e..000000000000
--- a/xfce-base/libxfcegui4/files/libxfcegui4-4.8.1-deprecated.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 9042e70bf7c8266aef059114d27ec1764fc41466 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Tue, 21 Jun 2011 19:55:19 +0000
-Subject: Drop XfceDesktopEntry usage.
-
----
-diff --git a/libxfcegui4/xfce-appmenuitem.c b/libxfcegui4/xfce-appmenuitem.c
-index 20dfa06..ffb15ed 100644
---- a/libxfcegui4/xfce-appmenuitem.c
-+++ b/libxfcegui4/xfce-appmenuitem.c
-@@ -522,127 +522,17 @@ GtkWidget *xfce_app_menu_item_new_full(const gchar *label, const gchar *command,
-  * xfce_app_menu_item_new_with_command(), xfce_app_menu_item_set_needs_term(),
-  * xfce_app_menu_item_set_icon_name(), and
-  * xfce_app_menu_item_set_startup_notification().
-+ * 
-+ * In Xfce 4.10 this function only returns NULL, since XfceDesktopEntry was
-+ * removed from libxfce4util.
-  *
-  * Since 4.1
-  **/
- GtkWidget *
--xfce_app_menu_item_new_from_desktop_entry(XfceDesktopEntry *entry,
-+xfce_app_menu_item_new_from_desktop_entry(gpointer *entry,
-         gboolean show_icon)
- {
--    XfceAppMenuItem *app_menu_item;
--    gchar *name = NULL, *cmd = NULL, *icon = NULL, *snotify = NULL;
--    gchar *onlyshowin = NULL, *categories = NULL, *term = NULL;
--    const gchar *dfile;
--    
--    g_return_val_if_fail(XFCE_IS_DESKTOP_ENTRY(entry), NULL);
--    
--    if(xfce_desktop_entry_get_string(entry, "OnlyShowIn", FALSE, &onlyshowin)
--       || xfce_desktop_entry_get_string(entry, "Categories", FALSE,
--                                        &categories))
--    {
--        if((onlyshowin && strstr(onlyshowin, "XFCE;"))
--           || (categories && strstr(categories, "X-XFCE;")))
--        {
--            if(xfce_desktop_entry_has_translated_entry(entry, "GenericName")) {
--                xfce_desktop_entry_get_string(entry, "GenericName", TRUE,
--                                              &name);
--            } else if(xfce_desktop_entry_has_translated_entry(entry, "Name")) {
--                xfce_desktop_entry_get_string(entry, "Name", TRUE, &name);
--            } else {
--                xfce_desktop_entry_get_string(entry, "GenericName", FALSE,
--                                              &name);
--            }
--        } else if(onlyshowin) {
--            g_free(onlyshowin);
--            g_free(categories);
--            return NULL;
--        }
--        
--        g_free(onlyshowin);
--        g_free(categories);
--    }
--    
--    app_menu_item = XFCE_APP_MENU_ITEM(xfce_app_menu_item_new());
--    
--    if(!name && !xfce_desktop_entry_get_string(entry, "Name", TRUE, &name)) {
--        gchar *tmp, *tmp1;
--        
--        tmp = g_filename_to_utf8(xfce_desktop_entry_get_file(entry), -1,
--                                 NULL, NULL, NULL);
--        if(!tmp)
--            tmp = g_strdup(xfce_desktop_entry_get_file(entry));
--            
--        if((tmp1 = g_strrstr(tmp, ".desktop")))
--            *tmp1 = 0;
--        if((tmp1 = g_strrstr(tmp, "/")))
--            tmp1++;
--        else
--            tmp1 = name;
--        name = g_strdup(tmp1);
--        g_free(tmp);
--    }
--    
--    app_menu_item->priv->name = name;
--    
--    if(!g_utf8_validate(name, -1, NULL)) {
--        g_warning("XfceAppMenuItem: 'name' failed utf8 validation for .desktop file '%s'",
--                xfce_desktop_entry_get_file(entry));
--        gtk_widget_destroy(GTK_WIDGET(app_menu_item));
--        return NULL;
--    }
--    
--    gtk_label_set_text(GTK_LABEL(app_menu_item->priv->accel_label),
--                       app_menu_item->priv->name);
--    
--    if(xfce_desktop_entry_get_string(entry, "Terminal", TRUE, &term)) {
--        app_menu_item->priv->needs_term = (*term == '1'
--                                           || !g_ascii_strcasecmp(term,
--                                                                  "true"));
--        g_free(term);
--    }
--    
--    if(xfce_desktop_entry_get_string(entry, "StartupNotify", TRUE, &snotify)) {
--        app_menu_item->priv->snotify = (*snotify == '1'
--                                        || !g_ascii_strcasecmp(snotify,
--                                                               "true"));
--        g_free(snotify);
--    }
--    
--    if(!xfce_desktop_entry_get_string(entry, "Exec", TRUE, &cmd)) {
--        gtk_widget_destroy(GTK_WIDGET(app_menu_item));
--        return NULL;
--    }
--
--    /* remove quotes around the command (yes, people do that!) */
--    if(cmd[0] == '"') {
--        gint i;
--        
--        for(i = 1; cmd[i - 1] != '\0'; ++i) {
--            if (cmd[i] != '"')
--                cmd[i-1] = cmd[i];
--            else {
--                cmd[i-1] = cmd[i] = ' ';
--                break;
--            }
--        }
--    }
--
--    app_menu_item->priv->command = xfce_expand_variables(cmd, NULL);
--    g_free(cmd);
--    
--    if(show_icon) {
--        xfce_desktop_entry_get_string(entry, "Icon", TRUE, &icon);
--        if(icon) {
--            xfce_app_menu_item_set_icon_name(app_menu_item, icon);
--            g_free(icon);
--        }
--    }
--    
--    dfile = xfce_desktop_entry_get_file(entry);
--    if(dfile)
--        app_menu_item->priv->dot_desktop_filename = g_strdup(dfile);
--    
--    return GTK_WIDGET(app_menu_item);
-+    return NULL;
- }
- 
- /**
-diff --git a/libxfcegui4/xfce-appmenuitem.h b/libxfcegui4/xfce-appmenuitem.h
-index 5732af9..0ce0f29 100644
---- a/libxfcegui4/xfce-appmenuitem.h
-+++ b/libxfcegui4/xfce-appmenuitem.h
-@@ -70,7 +70,7 @@ GtkWidget *xfce_app_menu_item_new_full                (const gchar *label,
-                                                        gboolean needs_term,
-                                                        gboolean snotify);
- 
--GtkWidget *xfce_app_menu_item_new_from_desktop_entry  (XfceDesktopEntry *entry,
-+GtkWidget *xfce_app_menu_item_new_from_desktop_entry  (gpointer *entry,
-                                                        gboolean show_icon);
- 
- void xfce_app_menu_item_set_name                      (XfceAppMenuItem *app_menu_item,
---
-cgit v0.9.0.3
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.8.1-r1.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.8.1-r1.ebuild
deleted file mode 100644
index c3493ca4a062..000000000000
--- a/xfce-base/libxfcegui4/libxfcegui4-4.8.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.8.1-r1.ebuild,v 1.1 2012/03/31 10:00:48 ssuominen Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="This package has been replaced by libxfce4ui. You shouldn't be using this."
-HOMEPAGE="http://www.xfce.org/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-solaris"
-IUSE="glade startup-notification"
-
-RDEPEND="gnome-base/libglade
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4util-4.8
-	glade? ( dev-util/glade:3 )
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-deprecated.patch )
-
-	XFCONF=(
-		--disable-static
-		$(use_enable startup-notification)
-		$(use_enable glade gladeui)
-		--with-html-dir="${EPREFIX}"/deprecated
-		)
-}
-
-src_install() {
-	xfconf_src_install
-	rm -rf "${ED}"/deprecated
-}