Use new libxfce4ui library (instead of old libxfcegui4).

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

4 files changed, 210 insertions, 3 deletions

diff --git a/xfce-extra/xfce4-xkb-plugin/ChangeLog b/xfce-extra/xfce4-xkb-plugin/ChangeLog
index d21fb932d8b2..0c3add9e79fd 100644
--- a/xfce-extra/xfce4-xkb-plugin/ChangeLog
+++ b/xfce-extra/xfce4-xkb-plugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/xfce4-xkb-plugin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/ChangeLog,v 1.19 2010/02/15 13:10:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/ChangeLog,v 1.20 2010/08/05 21:51:38 ssuominen Exp $
+
+*xfce4-xkb-plugin-0.5.3.3-r9 (05 Aug 2010)
+
+  05 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-xkb-plugin-0.5.3.3-r9.ebuild,
+  +files/xfce4-xkb-plugin-0.5.3.3-libxfce4ui.patch:
+  Use new libxfce4ui library (instead of old libxfcegui4).
 
   15 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-xkb-plugin-0.5.3.3-r1.ebuild,
diff --git a/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.5.3.3-libxfce4ui.patch b/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.5.3.3-libxfce4ui.patch
new file mode 100644
index 000000000000..8217ec9de5b6
--- /dev/null
+++ b/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.5.3.3-libxfce4ui.patch
@@ -0,0 +1,162 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=6396
+
+--- configure.in
++++ configure.in
+@@ -63,7 +63,7 @@
+ dnl ***********************************
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
+ XDT_CHECK_PACKAGE([LIBXKLAVIER], [libxklavier], [3.2])
+ XDT_CHECK_PACKAGE([LIBRSVG], [librsvg-2.0], [2.18])
+--- panel-plugin/Makefile.am
++++ panel-plugin/Makefile.am
+@@ -23,7 +23,7 @@
+ xfce4_xkb_plugin_CFLAGS =								\
+ 	@LIBXFCE4PANEL_CFLAGS@								\
+ 	@GTK_CFLAGS@									\
+-	@LIBXFCEGUI4_CFLAGS@								\
++	@LIBXFCE4UI_CFLAGS@								\
+ 	@LIBXFCE4UTIL_CFLAGS@								\
+ 	@LIBXKLAVIER_CFLAGS@								\
+ 	@LIBRSVG_CFLAGS@								\
+@@ -36,7 +36,7 @@
+ xfce4_xkb_plugin_LDADD = 								\
+ 	@LIBXFCE4PANEL_LIBS@								\
+ 	@GTK_LIBS@									\
+-	@LIBXFCEGUI4_LIBS@								\
++	@LIBXFCE4UI_LIBS@								\
+ 	@LIBXFCE4UTIL_LIBS@								\
+ 	@LIBXKLAVIER_LIBS@								\
+ 	@LIBWNCK_LIBS@									\
+--- panel-plugin/xfce4-xkb-plugin.h
++++ panel-plugin/xfce4-xkb-plugin.h
+@@ -29,7 +29,7 @@
+ #include "xkb-config.h"
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <libxfce4panel/xfce-panel-plugin.h>
+ 
+ #include <X11/Xlib.h>
+--- panel-plugin/xkb-settings-dialog.c
++++ panel-plugin/xkb-settings-dialog.c
+@@ -32,7 +32,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4panel/xfce-panel-plugin.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "xfce4-xkb-plugin.h"
+ #include "xfce4-xkb-plugin-private.h"
+@@ -447,7 +447,7 @@
+                     t_xkb *xkb)
+ {
+     GtkWidget *display_type_optmenu, *group_policy_combo;
+-    GtkWidget *vbox, *display_type_frame, *group_policy_frame;
++    GtkWidget *vbox, *display_type_frame, *group_policy_frame, *bin;
+           
+ 
+     GtkCellRenderer *renderer, *renderer2;
+@@ -480,14 +480,14 @@
+     gtk_container_add (GTK_CONTAINER (vbox), vbox1);
+     gtk_widget_show (vbox1);
+ 
+-    frame = xfce_framebox_new (_("Keyboard model:"), TRUE);
++    frame = xfce_gtk_frame_box_new (_("Keyboard model:"), &bin);
+     gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+-    gtk_widget_show (frame);
++    gtk_widget_show ((frame));
+     gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+ 
+     xkb->kbd_model_combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (xkb->combo_store));
+     gtk_widget_set_size_request (xkb->kbd_model_combo, 230, -1);
+-    xfce_framebox_add (XFCE_FRAMEBOX (frame), xkb->kbd_model_combo);
++    gtk_container_add (GTK_CONTAINER (bin), xkb->kbd_model_combo);
+     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (xkb->kbd_model_combo), renderer, TRUE);
+     gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (xkb->kbd_model_combo), renderer, "text", 0);
+     
+@@ -505,14 +505,14 @@
+     g_signal_connect (xkb->kbd_model_combo, "query-tooltip", G_CALLBACK (xkb_settings_config_modification_disabled_tooltip), xkb);
+     
+     /* toggle layout option */
+-    frame = xfce_framebox_new (_("Change layout option:"), TRUE);
++    frame = xfce_gtk_frame_box_new (_("Change layout option:"), &bin);
+     gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+     gtk_widget_show (frame);
+     gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+ 
+     xkb->toggle_options_combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (xkb->toggle_options_store));
+     gtk_widget_set_size_request (xkb->toggle_options_combo, 230, -1);
+-    xfce_framebox_add (XFCE_FRAMEBOX (frame), xkb->toggle_options_combo);
++    gtk_container_add (GTK_CONTAINER (bin), xkb->toggle_options_combo);
+     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (xkb->toggle_options_combo), renderer, TRUE);
+     gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (xkb->toggle_options_combo), renderer, "text", 0);
+     xkb_settings_add_toggle_options_to_list (NULL, NULL, xkb);
+@@ -531,14 +531,14 @@
+     g_signal_connect (xkb->toggle_options_combo, "query-tooltip", G_CALLBACK (xkb_settings_config_modification_disabled_tooltip), xkb);
+ 
+     /* compose key position option */
+-    frame = xfce_framebox_new (_("Compose key position:"), TRUE);
++    frame = xfce_gtk_frame_box_new (_("Compose key position:"), &bin);
+     gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+     gtk_widget_show (frame);
+     gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+ 
+     xkb->compose_key_options_combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (xkb->compose_key_options_store));
+     gtk_widget_set_size_request (xkb->compose_key_options_combo, 230, -1);
+-    xfce_framebox_add (XFCE_FRAMEBOX (frame), xkb->compose_key_options_combo);
++    gtk_container_add (GTK_CONTAINER (bin), xkb->compose_key_options_combo);
+     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (xkb->compose_key_options_combo), renderer, TRUE);
+     gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (xkb->compose_key_options_combo), renderer, "text", 0);
+     xkb_settings_add_compose_key_position_options_to_list (NULL, NULL, xkb);
+@@ -558,13 +558,13 @@
+ 
+     
+     /* the actual layouts */
+-    frame = xfce_framebox_new (_("Keyboard layouts:"), TRUE);
++    frame = xfce_gtk_frame_box_new (_("Keyboard layouts:"), &bin);
+     gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+     gtk_widget_show (frame);
+     gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+     
+     hbox = gtk_hbox_new (FALSE, 5);
+-    xfce_framebox_add (XFCE_FRAMEBOX (frame), hbox);
++    gtk_container_add (GTK_CONTAINER (bin), hbox);
+     gtk_widget_show (hbox);
+     
+     // TreeView
+@@ -630,7 +630,7 @@
+     xkb_settings_edit_layout_btn_show (GTK_TREE_VIEW (xkb->layout_tree_view), xkb);
+ 
+     /*****/
+-    display_type_frame = xfce_framebox_new (_("Show layout as:"), TRUE);
++    display_type_frame = xfce_gtk_frame_box_new (_("Show layout as:"), &bin);
+     gtk_widget_show (display_type_frame);
+     gtk_box_pack_start (GTK_BOX (vbox), display_type_frame, TRUE, TRUE, 2);
+ 
+@@ -638,9 +638,9 @@
+     gtk_combo_box_append_text (GTK_COMBO_BOX (display_type_optmenu), _("image"));
+     gtk_combo_box_append_text (GTK_COMBO_BOX (display_type_optmenu), _("text"));
+     gtk_widget_set_size_request (display_type_optmenu, 230, -1);
+-    xfce_framebox_add (XFCE_FRAMEBOX (display_type_frame), display_type_optmenu);
++    gtk_container_add (GTK_CONTAINER (bin), display_type_optmenu);
+ 
+-    group_policy_frame = xfce_framebox_new (_("Manage layout:"), TRUE);
++    group_policy_frame = xfce_gtk_frame_box_new (_("Manage layout:"), &bin);
+     gtk_widget_show (group_policy_frame);
+     gtk_box_pack_start (GTK_BOX (vbox), group_policy_frame, TRUE, TRUE, 2);
+ 
+@@ -649,7 +649,7 @@
+     gtk_combo_box_append_text (GTK_COMBO_BOX (group_policy_combo), _("per window"));
+     gtk_combo_box_append_text (GTK_COMBO_BOX (group_policy_combo), _("per application"));
+     gtk_widget_set_size_request (group_policy_combo, 230, -1);
+-    xfce_framebox_add (XFCE_FRAMEBOX (group_policy_frame), group_policy_combo);
++    gtk_container_add (GTK_CONTAINER (bin), group_policy_combo);
+     gtk_widget_show (group_policy_combo);
+ 
+     gtk_widget_show_all (vbox);
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild
index 7aeec207379f..49524dcfdeff 100644
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild
+++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild,v 1.11 2010/02/15 13:10:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild,v 1.12 2010/08/05 21:51:38 ssuominen Exp $
 
 EAPI=2
 inherit xfconf
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog README"
 	XFCONF="--disable-dependency-tracking
-		$(use_enable debug)"
+		$(xfconf_use_debug)"
 
 	if has_version ">=x11-libs/libxklavier-5"; then
 		PATCHES=( "${FILESDIR}/${P}-libxklavier-5.patch" )
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r9.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r9.ebuild
new file mode 100644
index 000000000000..8a16a1f921d2
--- /dev/null
+++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r9.ebuild,v 1.1 2010/08/05 21:51:38 ssuominen Exp $
+
+EAPI=2
+EAUTORECONF=yes
+inherit xfconf
+
+DESCRIPTION="XKB layout switching panel plugin"
+HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/0.5/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND=">=x11-libs/gtk+-2.6:2
+	>=xfce-base/xfce4-panel-4.3.20
+	>=xfce-base/libxfce4util-4.3.90.2
+	>=xfce-base/libxfce4ui-4.7
+	>=x11-libs/libxklavier-5
+	x11-libs/libwnck"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	x11-proto/kbproto
+	>=gnome-base/librsvg-2.18"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog README"
+	XFCONF="--disable-dependency-tracking
+		$(xfconf_use_debug)"
+	PATCHES=(
+		"${FILESDIR}"/${P}-libxklavier-5.patch
+		"${FILESDIR}"/${P}-libxfce4ui.patch
+		)
+}