gentoo resync : 10.12.2017

2 files changed, 1 insertions, 23 deletions

diff --git a/app-i18n/scim-tomoe/Manifest b/app-i18n/scim-tomoe/Manifest
index 63478a8796c8..a4c82e7e599b 100644
--- a/app-i18n/scim-tomoe/Manifest
+++ b/app-i18n/scim-tomoe/Manifest
@@ -1,6 +1,5 @@
 AUX scim-tomoe-0.6.0-gcc43.patch 445 BLAKE2B 7a6f48120398dd661a647914e9097dc69807a2c0d18ba9c56517c48df2a67dd7406cb13dea283ff5b9b8c64a19dcff4548453f0c47cb37f890cef0cf7a1794a8 SHA512 a27202fdf5be0d77d473674475ee99d2b0d1a6eba51ccc45c4c7dc6c3a9c3d1042ed3b25ae15a04fcff885aad7b84c42cac7462fcc739bf12076e675b413fafa
-AUX scim-tomoe-0.6.0-gucharmap2.patch 892 BLAKE2B e3fa946e2955e7c2546349b09380acdea53ba91fe9eaffa42e22dec4c359b501cc2f2a5f3a7525ae68b841b93105fe80338e87812c3d22f4b41bcdee27d3f50b SHA512 7d03f1cd13dbcce98c5b95abf5b4542de28a733e7a785972030ba979a8db55652fbcbf02a8cc09035ff5f0eafed6e9dc60397ff8909e37eb43ea3d35e396a452
-DIST scim-tomoe-0.6.0.tar.gz 385126 SHA256 4f053944285ed50e7916ebdb38298025e60eb430b64715fdad9375483456dc06 SHA512 d70a8838f8c82c76a8e3592ad712997189873cbc4ec7ebeba5d43d6583e24acf318299433c9342ee004c4ae4741cca7e0b88e4642cf46c43f967a47ec5ac9d4f WHIRLPOOL 4d34f4618efa12802fce12da42276d5b2a92dcc0ad591c337f6f8a28b5441c2db5639b07ec9aae6262a0b0ed74f460b9530748b229bcf529f30a1e2a038cb685
+DIST scim-tomoe-0.6.0.tar.gz 385126 BLAKE2B e211c97caab5221d80541cbc795d3559b9843df4fb03bc559a20dc34b510288aefde87251c35c0a123501192d8f4ffb9209fa3c6c74acbbba75ae3321dd58fe9 SHA512 d70a8838f8c82c76a8e3592ad712997189873cbc4ec7ebeba5d43d6583e24acf318299433c9342ee004c4ae4741cca7e0b88e4642cf46c43f967a47ec5ac9d4f
 EBUILD scim-tomoe-0.6.0-r3.ebuild 644 BLAKE2B adb72e7b638641c3b01236f3cab93340b356bfec4cd0fd32f1db8fb21d59fb39f599e9843bc2ccc1b68fb03f32772282ac142284a26c1185231348df8fb51bf2 SHA512 99f9c7a8c24cce85a0236115dd9d85a03046440c2f0d062d15e93d6358532e16e0cec50e37819e8487d3c79f6bf6ba136f1f12bdd6dccff11c96da88729cd11e
 EBUILD scim-tomoe-0.6.0.ebuild 548 BLAKE2B 61df9f03c93b5a792484189dd67803bbd855d4ae551fe5a6d406d730b1e3ec2e9974df50e54f436f3492137467caed3fb2c7061e04c4c45aaea03e55eab71a61 SHA512 7318b8497ce9bd410e05e48d9b7a2185b9fa810ac20d053088737acf95a6b88f3140a34e7bab0c038dbadddac2c2fe9b9e533856094452e55d2818df91f87406
 MISC metadata.xml 309 BLAKE2B f8126911d309ca51f6e56437d2c219026c2e50d854b62c44afc5e211cff957d1776b0fef17a64da072033c5df308c6015786feb49344be3c8c4c57074d028d36 SHA512 7d9c17a3c4279406d23064447a7370658c494bbc5eab2a05f048f58ac3e136804ad65dc2fafbfc132b1f82ca6a651f6fe34beb68ea370b5a0eb1a3f6c98d3c2d
diff --git a/app-i18n/scim-tomoe/files/scim-tomoe-0.6.0-gucharmap2.patch b/app-i18n/scim-tomoe/files/scim-tomoe-0.6.0-gucharmap2.patch
deleted file mode 100644
index 90a52615e65e..000000000000
--- a/app-i18n/scim-tomoe/files/scim-tomoe-0.6.0-gucharmap2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
----
- Update tomoe-gtk to gucharmap-2 API
- https://bugs.gentoo.org/show_bug.cgi?id=243160
-
- scim_tomoe_prefs_widget.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/scim_tomoe_prefs_widget.cpp	2008-12-06 16:40:15.000000000 +0100
-+++ b/src/scim_tomoe_prefs_widget.cpp	2008-12-06 17:01:19.000000000 +0100
-@@ -473,9 +473,9 @@
-         String (SCIM_TOMOE_CONFIG_UNICODE_TABLE_FONT_DEFAULT));
- 
-     if (font.length() > 0) {
--        gucharmap_charmap_set_font (charmap, font.c_str ());
-+        gucharmap_charmap_set_font_desc (charmap, pango_font_description_from_string(font.c_str ()));
-     } else {
--        gucharmap_charmap_set_font (charmap, NULL);
-+        gucharmap_charmap_set_font_desc (charmap, pango_font_description_from_string(NULL));
-         set_default_font (prefs, SCIM_TOMOE_CONFIG_CAND_FONT,
-                           GTK_WIDGET (charmap));
-     }