Sync with portage [Sat Jan 23 00:59:42 MSK 2016].

8 years ago · b5e032310b
parent 2980aa7997
commit b5e032310b
740 changed files with 4774 additions and 2363 deletions
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@ -1,27 +1,62 @@
 DIST bolt-2c04100eb9793f2b8541d243494e2909d2112325.tar.gz 69587 SHA256 c0cdbaa6ec724c73799003ba166a4c9f1c6f1cc1b9760f98ef2d2a2a431577da SHA512 98a34fc045a6646df61d69f156164172e4446159fd790a1875c489583935b644dca4b14de097c0d1331cf46aa5221c77b8d1273a1f74121ac954dc04ef849f86 WHIRLPOOL 0380733bfc41010bc1ba14fb8be1b464a5dcd33cdc784aebc47298ee352d2b1b628ed1ee91d7f35c4346458d6ead87408db0bbe869126c46dd70faf5605d4ae1
+DIST bolt-ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz 78144 SHA256 165a79b80801b667b9ae09becc6085ebc79a68de32403b31018010c89216d2bc SHA512 a1f1254a00c6ad05d9097e900f1918a1d05e0a945c2438e715f6d386fc0dad82b3302764afd7bfb2a43030e79c6a0271284c866caffdda216961c10e16b63e2a WHIRLPOOL 9917359c05160a4852e55d6e556b511ba374d6c16b2c78a7d9e3ad5566f7ef68dd08176993e9fac2dc7f69612dd7da12a96e0a73b5e1e19fa102b540f594b800
+DIST circbuf-bbbad097214e2918d8543d5201d12bfd7bca254d.tar.gz 2884 SHA256 eec8f654b3b3e5c57a2f44ac58edb823600753f26bf41e63d8164add4dee4943 SHA512 a97ff3d2df6961bd0a365872d844c8d1af2835c03aa832a2cf52b65b134c70044acf6629268e98df13c0c566cf0145e6080be9283b2e0dd1b18274e4636ca55a WHIRLPOOL 74b635808317e6da2dc0135e1a65bda705d4496ab298eaf1c70d8995c02c027044608ef1dfcfc71fb3f945c03bf67877d2b6489bdeb2b4c12324fee5c7a14ed7
 DIST circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz 2748 SHA256 b67d2ffc0a725b6844895680d52ba4a63757987637c8dabbb2c3e4d836512d52 SHA512 0e1db19e79cd0f584adcb0ec0d6f04cad1e855abf0872a5bcf4ac5fedace55374a50e2c5c2086f26d20c63ff46d9f370119959d6ff20ead32bb4888df16e6948 WHIRLPOOL a375ffa2214e527c47815b82579bee7a270bb652582605a83c1a0d13087b2ef2f09cc6ee16f7e735fa61846c106203f3db51822d38eac18345f26f9e942a1ca2
 DIST cli-6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz 12690 SHA256 87d7f733c0f2e778fa72951c55a7fe65ea8694f2a1f621c368ecffb111098b05 SHA512 942f8a30a4570f04932ad263bb6760ec8d940d46058c65e56ffc81b1b5cc2d205afd61908260ce7d8dee44db879c861aafc0112335493b0b5018fa7b3b91fb62 WHIRLPOOL 5ea03493adee35661ed7bd30e857b171160a1a71d10c65aa8eee6e439ddf7d9c7f5ae9c1b9e3c0d70cf2a82d513b3b5570fcb089912822a50cc123fe4bc3ad68
+DIST cli-cb6853d606ea4a12a15ac83cc43503df99fd28fb.tar.gz 15706 SHA256 d3b85664d5a7c3e37f88c7b2437491eb04614ff1ab54fd77c4c8de5aa853a638 SHA512 4a27bb1f00098aee99edb94a986e0e1af504d9d77039e61d711d348d0f36df81345c0ff7c5f8ff85f453f8ed02e2862d7e856ac5ea6a3c9510bfc80b4c770d55 WHIRLPOOL b4401d7efaa992a0587da6d7a34e7359d58759d264e59d0a7ff809146cb3580e2840e2212ced9f5771efe908a379f6c13cd2d6b0274f5ffd493ca0131f698e10
 DIST columnize-44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz 3680 SHA256 504519c9befbac3045a00a7a70e82cc437622294ece6ac19b85ffd4aa915369f SHA512 1117d4a7efc1f029aef27ad711073fe4f8cff4ddf42021f917ad44cdf246153a39ca9a911892b783128563d09594aec5ffc4f8ee1d44218dd8ead1635ab4a040 WHIRLPOOL bb0417093ff993358cbacfade5df8c416e911ef352ebd760152dbce37b9e3c7c2d0064decc3efee7fe61672b13372b077cc19c579f186128175d2b05fc32d0c4
+DIST columnize-983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz 3811 SHA256 1a087a5abbdea9adde033622079930af7a7b171693bef481c2291746ceb333f8 SHA512 0c746f39fe3f5b9ab0c62c188fe92183c23908fce2952d4ada366cedf204dc58883d717666d71fc1b37f5ed00411da39cfbd4d37ce5cf10012cdecc5704149b1 WHIRLPOOL d325bf6486d7e18da71eacd73d0dbac083a6179048aaa5120beb22372ace0d43fc04f80765c635c291924279adf4463ea42c4f61a2a59428cd88d5ecfb9dd5bc
 DIST consul-0.5.2.tar.gz 1821228 SHA256 acaa3b7a7c874d247175faaa9178bb1e93eabb2d810dc842c79ccf272b4518b6 SHA512 77e76cd090f668a963202aa68fcf5c676edeb30078de1f35ff9af6681c34dd4171eb0da24fedcd376cbe5fa0fa87f7a3453dda4075bfc55a8ba949d4c407ef04 WHIRLPOOL 746cef01f7733838de0774fcde4ef1b8f7c686ed90593218e623a3fc68bd6d590ecda427c8b94d1b412f1e83ebf76b4a357ecb89c39695ebdd890fc9f7976eb1
+DIST consul-0.6.3.tar.gz 2224536 SHA256 5cdc21d6f20f9b703d38e19d3d2ed1c037dcbb236b80bff6a9b9c481ded74435 SHA512 c80b96e18c283f8d2dc7542393e9d788c8247200890b1f2ecdf292b545c01c971f1452f6b37b23b92654409a191fbd4608710b1ca31d6c426ff77b53c4840c4b WHIRLPOOL b021bb7ecc97c2a99e88a8dd17dc1958fe7b2d17848c9e629edb0627d72d5651f96ef625cda4280989463e66c4b48880690b5e4a1180117bc762062be3b0566a
 DIST consul-migrate-0.1.0.tar.gz 12844 SHA256 f9c2699cf5686065b69c3c0af58f140c65c6c0963e699b35b6e03e06fa7f996b SHA512 8884112f8529dbd48afccc21e89b5e0c401a056d7ca2f223803648c6cfe12a6582a2f91ee548672c10c57bad11028a01297ad039c0be39243180deb165d262df WHIRLPOOL bb977a8823360c8159d356aca9273665b41f02b390984e91c005ef8a57e57d9d77143c575fe0b38933522a8ff03743f9b49bc5583c58c1b37bcb04f8f3ec08b9
+DIST datadog-go-bc97e0770ad4edae1c9dc14beb40b79b2dde32f8.tar.gz 6727 SHA256 5ba22c0a7091b3c2512161aaf34cd0dffc18f887538ece9d691cbef528645b3a SHA512 ff9808f2cc5e040a1144673e49fc9405c7e98e3322b090d231e41f4c1b3bdaf48c920a543a155138e3fc6a5fc852b05d936ec2a04ce9b6f8cb2f4476e0793161 WHIRLPOOL e484a13a7c96d88fbbeffa11c1e27781bbaa922558dc4ec0305c56544bf93e83e0c96130437ce4cac603466df6686f140f229d7f81c0474b09b26a8320c1d66f
+DIST dns-85b661b2a6fc95a5a83e66d7730c4bc0b6e9c99e.tar.gz 158741 SHA256 5d8ef0bd31fb2ee6522d6f0e868ae88f4c294d3d05d66f226ae2b15aade6034a SHA512 3438986bc4c411cea38ee8a88af8e1a89479336939610777154f9f86f716c8362c042ee9247439c178daeba1aae4ef69111a3b63afa1b3bd9ed3e7c31eaaed9f WHIRLPOOL 48c81a8690acbfdcdca5d5e22ac16db4dbdd037fb18ebed7ed02916e080ee31d068f197f6ea05e89a7ee981867183f5d9879a6b294c8986daf6011e7bb3f0baa
 DIST dns-bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz 117777 SHA256 4b539f47f2ccf7fffd35490b4840fa4503506223bdb25ce957797b5a373d2743 SHA512 e7c5c5c321147e973d09e516054ef233e59a1326a094f2f07c6ecf4392f50bd0493a9f197789982d4de6ca373e713214ad6166fb513b2beebaa0d94ab5b01aea WHIRLPOOL fdaab64471665f6d5dc9e06599ec9e9de6dac225d5117ca7c008ce385a7b31a707c8fa0ecd13e03e83f9dafd500b3fd8180392e386319dfce53cb37d50b830fc
+DIST errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz 8320 SHA256 e77d6aa78ef6342b21358d689edcd043778c5623af5a9b2690ed8e3fa4ea7db0 SHA512 da45b1696253bebe012f3d0e624a63dd11ad1a613d81cc302f2ea6f096f29a8d81015b9c00363bd2590c4cacc59de52a27e84435a7b4ad6512485cdd87df11c0 WHIRLPOOL 5c6013d852711e001a0eca6a3ad11f64e006be527cfc0b46db21049af97506730b48cfe1b2fac10bcfc66f61dce69023f20b06c83558e80ce337d75a127aa90d
+DIST go-bindata-a0ff2567cfb70903282db057e799fd826784d41d.tar.gz 17860 SHA256 65cf65ac422fb8072abfaabec86c20a74e448a93b489e896a36642e7049f5d32 SHA512 ed1d2fd1c5a833b6efdc731eb43f72fc072a701c447a926ad6c1f9be3c0f1ed92c689639d02a288230a49d53795f41092deab132389871a5b9f79abdc525fc43 WHIRLPOOL 34250f7fdd0d1cea862cbcd5d8580588908585b5aef84366258b58fd45914e9d3234af0b781eaa1c74bad2ac3d06d1cd5cc57d817180b3191e6a0c2e91e894f3
+DIST go-bindata-assetfs-57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2.tar.gz 3674 SHA256 4c1a7338c3d85ab4a65d5d9eacd840d36c053542b9f1a86cb7ae0b15296eda94 SHA512 6b08baabfd4df91f2594cf65581a00f50891df97a7959825510c24dbffa8e75cd7bb0e1235fb3fd0789f5c336f1ad63b35d8a8e1e27c8eb88c42cb101dc3b6bd WHIRLPOOL c2543784213f384815a75c92a6395c5b18aa09932ee01837a09618587ba9fe27eb9db603d65e9a8788de00ffc0320595cfcb7d5e15814c9048b55b22160d00bd
 DIST go-checkpoint-88326f6851319068e7b34981032128c0b1a6524d.tar.gz 9830 SHA256 ea62599bfbe3ec9b616a8b75a14013ccfc288b8b0ccdcac4dac93c82503d41ae SHA512 94c90964fdd343afc4a4054c1e10e71eff04e0e410e72f6f19056471d41258ec1d976b8f0d9d61284832872fbd39a157fb64908a4195d183823b7f21638b0ffb WHIRLPOOL 694685c0fe9141be69bf889a710c357a011342772ac0a1bc7b39a2a43ce4824e1ed98dd8be77dc62216948c1f113e8570bd8781146ac16de154f69451e461308
+DIST go-checkpoint-e4b2dc34c0f698ee04750bf2035d8b9384233e1b.tar.gz 9966 SHA256 db9082332473fdc385c04e5c8e4fe06ebe513558accc3edae9d9cc28f3a858eb SHA512 b8fdc11b1f531c0b75236a5d638bd11ead597b7ac3d0f2dda6b7ec0450b5f92b046b40290201e80c476846fc0f78589891f5b037c50ccf6a2d07df0e2ab7ca92 WHIRLPOOL 20a3d4914e326baa6b9d111a37073e07e8336ebbde892205e770e22a7d24e92f2fb0318c00a3fb57b4db53b6e28d93a13675335ffdbc7c0d9056026deef47a62
+DIST go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz 6595 SHA256 b0a0282baa30df0e77ebd0902c5f0043f9af3460172ff61070927c270fa8139d SHA512 bfdeea0c0aad4160729bb023c9c908ff56c7faa64a820b16e982efede0389365987343b2a227cac95edaa4c9096f2dfcb1fd3f7d55510328dfdb284cfbf7600a WHIRLPOOL 1cd82ed8a82a2cb1de58a9a0177fead214e63908e880b2d57a4434c024a49d05579ea77142aa9d5ecca370adc4539bfb7db1d9d4a2cc27fc41d83a350c4fce39
+DIST go-dockerclient-296e36969d9d7606c4a6cbcd38eced50a39a0fd1.tar.gz 716365 SHA256 e1f5c43b80f72f1a9947332ad66364b35d8d2ec482df098e92af8c301f56e0aa SHA512 3192ffb293c76a89f202855e46168ea32f25916aa00c439d9aded68b44e0f2476b0416f66d0cd59092667515b64e059e2e0bb57e092e9ed66ee3c31541363a14 WHIRLPOOL 46503d46d5cd843858378df9646c9866301d540dd670c5ee831f52bcc2f8770753e1355791f79f588d0689f17c3842d7b776f5b36ab3821c80a6f89d75cba5ce
+DIST go-immutable-radix-12e90058b2897552deea141eff51bb7a07a09e63.tar.gz 12576 SHA256 6b268bb9aec15f263b5211b8b65f919e0af469563f50130ede34a32b04c39004 SHA512 ee4ce16d289fc5f41051d1da8faeb9d61d4fee81cc2e71edd041ebd72db870147795c95ebb915a9ee0c9b075c3142f9244b3a14f7b549934c3b36bb8df58123c WHIRLPOOL f587182c4fb98198de3f53612733fb9089465ff5c52293562ab5f3d5564fb0582ee5ce5915f30561fc6a39cf4bcae8e76357eff851657b552fb2dbfc7df7077a
+DIST go-isatty-56b76bdf51f7708750eac80fa38b952bb9f32639.tar.gz 1955 SHA256 a6f1ac857812224bd8a33e338b9baefcce2b1ca1777e8f359dff0a7bffb4bb3a SHA512 451ee7d6a42f967b2dd57a70f58690f3bbb21f0d6c18522772d3d9ca270ff9bbdd38d7e54e5404d303a615dcdca3c96fd9dd27075ac6d9efd88611b82f4c3662 WHIRLPOOL 39b094ea2f5a9fc808d160166973dd4e5a465408cb72c65d9450d1bf71f756eed7bbb5f98272482b177c2d2c2c2b7f4fc7e40ee75b51bc3d7a999cf550f1b9a9
+DIST go-memdb-31949d523ade8a236956c6f1761e9dcf902d1638.tar.gz 17359 SHA256 4a463839b906a230c3b128b16f67adc88e99900b63018d9bb508c4b95a1eed67 SHA512 abf2434b6f6b4b392635a9d1538bf7395e987be5d8c6fc6d0399257dc40700e766bdfa885ba72f6f942c6c7ebbf47dffdef66df3f47058bf493259fd2bf1141c WHIRLPOOL 1361ef58e09ea376c630847809ef6a5e614780530510d066be1ba9360a6a37c8c8eed831966f5ba4a97f5d93c063d71f56d10186eaa2242a22ea98d9e86092df
+DIST go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz 13610 SHA256 2efdf7c349cb81ef75fbb812e150aac9a7c6c27417f4e84f655ff77ddb006789 SHA512 2dd120d6da4d8cfcd4546a288534f233f7073281ed3d6e7712c8a92fc11f7b800c0950835037ec936ec89e6fc2dba06088d70bc7faee6f139cc9656c0a81d4b7 WHIRLPOOL ebe0a792cb231f3ff5241f8c2526c7a7927d6d1ab138e92ae0da34ba72e54bbb4769aa14804110e61d7de280ce28a0040ebd17e79ceccec585ad48c9aac91c33
 DIST go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz 11268 SHA256 2f4206d5d50eaab383cdc4f5c57179e285b93649c028a69dd9e2a4a45b69afe3 SHA512 e3da3f7b98edd32da5c3381afc3e92021b92416d7ea9de0423a05c06bc9ff808e28d29ca9f689c0029809a4b1643819954039516d6ab5890bb5512f5fe99fd6d WHIRLPOOL 815f83ae08bb6a37ee1774a718a8c3b4087ee9a95f190b8a77453f0d1ba1ca88a331e8be12b2f63d0c1fdb9472f2ff35786b94eaf1f61f5cb33fe1e6d9e4e460
 DIST go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz 49485 SHA256 c32b90e67762a375981b38154cae65222bb1aaa7722727d0225d5f8de773e4c8 SHA512 e4141e664c3237f7ab4c283b110d04e933bfb36a9d57af374ab42fed00a4ad6d8399e3399b206eebe76c5e142746412b2ada6c20b1ec09088f3bb7d82a7b01a9 WHIRLPOOL 1434e72897de4063515a0d3319e96b066406c110e3e36f710970886ba6ec9411f71908d9696a4528ee0fcb88bea54ab9c064faa230761ce38b82bb5506a2c073
+DIST go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz 49488 SHA256 eeffbd458f4996334275f828cfd3549d32a2ba6eda359e5c9be09f091548781f SHA512 7e60a122cca007bf5455d6e15f77c24eaa5739deedc9e0c158282249e84698f873628bffa9eb7d23c1c59bda7632b1968ca770c8e1796e2d50750ac86e80fcb2 WHIRLPOOL 41745e39256ef510d42c4da413609e3bdd0621cc2acccfddabb4c8774e47b73ad46656639bed3fac2335cf1b6a2a245d3b8b4f3831cfafb2c6e7ecb90293475d
+DIST go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz 8792 SHA256 734fdf39b7fb299ecf18e65f72ac3f1929bd978618af575e8bcad9e5ca55b494 SHA512 8a3e37ac07bbd571dd8b76bd8c119e5dbc620444e78a6f9fe2c4d28b0171a46704a0b088380ca201a08f7235698f07de4e4881691aef5370739c8bfe2db9e85b WHIRLPOOL 7b501d47880ad570dd79d2da79cc10373b03426f7f89b513f3b3b195682b0b36aeefac675a56070c262ee7e0d31ff9a564a9667924b1da66957ad0f97ab2d46c
 DIST go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz 8058 SHA256 af90f9be029c091eb011ff25d270772fdb51edf3c6396cf99f224c4e7ad724c3 SHA512 f5cb12407f9bc986867a274c623037edab04f8e2b664c7d4db3bb7e32f970dd073a3d233d18549a5f01b5e88abff0eb0c1fcf79b6696a531c208e6fe8137080e WHIRLPOOL c997792a5c1b3029b32d0fad3a55a281b5ced2bef306367a1fd49df75cab831b93a3752e76f8a18ce5d08e155f66b3826aa5d9878fb9655821cef7a69b71de31
 DIST go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz 5446 SHA256 f4e628adceee06d7717dce0bf566d5ebd8c009599807f2436b3cda259011b331 SHA512 350904076752e2fda17e9c2891a50b037d2ca165924880d6d5e466b8ed76685d79ff00bbbfbe9a665668e0ebde23c87129d3c1c4bf27ffe0c034df160db9d08f WHIRLPOOL 8571b9e818904a56ea16c35883725013d2009dc294acfdf4f28920a03baff36ffcd3d4d6d8be0ecfc78eefbfeef57e4b2ca224f2ce37d665caae724389346f88
+DIST go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz 5484 SHA256 4b5ac4fe94fb221c849b0e9694301eba2dc91ac1a6b79cee48da038cb1a3d2aa SHA512 e76b6eb6e23f3f1872486e1ad0cfe9e4dcd676a1bee62cfb2e2de28ead2defb8997adadfc48781d910b327fc777c4b38acca1e983a0fb14dd73142f4edb97337 WHIRLPOOL 391097c2c1f7e2a170b41d752595480454d036e9c35dd4ff08678d103a5bd2baddedb3a4a7ce89ca938408fa234be3a63bc74461c09bbfea212d016efa7c3028
+DIST go-reap-2d85522212dcf5a84c6b357094f5c44710441912.tar.gz 8469 SHA256 919b889e2fa550e97b6b2254983cb4e826772ebf5237a787c65217caa244efa0 SHA512 aec1ab90bf1a461e0031f4e3015585129be095896bc40c4188f01d3295b95565f544271ee51d284936d504097831bfee979ba9002bf2749805e565ae6991b066 WHIRLPOOL cda564739e7f49621eb1fb26eecd1b2bc22df673206ffe1877b78eaf08b587fcab80976cfc1452349111d519cae1e46e07fc8f00578355f67741b0dec1c37a18
 DIST go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz 4397 SHA256 378f5249729661db9d0c65030fbf636f6ec1d60ee926e67abf8c6dd7921d3907 SHA512 42257d0599936bb215f4a9f9189518418f02bc43e4d7417823ea460bfc45c6fd1f9b0bf5a35dd73881b57cd9e892c702b813a68fe6e417e82dd31c6635c1b24e WHIRLPOOL 26cf1464bf0899ae9bad0067481f57a121433c5fe7c93fef92523a157d7906b8c1c4216c2a4fe738222e4afaa85fc0a7b7b29149254125a3e8b2e7064add6cb1
+DIST golang-lru-5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz 12310 SHA256 9eb4e0d57ee38d379a1940a6970e7e4b8073e14dcfdbd83a5bdfadfd73635a2e SHA512 1fd87ae7707d1b01955896b55075237939d00eb58510a4af9e07f752222171cbdf294a98309cacee947629b577bd8c3e69c635212a56d96d2b6edf82e7720820 WHIRLPOOL 6d7ff2e77000654efcad5dd287e87800c671f20a23423951dd7c4b05e38b12df778d021ca601b19e2ab25ad966d9730796ebfdc6fc49e39059f68d6f9a31cc2f
 DIST golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz 7872 SHA256 cac6e889020e8b31e46d50b98e0af9acbb44bf352ad0ca9d30db79b6235849e2 SHA512 29eee70cbdc9c712d1cece1f911f3a74ebfd44318b91dcd1932f0bff031286f0a80db93772dd04be350c0cca3cc77c0676659ef0f85229f31a1140e23c1fc3f5 WHIRLPOOL c4711d30caf5c2d880aeec7330bc06011dc4e741e305f6dcac8d983734b3706cb5967b06755f7684370ca61a91f356a97c9866ffda0e275e26bb11d3a74d0145
 DIST gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz 100298 SHA256 de5119016d4e12885c474f4f1e682c80984b464a0ae2809f28699aeba1badc68 SHA512 f8f0268b49a091166302440ee34e40ff89a4c6adacfcd2daa62161a04f8ebe2a5e66074c125afa40147eba7493ce5fd5fb75e33b3955ef9f0f836ecc409603a3 WHIRLPOOL bdc42de4d1b8fecd2a9770745d8b80ebaf3afc3471e672e4dd512f8e60272d9cfd7d6991ecafd424f20036b55b894e5befde81281b0a01fefc274df57044050e
+DIST gox-39862d88e853ecc97f45e91c1cdcb1b312c51eaa.tar.gz 15118 SHA256 c884282ebb143a037975418d0c3a73843d5147f73af6723d19b6177d369f4fcc SHA512 7c8934def51b370824a357716aeaf85dd0728a3007e60a31a0ef7cbb4e1ebb68d5ea58f883dac12985bf97a1bfd725108161912e2332f4f160a80e016cab85d1 WHIRLPOOL 4097b31a867d5cf39ea52d3729c38ddd009c660e87d026a067f6e255bdb2d15b81a9d1b11c6e45916b9e9ac672e7c2217d34d0f93c651c86b3c954e9177de5c7
 DIST hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz 28692 SHA256 109ec067ff8ff7f30538e0d2ba1384c1fe25694c99d56972003b1c669d19d0b2 SHA512 90f568373d20cccbb56ada29257bd2ea808bbacb668fd1b82e71abf8f5e2592b4a58dc5d3f1174a2b38c660316cd0227eb333e747aae7a846e94168ebe9d2297 WHIRLPOOL cf5685f25d3c3b69d330e30ad089e2cbc9c6636b0f2ac4933638d6bcad06aa5a50f92d5228a1f1ddabd5e0f8187bc5b16f38f4a3bd86bbbf161a5409d5102ec0
+DIST hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz 54677 SHA256 5656a59a398dc22d383d8daf33c410dcc1c21894d0053df5f7263d3a65f85fd9 SHA512 a430b7a4be9147e0fad3d932ecaee5970f049991351654682c679ace971e883615f957255d81da3dc2f732b0bfa26d66eb73ec7811957f05c2f72c2c506c23cd WHIRLPOOL d6dddcfbc53bc68fdf3971829bf8f0662e47a447682b37306424dd91ee2cc3d0280c7c368b3a8ded9f2127b2789b7b68648de9beaf9f9847cedb7324c2605dbf
+DIST iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 SHA256 71c117246bb1d4d78ad5c3bc5d301942bcebaae5b1e35da1ad7851ceac71a675 SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c WHIRLPOOL 15dfd50bfc992a7b6a1b5d672d5bf9bfcb71a357eae371eac773e7fe9ad4ec8d4d0578e0dc6b12bb14689d1497129616b0eb300bbcb483a6865ac315bced562a
+DIST logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz 7717 SHA256 a58c8a6112b9ca2eb193d75996a54699f572411f3146d8ba62377af4a9fb933a SHA512 54e55f95808fb68be532e35076ffb04ff844a7d032530b82bbdd87f809bd1b0585538964cc22c7ae1cc039c5c30a02eca9734734c0c01ad76a14bd5a4c386426 WHIRLPOOL 0086485565e6fae835f54a1bb00a40660650c6018a6e79e05ba15120a59a6552ba60d86bfd63f7bc5cd8b331984fcdbe7162ef24d257bcc18a7fd8e6c028dd80
 DIST logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz 7704 SHA256 9b2173d9277574adbc45400101cb0b65534a5cd3defe62eeb3bff652eeb3e34c SHA512 9a4444fbae3bd1c0b2391981edf2f8155ebdd90a14a367f718bc7bcdced68b37b563ae38141fc3cb35409ff70820bd32b5a44cb218630418bce37f78181ef109 WHIRLPOOL 4973a7ef035807c9ef1135cface87cce4707910e6c33cece87dc8200df5e3d3c351d129ce20214e2cbf6bf58a7b040e9d1c5e12f5414cf37e45890a6a8ec439c
+DIST mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz 13977 SHA256 3b2873f0e7e7a37f1b809493717033c1257bf41a9996e336746d83556df68240 SHA512 f495fe99c8ce752830b3d36db445cdc32baac6e266a0862d13e7e80e04f412ae7ee85e13ba794f1cfae3effb226007874c8ee819a4ef568ce2884077dfba4f9c WHIRLPOOL e3cf27de3f414014f9f068f66540daeeb90e10d69196a117a1e3a06c02cd096f5d711657c19c8ffdc26bf6a399a45fb9f78e96e26335f788baf7695785b7b90f
 DIST mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz 12220 SHA256 b4fa5d3b888734f849c5d6784fc1c5749e4ece168fda65c604676fca39c085d2 SHA512 de79f2579a086cccc047b280ae7e2b5dc5f8a95d504ead9d7f0cbaf01e70d37cb4eea8e7ab9aec446a7c2f1771152add3e2e488c18963d63ca3dac43ed2a33b7 WHIRLPOOL ecf8bd2bc9e50bb9e5ad3b6ebb04f5fdc10cf0e515f25d1381bbd1591c074887706b7c25f03a749ff212555fc537534056dab58eaece9357de9045ba2edd9a51
 DIST memberlist-6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz 51853 SHA256 7b808ff100db2e484e6cf338d32ed55512f4c371c5cbba498aeca632f21c830f SHA512 fb70a58c6914919e68210bd2486051e64bdbb03475dc02734b7c03ed51e7537ca19162264bffafb83eccf7ebd24ae7d6f9b400f23be0aeae9d80210addd91de2 WHIRLPOOL 981208444af8343157837c6cd3cb2ae886b1078d27c40f9cbff2a7acd52c682b1e29b9743bef7a709aafa35c3a5f9c1345578c27fb89f7330128e53ba435415a
+DIST memberlist-9888dc523910e5d22c5be4f6e34520943df21809.tar.gz 56833 SHA256 fb61ee9881d9d5a7bb0f8a50f86374e6360b7a4d75b6724999a6924cbc45ed34 SHA512 8941f0b138590b7d2b2e75c02e6c063b7146eb2a65b75ec48c341745ed60d6451b563f49db8bf4f693936b528c0e3f6c8d88b4b6e25d6ac4721aec36306b88db WHIRLPOOL 826a64eb649c5dd11e00f99ef0d711cd3b4cfbf03c16c9158a23ac95d55904e9a6a133b69b7f224a282a3142cd3f5971a7731a48833ca0baa9c651c8b4d95a18
 DIST muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz 25816 SHA256 237354d5acf550d05d20841e0ec6e88cea29ece70fdf8fc73a2d59884ea6be01 SHA512 2ce026db7d0dbe3704e5855970126658c33f45c28ab7c0ad60ab5dcd3c107ea9a3a2617efa59d89148c0dbbfa5dd2c30358e6b5855d9525772685e2c676b3e8e WHIRLPOOL 1a992c5ba09b9bce80dac43d5df2d0d6c72402e7b63cd56a168db5ceecbc6a7c5fad4b51f6e725c21d4e619dbc052270cacfcaf2d0d58dab7accf69eda49a6f4
+DIST net-rpc-msgpackrpc-a14192a58a694c123d8fe5481d4a4727d6ae82f3.tar.gz 2946 SHA256 c233ef14bdc51ed68800c06d71eaa394ad84341e3bf0cf0abfcb063486396816 SHA512 d9876a3c3ea3141240ec69c19703cb258cc6e5ba213f04d0bdf60a8741c8301204d94cc82fa037896eb2f8034f54b8471ede290cb3fb2b7033edaf2fef8000a9 WHIRLPOOL 428bf8a727de251419cf219fa26587c781ac9c59e2ccd033c7b6960e5363edeaf936d49c199d4e3103e6ab153eb17f029432d8d7031a07f8cfeb28df6b60ddbd
 DIST net-rpc-msgpackrpc-d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz 2805 SHA256 0eb8244654cf9e461ce6338cdb7c6ab28dc118d425497e5f6045808e24932a0f SHA512 635c48bbbdce634fee720038a77a2c80f19a3b1e44cef1566b6eda6623bd00d1bf7cc89eb621517d620917c26f0ee80a23006edd903f8f03cf9d18e64b16ecfe WHIRLPOOL 7874f34649b22630d11f03655a35943b03375575cf5140e2d0de2194bab17b95489afa572fa19137a8001558d4139eae0e84b61b6604aa4d08a771af9f619467
+DIST raft-057b893fd996696719e98b6c44649ea14968c811.tar.gz 60617 SHA256 0a97044468f5a7b0640296c0bf25c9b66c2f78a6df9fdd8bf8ea5d624549ea93 SHA512 cc98717d405e3ee2479d44d79a98228faba3ca3ff41064490dde7555ca35bc65d3a8765778298fd0372b6a8afd0b00e5a557b8ad736709a0534c3fc85f61f3d7 WHIRLPOOL 74fd868a541d356284482c4af37b8affd61bf9588ec8c8f631cdb65d5c019cb5e4c78472b2fe111b137bf3aaf414c49c994e03a08522342047cd140df20986c6
 DIST raft-a8065f298505708bf60f518c09178149f3c06f21.tar.gz 56934 SHA256 a952ce8348085be36a1accbb7555e8c5a1a1c2292066d1966f17994ec90276ef SHA512 66aae260f4aa2b0a64669ff7abf4975fc933a7b873454c63a5eea807d5028360ba9f0396f3f9ac78136d96003af23b50ab4b922bad2b4f821db4faf057ce35ff WHIRLPOOL dd9f36d0213228717c428db9132f67a9efbdd882da1f320cb7893cd40ce569dd981c8aa4542f1d43f2bdc8ceb5b891197d45cbfa7bf055a3a69a4a98471bd0b5
 DIST raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz 8881 SHA256 490ced07cc72baede9b997dcf92499fa0d4298926fbc51ee632bde3d3ea0979e SHA512 4f98cf8cf375561f255822cbd21b6926d3bd12ff2a1d9307b59ce5e12628034f197f6efc85d9cc9cf951eac7402b36954c2ea686bb033075ec840106614f2039 WHIRLPOOL 337d399c6b73893bb72d77a77e6b2c7b5ee914d191b719dec13f72975c0a4ece1ee6a902d32197bbf0f0300bdc3ce8efda082363a1e79a7d3f2d8aec6eb2d436
 DIST raft-mdb-4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz 9811 SHA256 9873fa73d17174e0e7175216848a2a7c58a9c66701459ed4d4866ab063ef58c1 SHA512 a592adb161dc9c8e40b17606ec0366e61c7ab76d7fb9f074d01abfb1ba1b1f7629582ce103e39989c269d1d49506b4ac24b7a265161aad2c855b60df7e02169b WHIRLPOOL 65f3f2ec309e0d7c0ab6246853fc584a4abb64cf6a09657dad047d4be89509177aabdd149360aa506281187068a1ee0dc465dd717be3479315a3e602794f7a1b
+DIST raft-mdb-55f29473b9e604b3678b93a8433a6cf089e70f76.tar.gz 9812 SHA256 c656165f8eafebd8a1c988007ffc6dc1da47b948fa74e103c2d486025558cd44 SHA512 5cebfe48dbd6eaaa90ac43b369ee8dd5125a2edeb3e838158ed279e73acdd3b9e3e436d3b8af7ee58cabfa32bc5c6de4ef904fe3686e2f88559b8c868370b2a2 WHIRLPOOL 01d01923b977a8bce9658ff081001e4c490fc8d90bc322177facc3169739fb24ee27a9267cdcc693707573b647d9ccce8c70a7193ad5a2862e098cfb6553e551
+DIST scada-client-84989fd23ad4cc0e7ad44d6a871fd793eb9beb0a.tar.gz 15815 SHA256 52b78dae0c5078e69cdee10f20618f341d2973263ee389d880af4b2b95683873 SHA512 703e1f575193aec6d3592c6df0c0eef40d75cc9634697812abe55dd1e7c4c5a1af156a708e5227a0c9853e26b22a185e5365f142939eaad890488ffe564279cd WHIRLPOOL b36655ab49d57e1a6b655ba16ad514d9ec705466caf0c2c1ceb555876e99aa44ab47c8c4a37e65a81cc9db00d481ee8e902a36343f06abe6367c59d0aea08bb1
 DIST scada-client-c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz 15805 SHA256 74d7195f4d7b213cb82278ed34c16808a79923be9009aab7e8f1267d5a6675f7 SHA512 dab4b8b2bd6e57727e89e22eec89f0b381cf492797364e8891f2308e381290f4d7359edc5833b47e260e27cce77d7fed32672889c45f24397ad6ae06bb027642 WHIRLPOOL c04510ca20ff25ef4521d2e71b0f27abfdf484bfe24680ee9b92502e93dc1d8bce9e468ce5202f175a7cbc20d787e74618392a1f8f3d8858db303dec46e2d424
 DIST serf-558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz 572608 SHA256 ccc9f543adb1c41e0541fd6f0d302e4a7b4e2b1695de695466d5c9e572971edf SHA512 7c6c1c8ae40952311a3a722d0f10b9e236bac1f291e4cd2014ccde495e3ab4b8f0922e619ac90e8bd38ed6b20db6238d66e786ef0f25cab2540663004672334e WHIRLPOOL 9623ab60e0547781f7de058ba96fa6d8bc447b898500054578bdfc3d9dcae531e701e604d3d3cd323143a67f8c6af5b6fb5b1aba37368deccdd43e268f0d8144
+DIST serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz 579000 SHA256 6c74d90b84c402c684e27a8948ba54074ad368ed121945d21b9c00135cdf7c74 SHA512 eced133c2ba261e4e39d16f2252f555611e90f23f70a746a6f8d60b24e6747e73e619ec74f10a1c0646ec5edfd731cd79f6700d9bc5fb7b100723aac32203a5f WHIRLPOOL eaa15ec8dcdfeeb490cea4e9af24c8507dba09583f5e02919fd71607bfed8c999f872d3c8dd818378f79ade5fd065e1c2e270dda8ff428848c409f7922196478
+DIST speakeasy-36e9cfdd690967f4f690c6edcc9ffacd006014a0.tar.gz 6906 SHA256 bee6fff18fc5af06302cb0d1c2754bba4873698fbbd2d265bb65ed2fcbd221f4 SHA512 c1079fa3a1c485792b3cbb738a4589c11ecd01d89104c33d77c6ce2e865a20d6191f9752f5d93537d05551cf1a67351c64e11dbe36e29d5426b6d29e42516147 WHIRLPOOL c10b39c7764a08f5c7d212e839163c4758a2c38ac4085bfca8dbf55006212c029cfdaad9d8fe2a3c80b095db8733c51359055743b79579a8bfb8d6e397fef5e5
 DIST yamux-b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz 19249 SHA256 e4ca04b27f2899bd04033d4bb8cf2c5d0eac6e916c87851ded9cfa57d1f70b5f SHA512 9e889a25c20e1de7ffc59d785fba574152689303c41055ee0cb046fa18346df23ce875e1dce6607e3a0a7211b336c6033b66073ae811b7a08aa121bf147dcf1d WHIRLPOOL 3fb8dd868ba126f6044685a848260451ebe611332ecda152145243b150b995fcaa7c36a8205bcc97af00975c2b44901fb1731a8e6a78f40bc2a22a76b3bc7951
+DIST yamux-df949784da9ed028ee76df44652e42d37a09d7e4.tar.gz 21619 SHA256 7149ade3006a4458a190b73876f41ec03023c04a48d1068b75726a91102fc9f0 SHA512 bca9909319d5610b6d12ae8bb78afec97bb9b61119e10a22011699b3197d1ad3bf75cb143a9fd87a3eda69014439a8350d1c6993664c8d6e00e34796ce40d117 WHIRLPOOL 57cc271f221107b4fe9776fd5fe00a3a0c9c098cd032c3db3f471c7104c325adce2ed02f8fd27d6744d08dbc44ee0c986e330559727b5e369174607b03951ded
--- a/app-admin/consul/consul-0.5.2-r1.ebuild
+++ b/app-admin/consul/consul-0.5.2-r1.ebuild
@ -129,6 +129,7 @@ src_install() {
 	keepdir /etc/consul.d
 	insinto /etc/consul.d
 	doins "${FILESDIR}/"*.json.example
+	rm "${ED}etc/consul.d/ui.json.example" || die

 	for x in /var/{lib,log}/${PN}; do
 		keepdir "${x}"
--- a/app-admin/consul/consul-0.5.2.ebuild
+++ b/app-admin/consul/consul-0.5.2.ebuild
@ -1,160 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit golang-base systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="http://www.consul.io"
-GO_PN="github.com/hashicorp/consul"
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="test web"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.4
-	dev-go/go-crypto
-	test? ( dev-go/go-tools )
-	web? (
-		dev-ruby/sass
-		dev-ruby/uglifier
-	)"
-RDEPEND=""
-
-SRC_URI="https://github.com/hashicorp/consul/archive/v0.5.2.tar.gz -> ${P}.tar.gz
-https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz -> circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz
-https://github.com/armon/go-metrics/archive/a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz -> go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz
-https://github.com/armon/go-radix/archive/0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz -> go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz
-https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz -> gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz
-https://github.com/boltdb/bolt/archive/2c04100eb9793f2b8541d243494e2909d2112325.tar.gz -> bolt-2c04100eb9793f2b8541d243494e2909d2112325.tar.gz
-https://github.com/hashicorp/consul-migrate/archive/v0.1.0.tar.gz -> consul-migrate-0.1.0.tar.gz
-https://github.com/hashicorp/go-checkpoint/archive/88326f6851319068e7b34981032128c0b1a6524d.tar.gz -> go-checkpoint-88326f6851319068e7b34981032128c0b1a6524d.tar.gz
-https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz -> go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz
-https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz -> go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz
-https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
-https://github.com/hashicorp/golang-lru/archive/995efda3e073b6946b175ed93901d729ad47466a.tar.gz -> golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz
-https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz -> hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz
-https://github.com/hashicorp/logutils/archive/367a65d59043b4f846d179341d138f01f988c186.tar.gz -> logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz
-https://github.com/hashicorp/memberlist/archive/6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz -> memberlist-6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz
-https://github.com/hashicorp/net-rpc-msgpackrpc/archive/d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz -> net-rpc-msgpackrpc-d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz
-https://github.com/hashicorp/raft/archive/a8065f298505708bf60f518c09178149f3c06f21.tar.gz -> raft-a8065f298505708bf60f518c09178149f3c06f21.tar.gz
-https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz
-https://github.com/hashicorp/raft-mdb/archive/4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz -> raft-mdb-4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz
-https://github.com/hashicorp/scada-client/archive/c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz -> scada-client-c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz
-https://github.com/hashicorp/serf/archive/558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz -> serf-558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz
-https://github.com/hashicorp/yamux/archive/b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz -> yamux-b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz
-https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz -> muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz
-https://github.com/miekg/dns/archive/bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz -> dns-bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz
-https://github.com/mitchellh/cli/archive/6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz -> cli-6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz
-https://github.com/mitchellh/mapstructure/archive/442e588f213303bec7936deba67901f8fc8f18b1.tar.gz -> mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz
-https://github.com/ryanuber/columnize/archive/44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz -> columnize-44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz"
-
-STRIP_MASK="*.a"
-S="${WORKDIR}/src/${GO_PN}"
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-get_archive_go_package() {
-	local archive=${1} uri x
-	for x in ${SRC_URI}; do
-		if [[ ${x} == http* ]]; then
-			uri=${x}
-		elif [[ ${x} == ${archive} ]]; then
-			break
-		fi
-	done
-	uri=${uri#https://}
-	echo ${uri%/archive/*}
-}
-
-unpack_go_packages() {
-	local go_package x
-	# Unpack packages to appropriate locations for GOPATH
-	for x in ${A}; do
-		unpack ${x}
-		if [[ ${x} == *.tar.gz ]]; then
-			go_package=$(get_archive_go_package ${x})
-			mkdir -p src/${go_package%/*}
-			mv ${go_package##*/}-* src/${go_package} || die
-		fi
-	done
-}
-
-src_unpack() {
-	unpack_go_packages
-	# Create a writable GOROOT in order to avoid sandbox violations
-	# or other interference from installed instances.
-	export GOPATH="${WORKDIR}:$(get_golibdir_gopath)" GOROOT="${WORKDIR}/goroot"
-	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
-	while read -r path; do
-		rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
-		"${GOROOT}/pkg/linux_${ARCH}/${path#${WORKDIR}/src}" || die
-	done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
-}
-
-src_prepare() {
-	# Avoid the need to have a git checkout
-	sed -e 's:^GIT.*::' \
-		-e 's:-X main.GitCommit.*:" \\:' \
-		-i scripts/build.sh || die
-
-	# Disable tests that fail under network-sandbox
-	sed -e 's:TestServer_StartStop:_TestServer_StartStop:' \
-		-i consul/server_test.go || die
-	sed -e 's:TestRetryJoin(:_TestRetryJoin(:' \
-		-i command/agent/command_test.go || die
-}
-
-src_compile() {
-	emake
-
-	if use web; then
-		pushd ui >/dev/null || die
-		emake dist
-	fi
-}
-
-src_install() {
-	local x
-
-	dobin bin/*
-	rm -rf bin
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners consul:consul "${x}"
-	done
-
-	if use web; then
-		insinto /var/lib/${PN}/ui
-		doins -r ui/dist/*
-	fi
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-
-	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
-	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete
-	while read -r -d '' x; do
-		x=${x#${WORKDIR}/src}
-		[[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
-			-f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
-		rm -rf "${WORKDIR}"/src/${x}
-	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
-	doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
-	insinto /usr/lib/go/src/${GO_PN%/*}
-	doins -r "${WORKDIR}"/src/${GO_PN}
-}
--- a/app-admin/consul/consul-0.6.3.ebuild
+++ b/app-admin/consul/consul-0.6.3.ebuild
@ -0,0 +1,163 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit golang-base systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="http://www.consul.io"
+GO_PN="github.com/hashicorp/consul"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.4:=
+	dev-go/go-crypto:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/armon/circbuf/archive/bbbad097214e2918d8543d5201d12bfd7bca254d.tar.gz -> circbuf-bbbad097214e2918d8543d5201d12bfd7bca254d.tar.gz
+https://github.com/armon/go-metrics/archive/345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz -> go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz
+https://github.com/armon/go-radix/archive/4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz -> go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz
+https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz -> gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz
+https://github.com/boltdb/bolt/archive/ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz -> bolt-ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz
+https://github.com/bgentry/speakeasy/archive/36e9cfdd690967f4f690c6edcc9ffacd006014a0.tar.gz -> speakeasy-36e9cfdd690967f4f690c6edcc9ffacd006014a0.tar.gz
+https://github.com/DataDog/datadog-go/archive/bc97e0770ad4edae1c9dc14beb40b79b2dde32f8.tar.gz -> datadog-go-bc97e0770ad4edae1c9dc14beb40b79b2dde32f8.tar.gz
+https://github.com/fsouza/go-dockerclient/archive/296e36969d9d7606c4a6cbcd38eced50a39a0fd1.tar.gz -> go-dockerclient-296e36969d9d7606c4a6cbcd38eced50a39a0fd1.tar.gz
+https://github.com/elazarl/go-bindata-assetfs/archive/57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2.tar.gz -> go-bindata-assetfs-57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2.tar.gz
+https://github.com/hashicorp/consul-migrate/archive/v0.1.0.tar.gz -> consul-migrate-0.1.0.tar.gz
+https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
+https://github.com/hashicorp/go-checkpoint/archive/e4b2dc34c0f698ee04750bf2035d8b9384233e1b.tar.gz -> go-checkpoint-e4b2dc34c0f698ee04750bf2035d8b9384233e1b.tar.gz
+https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz
+https://github.com/hashicorp/go-immutable-radix/archive/12e90058b2897552deea141eff51bb7a07a09e63.tar.gz -> go-immutable-radix-12e90058b2897552deea141eff51bb7a07a09e63.tar.gz
+https://github.com/hashicorp/go-memdb/archive/31949d523ade8a236956c6f1761e9dcf902d1638.tar.gz -> go-memdb-31949d523ade8a236956c6f1761e9dcf902d1638.tar.gz
+https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz
+https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz
+https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
+https://github.com/hashicorp/go-reap/archive/2d85522212dcf5a84c6b357094f5c44710441912.tar.gz -> go-reap-2d85522212dcf5a84c6b357094f5c44710441912.tar.gz
+https://github.com/hashicorp/golang-lru/archive/5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz -> golang-lru-5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz
+https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz
+https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz
+https://github.com/hashicorp/memberlist/archive/9888dc523910e5d22c5be4f6e34520943df21809.tar.gz -> memberlist-9888dc523910e5d22c5be4f6e34520943df21809.tar.gz
+https://github.com/hashicorp/net-rpc-msgpackrpc/archive/a14192a58a694c123d8fe5481d4a4727d6ae82f3.tar.gz -> net-rpc-msgpackrpc-a14192a58a694c123d8fe5481d4a4727d6ae82f3.tar.gz
+https://github.com/hashicorp/raft/archive/057b893fd996696719e98b6c44649ea14968c811.tar.gz -> raft-057b893fd996696719e98b6c44649ea14968c811.tar.gz
+https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz
+https://github.com/hashicorp/raft-mdb/archive/55f29473b9e604b3678b93a8433a6cf089e70f76.tar.gz -> raft-mdb-55f29473b9e604b3678b93a8433a6cf089e70f76.tar.gz
+https://github.com/hashicorp/scada-client/archive/84989fd23ad4cc0e7ad44d6a871fd793eb9beb0a.tar.gz -> scada-client-84989fd23ad4cc0e7ad44d6a871fd793eb9beb0a.tar.gz
+https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz
+https://github.com/hashicorp/yamux/archive/df949784da9ed028ee76df44652e42d37a09d7e4.tar.gz -> yamux-df949784da9ed028ee76df44652e42d37a09d7e4.tar.gz
+https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz -> muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz
+https://github.com/jteeuwen/go-bindata/archive/a0ff2567cfb70903282db057e799fd826784d41d.tar.gz -> go-bindata-a0ff2567cfb70903282db057e799fd826784d41d.tar.gz
+https://github.com/mattn/go-isatty/archive/56b76bdf51f7708750eac80fa38b952bb9f32639.tar.gz -> go-isatty-56b76bdf51f7708750eac80fa38b952bb9f32639.tar.gz
+https://github.com/miekg/dns/archive/85b661b2a6fc95a5a83e66d7730c4bc0b6e9c99e.tar.gz -> dns-85b661b2a6fc95a5a83e66d7730c4bc0b6e9c99e.tar.gz
+https://github.com/mitchellh/cli/archive/cb6853d606ea4a12a15ac83cc43503df99fd28fb.tar.gz -> cli-cb6853d606ea4a12a15ac83cc43503df99fd28fb.tar.gz
+https://github.com/mitchellh/gox/archive/39862d88e853ecc97f45e91c1cdcb1b312c51eaa.tar.gz -> gox-39862d88e853ecc97f45e91c1cdcb1b312c51eaa.tar.gz
+https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
+https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz
+https://github.com/ryanuber/columnize/archive/983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz -> columnize-983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz"
+
+STRIP_MASK="*.a"
+S="${WORKDIR}/src/${GO_PN}"
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+get_archive_go_package() {
+	local archive=${1} uri x
+	for x in ${SRC_URI}; do
+		if [[ ${x} == http* ]]; then
+			uri=${x}
+		elif [[ ${x} == ${archive} ]]; then
+			break
+		fi
+	done
+	uri=${uri#https://}
+	echo ${uri%/archive/*}
+}
+
+unpack_go_packages() {
+	local go_package x
+	# Unpack packages to appropriate locations for GOPATH
+	for x in ${A}; do
+		unpack ${x}
+		if [[ ${x} == *.tar.gz ]]; then
+			go_package=$(get_archive_go_package ${x})
+			mkdir -p src/${go_package%/*}
+			mv ${go_package##*/}-* src/${go_package} || die
+		fi
+	done
+}
+
+src_unpack() {
+	unpack_go_packages
+	# Create a writable GOROOT in order to avoid sandbox violations
+	# or other interference from installed instances.
+	export GOPATH="${WORKDIR}:$(get_golibdir_gopath)" GOROOT="${WORKDIR}/goroot"
+	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+	while read -r path; do
+		rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
+		"${GOROOT}/pkg/linux_${ARCH}/${path#${WORKDIR}/src}" || die
+	done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
+}
+
+src_prepare() {
+	# Avoid the need to have a git checkout
+	sed -e 's:^GIT.*::' \
+		-e 's:-X main.GitCommit.*:" \\:' \
+		-i scripts/build.sh || die
+
+	# go install golang.org/x/tools/cmd/stringer: mkdir /usr/lib/go-gentoo/bin/: permission denied
+	sed -e 's:golang.org/x/tools/cmd/stringer::' -i Makefile || die
+
+	# Disable tests that fail under network-sandbox
+	sed -e 's:TestServer_StartStop:_TestServer_StartStop:' \
+		-i consul/server_test.go || die
+	sed -e 's:TestRetryJoin(:_TestRetryJoin(:' \
+		-i command/agent/command_test.go || die
+}
+
+src_compile() {
+	PATH=${PATH}:${WORKDIR}/bin XC_ARCH=${ARCH} XC_OS=${KERNEL} emake
+}
+
+src_install() {
+	local x
+
+	dobin bin/*
+	rm -rf bin
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+	rm "${ED}etc/consul.d/ui-dir.json.example" || die
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+
+	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete
+	while read -r -d '' x; do
+		x=${x#${WORKDIR}/src}
+		[[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
+			-f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
+		rm -rf "${WORKDIR}"/src/${x}
+	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
+	insopts -m0644 -p # preserve timestamps for bug 551486
+	insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
+	doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
+	insinto /usr/lib/go/src/${GO_PN%/*}
+	doins -r "${WORKDIR}"/src/${GO_PN}
+}
--- a/app-admin/consul/files/ui.json.example
+++ b/app-admin/consul/files/ui.json.example
@ -0,0 +1,3 @@
+{
+  "ui": true
+}
--- a/app-arch/tar/tar-1.28-r1.ebuild
+++ b/app-arch/tar/tar-1.28-r1.ebuild
@ -14,13 +14,13 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl minimal nls selinux static userland_GNU xattr"
+IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"

 RDEPEND="acl? ( virtual/acl )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.10.35 )
-	xattr? ( sys-apps/attr )"
+	xattr? ( elibc_glibc? ( sys-apps/attr ) )"

 src_prepare() {
 	if ! use userland_GNU ; then
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@ -7,16 +7,16 @@
    defined by RFC4880.
  </longdescription>
  <use>
-    <flag name='smartcard' restrict='&lt;app-crypt/gnupg-2.0.17-r1'>
+    <flag name='smartcard'>
      Bring in <pkg>dev-libs/libusb</pkg> as a dependency; enable
      scdaemon.
    </flag>
-    <flag name='smartcard' restrict='&gt;=app-crypt/gnupg-2.0.17-r1'>
+    <flag name='smartcard'>
      Build scdaemon software. Enables usage of OpenPGP cards. For
      other type of smartcards, try
      <pkg>app-crypt/gnupg-pkcs11-scd</pkg>.
    </flag>
-    <flag name='usb' restrict='&gt;=app-crypt/gnupg-2.0.17-r1'>
+    <flag name='usb'>
      Build direct CCID access for scdaemon; requires
      <pkg>dev-libs/libusb</pkg>.
    </flag>
--- a/app-emacs/pymacs/metadata.xml
+++ b/app-emacs/pymacs/metadata.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
-<herd>python</herd>
-<upstream>
-  <remote-id type="github">pinard/Pymacs</remote-id>
-</upstream>
+  <herd>emacs</herd>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="github">pinard/Pymacs</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-emacs/pymacs/pymacs-0.25-r2.ebuild
+++ b/app-emacs/pymacs/pymacs-0.25-r2.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit elisp distutils-r1 vcs-snapshot
+
+DESCRIPTION="A tool that allows both-side communication beetween Python and Emacs Lisp"
+HOMEPAGE="http://www.emacswiki.org/emacs/PyMacs"
+SRC_URI="https://github.com/pinard/Pymacs/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc"
+
+DEPEND="doc? ( >=dev-python/docutils-0.7
+			virtual/latex-base )"
+RDEPEND=""
+
+DISTUTILS_IN_SOURCE_BUILD=1
+SITEFILE="50${PN}-gentoo.el"
+
+# called by distutils-r1 for every python implementation
+python_configure() {
+	# pre-process the files but don't run distutils
+	emake PYSETUP=: PYTHON=${EPYTHON}
+}
+
+# called once
+python_compile_all() {
+	elisp_src_compile
+	if use doc; then
+		VARTEXFONTS="${T}"/fonts emake RST2LATEX=rst2latex.py pymacs.pdf
+	fi
+}
+
+python_install_all() {
+	elisp_src_install
+
+	sed \
+		-e '/pymacs-python-command/s:"python.*:"python":g' \
+		-i "${ED}"/${SITELISP}/pymacs/pymacs.el || die
+	elisp-compile "${ED}"/${SITELISP}/pymacs/pymacs.el
+
+	distutils-r1_python_install_all
+	dodoc pymacs.rst
+	use doc && dodoc pymacs.pdf
+}
--- a/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild
@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	S="${WORKDIR}/${REPO}"
 	live_eclass="mercurial"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	UPSTREAM_VER=
 	SECURITY_VER=7
 	# vars set to reflect https://dev.gentoo.org/~idella4/
--- a/app-emulation/xen-tools/xen-tools-4.6.0-r7.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.6.0-r7.ebuild
@ -19,7 +19,7 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	UPSTREAM_VER=0
 	SECURITY_VER=7
 	# vars set to reflect https://dev.gentoo.org/~idella4/
--- a/app-emulation/xen/xen-4.5.2-r4.ebuild
+++ b/app-emulation/xen/xen-4.5.2-r4.ebuild
@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm ~arm64 -x86"
+	KEYWORDS="amd64 ~arm ~arm64 -x86"
 	UPSTREAM_VER=
 	SECURITY_VER=0
 	# var set to reflect https://dev.gentoo.org/~idella4/
--- a/app-emulation/xen/xen-4.6.0-r8.ebuild
+++ b/app-emulation/xen/xen-4.6.0-r8.ebuild
@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm ~arm64 -x86"
+	KEYWORDS="amd64 ~arm ~arm64 -x86"
 	UPSTREAM_VER=0
 	SECURITY_VER=0
 	# var set to reflect https://dev.gentoo.org/~idella4/
--- a/app-misc/ckermit/metadata.xml
+++ b/app-misc/ckermit/metadata.xml
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
+	<herd>embedded</herd>
 </pkgmetadata>
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@ -1,5 +1,2 @@
-DIST mksh-R50d.tgz 374014 SHA256 a2268826a1463959ff7b7979fbf9176f1298400ecc24ae13d6337eee5c63f982 SHA512 1bb545d00e3ce5783541c88e1fea47cbd01e2103c60be7d6f5b8bf02d30576d543c4e9f6786b8d14785554c11ca1123364297a2cce0c5c3a5901b6e717594bd8 WHIRLPOOL 899b3feed7610328971b17195701dedf732507c52cd35c69bc2f3778243b344f7c8546871b7b728d122c99aa38c9b525aedeb8f5be8cd90ee2c74b32cb2ce64b
-DIST mksh-R50e.tgz 376013 SHA256 ad3c148769d08cf934a96be2837599ba9db355f38a8f49c7bc8876b80d2e08da SHA512 70d904eb4dfdaf28ee5858d1abec296d69e428e3a81e5802640bc4b95a4c77e08ad8f301b29063f329081428e4b9583f0203e9b509263e8e7b9a705ac63acde5 WHIRLPOOL 1b6d6e0c4413eac44f033945fc2fbe2891623821c1f1a5ceea0084dc834d8754f2582ffac72567138f337e7fdf069f19a79644fc3987fd6cb971c74bde5c209f
-DIST mksh-R50f.tgz 377797 SHA256 74e051ce92ece9555d91505b956572f64668fc88c5ccabee742099e7f29a2bcb SHA512 ca0b5d986727afc8b295b4a81c84e0048f1650c4ea3c45dcc05cabcc474bca4ab4719a063b708f3ddee08d65f35651652c0938b4279f6d706182d46ea5566cc1 WHIRLPOOL a5845cf4fa89b91f076e6eb7af5a176e98dd766a9dc3840acb832f3305c1b7b4f5e01871684a33b0491e34f841a5f6d75f34fba78f99be4852634f337b2054b4
-DIST mksh-R51.tgz 382169 SHA256 9feeaa5ff33d8199c0123675dec29785943ffc67152d58d431802bc20765dadf SHA512 dea2dea283959c0564cb6e9dbb9eecf004365cd01d83f1a8bbaff319c8ebefc4eb5e85898e207c7ce0577af525be0563e7c6b5f4b3449a2439e93f3f8bfd43ea WHIRLPOOL e626b4ffe5f637486a75a4008e51ddd3dd4c9c739dcb6b1502ee0b04f9ade20e55856497dacb5e7228d5b16af015e55fd33753b1d092c8aa7adcd5dd5e30681a
 DIST mksh-R52.tgz 383814 SHA256 45c2f5cdd2c63a6a831ffae65cea0afd021eabb983537aa21ff893ee38b3768f SHA512 83b478baa401dc6116c363043d9d6629028bbcdf19448db939738c5b98f8e4f7da92932296c2ee813b317151d31a1b6cd55d27f062f79e587e22991b018a0285 WHIRLPOOL 524524b950d5f7f21a2660235f955c45e645bcebf1e6120e71c183a0d50da5974840d7f70a18ab6d0766ad5345f62cd657f2fbcc1cd2d33976943f3bb28c243a
+DIST mksh-R52b.tgz 385085 SHA256 93231332a1df0a9c8d4a0d54a519d8b485989a52f7400f0e6451366a0c74b81f SHA512 d204f0d0e221a8592dc0efdb31b909ce522792708937ab1f3ec0a4b1098f2d5171c06cda029a9f7e63eb087a1acf53210f4701cee5564868c15c6294e6fe322f WHIRLPOOL 687eba233332ad7d4de53a57e53a5f851558190ea69daca21ea820a85fbeca00da8fa92e9d8a4dd833498d9adb80482c3394913a61251e9fe2a3cc9e962e74e4
--- a/app-shells/mksh/mksh-50d-r1.ebuild
+++ b/app-shells/mksh/mksh-50d-r1.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-DEPEND="static? ( dev-libs/klibc )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static ; then
-		unset CC
-		export CC="/usr/bin/klcc"
-		export LDSTATIC="-static"
-	fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
-
-pkg_postinst() {
-	ebegin "Updating /etc/shells"
-	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
-	mv -f "${T}"/shells "${ROOT}"etc/shells
-	eend $?
-}
--- a/app-shells/mksh/mksh-50d.ebuild
+++ b/app-shells/mksh/mksh-50d.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-DEPEND="static? ( dev-libs/klibc )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static ; then
-		unset CC
-		export CC="/usr/bin/klcc"
-		export LDSTATIC="-static"
-	fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
--- a/app-shells/mksh/mksh-50e.ebuild
+++ b/app-shells/mksh/mksh-50e.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-DEPEND="static? ( dev-libs/klibc )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static ; then
-		unset CC
-		export CC="/usr/bin/klcc"
-		export LDSTATIC="-static"
-	fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
-
-pkg_postinst() {
-	ebegin "Updating /etc/shells"
-	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
-	mv -f "${T}"/shells "${ROOT}"etc/shells
-	eend $?
-}
--- a/app-shells/mksh/mksh-51.ebuild
+++ b/app-shells/mksh/mksh-51.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-DEPEND="static? ( dev-libs/klibc )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static ; then
-		unset CC
-		export CC="/usr/bin/klcc"
-		export LDSTATIC="-static"
-	fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Build.sh -r || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
-
-pkg_postinst() {
-	ebegin "Updating /etc/shells"
-	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
-	mv -f "${T}"/shells "${ROOT}"etc/shells
-	eend $?
-}
--- a/app-shells/mksh/mksh-52b.ebuild
+++ b/app-shells/mksh/mksh-52b.ebuild
@ -27,7 +27,7 @@ src_compile() {
 	fi
 	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
 	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
+	sh Build.sh -r -c lto || sh Build.sh -r || die
 }

 src_install() {
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@ -1 +1 @@
-DIST blogc-0.7.tar.xz 262724 SHA256 6ac5e1cd481ebbb0b0a80d23b1d1e8730fed8bc0ae09ead14b37b49e314b0347 SHA512 645f8c3aa97c5837e12de5aa660268bed9cbaaad802134c87269f4be99c0006007706bf57a1310e35d34d5d22e3cc371befa365259505bad9f62810db1303efa WHIRLPOOL 5f6d7015df369bda182bf816ad270a835b5c8b9b280093717a19baa813d8d8b5e36e4d413bbeadc0bc4352893784cd9d40ffd36b3212a67b88326b6662775513
+DIST blogc-0.7.1.tar.xz 263028 SHA256 b546e583fbeb064f5f4089f83a716dfc259be3bdb24aab1c04cdabd922c2908c SHA512 428e1467c34b4066171229d91505e66ed711cf3b0fddc6e4d28dc2fa92b4811e16d5a6fbaf31908f7d75871a00ba37464e00272a8e8cae9be570ad0cddb9adc5 WHIRLPOOL d3e80b3f4daec5f9048ca2e028feb63525a695d70050cfa6953e47c24947ba28603bab01457e0983034c9bee0b06a33b64d60238461de62c81ffd3b944381b7a
--- a/app-text/blogc/blogc-0.7.1.ebuild
+++ b/app-text/blogc/blogc-0.7.1.ebuild
--- a/dev-db/sqldeveloper/Manifest
+++ b/dev-db/sqldeveloper/Manifest
@ -1,3 +1,4 @@
 DIST sqldeveloper-3.2.20.09.87-no-jre.zip 182052759 SHA256 787b703a3fa2d7969ae486b9f2f23bdafd31242b2af74257943cf826c535c8d4 SHA512 716e2f9584e192b8e72a0e9439ac3fb0aea297087640df7c7c5659170846376d8e44d0fbdc68c96e274b100aad3f26b0710691349bfc0092c86c42830e115efe WHIRLPOOL 1d9eb51cb263c14a89a44167a239f3be34b7ca9bd78eefc28a73c1b24e6f4e2f10a1665b0b4a03c6932f987fae375c95bfc310c485e179c76e9b7135bb9825e3
 DIST sqldeveloper-4.0.2.15.21-no-jre.zip 235443867 SHA256 b23aca1d256002cdc19a0b3136ae13ebf9064feacc45a131be229a88fe9faed7 SHA512 e67b0f3d127adbc6cb77b3eb822834a6c41be7039c54eceb85e8c882704684a02dd036f078408192ad2cbcb963dfb0ba583e99a9f7b7db36b1e9a1f96e555880 WHIRLPOOL 31b32713f116193036dc5dd9b63c9b6c321763e2273227c51d70bd3db93575e4f12150a045f8615fb6086ee1d464af4d112be5824f9bf22b4f5917ae5a15b724
 DIST sqldeveloper-4.1.1.19.59-no-jre.zip 328364824 SHA256 3b0f3f861495f41b6844eeaf3a58117a90dd72d98cfe8d0b4ffafe103ec56bb5 SHA512 1f5a683ba91a41cb7bc40a45215632ff10b2b1075d5b434d5a8349137d467f59192ec78d33e67b141729b7a1f3e5d678f8b934418e362706ac85a8b0fe89b838 WHIRLPOOL fc4e86e18108729a044bbb4b75a25418599ac972ed003ee69cc0982e66eeb6779d3d46306ec3429b9f9d7a0fa01dc6242b66430c02fe333cb9d95f70160e3402
+DIST sqldeveloper-4.1.3.20.78-no-jre.zip 331401110 SHA256 10caec7183f4075033598faf272d2be82207261442abf3bc3bd899246968b8de SHA512 828a751bc9df7bdc59f9b89b317189826e328671d081df24d39a102aeefaf5a0a56e01e066802da1ee92617bf1fdb77ad598b448043dd7f4239f2103efb4427b WHIRLPOOL 8eee4fbc34617f721893ab880be9c7c27ac8d5378491ba97bcd0084660ad500e2c0e4812ea5b25f8cd907e2c689168af08bbccfdc0b51f04cc0d74bf0760e009
--- a/dev-db/sqldeveloper/metadata.xml
+++ b/dev-db/sqldeveloper/metadata.xml
@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
-	<email>jan.bednar@gmail.com</email>
-	<name>Ján Bednár</name>
+	<email>wschlich@gentoo.org</email>
+	<name>Wolfram Schlich</name>
 	<description>Maintainer</description>
 </maintainer>
 </pkgmetadata>
--- a/dev-db/sqldeveloper/sqldeveloper-4.1.3.20.78.ebuild
+++ b/dev-db/sqldeveloper/sqldeveloper-4.1.3.20.78.ebuild
@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils java-pkg-2
+
+DESCRIPTION="Oracle SQL Developer is a graphical tool for database development"
+HOMEPAGE="http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html"
+SRC_URI="${P}-no-jre.zip"
+
+RESTRICT="fetch"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="mssql mysql sybase"
+
+DEPEND="mssql? ( dev-java/jtds:1.2 )
+	mysql? ( dev-java/jdbc-mysql:0 )
+	sybase? ( dev-java/jtds:1.2 )"
+RDEPEND=">=virtual/jdk-1.8.0
+	dev-java/java-config:2
+	${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+QA_PREBUILT="
+opt/${PN}/netbeans/platform/modules/lib/amd64/linux/*.so
+opt/${PN}/netbeans/platform/modules/lib/i386/linux/*.so
+"
+
+pkg_nofetch() {
+	eerror "Please go to"
+	eerror "	${HOMEPAGE}"
+	eerror "and download"
+	eerror "	Oracle SQL Developer for other platforms"
+	eerror "		${SRC_URI}"
+	eerror "and move it to ${DISTDIR}"
+}
+
+src_prepare() {
+	# we don't need these, do we?
+	find ./ \( -iname "*.exe" -or -iname "*.dll" -or -iname "*.bat" \) -exec rm {} +
+
+	# they both use jtds, enabling one of them also enables the other one
+	if use mssql && ! use sybase; then
+		einfo "You requested MSSQL support, this also enables Sybase support."
+	fi
+	if use sybase && ! use mssql; then
+		einfo "You requested Sybase support, this also enables MSSQL support."
+	fi
+
+	if use mssql || use sybase; then
+		echo "AddJavaLibFile $(java-pkg_getjars jtds-1.2)" >> sqldeveloper/bin/sqldeveloper.conf
+	fi
+
+	if use mysql; then
+		echo "AddJavaLibFile $(java-pkg_getjars jdbc-mysql)" >> sqldeveloper/bin/sqldeveloper.conf
+	fi
+}
+
+src_install() {
+	dodir /opt/${PN}
+	# NOTE For future version to get that line (what to copy) go to the unpacked sources dir
+	# using `bash` and press Meta+_ (i.e. Meta+Shift+-) -- that is a builtin bash feature ;-)
+	cp -r {configuration,d{ataminer,ropins,vt},e{quinox,xternal},ide,j{avavm,d{bc,ev},lib,views},modules,netbeans,ords,rdbms,s{leepycat,ql{developer,j},vnkit}} \
+		"${D}"/opt/${PN}/ || die "Install failed"
+
+	dobin "${FILESDIR}"/${PN} || die "Install failed"
+
+	mv icon.png ${PN}-32x32.png || die
+	doicon ${PN}-32x32.png || die
+	make_desktop_entry ${PN} "Oracle SQL Developer" ${PN}-32x32 || die
+}
+
+pkg_postinst() {
+	# this temporary fixes FileNotFoundException with datamodeler
+	# this is more like a workaround than permanent fix
+	test -d /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log \
+		|| mkdir /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log
+	touch /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log/datamodeler.log
+	chmod -R 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log/datamodeler.log
+
+	# this fixes another datamodeler FileNotFoundException
+	# also more like a workaround than permanent fix
+	chmod 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/types/dr_custom_scripts.xml
+
+	echo
+	einfo "If you want to use the TNS connection type you need to set up the"
+	einfo "TNS_ADMIN environment variable to point to the directory your"
+	einfo "tnsnames.ora resides in."
+	echo
+	einfo "In order to use SQL Developer you need to enshure you are using proper version Java VM (1.8)"
+	einfo "Use eselect java-vm list to get this info,"
+	einfo "eselect java-vm set user N to assign user-level value"
+	einfo "eselect java-vm set system N as root to set system-wide default"
+	echo
+}
--- a/dev-games/ogre/files/ogre-1.9.0-samples.patch
+++ b/dev-games/ogre/files/ogre-1.9.0-samples.patch
@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig
+++ CMakeLists.txt
+@@ -519,7 +519,9 @@
+ endif ()
+ 
+ # Setup samples
+-add_subdirectory(Samples)
+if (OGRE_BUILD_SAMPLES)
+    add_subdirectory(Samples)
+endif ()
+ 
+ #Add android JNI binding
+ if(ANDROID)
--- a/dev-games/ogre/ogre-1.9.0-r1.ebuild
+++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild
@ -4,7 +4,7 @@

 EAPI=5
 CMAKE_REMOVE_MODULES="yes"
-CMAKE_REMOVE_MODULES_LIST="FindFreetype"
+CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"

 inherit eutils cmake-utils vcs-snapshot

@ -21,6 +21,7 @@ KEYWORDS="amd64 ~arm x86"
 IUSE="+boost cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl poco profile tbb threads tools +zip"

 REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) )
+	examples? ( ois )
 	poco? ( threads )
 	tbb? ( threads )
 	?? ( gl3plus ( || ( gles2 gles3 ) ) )
@ -71,7 +72,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" \
 		"${FILESDIR}/${P}-remove_media_path_to_bindir.patch" \
-		"${FILESDIR}/${P}-gcc52.patch"
+		"${FILESDIR}/${P}-gcc52.patch" \
+		"${FILESDIR}/${P}-samples.patch"
 }

 src_configure() {
@ -81,7 +83,6 @@ src_configure() {
 		$(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG)
 		$(cmake-utils_use doc OGRE_INSTALL_DOCS)
 		$(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE)
-		$(cmake-utils_use examples OGRE_INSTALL_SAMPLES)
 		$(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE)
 		$(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL)
 		$(cmake-utils_use gl3plus OGRE_BUILD_RENDERSYSTEM_GL3PLUS)
@ -90,9 +91,10 @@ src_configure() {
 		$(cmake-utils_use gles3 OGRE_CONFIG_ENABLE_GLES3_SUPPORT)
 		$(cmake-utils_use profile OGRE_PROFILING)
 		$(cmake-utils_use examples OGRE_BUILD_SAMPLES)
+		$(cmake-utils_use examples OGRE_INSTALL_SAMPLES)
 		$(cmake-utils_use examples OGRE_INSTALL_SAMPLES_SOURCE)
 		-DOGRE_BUILD_TESTS=FALSE
-		$(usex threads "-DOGRE_CONFIG_THREADS=2" "-DOGRE_CONFIG_THREADS=0")
+		-DOGRE_CONFIG_THREADS=$(usex threads 2 0)
 		$(cmake-utils_use tools OGRE_BUILD_TOOLS)
 		$(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)
 	)
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@ -2,3 +2,4 @@ DIST go-favicon.ico 1150 SHA256 d76ca702a6d81e20ddd31c8c5a4368130e7c68d990600316
 DIST go-tools-0_pre20150805.tar.gz 1633388 SHA256 80db6fc563df50eb924dbf4f96cef287fc6b89cc8b98595c1dac3c80a118f290 SHA512 80813c2da74c7b25fa2cfd15b2505757e7f466469ac701cb22d190dc83a607f091c4dea207a2e371e53d7a1f5459e7b53e5eea53c95565e958a6eb7fcb212359 WHIRLPOOL 3b000f830d81c35e6f76a9883d9430eb7fe0f546a36579a150a7bd8f825146a0623726a98a7b7f764825c9fee30af1f89b3bbc98efeaf05fe8f64bbb127a1f68
 DIST go-tools-0_pre20150823.tar.gz 1633447 SHA256 12ac4c5e49134a7dcc9c2f3123d20562463d83360a6e1d2fc6ace5ec025a31ae SHA512 6d906bae8433182e7a105a46b92c4f64ac145196ccc72f8934376fc49e5d554182931745e92229c4571323a6eba9ce2f680b5add3844ecb593a194cbbc1b0b63 WHIRLPOOL acb3ac4e5abcc56a37bec461a7e4170e4a45ebd917ed9ca1dd016c92756a01b0ed0887e525bc17acd7a88a34fd5f9495a5ffa63f58a05d547e2fba17c4ff9a8e
 DIST go-tools-0_pre20150902.tar.gz 1630401 SHA256 c5026af549199f62a374b705981cf0f04661497af0d69ee47d54e9992ee44c8f SHA512 437d5178ce5bf6c4d39ad638259e7c18150d2574dffb632003fa0b83a61a9103e666e562aecc6e8412d995e4b5ffacda6bc12b1cfbbea0b22a5ff680a0a7e3e1 WHIRLPOOL bfc7998c3c042059213975dc6864814edf497b5c6ee70c228925bcb7dd283efb4f49d7ac05383b8ae2d85ccc7fbd7663e3c2899bffe47e4e36195bd639bc61c7
+DIST go-tools-0_pre20160121.tar.gz 1768660 SHA256 4f1d444643e06bc9da47655e6532d71cdd4dfe3167352d93fd48a8e31bec5a60 SHA512 ca4b213a6f398f9bb61a81784fb6dcb4a82994e2d7a95134fc5203ce0f65848d192b2d7c8975a59199db873942c23562866a5607347e060ac0af370d72e067e2 WHIRLPOOL fa4f0006211cb52eca9cba015235a07d7d640681864a62ed065454efceb789694ea3a6d0099adec910bee075153e56e1323cb7e6f4d9a7426d2b8e40474a715e
--- a/dev-go/go-tools/go-tools-0_pre20160121.ebuild
+++ b/dev-go/go-tools/go-tools-0_pre20160121.ebuild
@ -0,0 +1,106 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGO_PN="golang.org/x/tools/..."
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="f3a63969dd29f8cfa913fdaea22f30c1ed537cb3"
+	ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go Tools"
+HOMEPAGE="https://godoc.org/golang.org/x/tools"
+SRC_URI="${ARCHIVE_URI}
+	http://golang.org/favicon.ico -> go-favicon.ico"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND="dev-go/go-net:=
+	!<dev-lang/go-1.5"
+RDEPEND=""
+
+src_prepare() {
+	local go_src="${EGO_PN%/...}"
+	# disable broken tests
+	sed -e 's:TestWeb(:_\0:' \
+		-e 's:TestWebIndex(:_\0:' \
+		-i src/${go_src}/cmd/godoc/godoc_test.go || die
+	sed -e 's:TestVet(:_\0:' \
+		-e 's:TestDivergentPackagesExamples(:_\0:' \
+		-e 's:TestIncompleteExamples(:_\0:' \
+		-i src/${go_src}/cmd/vet/vet_test.go || die
+	sed -e 's:TestImport(:_\0:' \
+		-i src/${go_src}/go/gcimporter/gcimporter_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' \
+		-i src/${go_src}/go/gcimporter15/gcimporter_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' \
+		-i src/${go_src}/go/importer/import_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${go_src}/go/loader/stdlib_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${go_src}/go/ssa/stdlib_test.go || die
+	sed -e 's:TestGorootTest(:_\0:' \
+		-e 's:TestFoo(:_\0:' \
+		-e 's:TestTestmainPackage(:_\0:' \
+		-i src/${go_src}/go/ssa/interp/interp_test.go || die
+	sed -e 's:TestBar(:_\0:' \
+		-e 's:TestFoo(:_\0:' \
+		-i src/${go_src}/go/ssa/interp/testdata/a_test.go || die
+	sed -e 's:TestCheck(:_\0:' \
+		-i src/${go_src}/go/types/check_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-e 's:TestStdFixed(:_\0:' \
+		-e 's:TestStdKen(:_\0:' \
+		-i src/${go_src}/go/types/stdlib_test.go || die
+	sed -e 's:TestRepoRootForImportPath(:_\0:' \
+		-i src/${go_src}/go/vcs/vcs_test.go || die
+
+	# Add favicon to the godoc web interface (bug 551030)
+	cp "${DISTDIR}"/go-favicon.ico "src/${go_src}/godoc/static/favicon.ico" ||
+		die
+	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
+		-i src/${go_src}/godoc/static/makestatic.go || die
+	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
+		-i src/${go_src}/godoc/static/godoc.html || die
+}
+
+src_compile() {
+	# Generate static.go with favicon included
+	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
+	go run makestatic.go || die
+	popd >/dev/null
+
+	golang-build_src_compile
+}
+
+src_test() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	mkdir -p "${T}/goroot/test" || die
+	GOROOT="${T}/goroot" golang-build_src_test
+	rm -rf "${T}/goroot"
+}
+
+src_install() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	cp -sR "$(get_golibdir_gopath)" "${T}/gopath" || die
+
+	GOROOT="${T}/goroot" GOPATH="${WORKDIR}/${P}:${T}/gopath" go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+	golang_install_pkgs
+
+	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/* "${T}/goroot/bin/godoc" "${T}/gopath/bin/tipgodoc"
+	dodir /usr/bin
+	ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
+
+	rm "${D}"$(go env GOROOT)/bin/{cover,vet} || die
+}
--- a/dev-haskell/concurrent-output/Manifest
+++ b/dev-haskell/concurrent-output/Manifest
@ -0,0 +1 @@
+DIST concurrent-output-1.7.3.tar.gz 21005 SHA256 9a510e7378ba9c6c637027074fa127fad832f9321144fdbe9ae3b1955cf40620 SHA512 0c338d45167bac4d11f760994fa7c5b3d6b3525cc4fbb289e70247affcabec94b44cdc1991519e40ddb71975e5a995f10e116b289de194dd3a91467c6f4df950 WHIRLPOOL 4670e2f99ed3c9658d8e6c3e02d412fc78b7af208775872278851b356b282b8fbc906474674f30af25063a85bbc405fc530baa486771ac39b30f851bd0a21cdf
--- a/dev-haskell/concurrent-output/concurrent-output-1.7.3.ebuild
+++ b/dev-haskell/concurrent-output/concurrent-output-1.7.3.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Ungarble output from several threads or commands"
+HOMEPAGE="http://hackage.haskell.org/package/concurrent-output"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?]
+	>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?]
+	>=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?]
+	>=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?]
+	>=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?]
+	>=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?]
+	>=dev-haskell/transformers-0.3.0:=[profile?] <dev-haskell/transformers-0.5.0:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
--- a/dev-haskell/concurrent-output/metadata.xml
+++ b/dev-haskell/concurrent-output/metadata.xml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		Provides a simple interface for writing concurrent programs that
+		need to output a lot of status messages to the console, or display
+		multiple progress bars for different activities at the same time,
+		or concurrently run external commands that output to the console.
+		
+		Built on top of that is a way of defining multiple output regions,
+		which are automatically laid out on the screen and can be individually
+		updated. Can be used for progress displays etc.
+		
+		&lt;&lt;https://joeyh.name/code/concurrent-output/demo2.gif&gt;&gt;
+	</longdescription>
+</pkgmetadata>
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.71-r1.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.71-r1.ebuild
@ -84,6 +84,7 @@ RDEPEND="!x64-macos? (
 			x11-libs/libXext
 			x11-libs/libXi
 			x11-libs/libXrender
+			x11-libs/libXtst
 		)
 		javafx? (
 			dev-libs/glib:2
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.72-r1.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.72-r1.ebuild
@ -84,6 +84,7 @@ RDEPEND="!x64-macos? (
 			x11-libs/libXext
 			x11-libs/libXi
 			x11-libs/libXrender
+			x11-libs/libXtst
 		)
 		javafx? (
 			dev-libs/glib:2
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.72-r1.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.72-r1.ebuild
@ -57,6 +57,7 @@ RDEPEND="!x64-macos? (
 			x11-libs/libXext
 			x11-libs/libXi
 			x11-libs/libXrender
+			x11-libs/libXtst
 		)
 		javafx? (
 			dev-libs/glib:2
--- a/dev-lang/falcon/Manifest
+++ b/dev-lang/falcon/Manifest
@ -1 +1,2 @@
 DIST Falcon-0.9.6.4.tar.gz 1782796 SHA256 24f4294f93c192f21d3590795a9fdd864c3f2d376cb0baac9c1e11e893cfaf81 SHA512 244fc0cc6811d9c918a1983d93e380982584016d84752b00d3adc17e46d7a7cbf9d20f09b7562316b1c9ea6eaaa91c1cb931f4469f7d510d9084f1daaca732a5 WHIRLPOOL 2178d6307fcd516f490fada540af649a60ca39f8640215b926f153316ab349ed9b46e47c7849270a20632e9639ca65d635f88ed4d0a2fccf718967ce83106a8b
+DIST Falcon-0.9.6.8.tgz 11772705 SHA256 f4b00983e7f91a806675d906afd2d51dcee048f12ad3af4b1dadd92059fa44b9 SHA512 f354a058d9075a636c0b2db339fd86adda9b4a4bc7c229186b73aa200e059a21b311a4944b1b7388b4992390e4d540af8832e4b2cea31d7f956df1dd96f2f59c WHIRLPOOL cc42e7d250aea223162703a52b5f9461d52db6051d29dfb26320ce740fe6b502e8c8f474bb97809dc238fb23ce8cb99e9ec6d35fb01656a20e9d9b3d8b3b24e0
--- a/dev-lang/falcon/falcon-0.9.6.8.ebuild
+++ b/dev-lang/falcon/falcon-0.9.6.8.ebuild
@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils multilib
+
+MY_P="${P/f/F}"
+
+DESCRIPTION="An open source general purpose untyped language written in C++"
+HOMEPAGE="http://falconpl.org/"
+SRC_URI="http://falconpl.org/project_dl/_official_rel/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl dbus debug gd gtk mysql pdf readline sdl sqlite"
+
+DEPEND="
+	dev-libs/libpcre
+	sys-libs/zlib
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	gd? ( media-libs/gd:= )
+	gtk? ( dev-libs/glib:2 )
+	mysql? ( virtual/libmysqlclient:= )
+	readline? ( sys-libs/readline:0 )
+	pdf? ( media-libs/libharu )
+	sdl? (
+		media-libs/libsdl
+		media-libs/sdl-image
+		media-libs/sdl-mixer
+		media-libs/sdl-ttf
+	)
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS ChangeLog README RELNOTES"
+PATCHES=(
+	"${FILESDIR}/${P}-mongo-amd64.patch"
+	"${FILESDIR}/${P}-mongo-stdint.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DFALCON_BUILD_CURL=$(usex curl)
+		-DFALCON_BUILD_DBUS=$(usex dbus)
+		-DFALCON_BUILD_GD2=$(usex gd)
+		-DFALCON_BUILD_GTK=$(usex gtk)
+		-DFALCON_BUILD_PDF=$(usex pdf)
+		-DFALCON_BUILD_SDL=$(usex sdl)
+		-DFALCON_DBI_BUILD_MYSQL=$(usex mysql)
+		-DFALCON_DBI_BUILD_SQLITE=$(usex sqlite)
+		-DFALCON_DISABLE_RPATH=ON
+		-DFALCON_SKIP_BISON=ON
+		-DFALCON_WITH_EDITLINE=$(usex readline)
+		-DFALCON_WITH_MANPAGES=ON
+		-DFALCON_WITH_INTERNAL_EDITLINE=OFF
+		-DFALCON_WITH_INTERNAL_PCRE=OFF
+		-DFALCON_WITH_INTERNAL_ZLIB=OFF
+		-DFALCON_WITH_GPL_READLINE=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	pushd "${S}/tests/core/testsuite" > /dev/null || die
+	"${CMAKE_BUILD_DIR}/bin/faltest"
+	popd > /dev/null || die
+}
--- a/dev-lang/falcon/files/falcon-0.9.6.8-mongo-amd64.patch
+++ b/dev-lang/falcon/files/falcon-0.9.6.8-mongo-amd64.patch
@ -0,0 +1,75 @@
+From 64526ea7d3b5ec04f398bd28cb4e505e6a0f3218 Mon Sep 17 00:00:00 2001
+From: Stanislas Marquis <stnsls@gmail.com>
+Date: Sun, 9 Jan 2011 08:40:00 +0100
+Subject: [PATCH] [mongo] [cmake] Fix problems with Linux x64.
+
+---
+ modules/native/mongodb/CMakeLists.txt     |   11 +++++++++--
+ modules/native/mongodb/mongodb_mod.cpp    |    2 +-
+ modules/native/mongodb/src/CMakeLists.txt |    8 ++++++--
+ 3 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/modules/native/mongodb/CMakeLists.txt b/modules/native/mongodb/CMakeLists.txt
+index ba7e5cf..bf2d869 100644
+--- a/modules/native/mongodb/CMakeLists.txt
+++ b/modules/native/mongodb/CMakeLists.txt
+@@ -8,6 +8,10 @@ falcon_define_module( FALCON_MODULE mongo )
+ 
+ message( STATUS "Adding mongodb module" )
+ 
+if ( NOT MSVC )
+    option( MONGO_HAVE_STDINT "MongoDB problem with int64_t?" OFF )
+endif()
+
+ ##
+ #   Find Falcon
+ #
+@@ -28,8 +32,11 @@ add_subdirectory( src )
+ if ( MSVC )
+     add_definitions( -DMONGO_USE__INT64 )
+ else()
+-    #add_definitions( -DMONGO_HAVE_STDINT )
+-    add_definitions( -DMONGO_USE_LONG_LONG_INT )
+    if ( MONGO_HAVE_STDINT )
+        add_definitions( -DMONGO_HAVE_STDINT )
+    else()
+        add_definitions( -DMONGO_USE_LONG_LONG_INT )
+    endif()
+ endif()
+ 
+ ##
+diff --git a/modules/native/mongodb/mongodb_mod.cpp b/modules/native/mongodb/mongodb_mod.cpp
+index 6102664..4d47fac 100644
+--- a/modules/native/mongodb/mongodb_mod.cpp
+++ b/modules/native/mongodb/mongodb_mod.cpp
+@@ -1321,7 +1321,7 @@ BSONIter::makeItem( const bson_type tp,
+         //...
+         break;
+     case bson_long:
+-        it = new Item( bson_iterator_long_raw( iter ) );
+        it = new Item( (int64) bson_iterator_long_raw( iter ) );
+         break;
+     case bson_eoo:
+     default:
+diff --git a/modules/native/mongodb/src/CMakeLists.txt b/modules/native/mongodb/src/CMakeLists.txt
+index 48cdaef..d883af3 100644
+--- a/modules/native/mongodb/src/CMakeLists.txt
+++ b/modules/native/mongodb/src/CMakeLists.txt
+@@ -7,8 +7,12 @@ include_directories( BEFORE . )
+ if ( MSVC )
+     add_definitions( -DMONGO_USE__INT64 )
+ else()
+-    add_definitions( -DMONGO_USE_LONG_LONG_INT )
+-    #add_definitions( --std=c99 )
+    add_definitions( -fPIC )
+    if ( MONGO_HAVE_STDINT )
+        add_definitions( -DMONGO_HAVE_STDINT )
+    else()
+        add_definitions( -DMONGO_USE_LONG_LONG_INT )
+    endif()
+ endif()
+ 
+ set( MONGO_SRCS
+-- 
+1.7.9.1
+
--- a/dev-lang/falcon/files/falcon-0.9.6.8-mongo-stdint.patch
+++ b/dev-lang/falcon/files/falcon-0.9.6.8-mongo-stdint.patch
@ -0,0 +1,36 @@
+From a64c0c3959a0f5e853daba2b35ca19459acf875e Mon Sep 17 00:00:00 2001
+From: Stanislas Marquis <stnsls@gmail.com>
+Date: Sat, 29 Jan 2011 12:27:50 +0100
+Subject: [PATCH] [mongo] Fix detection of stdint.h
+
+---
+ modules/native/mongodb/CMakeLists.txt |   12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+diff --git a/modules/native/mongodb/CMakeLists.txt b/modules/native/mongodb/CMakeLists.txt
+index bf2d869..e4d1df6 100644
+--- a/modules/native/mongodb/CMakeLists.txt
+++ b/modules/native/mongodb/CMakeLists.txt
+@@ -8,8 +8,18 @@ falcon_define_module( FALCON_MODULE mongo )
+ 
+ message( STATUS "Adding mongodb module" )
+ 
+##
+#   Check for stdint.h
+#
+ if ( NOT MSVC )
+-    option( MONGO_HAVE_STDINT "MongoDB problem with int64_t?" OFF )
+    find_file( STDINT_H stdint.h HINTS /usr/include )
+    if ( STDINT_H STREQUAL STDINT_H-NOTFOUND )
+        option( MONGO_HAVE_STDINT "MongoDB should use stdint.h" OFF )
+    else()
+        option( MONGO_HAVE_STDINT "MongoDB should use stdint.h" ON )
+    endif()
+    mark_as_advanced( STDINT_H )
+    mark_as_advanced( MONGO_HAVE_STDINT )
+ endif()
+ 
+ ##
+-- 
+1.7.9.1
+
--- a/dev-lang/julia/julia-0.4.3.ebuild
+++ b/dev-lang/julia/julia-0.4.3.ebuild
@ -74,10 +74,12 @@ src_prepare() {
 		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
 		deps/Makefile || die

-	local lblas="$($(tc-getPKG_CONFIG) --libs blas)"
-	lblas=${lblas%% *}
-	local llapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-	llapack=${llapack%% *}
+	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
+	libblas="${libblas%% *}"
+	libblas="lib${libblas#-l}"
+	local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
+	liblapack="${liblapack%% *}"
+	liblapack="lib${liblapack#-l}"

 	sed -i \
 		-e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
@ -87,10 +89,10 @@ src_prepare() {
 		-e "s|/usr/include|${EPREFIX}/usr/include|" \
 		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
 		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
-		-e "s|-lblas|${lblas}|" \
-		-e "s|= libblas|= lib${lblas#-l}|" \
-		-e "s|-llapack|${llapack}|" \
-		-e "s|= liblapack|= lib${llapack#-l}|" \
+		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
+		-e "s|= libblas|= ${libblas}|" \
+		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
+		-e "s|= liblapack|= ${liblapack}|" \
 		Make.inc || die

 	sed -i \
--- a/dev-lang/python/python-3.5.1-r2.ebuild
+++ b/dev-lang/python/python-3.5.1-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -254,6 +254,14 @@ src_install() {
 		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
 	fi

+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E "${ED}usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}usr/bin/${abiver}"
+	fi
+
 	use elibc_uclibc && rm -fr "${libdir}/test"
 	use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
 	use tk || rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
--- a/dev-ml/dose3/dose3-4.2.ebuild
+++ b/dev-ml/dose3/dose3-4.2.ebuild
@ -19,7 +19,7 @@ IUSE="+ocamlopt +parmap zip bzip2 xml curl rpm4 test"
 RDEPEND="
 	>=dev-lang/ocaml-3.12:=[ocamlopt?]
 	dev-ml/cudf:=
-	dev-ml/extlib:=
+	>=dev-ml/extlib-1.7.0:=
 	dev-ml/ocaml-re:=
 	dev-ml/cppo:=
 	parmap? ( dev-ml/parmap:= )
--- a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
+++ b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -30,8 +30,8 @@ python_install_all() {
 }

 python_install() {
-	distutils-r1_python_install
-
 	# main namespace provided by dev-python/backports
-	rm "${ED}$(python_get_sitedir)"/backports/__init__.py* || die
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	rm -f backports/__init__.py || die
+	distutils-r1_python_install
 }
--- a/dev-python/boto/boto-2.39.0.ebuild
+++ b/dev-python/boto/boto-2.39.0.ebuild
@ -17,6 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"

+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
@ -25,6 +27,10 @@ DEPEND="
 # requires Amazon Web Services keys to pass some tests
 RESTRICT="test"

+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
 python_test() {
 	"${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}"
 }
--- a/dev-python/cffi/cffi-1.5.0.ebuild
+++ b/dev-python/cffi/cffi-1.5.0.ebuild
@ -23,6 +23,7 @@ RDEPEND="
 	virtual/libffi
 	dev-python/pycparser[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"

 # Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
--- a/dev-python/keyring/keyring-7.3.ebuild
+++ b/dev-python/keyring/keyring-7.3.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )

 inherit distutils-r1

--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@ -1,2 +1,2 @@
 DIST pip-7.1.2.tar.gz 1049170 SHA256 ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477 SHA512 78082afe6b559bf87f91ae9b6d304cfbfce00206e09be42fdae9d449a55cd8d968df6873e834191d0b0e6baae29e72eb3eee42386ff7c5dc9c29b6c28b754449 WHIRLPOOL 953fdc9104f3ac34c9104ec93948f58c4b0e193f18da60d3247d801c283c574490f8b91146e4278888c0b920090f537095c1a1693ca352d062dd98473390fdc9
-DIST pip-8.0.0.tar.gz 1129857 SHA256 90112b296152f270cb8dddcd19b7b87488d9e002e8cf622e14c4da9c2f6319b1 SHA512 2277dbe74af2dd3a3280b4115ebdbe2de83a5fbfdd3f15e2627441478bd08f21b46771153100ed9934a48a3662846aa84310f722029e6f56fa9a400dbd61e910 WHIRLPOOL 8f70adb37fdabf91db8c5a9d257daa8a0df0e6c6d8f077f19288033a41bca445427173bb32c4b18019096f2191b3b5d2381124c0e3a664da79bb881a0cf60610
+DIST pip-8.0.2.tar.gz 1130183 SHA256 46f4bd0d8dfd51125a554568d646fe4200a3c2c6c36b9f2d06d2212148439521 SHA512 f2660725da4efa156c6c0f6cb9ba3f10e8b6dd2fc9113e9a8754a59f38ee6161e5a648f9dbcf8853ef85a85d3164bcaac3a7032ac2057e92f331a337cacfc5d9 WHIRLPOOL abc88372746193686910ee127ac3f6f4bb7f3a5d7f897f705c2e43ea91d60c55ed26faf5e6acddd1d7e01772cbff4836195dcf22f9fc9dec30ad8c89986db778
--- a/dev-python/pip/pip-8.0.0-r1.ebuild
+++ b/dev-python/pip/pip-8.0.0-r1.ebuild
@ -23,7 +23,7 @@ VENDOR_DEPEND="
 	>=dev-python/html5lib-0.9999999[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9[${PYTHON_USEDEP}]
 	>=dev-python/colorama-0.3.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.9.1-r1[${PYTHON_USEDEP}]
 	>=dev-python/CacheControl-0.11.5[${PYTHON_USEDEP}]
 	>=dev-python/lockfile-0.12.2[${PYTHON_USEDEP}]
 	>=dev-python/progress-1.2[${PYTHON_USEDEP}]
@ -33,7 +33,8 @@ VENDOR_DEPEND="
 	virtual/python-ipaddress[${PYTHON_USEDEP}]
 "
 RDEPEND="${VENDOR_DEPEND}
-	>=dev-python/setuptools-19.4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-19.2[${PYTHON_USEDEP}]
+	<dev-python/setuptools-19.4[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"

@ -42,7 +43,7 @@ RESTRICT="test"

 PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.2-disable-version-check.patch
-	"${FILESDIR}"/${P}-unbundle.patch
+	"${FILESDIR}"/${PN}-8.0.0-unbundle.patch
 	)

 python_prepare_all() {
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@ -1,2 +1,3 @@
 DIST regex-2015.07.12.tar.gz 554160 SHA256 9a39618645ce8c707c2c1346a3eeef0e441a9084df0739a5fcfe32059f68ebe1 SHA512 3b8cfa029744d17f06c659e6357d3a4520817656da6dcfc6952bbdac01fec266e8832fab649000fc7a3dacab508e2ae462728c139cc4cac913c40e2ae34abf54 WHIRLPOOL 86f004c6d8533071ef938ba39cfe34f198dcc56ab75883f8b5f2bc2dfaa40abc46b0ed64aa873821c6cc4e694c424dd8a16d97c35a6a1fafa7d2f84e09c59adf
 DIST regex-2015.07.19.tar.gz 554541 SHA256 c1dc58206f458749040ba813ef65067d7018908cab4bb16f4f12d9c7631e48b7 SHA512 94845ae133e25bdc2bb6ee6093f38f7a9281a64cdf4e53817c80183a28d7d0e2173f16f048f29ba38b2b277fc974c46a2f7d3b2fe1a346bc5d35c5fa45cdac17 WHIRLPOOL 4b38bd745c43fa2832d93e20fb4066911c6a224a2d1b4c3afaf8f03dcdf6d8d39896b25843671e0ee6916257b428455f24bbd493222e1b7bfa67c0b2ab838d32
+DIST regex-2016.01.10.tar.gz 574017 SHA256 02a77606e3f4a0a16a2727ed8f067681635a56221e8fca863ff64b196d5d79e0 SHA512 4f4700ca746763f857449003d32d56b5aa8069e3b71b160e719633b0cf00f80efc0766d8e1e193977278f91bd3e73c87aab31bee23aec77557ac9b3652ff6a2f WHIRLPOOL 9d493c0695b5920dfa71d94636d9f2952cbd5db97f60ae68c30fdf81fdbdab05c4726a41dae036541de694ec1ca688acdb20eaa48e514865da26c9a9569e30a0
--- a/dev-python/regex/regex-2016.01.10.ebuild
+++ b/dev-python/regex/regex-2016.01.10.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DOCS=( README docs/UnicodeProperties.txt )
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local msg="tests failed under ${EPYTHON}"
+	# https://bitbucket.org/mrabarnett/mrab-regex/issue/145/1-fail-in-testsuite-under-pypy
+	einfo "There is one trivial fail of test test_empty_array under pypy"
+
+	if python_is_python3; then
+		"${PYTHON}" Python3/test_regex.py || die $msg
+	else
+		"${PYTHON}" Python2/test_regex.py || die $msg
+	fi
+}
+
+python_install_all() {
+	local DOCS="${DOCS} docs/UnicodeProperties.txt"
+	use doc && local HTML_DOCS=( docs/Features.html )
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/requests/requests-2.9.1-r2.ebuild
+++ b/dev-python/requests/requests-2.9.1-r2.ebuild
@ -25,7 +25,7 @@ RDEPEND="
 	>=dev-python/py-1.4.30[${PYTHON_USEDEP}]
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.13[$(python_gen_usedep 'python*' pypy)]
-	dev-python/urllib3[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.13.1-r1[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@ -1 +1,2 @@
 DIST Unidecode-0.04.18.tar.gz 206191 SHA256 f19150c74de2fe6847b13efeeaee402f2bd2c309a446346a8b5baae0315d108a SHA512 4434b147662c605829a599cb227b10599e70b9a40669b6bce490156c6679d22b49e1768667e10851eaf8d6a142a2c22df4800f0382ed74e781c247708021acd7 WHIRLPOOL 84f07583ba19f6c029128699629dc5709343520b94ea0fd3c8924d7e44910481f5b1574449eb78c2fa4dd884de4fa8b646593623dcae28b809f423c343163aa1
+DIST Unidecode-0.04.19.tar.gz 204613 SHA256 51477646a9169469e37e791b13ae65fcc75b7f7f570d0d3e514d077805c02e1e SHA512 a7be95ab22dcc61925da5abb2288cf947e96c61926cd384222451f65947be13d3f5d28bcc4e06f636bebc3dfae01716d455036e15ddb3199f52ca542997f74a1 WHIRLPOOL 14b8f0cfdb42ad10f5aa91f586a9880054f55cbc9d4bff64e62593b57c2265d77131f32ba5f8ebc11c594c79a1c1d8a109fddd2ce6e777e9974d947759ccaeb4
--- a/dev-python/unidecode/unidecode-0.04.19.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.19.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+MY_PN=Unidecode
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1
+
+DESCRIPTION="Module providing ASCII transliterations of Unicode text"
+HOMEPAGE="https://pypi.python.org/pypi/Unidecode"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@ -1,2 +1,2 @@
 DIST virtualenv-13.1.2.tar.gz 1704701 SHA256 438a9933dac2e6ef2e4270fe82435f9c29f933f05e2c5840a7b45e342b6292f8 SHA512 e58f0b1d46174d61b0ef6703020806208f34291c5490fabf29d3b82a03ba89a7caeb377aac44549f6c0ffe2e445786e16dcd67593b7b8d3b1fae0d9e8c8ef124 WHIRLPOOL 03fe0181ebb2d4becb357a740cc3f743526a087e03c03f5e20abac6a54a2701865c89f9f6023ae996d3ca032b08d28e1048747dc8ea1740316f330180f0f5161
-DIST virtualenv-14.0.0.tar.gz 1793952 SHA256 b65ed686c9248426c5ad9b7e0f821c16e5493e363f944895da19a744c5be03fb SHA512 638d118819cfdc86f2d825981ddd9ef5e5f1618062ddbc2f275e66660f88c4800fac55e00a16ca307a3e5b5fceaeccc69f498917e9dd8398bf40de63e6f96445 WHIRLPOOL 5686069cf9add4a87c95cdad1aa5c8d14643df94f368e81abb66163086c009e64ef197887f953c5e6dfbbbe24ff4ceeaad64581bfd45cd571b7fb114b30b1329
+DIST virtualenv-14.0.1.tar.gz 1794063 SHA256 66778f6d27b3864644b923fdbac69d012281821c0c90d2e928a319e9eeef2830 SHA512 594fd00d99808dcc6da573b5b60ffe397bda229517351410aed4342935afcf0ce8d660ef8209fd8a19dd7d880c1afdb7caeb12c638dce80d01b623caa4b5c0fc WHIRLPOOL 1ce84d2d78953897f4fdeea9268849c21da7ca1e25b05b17efa7262a9557c1b89739f81566d7a3f96292837fbd998cce3052954c6acfe3ac1071d0179d57c6b6
--- a/dev-python/virtualenv/virtualenv-14.0.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-14.0.1.ebuild
--- a/dev-python/xonsh/Manifest
+++ b/dev-python/xonsh/Manifest
@ -1,2 +1,3 @@
 DIST xonsh-0.2.3.tar.gz 135218 SHA256 e54f045bbcb2c49f8bf67812bc1c1428628745d0b4dd9880c32b4703e51c4a4d SHA512 78cd577765e3116d0b0060a4db6e3e9aaa5bd870fce2e35241eaa00ca1600039d71b4f0ee011f20c959bf72f33ed09a69b4149c8daf377b9151ae0157259c700 WHIRLPOOL d1660a9f0571c8819560412033399cea4d80ee25707b87d84d852d26a7fcb392e0cf8d57f9084e2a3a36eb2ffffa38ae706b5da540cb2015c816efdd52148caf
 DIST xonsh-0.2.4.tar.gz 169491 SHA256 6fa02a32bdc1692992258f26f5bc31c5497143c1c8bd0a8fc279da219122f168 SHA512 17ef284ff57df517e5fc932816fb1ea800107f81aa42a5299d7ed6b2cc46eeaf176c9745b0e70524c0b92c582753b8b6dd586288a4db0ac95e3c4d7b20080cea WHIRLPOOL e472b10f73e785563e4ab457e60bf1702654a6fe2e6bdd35f4972a14485e100bcfb35b5ccbd93c6a55b228a9bd432f0c05287bb4b573bf6727d3e9cf6d8ed976
+DIST xonsh-0.2.5.tar.gz 188798 SHA256 a7bdc9d906cb800c271e3808293d27f4513e48e5f6f687241e7f90502c17769f SHA512 b3a3ec39dc9a4df3771bc9d12ce9658cc8740b043b09c7ff5f4b47a3d0d0424e6912c3811c07e7d76c612b09a7aa06dac18323ab8154fdf4b97b84785d9aea55 WHIRLPOOL 4d2467fc0585a889ec352c5c7d997a28d9807886539fdf92780d15af199f76c2f7201b1214fd101eebbd822f636b20aaa10915a203d852802a15bd9f18c85db9
--- a/dev-python/xonsh/metadata.xml
+++ b/dev-python/xonsh/metadata.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>python</herd>
--- a/dev-python/xonsh/xonsh-0.2.4.ebuild
+++ b/dev-python/xonsh/xonsh-0.2.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -29,11 +29,6 @@ DEPEND="${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"

-_PATCHES=(
-	"${FILESDIR}"/${P}-kernel-backport.patch
-	"${FILESDIR}"/${P}-${PN}.bat-backport.patch
-)
-
 python_prepare_all() {
 	sed \
 		-e "/install_kernel_spec/s:prefix=None:prefix=u\"${ED}/usr\":g" \
--- a/dev-python/xonsh/xonsh-0.2.5.ebuild
+++ b/dev-python/xonsh/xonsh-0.2.5.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="An exotic, usable shell"
+HOMEPAGE="
+	http://xonsh.readthedocs.org/
+	https://github.com/scopatz/xonsh
+	http://pypi.python.org/pypi/xonsh"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/ply[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed \
+		-e "/install_kernel_spec/s:prefix=None:prefix=u\"${ED}/usr\":g" \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbose || die
+}
+
+pkg_postinst() {
+	optfeature "Jupyter kernel support" dev-python/jupyter
+	optfeature "Alternative to readline backend" dev-python/prompt_toolkit
+}
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@ -1,3 +1 @@
-DIST fast_gettext-0.9.0.tar.gz 86616 SHA256 773f1112524f1777f4f46ce80c5e1341dd270d232d86808d5ecc27d5b4d83e29 SHA512 901e9725ae537300be078febf4c5c94f466da48b0e4d3611037bfc98b914436a23828708177d6874c7b2ae60245631cd414ee52bd1b9de90c6ff8d1a6dbe37a4 WHIRLPOOL 06f858d501d66cfc609ff2a75010e73b33f706d388286a64ce923a6a87f96ddcc98a6623644b8bac9e57dbe86b7345ddd7aaf601d69ca600e6f8a7c9c8e95114
-DIST fast_gettext-0.9.2.tar.gz 86892 SHA256 7c7de3f9ac19d2e5a81fa15bf0dcd4d54bcb92051e881d83265c6cdadfce239b SHA512 d8bfe755ba6754ff474a6d0e42e9a725aa00f20b381fe5c0a2a2dc3efc5e0bf6096450e0665cd4369717296dc55cd316f836d9cd35b96764eb56e3ca33379c14 WHIRLPOOL 615f5357815d8321d1f099889b352826034af1defbf8a6a4383b9e71b7e37ed06c582e0e957ec4e9a2345b3b84dce9a5432e3d85946f679fa27fcafe04cbce4c
 DIST fast_gettext-1.0.0.tar.gz 86573 SHA256 8390793a29d291b4efbad01e4c579fcb86200b91e87a72d667fb5e1d451b53a2 SHA512 f9c1656218fbb8f514e10bac6b2656a39013dc0b745e0741cea727280aa0153f3555badc4cbd18fea6bff27e3542c62bb4a7808b0565d6282aa4444ee154cb8e WHIRLPOOL 0d1d1bca6a87364a5a834ca88a1906ef90fbd353890191cd0865103865be396dd7c9ce5c9f8abbbfaa088178ee1a7eecfd57b8a16291214f767b775f7737c81a
--- a/dev-ruby/fast_gettext/fast_gettext-0.9.0.ebuild
+++ b/dev-ruby/fast_gettext/fast_gettext-0.9.0.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# jruby support requires sqlite3 support for jruby.
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="GetText but 3.5 x faster, 560 x less memory, simple, clean namespace (7 vs 34) and threadsave!"
-HOMEPAGE="https://github.com/grosser/fast_gettext"
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activerecord dev-ruby/protected_attributes dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm Gemfile.lock || die
-
-	# Remove jeweler and bump from Gemfile since they are not needed for tests.
-	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
-
-	# Avoid unneeded dependency on git and development dependencies.
-	sed -e '/git ls-files/ s:^:#:' \
-		-e '/\(wwtd\|bump\)/ s:^:#:' \
-		-i fast_gettext.gemspec || die
-
-	# Don't run a test that requires safe mode which we can't provide
-	# due to insecure directory settings for the portage dir. This spec
-	# also calls out to ruby which won't work with different ruby
-	# implementations.
-	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
-
-	# Avoid not failing pending specs related to ree18.
-	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
-
-	# Avoid RSpec 3 specific syntax
-	sed -e '/failure_message/ s:^:#:' -i spec/support/be_accessible_matcher.rb || die
-
-}
-
-each_ruby_prepare() {
-	# Make sure the right ruby interpreter is used
-	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
-}
--- a/dev-ruby/fast_gettext/fast_gettext-0.9.2.ebuild
+++ b/dev-ruby/fast_gettext/fast_gettext-0.9.2.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="GetText but 3.5 x faster, 560 x less memory, simple, clean namespace (7 vs 34) and threadsave!"
-HOMEPAGE="https://github.com/grosser/fast_gettext"
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activerecord dev-ruby/protected_attributes dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm Gemfile.lock || die
-
-	# Remove jeweler and bump from Gemfile since they are not needed for tests.
-	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
-
-	# Avoid unneeded dependency on git and development dependencies.
-	sed -e '/git ls-files/ s:^:#:' \
-		-e '/\(wwtd\|bump\)/ s:^:#:' \
-		-i fast_gettext.gemspec || die
-
-	# Don't run a test that requires safe mode which we can't provide
-	# due to insecure directory settings for the portage dir. This spec
-	# also calls out to ruby which won't work with different ruby
-	# implementations.
-	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Make sure the right ruby interpreter is used
-	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
-}
--- a/dev-ruby/fast_gettext/fast_gettext-1.0.0.ebuild
+++ b/dev-ruby/fast_gettext/fast_gettext-1.0.0.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5

-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"

 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
@ -13,7 +13,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3"

 inherit ruby-fakegem

-DESCRIPTION="GetText but 3.5 x faster, 560 x less memory, simple, clean namespace (7 vs 34) and threadsave!"
+DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!"
 HOMEPAGE="https://github.com/grosser/fast_gettext"
 SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

--- a/dev-ruby/gettext_i18n_rails/Manifest
+++ b/dev-ruby/gettext_i18n_rails/Manifest
@ -1,2 +1,3 @@
 DIST gettext_i18n_rails-1.3.1.tar.gz 20261 SHA256 d50193878e7b8eee61ba48fe33c10f7eed28afdcb7e500dd135743cbc9ffd72f SHA512 761c941aa4d4a746067b84c703b7ca661af3229a2886113a0c5beb1872efd5e74dae7bcf0c6bb476078e636835d19a66e93c8c9c7850024c4ca025e153f1b708 WHIRLPOOL 0b865211641224a5dfc6e76e88297fc2cc8576789a099ca65bc3deefb95318313ec8bae24070fde65c0cd219402cc928265b7ef626435836d3fa8e908ad4ece4
 DIST gettext_i18n_rails-1.3.2.tar.gz 20260 SHA256 7c11f3a1d6d9ae394fd77070013a4fa19330bf4b203a7972d651d2ca2b9056de SHA512 04412b5e6b7389b3882d33385fbec22de7c61cd93e4cc7bc09c2bb4afb5d61d08e4c513e17aac18cf250f8efe12c6362633f9722f0e335bb9913484ce7abca15 WHIRLPOOL c96c23242a5ffc03d7e929bf1e05d12a41a8f01957efaebfbad122df842e212b2f6f306125b2047a2366328181fe40959c9fabf3b672bfc8074f8b9f1d6fb785
+DIST gettext_i18n_rails-1.4.0.tar.gz 21787 SHA256 456f80d679437347cd2a9c516b442302dc93d8776d6503512dff03bdbceda54e SHA512 c6455acafbc498ba33703b028b54c30c15ee8454274677eb5dbe402354e178a880d53840d7c7b8f0e1a5a3212184f93043f7df2ab743955c8a869c79a16d4679 WHIRLPOOL ffa186594756a51dadd834e83788e630090bd1a9563e27accf86e5c187908a999d77188963b2b5b2cf9874c2fecf8add7a21b97b453023329d99b3acc529f973
--- a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.4.0.ebuild
+++ b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.4.0.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="FastGettext / Rails integration"
+HOMEPAGE="https://github.com/grosser/gettext_i18n_rails"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rails:4.1 dev-ruby/activerecord:4.1[sqlite] dev-ruby/temple )"
+ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0"
+
+all_ruby_prepare() {
+	rm Gemfile Gemfile.lock || die
+
+	# Remove specs for slim and hamlet, template engines we don't package.
+	rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die
+
+	# Test against Rails 4.1.0 to match keywords.
+	sed -e '1igem "rails", "~>4.1.0"' -i spec/spec_helper.rb || die
+}
--- a/dev-ruby/protected_attributes/Manifest
+++ b/dev-ruby/protected_attributes/Manifest
@ -1,3 +1 @@
-DIST protected_attributes-1.0.9.tar.gz 22212 SHA256 e22ce3bbf9a6edea7c468518fb86aafefb4137f937f62552fe2d56c89fc2e19e SHA512 ed630460df14ea290d9146448908067e0f418568fa31f1f7dbc014954738ca8ee0ff70992c8d77eab9af446a2e1a91e24acb7585d9030a4ab6cae6ede8ee8a4a WHIRLPOOL 7af9a3c1c2c93c0b17443b7fbcbedbd1baa7c54c7541a692353195d3ea457ac530f31f2446835918c2ee0512aa585b3d574a913a9eebd1a39f24c5a988ac3d8c
-DIST protected_attributes-1.1.1.tar.gz 23227 SHA256 bb946ebc575a8f9286ba689b641f6f397a79ea308c8008a1a30ee50c6c3b7bbc SHA512 94b21cfc5bbb16ad704e627a89d091d81e5a4c468052de3e6ad80292dab057408b4e6b230e68ef2382a089985faef790568851747e684710ecc5ad4ff6c3f0d3 WHIRLPOOL c5571d93a27301854bf27505ff98dc146a4f91fbb64f5d5ca36588239b535d6ca47f3971242ae2444e496151abd13239560cec2e17296c757549c826d911ba06
 DIST protected_attributes-1.1.3.tar.gz 23148 SHA256 0dba89d47e96762b6e2c9cedc1d96a06a16bb307136e23cfc89830602bc97a4b SHA512 e20acd5c392eedc62af18745518249273351104dd0a05e33e459d2ac36706a7c6fdc151d4043370a4527d3e8e96417b26bad2e0f3b21cef3a512bd169d635d45 WHIRLPOOL 311cd7fd9634794d72fae25a903767cbf3894ea07814e8654739e30b3354a49cbe1417dd89462f94f7ed290e7d182132f57aa21106a1e9282be55f5c72508164
--- a/dev-ruby/protected_attributes/protected_attributes-1.0.9.ebuild
+++ b/dev-ruby/protected_attributes/protected_attributes-1.0.9.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protect attributes from mass-assignment in ActiveRecord models"
-HOMEPAGE="https://github.com/rails/protected_attributes"
-SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="1"
-
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_rdepend "
-	=dev-ruby/activemodel-4* >=dev-ruby/activemodel-4.0.1
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	=dev-ruby/actionpack-4*
-	=dev-ruby/activerecord-4*
-	=dev-ruby/rails-4*
-	dev-ruby/mocha
-	dev-ruby/sqlite3
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/github/ s:^:#:' Gemfile || die
-}
--- a/dev-ruby/protected_attributes/protected_attributes-1.1.1.ebuild
+++ b/dev-ruby/protected_attributes/protected_attributes-1.1.1.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protect attributes from mass-assignment in ActiveRecord models"
-HOMEPAGE="https://github.com/rails/protected_attributes"
-SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="1"
-
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_rdepend "
-	=dev-ruby/activemodel-4*:* >=dev-ruby/activemodel-4.0.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	=dev-ruby/actionpack-4*
-	=dev-ruby/activerecord-4*
-	=dev-ruby/rails-4*
-	dev-ruby/mocha
-	dev-ruby/sqlite3
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/github/ s:^:#:' Gemfile || die
-}
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@ -1,4 +1,2 @@
 DIST ruby_parser-3.6.6.gem 250880 SHA256 d3a3ff8e472f85d769e848caa94938e5c4a7b5d9df75384056431bade8bd2cf5 SHA512 c28fea8970c6449a59c1fed1cb2fec3cd167d45c622a7d7de85cf22f24238cd91e3fae4c20ff0de4bd0f4c3afdfd1979e16ee73f60104bcc39469d13650be02a WHIRLPOOL fdf8abbb6eb1e2c421704effd574b5d7baa21059267fad53b1a4f9e80f46c76afe65065e7b5753769c06159a6bd8c84453b9d8d3989f91492fefb15a7b5a6a64
-DIST ruby_parser-3.7.0.gem 310784 SHA256 95d2036b753f399706e3478c1033a81520b27ccf8702e8de076cdfcaff5f1de4 SHA512 bce90b9a266dea59c2c52b80d1524fa6aaf74a6259e7aefe6697081756b8fd6e084ec31042a4b8ca6cf61fbea027fe4255f18d0c3047643a18b03a74b73457d7 WHIRLPOOL 2de7e23ae380e7a2087859cce4d6b97b8399487fc5f504223975f631b8088356a0b3b628d38d6bbecde29a56063cca1c97918a0d7711ddd1482959ffaa0baa35
-DIST ruby_parser-3.7.1.gem 311296 SHA256 7cba241552f03f2db4911013fa40bcd925425f713aa712ebdf34431f1d15ab5a SHA512 34e097c97cf5bd606874a0a1aecb4a5eb4a10f97fd088c21a95b1aee52d9c758a1c7d53601bc711fb5b3d57bf1707e157411eb96d15cccd516c6f5024eca9855 WHIRLPOOL 26178317838ee2bbdd928ea5a97a3c3aaef165b49623395dcff58ac819633b9fc2529a754e821e4e2e5257b34f213f92700f691b0506371e9dc8ab3b7b187633
 DIST ruby_parser-3.7.2.gem 311296 SHA256 7f639194041e51680b530480990c0ca3632507e3740a8ef4516592550e3037e6 SHA512 52c026ebdcc687059818d42bb0f4c8e960209deb19f86bd3204c6b0bd3e06ffa01e9d628587f88c866756a81914d5b3cb7df2947433eb39d214a4a144c168442 WHIRLPOOL 63b3189f5ac5153aee8ce7ff1c2ae2533199b59db016a1159e80ec31b23b87e08e97a6bff9112533216f2b07d28ab16e52f462921a0779d45d0cb1c79b1e613f
--- a/dev-ruby/ruby_parser/ruby_parser-3.7.0.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.7.0.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby parser written in pure ruby"
-HOMEPAGE="https://github.com/seattlerb/ruby_parser"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.6.0:4
-	!<dev-ruby/ruby_parser-2.3.1-r1"
-
-ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
-ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 )"
-
-DEPEND+=" test? ( dev-util/unifdef )"
-
-all_ruby_prepare() {
-	# Remove reference to perforce method that is not in a released
-	# version of hoe-seattlerb.
-	#sed -i -e '/perforce/d' Rakefile || die
-	sed -i -e '/license/d' Rakefile || die
-	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
-}
--- a/dev-ruby/ruby_parser/ruby_parser-3.7.1.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.7.1.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby parser written in pure ruby"
-HOMEPAGE="https://github.com/seattlerb/ruby_parser"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.6.0:4
-	!<dev-ruby/ruby_parser-2.3.1-r1"
-
-ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
-ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 )"
-
-DEPEND+=" test? ( dev-util/unifdef )"
-
-all_ruby_prepare() {
-	# Remove reference to perforce method that is not in a released
-	# version of hoe-seattlerb.
-	#sed -i -e '/perforce/d' Rakefile || die
-	sed -i -e '/license/d' Rakefile || die
-	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
-}
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@ -1,4 +1,3 @@
 DIST sexp_processor-4.4.4.gem 38912 SHA256 43cab5a67ca409d62411f869ddb7a0a4de0988b489d3f1d610d9b6e521964fd5 SHA512 b17c2a6a5675a5244a935f4d3024bcb6eadb667a189a406b4f890b29361042a5523df55cdb5ee82e60180eacc5999a163f2e88a0b70113aa42aa50cffbdfe1e2 WHIRLPOOL 01d7193d6e3c74d517f108b8aa778fcbd701987d20ee503ae9947ce60a0b3824d1dfae2ca6a0bd4f7b314cfa8c22fb347db0b6fef218833a022f2aec351d37fb
-DIST sexp_processor-4.4.5.gem 38912 SHA256 af8713761f1b6604865830c54324e57c33e7cc05107ebdbee4e6d458f8f8fe7c SHA512 6190cc85f7c67ade97725459fd415593fd9f9b405e004b677543c5db40c364d12627587218fe500d46809ccde316dc7d59a647568dfa10bd8eb892af9c20a05e WHIRLPOOL fdea17c49a95e8241b90148710acf7c60f27fb0ddc2fe31a08d095b61fd5c5540dbb88415be47597a94754b89a0023c0273d1f5b7f4280a120cb293d38e9c53b
-DIST sexp_processor-4.5.1.gem 38912 SHA256 1456a9be103bf1de0d34ff6980b77a5a72cf3d4b35bbd2182ac62506981a234c SHA512 9cf997a34c57598c7c09392827453cc7c1233fa335261e9f177f0fb70904d7f4a61d8eb819dab040eae8025c1c91fbc4e09f2aae5f02a457ad19f7732e9552c5 WHIRLPOOL cc232f198e018bbd75b8e860ed921b5326d5067dfd1aaacca3613bf787617a99b0c2221da6b072788e453ac2ae93188f8512672d46f89e159642a2bf01343491
 DIST sexp_processor-4.6.0.gem 39424 SHA256 e2498f90c75bd4c19d1739afadde8c03af26a881c8bd775f71d2f180de65b43f SHA512 48c96a826472029f22e46138831ee9952250e747b9b5e2637d348ae4cba08d4097c88148457d4215e264c556595da44cb7aad8612642a3e49d68888b6d2e0363 WHIRLPOOL 5fd40d5813d957dd304eb3b697b780db23aab24be096fb25fd4448f6b069424f045e3de20d9e5f315901b1bef039371c797377fb5ac837c21204431ca1c77a18
+DIST sexp_processor-4.6.1.gem 39424 SHA256 e2e96c2ee3ea81e1dc7b4b4abee23b6e552e669cfe456ee69126a29a03373cd7 SHA512 25513e71e30c0ded46201d81e454ab628054c2380c4b9715d6b05cf08703ce3cc31e7d127514f2abc12d875d0d53791740b728922f91b85ba579931799de09d7 WHIRLPOOL 6cd94d615eec3858e2fcb920526438a9d6a6c4509da48369812fb5235e62814be6a7fbe63b9c392287938127f00900ec89638173a5b64b85a1f8bc6ac9e80d8a
--- a/dev-ruby/sexp_processor/sexp_processor-4.4.5.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.4.5.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
-HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/hoe-3.13
-		dev-ruby/hoe-seattlerb
-		>=dev-ruby/minitest-5.5
-	)"
--- a/dev-ruby/sexp_processor/sexp_processor-4.6.1.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.6.1.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5

-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"

 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"

 RDEPEND=">=dev-libs/glib-2.12:2
--- a/dev-util/monodevelop/files/local-nuget-icons.patch
+++ b/dev-util/monodevelop/files/local-nuget-icons.patch
@ -0,0 +1,31 @@
+--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoader.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoader.cs
+@@ -91,8 +91,7 @@ namespace MonoDevelop.PackageManagement
+ 		ImageLoadedEventArgs LoadImage (Uri uri, object state)
+ 		{
+ 			try {
+-				var httpClient = new HttpClient (uri);
+-				Stream stream = httpClient.GetResponse ().GetResponseStream ();
+				Stream stream = GetResponseStream (uri);
+ 				Image image = Image.FromStream (stream);
+ 
+ 				return new ImageLoadedEventArgs (image, uri, state);
+@@ -101,6 +100,17 @@ namespace MonoDevelop.PackageManagement
+ 			}
+ 		}
+ 
+		static Stream GetResponseStream (Uri uri)
+		{
+			if (uri.IsFile) {
+				var request = WebRequest.Create (uri);
+				return request.GetResponse ().GetResponseStream ();
+			}
+
+			var httpClient = new HttpClient (uri);
+			return httpClient.GetResponse ().GetResponseStream ();
+		}
+
+ 		void OnLoaded (ITask<ImageLoadedEventArgs> task, Uri uri, object state)
+ 		{
+ 			if (task.IsFaulted) {
+
--- a/dev-util/monodevelop/monodevelop-5.9.5.9-r1.ebuild
+++ b/dev-util/monodevelop/monodevelop-5.9.5.9-r1.ebuild
@ -0,0 +1,142 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit fdo-mime gnome2-utils dotnet versionator eutils git-r3
+
+DESCRIPTION="Integrated Development Environment for .NET"
+HOMEPAGE="http://www.monodevelop.com/"
+SRC_URI="https://launchpadlibrarian.net/68057829/NUnit-2.5.10.11092.zip
+	https://www.nuget.org/api/v2/package/NUnit/2.6.3 -> NUnit.2.6.3.zip
+	https://www.nuget.org/api/v2/package/NUnit.Runners/2.6.3  -> NUnit.Runners.2.6.3.zip
+	https://www.nuget.org/api/v2/package/System.Web.Mvc.Extensions.Mvc.4/1.0.9 -> System.Web.Mvc.Extensions.Mvc.4.1.0.9.zip
+	https://www.nuget.org/api/v2/package/Microsoft.AspNet.Mvc/5.2.2 -> Microsoft.AspNet.Mvc.5.2.2.zip
+	https://www.nuget.org/api/v2/package/Microsoft.AspNet.Razor/3.2.2 -> Microsoft.AspNet.Razor.3.2.2.zip
+	https://www.nuget.org/api/v2/package/Microsoft.AspNet.WebPages/3.2.2 -> Microsoft.AspNet.WebPages.3.2.2.zip
+	https://www.nuget.org/api/v2/package/Microsoft.Web.Infrastructure/1.0.0.0 -> Microsoft.Web.Infrastructure.1.0.0.0.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+subversion +git +gnome qtcurve"
+
+RDEPEND=">=dev-lang/mono-3.2.8
+	>=dev-dotnet/nuget-2.8.3
+	gnome? ( >=dev-dotnet/gnome-sharp-2.24.2-r1 )
+	>=dev-dotnet/gtk-sharp-2.12.21:2
+	>=www-servers/xsp-2
+	dev-util/ctags
+	sys-apps/dbus[X]
+	subversion? ( dev-vcs/subversion )
+	!<dev-util/monodevelop-boo-$(get_version_component_range 1-2)
+	!<dev-util/monodevelop-java-$(get_version_component_range 1-2)
+	!<dev-util/monodevelop-database-$(get_version_component_range 1-2)
+	!<dev-util/monodevelop-debugger-gdb-$(get_version_component_range 1-2)
+	!<dev-util/monodevelop-debugger-mdb-$(get_version_component_range 1-2)
+	!<dev-util/monodevelop-vala-$(get_version_component_range 1-2)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	x11-misc/shared-mime-info
+	x11-terms/xterm
+	app-arch/unzip"
+MAKEOPTS="${MAKEOPTS} -j1" #nowarn
+S="${WORKDIR}"/${P}
+EGIT_REPO_URI="https://github.com/mono/monodevelop.git"
+EGIT_COMMIT="${P}"
+
+src_unpack() {
+	cd "${T}"
+	unpack NUnit-2.5.10.11092.zip
+
+	#clone from git
+	git-r3_fetch
+	git-r3_checkout "${EGIT_REPO_URI}" "${T}/${P}"
+
+	#extract packages
+	mkdir -p "${T}"/packages || die
+	cd "${T}"/packages || die
+
+	for pkg in NUnit.2.6.3 \
+				NUnit.Runners.2.6.3 \
+				System.Web.Mvc.Extensions.Mvc.4.1.0.9 \
+				Microsoft.AspNet.Mvc.5.2.2 \
+				Microsoft.AspNet.Razor.3.2.2 \
+				Microsoft.AspNet.WebPages.3.2.2 \
+				Microsoft.Web.Infrastructure.1.0.0.0
+	do
+		mkdir $pkg || die
+		cd $pkg || die
+		unpack $pkg.zip
+		cd .. || die
+	done
+	mkdir -p "${S}"
+}
+
+src_prepare() {
+	# Remove the git rev-parse (changelog?)
+	sed -i '/<Exec.*rev-parse/ d' "${T}/${P}/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj" || die
+	# Set specific_version to prevent binding problem
+	# when gtk#-3 is installed alongside gtk#-2
+	find "${T}/${P}" -name '*.csproj' -exec sed -i 's#<SpecificVersion>.*</SpecificVersion>#<SpecificVersion>True</SpecificVersion>#' {} + || die
+
+	#fix ASP.Net
+	cd "${T}/${P}/main"
+	epatch "${FILESDIR}/5.7-downgrade_to_mvc3.patch"
+	epatch "${FILESDIR}/local-nuget-icons.patch"
+
+	# fix for https://github.com/gentoo/dotnet/issues/42
+	epatch "${FILESDIR}/aspnet-template-references-fix.patch"
+	use gnome || epatch "${FILESDIR}/5.9.5-kill-gnome.patch"
+	use qtcurve && epatch "${FILESDIR}/kill-qtcurve-warning.patch"
+
+	#prepare dist package
+	cd "${T}/${P}"
+	epatch "${FILESDIR}/5.9.5-skip_merged_tar.patch"
+	./configure --profile=default || die
+	make dist || die
+
+	#move it
+	mv -f "${T}/${P}/tarballs/"monodevelop-*/* "${S}" || die
+
+	#copy missing binaries
+	mkdir -p "${S}"/external/cecil/Test/libs/nunit-2.5.10/ || die
+	cp -fR "${T}"/NUnit-2.5.10.11092/bin/net-2.0/framework/* "${S}"/external/cecil/Test/libs/nunit-2.5.10/ || die
+	mv -f "${T}/packages" "${S}" || die
+
+	default
+}
+
+src_configure() {
+	# env vars are added as the fix for https://github.com/gentoo/dotnet/issues/29
+	MCS=/usr/bin/dmcs CSC=/usr/bin/dmcs GMCS=/usr/bin/dmcs econf \
+		--disable-update-mimedb \
+		--disable-update-desktopdb \
+		--enable-monoextensions \
+		--enable-gnomeplatform \
+		$(use_enable subversion) \
+		$(use_enable git)
+	# https://github.com/mrward/xdt/issues/4
+	# Main.sln file is created on the fly during econf
+	epatch -p2 "${FILESDIR}/mrward-xdt-issue-4.patch"
+	# fix of https://github.com/gentoo/dotnet/issues/38
+	sed -i -E -e 's#(EXE_PATH=")(.*)(/lib/monodevelop/bin/MonoDevelop.exe")#\1'${EPREFIX}'/usr\3#g' "${S}/monodevelop" || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
--- a/dev-util/pkgconfig/pkgconfig-0.29.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.ebuild
@ -63,6 +63,10 @@ multilib_src_configure() {
 			# add the libdir for libtool, otherwise it'll make love with system
 			# installed libiconv
 			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
+			# the glib objects reference symbols from these frameworks,
+			# not good, esp. since Carbon should be deprecated
+			[[ ${CHOST} == *-darwin* ]] && \
+				append-ldflags -framework CoreFoundation -framework Carbon
 		fi
 	else
 		if ! has_version dev-util/pkgconfig; then
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@ -7,3 +7,4 @@ DIST git-annex-5.20150327.tar.gz 4764485 SHA256 1e309466627eb634816805004391c540
 DIST git-annex-5.20150617.tar.gz 5047577 SHA256 2d37c49866880803886fe77be17ac154c84acc0c344e4fefea577a59e55f8d54 SHA512 25f42ab403d3fd39a689af74cd8a26dc5de761d5a8a79c8d7050194c2094f65de9681b4189076c484fb5c644408918140cf1fcb0109a6a2195f1d547e307abfc WHIRLPOOL 89410f048f5773256cac6525f1a42e3845a5106a1d0b82e031d1f70136375479efc180b21907036e191243f55aee7d94b041cc1d994dea403a1640e7310f6f4d
 DIST git-annex-5.20150710.tar.gz 5080419 SHA256 970f953a278401863fb1006679d216891ae556f80434b587deb08dfd6644f860 SHA512 35240f1d78561dab02ae014e4d00b8645c33c526b0d36a28253b9129198ea53b784949c7b47fd3b97f056842430a5e8b0d312b8ba6985bbb3228c73a4dfa21ea WHIRLPOOL 06b824031aeef38468e17ef239aa1501a2236a084a9c54e4c81001247c62b8621cdc6bc090f2b1a516df000823951acee784000aa6dc5b4de5dc4bcd5a2bda59
 DIST git-annex-5.20150731.tar.gz 5096183 SHA256 a2eefd4c273f5510e8ee384cc4fb512bf10c76cc4b84f6fff5c255223bd853a1 SHA512 edad8fb6aa98ad08cfe8406e2c7b794b0cc3a437f28ed43b5863bbba59a1633e2d6b3a94b6f942494ef7bd912650f7c89ad2a3d54920ff405f4d8d173e1027e9 WHIRLPOOL 945600b49b9f240da37d4642849395fc9ef9a615701a8088b6fb573e098e9b4de5a4bde8714974105a36a963e19a78137abdc513f9a0335ff5fe36981d12be25
+DIST git-annex-5.20151218.tar.gz 5233343 SHA256 d8aed73cbc1d1eefcbe6de7790c83f1d6458b4ac1e910d9a34b22782d16142ca SHA512 6c572b40f53dc4e8b72a14daf16a94bdf8c53618bbe85d797f2f440ceab42066376e681b228699a76da3a93965cd166aa68c020a48e2fdb1de964ca27aed55a0 WHIRLPOOL 62e24e29e5e2dfc8b6b9c7815fea57d720bd7183ec513b23dd0d8ac9f8182eaa1178b4017ea9e4d221baac3684c67ede1d3809956aabe5ce77ed3600b175bbbf
--- a/dev-vcs/git-annex/git-annex-5.20151218.ebuild
+++ b/dev-vcs/git-annex/git-annex-5.20151218.ebuild
@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="manage files with git, without checking their contents into git"
+HOMEPAGE="http://git-annex.branchable.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+assistant concurrentoutput cryptonite +database +dbus +desktopnotify +dns doc ekg +feed +inotify +network-uri +pairing +quvi +s3 +tahoe +tdfa +torrentparser +webapp +webapp-secure +webdav +xmpp"
+
+RDEPEND="dev-haskell/async:=
+	dev-haskell/bloomfilter:=
+	dev-haskell/case-insensitive:=
+	dev-haskell/data-default:=
+	dev-haskell/dlist:=
+	dev-haskell/edit-distance:=
+	>=dev-haskell/exceptions-0.6:=
+	dev-haskell/hslogger:=
+	dev-haskell/http-client:=
+	dev-haskell/http-conduit:=
+	dev-haskell/http-types:=
+	dev-haskell/ifelse:=
+	dev-haskell/json:=
+	dev-haskell/missingh:=
+	dev-haskell/monad-control:=
+	dev-haskell/monad-logger:=
+	>=dev-haskell/mtl-2:=
+	dev-haskell/old-locale:=
+	>=dev-haskell/optparse-applicative-0.11:=
+	>=dev-haskell/quickcheck-2.1:2=
+	dev-haskell/random:=
+	dev-haskell/resourcet:=
+	dev-haskell/safesemaphore:=
+	dev-haskell/sandi:=
+	>=dev-haskell/stm-2.3:=
+	dev-haskell/text:=
+	dev-haskell/transformers:=
+	dev-haskell/unix-compat:=
+	dev-haskell/utf8-string:=
+	dev-haskell/uuid:=
+	>=dev-lang/ghc-7.6.1:=
+	assistant? ( inotify? ( dev-haskell/hinotify:= ) )
+	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
+	cryptonite? ( dev-haskell/cryptonite:= )
+	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
+	database? ( dev-haskell/esqueleto:=
+			dev-haskell/persistent:=
+			dev-haskell/persistent-sqlite:=
+			dev-haskell/persistent-template:= )
+	dbus? ( >=dev-haskell/dbus-0.10.7:=
+		desktopnotify? ( >=dev-haskell/fdo-notify-0.3:= ) )
+	dns? ( dev-haskell/dns:= )
+	ekg? ( dev-haskell/ekg:= )
+	feed? ( >=dev-haskell/feed-0.3.4:= )
+	network-uri? ( >=dev-haskell/network-2.6:=
+			>=dev-haskell/network-uri-2.6:= )
+	!network-uri? ( >=dev-haskell/network-2.0:= <dev-haskell/network-2.6:= )
+	pairing? ( dev-haskell/network-info:=
+			dev-haskell/network-multicast:= )
+	quvi? ( dev-haskell/aeson:= )
+	s3? ( >=dev-haskell/aws-0.9.2:=
+		dev-haskell/conduit:=
+		dev-haskell/conduit-extra:= )
+	tahoe? ( dev-haskell/aeson:= )
+	tdfa? ( dev-haskell/regex-tdfa:= )
+	!tdfa? ( dev-haskell/regex-compat:= )
+	torrentparser? ( >=dev-haskell/torrent-10000.0.0:= )
+	webapp? ( dev-haskell/aeson:=
+			dev-haskell/blaze-builder:=
+			dev-haskell/clientsession:=
+			dev-haskell/crypto-api:=
+			>=dev-haskell/path-pieces-0.1.4:=
+			>=dev-haskell/shakespeare-2.0.0:=
+			dev-haskell/wai:=
+			dev-haskell/wai-extra:=
+			>=dev-haskell/warp-3.0.0.5:=
+			>=dev-haskell/yesod-1.2.6:=
+			>=dev-haskell/yesod-core-1.2.19:=
+			>=dev-haskell/yesod-default-1.2.0:=
+			>=dev-haskell/yesod-form-1.3.15:=
+			>=dev-haskell/yesod-static-1.2.4:=
+			webapp-secure? ( dev-haskell/byteable:=
+					dev-haskell/securemem:=
+					>=dev-haskell/warp-tls-1.4:= )
+			!webapp-secure? ( dev-haskell/warp-tls:= ) )
+	webdav? ( >=dev-haskell/dav-1.0:= )
+	xmpp? ( >=dev-haskell/gnutls-0.1.4:=
+		dev-haskell/network-protocol-xmpp:=
+		dev-haskell/xml-types:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
+
+src_prepare() {
+	# does not respect staging dir
+	epatch "${FILESDIR}"/${PN}-5.20150731-no-strange-installs.patch
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-android \
+		--flag=-androidsplice \
+		$(cabal_flag assistant assistant) \
+		$(cabal_flag database database) \
+		$(cabal_flag cryptonite Cryptonite) \
+		$(cabal_flag concurrentoutput ConcurrentOutput) \
+		$(cabal_flag dbus dbus) \
+		$(cabal_flag desktopnotify desktopnotify) \
+		$(cabal_flag dns dns) \
+		$(cabal_flag ekg ekg) \
+		$(cabal_flag feed feed) \
+		$(cabal_flag inotify inotify) \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag pairing pairing) \
+		--flag=-production \
+		$(cabal_flag quvi quvi) \
+		$(cabal_flag s3 s3) \
+		$(cabal_flag tahoe tahoe) \
+		$(cabal_flag tdfa tdfa) \
+		--flag=-testsuite \
+		$(cabal_flag torrentparser torrentparser) \
+		$(cabal_flag webapp webapp) \
+		$(cabal_flag webapp-secure webapp-secure) \
+		$(cabal_flag webdav webdav) \
+		$(cabal_flag xmpp xmpp)
+}
+
+src_compile() {
+	haskell-cabal_src_compile
+	use doc && emake docs
+}
+
+src_test() {
+	if use webapp; then
+		export GIT_CONFIG=${T}/temp-git-config
+		git config user.email "git@src_test"
+		git config user.name "Mr. ${P} The Test"
+
+		emake test
+	fi
+}
+
+src_install() {
+	haskell-cabal_src_install
+	dosym git-annex /usr/bin/git-annex-shell # standard make install does more, than needed
+
+	# install-mans wants ikiwiki. It returns 0 and builds the man pages without ikiwiki.
+	emake install-mans DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+	use doc && emake install-docs DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+	mv "${ED}"/usr/share/doc/{${PN},${PF}}
+	dodoc CHANGELOG README
+	if use webapp ; then
+		doicon "${FILESDIR}"/${PN}.xpm
+		make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office"
+	fi
+}
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@ -22,6 +22,8 @@
 		<flag name="androidsplice">Get TH splices for Android.</flag>
 		<flag name="asciiprogress">Use ascii-progress library (experimental)</flag>
 		<flag name="cryptohash">Enable use of cryptohash for checksumming</flag>
+		<flag name="concurrentoutput">Use concurrent-output library (experimental)</flag>
+		<flag name="cryptonite">Use the cryptonite library, instead of the older cryptohash</flag>
 		<flag name="database">Enable building with <pkg>dev-haskell/persistent</pkg> for database use</flag>
 		<flag name="desktopnotify">Enable desktop environment notifications</flag>
 		<flag name="desktop-notify">Enable desktop environment notifications</flag>
--- a/dev-vcs/hub/Manifest
+++ b/dev-vcs/hub/Manifest
@ -1,3 +1,4 @@
 DIST hub-1.12.4.tar.gz 76798 SHA256 b7fe404d7dc5f60554f088bec12de5e80229331430ea0ced46d5bf89ecae5117 SHA512 3c80592954f6f9bd9406adf8faaaf3e307a5387b623b07f06f574e6841899a7e253b67429417ba37c78b53064ddd0188b9f37e3e24130d899207c23bad389618 WHIRLPOOL 46c0870101add366c83d12ea92cfd1d434e841df58101ef8b1250e040cb0fe92590245b3e092780213b837cc2f9d9ad9bd9bff37a110bc608d63cddd7bbf4898
 DIST hub-2.2.0.tar.gz 301460 SHA256 2da1351197eb5696c207f22c69a5422af052d74277b73d0b8661efb9ec1d0eb1 SHA512 ad65cfd2a81ab92ab69d31ff7a068cf2da1557ca1d2f6e1b97b7f939249e9955bb2cace42b8900ec2d5b98970fbca27435edcd503af7ee3c05a79462e7734d8a WHIRLPOOL 83ea1d3b1086d7cdcebed6cb604027763cd41dd3f101dd56827c469ec61034a9e3a7b4cbd1111b5b7820707a13679a558704d80d58fed125f07573fb983dff9a
 DIST hub-2.2.2.tar.gz 311726 SHA256 610572ee903aea1fa8622c16ab7ddef2bd1bfec9f4854447ab8e0fbdbe6a0cae SHA512 27eb8d3b973b30ab16fa59649af55934a2543d74d5160337be881b9d6038efaac4d19e3b2d3295191e65daedafa93d36773f05b3e3a48eae312b711db34762c0 WHIRLPOOL e4274515eac18938c42b4bf71a5ed7ec0e1c66a4ea65db68559172c039bd2b7b252d0c0ffc7209545f966d4d8b0d7b89c6e075f589ac677e16340ba5c641f778
+DIST hub-2.2.3.tar.gz 314438 SHA256 f8a43df60b2efd95c70054324e73f27c3b253ec1c4969de8ea6c514669c688ed SHA512 6f05b697ea4aa4962ac2977e2060e418a7332756c713828ec987aad6c06b6cfb9f39c2ed79797f6c2243f841cd009344482a341d11c14fd4728ba4b8cc0318d5 WHIRLPOOL 105edccf4841eafd7718b071efffbd42ce2974c646940f1ea3a6130a96a2bb0ffaf772f44f1f64666bd9d4ceae631dfc8de1c1343bd68e84fe59ccefe518214b
--- a/dev-vcs/hub/hub-2.2.3.ebuild
+++ b/dev-vcs/hub/hub-2.2.3.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 readme.gentoo-r1
+
+DESCRIPTION="Command-line wrapper for git that makes you better at GitHub"
+HOMEPAGE="https://github.com/github/hub"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.5.1:="
+RDEPEND=">=dev-vcs/git-1.7.3"
+
+DOC_CONTENTS="You may want to add 'alias git=hub' to your .{csh,bash}rc"
+
+src_compile() {
+	./script/build || die
+}
+
+#src_test() {
+#	./script/test || die
+#}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	dobin hub
+
+	doman man/${PN}.1
+	dodoc README.md
+
+	# Broken with autoloader
+	# https://github.com/github/hub/issues/592
+	#newbashcomp etc/${PN}.bash_completion.sh ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/hub.zsh_completion _${PN}
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
--- a/eclass/readme.gentoo-r1.eclass
+++ b/eclass/readme.gentoo-r1.eclass
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-# @ECLASS: readme.gentoo.eclass
+# @ECLASS: readme.gentoo-r1.eclass
 # @MAINTAINER:
 # Pacho Ramos <pacho@gentoo.org>
 # @AUTHOR:
--- a/eclass/readme.gentoo.eclass
+++ b/eclass/readme.gentoo.eclass
@ -31,6 +31,7 @@ case "${EAPI:-0}" in
 		# from needing to export another pkg_preinst phase to save has_version
 		# result. Also relies on EAPI >=4 default src_install phase.
 		EXPORT_FUNCTIONS src_install pkg_postinst
+		eqawarn "This eclass is DEPRECATED. Please use readme.gentoo-r1 instead."
 		;;
 	6)
 		die "Unsupported EAPI=${EAPI} for ${ECLASS}"
--- a/games-emulation/ppsspp/ppsspp-1.1.0.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.1.0.ebuild
@ -42,7 +42,7 @@ DEPEND="
 		dev-qt/qtcore:5
 		dev-qt/qtopengl:5
 		dev-qt/qtmultimedia:5
-		dev-qt/qtwidgets
+		dev-qt/qtwidgets:5
 		dev-qt/qt-mobility[multimedia]
 	)
 "
--- a/games-emulation/ppsspp/ppsspp-1.1.1.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.1.1.ebuild
@ -42,7 +42,7 @@ DEPEND="
 		dev-qt/qtcore:5
 		dev-qt/qtopengl:5
 		dev-qt/qtmultimedia:5
-		dev-qt/qtwidgets
+		dev-qt/qtwidgets:5
 		dev-qt/qt-mobility[multimedia]
 	)
 "
--- a/games-emulation/ppsspp/ppsspp-9999.ebuild
+++ b/games-emulation/ppsspp/ppsspp-9999.ebuild
@ -41,7 +41,7 @@ DEPEND="
 		dev-qt/qtcore:5
 		dev-qt/qtopengl:5
 		dev-qt/qtmultimedia:5
-		dev-qt/qtwidgets
+		dev-qt/qtwidgets:5
 		dev-qt/qt-mobility[multimedia]
 	)
 "
--- a/kde-misc/zanshin/Manifest
+++ b/kde-misc/zanshin/Manifest
@ -1,3 +1,4 @@
 DIST zanshin-0.2.1.tar.bz2 142281 SHA256 dd9592750b793118dc6de46ebed8b76a9e00b0f193c2963ab880cf33b738b394 SHA512 109620a0c1ab27360c213a440b3a3a123b466d1be6c5b745ab9d076fc768dec5f1b7cbeecfd1190c287cd35d8cf96d3ff32b380d29ddf6255f1f3c4ce2fdd7ae WHIRLPOOL 440d6d84b1e3934a4861a07f965c95531590f96ee4d6603716906f908efdc6d4f0696bbc405fb228f79a1b73528cafa8be38b4dc4746c4c413d9225cac631cd2
 DIST zanshin-0.2.2.tar.bz2 142237 SHA256 5c0250c4614a82b4282c209818d11ba31c1326bb0ad434b452a22797f045370b SHA512 637b7e8a74a12700d35e678ac6e676070cc03e3576e6c82fb63b95f6cce3cd8b02639c3ef10a7738b47bbde62348f5cf8d7ba499fa281cd4ac22ef2951559be3 WHIRLPOOL 3f20f1a742a109f5c2e2955d4262802b36692d6430972ef995685d5ed59488ce301a565a451c33cf31ee529083301bd63f23efadc6790b01ffc256b1a4eec2bb
 DIST zanshin-0.3.0.tar.bz2 352593 SHA256 4447ab7c334e764c6f6503a5747b88db075a09bb8ae787bea2caeff930fb8ec4 SHA512 82efa2baad5cadae69e7edccefa2e7bd76f3e9d05b2c1fdc59cc8e965064549cfc3243bd18bb816a71f60f344de1fc383f2cb5292a4da5478478b1b9b6892ef2 WHIRLPOOL 9ddd344bd8eb57d6d9cce18b8eb57acb9eba24ed398b9d8d435882faf7e2a60739d8093d7006336c8032a1b6b70cf1b8a92c7e4d466d7a702c4afbbbbbd149c6
+DIST zanshin-0.3.1.tar.bz2 353114 SHA256 f4fb120499eb6f64e11aff714d44cc5fb4a70ccc4db3179a6926a0883eb362b2 SHA512 6cd3576308ca73fba3913f09b80e4b7fadd9368105f10f7e9db09a865fbedafed9cc84680d8145f4852f75a63f025ddd5cb775a2876ed4b67841981f4d610cd0 WHIRLPOOL 831fd91ee827cfe8b01b0bc67e7adb75c8d4a3ccd6f5a3144727a15d0dc46430d2f4fc9924273cbbeffab510e53dd2244849efbd72c766558343e0de5021fc85
--- a/kde-misc/zanshin/zanshin-0.3.1.ebuild
+++ b/kde-misc/zanshin/zanshin-0.3.1.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde4-base
+
+DESCRIPTION="Todo management application for KDE"
+HOMEPAGE="https://zanshin.kde.org/"
+SRC_URI="https://files.kde.org/${PN}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdeapps_dep kdepim-runtime '' 4.6.0)
+	$(add_kdeapps_dep kdepimlibs)
+	$(add_kdebase_dep baloo)
+	dev-libs/boost
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@ -1,2 +1,3 @@
 DIST rspamd-1.0.11.tar.xz 1176160 SHA256 b914c77c30dcab863f6c685b4a83a1662ee1b4503654fbf3ee3ae2fbca1ed928 SHA512 79464e8c29bdf5b081744b79fb8eee944bf647abf334cd77686a8fa4d0a3ab7ff4293fc464606d298fb57c8d7fe909e333ae7e58768330e4d65464bf42f76f15 WHIRLPOOL ca1f8338ef6f917622c8a93fa8bf230b2767d750e953d9f790649e660865caaa255c5a8eb35a14cb882acc193a237bf107d79c7c01f3d7ec6520301edc9f2629
 DIST rspamd-1.1.0.tar.xz 1291004 SHA256 69db05150b4ba8304d24dd0f96c79b5d3792478373f0d6be6c92b51b1cf60ead SHA512 41a8fb49a10082b1dc97397ebb8ac81dd3f4912e9140dcb7c57c9e15f1e49cf472aa94570a2f802b82e3db8ab8a87dd6a63f7db7249da4d99473700535045256 WHIRLPOOL 3781b7450e0f2cd780e2dac804871d52fed619c5e82faf54d8d9d4230b2baf531eeacea09b43ae36ec09fb7b659ba74116ab59fb86731de9bcfc471a2dbdd7ad
+DIST rspamd-1.1.1.tar.xz 1291968 SHA256 3c4bda66b533861a84d82ea26bd7c19ccd1b1befe8b3e33a0fc211c036569a06 SHA512 c971000f9e6c09ae8c4a175fcd96471efa3f5e73689b038a45cc2212dcf296babfd4000fa41f0451b2fdd989e00192cbb234a73cef026c16466bfe78b04b5385 WHIRLPOOL e1ef4042e9a38bcff20a2a3ea0e9fa29fa813adede28867e176d3aeff952fe243fd4a083a60d810fe16c1ad22e6489583b50a38825bc20c338ddf1710f9294da
--- a/mail-filter/rspamd/rspamd-1.1.1.ebuild
+++ b/mail-filter/rspamd/rspamd-1.1.1.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils user
+
+DESCRIPTION="Rapid spam filtering system"
+SRC_URI="https://rspamd.com/downloads/${P}.tar.xz"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl:0
+		dev-libs/libpcre
+		dev-lang/luajit:2
+		dev-libs/libevent
+		dev-db/sqlite:3
+		dev-libs/glib:2
+		dev-libs/gmime
+		sys-apps/file
+		virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup rspamd
+	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFDIR=/etc/rspamd
+		-DRUNDIR=/var/run/rspamd
+		-DDBDIR=/var/lib/rspamd
+		-DLOGDIR=/var/log/rspamd
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/rspamd.init" rspamd
+
+	dodir /var/lib/rspamd
+	dodir /var/log/rspamd
+
+	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/rspamd.logrotate" rspamd
+}
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@ -2,5 +2,5 @@ DIST postfix-2.10.9.tar.gz 3820525 SHA256 e47eb56db2d238b9c5a5147a516fa406ab6afb
 DIST postfix-2.11.7.tar.gz 4031689 SHA256 05828b5b846e48fdc80db67d85409066010614af521070df4733459fbf447e20 SHA512 a1e146db6d2d71abb1dd7c70cde24e6410b599458ffa8061a0161be9475452034d9dcc7ec3976042b379cd84f5ebdba2f9d8d829637ff376ccaf7e87bcabe7a3 WHIRLPOOL 990cf17bc8d0cb8c8de0aa42f16125b1393feb42ed2eca3cb66ddd4d0b5d9425f619ee22047745fdd2f0069dc321e942ecc326bfbb88519fccf4931f95b1c483
 DIST postfix-3.0.2.tar.gz 4239235 SHA256 68256314202f5f0f24022d64f7ac664d28fa1394d07c84a37c3fc7a2d040be80 SHA512 b097ff5cb1707361af568bbcf8b9d264dfefe7a9fd5c2fb4ce731a2ff6a632c3341ace43afe7f1600f2096592535cf9a300322f78c92000e752e0df7d3c39021 WHIRLPOOL 3fd230321577c0226926701a17803b038a281b46abe884899ca38ea18c5fd9c13ef90900e5fdd17db20ecf8dc63b373cb9f378f1402660be2908192900cba47a
 DIST postfix-3.0.3.tar.gz 4240588 SHA256 401e46ec3450569dcce60d1d8ca22a19ab1f7f817b0cc730cdf4875ba608ac02 SHA512 b6cd091a8cdda9678fa2979082e47a363dd086e4376effc0a427d1beb5eb35bd7dc28003ad28323c42318d7f630e0d8b105c56fd1a63bd5b5a20501db68ac524 WHIRLPOOL b013164f12e2adde464052f37584320687716f18c65cdd01344848bbcdd5a08be16c741234a063d717474a50be0d14d7b5574ccb69dc56e00f30b619d148c9f9
-DIST postfix-3.1-20160104.tar.gz 4312368 SHA256 f61125163bd80bb51a02979cd0955502601331e547b3dad02d2b4ff06ce0e01b SHA512 6761125cdd4b7f3760db5a7b2ea5e5381cd77cab369db69d66ef607fbda70912ff4de079b57ef0952d335b6f558f8e004c1ed9f4ca100ea7c4708fabe8e6a498 WHIRLPOOL 797cc89e277fe9f9ac4ccc9729d8e4190aeb8973d3a0137d79dfc38e2a0aeb52830a35437cb1d09fbf5b9e8a3f3a7e7cf411380afe31313f1b6fb88d49826789
+DIST postfix-3.1-20160117.tar.gz 4314392 SHA256 91f6572d453000d113d783e0e2d73db6cec53d8ce37e2d3fe441cfdd6621c9b1 SHA512 e712e60758d10edf3bd20d37667664fbb86959238cd7c704c86872dff761c8c52db1e4345a48b9bade19a950eb8fe5c1e71c42d6d37ddf0b70b6bec22a36dc60 WHIRLPOOL 8d1abec5621abece386f718117d4db6e7ff2fa3c41520b5e4cbede70475a719366a4ff53132262d943025c48a2be679279eca2180d0a834a2463953eb9e7e99b
 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
--- a/mail-mta/postfix/postfix-3.1_pre20160117.ebuild
+++ b/mail-mta/postfix/postfix-3.1_pre20160117.ebuild
--- a/media-gfx/k3d/Manifest
+++ b/media-gfx/k3d/Manifest
@ -1,2 +1 @@
 DIST k3d-0.8.0.5.tar.gz 9992671 SHA256 d238d55211695a79b2449b19103068add1900f55f7a2e13765a2dc712e5eeda3 SHA512 229ceb195a07fcf3c07957f5f66b01bbdc03c54d5aa0b2c24be7511864013fb0b58b1e45c4db995c77aa5cc2318b61aed3412c71b16c2c042799863da8912065 WHIRLPOOL d266b4279e4bc7f4beb791451f8f626f229875fc4d6a987f7276e2ecb22e4a1b6b7d31c8e7fa27623d881f03032c76f0a9198ae28c79397aa2c22b261b83ca5b
-DIST k3d-source-0.7.11.0.tar.gz 7692200 SHA256 c6364cb9e989f2ac2412541c2a4368279b23e728822ab7e6b5390d579dd49008 SHA512 023dcdfd4e35c4444b07e2d674824fdc31842847a0f8393641359b25fc3f3a127adf2279606d0322e24c3e66d59709624dcf128eda4260296da2c3dc42d0ac43 WHIRLPOOL e50b07d93b7689454999ec125990871c72f803ba75ae6373f1a201f2393b4fcbd90e3f2b49eca610bbb26a3cf4c4934a0108ed250b2830d58a9d98b92883a99b
--- a/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild
+++ b/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild
@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils cmake-utils flag-o-matic
-
-MY_P="${PN}-source-${PV}"
-
-DESCRIPTION="A free 3D modeling, animation, and rendering system"
-HOMEPAGE="http://www.k-3d.org/"
-SRC_URI="mirror://sourceforge/k3d/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="3ds cuda gnome graphviz gts imagemagick jpeg nls openexr png python tiff truetype" #TODO cgal tbb
-
-RDEPEND="
-	dev-libs/boost[python]
-	>=dev-cpp/glibmm-2.6:2
-	>=dev-cpp/gtkmm-2.6:2.4
-	dev-libs/expat
-	>=dev-libs/libsigc++-2.2:2
-	media-libs/mesa
-	virtual/glu
-	virtual/opengl
-	>=x11-libs/gtkglext-1.0.6-r3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libXt
-	3ds? ( media-libs/lib3ds )
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	gnome? ( gnome-base/libgnome )
-	graphviz? ( media-gfx/graphviz )
-	gts? ( sci-libs/gts )
-	imagemagick? ( media-gfx/imagemagick )
-	jpeg? ( virtual/jpeg )
-	openexr? ( media-libs/openexr )
-	png? ( >=media-libs/libpng-1.2.43-r2 )
-	python? ( >=dev-lang/python-2.3 dev-python/cgkit )
-	tiff? ( media-libs/tiff )
-	truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS README"
-
-# k3d_use_enable()
-#
-# $1: use flag. ON|OFF is determined by this.
-# $2: part of cmake variable name which appended to the base variable name
-#     that is -DK3D_BUILD_$2
-#
-# e.g.) k3d_use_enable gnome GNOME_MODULE #=> -DK3D_BUILD_GNOME_MODULE=ON
-#
-k3d_use_enable() {
-	echo "-DK3D_BUILD_$2=$(use $1 && echo ON || echo OFF)"
-}
-
-k3d_use_module() {
-	echo "-DK3D_BUILD_$2_MODULE=$(use $1 && echo ON || echo OFF)"
-}
-
-src_prepare() {
-	sed -i \
-		-e '/PKG_CHECK_MODULES/s:libpng12:libpng:' \
-		cmake/modules/K3DFindPNG.cmake || die
-
-	epatch "${FILESDIR}"/${P}-libpng14.patch
-
-	epatch "${FILESDIR}"/${P}-fix-potfiles.patch \
-		"${FILESDIR}"/${P}-cuda.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gtk-liststore-vs-treemodel.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
-
-	[[ -f CMakeCache.txt ]] && rm CMakeCache.txt
-}
-
-src_configure() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	mycmakeargs="
-		-DK3D_BUILD_SVG_IO_MODULE=ON
-		-DK3D_BUILD_CGAL_MODULE=OFF
-		$(k3d_use_module 3ds 3DS_IO)
-		$(k3d_use_module cuda CUDA)
-		$(k3d_use_module gnome GNOME)
-		$(k3d_use_module graphviz GRAPHVIZ)
-		$(k3d_use_module gts GTS)
-		$(k3d_use_module gts GTS_IO)
-		$(k3d_use_module imagemagick IMAGEMAGICK_IO)
-		$(k3d_use_module jpeg JPEG_IO)
-		$(k3d_use_enable nls NLS)
-		$(k3d_use_module openexr OPENEXR_IO)
-		$(k3d_use_module png PNG_IO)
-		$(k3d_use_module python PYTHON)
-		$(k3d_use_module python PYUI)
-		$(k3d_use_module python NGUI_PYTHON_SHELL)
-		$(k3d_use_module tiff TIFF_IO)
-		$(k3d_use_module truetype FREETYPE2)"
-
-	cmake-utils_src_configure
-}
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@ -1,2 +1,2 @@
 DIST kphotoalbum-4.5.tar.xz 9415984 SHA256 0cdd4e02e9e4f840550a20cc8dca8a017777e4a55db19f0f8b15e903d2c342cd SHA512 57fe89ec55098312ed53b3ba934d42b84de6e5efcb7e30860deaa0162971ba9e2e9eb573268e2918492c79c2b739b5cf7e16bcb0c9a619c189b3b7ccadb9642d WHIRLPOOL 77f2a4c40b84c5e3406f16757d631aaf8968129d99506bed7528cc27216d34980aba246714629a1969a6625a72291596cf115f275d6fdb39ba4bd84cf93d74fe
-DIST kphotoalbum-4.6.2.tar.xz 9503920 SHA256 54c256a1943a632f7ff68126dc985e7f434e7b18c762ae40a49181b9d85f34fb SHA512 437fb05a3e2f9f6f2ca97ba3ee17a125185ffe1603f3a37ad1b1bf837c49ee983e7ccf6858ad7243a7cae00eb2175f5a280bfd31cd5ed109ca46fa1ae8170a57 WHIRLPOOL aaab45d3d5f2115206d98cd7db4953df21c3189ffc8f57f3291321f744cdf69fb138ec08f4af0b6b3f2db2b2281e8f468259cf0846784528e6fba64906b93459
+DIST kphotoalbum-4.7.tar.xz 9514404 SHA256 8b33cbe995b652740ee965b907abb96689588c1eac36340d9ace646d3018735d SHA512 b441c5ebad3821dc72601e50bddcb7fe49c1f8cfd08ddc763692b69e3eb8affd2f5146d2cd9eb48d272d1f600ea40ee1d2a5bb7a14b6eaade558852154485100 WHIRLPOOL 037f04dfa31aba059ef76bf45b67d4268c81bd025b2c6e8bfb092aad2e30f7a829522624fb24a1163864c9e63a91f1bfa970a2f5465530c9577c46ae979c14c2
--- a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -26,7 +26,7 @@ COMMON_DEPEND="
 	media-libs/phonon[qt4]
 	virtual/jpeg:0
 	exif? ( >=media-gfx/exiv2-0.17:= )
-	face? ( >=kde-apps/libkface-4.7.0 )
+	face? ( >=kde-apps/libkface-4.7.0:4 )
 	geolocation? ( $(add_kdeapps_dep marble) )
 	kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )
 	map? ( >=kde-apps/libkgeomap-4.7.0:4 )
@ -40,7 +40,6 @@ RDEPEND="${COMMON_DEPEND}
 	kipi? ( >=media-plugins/kipi-plugins-4.7.0 )
 "

-PATCHES=( "${FILESDIR}/${P}-bump-min-cmake.patch" )
 DOCS=( ChangeLog README )

 src_configure() {
--- a/media-gfx/openmesh/Manifest
+++ b/media-gfx/openmesh/Manifest
@ -1,4 +1,3 @@
-DIST OpenMesh-2.3.1.tar.bz2 18203577 SHA256 5cd6537c64e1ff3f451e19328a70c02d283d06705e96698c19dde75c3749e4f8 SHA512 5d0822032111f07dc23751edebc7efa6e98d7e729ee020cfa6b5cf78b4c5e1a9f0ea1ca4a5cf3b1fe1cb1fc4389260f834b9e1c682a4f4c68cdc84035eef6c67 WHIRLPOOL 398fd2ae94e3927024fdc8489801480b9c27449e1ac5559f0e8c890ebee3d61b66207c6909f4b3ef73ec16829fee877e57e434a77c9dde2c0d22ec80a987e968
 DIST OpenMesh-3.2.tar.bz2 23766435 SHA256 c74890539846c8222aae93ad63316132e84bf4b2080c9b8321790767723f32e5 SHA512 40b346a6c7b141c284183ca66a489d20b668e3c3c0fb5b4e4185b86ea4552f031ea3106e918b2c3cf8e1bc713f3aac325dd17b50ec4d29f6446cf2cbde9a3dd9 WHIRLPOOL 93d8a2d2443f3de8938bf02836f1e1af92fc5adcd0c8c8fbc404a489d566d8d0e4dc4ed86665a8de0c94b171c045713497a7ef6fdb2aa83e04c5a3e2c18a79d5
 DIST OpenMesh-3.3.tar.bz2 24797682 SHA256 4eff6fff5685c57e2e7cdbf5b4b1ef183b3806db822eb01f74c8895e0fbe7a1d SHA512 3bed1f6a3d7db9b67d6c17647bf6c5efa26aca394763d14f5106f70573660329618d99287a51bea23c3a34b495117e38d5756d6d5bf49ea1add711d9e68bab8d WHIRLPOOL 3e6469940dd0ea5c6b83f79841faae8917c25558ea2bc43d78b7576c070fb8ab14b0280c1900e7d871f30a305ab42791a5498373a8869674179b0fd73dc626d5
 DIST OpenMesh-4.1.tar.bz2 24728164 SHA256 3e30cd7325db6367175e2e88c7516c23b7f90c9e1ff739c7d62e7de21228bb8e SHA512 064a4d5cb467589869baf4a302e6c620bd84de874b24019252b97ef863b59e83f2fe23ea45e4a5162a7765847da19f75f563f084cf2b3ae77c7e704b4c859b71 WHIRLPOOL 6989d0ff9dd24bf5b8252e6fc0a416258015d1b5a6202b4e7583c1f2eefe59826a5e2aaa6d50f105083f43680431a67e1cab5b81ace06b119d4e3737267f79ee
--- a/media-gfx/openmesh/files/QGLViewerWidget-hh-gcc-4.3-include-fix.patch
+++ b/media-gfx/openmesh/files/QGLViewerWidget-hh-gcc-4.3-include-fix.patch
@ -1,18 +0,0 @@
-diff -urN a/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh b/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh
--- a/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh	2008-07-01 09:05:13.000000000 -0400
-+++ b/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh	2009-04-17 16:38:31.099766294 -0400
-@@ -36,11 +36,11 @@
- //== INCLUDES =================================================================
- 
- 
-#include <OpenMesh/Core/Geometry/VectorT.hh>
-#include <QtOpenGL/qgl.h>
-#include <string>
-+#include <cstring>
- #include <vector>
- #include <map>
-+#include <OpenMesh/Core/Geometry/VectorT.hh>
-+#include <QtOpenGL/qgl.h>
- 
- 
- //== FORWARD DECLARATIONS =====================================================
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST concurrent-output-1.7.3.tar.gz 21005 SHA256 9a510e7378ba9c6c637027074fa127fad832f9321144fdbe9ae3b1955cf40620 SHA512 0c338d45167bac4d11f760994fa7c5b3d6b3525cc4fbb289e70247affcabec94b44cdc1991519e40ddb71975e5a995f10e116b289de194dd3a91467c6f4df950 WHIRLPOOL 4670e2f99ed3c9658d8e6c3e02d412fc78b7af208775872278851b356b282b8fbc906474674f30af25063a85bbc405fc530baa486771ac39b30f851bd0a21cdf`