old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

5 files changed, 7 insertions, 150 deletions

diff --git a/x11-terms/xfce4-terminal/ChangeLog b/x11-terms/xfce4-terminal/ChangeLog
index 136e74f9a64d..cbac0ba904a7 100644
--- a/x11-terms/xfce4-terminal/ChangeLog
+++ b/x11-terms/xfce4-terminal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/xfce4-terminal
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xfce4-terminal/ChangeLog,v 1.20 2014/04/20 08:50:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xfce4-terminal/ChangeLog,v 1.21 2014/04/22 13:54:37 ssuominen Exp $
+
+  22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch,
+  -xfce4-terminal-0.4.8.ebuild, -xfce4-terminal-0.6.2-r1.ebuild,
+  -xfce4-terminal-0.6.2.ebuild:
+  old
 
   20 Apr 2014; Agostino Sarubbo <ago@gentoo.org> xfce4-terminal-0.6.3.ebuild:
   Stable for x86, wrt bug #507432
diff --git a/x11-terms/xfce4-terminal/files/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch b/x11-terms/xfce4-terminal/files/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch
deleted file mode 100644
index d33e2e52b4dd..000000000000
--- a/x11-terms/xfce4-terminal/files/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=10395
-
---- terminal/terminal-encoding-action.c
-+++ terminal/terminal-encoding-action.c
-@@ -253,7 +253,7 @@ terminal_encoding_action_menu_shown (GtkWidget              *menu,
-   /* action to reset to the default */
-   default_label = g_strdup_printf (_("Default (%s)"), default_charset);
-   item = gtk_radio_menu_item_new_with_label (groups, default_label);
--  groups = g_slist_prepend (groups, item);
-+  groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
-   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), found);
-   g_signal_connect (G_OBJECT (item), "activate",
-@@ -267,7 +267,6 @@ terminal_encoding_action_menu_shown (GtkWidget              *menu,
-       /* category item */
-       item = gtk_menu_item_new_with_label (_(terminal_encodings_names[n]));
-       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
--      groups = g_slist_prepend (groups, item);
-       gtk_widget_show (item);
- 
-       submenu = gtk_menu_new ();
-@@ -281,7 +280,7 @@ terminal_encoding_action_menu_shown (GtkWidget              *menu,
-             break;
- 
-           item2 = gtk_radio_menu_item_new_with_label (groups, charset);
--          groups = g_slist_prepend (groups, item2);
-+          groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item2));
-           gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item2);
-           g_object_set_qdata (G_OBJECT (item2), encoding_action_quark, (gchar *) charset);
-           gtk_widget_show (item2);
-@@ -304,7 +303,7 @@ terminal_encoding_action_menu_shown (GtkWidget              *menu,
-     {
-       /* add an action with the unknown charset */
-       item2 = gtk_radio_menu_item_new_with_label (groups, action->current);
--      groups = g_slist_prepend (groups, item2);
-+      groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item2));
-       g_object_set_qdata_full (G_OBJECT (item2), encoding_action_quark,
-                                g_strdup (action->current), g_free);
-       gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item2);
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.4.8.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.4.8.ebuild
deleted file mode 100644
index 8fea2b407de6..000000000000
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.4.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xfce4-terminal/xfce4-terminal-0.4.8.ebuild,v 1.1 2012/12/28 03:24:28 ssuominen Exp $
-
-EAPI=5
-MY_P=Terminal-${PV}
-inherit xfconf
-
-DESCRIPTION="A terminal emulator for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/terminal/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-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 ~x64-solaris"
-IUSE="dbus debug"
-
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=x11-libs/gtk+-2.14:2
-	x11-libs/libX11
-	>=x11-libs/vte-0.22.5:0
-	>=xfce-base/exo-0.6
-	dbus? ( >=dev-libs/dbus-glib-0.88 )
-	!gnustep-apps/terminal" #376257
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable dbus)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS )
-}
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.6.2-r1.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.6.2-r1.ebuild
deleted file mode 100644
index 7a888ba77192..000000000000
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xfce4-terminal/xfce4-terminal-0.6.2-r1.ebuild,v 1.5 2014/01/28 14:17:01 ago Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A terminal emulator for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/terminal/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-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 ~x64-solaris"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.26
-	>=x11-libs/gtk+-2.24:2
-	x11-libs/libX11
-	>=x11-libs/vte-0.28:0
-	>=xfce-base/libxfce4ui-4.10"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-fix-up-the-encoding-menu-creation.patch )
-
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS )
-}
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.6.2.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.6.2.ebuild
deleted file mode 100644
index bae9ccc2655f..000000000000
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.6.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xfce4-terminal/xfce4-terminal-0.6.2.ebuild,v 1.1 2013/05/05 19:14:12 ssuominen Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A terminal emulator for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/terminal/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-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 ~x64-solaris"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.26
-	>=x11-libs/gtk+-2.24:2
-	x11-libs/libX11
-	>=x11-libs/vte-0.28:0
-	>=xfce-base/libxfce4ui-4.10"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS )
-}