Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-fbterm/files/, app-i18n/ibus-fbterm/
Date: Sat, 05 Aug 2017 13:26:17
Message-Id: 1501939541.e8c56f1ea9f9e7c54eb43b1de80db5d089036023.hattya@gentoo
1 commit: e8c56f1ea9f9e7c54eb43b1de80db5d089036023
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 5 13:25:41 2017 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 5 13:25:41 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c56f1e
7
8 app-i18n/ibus-fbterm: drop old
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 app-i18n/ibus-fbterm/Manifest | 1 -
13 .../files/ibus-fbterm-0.9.1-ibus-1.4.1.patch | 23 ---------------------
14 .../files/ibus-fbterm-0.9.1-ibus-1.4.99.patch | 22 --------------------
15 app-i18n/ibus-fbterm/ibus-fbterm-0.9.1.ebuild | 24 ----------------------
16 4 files changed, 70 deletions(-)
17
18 diff --git a/app-i18n/ibus-fbterm/Manifest b/app-i18n/ibus-fbterm/Manifest
19 index 0bf7976e91c..beadb407202 100644
20 --- a/app-i18n/ibus-fbterm/Manifest
21 +++ b/app-i18n/ibus-fbterm/Manifest
22 @@ -1,2 +1 @@
23 -DIST ibus-fbterm-0.9.1.tar.gz 106808 SHA256 98437db4d5d15bbdca3e4b0a08f1bd1be544a305aa1d0f65fedb81b871da2e7c SHA512 7f5bbb0ebf5ad12f3bdccb7966cb1ff7f40f8ebfb94a5767e0382ef5eee24f22021a428ac8073e987c43f32d67cfb7922ffe63666d88dcbd56cfdbcd36f3156f WHIRLPOOL 110e38beadfd64e75b6a40b9885b8aa1dec30771aeaff5dcd4c0f7403d24faa63b6a72d6a3fe79ec3fc1eb09e0f5963dee85664d41849ce3d723e4996ef6ebff
24 DIST ibus-fbterm-1.0.1.tar.gz 244979 SHA256 5b80262a02433d73ee01753789ba21a8e3e5a2deac7b506cb0ba16ecdb590a33 SHA512 6900a37444f15820cf383dd928107fd900f1677d8da5b4cc318e97b1227d412e098e8d476194da77fd4968b296729dff79a9c51d289b82e3b9a9485a05754f04 WHIRLPOOL 6ec061d7f6ff4918f009c729ada2745b4fb83ec77a831a4a740d615df3fd59d3268707a65b59477636de2b92793e04effd92e87b4f6541f64b9026c1c90c64cf
25
26 diff --git a/app-i18n/ibus-fbterm/files/ibus-fbterm-0.9.1-ibus-1.4.1.patch b/app-i18n/ibus-fbterm/files/ibus-fbterm-0.9.1-ibus-1.4.1.patch
27 deleted file mode 100644
28 index 08508c23180..00000000000
29 --- a/app-i18n/ibus-fbterm/files/ibus-fbterm-0.9.1-ibus-1.4.1.patch
30 +++ /dev/null
31 @@ -1,23 +0,0 @@
32 -diff -Nurap ibus-fbterm-0.9.1.orig//src/display.c ibus-fbterm-0.9.1//src/display.c
33 ---- ibus-fbterm-0.9.1.orig//src/display.c 2012-06-06 17:59:26.000000000 +0900
34 -+++ ibus-fbterm-0.9.1//src/display.c 2012-06-06 18:05:22.000000000 +0900
35 -@@ -212,7 +212,7 @@ static void calculate_status_win()
36 - IBusProperty *prop = ibus_prop_list_get(property_list, i);
37 - if (!prop) break;
38 -
39 -- w += text_width(prop->label->text);
40 -+ w += text_width(ibus_property_get_label(prop)->text);
41 - }
42 -
43 - status_bar_win.x = cursor_x;
44 -@@ -238,8 +238,8 @@ static void draw_status_bar()
45 - IBusProperty *prop = ibus_prop_list_get(property_list, i);
46 - if (!prop) break;
47 -
48 -- draw_text(x, y, COLOR_FG, COLOR_BG, prop->label->text, strlen(prop->label->text));
49 -- x += FW(text_width(prop->label->text));
50 -+ draw_text(x, y, COLOR_FG, COLOR_BG, ibus_property_get_label(prop)->text, strlen(ibus_property_get_label(prop)->text));
51 -+ x += FW(text_width(ibus_property_get_label(prop)->text));
52 -
53 - char space = ' ';
54 - draw_text(x, y, COLOR_FG, COLOR_BG, &space, 1);
55
56 diff --git a/app-i18n/ibus-fbterm/files/ibus-fbterm-0.9.1-ibus-1.4.99.patch b/app-i18n/ibus-fbterm/files/ibus-fbterm-0.9.1-ibus-1.4.99.patch
57 deleted file mode 100644
58 index 6cf85865904..00000000000
59 --- a/app-i18n/ibus-fbterm/files/ibus-fbterm-0.9.1-ibus-1.4.99.patch
60 +++ /dev/null
61 @@ -1,22 +0,0 @@
62 -diff --git a/src/ibus-fbterm.c b/src/ibus-fbterm.c
63 -index ffb7401..b4ddb64 100644
64 ---- a/src/ibus-fbterm.c
65 -+++ b/src/ibus-fbterm.c
66 -@@ -119,13 +119,17 @@ static void im_active()
67 - debug("im active\n");
68 - modifier_state = 0;
69 - init_keycode_state();
70 -+#if ! IBUS_CHECK_VERSION(1, 4, 99)
71 - ibus_input_context_enable(ibus_ctx);
72 -+#endif
73 - }
74 -
75 - static void im_deactive()
76 - {
77 - debug("im deactive\n");
78 -+#if ! IBUS_CHECK_VERSION(1, 4, 99)
79 - ibus_input_context_disable(ibus_ctx);
80 -+#endif
81 -
82 - auxiliary_text_win.w = 0;
83 - lookup_table_win.w = 0;
84
85 diff --git a/app-i18n/ibus-fbterm/ibus-fbterm-0.9.1.ebuild b/app-i18n/ibus-fbterm/ibus-fbterm-0.9.1.ebuild
86 deleted file mode 100644
87 index 1b23b299943..00000000000
88 --- a/app-i18n/ibus-fbterm/ibus-fbterm-0.9.1.ebuild
89 +++ /dev/null
90 @@ -1,24 +0,0 @@
91 -# Copyright 1999-2014 Gentoo Foundation
92 -# Distributed under the terms of the GNU General Public License v2
93 -
94 -EAPI="4"
95 -inherit autotools-utils
96 -
97 -DESCRIPTION="ibus-fbterm is a input method for FbTerm based on iBus"
98 -HOMEPAGE="https://ibus-fbterm.googlecode.com"
99 -SRC_URI="https://ibus-fbterm.googlecode.com/files/${P}.tar.gz"
100 -
101 -LICENSE="GPL-2"
102 -SLOT="0"
103 -KEYWORDS="~amd64 ~x86"
104 -IUSE=""
105 -
106 -RDEPEND=">=app-i18n/ibus-1.4.1
107 - app-i18n/fbterm"
108 -DEPEND="${RDEPEND}
109 - virtual/pkgconfig"
110 -
111 -PATCHES=(
112 - "${FILESDIR}"/${P}-ibus-1.4.1.patch
113 - "${FILESDIR}"/${P}-ibus-1.4.99.patch
114 -)