Mark stable on amd64 (bug #540844). Remove old.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)

3 files changed, 8 insertions, 39 deletions

diff --git a/app-i18n/fcitx-configtool/ChangeLog b/app-i18n/fcitx-configtool/ChangeLog
index 0d41db7e64b5..40aabd601cc7 100644
--- a/app-i18n/fcitx-configtool/ChangeLog
+++ b/app-i18n/fcitx-configtool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/fcitx-configtool
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/ChangeLog,v 1.26 2015/05/01 05:31:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/ChangeLog,v 1.27 2015/05/09 13:21:40 yngwin Exp $
+
+  09 May 2015; Ben de Groot <yngwin@gentoo.org> -fcitx-configtool-0.4.7.ebuild,
+  fcitx-configtool-0.4.8.ebuild:
+  Mark stable on amd64 (bug #540844). Remove old.
 
   01 May 2015; Jeroen Roovers <jer@gentoo.org> fcitx-configtool-0.4.8.ebuild:
   Stable for PPC64 (bug #540844).
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.7.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.7.ebuild
deleted file mode 100644
index 51d1e585ffab..000000000000
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 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.7.ebuild,v 1.3 2015/04/19 11:58:33 blueness Exp $
-
-EAPI=5
-
-inherit cmake-utils
-
-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 ~ppc ~ppc64 ~x86"
-IUSE="gtk +gtk3"
-REQUIRED_USE="|| ( gtk gtk3 )"
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	dev-libs/glib:2
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3	)"
-DEPEND="${RDEPEND}
-	app-text/iso-codes
-	dev-libs/libunique:1
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_enable gtk GTK2)
-		$(cmake-utils_use_enable gtk3 GTK3)"
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild
index 5317ffcaf517..02fba4c23e12 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2015 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.8.ebuild,v 1.3 2015/05/01 05:31:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild,v 1.4 2015/05/09 13:21:40 yngwin Exp $
 
 EAPI=5
-
 inherit cmake-utils
 
 DESCRIPTION="A GTK+ GUI configuration tool for fcitx"
@@ -12,14 +11,14 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE="gtk +gtk3"
 REQUIRED_USE="|| ( gtk gtk3 )"
 
 RDEPEND=">=app-i18n/fcitx-4.2.8
 	dev-libs/glib:2
 	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3	)"
+	gtk3? ( x11-libs/gtk+:3 )"
 DEPEND="${RDEPEND}
 	app-text/iso-codes
 	dev-libs/libunique:1