gentoo resync : 26.11.2017

2 files changed, 16 insertions, 17 deletions

diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index 149d1a6aa80c..13b8ac844c6b 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -1,13 +1,11 @@
-AUX sunpinyin-2.0.3-force-switch.patch 1046 SHA256 ddb9fe9f219ae1e6d8754fb03187dba913ac9d731836da15e93d155a9c287bbf SHA512 abae0d760ecb93c6317483f3b14ee21670f1a42799ffc15a5dcfcf7f0838f0809731953bf6377a52a9647ace8172025bff5049859ac55db989d9f61904fa38ae WHIRLPOOL ae78c316cc9517299280ec0fed5c11c94ff874fb44931a49ca074ddf201bf6c2964e952b0261adad3bec50ff950db6d8f47d0f7f48fa10efd10eae0c8759bc15
-AUX sunpinyin-2.0.3-gcc-4.7.patch 1275 SHA256 0d01a61d663a9b316dbd368ba6df23a55e741daf0e6a56a249c279b0522d4a60 SHA512 48d7e5ab52395467f3b282b73bb3ca5b2cd27c76ac1b454c0e248a9cfb13d8d628fbdf93b82a57404109d288c46d70456bb4aaf4f2899e3dd6e047140cdfc7c0 WHIRLPOOL 13ba61171cabac01e1d48bed2fcd9832e486eceb3a8b0488e98dfbefdf5a125a749d3845aa16c854be8ed608a24f8723d287ee655e765cbaa014a4e5ff864d08
-AUX sunpinyin-2.0.4-pod2man.patch 469 SHA256 ef232fff1eeb9d041e657719bba02f703118d3a3fbb63f6d0c08f5da3b0bb81d SHA512 1cc36f21dd11c802365fd770e7eefb324a3200e6570d7b585179778c8385dc694b214ad1339ac266f0adfa9d1f1ebca87b7847544069e25cfb563b0cb5bd8172 WHIRLPOOL 6c1aed93d9c2d06088e664394eb1d20d4e6d1e98ca6d727e85d1d2a09207f05eb5238f8944aaa52cb2d63229cb5f2c13a9bfba4b29f9c3268902e83d2ffca814
-AUX sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch 1010 SHA256 f27b1599666141b375b48032e79b7e606e07752d543c94f68f1c25387c958fa0 SHA512 8aaba439c49fac48c9523471bdbbac52feb594f61da6e3ba3747e3e6a08498817f06a8af8bcaa35d6b25ce0d31af3faac24faa57e15e3cae446f37dac5a30337 WHIRLPOOL 98f1a650445fb7874e7a8326d7a74ef125a3f954ff2b13dd9f1525dfa0fe65302bfd223843040a06c13bceedff995b2293e652f5155d7b4620125346fcb04cd6
-DIST dict.utf8.tar.bz2 1598995 SHA256 d8261f6b0bfcdd40a9c4f366228f86b017e06c9d7d64d6ddec1c2c3511eea805 SHA512 04ec55e4af4b58d29b1141a824b5c3de5dbaaab0133d88e477d9183db738fc63543b4004bf071e611c6ea0d4b4c161b73849a64ab75f4df5bb5116d7f52d8e34 WHIRLPOOL c1ead1556dbcbe0811551cff2b84367ce9827a06733a3f5a6c2a229882ecd9b83069455146d6ea507d235ef3ad979cd10d373cfc806e150ad0fae9bd91330925
-DIST lm_sc.t3g.arpa.tar.bz2 25098718 SHA256 c80093a8b43561e64158de4139967eef39b851432a2660e8050429d7560907cd SHA512 1e5e577c92df2f230b6b5962298ef7c215f6069b53e8e2dd4c5ad3eb54f999fc239b0924b4ab031af59c3194da15d6317ea2860f158e805b5cf0126666eaad98 WHIRLPOOL 294b668ca6bcb765392f882bd9b0f16e403c8709eb2d7ae129e4c4aba3372b8b6d9b6a78df67b811a742136e4d1b203b5da7e7f7554296c6986a6fcba361b50b
-DIST sunpinyin-2.0.3.tar.gz 169394 SHA256 4ab776e7563f69f8dbda8fac7cfaa42bd0db1ea68bab15f756094ce5398d83d1 SHA512 25f1fc4b8f550663861f2c7426832924676f83e1f201689fde51b04ca78704b46dbbf2b92736234d5e1a729ba1bb23bd1f3a0394f6b8b54cb0df57b9bb7ece1d WHIRLPOOL 71a4efedcbe4ec1dda9ecb1b94256a0e5e8ca570a234a8b378f85af68bf3da9f3b9220aee98c2f3ce509daa33996fea8b554e81594c299281ede58167cf633e8
+AUX sunpinyin-2.0.3-force-switch.patch 1046 BLAKE2B 786ff56100b308cbcd0bc7bb4a16d7e5691e0dae5778639f9b3d04f4eae531b44164262256443b62e191f72a4aa85a039c08cc0608b97796f76e7ae0f074f45c SHA512 abae0d760ecb93c6317483f3b14ee21670f1a42799ffc15a5dcfcf7f0838f0809731953bf6377a52a9647ace8172025bff5049859ac55db989d9f61904fa38ae
+AUX sunpinyin-2.0.3-gcc-4.7.patch 1275 BLAKE2B 9dc9fbc1b63f59fcdd853a8c99e9bfbf021540672729991cab67ea67b82e9d530963b33a34ce378af7309d9b749e0a831b6d1cd0393f3a7c182ca29d9411b27c SHA512 48d7e5ab52395467f3b282b73bb3ca5b2cd27c76ac1b454c0e248a9cfb13d8d628fbdf93b82a57404109d288c46d70456bb4aaf4f2899e3dd6e047140cdfc7c0
+AUX sunpinyin-2.0.4-pod2man.patch 469 BLAKE2B 5fab9d9a4cdb88189dfe0b8146f42effa9a48df8ce98e510a85c2cd55b92260803fb2350d921fa2a7e2a49e61ffbe82d2873397426c29ace1a50ba5c1d2c25b5 SHA512 1cc36f21dd11c802365fd770e7eefb324a3200e6570d7b585179778c8385dc694b214ad1339ac266f0adfa9d1f1ebca87b7847544069e25cfb563b0cb5bd8172
+AUX sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch 1010 BLAKE2B 3d34ca402e1504880e1abea8e2afc5fd5e342762020c450300ce01301f60d2c8cc527fdecb420eadf682fc1e086fef15b085518618c3803195d3afe4fd147d98 SHA512 8aaba439c49fac48c9523471bdbbac52feb594f61da6e3ba3747e3e6a08498817f06a8af8bcaa35d6b25ce0d31af3faac24faa57e15e3cae446f37dac5a30337
+DIST dict.utf8.tar.bz2 1598995 BLAKE2B 4cb990b6bbb440218c6af695369bdccf97b820da9aa10d118043a7bda1c602e53d0c63c4a460db2c64530e69ac1d98619e1a2efa2113a292063b422fc1b3d32c SHA512 04ec55e4af4b58d29b1141a824b5c3de5dbaaab0133d88e477d9183db738fc63543b4004bf071e611c6ea0d4b4c161b73849a64ab75f4df5bb5116d7f52d8e34
+DIST lm_sc.t3g.arpa.tar.bz2 25098718 BLAKE2B a7cd87d4e786a7dfe854b33c5c70019075ec99b02fd6cb33f91f89babdd2b255b6d157fff30c22b5372e74908483b814cc9698fd84caa3e56c61e76a59dbea04 SHA512 1e5e577c92df2f230b6b5962298ef7c215f6069b53e8e2dd4c5ad3eb54f999fc239b0924b4ab031af59c3194da15d6317ea2860f158e805b5cf0126666eaad98
+DIST sunpinyin-2.0.3.tar.gz 169394 BLAKE2B d93472c0c208da2a7aab99b1d514fa01acf67e69bdddc2c0e15f40af7a2abaf8860f8e792c2bd286bd1ec3a24124b0284d28295115c8dff1051f5df3c2314bb7 SHA512 25f1fc4b8f550663861f2c7426832924676f83e1f201689fde51b04ca78704b46dbbf2b92736234d5e1a729ba1bb23bd1f3a0394f6b8b54cb0df57b9bb7ece1d
 DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 SHA256 e650957aced55075448b7f02298d0c5cf59a8b8e041e9c7d92d24cb5170de93f SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2 WHIRLPOOL 82535dcde38c2fce17877e465db7ebeaed14a7f305ad96ca451c5b35ae04244a94e9bde9ce51092a390964c557e39ab43742d2370342f9b72722b24f916c55d6
-EBUILD sunpinyin-2.0.3-r1.ebuild 1617 SHA256 c5eddf6b1868e5e05e46c88a145551111fe9633cf97ed0fa71843bc1ceba2f7c SHA512 285f5aed247330d819dea7299230def6cabe23d12b1658bfc5c24004e78f95a38bb9862463ee533a540a32e8780ac78a01966d2f70dd71563a58b7bc22325bae WHIRLPOOL cb2da32c6c9302ec58ba258b52921f8a5d3367d3b7a37e40d8d32e519102e1882fee40f0f2eda09d25218ef881e3c2bf3085fd829af1ea02d20c2eb24a5889e0
-EBUILD sunpinyin-2.0.4_pre20130108-r1.ebuild 1057 SHA256 8c13c3262c069c88904afeb4a393029696da2755332327b2795137055c38b6ea SHA512 594ea06940263db5afa0cb87631074417a05999863b0d64793b6567732bf4ebf37b8c7f02c14ab3f91e18755f7b6bebce325d1d0578c191d5f70d2af75ca5a36 WHIRLPOOL eaee444d80cb33c47335266c60ba916e3b0ee75f0473f2dba6c21304cd73f1485c8da05b5429858376d84c0a7c3437be39c0f771c132a77ea42f3ec04ee2641b
-MISC ChangeLog 3463 SHA256 bcd93ab07bf8a5a245eda401780d01978eddd06d511689424911fa65980bd196 SHA512 9fa7ebe4e935e33fc4b7dd932877287223f93993df5451220229e3f65175472ef5c6d5fa3c14d199f99afb515962147bb4ee3ae3abc675d64a6d2641fc52fe4a WHIRLPOOL 759ad97189825adb8de6d21a025d3d90031442d0cc73cce51590cf6199c6a7933ec51a18919618fee0b79f3e88ad7df882af664fd59d4f95acd8087c92e69117
-MISC ChangeLog-2015 3001 SHA256 e31d7745175660fb756dd46882d0942c329b96db2be582126144ab44dafd6274 SHA512 c455286568062737730ede3b5dc55f7c7330aa08ea8f3e897063f6514d8904c870c8be765699f2d7a8dfa0b641a499c01478b3ed4201ed74d264ade3b1e82c60 WHIRLPOOL 4883106b612c18a9723c026090e7bd269521b9adc2103340cdd13c6b2533bda4fa895e6dca0e46be47e2e96e552e19eb0633ad77c028ce2c69f090ca6699efc5
-MISC metadata.xml 328 SHA256 28e1068608e622ed813bc6cd681a3f6d035b2550a6f884ab0b8b8250a33dae17 SHA512 c67333df77b03f92845334d6b738c172cc2e1935b5df4cad2d7bc983c08cda59f1427588ab8d054cd40b7fdc52c0adcb516d74c7de4bb320f85979a6a3297628 WHIRLPOOL 1293bb8bd16e7a829cb0099f40b9c6c45f8d4d17d9cd608ea5adddb61dd8d5888cb50802e7c110e03f84597a94bb8f0917908a8b8576de0e031ad3305703c72b
+EBUILD sunpinyin-2.0.3-r2.ebuild 1608 BLAKE2B cd4e7cbbb893e1dc9867e9c0d88628a2264ec60759550409e6c8437224495124749b3efeeb75c7ca5177bafff2121655376b3f7087e00f59b99c19e3b61cf5b6 SHA512 e4e06b77ac463074ea01211e754e7a3a90e4c0d7026b7bb321d18f79105d7bfca635e5a82e06f956ceb0b4d8febe5a1497cbbc8ec48ef2c994f1b00d90f66a57
+EBUILD sunpinyin-2.0.4_pre20130108-r1.ebuild 1057 BLAKE2B 0bd5fe2b7ac7af8b635bd45c3a28c7f79f8a4212830b939501c9c94dc67972ce3b6333beb937e57c2886aba33cd8ad86b916a26d1ea1c7d4881846c97d597e3f SHA512 594ea06940263db5afa0cb87631074417a05999863b0d64793b6567732bf4ebf37b8c7f02c14ab3f91e18755f7b6bebce325d1d0578c191d5f70d2af75ca5a36
+MISC metadata.xml 328 BLAKE2B 61db20b9475140020b99ef82cc8949db01b996bbe043b4aa68bd7bd6cb67c56286ce0e00c8dd1a039798b23a8921621260286231f1d87a079ef13a4a764b8049 SHA512 c67333df77b03f92845334d6b738c172cc2e1935b5df4cad2d7bc983c08cda59f1427588ab8d054cd40b7fdc52c0adcb516d74c7de4bb320f85979a6a3297628
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
index c0dea27daf5c..8ef0101da1e5 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
-inherit eutils multilib scons-utils toolchain-funcs
+inherit scons-utils toolchain-funcs
 
 DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME"
 HOMEPAGE="https://sunpinyin.googlecode.com"
@@ -27,8 +27,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-force-switch.patch"
-	epatch "${FILESDIR}/${P}-gcc-4.7.patch"
+	eapply "${FILESDIR}/${P}-force-switch.patch"
+	eapply "${FILESDIR}/${P}-gcc-4.7.patch"
+	default
 }
 
 src_configure() {