gentoo resync : 23.12.2017

13 files changed, 36 insertions, 32 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 69101802cf0f..3c9ed408bb3f 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index eb549e2f7dd4..06f2060c8638 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -3,5 +3,5 @@ DIST ibus-1.5.15.tar.gz 2259352 BLAKE2B 52a820b55573f034f60dc705e0c513515c0f128f
 DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
 EBUILD ibus-1.5.12.ebuild 3695 BLAKE2B b22d441277f55324c4d5ecc6d592f3057900a46e0f4bed4ccc90c14ec10890fa26bab18c5ded5649f9bb83c3485899bcea8e9d0fc80410e55199ad97b51f2009 SHA512 2593129b58c41301ea94f7b7761cc40e13f3b6458230478067d6a0a1c6a23ad8aa5f225d4203259ad54eb38d87b3bbac1a029a4de5282aee82147891b3c2b394
 EBUILD ibus-1.5.15.ebuild 3552 BLAKE2B 040902ad38258aab1ff4b0d2b3eb495a6f7a3b5148b1cbd06378773b1c421da8e3240395d4412a712243663b1d70754b33356c2316d072dcc847f80a902d04ea SHA512 dec56dc700cc9e8fbe2280cf75e2550cc92d51e7ecbae307b87ef6e5707a2a7e31c5b82e8228818290bc94527f3c2bbdb34e0a4b61a0c8d5f1bafe5ebd00d485
-EBUILD ibus-1.5.16.ebuild 3958 BLAKE2B 0e5814813b9f060c3bcf9e6487bb56702e134a163b68d1244d19b4775c0f3e92f5b83975b0b7e30425249d5170c96f35b80c0d1a2fa2c6babc1356e665168007 SHA512 b8c3f8ac7946ac7d3863f7585638be16b03b2609467ecac6a946dd5cc6c5a2d13d3e546f9f31d9c431ee07caa952f5a9f19c6f4db50fc087b2b2e228e0ddc92a
+EBUILD ibus-1.5.16.ebuild 3965 BLAKE2B 56b920f04cbcf8de88b0cc4347f8876fd6972670c48d4717f372a5436a88e99f63a9b07bcd52a72dec0d313f06d8893fc3f6fda0e03fd7ebc78f6ed3e1c8ef79 SHA512 514bf67cb6331b0d7e1d583f865e66d5ab8c8f13db40de925e8bf51f976f89171f8b028b377676ca22f8c7465b53ab66bddd0237ff67a0319710d194bffc857b
 MISC metadata.xml 876 BLAKE2B 0594f787b71a972b67f1f52fde4e6e6c4eead1f604a1152ea9af2a15cd678677a29adaaba1a53251efbb95f0d12baa7d3dc63e54676757bbc7d9bf6235cf7e1e SHA512 eff80e5a8db4276c1138de9e661e5735c42abfc32950bc439eda9f342e5d2a68a8d5c848dc0000a2960a315ac38dbeda6b9fc44de8b9d526e7dddd94122f9f32
diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index 1840a7ca6982..f04a122889f9 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index 54eb13ffe162..dae3a9bbcd93 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -3,6 +3,6 @@ DIST poedit-1.5.5.tar.gz 2594758 BLAKE2B a0c833bf657bbda89b2109b6da62e6eafc9dddc
 DIST poedit-1.8.5.tar.gz 2404829 BLAKE2B f39a7e2e14dab9c0ed0b761a3feb271c8eb0e3b1fdc09c77c6a3dfaaa499e3419881e0959f5a53b07754810adc1518efd4c56a1bb4fd490c1e2a405a7d44ef1c SHA512 87eae2bcedc07eefb097edf263db10b3947956cfa504eddb259e3c3cfed6215ad0da4517fe5132b61041c39a7fbabd298ca42582570295bacbbd62d5ffc6f6a7
 DIST poedit-1.8.7.tar.gz 2483945 BLAKE2B 0cea4dfa19bbd7e6563a2872836cf3dd53d45de39fe65323c19daf9e87ba264f38e24a1957a391511a746be164fe8d985348c847524ea80dd99e6988176bbf73 SHA512 609022e696915cddb130c561c7eaa7dff76ce0458f58d9b8de34f0e8b98839cdccaf4a593e0e4eded67252cece08c61f961191f64cf4d76fa148f403d9705e68
 EBUILD poedit-1.5.5.ebuild 915 BLAKE2B b46d3195b76190a54904869b9ef0de9bf711205722b256bdf771fe7d562a50ff3db6cd468f6277f19607b91b71a8236be009f7312f6a347156096bf40a164a7f SHA512 4aaaf2603a45f504e2b838d166ec9ecfa000c2689ad5d2daa34984517aaeabdc245bf28a94a3b40df392dceaf10520516d0de745ccc8066676d983af498be1d1
-EBUILD poedit-1.8.5.ebuild 1736 BLAKE2B 72459ca911c042d112eac985e20152a107885ab5dad220079300de7a4697f18615f11e9b4b86a9f5fda853b491fa34682c985db450e655ec0b58867faa019776 SHA512 48d8d23ea1f9f5ed93cd95e017cd33c32f2e6e0f9dbf5799178793a4d49c45053c57c745ac1c8cbcc809dc55d24f5b502a4589c865b5a3b100d5e23cd80f0411
-EBUILD poedit-1.8.7.ebuild 1599 BLAKE2B 73779fdabf99dd88d28aea842768debe3d1a01217f383a55473789b8e7864241c024ca3759edfe67c84cf76f5f68e33ca1576ed42d612e936e3498265ff9de71 SHA512 5b2a1e303aeca870c3899e980b8e197c56535db01076de85d7b059717bbd88ca271d8ddc418c854fff0961685faba0a38ddb788e0f8f66d078c62ec6e5d3b336
+EBUILD poedit-1.8.5.ebuild 1743 BLAKE2B 0f3944f5d82a5f3a4bad27d01d5b7247cf612e5f9e1b066f67fd7f5dd5e323b154e462c02e66e0d6cb0abd24536138e73f7dc20a4be862e967fd0a09bc063df6 SHA512 e7bd5759ac48126b914a27e04a0984d9cc6666ae39a29bc8046e7e6cfb8750fa52b03aa5ce41adc47000524c7c6797c5f37060feb587641ad43575bdf04012f1
+EBUILD poedit-1.8.7.ebuild 1606 BLAKE2B ec7112f82b5df0527101fc736188a96d7a1fc7cdfcb43185e69cf039c1188c67333417f00383d0b87156a5dc7f7aad3afa4b6cd45cadec19cad5452db063555b SHA512 f56dbe7135f8057674e55eca5b9d2e9c254079ddb2e1e070fb7586e070d51012a5286cf35e13e37ee0bc8fd650fa5852e8d7422f733964b89927b2c28656357e
 MISC metadata.xml 391 BLAKE2B 9ad2108cfd16183f871c18a04008364439226a905d824253b50e0f4d91ea437a915d2d83164bfcd6a7a2733fbd5db1291b9ef59f86736e5716509ea8b3575c02 SHA512 703b2a9a442d99d59f033561093bc9027cd52c0a98eb1e0cc253c3fcfbcf1987fac8c244061edfe87ea84dde192fe098ed02c6b1cdc3bb6754f42a72ac2ddd3f
diff --git a/app-i18n/poedit/poedit-1.8.5.ebuild b/app-i18n/poedit/poedit-1.8.5.ebuild
index 3b8c2b88360f..95a2f210354f 100644
--- a/app-i18n/poedit/poedit-1.8.5.ebuild
+++ b/app-i18n/poedit/poedit-1.8.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 hppa ~ppc ppc64 ~sparc x86"
 IUSE=""
 
 # db/expat req for legacytm (backwards support for pre 1.6)
diff --git a/app-i18n/poedit/poedit-1.8.7.ebuild b/app-i18n/poedit/poedit-1.8.7.ebuild
index b4ca8cf69ffe..4e868c8f55ae 100644
--- a/app-i18n/poedit/poedit-1.8.7.ebuild
+++ b/app-i18n/poedit/poedit-1.8.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 # db/expat req for legacytm (backwards support for pre 1.6)
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index 73770aa12ac5..8fe205191f56 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -1,3 +1,3 @@
 DIST unicode-cldr-common-31.0.1.zip 16370865 BLAKE2B 46e941471074116eb00ba81848b37c82e025e12841d75ef9e4e2620f887384c4dbb3f8c36febcd86d19cd17d4d84e77e11121d1ed1cf2ccf67a09260cdddc9f7 SHA512 6ef4a73b31bde5dead5af9145e5befa5969e9449b4072c94c5370c979db54e3072ec5bf15f54152045da329bf4382e54edb532c0ec77a2ce451bacc8778b73bc
-EBUILD unicode-cldr-31.0.1.ebuild 488 BLAKE2B c54f7030de5cc4ab004eda59839e5141e95c822b216260e8e4d63a8eb6c0e543501723287463645bb8051366ca0b6a450dde777539dd07ba238517f417e95a3b SHA512 44e9c84ec7aefd2d2f0237d5c5905235c2b9d56fd18cd5676a39a164a04cdf46195eda665e4cee75aadc45b08c135fcf2931e29f1d623fb9696ee9652f22de1f
+EBUILD unicode-cldr-31.0.1.ebuild 495 BLAKE2B b4f5fb6ed9ef3d52e469fc133a85101566dd685b974c9c5106e5ec854f093617cd680f9831d7fa2869af946b94b5715885f5d0907419cb8ea445b1c30ceb1758 SHA512 91da38363ee3f53a93cd779a65d08b0e891b61988017929094e9936fcbd5ff69e5b93a9fec2e1fd7c8ed6be62b44b46a63848b6673fa5740de308a146d840e2b
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild b/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild
index 95ba5021fd72..dc6a13ec5114 100644
--- a/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild
+++ b/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://${PN%-*}.org/Public/${PN/*-}/${PV}/core.zip -> ${PN}-common-${PV
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index 088fab019a9f..110844689425 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -3,5 +3,5 @@ DIST unicode-emoji-sequences-5.0.txt 103383 BLAKE2B 1fc122b617963090d7ce165c9bc1
 DIST unicode-emoji-test-5.0.txt 341770 BLAKE2B ab4e0900dd685172ba686c3a8e501cb3333be5594338526179a3d851970546fdde2793f9c31c501e978608bcee57d7281b4722bc6f657f0626c4a48ca2ad8490 SHA512 368483fadaa2c87e1197d0b0351c1e68b4244e73ab93542d73df7169d1dfcdf98b0fc1da8a969645f6a2d45db1f2db5f75ba919dd05f1012fbc2f3fb524f5c5d
 DIST unicode-emoji-variation-sequences-5.0.txt 36120 BLAKE2B 50e19bd7147486437dc4fd7784ec9bd5869e58f934738fa1d46edc030202fb9490ddebd6f1cefb98dd78b3be2c4da7e3f2acef0ce54487a183123311efbf7205 SHA512 484509ed56c5ea5e73160e211643a938d3fa08474281d316e5ed2d2346f38f5140a147454a9cb81c9f463d6c62befd98a8b70b695ee50effdbcfc6085dcaa520
 DIST unicode-emoji-zwj-sequences-5.0.txt 115207 BLAKE2B beb8f304be16ffe34fde4cab20bfb981f3ae61ffc6827ced0b3160de7e405459fdf38c6e7fcafdd3887da16da7870b84520f1c68e661480efbd0cb9510a04649 SHA512 26398ac77035d2f5df7a61f4c2a8a098af8e551576c9c9f157379c05aa8f75de5a0827c9bc476eb20f32c38b0c3605f6a1d9e07fe27f0e75df359ed2a7e6d25b
-EBUILD unicode-emoji-5.0.ebuild 870 BLAKE2B a1c8608f30ca7f61c8e2a29f1f83ea79d8748dce833f845d4449f92cf74668d00988ad01122846a7914c0022d26014cba3316b9ea1625e1338755bddafc78978 SHA512 64cb7b8923ba6d22d06094c461a8bea633d0f994e9de20e6c6d2be671f91abf6f3102f263ad6524e1ef505d1a1e1a8d569dd3111ccc9e0475a6f7bb51567ab92
+EBUILD unicode-emoji-5.0.ebuild 877 BLAKE2B 54795b67629e2f6b7551d9245f958a26b9a4b400f5590887c4d07ccabba84e674765536e312868060665f69006c4ca99f5bd33aa219958a3ac163c4f8390c491 SHA512 a9b1fa17e4e565d5d19c64fd5746aa05967008e901a5abd0d3c79f18f9bfad6ffb2126e93528c6a487259b3cd5b39a35a8cd714a3b06ecce53d421d81da75912
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild
index 412847b2a3c4..2ce2b443a1d4 100644
--- a/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild
+++ b/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${BASE_URI}/${PN/*-}-data.txt -> ${PN}-data-${PV}.txt
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/app-i18n/zhcon/Manifest b/app-i18n/zhcon/Manifest
index f150d6f69e01..8870a37ba72f 100644
--- a/app-i18n/zhcon/Manifest
+++ b/app-i18n/zhcon/Manifest
@@ -5,8 +5,8 @@ AUX zhcon-0.2.6-automagic-fix.patch 1363 BLAKE2B 6b03a2dd0c91953e75a11685ea07263
 AUX zhcon-0.2.6-curses.patch 694 BLAKE2B 681ad2b8314ce379ccb0ad77123cf168da41656dde31e88e1fc746557e59220645f262a62e8abfd3088c77888f0aa8fb877db7b0eba6e81f5b4299611bb38c8c SHA512 245b60dd255cff47d70cd1d4dea7b816fcbc668cfa74d5642bb9689e3f819667e76b8336ec3c746d34a3c744d2a6c1d88b32b73f20e41e1f5c830524e158c265
 AUX zhcon-0.2.6.configure.in.patch 379 BLAKE2B b87b5e6f61890d058c77eb5d578ec9db6cfc7c66ac2b599bcaef8246da118b63013b4ce918c6ffc996ca41da5d80af2db974b7ef5165b593ce7e15da947af234 SHA512 8d226fb01707b37bc5accd44fad01cf028ccfd4c9d826f4056700c9291b3f544333f80f716da4834dae5e32a6a17bdd1c7913635e14eb10764716a45b91229d6
 AUX zhcon-0.2.6.make-fix.patch 3071 BLAKE2B 527083f2fbe91ffeccdb6b6130f68d32e09e0d3b3738fac0e5626eba886a7f325836305df6ffb6f206d05f220c342b945cab2d442f3165de77e77ea66584dba9 SHA512 25ac39954f69c251ea1587f580879ca1e38502997b1b7313ef43a84d8626811c5b74e1a0065fec94f4c5acf378ee4495cb41c3ff3a902bd73973f15239c593a8
-AUX zhcon-0.2.6.sysconfdir.patch 874 BLAKE2B 50d989f570acfc03ab250f74a2c98293f7c16f761cbcf203112e5dfb4f9d6fc1ec803fce65f40012e880844e172641d656b46f58d4004de129eee197df0004d0 SHA512 db957f80b00be3bebb73120ef2556aaa673fda3b85817213617a81a651960279d23ecb768a164e161b9be7cd2289509cf0f8243eb7e2903b976b5b2bd0b0b951
+AUX zhcon-0.2.6.sysconfdir.patch 779 BLAKE2B 869a6fe3bcf632d0c29eb37145dc516fde1bc01066dd3d657b38fa91a355f613b23326653ee7bf06a368cd7fd6fe8012b70fceb0a805f9699910a1b6ad5b241b SHA512 8996e04f6cb7ba7fa1b548fa47ab3463a76aa690e59fce1614986dbf73d3569eea479c5c764e84f6994a6b6795c4fcf29f9018a3b5cee2ec075677f909de4e11
 DIST zhcon-0.2.5-to-0.2.6.diff.gz 2881 BLAKE2B eb7b3bc38ae77c7a0add2a0693822fb34a7721ec4224a5be6fc533f0c69878a66c123a12b2d38a09ab1a3360f3d1e0658ccaf35e138d102748675cd60f81df21 SHA512 c4725e600cde5a629735506c8eaa3b78df4606cd2745891a21c4f25889cff10b6fe4cbeb3cf60b85ad62ed0e46c8e7bbb802b7675f79f3a1d82f6942c393d4ad
 DIST zhcon-0.2.5.tar.gz 5011644 BLAKE2B 326add20cac0bab31c4a34a0261374f2daf8db84f0fafd774c3498c4ba42275a6258bac0b74447626e691c1e86bcd6e0a6408cb8d6af5c1ff2a8912b5dc3d411 SHA512 35f1517b649e5afe3156eb1aa7735f3d3a988fad08c433b8f343df6ba3fdef89493afe61488a76059e4bfa1db4455d21d0bde7041bab37eb50e5ab0b622218fa
-EBUILD zhcon-0.2.6-r2.ebuild 1358 BLAKE2B a059cbb4bd7deefd6585cb0625c72efeabb5865cea381659e5fc6f7a45e11b3840b8d412e53d42c2cad34962c1353ed2d767b74a3db141e977101498ad01f23d SHA512 62b999c8ad154c9adb5b2e86854d2a79d39a30c2c53bd7dc494f3cbf0811c94b7e98ef2f4920f2734ee54cfa288dafaa65816eb0f41085f8826d98206c6d8036
+EBUILD zhcon-0.2.6-r3.ebuild 1296 BLAKE2B f75f9fb5c44f4c68ccb783712b7c85e83065055812d2093cbf4fec41dbea50074048e7f6f0ef6c235333259478b6f5a4b46bed137d2dcec5425c13e8cbf9a7a8 SHA512 7c77d58404379cb4d46429d53b6bc66c494b57035bbeb3cd8c4ceb96e2e5164fd6b4762005fe8c72e1a98cfca6072f0dc9e3f93f14a8c4f66be1d5f4cca4322f
 MISC metadata.xml 620 BLAKE2B 2d07a1bd4880b59a4d6c76325ffe19ebaeacb2943797f5afeeb25ce7521d1ca406d3367496a0ebcf0235bcdd54d6e68bbb2196dd24f926877a00a0ce1313aec5 SHA512 f67cb7edc94c9d26bf5b7e89d9a02333aec62d8dce387b2449c1879f93a56654a12292b92be63936615ca916452a0d19d62bee984e2462fb939a0fe98e2e7c84
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch b/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
index bc1d8713cd22..551d656dd6e2 100644
--- a/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
+++ b/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
@@ -1,6 +1,6 @@
-diff -ruN zhcon-0.2.5/src/Makefile.am /tmp/zhcon-0.2.5/src/Makefile.am
---- a/zhcon-0.2.5/src/Makefile.am	2006-06-22 12:35:01.531885552 +0800
-+++ b/zhcon-0.2.5/src/Makefile.am	2006-06-22 12:31:44.000000000 +0800
+diff -ruN /src/Makefile.am /tmp/src/Makefile.am
+--- a/src/Makefile.am	2006-06-22 12:35:01.531885552 +0800
++++ b/src/Makefile.am	2006-06-22 12:31:44.000000000 +0800
 @@ -5,6 +5,8 @@
  
  zhcon_LDADD = display/libdisplay.a
@@ -10,9 +10,9 @@ diff -ruN zhcon-0.2.5/src/Makefile.am /tmp/zhcon-0.2.5/src/Makefile.am
  SUBDIRS = display
  
  install-exec-local:
-diff -ruN zhcon-0.2.5/src/zhcon.cpp /tmp/zhcon-0.2.5/src/zhcon.cpp
---- a/zhcon-0.2.5/src/zhcon.cpp	2006-06-22 12:35:01.398905768 +0800
-+++ b/zhcon-0.2.5/src/zhcon.cpp	2006-06-22 12:32:41.000000000 +0800
+diff -ruN src/zhcon.cpp /tmp/src/zhcon.cpp
+--- a/src/zhcon.cpp	2006-06-22 12:35:01.398905768 +0800
++++ b/src/zhcon.cpp	2006-06-22 12:32:41.000000000 +0800
 @@ -123,7 +123,7 @@
      string cfgfile = getenv("HOME");
      cfgfile += "/.zhconrc";
diff --git a/app-i18n/zhcon/zhcon-0.2.6-r2.ebuild b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
index 65f87490e84a..f428d22d614f 100644
--- a/app-i18n/zhcon/zhcon-0.2.6-r2.ebuild
+++ b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI="6"
 WANT_AUTOMAKE="1.9"
 
 inherit autotools eutils
@@ -24,16 +24,20 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}.sysconfdir.patch
+	"${FILESDIR}"/${P}.configure.in.patch
+	"${FILESDIR}"/${P}+gcc-4.3.patch
+	"${FILESDIR}"/${P}+linux-headers-2.6.26.patch
+	"${FILESDIR}"/${P}-curses.patch
+	"${FILESDIR}"/${P}-amd64.patch
+	"${FILESDIR}"/${P}-automagic-fix.patch
+	"${FILESDIR}"/${P}.make-fix.patch
+)
+
 src_prepare() {
 	epatch "${DISTDIR}"/zhcon-0.2.5-to-0.2.6.diff.gz
-	epatch "${FILESDIR}"/${P}.sysconfdir.patch
-	epatch "${FILESDIR}"/${P}.configure.in.patch
-	epatch "${FILESDIR}"/${P}+gcc-4.3.patch
-	epatch "${FILESDIR}"/${P}+linux-headers-2.6.26.patch
-	epatch "${FILESDIR}"/${P}-curses.patch
-	epatch "${FILESDIR}"/${P}-amd64.patch
-	epatch "${FILESDIR}"/${P}-automagic-fix.patch
-	epatch "${FILESDIR}"/${P}.make-fix.patch
+	default
 	for f in $(grep -lir HAVE_GGI_LIB *); do
 		sed -i -e "s/HAVE_GGI_LIB/HAVE_LIBGGI/" "${f}" || die "sed failed"
 	done
@@ -42,12 +46,12 @@ src_prepare() {
 
 src_configure() {
 	econf $(use_with ggi) \
-		$(use_with gpm) || die
+		$(use_with gpm)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
-	dodoc AUTHORS ChangeLog README NEWS TODO THANKS || die
-	dodoc README.BSD README.gpm README.utf8 || die
+	dodoc AUTHORS ChangeLog README NEWS TODO THANKS
+	dodoc README.BSD README.gpm README.utf8
 }