Version bump; drop old

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 0x2B2474AD43CE296E!)

4 files changed, 17 insertions, 73 deletions

diff --git a/app-i18n/fcitx-configtool/ChangeLog b/app-i18n/fcitx-configtool/ChangeLog
index 718d4e7ca1d4..f702e7a5e819 100644
--- a/app-i18n/fcitx-configtool/ChangeLog
+++ b/app-i18n/fcitx-configtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/fcitx-configtool
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/ChangeLog,v 1.18 2013/05/10 07:16:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/ChangeLog,v 1.19 2013/07/24 10:32:22 yngwin Exp $
+
+*fcitx-configtool-0.4.7 (24 Jul 2013)
+
+  24 Jul 2013; Ben de Groot <yngwin@gentoo.org> +fcitx-configtool-0.4.7.ebuild,
+  -fcitx-configtool-0.2.0.ebuild, -fcitx-configtool-0.4.4-r1.ebuild,
+  -files/fcitx-configtool-0.2.0-fix-gtk.patch:
+  Version bump; drop old
 
   10 May 2013; Patrick Lauer <patrick@gentoo.org>
   -fcitx-configtool-0.4.1.ebuild:
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.2.0.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.2.0.ebuild
deleted file mode 100644
index 4a6beb1d1b10..000000000000
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/fcitx-configtool-0.2.0.ebuild,v 1.5 2012/06/01 00:16:10 zmedico Exp $
-
-EAPI="2"
-
-inherit cmake-utils eutils
-
-DESCRIPTION="A gtk GUI to edit fcitx settings"
-HOMEPAGE="http://fcitx.googlecode.com"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	=app-i18n/fcitx-4.0.1
-	dev-libs/libunique:1
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	# fix dependency on gtk+
-	epatch "${FILESDIR}/${P}-fix-gtk.patch"
-}
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.4-r1.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.7.ebuild
index 582f5d5ef3fc..0b2901602dba 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.4-r1.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.7.ebuild
@@ -1,32 +1,30 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/fcitx-configtool-0.4.4-r1.ebuild,v 1.1 2012/07/19 09:07:21 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/fcitx-configtool-0.4.7.ebuild,v 1.1 2013/07/24 10:32:22 yngwin Exp $
 
-EAPI=4
+EAPI=5
 
 inherit cmake-utils
 
-DESCRIPTION="A GTK+ GUI to edit fcitx settings"
-HOMEPAGE="http://fcitx.googlecode.com/"
-SRC_URI="${HOMEPAGE}files/${P}.tar.xz"
+DESCRIPTION="A GTK+ GUI configuration tool for fcitx"
+HOMEPAGE="http://fcitx-im.org/"
+SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+gtk gtk3"
+IUSE="gtk +gtk3"
 REQUIRED_USE="|| ( gtk gtk3 )"
 
-RDEPEND=">=app-i18n/fcitx-4.2.4
+RDEPEND=">=app-i18n/fcitx-4.2.8
 	dev-libs/glib:2
 	gtk? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3	)"
 DEPEND="${RDEPEND}
-	app-arch/xz-utils
 	app-text/iso-codes
 	dev-libs/libunique:1
 	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
+	virtual/pkgconfig"
 
 src_configure() {
 	local mycmakeargs="
diff --git a/app-i18n/fcitx-configtool/files/fcitx-configtool-0.2.0-fix-gtk.patch b/app-i18n/fcitx-configtool/files/fcitx-configtool-0.2.0-fix-gtk.patch
deleted file mode 100644
index c117fce51a1f..000000000000
--- a/app-i18n/fcitx-configtool/files/fcitx-configtool-0.2.0-fix-gtk.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- fcitx-configtool-0.2.0/gtk/keygrab.c	2010-12-17 14:16:14.000000000 +0800
-+++ fcitx-configtool-0.2.0-patched/gtk/keygrab.c	2010-12-18 18:24:33.345000017 +0800
-@@ -101,10 +101,10 @@
-     guint key;
-     GdkModifierType mods = event->state & gtk_accelerator_get_default_mod_mask();
- 
--    if ((event->keyval == GDK_KEY_Escape
--            || event->keyval == GDK_KEY_Return) && !mods)
-+    if ((event->keyval == GDK_Escape
-+            || event->keyval == GDK_Return) && !mods)
-     {
--        if (event->keyval == GDK_KEY_Escape)
-+        if (event->keyval == GDK_Escape)
-             gtk_signal_emit_by_name(GTK_OBJECT(b), "changed", b->key, b->mods);
-         end_key_grab(b);
-         keygrab_button_set_key(b, 0, 0);
-@@ -112,11 +112,11 @@
-     }
- 
-     key = gdk_keyval_to_upper(event->keyval);
--    if (key == GDK_KEY_ISO_Left_Tab)
--        key = GDK_KEY_Tab;
-+    if (key == GDK_ISO_Left_Tab)
-+        key = GDK_Tab;
- 
-     if (gtk_accelerator_valid(key, mods)
--            || (key == GDK_KEY_Tab && mods))
-+            || (key == GDK_Tab && mods))
-     {
-         keygrab_button_set_key(b, key, mods);
-         end_key_grab(b);