summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-i18n/fcitx-configtool/ChangeLog9
-rw-r--r--app-i18n/fcitx-configtool/Manifest31
-rw-r--r--app-i18n/fcitx-configtool/fcitx-configtool-0.2.0.ebuild30
-rw-r--r--app-i18n/fcitx-configtool/fcitx-configtool-0.4.7.ebuild (renamed from app-i18n/fcitx-configtool/fcitx-configtool-0.4.4-r1.ebuild)20
-rw-r--r--app-i18n/fcitx-configtool/files/fcitx-configtool-0.2.0-fix-gtk.patch31
5 files changed, 42 insertions, 79 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/Manifest b/app-i18n/fcitx-configtool/Manifest
index 661fe5054437..18e591d5a490 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -1,9 +1,28 @@
-AUX fcitx-configtool-0.2.0-fix-gtk.patch 1137 SHA256 f2bf4bcd51cbcc6b7f4cb4eb6d0d8e8b276858217ad4ea3b254e4bd171ba5405 SHA512 199f09691c1168f687290c99c2adf20a4fd080178d41a2b9465a3c13f707597d47ef68aadb93ad36160b92bd54c634fe90adfd5232f7b2e456314bfedbb9c08b WHIRLPOOL 9e9ffcecfc0d1b5188008c51aab025eca22b4edfb6df38c1a920d104ea32afa434445381c69d299db4ef8784d222e08d8e5498bb071b035849914ef4e60e6edb
-DIST fcitx-configtool-0.2.0.tar.gz 37435 SHA256 2c309f2df500cf7c1b0d13b446a69e3513a11588025a2f648b18b684cc2320fe SHA512 5f3de55c05fb554077013fe42aa768e951e4f15883dccc3a16167908b6255930088f1070f8a77a0b39ffeeb99f24030e158742d6f2016b1695459feba40b4036 WHIRLPOOL 68ac721743ea7569124f4ea0aa542dd19ade25377c8006e94867e38625016efba18d9b046f28e5b3f59cca6de9594b73903459bae101a22eb85f4b27556c44e4
-DIST fcitx-configtool-0.4.4.tar.xz 37764 SHA256 66cae23c1e1555a5e8e8cb8696e562b0b58d28e16d2f0b9c64a0f274a6c06745 SHA512 13e645da728e85d243539870a0f452c436a023300c2552560299d139ddbe4aa4242ef5ad8ba864d2f6a19811572008664df861024d92e48132e1cf140bf0b5e5 WHIRLPOOL 0a810b768e3da830492fd6c59824fbd2a24bb896feb26d2525b38910b2ce71da5613f74cf4c309d9aa1514024d918dd3233c7472c12c5e61015fb861f9dc1305
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST fcitx-configtool-0.4.6.tar.xz 41992 SHA256 8d64107f9f12b4f2cbd82e40b87a2dc4dc76d0ff854481c1103d5e9a2c2e129d SHA512 946bceb77fc6d14210154d9264c86d3333f910893cf3054f65eab72641421847e8ac003889b742f4c28f74c8ab1cfbcfb82abe35ea83ca2548cfc1decc92fc4c WHIRLPOOL 58f8a420f6c98cb6d710bd05d8ca2a3ca48a115015e6de98b105bf71b59bf3dab34eb63009d763dc7a3554fa6ec0b442e8bb277f890230dd94ec371397a6766c
-EBUILD fcitx-configtool-0.2.0.ebuild 712 SHA256 e909ac14ff2780893b6a4b3124125526337b97c95ddc804cc91964076be72b79 SHA512 a11cda53dd78bd13e147a45b61e4865069277953e015381777017ef34a3bfe86c89ce46511615ae3d65441e3d74e9894e551fd4b9ddc69b4fe922f142b570e2a WHIRLPOOL fd9e0028635631b27250f2d5012a67954d73262aa3a4e0f395f60baa1bbe44c8782861245c8fea37e529f08571027b69e3f2e554bd452393007cd525056ef21f
-EBUILD fcitx-configtool-0.4.4-r1.ebuild 881 SHA256 fc5c0cde2972d5557543fdb48cd04e8ad7a6ff231daaca85506bc529e57f75cf SHA512 bca4e31cf0e809185e35a6e9f7ec8de9f23abca850b75683c5037254a6b85c0267cbfb1dbe5220829bdec98b7762697f426d31fa087a822e9bcf9eaf48ae9967 WHIRLPOOL 8ec1452a7fce90e79f8779d2d92fa1c0f8b4b408f9b3a9f5cc1b04e81d59631f9e0d35e6c3d354c8350326fb5b7f5ce1886ece5fd3d0c8fe759d57dfae39f1e7
+DIST fcitx-configtool-0.4.7.tar.xz 46760 SHA256 712460a726c921545e9678be15a549061b1751d587f3eb2b0b0bdf6b2cba9f55 SHA512 90ec9f4c30c46ea937f965173a4213b67d1cb360cc43b96af9899cdd5a0e35d34658ee7149ed10b3dc58d3851bc1712915db970fd2d25a976983b1037e380be2 WHIRLPOOL 08fa41820f159df512c55f6dda616e5eff7e0e0d2b401507f03227dac2e3c9bbf7d347f351046fc247379110a267f15aff433c315a91706dabb479f0c8b92070
EBUILD fcitx-configtool-0.4.6.ebuild 855 SHA256 9f551ada1dd8cf72d9661dd187e0a7b09116460206a40aeec3f4cf469e0b4b5e SHA512 e7c871d50d57ab76ba8d05da7323e46fe4d1695ad9710d9f229e8816d2d31321c518478c5f6f31ed181ef3fc91838f12d0909ea4eb461dc96bb087a622f318b3 WHIRLPOOL a7c56991c9363aac294de3720b2642e9c833746211795aad253515a061fafb83ead9334e11f49b7251a2bcecd34e870aa05fffcadf15e0a57885e164154d61d6
-MISC ChangeLog 2822 SHA256 5ba51a1edc8e30863d5e87971393cbdfc97facd1b4f16f87179d722356a214ae SHA512 109dc65f6f1ac38a5c19480705fcbb320221c8b2c8913091763c8880ce520d66d92fe19622e432ae78e9d4c3cd59f321a27e97770b5ae8c523ea0b29b2c9411f WHIRLPOOL 997c4568ddcebb2edb39d24b3aadfefee5ddcd27e15c2d555e2cf34023235c72fb5d206563bb7d2f63e02dd1f3aa32ed43a60804806c1cf712b52c57aaecb8d3
+EBUILD fcitx-configtool-0.4.7.ebuild 856 SHA256 cc8e4eeec7ab03305a795020e105036799c1976c60e974480b8b45e025dcf0dc SHA512 028ea44bc0a4a27fdd7af5238f3033a716790e9457de60867e0b6cc53db45d9db6b8d240f5f091f023e910892f38a2cad7f7eeb73351f2161ddbf8e4d5ac5f06 WHIRLPOOL c01c6c8eaf41f504068dca6b7dac8740576f66ae07c23c624fc1a36b3ef63a4067ab5f0d382ebe1e6d9bf72ac669610566c24d7c785e3a796d35c2a5d239b5d0
+MISC ChangeLog 3082 SHA256 d8e64ab3ba40566e42e365028b968a176cbe39fed2b9f50722aad2e1b6c1f478 SHA512 9f6e0fe9a71970bd7ec3f16cea484622eaa752f79ee0c0b8e361689f0104eb734c138f4f52b435c1fc020bd44b2e59fa86c3b221c34e37cc5a425690deb34211 WHIRLPOOL 6423ed5cf370616c244db2e3723b2c288be046258e747d70a3edf03a2e6714bc5102916a531969a8424ceffe6c14c97f7558a0e4f70e70f065664307588ff160
MISC metadata.xml 297 SHA256 05d5d392294efda711084b8e637ce9470a7c941defa88892b64e1f68a2afad61 SHA512 7bb93e466ea0c8fac5a8ca397e5c5ba8beb013ab49043f5d0939388dc32aeb2a917baa2e114ea7e7a0fd68853f64e9993a7a730cf2527952e1caa402033a5c5b WHIRLPOOL 604c45ec89fc7032340f10b35aa7841a2db03655407f1e2fabf67a07368509ac02c964a318eb97c3c718c42a9f0dd4c0ccc6baef0717e2afe1ad7be0e1b1c931
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQJ8BAEBCABmBQJR7603XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
+QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1DziluWwMP/0d4YSMk1JpAJ5yN/9C19q+4
+aG3CxTW7mhHEobzuydTb8zrUcyXfNmn7CEkpUftj65z1yLaFXJRJmczPgeitxXzs
+W5vfbUHrNYN+O6jvM7JpHiIOMMWEVVYNrTHRfVuCBdx/gd1RgPpgerG77+pWBbmG
+5QgA6SyIku31y3KSrxVVtZ1BgQi/pz8OLxUvad7TWeNiqL5KgOPSw9bD4jC6y50x
+LoPj/Mvr33Ua5IIVuwkRMkAlp/1pzOV1I1qH7a0b6pxbX8IPtXEFXVmjz3lYU2ME
+Uo6pEwOg4hGZfXTjTPpvFRn68ABr5Kojl0dSOCEjrWwrPZu2q34grzftscS6f0IU
+RXMmPgopVRHiiEvv7wXlJi6bTn82TES9raKJtvW0w3BR3qPFZoPxLpNcZ/BxOCyK
+IWkQbP9qGGwgCJH/GqbdFUzwRfB+IKpncrN1q7GmucpY8CyPyd9270odibs0R+0f
+6tl2SFDttqQUJfvxNOvCZUR08V4T1RAYtxcF8LUohIkB/JAIIYZ34w+APxITOFBi
+4MtieNjbwHatRX1BL5j4Ajs+0Cl5Qay3KxsBDjuA/Ky46PCxtpjaT6Vrilb1L5t0
+qyjRMzfenl9lIJxQqVCeMAIH3QK/ruVJFNaPZSsaGEw/a1MOeLF0hIw/UULHv2Im
+sHUK0i6QjJbqMuA6HQGs
+=RC0u
+-----END PGP SIGNATURE-----
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);