old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

6 files changed, 15 insertions, 170 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/Manifest b/x11-terms/xfce4-terminal/Manifest
index ab52ae615d89..5b2dbc8c9238 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -1,30 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch 2124 SHA256 3bc52a037b029c516a87dc69cfe49a2a28a5f58ee1d0ca4cbb5b60c7e3505efe SHA512 a65828e07f8bd63a586941604294357a63aa1e7ca38fcb9ce828e79cec3508c97d75f54982274c22ada834efec59cc861fe14b7acc5c4656794b1350f04ac041 WHIRLPOOL bb2e74e5fffc97b253281f77a8ab950c9dbe965f39f45725548f50904ac836d6cd58104cf8d123c20162c22ae8a8078a7102b0a9b36f59f95a70ff34cd7e7def
-DIST Terminal-0.4.8.tar.bz2 1585791 SHA256 fe5db0b7127ce87efa1e10f44d8915be88005b6ce4f0bfea6b64533e25cc788d SHA512 ce9727aac2a3f2c8abe6bc748067169e9ca1b451984e4177434c760be19633e7eefafdbaa3a73806e2cb0afa2739c54be84bc13c2b54539fa098ad4af0ff923b WHIRLPOOL 31408b4ec3625359f32d0440289e413aea6d9cd227c8e67c5d73c247a5cd7065eea0bb61d4554f2c92d51ee1b6084e49f8026a8f19afca60ccc2ba61fe87bdbd
-DIST xfce4-terminal-0.6.2.tar.bz2 840182 SHA256 3d92422288d26311880af694bb4e02c9235997ca307a5e85001bf6bef65c3b35 SHA512 06289c15849b0bcc68cdbbf699abc05571d5da76f7119e20a84c84f95defbe4c2dcd88ce4af6be563877a0f0d1bd4d4520c4a986b6cee02bc84428d2ad50c4b8 WHIRLPOOL 7bb40f82539804337e0a0d48b044aed38f3b0262c232bb767f4d6f0a70ef326011c513d0e2f6f0a4193df079de4f7b168747fa355297223064afb6019f20a7df
 DIST xfce4-terminal-0.6.3.tar.bz2 815207 SHA256 912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08 SHA512 805390b75178b3a2fbff4f8dfe972474e5575ad5a80aaf775f7b4086f975cf5b444a335b1ec1a9a39bc89642c71e1d0cb1bbc14d96b913980bd231d32a081c49 WHIRLPOOL 199f305ae3996eeb5797dbc3fbe07f459c577bfb5a259c3ce820b2fea87ef92593ed26fd82745b7266a6e8801aef61c5a82ddd0f7e9cdc3f3c741e58ba37ed0a
-EBUILD xfce4-terminal-0.4.8.ebuild 1077 SHA256 56194cd9007be6d704ba9793624a44b03e48d980f32d089d588015e025192b65 SHA512 bcad9cb94857573cb3f218eafe0ca6acbff3fc4c05eb67fd89be491edd0a79dfe97d9e8f294293ff38bed2ad21f71dba26bc8179fcb5d7a10aa80ede1b4409d7 WHIRLPOOL 38e62b3f4654f9eeecedba3be4c0be7b11aaba92356d8443bb7d97c188159b0ec9c196c1f24100b5160b44db46b4cf2dec17ecbaa612e8bd3445a8242d8283b9
-EBUILD xfce4-terminal-0.6.2-r1.ebuild 1012 SHA256 029ccc9cf0d5b678c1383724cf1ddeed4e178035639251f6bb14466d037e55f4 SHA512 a56e85dac5e101da27457c2c11b17ef7de28a601c370fb2691a68ea9fb5601c6016032f2cce003fb83df7d79f6f06bad81252d9bf0f0df942bab1d0019afaf76 WHIRLPOOL 754ce3346a0fc15c96e7c4089baa6ac0eff9ac23f481d38c63f176e309c4603bb91805e818b6983ba4dbd1f1642a2b50fbd553e6d6ccdbfba4bcc1d5de8d59d4
-EBUILD xfce4-terminal-0.6.2.ebuild 946 SHA256 f0b835e9771bd11e8d42437279f531d9149d6d1101fc0abb87f8eba2b1284f7c SHA512 2b8324338b5a570a28534d9a59bdb4c0acc2c7b113461e8992af2b18dc3512bc1c5f6b3ef720a0716b870f13aebdbc3c1a17cc461d4c98e7f6ca399e48d4e1fb WHIRLPOOL 4ccaf753467621dfe0170f8dd5b615923d9ccb7e592fb5982112e53c0221823ea1557824ab1f8ea8a2dcd9ee8c139e52e374aba3fa1e210e55eb4782be6216e4
 EBUILD xfce4-terminal-0.6.3.ebuild 932 SHA256 3ea9c629ebc95b679680472ec2efbde2fabe6d662accda3082c4e1c9f13a44ff SHA512 662c00c3114300847415d90416d5b3e68808416bfaad5ad46957b8ac38883df30e1c2f6c305322808f73c1dfd6133e32305de95b11c2acb93a5a2cc8a3fbfdd5 WHIRLPOOL 90523c616c00aeae05420d8bb7517ffee151f3ec45c29dbf056a02d1714c4303206956525979cb6973228e956105135b6df78408bd487d33117bb9c13739dd70
-MISC ChangeLog 18953 SHA256 c763dadbcca222779e15d39a475339641b3287fc4fc6b7168556031691d2678c SHA512 9ae6c3d40a4d20f0a31de5e7e9771208b8d30b3d18f9bfac5f5636159866d84df1bf873c7879184cf334da9a66f7ac1d21547decf77faf72c1493795c3e14393 WHIRLPOOL 70ce2947aba3ff031f778c78dc6ca086c4ee93e821b6c846b47e1e6a39279c5fcfde75a66f39d05f74939c74fc550f482b25822f25766bdf4201daee84341fc9
+MISC ChangeLog 19188 SHA256 a87acdd3e63be17111538f409ab4b5258ddde22334504118b1340743be7fb46a SHA512 3bea5d4d0f6ca077dea3c505641d2bbfd4d90e83cda5b7e4468bc90b0dbd495dca7d65b4f85e1ed218eea3fdebcca00f16f6a9719ebbf2acf3b8378e0c9ae9e3 WHIRLPOOL d32ab00400a9a7a79ca4e45644edd56cffb1bd992e48ae09088fe115be56a327d414f22c11ee2bb836f96bef03894dc26ec3cc2f60e3642fed452359a4a28094
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTU4pJAAoJELp701BxlEWfJsMP/RO5Pjd1t47i4kWByRxeOVXm
-b7gXkyTHHTvCsJmJ6ohOCBNHBLJ1Daf0quUGaG5t6ikTO+CvyGx0i5A98Zcuzhde
-m6h9j0P3Ctsl2GRKZRBCFB6LvZKzkSBPaF+nd2+HjWrhiLJTZsr7e3Rn4o5gZZUC
-jp6mNsZn2Be29A8DCnUeyve/1Uy4OQtp1mBUG739mQBWIe/hkr26njigVW4O6llh
-jJaydGf0g9DpXRd4FXJzexYbPvpNOaEIvoyNV8Th+jvFvioSbc9umA8MDre/Y6p/
-djX3gpc6NarctAKzsGNBl4vDshC+6OILSmPidC0S/bHze/AzOCbs7uvJ07tqjrD7
-5Oc6ObxYFCh8FBRjiytXrHOtTqvXH0fSvAQz+mm4NkhtIp89J6bA/IybR52PUjNO
-JjUg4SI3It8qQE69zAADZNt5f+MeEATwOS+QGu/hq4y+jsO308AQerHQ1LOBOCfs
-onkVNh9JkjcS03XlRedSrP6s70FepPq65IvRpCP5swJMfcmmUb5yKj8e/G3wOurf
-s//isHXosLTACY2uYrQ3lZ7ViDM1ugfpSCkPTp+f4xVOAhsgJjjX08gCqWA+bPZg
-jgj4xCOn/luO8qKhKChT1CqOxdpiS5x1hfUWsDpcRuHrxBhNdN14MUMo2bQwBWQB
-dhaoQf8H4NY60HNN+hNs
-=ry/u
+iQEcBAEBCAAGBQJTVnSdAAoJEEdUh39IaPFNBuIIAJQs3KG4F4DVra2aFJZrCvmq
+bjvX8fnuRyunPMoA6ZDmaf+O9cMfS8l6728gj+cLmhy99z9vBmHKB6D2w+KO88Hm
+VnWNFrp9UG5IEprl8xWq6SmzuZh7bA+ZC6okd30fWZmuolUR+TaUvqI9+RYHWoYl
+FaW/br0yB5fz9zkt62YfDAuIsns3fcj7Dz5IT3SQPYXxKV9efHWJhcqYS/1JE5vv
+PCULK1/5lSSfXDOtXJKFMTwC3cT5ChQ7t/cbzjmN8nHJ/i2lmroHd5ksnVnC4Lu1
+f02ONe0Xe08S8zsKu9omleCKCtSZF/jufvBvK5xWsLHAOpYSQWgi5XOQ6+02w8U=
+=GSQD
 -----END PGP SIGNATURE-----
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 )
-}