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

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

4 files changed, 26 insertions, 47 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/Manifest b/app-i18n/fcitx-configtool/Manifest
index bc6180550056..38014a2faab8 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -2,17 +2,27 @@
 Hash: SHA256
 
 DIST fcitx-configtool-0.4.6.tar.xz 41992 SHA256 8d64107f9f12b4f2cbd82e40b87a2dc4dc76d0ff854481c1103d5e9a2c2e129d SHA512 946bceb77fc6d14210154d9264c86d3333f910893cf3054f65eab72641421847e8ac003889b742f4c28f74c8ab1cfbcfb82abe35ea83ca2548cfc1decc92fc4c WHIRLPOOL 58f8a420f6c98cb6d710bd05d8ca2a3ca48a115015e6de98b105bf71b59bf3dab34eb63009d763dc7a3554fa6ec0b442e8bb277f890230dd94ec371397a6766c
-DIST fcitx-configtool-0.4.7.tar.xz 46760 SHA256 712460a726c921545e9678be15a549061b1751d587f3eb2b0b0bdf6b2cba9f55 SHA512 90ec9f4c30c46ea937f965173a4213b67d1cb360cc43b96af9899cdd5a0e35d34658ee7149ed10b3dc58d3851bc1712915db970fd2d25a976983b1037e380be2 WHIRLPOOL 08fa41820f159df512c55f6dda616e5eff7e0e0d2b401507f03227dac2e3c9bbf7d347f351046fc247379110a267f15aff433c315a91706dabb479f0c8b92070
 DIST fcitx-configtool-0.4.8.tar.xz 47196 SHA256 0ebc06d9d325fed096e9cb61fe53b82000d2de0e9aefe5945ba8f0aa2ca851ed SHA512 7b3c43b9d7d1dab04880effe6fc4e80e64c9bad34699c0c8d2992ec971605ef2eaa0b1fb13f71a582289c75560c3edc95af21f6413ac2bb594d5cdb31a0b4cb7 WHIRLPOOL a1817bcc9d6bdcd96e66dbe71d44cb66d6b66802e366b8f21d5f922495176463fc23adff2bbdbfb4003ddcef43839fab06715231fdaada8714eec1e3a073f18f
 EBUILD fcitx-configtool-0.4.6.ebuild 866 SHA256 89eb161d3a94a22151a4c75402a521a7cdf54d088947566ddafd2c83d2c59fbf SHA512 ca2ca88148ccf3ba95a6dbd00bd9ab4d263504475ca4b91886588740f7781f29dfe668b9b04c99fcd513b6c88790388cae19bc1c12fdc01b2765d85520717ef5 WHIRLPOOL ef7b191acf61ce8de5b922ebe3624e65565c5c3c6c30c766ac6fbe18bca45c9d87529e46f0f814f512f7ce720317da818586da0711e30547629a36ff219b448b
-EBUILD fcitx-configtool-0.4.7.ebuild 869 SHA256 887fafda56617cdc1058779e99dab58d37554468d7ddc68880997f09725827b3 SHA512 3b49d1a75a1fc93d67756f96b83c4944776fa1c13ee9401050588e738a9889a1c7235658e711e085247bca4061082b6656ea28faf83e77e27a78205f7839f219 WHIRLPOOL 917a47060a722e48fdb4abeccf6b5379e7a43cf2dbf14bdf797c5cd491bf6684e605df4a65e6bd510ccd6296f84cf73abee80938e46cd0d826c0b65eb9aee83d
-EBUILD fcitx-configtool-0.4.8.ebuild 864 SHA256 8f727d70cad80e96b28897b5f470e369569202e5d357b3820569241dbecd3e7f SHA512 50fd161fa427bbadd6d77da0b566c94575bdc723a08ed63e213104173f3c339919e38504a59fce2ddd332120aae215cef7c24eddc9be9c28e21190fc2e912a2a WHIRLPOOL 232f0ea2c7a0f85f0dc8ebc55ed4f031e1916f514b6c256b46984516291bdda0a3a4f35db43ad9945edf08511dfbf943d25edfa11dae0d6aa9052b1f121c6df7
-MISC ChangeLog 3973 SHA256 6c17e7ffe062ada0cc69ff3be7896e8ef535a4febf125c525d27353d00b1ed41 SHA512 9e0a09087e41fd0824df3d2ec969e55db58f0c13ed965debf232a28815dc49a84001067afc1123ba6615c71b4f4e707b85563ca06f81572bc5ecda08594b2322 WHIRLPOOL cb2f91afaa0d118d03337b20fcdbf71b6eb26eb002cd25dd47d0c4f06fd694bde6bf615bf200e2a885a17907c142f5a112f06c01cecb18a1843c23c8d1fe0d64
+EBUILD fcitx-configtool-0.4.8.ebuild 865 SHA256 ed1138f384a0dd71770eac66fc06bf5713f22679b53ef7568b37f5fb9b4a23be SHA512 69120c22e67010e376ed920d10346c9f0700f023ea80b9c23ecef5075bc0f72af1c8c1c4fc29cb9ace616d13f4f8f9d83342798188c42c4857a38e4ad14d41d0 WHIRLPOOL e2713aafb48707d63de39411535ee2bbdc7739c8efc09aa70a918c6fc07b52567bea94b303047666665bae10aabe09694f9de594fa2d9402c3c24e67cd1b8697
+MISC ChangeLog 4140 SHA256 3fb8f913ef8c9e6247e9448533d12100068e80be5f1cbaee681a733db0833507 SHA512 79a7093f5d416af55fe8eb4b3231b7daba39db02f553e4ce7341cc0d80996b825e46e95b0102233b576312c2796f8e03cb6f0d9c649305520b258f4c1b1ecff8 WHIRLPOOL 64835068e1eb6987ccccf7a850f885f131ab929d27e2a6f5ae9eb65406a204f27295a427f232858dec42e7e763b23d22be9e3396b80401e62e8c8935d443594d
 MISC metadata.xml 297 SHA256 05d5d392294efda711084b8e637ce9470a7c941defa88892b64e1f68a2afad61 SHA512 7bb93e466ea0c8fac5a8ca397e5c5ba8beb013ab49043f5d0939388dc32aeb2a917baa2e114ea7e7a0fd68853f64e9993a7a730cf2527952e1caa402033a5c5b WHIRLPOOL 604c45ec89fc7032340f10b35aa7841a2db03655407f1e2fabf67a07368509ac02c964a318eb97c3c718c42a9f0dd4c0ccc6baef0717e2afe1ad7be0e1b1c931
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVDD78ACgkQVWmRsqeSphMZtwCdEkAFCJBuTJNZVl+aDUXs5Ff/
-2LsAniAEbuArRY/L9SGG3IG5yph0K0MD
-=rQ4L
+iQJ8BAEBCABmBQJVTgnpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOiYcQAKFhKMwqvRyaWECizCX6Mq9u
+cbxs+5B752K1U+BhB02bI5kkJxQ+53U5VU+QE2UjjnTImtIZ3efTHmnbNUWRhop1
+aoCRudrvhLLcwr9DmVtXn4pobXq1Byg74eKtU2EcEKkgQ8tI553xu5RKoyOBqlMM
+inH2THU4MdlG+cKhSmGJnw11ZJANUpnfAX4voXwCIhy/qUGUmGyPJv/Mj1aLkrJz
+9FP7C/HpyV66VjNAtix8rrbuN5pijDzyVYV7fp8t9ZNzmo1aks7HIXhxVrVlOirq
+gwVrSop+NwZ4qox21TKiIgauFnTnVHaoUIf8aAyi1Hg4qAT6wcHq0oxLJgJeynBw
+dk5jG5JREmQ7DF/rg4lE/I3USd1isyZr90+0BHFv0cH6R86vWgkUeqLhFp3jgAbH
+iaqisnYuycEg/0THrK0RSgRkTUA0x8pI8qq2de5ZHbE50OxPIQEUnZPpmspu1d1j
+L85MUU9Aac3im1YQ5jHMQJPJgGHbXTt4NOZpPdaGJ6XFlFJindK/kTA1lIwoFD47
+6BYE4HKD30ZTV7+UvbAJgIFlFdQfpEm2n4DNOANbbOdslN9+4eD+F4sjs/L4LlJk
+33PtKq/6lL5m3GPFWkM0m9jZivFYxcO765YoauQVdh+HI62a/fxVHjclq/CND3S+
+nhh0eVZ7XHkuFLYZCXVN
+=E9Xz
 -----END PGP SIGNATURE-----
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