gentoo resync : 14.07.2018

4 files changed, 0 insertions, 134 deletions

diff --git a/app-i18n/scim-pinyin/Manifest b/app-i18n/scim-pinyin/Manifest
index 98d6b8f3dfd3..273a2f93c51d 100644
--- a/app-i18n/scim-pinyin/Manifest
+++ b/app-i18n/scim-pinyin/Manifest
@@ -1,7 +1,4 @@
 AUX scim-pinyin-0.5.91-fixconfigure.patch 1313 BLAKE2B 6ab4742b4c857064d07402411b81041e3a5f8cc998876df7421f1b7bab97905e572fe793fdecb91325a34c0f4e774d8d115dbc3ea23db63aa518e0d84240ebb7 SHA512 9d4dd0c259d8171c8a3b171e68eded4670aacd27902ee8373fe7aff36d088b3cec5570783b9588357ea475321b5267ff635b865a57e7fd3a9b1245e86710decb
-AUX scim-pinyin-0.5.91-gbk.patch 2501 BLAKE2B 5a352313b0a779049e5a74f94fab1ffe23336b2fa979d35961ff0db8e86214d51f4ef3e08a6b65261306fd049fad639dabf767ebc3c5e1d863b8249975b0c819 SHA512 77dc428913f0fdfa8c9c9ac056eaa84d9b60e3b285ce510aa9528be087f5757f3f8055ef0930c4ce1c3776e0ca0e3a3fd725ca5d790ade030a8893e5fc8bca17
-AUX scim-pinyin-0.5.91-gcc43.patch 1737 BLAKE2B 09c72b35e238cb0df6a9d3ca9dc08087257bfdd21dfef3d3a0a1de71984a5f840f8b18207183beae794d8284849adeaba9d3ce122dd65e8290aa4c810febe84b SHA512 3b9d10c2ee4ada9a3d8e6c2c292f745efbe034b8eda30932aeea24c1fbaf54a9ce5e6b9e1dad3c43b33b6b14b009406770a55c23821bbe4d9e421d674d1b34fd
-AUX scim-pinyin-qt335.patch 1122 BLAKE2B 693bfb38d5acf47da482603442c28f5fdd2bb1fb9a9f158fd033321f4d28f092fa049e554bb0281178c47013c8888abc44085b10042702d95a2aea349cf1d450 SHA512 d9cafc0f058f7da5fd2c7b70f7b2eeea249044a1aa886e414d5fad78ceaad168d8cd260e7077c03aad6fe622b637bba5312403b15b61b935157f6258020c1c55
 DIST scim-pinyin-0.5.92.tar.gz 4769203 BLAKE2B 413a196d175536a044bdf4922bf1f3de6051f7e3cb61131153cab6c15e2301e373bfdd037d3e70c2893f66c29f955696e94bb9c75d1e686ca549d26716de0c47 SHA512 6af20b925c45ca355e12eeb59285e3327c2195038078a0e1741870395dc5a8f7dae60b8c9cd77919fbad94c27e123b9e58439f7011277439f9914d1a543a805f
 EBUILD scim-pinyin-0.5.92.ebuild 845 BLAKE2B 8b9ea8806e578c7a66ef65001d192233d8c1150508f7de7d027b32082c4955d2945eb81174a361f48c835a8ead8d16fc47dd8b57f9956705fef409602efe16c8 SHA512 d5a80f917eb810b87e31894404170eec5f87788c831cd6c8c80d369e7558ee9b44d4f4b0095c1eb378bb4848fb0288c9b2b138a4949bcabc35b9446cc22c6762
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gbk.patch b/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gbk.patch
deleted file mode 100644
index bc6a228fb0cc..000000000000
--- a/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gbk.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Nru scim-pinyin-0.5.91.orig/src/scim_pinyin_imengine.cpp scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp
---- scim-pinyin-0.5.91.orig/src/scim_pinyin_imengine.cpp	2005-08-06 23:31:08.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp	2009-02-18 00:06:34.000000000 +0800
-@@ -706,8 +706,12 @@
-         m_sys_phrase_lib = m_pinyin_global->get_sys_phrase_lib ();
-         m_user_phrase_lib = m_pinyin_global->get_user_phrase_lib ();
-     }
--
--    if (encoding == "GBK" || encoding == "GB2312") {
-+    
-+    if (encoding == "GBK") {
-+        m_simplified = true;
-+        m_traditional = true;
-+        m_chinese_iconv.set_encoding ("GBK");
-+    } else if (encoding == "GB2312") {
-         m_simplified = true;
-         m_traditional = false;
-         m_chinese_iconv.set_encoding ("GB2312");
-@@ -930,10 +934,39 @@
- 
-     m_iconv.set_encoding (encoding);
- 
--    if (encoding == "GBK" || encoding == "GB2312") {
--        m_simplified = true;
--        m_traditional = false;
--        m_chinese_iconv.set_encoding ("GB2312");
-+    if (encoding == "GBK") {
-+        if (m_simplified == false) {
-+            if(m_traditional == true){
-+                ; //Big5. Big5togbk is not implemented. Set to next available. 
-+                m_simplified = true;
-+                m_chinese_iconv.set_encoding ("GBK");
-+            }else{ // nochinese mode. Should not happen. 
-+                m_forward = true;
-+                m_chinese_iconv.set_encoding ("");
-+            }
-+        }else{
-+            if( m_traditional == false) //GB2312
-+                m_chinese_iconv.set_encoding("GB2312");
-+            else m_chinese_iconv.set_encoding ("GBK"); //ALL
-+        }
-+    } else if (encoding == "GB2312") {
-+        if ( m_simplified == false ) {
-+            if(m_traditional == true) {
-+                ; //partly map big5 to gb2312 is not done. Set to next.
-+                m_forward = true;
-+                m_chinese_iconv.set_encoding ("");
-+            }else{//Should not happen. 
-+                m_forward = true;
-+                m_chinese_iconv.set_encoding("");
-+            }
-+        }else{
-+            if (m_traditional == true) { //Should not happen. 
-+                m_forward = true;
-+                m_chinese_iconv.set_encoding ("");
-+            }else{
-+                m_chinese_iconv.set_encoding ("GB2312");
-+            }
-+        }
-     } else if (encoding == "BIG5" || encoding == "BIG5-HKSCS") {
-         m_simplified = false;
-         m_traditional = true;
diff --git a/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gcc43.patch b/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gcc43.patch
deleted file mode 100644
index 6f9bd3879eb0..000000000000
--- a/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gcc43.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur scim-pinyin-0.5.91.orig/src/scim_phrase.cpp scim-pinyin-0.5.91/src/scim_phrase.cpp
---- scim-pinyin-0.5.91.orig/src/scim_phrase.cpp	2005-01-06 22:30:58.000000000 +0900
-+++ scim-pinyin-0.5.91/src/scim_phrase.cpp	2008-06-21 13:16:32.000000000 +0900
-@@ -27,6 +27,7 @@
- 
- #define SCIM_PHRASE_MAX_RELATION 1000
- 
-+#include <cstring>
- #include <scim.h>
- #include "scim_pinyin_private.h"
- #include "scim_phrase.h"
-diff -Naur scim-pinyin-0.5.91.orig/src/scim_pinyin.cpp scim-pinyin-0.5.91/src/scim_pinyin.cpp
---- scim-pinyin-0.5.91.orig/src/scim_pinyin.cpp	2005-08-08 15:11:16.000000000 +0900
-+++ scim-pinyin-0.5.91/src/scim_pinyin.cpp	2008-06-21 13:16:30.000000000 +0900
-@@ -28,6 +28,7 @@
- #define Uses_SCIM_CONFIG_PATH
- #define Uses_SCIM_LOOKUP_TABLE
- 
-+#include <cstring>
- #include <scim.h>
- #include "scim_pinyin.h"
- 
-diff -Naur scim-pinyin-0.5.91.orig/src/scim_pinyin_phrase.cpp scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp
---- scim-pinyin-0.5.91.orig/src/scim_pinyin_phrase.cpp	2005-08-06 21:06:49.000000000 +0900
-+++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp	2008-06-21 13:21:13.000000000 +0900
-@@ -26,6 +26,7 @@
- #define Uses_SCIM_CONFIG_PATH
- #define Uses_SCIM_LOOKUP_TABLE
- 
-+#include <cstring>
- #include <scim.h>
- #include "scim_pinyin_private.h"
- #include "scim_phrase.h"
-diff -Naur scim-pinyin-0.5.91.orig/src/scim_special_table.cpp scim-pinyin-0.5.91/src/scim_special_table.cpp
---- scim-pinyin-0.5.91.orig/src/scim_special_table.cpp	2005-01-06 22:31:02.000000000 +0900
-+++ scim-pinyin-0.5.91/src/scim_special_table.cpp	2008-06-21 13:25:25.000000000 +0900
-@@ -20,6 +20,7 @@
- #define Uses_STL_IOMANIP
- #define Uscs_C_STRING
- 
-+#include <cstring>
- #include <time.h>
- #include <scim.h>
- #include "scim_pinyin_private.h"
diff --git a/app-i18n/scim-pinyin/files/scim-pinyin-qt335.patch b/app-i18n/scim-pinyin/files/scim-pinyin-qt335.patch
deleted file mode 100644
index c7c0c595c0d1..000000000000
--- a/app-i18n/scim-pinyin/files/scim-pinyin-qt335.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: scim-pinyin-0.5.91/skim/setupui/smartpinyinui.ui
-===================================================================
---- scim-pinyin-0.5.91.orig/skim/setupui/smartpinyinui.ui
-+++ scim-pinyin-0.5.91/skim/setupui/smartpinyinui.ui
-@@ -863,20 +863,4 @@
-     <tabstop>kcfg__IMEngine_Pinyin_DisablePhraseKey</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--</includehints>
- </UI>