Sync with portage [Wed Mar 2 08:48:14 MSK 2016].

2016-03-02 08:48:15 +03:00 · 2016-03-02 08:48:15 +03:00 · 71ebdbdca9
commit 71ebdbdca9
parent 2dee493a99
4807 changed files with 19709 additions and 11542 deletions
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@ -175,3 +175,8 @@

    - Validating configuration before (re)starting daemon

+  29 Feb 2016; Patrick Lauer <patrick@gentoo.org> metadata.xml:
+  Remove unneeded useflag descriptions from metadata.xml
+
+  Package-Manager: portage-2.2.27
+
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@ -15,9 +15,9 @@ AUX logrotate 115 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043
 DIST collectd-5.4.1.tar.bz2 1521907 SHA256 75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0 SHA512 96289f52d3d1da55c862ae9ee2f57972682d7eab87387e97efa41fb5197599e097abd71aed2fe014e26af37c9ae98471e06dd181c725849976242642ce5c9492 WHIRLPOOL 2ed85b9d6d00c4e7dc6af236b637e282f17c6c0b20c1ba3da9c12ea85c5fdea1add2e29165874c7e9620852e422282d489436a4e245b161902f8926185edec16
 DIST collectd-5.5.0.tar.bz2 1824495 SHA256 847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88 SHA512 d2c2840f681c10345e02ad8df0f7c581dcb45bee276589fcd96b3dadd281a79ebb3b9a34a186242ef41285dde7fc505432376138ff4f72c4f60f1b840e640017 WHIRLPOOL 6223ca363984ab3777ca89e2cd5011f059b6ca7f5c66c5e7325d3155ce38ef2829caced3ad27e4d5016c5fdba59bb21b9b47d840ea0c4d164c3674b6ee5062ac
 DIST collectd-5.5.1.tar.bz2 1797852 SHA256 f9c5d526e1f0429a7db1ccd90bdf9e23923a2fd43b7285cfda8f0341e5c0bc3f SHA512 1935809571b8f0e0870399385312a5687f441d11e08a0c7d1337384b3790c3436ba84f89226aad979584045cc13bdf88f1350a0f49c94bcd0dbcf12ae4704dae WHIRLPOOL 3efeeb9262344a8a1c0aa068e64f5d45ff536d1fc1399b4599143a6e47740d5a33aedf482dbf9110cc5f0345d624fbe71ff00fc6f7afeee891326617f7979e41
-EBUILD collectd-5.4.1-r2.ebuild 13515 SHA256 b548f921f54daaa24f23676a7067bf2b773220ca3910a698f9ace426185ddf30 SHA512 44f1bdbbd77953560a6f20188f0eed009fc77ff8c32073acff7437b30127aa44bb1d463ed52d5e78d4f5452c2c5cedb7229aecd44d5839b6bf2870bd373fbb47 WHIRLPOOL a5fcdff9c4dd2b5d7051daedcb662117e4665c48b6d3b927e92add19a0e8bc21f01126ff6e659b67fc6c81b79014b0b719a33af03d5a3df024eead3b973b2fc5
-EBUILD collectd-5.5.0.ebuild 14334 SHA256 8788ba3b14f709cad50c362ee7da94597e5980067cc1cdc0adba1ea6a0d24ed6 SHA512 af5a5be67cb1df4015eab413029d11625add8d9b04f8d0796b93c41552d5ea7ec817b04e8df5c05dcc5f6f8d87255e99b67e3ed3926ddb00c9b0a1203a424708 WHIRLPOOL c84c6920a589a5e5645d70e8141898b78138ae0244d560f53cb9b3f986d47813828d34db82a43bbf90c048881804b394e4d62129f08cfc17c319d8c6e7776a92
-EBUILD collectd-5.5.1.ebuild 16793 SHA256 a0103e506ef36dbc8684876e70f1e64df2a20b0c31d5beb0596b617556eaf6ff SHA512 edb0ca654cfd5894bce3a0f4f054c395ffcb9239a2f73c598c5cf734633a196537a395587468199e49cfe93b569ee474ae3fa9a9f564dbc90eee316a46434c59 WHIRLPOOL 502efaa1bf0c6c36ffb2df08fe931f93db2408d08201114e37ec3c43453d5dbbe2849ee4ed83bdb4a5ef6d6d20322b1b57d63f4b520fcb2d3a74ff38763e0f4a
-MISC ChangeLog 6304 SHA256 448882b4c992dfb5d32b654f17bd926ab6f924e0a75482d9a677557b6dcb899a SHA512 726644aa4f90f8671e0dcc13012271a73d9f3a2e04c177f347e5a66e4ba53c22635c40be06c80938fc5c4242ae9bfeed3b7fa8e545483841c17ed78b4b3008d6 WHIRLPOOL bb28f861924896e589b273fc04446f9e888e561b684865dc5ff519adc413d23375a53066ee9c70dd32a971198679d7bb6463a7aaea68f8bff87bf8337f017dd7
+EBUILD collectd-5.4.1-r2.ebuild 13514 SHA256 ee71f6e68fd739c8f078e578738204b3c06e314f06d0f9a87e8d5ef6dd096790 SHA512 07d1d2bd425d9081b09b76e6f8dd35ec46d0e989bfed80e331e6c7db40595ac1a33f9f0c10a1a370d3639629244cc8f9c2ee6d4fdfe8582a9a67d1f62c9e96f7 WHIRLPOOL 930e29ae0b858f1c3ea069c6f4bc0d6d52e070f75d427761c1f9c74bc3770e2cfe5e472513022c5dabc455ade264e753c580e4a9b67cc2a9b645966d805484b7
+EBUILD collectd-5.5.0.ebuild 14345 SHA256 d8a5aefade4ea620b85265cbad2896dc83f9989a33288580cd0978c52c702da7 SHA512 a19d94f91d29d34f8799edda72cc013cdff84556ebf2e7c033f8fd1416f79ae13df73e8503536491ad52662a4f0575451076c5d89cb17826f38a313333d3ded7 WHIRLPOOL 7ad23e19b1f87de2d37947da9318f94295fd4bd59e72431774b44b86a22f0c57599515da461f1b19b495e8f97a84c222b8216dc8c78113d208c6f7bee51d437f
+EBUILD collectd-5.5.1.ebuild 16804 SHA256 b87a61666472387a5d44aa96c986c17b3ebbd3586b5f383ef220833106e5ebc1 SHA512 5fe9115d46d2527630a3d4156b965deb422183bd8eb849540b2838ced8690a89b64766338c97f075ff164524952e3f516907f66c6f859c92985ccf5c777c8360 WHIRLPOOL 8eb59ab1d723906a7b929ffcf69b0242983de67659697817cba420df571e4c68c1f7046dfcdcfffcb25a91afef25b222908005ab6c2fcd65db92d068eafe6e5f
+MISC ChangeLog 6461 SHA256 48de5fed66804736cde9bf91e7b8d1bc5255a33a342904f222349b7ba2f3e4d0 SHA512 dd21864fa5f9570fbb959e8379ab430684fefb6db55f4ea36f489cee482a837d1ecf9c488a5afe49c18860ea247cb309cd5c9ed1f6abfd9ee04a97c073206f26 WHIRLPOOL 77e6f374464537913b8645a1b94b7c90b298942b61a31f26b87b64adabd07c4186654b33f757dc8303b90dcd6b546026d5d3e9da67aa63749e5f4500fd90e3dd
 MISC ChangeLog-2015 14362 SHA256 1859e1b9ca3e7493396d72b51c984fdd2be019a1247e7005a41fe1a05f578894 SHA512 2434c3cfe30fbbcdc9a9e0e6d0f2c881d13e58d1bab2f47738ca0654a3a56b5d488ff1f542c1fd011e5349df810dcdc98c80559e91f39b4457ba626e633205dd WHIRLPOOL ce50c9de205ef7b86cd799d1d9f2bc4d0623fbfee511dd7e4a3a1f4d289eb567ff0026866c7b38428b285b88eabde060d77403db71f9455c865ae01c4c3623b9
 MISC metadata.xml 18992 SHA256 4ab977ba896efca40d7bd8a27971205859a2f0bad7aa1ba4b72f648694687c82 SHA512 15b41ed25be2d31b444535ce89cf8ada53145e3306bb7e9cf3a3501e94c157fb85adc912347576125529b2a9e56e248c220dc923c7de7a694760c99203976e12 WHIRLPOOL cc8d610147acc9f0317a6bc874d691102ea5e1f84f5c7df5b0cf9522efbb9762a8ab4104d61070b216cd805aecceef5c6ccc10b903d2e9e0b8dbb9b33b9778bd
--- a/app-admin/collectd/collectd-5.4.1-r2.ebuild
+++ b/app-admin/collectd/collectd-5.4.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$

@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 )

 inherit autotools base eutils java-pkg-opt-2 linux-info multilib perl-app python-single-r1 systemd user

-DESCRIPTION="A a daemon which collects system statistic and provides mechanisms to store the values"
+DESCRIPTION="Collects system statistics and provides mechanisms to store the values"

 HOMEPAGE="http://collectd.org"
 SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
@ -77,13 +77,13 @@ COMMON_DEPEND="
 	collectd_plugins_netlink?		( net-libs/libmnl )
 	collectd_plugins_nginx?			( net-misc/curl )
 	collectd_plugins_notify_desktop?	( x11-libs/libnotify )
-	collectd_plugins_notify_email?		( net-libs/libesmtp dev-libs/openssl )
-	collectd_plugins_nut?			( sys-power/nut )
+	collectd_plugins_notify_email?		( net-libs/libesmtp dev-libs/openssl:= )
+	collectd_plugins_nut?			( >=sys-power/nut-2.7.2-r2 )
 	collectd_plugins_onewire?		( sys-fs/owfs )
 	collectd_plugins_oracle?		( dev-db/oracle-instantclient-basic )
 	collectd_plugins_perl?			( dev-lang/perl:=[ithreads] )
 	collectd_plugins_ping?			( net-libs/liboping )
-	collectd_plugins_postgresql?		( dev-db/postgresql )
+	collectd_plugins_postgresql?		( dev-db/postgresql:= )
 	collectd_plugins_python?		( ${PYTHON_DEPS} )
 	collectd_plugins_routeros?		( net-libs/librouteros )
 	collectd_plugins_rrdcached?		( net-analyzer/rrdtool )
--- a/app-admin/collectd/collectd-5.5.0.ebuild
+++ b/app-admin/collectd/collectd-5.5.0.ebuild
@ -79,7 +79,7 @@ COMMON_DEPEND="
 	collectd_plugins_nginx?			( net-misc/curl )
 	collectd_plugins_notify_desktop?	( x11-libs/libnotify:= )
 	collectd_plugins_notify_email?	( net-libs/libesmtp dev-libs/openssl:0= )
-	collectd_plugins_nut?			( sys-power/nut )
+	collectd_plugins_nut?			( >=sys-power/nut-2.7.2-r2 )
 	collectd_plugins_onewire?		( sys-fs/owfs )
 	collectd_plugins_oracle?		( dev-db/oracle-instantclient-basic )
 	collectd_plugins_openldap?		( net-nds/openldap )
--- a/app-admin/collectd/collectd-5.5.1.ebuild
+++ b/app-admin/collectd/collectd-5.5.1.ebuild
@ -91,7 +91,7 @@ COMMON_DEPEND="
 	collectd_plugins_nginx?			( net-misc/curl )
 	collectd_plugins_notify_desktop?	( x11-libs/libnotify )
 	collectd_plugins_notify_email?		( net-libs/libesmtp )
-	collectd_plugins_nut?			( sys-power/nut )
+	collectd_plugins_nut?			( >=sys-power/nut-2.7.2-r2 )
 	collectd_plugins_openldap?		( net-nds/openldap )
 	collectd_plugins_onewire?		( >=sys-fs/owfs-3.1 )
 	collectd_plugins_oracle?		( dev-db/oracle-instantclient-basic )
--- a/app-admin/elektra/ChangeLog
+++ b/app-admin/elektra/ChangeLog
@ -84,3 +84,27 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+*elektra-0.8.15 (01 Mar 2016)
+
+  01 Mar 2016; Michael Weber <xmw@gentoo.org> +elektra-0.8.15.ebuild,
+  +files/elektra-0.8.15-conditional-glob-tests.patch:
+  Version bump.
+
+  Package-Manager: portage-2.2.27
+
+  01 Mar 2016; Michael Weber <xmw@gentoo.org> -elektra-0.8.3-r3.ebuild,
+  -elektra-0.8.6.ebuild, -elektra-0.8.7.ebuild,
+  -files/elektra-0.8.3-fix-yajl-if-user-config.patch,
+  -files/elektra-0.8.3-introduce-attributes.patch,
+  -files/elektra-0.8.7-conditional-glob-tests.patch:
+  Drop old.
+
+  Package-Manager: portage-2.2.27
+
+  01 Mar 2016; Michael Weber <xmw@gentoo.org> elektra-0.7.1-r5.ebuild,
+  elektra-0.8.12.ebuild, elektra-0.8.15.ebuild, elektra-9999.ebuild,
+  metadata.xml:
+  fix DESCRIPTION, live ebuild, metadata.xml
+
+  Package-Manager: portage-2.2.27
+
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@ -3,20 +3,14 @@ AUX elektra-0.7.1-ltdl.patch 630 SHA256 707a809f9927f5ef376b7f4f7c116590524f2da8
 AUX elektra-0.7.1-remove-ddefault-link.patch 576 SHA256 ad834ef43a15925e5570faae853fa6d32607bd75dd991d9223373c1aa66df15e SHA512 75b0d776fdd150f369021f98868da5a1d3e4dc7891a5de149c9b16ca984300a0688fec11e9441732ac7d11c899371bbfa3879562131333597a5d57f89748a92d WHIRLPOOL dc0dd9e760ce86b5b8e28cae0c43c86de4194c1008d82a4b8dfe934eda35c88f7e3ff26931a46f192f0a45e0f71d642c8d10d00ac66431e6c5e037ffbb34ef1c
 AUX elektra-0.7.1-test.patch 6259 SHA256 a84091cbe3b0ca9c01278c17d8eee0f95a06758969d52599b855da1be3949f49 SHA512 258e49c90cea8b1a830a8acb5a2307e49d3dea6b2189373f1b0b614cb070d7a9dbb4954fb486bbacd46fa612d96d6824ef1ee4f40925ad2a347eabb4a45bdfe7 WHIRLPOOL 382a95d5b7fb4d5564eac06a04a909e69af3770913d06b56c3e3d78f3c4f56ef9a4fe51e490e274de0cdd9b254808da6c5638d4b35f991fe1b4c5cf9d7cda011
 AUX elektra-0.8.11-conditional-glob-tests.patch 667 SHA256 28d6f2de7cc9c1281d943da84561047cf029d7f2b6425814b4bb4cabd13ce250 SHA512 e329f3971af6e8ceef11161226cf0484c5cbbaa81b8e03a1d5066e5438af4a236502a792f13264bacec96b08175e6dcc06d0baddcdf3c2593915fe4c14ada374 WHIRLPOOL d1139870ab8f8f3fd099f0dcb6febaa5f6e71cc0d4aee736a47969b3b77725bbfe7795e2d9cfa744367e865b3487254c02ab51f3ddca7a695221addce526d68f
-AUX elektra-0.8.3-fix-yajl-if-user-config.patch 814 SHA256 b49d742526c40fb017e09b68bf5d9be928c21374778142efb1aa7530b72e59c9 SHA512 2531f730991e9810ff84372dfe79e6a973eecca3b3154709c5e839a8a9e45606567619549e4e9156a1751e3e45a723f0728ca9d4175606252dca6fdef19ff879 WHIRLPOOL c8159580e9ab9988994406a8936225a54c949971b28bfba7a64a47f77966cdea5f0f814213f8e2992041adb7ec66e7ca53f6d43f791a1e5036b460d0da2fda5f
-AUX elektra-0.8.3-introduce-attributes.patch 806 SHA256 09ea008048e620e05b6e64a877275073574e34457354f578ba9d0ab1737e15f2 SHA512 1ea9dd7b5460dfae6a57ceb972e527b7c7dd80452fba19b1296a31175b3285144b0458271981f6b26e5e239301bb698c1ce87ca113ad58ecf3fa433f4240b666 WHIRLPOOL 90eb0167a85c1ea9e58f12c30fb69a13edea034762a6c04d3ccd8b8f9e656e3398ccca3f3ee27592401930c6088043416515850055c149709cc7d2884bce9b66
-AUX elektra-0.8.7-conditional-glob-tests.patch 589 SHA256 e23ece7b784cefe34d8f7720e451798b5a4c57fe4f9bb0bfcf33943631ebb744 SHA512 6b8255000f447a455484f7e4d8727ab18f921a9ca6d2b46a5136c7f4162bcbc4b5fc24c060f2805b454e271a51bd371e9365c972620c078dbcf978bd7f4d05ca WHIRLPOOL 1a9479bb8d6b2ed52f1420bfe9eef0e1f408252955756ff64834f57446206f6c63712127d1616a935d4a075ec10403d7dc451287e296d22ffce61b771d9948ee
+AUX elektra-0.8.15-conditional-glob-tests.patch 415 SHA256 db679f8c4a555461f33468c139fecb3221f212dbb2fd0e6bb3b004a503565c76 SHA512 e57b317716979a5cb94e11094db8eeaac2941640262eec011329d1f6b1cda27c19999099e0b9a5bc9a7131de730a7065ac9256d965bf8d553afbadb94172a27c WHIRLPOOL 41dde47a20d84ef8800051b2d1baa977ed65111f86a430a12c7b2678fe845aaabfcb6ae914dbdc399935cfd3b4e70b8bbfd67a02768053aa6903817590f6f7da
 DIST elektra-0.7.1.tar.gz 1347524 SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c SHA512 25ca25e95d1a20a79ba97b094dc9630fb791f6653c2bacec751cc51492202831b7d28ae0786081e6be91581245bda3f5b7e2f3b523f7faa6bfb1d97b3d209684 WHIRLPOOL e90e7c126f2467c8ae29e3cffd5d8a6bfa444dfd38edcc8809d49562825aff8ec6c826139da4a2aa09e38935ee63b48674431c7cc27e2a14d372b2b8270b170d
 DIST elektra-0.8.12.tar.gz 2102450 SHA256 562432bea9455a61ff6e6b3263078ea9b26bef2ed177a04b5f9b181d605bc021 SHA512 be01dbeae5cc680973a7c7917f341506106139c7facc3d3f597f31f7aa91065dcee862121b8704d589f4c6dd916a99cadc9b67e2e9604bec2841b1ebafea89ea WHIRLPOOL 6661d9a337aa71fcc9764f127ec4055b3eb1456d60608c80ac8763aee2d680ab8691a16668da8ef694efb09e2415f58bf4e34a4f1f0e9a7498fecf88f56ce9da
-DIST elektra-0.8.3.tar.gz 1092409 SHA256 48fab82a6b1e8f0038c43ae9ade4da25b697d0aa74e39b7b94056ab7febc4be1 SHA512 e298c0515515a3a59fe28e695fd347ce775465d95f95f8d08c54e0223baf24300ec7e876d35fd3a07f2348290fdc7f740557333b26e847d09b4c41df63a1d886 WHIRLPOOL 64673416e96cc0a8f3ffbfc3f88525de3bc1270b381d0642b59f0a4f9d49db5cb296bd10a2839bc2baea82f58dcb6416ada1031553d378cba858d8f94df2d3b9
-DIST elektra-0.8.6.tar.gz 1188337 SHA256 e815cf69b070c339784472841aa0ee0b169fab7c78f41cbbd7044f53fa9ed216 SHA512 4df585e07ab461b924a506a8c58bcfbe55e6c1df72710bfdc13760559054ffef6b92f8da94c08f2d8f6a7a7692983d0e92d4ffa98506fcbfc166a71bf989e488 WHIRLPOOL b0dfa2841dcef35e03dfa04e5613576d5d8d74586e959c538399adbebf2d4d4842b15e912845c07f5c309614e33217b112124ec0971accf9fa4e521e1283732a
-DIST elektra-0.8.7.tar.gz 1566800 SHA256 698ebd41d540eb0c6427c17c13a6a0f03eef94655fbd40655c9b42d612ea1c9b SHA512 37b34abeb392e170f89a97f825153f925d7b11ea980832cb8f1bf8dbd8b098f8bd553b3998728ef84ce4f4c53ea1f420824984fe670f6752c1b50e98821eb07e WHIRLPOOL 7f3f290f9064488fd1c9927a76d3f9e235e144b1ebe91a02b392ee468b2bcc4881906a71b88822a75ac1506200c3c8d5857c31f35bdc8f9832eae67c2647a768
-EBUILD elektra-0.7.1-r5.ebuild 2026 SHA256 8c4f123d3d72260efaa11a3b986397f2797f6added25f319aa14195c6ec7906e SHA512 039d70b8eda2059f394e53513802da99bad6b5d1e50b5e0c1eb3f6498432e1024c242f4ddcff149ded8260357d508c1b7a2f6de804bc17aa25f5ef2e03073571 WHIRLPOOL a61aa94f2092cef307d71c9e4b73db896c3d7aae0db063bb658a7bbd3150169c7c31523496fbfaa8e6ffc9bff92af0041030d17dd0c45b793fa6d2e21baa6beb
-EBUILD elektra-0.8.12.ebuild 3694 SHA256 cd16b1158a86af5d48681de75f680befbaea454b05b0c267c6b3ea22012735a3 SHA512 1b114d2a7395d210143d3fe4c9d475d43c650043956d418721d475c3332c26367223c66306f876264328332c0ac817d2f517c40a31c9d4fe63e45bf08667638e WHIRLPOOL 93e7a491ebf245468d4b04a9c52d3dda5fb1d8a5d6f2e12a2760a22821d2e27caecf7021914f4ec14e74d95360a630c58c33f4b89d80ed23d96a7520fe428fa9
-EBUILD elektra-0.8.3-r3.ebuild 2647 SHA256 817781ae100ebd9c7246b97da9ce4c0d342f09cf62bc6443e14bdd1b4d6cb3dd SHA512 6894d99cf8800783de3f3c1ec7741deb54ce3004d27934898080195cf9f767911cf0ee5a2c91d97bf4cb160d39c4dc512623d23602ba6717ed148297d48b1f23 WHIRLPOOL d651185f2ace66df8b34de3e273d473d38feb61c475160b8b2b47b3b4b511746bb71715a94eff962a6c8a6622eef8ecbc0d164a522341b032cbc9c5e605b11ec
-EBUILD elektra-0.8.6.ebuild 2177 SHA256 93fcd7f01b00670170fb4749719c1951a3cce1d4e1bcd7c95711e482a45619f2 SHA512 b3514b9592969b6f43053935c240696295622e3ed51fd79498ce7a6edc2f992f938b26033e6e9472a2a5dfde54275de7dfaa17d381531b8981ee0fa171bb60f2 WHIRLPOOL 880f54b43b299dab8c5730d741c062fcd31b9fbf25cd64cd806c8e46926a3f59edd69ca938f07d9b92a3c7f80f475b5fd5d9b28db6cb5429d8158be4c7bf9157
-EBUILD elektra-0.8.7.ebuild 2737 SHA256 735cf2401affe2b090c6f8153bbe1488e417e4f6847ea750e258cf3b9e36bd51 SHA512 909a4b26cb6412d1925286aae04a7b504c2c7c228aa755bb668e34762de15b64e285f827108bfbec28ff9ba956d8c796efd876122c765b46adfb7ef4dd6e7541 WHIRLPOOL 10a55610cfbbbd043e6b743eb1030f16acff5012def82c32362d5634bee0c9c03c157529471aa48b0341fa0830ff9dd78483832382c32e8edc1602c409fa0ee9
-EBUILD elektra-9999.ebuild 3687 SHA256 aff0cfdf113ad4532a525d07f5184c8dc7336165300d02b84e23c6e99d79f8b6 SHA512 f2b87e0fb4ec651fdfcac8c3a36420ba98fc475334f6ce597996c1e08ce969fc824f659d80d158e8ff311f97d604b71e9644e82f72a8a50f1ee79c8cc13092fd WHIRLPOOL 064091bfef0b2c0be1a5a2f8a1cfebccf2912d5b1d078463422247efd9a7ec84891d06a1f176936f291b2186324fa83af285cb9320de9b0354d1b2a779c95ee8
-MISC ChangeLog 3379 SHA256 d662da3d123f1d14011d8676fb7486c5b8199c2b2259fe76ce4a02f7bbab5a64 SHA512 48e4ce051306503909e952b69ee18666bb5d07308d67fefe2439d9866d6a6f1b2cdfc72b41830455a58b0dd9205aabd7a0577924269388e686edd593f26de37e WHIRLPOOL a1aed79e49ebfacc494dcfaee080af6b8ca1b597d0b50cf520287ee080e7d04ac20f13ab3cba4f3b2e1cc3c11b95688c8f1bc8f3ff50f87a0ea9073a8df0848f
+DIST elektra-0.8.15.tar.gz 2338297 SHA256 6a406986cecb8d4a44485ced118ee803bc039b0824b72298e123b4dd47eb0b22 SHA512 86a408dd546b33e3b437f92f415de7aee6a235189f9eab0762b3f44ab4c453ee369a53de10a9f5b0df1b446460b12c57c6b8b77c282648ec2a49f2328d9af13d WHIRLPOOL c4f77903f9340c665f4c484c0b700b048358691873031ae5e62e63f0acf9a5fc5efb3c307331712497c59172ad202780280abfa8b717f523fabda73564a0005e
+EBUILD elektra-0.7.1-r5.ebuild 1994 SHA256 e95b9eac22a6c5eec89cda4d2327eedf7fc1016b9b715f5c54b2a18d81d94ad7 SHA512 44c516ebc240d854bd09758d28276f1052252a9c94068affa1f02cc3a5a21542c36e8ff64328d590ed1033eef2de749cfafa8ecb5a419711c671686da158f06b WHIRLPOOL f2b3d51693798d638437b0e3f775a49a7196093516f35d71631408aea602b18bf7ea5ec7e574dcdf8e79ea28a9007e96a2a0cb3fcbf98cfdcde0666b978a4ed1
+EBUILD elektra-0.8.12.ebuild 3662 SHA256 2793cdb3cd1e8e40eb59d53fb818dc323bcea4123bbf683ea36cb30c140c78e7 SHA512 3dcf127897816314cec9d43bd59041e25b2e552d51f40a517e48c9bff5fbc1c362b22e4b1229d0a22eab2fa0ff5da6c63ffc64f552be9cac78100f7bfa234c87 WHIRLPOOL 5b8203c254aab7a62d760fc7c49646dfbc747d5a57d71ef3c5cd95774bb70b7225ab8deac6c55238aa6a6b3dfac8960808c084a941ee1cdb9652fadeb0d6d237
+EBUILD elektra-0.8.15.ebuild 3654 SHA256 8277bfc58550e65b8fec817bb16422203cc7ca606ef9e311bad9256e46827b2b SHA512 e007750607409e52650017227522844c92bb38ab709b7bd4e11a564d7b44b99af8262450b95ba69d0904d849b8d862c862afc42c1bd8d05c7553c8984be50e35 WHIRLPOOL 598dac3b417283536e105ddd19d9463e32570077ecba14fdb462c21b7dfcfe76cd2186f3e2b926b1cabd52fdb1894a4120f34d00c68b89ef2e242b7a3f7aed1a
+EBUILD elektra-9999.ebuild 3661 SHA256 06a004e4c36466b3f423d435e69c1b8a9026f72f59061bc2f036c7718269146c SHA512 0c2c2b72e41f8e9414167135f5674d6e640aee8e0405d52a903a43aabffbd29d1a9dca3b7b3d5f3508820cccbcba9c5b351ee9ba77371584d6d77c25dad30317 WHIRLPOOL c51590596cd35b67c4cad485085f0ddc4c4f019c199ead2de2dabc85c7920456014148c3e24da9e2bd4e1567b9087f1b3ae2b7bf43c480b05ad8954fe1a85e85
+MISC ChangeLog 4149 SHA256 3c4bf83089213fee0eb6cd95518dd0a1715097e25002c3032aa6c5120ca41307 SHA512 09657e7deb80eda30ed63001bedd7e45aee5d89ca9c96e70d0de3655b238771983e47a1b11d92c0bdbd4e2c4d822765ba55411a186c9bbd74b604714a67842a3 WHIRLPOOL 7aaa31b4c10f07507f792a4811a48083219f2661c72a6d9e8d21ad702e5cc68f3f4ef5b0e963bb9a4f51bb78fa3892b9b4611c3fd9eca3eb805a153e98b17833
 MISC ChangeLog-2015 4412 SHA256 3de214eae0b0bf73ee8ab2bc080efd7074185c598ec620f2f29632089dfe2041 SHA512 daa6f2bdc84e47a88814c4f1ca5d4f8aafa1c16b6195cb8d9e31d57d1ee5c2d7bd236f8e30dbbbac6c43414863e4df162791b331a8ded2902d432a9befee733d WHIRLPOOL 1c4cef8a03e139332d59e4226e6ba8fe98f61c9aa18845bd70390b3208e7594d8be17bd5a8a66711cbc2f090febcf5911e27c113ac1076fba8b89ce73989df77
-MISC metadata.xml 697 SHA256 d28a761758595bc2f05c30f6d48b91209ccb8dbc1ea2675f978bbc2b44051d5e SHA512 89c253d046ab9f58a6bfd1b306300c780f451e56ff091d8466305b5d40625a006ae8d3b359e3b7afee79e9b415f3eefce4b2733b264e5597930fe65ef1c8e050 WHIRLPOOL 7f4183b0fb53c38f87d07002d23122f5ed1a7c736de20881eda2ab91b227a0fa9e88d3104a309fdc3d91e8fea5447636d09f342f499613e63353afdeee10dad1
+MISC metadata.xml 641 SHA256 557b10d1d66e01f50cc2a92ee442308cb5affce46b73b9582e3a79e156fb2350 SHA512 ef513b8dd292e072501f89140baadcc7934ade1e2ef0c7f122fa6b9c64b3f2aa5b84eb3d4be8b18074d70f163cc25b9d6f93cad40e68361bcfc67b589cd558c8 WHIRLPOOL e318a0119fd8d180142f2a4e7ab7560b76421a08ab334f5bea8d5b0ac11f5d49bfb7c501e513e5184e5c473637320db4a4da60f2be5237c99ac1f4a31a2f7cca
--- a/app-admin/elektra/elektra-0.7.1-r5.ebuild
+++ b/app-admin/elektra/elektra-0.7.1-r5.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -6,7 +6,7 @@ EAPI=5

 inherit autotools autotools-multilib eutils multilib

-DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
+DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
 HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
 SRC_URI="ftp://ftp.markus-raab.org/${PN}/${P}.tar.gz"

--- a/app-admin/elektra/elektra-0.8.12.ebuild
+++ b/app-admin/elektra/elektra-0.8.12.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$

@ -6,7 +6,7 @@ EAPI=5

 inherit cmake-multilib eutils java-pkg-opt-2

-DESCRIPTION="Universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
+DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
 HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
 SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"

--- a/app-admin/elektra/elektra-0.8.15.ebuild
+++ b/app-admin/elektra/elektra-0.8.15.ebuild
@ -0,0 +1,120 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib eutils java-pkg-opt-2
+
+DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
+HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
+SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl";
+IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
+
+RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	augeas? ( app-admin/augeas )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jdk-1.8.0 )
+	qt5? (
+		>=dev-qt/qtdeclarative-5.3:5
+		>=dev-qt/qtgui-5.3:5
+		>=dev-qt/qttest-5.3:5
+		>=dev-qt/qtwidgets-5.3:5
+	)
+	uname? ( sys-apps/coreutils )
+	systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
+	yajl? ( >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-cpp/gtest-1.7.0 )"
+
+DOCS=( README.md doc/AUTHORS doc/CODING.md doc/NEWS.md doc/todo/TODO )
+# tries to write to user's home directory (and doesn't respect HOME)
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
+
+PATCHES=( "${FILESDIR}/${P}"-conditional-glob-tests.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	einfo remove bundled libs
+	# TODO: Remove bundled inih from src/plugins/ini (add to portage):
+	# https://code.google.com/p/inih/
+	rm -rf src/external || die
+
+	# move doc files to correct location
+	sed -e "s/elektra-api/${PF}/" \
+		-i cmake/ElektraCache.cmake || die
+
+	# avoid useless build time, nothing ends up installed
+	comment_add_subdirectory benchmarks
+	comment_add_subdirectory examples
+}
+
+multilib_src_configure() {
+	local my_plugins="ALL"
+
+	if multilib_is_native_abi ; then
+		use augeas || my_plugins+=";-augeas"
+		use java || my_plugins+=";-jni"
+	else
+		my_plugins+=";-augeas;-jni"
+	fi
+
+	use dbus      || my_plugins+=";-dbus"
+	use iconv     || my_plugins+=";-iconv"
+	use ini       || my_plugins+=";-ini"		# bundles inih
+	use simpleini || my_plugins+=";-simpleini"
+	use syslog    || my_plugins+=";-syslog"
+	use systemd   || my_plugins+=";-journald"
+	use tcl       || my_plugins+=";-tcl"
+	use uname     || my_plugins+=";-uname"
+	use xml       || my_plugins+=";-xmltool"
+	use yajl      || my_plugins+=";-yajl"
+
+	# Disabling for good (?):
+	# counter - Only useful for debugging the plugin framework
+	# doc - Explaining basic makeup of a function //bug #514402
+	# noresolver - Does not resolve, but can act as one
+	# template - Template for new plugin written in C
+	# wresolver - Resolver for non-POSIX, e.g. w32/w64 systems
+	my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver"
+
+	local my_tools
+
+	if multilib_is_native_abi ; then
+		my_tools="kdb"
+		use qt5 && my_tools+=";qt-gui"
+	fi
+
+	mycmakeargs=(
+		"-DBUILD_SHARED=ON"
+		"-DPLUGINS=${my_plugins}"
+		"-DTOOLS=${my_tools}"
+		"-DLATEX_COMPILER=OFF"
+		"-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
+		$(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \
+			|| echo -DBUILD_DOCUMENTATION=OFF)
+		$(cmake-utils_use static-libs BUILD_STATIC)
+		$(cmake-utils_use test BUILD_TESTING)
+		$(cmake-utils_use test ENABLE_TESTING)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	einfo remove test_data
+	rm -rvf "${D}/usr/share/${PN}" || die "Failed to remove test_data"
+	einfo remove tool_exec
+	rm -rvf "${D}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
+}
--- a/app-admin/elektra/elektra-0.8.3-r3.ebuild
+++ b/app-admin/elektra/elektra-0.8.3-r3.ebuild
@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-multilib eutils
-
-DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
-HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
-SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus doc examples iconv inifile simpleini static-libs syslog tcl test xml yajl"
-
-RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	yajl? (
-		<dev-libs/yajl-2[${MULTILIB_USEDEP}]
-		>=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	doc? ( app-doc/doxygen )"
-
-# tries to write to user's home directory (and doesn't respect HOME)
-RESTRICT="test"
-
-src_prepare() {
-	#fix QA issues with upstream patches
-	epatch "${FILESDIR}/${P}-introduce-attributes.patch"
-	epatch "${FILESDIR}/${P}-fix-yajl-if-user-config.patch"
-
-	#move doc files to correct location
-	sed -e "s/elektra-api/${PF}/" \
-		-i cmake/ElektraCache.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation"
-
-	use dbus    && my_plugins+=";dbus"
-	use doc     && my_plugins+=";doc"
-	use iconv   && my_plugins+=";iconv"
-	use inifile && my_plugins+=";simpleini"
-	use syslog  && my_plugins+=";syslog"
-	use tcl     && my_plugins+=";tcl"
-	use xml     && my_plugins+=";xmltool"
-	use yajl    && my_plugins+=";yajl"
-
-	mycmakeargs=(
-		"-DPLUGINS=${my_plugins}"
-		"-DLATEX_COMPILER=OFF"
-		"-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
-		$(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \
-			|| echo -DBUILD_DOCUMENTATION=OFF)
-		$(multilib_is_native_abi && cmake-utils_use examples BUILD_EXAMPLES \
-			|| echo -DBUILD_EXAMPLES=OFF)
-		$(cmake-utils_use static-libs BUILD_STATIC)
-		$(cmake-utils_use test BUILD_TESTING)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	dodir /usr/share/man/man3
-	cmake-multilib_src_compile
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	if multilib_is_native_abi && use doc; then
-		rm -rf "${D}/usr/share/doc/${PF}/man" || die
-		cd doc/man/man3 || die
-		local my_f
-		for my_f in *.3 ; do
-			newman ${my_f} ${PN}-${my_f}
-			elog "installed /usr/share/man/man3/${my_f} as ${PN}-${my_f}"
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc doc/{AUTHORS,CHANGES,NEWS,README,todo/TODO}
-}
--- a/app-admin/elektra/elektra-0.8.6.ebuild
+++ b/app-admin/elektra/elektra-0.8.6.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-multilib eutils
-
-DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
-HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
-SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus doc examples iconv simpleini static-libs syslog tcl test +uname xml yajl"
-
-RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	uname? ( sys-apps/coreutils )
-	yajl? (
-		<dev-libs/yajl-2[${MULTILIB_USEDEP}]
-		>=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	doc? ( app-doc/doxygen )"
-
-DOCS="doc/AUTHORS doc/CHANGES doc/NEWS doc/README doc/todo/TODO"
-# tries to write to user's home directory (and doesn't respect HOME)
-RESTRICT="test"
-
-src_prepare() {
-
-	#move doc files to correct location
-	sed -e "s/elektra-api/${PF}/" \
-		-i cmake/ElektraCache.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation"
-
-	use dbus      && my_plugins+=";dbus"
-	use doc       && my_plugins+=";doc"
-	use iconv     && my_plugins+=";iconv"
-	use simpleini && my_plugins+=";simpleini"
-	use syslog    && my_plugins+=";syslog"
-	use tcl       && my_plugins+=";tcl"
-	use uname     && my_plugins+=";uname"
-	use xml       && my_plugins+=";xmltool"
-	use yajl      && my_plugins+=";yajl"
-
-	mycmakeargs=(
-		"-DPLUGINS=${my_plugins}"
-		"-DLATEX_COMPILER=OFF"
-		"-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
-		$(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \
-			|| echo -DBUILD_DOCUMENTATION=OFF)
-		$(multilib_is_native_abi && cmake-utils_use examples BUILD_EXAMPLES \
-			|| echo -DBUILD_EXAMPLES=OFF)
-		$(cmake-utils_use static-libs BUILD_STATIC)
-		$(cmake-utils_use test BUILD_TESTING)
-	)
-
-	cmake-utils_src_configure
-}
--- a/app-admin/elektra/elektra-0.8.7.ebuild
+++ b/app-admin/elektra/elektra-0.8.7.ebuild
@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-multilib eutils
-
-DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
-HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
-SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus doc examples iconv ini keytometa simpleini static-libs syslog tcl test +uname xml yajl"
-
-RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	uname? ( sys-apps/coreutils )
-	yajl? (
-		<dev-libs/yajl-2[${MULTILIB_USEDEP}]
-		>=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	doc? ( app-doc/doxygen )"
-
-DOCS="README.md doc/AUTHORS doc/CHANGES doc/NEWS doc/todo/TODO"
-# tries to write to user's home directory (and doesn't respect HOME)
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-conditional-glob-tests.patch"
-
-	einfo remove bundled libs
-	# TODO: Remove bundled inih from src/plugins/ini (add to portage):
-	# https://code.google.com/p/inih/
-	rm -rf src/external || die
-
-	local tests="augeas fstab hosts ini yajl"
-	if ! use test ; then
-		einfo remove test data
-		for test in ${tests}; do
-			sed -e '/TARGET_TEST_DATA_FOLDER/ s/^#*/#/' \
-				-i src/plugins/${test}/CMakeLists.txt || die
-		done
-	fi
-
-	#move doc files to correct location
-	sed -e "s/elektra-api/${PF}/" \
-		-i cmake/ElektraCache.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation"
-
-	use dbus      && my_plugins+=";dbus"
-	use iconv     && my_plugins+=";iconv"
-	use ini       && my_plugins+=";ini"		#bundles inih
-	use keytometa && my_plugins+=";keytometa"
-	use simpleini && my_plugins+=";simpleini"
-	use syslog    && my_plugins+=";syslog"
-	use tcl       && my_plugins+=";tcl"
-	use uname     && my_plugins+=";uname"
-	use xml       && my_plugins+=";xmltool"
-	use yajl      && my_plugins+=";yajl"
-
-	mycmakeargs=(
-		"-DPLUGINS=${my_plugins}"
-		"-DLATEX_COMPILER=OFF"
-		"-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
-		$(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \
-			|| echo -DBUILD_DOCUMENTATION=OFF)
-		$(multilib_is_native_abi && cmake-utils_use examples BUILD_EXAMPLES \
-			|| echo -DBUILD_EXAMPLES=OFF)
-		$(cmake-utils_use static-libs BUILD_STATIC)
-		$(cmake-utils_use test BUILD_TESTING)
-		$(cmake-utils_use test ENABLE_TESTING)
-	)
-
-	cmake-utils_src_configure
-}
--- a/app-admin/elektra/elektra-9999.ebuild
+++ b/app-admin/elektra/elektra-9999.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$

@ -6,12 +6,12 @@ EAPI=5

 inherit cmake-multilib eutils java-pkg-opt-2 git-r3

-DESCRIPTION="Universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
+DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
 HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
 EGIT_REPO_URI="git://github.com/ElektraInitiative/libelektra.git"

 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS=""
 PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl";
 IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
@ -41,7 +41,7 @@ RESTRICT="test"

 MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )

-PATCHES=( "${FILESDIR}/${PN}"-0.8.11-conditional-glob-tests.patch )
+PATCHES=( "${FILESDIR}/${PN}"-0.8.15-conditional-glob-tests.patch )

 src_prepare() {
 	cmake-utils_src_prepare
--- a/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch
+++ b/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch
@ -0,0 +1,15 @@
+--- elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt
+++ elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt
+@@ -4,6 +4,7 @@
+ add_cppheaders (HDR_FILES)
+ add_toolheaders (HDR_FILES)
+ 
+if (ENABLE_TESTING)
+ include (LibAddTest)
+ 
+ file (GLOB TESTS testtool_*.cpp)
+@@ -11,3 +12,4 @@
+ 	get_filename_component (name ${file} NAME_WE)
+ 	add_gtest (${name} LINK_TOOLS)
+ endforeach (file ${TESTS})
+endif (ENABLE_TESTING)
--- a/app-admin/elektra/files/elektra-0.8.3-fix-yajl-if-user-config.patch
+++ b/app-admin/elektra/files/elektra-0.8.3-fix-yajl-if-user-config.patch
@ -1,31 +0,0 @@
--- a/src/plugins/yajl/yajl.c
-+++ b/src/plugins/yajl/yajl.c
-@@ -23,6 +23,10 @@
-  ***************************************************************************/
- 
- 
-+#ifndef HAVE_KDBCONFIG
-+# include "kdbconfig.h"
-+#endif
-+
- #include "yajl.h"
- 
- #include <kdberrors.h>
-@@ -340,7 +344,7 @@
- 	KeySet *config= elektraPluginGetConfig(handle);
- 
- 	// ksClear (returned);
-	if (keyIsUser(parentKey))
-+	if (!strncmp(keyName(parentKey), "user", 4))
- 	{
- 		const Key * lookup = ksLookupByName(config, "/user_path", 0);
- 		if (!lookup)
-@@ -422,7 +426,7 @@
- 	return 1; /* success */
- }
- 
-int elektraYajlSet(Plugin *handle, KeySet *returned, Key *parentKey)
-+int elektraYajlSet(Plugin *handle ELEKTRA_UNUSED, KeySet *returned, Key *parentKey)
- {
- 	yajl_gen_config conf = { 1, "  " };
- 	yajl_gen g = yajl_gen_alloc(&conf, NULL);
--- a/app-admin/elektra/files/elektra-0.8.3-introduce-attributes.patch
+++ b/app-admin/elektra/files/elektra-0.8.3-introduce-attributes.patch
@ -1,27 +0,0 @@
--- a/src/include/CMakeLists.txt
-+++ b/src/include/CMakeLists.txt
-@@ -22,6 +22,9 @@
- check_include_file(time.h       HAVE_TIME_H)
- check_include_file(unistd.h     HAVE_UNISTD_H)
- 
-+set (ELEKTRA_DEPRECATED "__attribute__ ((deprecated))")
-+set (ELEKTRA_UNUSED "__attribute__ ((unused))")
-+
- configure_file (
- 	"${CMAKE_CURRENT_SOURCE_DIR}/kdb.h"
- 	"${CMAKE_CURRENT_BINARY_DIR}/kdb.h"
--- a/src/include/kdbconfig.h
-+++ b/src/include/kdbconfig.h
-@@ -30,6 +30,12 @@
-   * to search for user configuration. */
- #define KDB_DB_HOME              "@KDB_DB_HOME@"
- 
-+/** Declares a parameter as unused. */
-+#define ELEKTRA_UNUSED           @ELEKTRA_UNUSED@
-+
-+/** Declares an API as deprecated. */
-+#define ELEKTRA_DEPRECATED       @ELEKTRA_DEPRECATED@
-+
- /* disable debug output messages */
- #define DEBUG @DEBUG@
- 
--- a/app-admin/elektra/files/elektra-0.8.7-conditional-glob-tests.patch
+++ b/app-admin/elektra/files/elektra-0.8.7-conditional-glob-tests.patch
@ -1,21 +0,0 @@
--- elektra-0.87/src/libtools/tests/CMakeLists.txt
-+++ elektra-0.87/src/libtools/tests/CMakeLists.txt
-@@ -4,10 +4,12 @@
- add_cppheaders (HDR_FILES)
- add_toolheaders(HDR_FILES)
- 
-include (LibAddTest)
-+if (ENABLE_TESTING)
-+	include (LibAddTest)
- 
-file (GLOB TESTS testtool_*.cpp)
-foreach (file ${TESTS})
-	get_filename_component (name ${file} NAME_WE)
-	add_gtest (${name})
-endforeach (file ${TESTS})
-+	file (GLOB TESTS testtool_*.cpp)
-+	foreach (file ${TESTS})
-+		get_filename_component (name ${file} NAME_WE)
-+		add_gtest (${name})
-+	endforeach (file ${TESTS})
-+endif (ENABLE_TESTING)
--- a/app-admin/elektra/metadata.xml
+++ b/app-admin/elektra/metadata.xml
@ -9,7 +9,6 @@
 	<flag name="augeas">Enable plugin for reading and writing configuration files with help from Augeas</flag>
 	<flag name="ini">Enable new, advanced ini support</flag>
 	<flag name="gcov">Enable coverage support</flag>
-	<flag name="keytometa">Enable keytometa support</flag>
 	<flag name="simpleini">Enable simpleini support</flag>
 	<flag name="uname">Enable uname information for the key database</flag>
 	<flag name="yajl">Enable yajl support</flag>
--- a/app-editors/gummi/ChangeLog
+++ b/app-editors/gummi/ChangeLog
@ -83,3 +83,7 @@
  +gummi-0.6.6.ebuild, metadata.xml:
  bump to 0.6.6

+  01 Mar 2016; Christian Tietz <christian.tietz@mailbox.org>
+  gummi-0.6.6.ebuild:
+  drop base.eclass and fix whitespace
+
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@ -1,8 +1,8 @@
 DIST gummi-0.6.5.tar.gz 520902 SHA256 b23c2958376ea43c701a276ad19ceac5b50d9cb32a489a10897b25aa5004fffb SHA512 9a35533273ff5f2606ba1d79c01dcdf14f2a47628eb5d19613330650ed2a2bd542461492d031e51b773e13c6ac406b564e6703919f16e5f8d7e6bb3c4428b40e WHIRLPOOL 47e1ad5a15183ed0d24a88ebc3bc1af166604825da54db10461243ba4c1b8d6ca82d1afaf7306ef45a4df0f65d103b6cbc83db02cb6469fb7138545e16ae2728
 DIST gummi-0.6.6.tar.gz 792642 SHA256 4119341d6556d82f4b8ce08ad67b6f92c1d9ad1fbad789b7faa7b2d38b7299da SHA512 3be94927c9aafa4914ed2b6f6f5022dce5bcca315a1f947fafb8a4c8bbc5a2bc57f07f8ceaaacdd0b92a5a30483ea8b00e570faf62479280d2ad874716e4c47d WHIRLPOOL 6125d930497d6f5a4f6d8604b39314b04e6e147f93a998f3fe722295f7d04f795a2e7e1f8eea21953eae7e69074dc9a9cdc6cefb29f59261c47ec000c55bc363
 EBUILD gummi-0.6.5.ebuild 1079 SHA256 5de24d8fe02319b1818e19ba7c5ca11575604380ff03f5a0ad1b6a77736b3910 SHA512 66b5fb405e3d34ebf0ed3393e8d26ba1c2b5fd7cd3799bf46731288b433ebdff4b09317ce6ef670dc742c93c154b8fc918d028a177abe8b6a17fc3170c6c87fc WHIRLPOOL 73ef7d78cc94164f9ce04742a4287f8f32abab0c3e063be79686762221ff06fbd6909bb433528a97fa7d4029c6db7bc7fafb563f2c1b525db083a5ab9fa2e673
-EBUILD gummi-0.6.6.ebuild 1045 SHA256 5f533f94ebde97f6d6c0d15b603caa905f0e897924b67cd508d91d6573e44bec SHA512 29a1b34c5d2bd6395d79f33f4e2015a84dba8245f3aefb3364c51673c77e6907fb199e24f5099b8c7480e2a9446991e089f16e1ccd2f842af9328b013333f0ed WHIRLPOOL cd5ffd5dea769645a873a2887d426843c45616300cf8722d6da2f2c751ee8ca886f4fcf69b6dd8368e0823b0ca95923bbdc696649d6a8fd86a8e979cb5b632a4
+EBUILD gummi-0.6.6.ebuild 1039 SHA256 c3bcaa1c788b1af47ed0afc3fcd9e268049032233b9fbe85c433c3ca617aada8 SHA512 b5a61c969cf3576146aa5522d626480ebe4cda08d804fc4e18902edbe2601f27e894145337169dcf219d86e7adc5d8929b0b9c8a30d085025b3a3acc1d342d25 WHIRLPOOL 889f9a3a13f34774ad589d7e61d1d4cb7b6189bfb0d8b5814b75e2130ede5769d6d8b64e9401acb6e513476d879880a93335e4a9f8243a8c31b373ac1f713bed
 EBUILD gummi-9999.ebuild 1014 SHA256 ce1a40dfc953a749471e92bb2148895ea44613ca406ae675a7136ea94b0a1c70 SHA512 d66a1f16825169675b75fdf6a3641f982499206546c282a25bbd19a10f82174c82a1af39ac3799882fecf2d6bf52709c256b60c4a248d1c64639c02159cecf47 WHIRLPOOL f4b247d922f2336f2638f032c95a718e1e177c7fb76faa7915d7425b5967b2da38f9f74d39ea451a8b8ba0b1f91af6017476b378ce7e05d72324df3d794c1633
-MISC ChangeLog 3156 SHA256 8557e06710a407dd8c7473d54abd01f9c59a45686533a155b8cc933089ed4f80 SHA512 f3cb2e8b1a41e0613be40adf59803ebc2a3680572bb098481fdcfb53d66100625bd298b841cede64f9bd063009a5408fa2f0405e8d640040035c93b0f1f7c0f5 WHIRLPOOL b7a0f9e6f6343b120c9014913a1e96f4d6b8ce4b70f0d0aee481d697657c56314954cb9dc6624a98ddad10d0352d233e391e0f33edfaddc786dd91ecd1444a57
+MISC ChangeLog 3278 SHA256 1b65d6b4fb7f6be8df949337e8634eb0d812e824d9ecf826423a4eefcbc8bd4a SHA512 68c89b88381477fd3b7cef0687a7f28b9fccd2d1b1997f49bf250f81c8a13d18a9730727ce1f6b870b2e0f94752f87232e3f10460ffe24a4dcc6af66a8e0c7e2 WHIRLPOOL 441914701879c77df0cdb2b5ba39d43b442bb0047271f3dde47a4aede0e63917ee6d796a03e1349e729206973a6fe69fac331db1fd5bc2c063d5c6c5d529be64
 MISC ChangeLog-2015 6463 SHA256 39d3c8b6be938ea6862c22429f2465396ea6e10ffeeba3d46ad18381748c0d3a SHA512 b370268af9951d3ca0e34e5a94b60d36bf0ce76058d2d7e4701451a3ce4d0a73d17ea9844c90616fe5ca9ac267f1ff33806e0d903b9833e75e828e6d063f73c0 WHIRLPOOL 44c708e10cb119014902a6e00353a20d74afd6a41a201fcea7120eeec51f797f8c964e835ae42ba1dbe933c132910fc42be0e66ff02d326f1c0b365d8f796a49
 MISC metadata.xml 767 SHA256 2648b19567fd008ac1e2f097b782e6c80e6d87dd79fc6ac33616515b2071abd6 SHA512 40d2a7c474ed958b85ef0399d4fee4017a3d66e20b62e3351c57a90fe6da125ed675f29483e1bd164bb271f9c1ef407aea65f16a0913fcfca33b5fc82ab4e35a WHIRLPOOL 1cdea657e48808797d660d19d69f3d88c7453ab3ede59f825464df698a815e38a677c25bcb6b6b51837035401bb03c48bd1a5dd1596c37a7aed6b199d59cc0e0
--- a/app-editors/gummi/gummi-0.6.6.ebuild
+++ b/app-editors/gummi/gummi-0.6.6.ebuild
@ -4,11 +4,11 @@

 EAPI=5

-inherit autotools base eutils
+inherit autotools eutils

 DESCRIPTION="Simple LaTeX editor for GTK+ users"
 HOMEPAGE="https://github.com/alexandervdm/gummi"
-SRC_URI="https://github.com/alexandervdm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" 
+SRC_URI="https://github.com/alexandervdm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
--- a/app-emulation/rkt/ChangeLog
+++ b/app-emulation/rkt/ChangeLog
@ -75,3 +75,8 @@

  Package-Manager: portage-2.2.27

+  01 Mar 2016; Zac Medico <zmedico@gentoo.org> rkt-1.1.0.ebuild:
+  fix rkt_stage1_host RDEPEND conditional
+
+  Package-Manager: portage-2.2.27
+
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@ -10,5 +10,5 @@ EBUILD rkt-0.8.0.ebuild 2343 SHA256 3da5cb66e29c70aeed55d3a569bbb96008e8f908c1bd
 EBUILD rkt-1.0.0.ebuild 2950 SHA256 8466a2abd452d4cbb7cd2f75de0c9d3925d9ae61426bb04dd9f79058eebd9547 SHA512 fd60dc1b786839a9e38eb72c8d2b6d963890e9ede6a7e182e9c28db38da0974060d6ce34f99b5aaca0f229b9e576fea1386753d7955ce596f5d7d28e059930ea WHIRLPOOL fc93d7601cdea7a3d4f8e43f5ab6f217ad397d6650759fdef7c1ec5ff65a0f2fdccbbc992a30a654a457926fb012ad3e1dbc4ccd2f2c1bcb834f5694cbd719f3
 EBUILD rkt-1.1.0.ebuild 5283 SHA256 8b3aff7a53b3f4dd64d51d46df14b9529a3322b812e402a189d4f71bbf4ce89f SHA512 3405c646d7b6e7fce94edaabdf11315c931efc51694ebff7e9dba38dea0a9378371acd5512935dd49f7b83cdc2a2624ed75bb348f567b11d0b3ca7011313431a WHIRLPOOL bf433f44f59049bc7ad1cfd337d15c4403ed801bcceece51f71ebd29fbed6f122bc07fd18ded0d0b69ed839cc8bd8e0202136516cb074c0d806febd5e88ce8af
 EBUILD rkt-9999.ebuild 2547 SHA256 36adcd44488cdd7f25ac182b993cf683e58d6b84dc9ba040e81824a153616014 SHA512 00d4ca03e1f1108ad67b10d1adfcfd4eac6e183bb6b47d4111d69f91538305a5a40ac4f048aff13c3acf61c5151a8eec8d95bf4e45e7a52173d0b06f21ac153e WHIRLPOOL 096f80445a4d6c108bc988fe681c124f729cd2af9b2419b481e3866ac892f86e96ec08d6de96aee94b5984e1dbce38df39dbd6a86e4c461546b0a79bb77e1e8c
-MISC ChangeLog 2168 SHA256 d17df75f6295fdc6e08f42b85306b10963c7a8415d2d235e3c87b4db6993a2f4 SHA512 0c312b106455d9900e6afb8710d50e1c721514c05aa0d2d2bba2e684a256b8337ff4170d9dbf3495087c92bdc486f21e55a50fac2225d6b85bf240a3fe7cb8ec WHIRLPOOL 3875d4372e18244e16b0e5d7ebe8cf26ccf1d673bedebd5bcbd752f7f05d77dab0b3015618a41f83ac071b6c5d5ab8036bba9a59027dbbf7c7483f5274d054f2
+MISC ChangeLog 2311 SHA256 27dd2c2c4ad35708e8d414d3c23fe0f2656af35bbd597a740c031bf629ac7b11 SHA512 5a87653f3c7540d8c218cb0a50c4c90c9f8a28ccb525565c2e5f5dae649209f054bfb1a8913130144c2e1825a299dae1fee6b8906f3bfef2af72bdd43f99bcc7 WHIRLPOOL de780ef268b6dd038e1123124fc57fabac43f4129f15476d1f23a1706f8404f4b8362c6ea5f470c384d3e40f92fbdbc5002da59e42e616904ccc5fa8942f1787
 MISC metadata.xml 1033 SHA256 0f55ee179bc8a56c6b52ca51bab73c876d731898197b988d480e31e6f795f9ea SHA512 b91c5c206b9fc4457bd3b16fa41fb0b99ba6ebf61b653c3709a306af2f551f40c7fc24fb8451c85e0ff1991c5e7dc267ad0cbde3c9f20421b3a5faf281a3ec48 WHIRLPOOL b994aaf908bea945d5bf0a4a3c8d23205ab34837c949fc5d67aa69eff8ce9723843363ca298ffc08b8f52f6aca45e771ab58aada780dda14876ca6c1aac4f01b
--- a/app-emulation/spice-protocol/Manifest
+++ b/app-emulation/spice-protocol/Manifest
@ -1,5 +1,6 @@
 DIST spice-protocol-0.12.10.tar.bz2 103029 SHA256 788f0d7195bec5b14371732b562eb55ca82712aab12273b0e87529fb30532efb SHA512 4f6545ced78a4eedf6adca3f10d536a57205626e631d7cf380be4ea08ca2e1fbbe32566e59c2ce1900a7f057a6dab044483b8423885280cbf142b253d8e03711 WHIRLPOOL 224348a06c6116070119de7fc700dc0d3bf3be271b3043d0ebb01200958b145282bbbfee48f2a9ceb2f719bf631832b431a2af5ae6c8a09bc60640336cab5274
 EBUILD spice-protocol-0.12.10.ebuild 380 SHA256 8a133667564ed3326b9844203b5d9f2ae51c0eb89aaa1d5c5acbce03acb164df SHA512 25c7ca0116832129e23a33de76f2837a305fbe4ada2679f872bbc1b5cd09cd6041d09dbcdff66f9c94cc1708c4bee0a6a0c1e996d3d69e98ae8d66f2a0e53a00 WHIRLPOOL 17dfad0554905871e1db05e52c4f17b8cf8da073583675f3d6a3e8767b4369e38b493c8daa24f9bbdc6cfba8fea789b330e7840c62b60e20962f5be46a3e7c90
+EBUILD spice-protocol-9999.ebuild 619 SHA256 7a841aa906597bc6203e53a9ebbd7aae970f182ada224d3197a4d9940f29294b SHA512 39a6a74d603b05a3e4e8ffea9a97e80a797c596bdda3ecadbe627d57f64e98087fe3bc7bb5f8eb94b522cb9413d1ac3df1c9e5148f67ead40cd223b16ca3ade5 WHIRLPOOL f9cc7364aff4d890b315c6ba6a8611145ea7839b6740c08f4c4f226fc5168fc96fe7efd0abd38d5b4ef9373b81081ec975ccdbe401f1e4eef5c4807b2f5b0b0e
 MISC ChangeLog 5163 SHA256 d490e1f6fb88e29e84cf6533e85cb3052492e1de827d8fcd6512571a7c57b628 SHA512 65cc8eb6984025f537f092b675fb670c6548710845ae8ae43f23739ef4f29c0623c57c271564c2670aae2d2998c9b1fc1ae58c8947027e718ec761b63c3b6e4f WHIRLPOOL bacbd8248a9419f40c01c4439e303f729264559790c18eb49cc53686864864cee517e22ff84f055a00214745bb201f82e67541c03a6e072cf30a6c345e522d92
 MISC ChangeLog-2015 6113 SHA256 7fcca09d4ad157cb4f6722f938025fc41ab255158baa603b8e94f513eacb175f SHA512 78960a6ef6486b2d326a8479f0f431905199d6af0cd9eb023bd25ac1d4f4ba55a58db8b24fd379cab844154f30ad46dfbf197a0636e6662ec88ceba736ecee1c WHIRLPOOL 73f844c53a36fd957f905212801a09b3fb5294f05d8db919e2ffdcdac46801ccdfe07a557ec66495bb8de7c24aa93d8d54d51464329dd926af271e3015c86850
 MISC metadata.xml 392 SHA256 d71716d2383aa9ab43cbdde172b26662566a8c0eb8529efc728de9354ec3a6d9 SHA512 94b90de5debbe7d9e443a927854adaaf76315248af06f781e2e00b6232b0a33605479f9c29c5f78ae6527407382b3dedfc02ebfb579c884f0e82237e339a8b22 WHIRLPOOL 941723ce22812137b4a6788f04fc1d26ba9e33a44b817790143a6aa05e9a602a5e26905bf8c95ef2cf303e341b4ae43ee377905925c83bce1943de34ae0b8188
--- a/app-emulation/spice-protocol/spice-protocol-9999.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-9999.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-2 autotools
+	EGIT_REPO_URI="git://anongit.freedesktop.org/spice/spice-protocol"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Headers defining the SPICE protocol"
+HOMEPAGE="http://spice-space.org/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	[[ ${PV} = *9999* ]] && eautoreconf
+	default
+}
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@ -3,6 +3,7 @@ DIST spice-0.12.6.tar.bz2 1181088 SHA256 f148ea30135bf80a4f465ce723a1cd6d4ccb34c
 DIST spice-0.13.0.tar.bz2 1215334 SHA256 4862e2d11da10abdf46dd6cc834d79fa4ef3490efac8dbcdd19fa96f81147bbb SHA512 be9960e8f40415f2d0c2445aca701729f904b4598492b64993fc53b2cfb27652642f11721b43c44c953e6ba4982865b15260c995bb12c4f29ea9c7e962043795 WHIRLPOOL 88d92a4498e76eb279c073e4da87a0b0efe7697f6da1211b4830681a1cc6c828809dcaaec54e0876766a8fd4365e55439910c13c03e7a50d0ccbdcf98bbec781
 EBUILD spice-0.12.6-r2.ebuild 1653 SHA256 2e9ae316e546279333ad9bdf9446df282ec8d4f4ba18467df3babec47f9d64af SHA512 8905cf3b336afabb59f943d6f8039ef2291def4e0c4dd5e159c6dec34e90c06aca7517a83a1c6a1c6a90732c1356fc90a46ee6da060d60cff415d90cb0775505 WHIRLPOOL 7dc43c8240cad7213c11fb79bef73102a80dbf4069818d15ae8a5c23b7256a9f0ff96c1af531668c2502fe32fda906b009886697df0b99a8eaa9e09cc3a6fc82
 EBUILD spice-0.13.0.ebuild 1699 SHA256 93a098e3771dc02f0bde0157a1112fa3bd8b1cf69e0034cd36300412c94e019c SHA512 cbc76e4069ad2d035e09f896cbd7e76e05025e20246f5bc12c59658fc4e34209b89b98143eb168002c7b85a75bfdee6f403d696b84942f8edf99664cdea0a52f WHIRLPOOL 0dd6cd4eb4911887896e5eb28b7a4d0b05ccbd4ce51169c380e4768fd256a645a342dd0df8edb21c3add1bb146566259af859b51643b44b5d81484b81d650fa7
+EBUILD spice-9999.ebuild 1557 SHA256 06729b6f14124a54034e7e95f5dc2f4319a08b725abf3cc5ac938a2ab946c4f0 SHA512 c47f4720893632a859d0391896649fbf57a3ac52b393f29ac64e3432983202221e0736e23d76d8ad4792d7e14b2d8122bb9344fecc52d2c3f46915837a9a2c86 WHIRLPOOL 1f51d55fa50c22e5e3aa0fb3de94076705c5335a2b7a3e6a83da0c5669905c4a1e5dc4c7c8266d6148a5035dd1f1d9129e5104ffabe8af99bc472f146d4b8fcd
 MISC ChangeLog 6189 SHA256 43a5455ff12ac17b4ac65be6a5e43f68ea51bccde2234a957bf656753be99ec0 SHA512 a00377f2ad95ed9b5076b8b665e0ae96cb6af422e8f657904780296c4e09a9101c3fa308d6884c65788d59672bff86fb194ab63cac28d760ee53fe4b83a40256 WHIRLPOOL 2909402adcda3e89245eaa41b3f9cc870088a62b7eaf7fa2fd6eb105862371fa746dfa99c6683ff2ab826f3ae2f9a563ac6ecf72d5208cd328c8affe00382324
 MISC ChangeLog-2015 11333 SHA256 06046dca615aad09da9fc3ee0ac48f77b6004ec2af2942209535bad890cd0532 SHA512 b161432fa57d4d6dbeaa281b213c679518e73b0df1074435c9d2e7d56bae7abd8a889b4a61cd9a0e55f57baace6a63a4f6d232c0768481eda351eb5c2784b5a2 WHIRLPOOL 4aa7e48ab7e741d6a73d28855fc252b47742cb095afbfb2a90fdd6856de7132c9487234f254fe8dd873ab84c1af636f51e25261e3ef69689f06e97d9908010a3
 MISC metadata.xml 496 SHA256 1896a372596a69daad545832e9a592f4fbb5fc49dd6fc65f7eaa90a0dd8716bd SHA512 98ed412857b6d52d716f32c675b195fd3b4e853dd250ef98ce72c3aade203ae1d6c95d665fa46501da72206387a3419db6cd3310cf46094bfa9562106b7e4366 WHIRLPOOL 09e7c87cc88bcd1f60bd15bdb8d6a6679e779cf926922a28a95e5d0d77c5b2b795d1756c90046c5c19e4e1bded6094b462fe2a143dc8afafa201b3bb0f562922
--- a/app-emulation/spice/spice-9999.ebuild
+++ b/app-emulation/spice/spice-9999.ebuild
@ -0,0 +1,68 @@
+# 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_4} )
+
+inherit eutils git-r3 python-any-r1 autotools
+
+DESCRIPTION="SPICE server"
+HOMEPAGE="http://spice-space.org/"
+SRC_URI=""
+EGIT_REPO_URI="git://git.freedesktop.org/git/spice/spice"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="libressl sasl smartcard static-libs"
+
+RDEPEND="
+	>=dev-libs/glib-2.22:2[static-libs(+)?]
+	>=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?]
+	media-libs/opus[static-libs(+)?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/jpeg:0=[static-libs(+)?]
+	>=x11-libs/pixman-0.17.7[static-libs(+)?]
+	!libressl? ( dev-libs/openssl:0[static-libs(+)?] )
+	libressl? ( dev-libs/libressl[static-libs(+)?] )
+	smartcard? ( >=app-emulation/libcacard-0.1.2 )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )"
+
+DEPEND="
+	=app-emulation/spice-protocol-9999
+	virtual/pkgconfig
+	$(python_gen_any_dep '
+		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')
+	smartcard? ( app-emulation/qemu[smartcard] )
+	${RDEPEND}"
+
+python_check_deps() {
+	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	has_version "dev-python/six[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with sasl) \
+		$(use_enable smartcard) \
+		--disable-gui
+}
+
+src_install() {
+	default
+	use static-libs || prune_libtool_files
+}
--- a/app-misc/tmux/ChangeLog
+++ b/app-misc/tmux/ChangeLog
@ -237,3 +237,8 @@

  Package-Manager: portage-2.2.27-prefix

+  01 Mar 2016; Zac Medico <zmedico@gentoo.org> tmux-9999.ebuild:
+  fix 9999 ebuild breakage for bug 574592
+
+  Package-Manager: portage-2.2.27
+
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@ -5,6 +5,6 @@ DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 SHA256 a0
 DIST tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca 5626 SHA256 040cbb7ce19f5a256ae400061d310e0f64f58cbc525402043708b59546af2462 SHA512 956b2c1ca08e3c92aa39c9df54fbe1c661d0e076c91628c4b88f81f97104241b6505412fa0e21a681adc231eb2e6e7feee850474d4277812d186548bbb05f6d1 WHIRLPOOL 3eaa20479fccf7e20dbd7ccb8669bd8c47da90f7218fdb386fcd150c1223cc7300d68f880baa706bbdb7abf54394d44fd80479ba3fae934de9b53f40acc6286a
 EBUILD tmux-2.1.ebuild 2317 SHA256 4a4f693f0c48aeb00398b06d7a411726c4a7b33f7565d221f377643aae5034b6 SHA512 e265f8b8e76126f37332b3af27d56d2d44e41f98d79126d061b91b2128d273df24a8a04f8f8718876cad6c676e55e8b9823e9aa311ad139fe79cc231bbc8bb03 WHIRLPOOL 02a872b06391c00ec71d2db94b8c355d60c0d78979c5fe46370efa5b6b1fd3ef6494bd3522216c8a70280ae4cf2f96de50fb29b84451ae00101249d864189864
 EBUILD tmux-9999.ebuild 2568 SHA256 773e41c3a0f51f1f5e81214c928a36e0ee4a99a1fba1c71fc24791c4786bc72e SHA512 169c8077476b548264cbc5fbdf62f72ef6311447eaa6df452d75376d9b0e0c4c679346ea8c46effa2ef9473437579ee9f2e1ecf99bbf33fdbcd9cb48d3abcad9 WHIRLPOOL 3c3dcf8416956a176a1ac57840e14eadaab70ff0ea0b75652b0a0869f8223b7074eda0877ab0a2e07192559c9fcdeb4297c10ef13fd157a3a15e0d93f83e6591
-MISC ChangeLog 8115 SHA256 4b7c09a8ba16124a09a5456cbaf95f2198ed8a61692b6cc434cb0f31c9b04dc9 SHA512 2fde4a3b4833a8d490be2e42c35dc2aeae835ee34f7c2210cb87c0514c6d86dfd0d057c5fba51ff01d57ba5ac0890170d15acb1ac8f523837227cf27de720b75 WHIRLPOOL da86a075b85a93818a50c6f0fa422b218e542659259f0b47125dd9687ce2d754b2aae0640ac1059e272f38f3250c41f9a4d65a77fefd17f99b837469994f736f
+MISC ChangeLog 8258 SHA256 99c558f06669cee33ac9d75fa28d7e06feee234befcb2506499150b1898229e5 SHA512 a0a17c6c5c0eeef4c0dcc5de462c7cf07ab1e455aadeb787da5c5269e197eefa4d33b310e0a5e21645f370b70b1eac4fd1ffdff2415c23cffb6ffe045ee4a424 WHIRLPOOL 408b3e05a871c333842359f308583db07c2134e5b6d6e4f0bd92cc3590ac26eedcb37e5c45281127098f32a2e38aaabc2a9e23fca7952bfbcf4ce6506a85e539
 MISC ChangeLog-2015 13810 SHA256 cbb95f774d96b6b2f12e4421bb5ee3b75820f4ab9ff571f9a47420fd3928daa2 SHA512 7a14a2e19346013beadd9bade2366c7168ec12b54ecf2429ded745bddea83e7ea228a4bb4f729254db523d7c6c5ba2cc9e5f2a4fc771948ff6d624d6a9d3be08 WHIRLPOOL e9e3694e0f4bbff32cb1e44585faed0944440f5c39477594fc3ee1a62cf7f6b1dd453e7789083e99d6a451b8c6a9bbeb39fa373b65000988ee5c64aef899d010
 MISC metadata.xml 758 SHA256 d8b1acdbe0283795479436be5437f76037fb54e0c6f32ec6cbe4142964bc1889 SHA512 560576353d246b8b63fb5287e3ead7054e8f7307c0d78e02dee378537a6ffb03edc3b444f1c54809a4807cb4ce1f22e7967ae5825692d3804b89cd1b4655e2c7 WHIRLPOOL 048f7302af5a1ed297d4664880e973304627e12565ceffd394a2564b7cf6efba94d0f6ac14d032262970d4b30b09db4ea83a7294f4ce7cdca5512510939f0d36
--- a/app-misc/xmind/ChangeLog
+++ b/app-misc/xmind/ChangeLog
@ -94,3 +94,10 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+*xmind-3.6.1 (29 Feb 2016)
+
+  29 Feb 2016; Chris Reffett <creffett@gentoo.org> +xmind-3.6.1.ebuild:
+  Version bump
+
+  Package-Manager: portage-2.2.27
+
--- a/app-misc/xmind/Manifest
+++ b/app-misc/xmind/Manifest
@ -13,6 +13,6 @@ EBUILD xmind-3.4.1.201401221918.ebuild 2239 SHA256 3842b56da8bfea9abb7a798e3d058
 EBUILD xmind-3.5.1.201411201906.ebuild 2241 SHA256 0552ed8eaadf5f06a0bcd414e0a80805bbe4c8d22e283f4ae0ca487eb88172f2 SHA512 472723e5bc7e06fa3c362d18e7076c457072eb9cbacbb47c4a32be504aa7cb39233d9262d0014fcdd10c5ba30bec93134079a134473aa6a1b005ed73eeba76c2 WHIRLPOOL dc3c2063d4df5ae11b5c851110d90c3dfb8c7be0dd41eeafa553bb9db6ea9a90d4be998edca6d8e1a28e5ee5a1f666d0f9ec67d57bb2142f3c4bf125054fef67
 EBUILD xmind-3.5.3.201506180105-r2.ebuild 2224 SHA256 f5da806f3978cb63222490e0c061dfb4eb699d2472255a288d3c16f0fecf3e9d SHA512 423bd31b6fba869a6c6aedfdb25cd230b8bdfacc3744a62fafb928016faba0b1053470371ed9cf26b3558fd805fdc2bf510dfa37dcaf3f9c999cfccfe654bf92 WHIRLPOOL e9d1a0c69e2e478abd71d1cfb1599cbb505ad059d13de904ca81fa9105448ed816ec0a4162c91fbf96ccc30acac2c94158d0f5a0c6a814ef8d173ff184fc3e55
 EBUILD xmind-3.6.1.ebuild 2187 SHA256 7cdd05681a3bef4dd6d40fb7373fee4bc71400532e247d79cc7560cde6668580 SHA512 cf02fe69b9a03b187208d8944709d62f0083d9c94c58116ea47ebe006833304fd39d3bbcd204e58bb6cd8a37c929f9702423d1ed7c51b2f1dc8109dd57042739 WHIRLPOOL ac633226de525d96934182df98a613c8931b373ad4869b59d0dff5a827a128fca203853209306f8e5bf932abfd50289f5371e9eee2cae5eee975693a9aefbb48
-MISC ChangeLog 3585 SHA256 7160226fbd81aebda4ea97a2e0dc5529a2c2388b32d73f4740a5254926210c97 SHA512 58dd681d74efd797fe3243f4c964779c1e1cfa77508e2d492a0b705a63e890e710a0ff4b8847d138d12fe7387ffe97ddf65a04d511f3eee4355b88a0bd8ce02f WHIRLPOOL 243384b62fa12bb9cc18599f3f35c44c22ba6e57bbbf0a7369ff8d134c03d795678d7927a5f43b2f27e3df6dedf682e4feb667f48eed6b9a334f3ccaf88f302a
+MISC ChangeLog 3736 SHA256 29f07aec0f7b85e86dc1703ccca4097eb5e6c24775c04a1dd6de59c9713a7c6a SHA512 0b27f5ba7d05541f97b75f967aaac2e3c9d500088da40f503ae19a31e8410420b4a77e4bac1dc5cc8387ae2a6125f4a0a35b58b04802e4a20e7fe8ec45caa54e WHIRLPOOL 3509fb5e2b81b71fece104c380058b85cdc09b1860c047136a091675acbec1d138c951ce2854c664a7b872c08a1d10fd6c01be8689726b3104c6cbd0af53e10e
 MISC ChangeLog-2015 2816 SHA256 878639db21ae27d9f934a3da8828b1b666b3f131ef98986b43597f6148ee1c49 SHA512 88d10252fb897f618bcc10dd4402e3c7faba581ba33d369ea53ba4080b577366a721317ea122845301ccd3150914c144fe9418064cb2ddeca050c3448896de1e WHIRLPOOL 99cdab33b855abe71c32d59a1e9518f6ed101bb50541551bc752bee00bbe66459406bb7f9d72da1f763a34d90133f5775552731fc94103d2fa20c881b22da80f
 MISC metadata.xml 248 SHA256 276c1a0ca13c7abf47c84827347c1ed936141b1cbc6dc7f68061718cae3ca120 SHA512 29d9aef2134dc48ca8f1cf14bcb7197920bee680270c75fa551c892c9bbaa325a1a6cc6e97a25e1a33c1dc36e1c7085abb3672559b9803285d755db6eefe12a3 WHIRLPOOL 71e74598e61b7af968f3747f7fea0ded96efec00de3ec771a4bce49c8f7d897ed33958f9e76383703eb4058ed765c6ca13f3b0fd4f604bc4bb2b0806943f55ba
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@ -346,3 +346,14 @@

  Package-Manager: portage-2.2.27

+*libreoffice-5.1.1.3 (01 Mar 2016)
+
+  01 Mar 2016; Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+  +libreoffice-5.1.1.3.ebuild, libreoffice-5.1.9999.ebuild,
+  libreoffice-9999.ebuild:
+  5.1.1.3 pre-release version bump
+
+  Added back python2_7 compat since it was fixed upstream.
+
+  Package-Manager: portage-2.2.27
+
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@ -19,17 +19,20 @@ DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac0
 DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
 DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
 DIST libreoffice-5.1.0.3.tar.xz 175720564 SHA256 b41b03f008dab3439bde31c1918f0477c035eab629166a79eeebb0bb6e8757b3 SHA512 ff068df64ca3a566d709e00e30d12d81095c88e9f05f785db805387ae5ff47dc7f8cd801ec6657a121fc6683fc7e32ff9abc508cae3b4f06d6ad22404a875de8 WHIRLPOOL 68930103295c2136915c015e0b62388586413fb62bc9c7bf2bb6cea7c7820449438af151c64a9efbd00e205b60e5860ee26a2b288495562a8bab1a33f008d064
+DIST libreoffice-5.1.1.3.tar.xz 175820100 SHA256 2c5afb77e10daaf02b0521f0a3027345a9cfc02fa7a152f4a2e5d7a74abc8e38 SHA512 5aa5be15732808cce56eeb9274de35c15b31b56995ebbb9dfbfc19be23798576889e7276f42cb95cf9b8b1e0f755943ceb1994525bbbaedc24a28ac3345c6fe6 WHIRLPOOL b79ded47ed673f82df2bdbe1689b8d7fe272072e797868e2712d0f5b14f3cc8cd1cc5ac6437e695e48630504d4630e4e83b3bc03a8ed6f432bfbe7707a7dd078
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
 DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
 DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256 6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512 63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170 WHIRLPOOL b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
 DIST libreoffice-help-5.1.0.3.tar.xz 1903996 SHA256 c2e9dff6a930637ca9b203dc31b7f87b17a03419891201a386e81bfbbdc1b447 SHA512 5a7f9b59d14aa8b3f760abc835f7541d2458b6c2239a42653db91681d82a8f90bfc5c593c74ed086a64de8078eea6367ecd27f0ba07ce37fb13f6dd935f5a438 WHIRLPOOL 6d650f0faf230184a2db7e20440e755b0d05bbda1374bb4fc1bb3ed832d89b4f115bda4fad9f0a280d91d12aec1730b5b9dd76ef1d6acb417a03f7d3f6c4f320
+DIST libreoffice-help-5.1.1.3.tar.xz 1904764 SHA256 ce5df97b26d25bf73cf29f122f9f453ca54055ce37a8bb3dc25e4c298b5d3da9 SHA512 2d2400850e0e734df8eb884df2edfabd6dd31c1ef8f43652feca3cc573c1acf6d73716eadf3ded39e2b15f010ec486835830f020aec7b47529064d5cdab4fde0 WHIRLPOOL 1a39adf1b424876b58a5ad8c3e3e625c0e54ad525d93d309698fed33549c40cae00543311f68fe22e39b9f871587811b6867633e741724d61e994d6ad8518cb2
 EBUILD libreoffice-5.0.3.2.ebuild 18322 SHA256 4ec3690de6b0f3c646a62a9854928f05f6d019c97ea3a826db17cc452e7ab80d SHA512 25d3c34cfcc52a19779d1d865d6a4eda6ca2f0c03f49243eac2bb92a1f1479bfc33c371f5d7d0cf59a0aeb31813bba3383c5969093657905f53489b850ae634c WHIRLPOOL 7c00d49b0c87dd2df9b63b92477beaf27ea972705fbe63b90c4554776b9303ec7c6d1cc536ed20d622c5cd5e228ad5e3f7ec97cf69ee842abb09cb9e5246ff8d
 EBUILD libreoffice-5.0.5.2.ebuild 18308 SHA256 514bbaaa2ecfb40c86d45faf1dbb3522da9be107c7d5e7b14af5b5d8fa8fb31b SHA512 7cca2249d925bad1436de4e6f808bdbea1c24c816a9eeb588d39b7594d08bb07be013b22bb82929112d682443e73feec5b5f90aee90aa643cc00b589194a1299 WHIRLPOOL 75aac345382e0fbc76e94842e73365644cfc01b16cd6bbcaa1e9edc4bcd17c601793bd1d133d76eb196aadc759072eecc9c6033b79b797f92f05a8d611f39886
 EBUILD libreoffice-5.0.9999.ebuild 18270 SHA256 c7a11111b8d7d1648d1dd61195cc9d0fc805dd1791d65c041d9f9c68f7a0b6ff SHA512 465a380986109d372f1a9fd076a2a73404c96e995af36149045e261784d90be9405b0d78579d2f0d8d6e98357fff2f23905474b543fd7e74b714a0239d5a962d WHIRLPOOL 43d3cbbd46204ab1019df90b1885b4a53d1c97304cfab358817bc8e90b9480020a73b644c6fa5648cb51bc823b493189d8263dfaff5b190c170c81d562d8cf12
 EBUILD libreoffice-5.1.0.3.ebuild 17540 SHA256 69de70f2b4ac69aa80a73247fa6adb96a3898f6d3c1ae31f4747f8a2c7fa1a99 SHA512 e3184c5729c2eedd485dbc49829ca2764be3e9779f1ea4baab1e04d11d6ec9ab1e529c2c0e03907d83ade6f1bdb8b1f7a927b6464784db479573bd665bd73de6 WHIRLPOOL 11efffaa715814d9ae15497dee2ffcad58dd651a211a1c41d197b0f19743463bf3c49b7f9c45cffc8c9da18449c3ed7ad5609c961316813bff366533f1a8f378
-EBUILD libreoffice-5.1.9999.ebuild 17492 SHA256 9b76e8925bafd0cf48591d6258a1f3bd934b6b2d6b86a68446b03480d878e558 SHA512 5d4e48d6aedfde6884fa9d629762b73fbba1aea4f30f09d62480c94914257c1c2818302839c07fd2dcfc21b03e286c636369200c07b21813a8d8e5bd4b9102b5 WHIRLPOOL d30fbe52fbe9b378b37828b7fecf8374c55fb9dd2761cf3e6ef29d0b9d94c1b9bae6f2b4a4e2ba6e230fab5a8acf27e35ae9d8058fa95411f901a4ba77910c1c
-EBUILD libreoffice-9999.ebuild 17075 SHA256 cb3306eea92c5cf81b67154035383a61d27efc04506aa8ff3aeb5d222e1be8f7 SHA512 51cd9e0c637ce0fe2aecfc3453e6d0b6b5bff58965fa3689fcf3c2138eb8447860fbb4949266d51c555b306a55433551b772366d2b0300f2ba890096618f8893 WHIRLPOOL 85b54a13ff9ce1c4f9d681e38b06da19d19641347d74cdd2c7635f6312cfc85c099c5deaa235b73d1931addd3c74ff5376497f0caf53b28fa0a789fc26305c78
-MISC ChangeLog 11743 SHA256 a6e5fb648cb53e5ce6089ee4ced946f5bcf70a85d114e3377edda27d5c23c18b SHA512 e74fb3bb16e341fbde639668bc65934a814234443a8e02d1adfe41b80c6b3f5999e5ebe893a7bd88630bc9a2f2146fadaee743ab7e9e4f34a6461addb0bd5e0f WHIRLPOOL 0fec9c7775555e878a9048b361d16e8cfb95ef0116f20e98b3fa9f9d29361d0912dcbb644b162fc8b783920c24d2ea7ceb8cc01cf6c87ec02dc1edd24d71a410
+EBUILD libreoffice-5.1.1.3.ebuild 17510 SHA256 279b9937728a1d2ff26251c67b314993e2645acf268480346931e35ff529eb97 SHA512 fd4a454032222bbf286a421e94938356ce4546325d8dde3a40e1f74d3d4204f2d39875cf56a92e806c5eb98405370ef6730e9173c3574d872bc4ed0152756776 WHIRLPOOL b056b2666e93ffc0e9a4a443917439e0929ccbc08608de26a5ba94de11e69ab8dbb130b06b2a4f771ed59630c1eaf2eb7be2ee75fbe70047be888e9521094bf2
+EBUILD libreoffice-5.1.9999.ebuild 17496 SHA256 5ea7a391c4e887d66dce73eabeb370c462e4474d2f1a63e9133dbf1a65950c7d SHA512 7fc81ec4db1b9b565a7e2443e018d0e18bb26abf41a8fae0012949f2ddacc5c45ed3092063436c13a83fc28defed0652ca3cb49183e9bf9f9e58ea288d34b637 WHIRLPOOL 4e9e2a6ecb9b481e91dba7a5c2cf6af038158a45d5d2e438b2453dcd6ab393b95fee3f7cfb8c4c007ed103555fa762eaf87cfad8e31355f260d99f17c46b2096
+EBUILD libreoffice-9999.ebuild 17079 SHA256 e77c3651fd5c16cde580c230398b4fbd4fabbf2881dd69027eea08e5828cb947 SHA512 c1f296ebf45a1dab65f79b6fc6d4675ee5a3cb5c8b53068bcb0dbf0867741d56f82cedb74bfd70cff877f8a68ac9a9f7c2a340272623ddf6adb5cb2ef64df9a6 WHIRLPOOL d00f8e3279fe3aeadf1ad738e6dfeaf626cf1f4d3b7d0cb4681504c3aefd5148ddc084a422693f41ef554d83bc5dfdeeb1a308f1f63baf78fc4221490d3cf57b
+MISC ChangeLog 12066 SHA256 807de8c4da849f9adbd72d56c8c8367b773916a3db723c1140dc7ad5367977f9 SHA512 049243832b344243ac4fe6c3285ab5d4ec4aea434b1d82f2393024d20d09b5ef49124c96c91ffe3a2215413159f85645b6a097c1fbd279dfdc52ec7acfa48de8 WHIRLPOOL dd722625d8f93758888585ffcb7194bef24bb77a7fc4b7b5e5e9c879ac66471ade5e8895fbda33b92fec08a7f65950f3d153e999e9a4376e0192b93605c2b349
 MISC ChangeLog-2014 109721 SHA256 db62affd74b541212d4043dbc88acf51fb8aa36602d6e5625cab9b0b823a54f7 SHA512 6481d8f26924300ca46f0cd216962167b6ce5d53028558b0128ed4f996a8cf5576182e9e511493e4b57f628189fc127dec9ce62110bc8d3d85c6d4e2a815bf26 WHIRLPOOL 76c87a30a9296f64675baeb5f77a8500b9b1ff25c6edd5a5d0b984dc3cb3b3aecee37938d882194d6be58ef34c8b1925c1d9b8b7a7b786a5d68539fba714e627
 MISC ChangeLog-2015 9339 SHA256 efed9b1e7f6ed3ce24e8351037daeb8b050089969bf6ca5e5c013d42ffb2fb88 SHA512 7b58f85ea022bc91f78c812e09381660c25fb054b8f4e53e17e81161db775c832e441c5c64f50ab3d0093edc627a6bbc54c53f3fc75470d149ccb7ab92beba39 WHIRLPOOL 90c23e45e3afe143983ff60c5ca561f55169014d80d78e7d67b4342c2d7c71a0cf5548ed6316cc98366c3f205f506374a9643d22697e542c83243ca5bad1c78c
 MISC metadata.xml 1274 SHA256 bd4493db2b60fa26fdc8101687d92cea7760d19676f08a8c36b820755a1f8c6a SHA512 c25b674ddedf86ab66c6cea0e40822b658fab3e281f31d7e0ece4311c2edd7a1f1bee0ea20fc1e35224c8000443b38320be104fa26ce3cfa95df26ee5927aab1 WHIRLPOOL f5d25cc64f3dc9cbb92a84bcabb828c582e97617a34fd655c6ede9d0422a1e3e5d00bc87e37f2128d7ba394d51af2c42b6e0ee9ec255ad563b53e71f4675393d
--- a/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
@ -0,0 +1,589 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	http://dev-builds.libreoffice.org/pre-releases/src
+	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == core ]]; then
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+	"${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+	IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.3.2-r3
+	app-text/mythes
+	>=app-text/libabw-0.1.0
+	>=app-text/libexttextcat-3.4.4
+	>=app-text/libebook-0.1
+	>=app-text/libetonyek-0.1
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libodfgen-0.1.0
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	>=app-text/poppler-0.16:=[cxx]
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	>=dev-libs/boost-1.55:=
+	dev-libs/expat
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.8.1.1:=
+	=dev-libs/liborcus-0.9*
+	>=dev-libs/librevenge-0.0.1
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+	>=dev-lang/perl-5.0
+	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+	libressl? ( dev-libs/libressl )
+	>=dev-libs/redland-1.0.16
+	media-gfx/graphite2
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	>=media-libs/glew-1.10
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	media-libs/lcms:2
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libvisio-0.1.0
+	>=net-misc/curl-7.21.4
+	net-libs/neon
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/jpeg:0
+	>=x11-libs/cairo-1.10.0[X,-xlib-xcb]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/glu
+	virtual/opengl
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+	cups? ( net-print/cups )
+	dbus? ( >=dev-libs/dbus-glib-0.92 )
+	eds? (
+		dev-libs/glib:2
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-2.5 )
+	gltf? ( media-libs/libgltf )
+	gtk? (
+		x11-libs/gdk-pixbuf[X]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		>=x11-libs/gtk+-3.8:3
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+	telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!<app-office/openoffice-bin-3.4.0-r1
+	!app-office/openoffice
+	media-fonts/libertine
+	media-fonts/liberation-fonts
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+	kde? ( $(add_kdeapps_dep kioclient) )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-0.12.0:0=
+	media-libs/glm
+	net-misc/npapi-sdk
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	!<sys-devel/make-3.82
+	sys-devel/ucpp
+	sys-libs/zlib
+	virtual/pkgconfig
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		>=virtual/jdk-1.6
+		>=dev-java/ant-core-1.7
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	collada? ( gltf )
+	eds? ( gnome )
+	gnome? ( gtk )
+	telepathy? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+	# submitted upstream
+	"${FILESDIR}/${PN}-5.1.0.3-isnan.patch"
+
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
+CHECKREQS_MEMORY="512M"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+pkg_pretend() {
+	local pgslot
+
+	use java || \
+		ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check-reqs_pkg_pretend
+
+		if [[ $(gcc-major-version) -lt 4 ]] || {
+			[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
+		then
+			eerror "Compilation with gcc older than 4.7 is not supported"
+			die "Too old gcc found."
+		fi
+	fi
+
+	# Ensure pg version but we have to be sure the pg is installed (first
+	# install on clean system)
+	if use postgres && has_version dev-db/postgresql; then
+		 pgslot=$(postgresql-config show)
+		 if [[ ${pgslot//.} -lt 90 ]] ; then
+			eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
+		 fi
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+	python-single-r1_pkg_setup
+
+	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local mod
+
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+	use branding && unpack "${BRANDING}"
+
+	if [[ ${PV} != *9999* ]]; then
+		unpack "${P}.tar.xz"
+		for mod in ${MODULES}; do
+			[[ ${mod} == core ]] && continue
+			unpack "${PN}-${mod}-${PV}.tar.xz"
+		done
+	else
+		local base_uri branch checkout mypv
+		base_uri="git://anongit.freedesktop.org"
+		for mod in ${MODULES}; do
+			branch="master"
+			mypv=${PV/.9999}
+			[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+			git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+			[[ ${mod} != core ]] && checkout="${S}/${mod}"
+			[[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+			git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+		done
+	fi
+}
+
+src_prepare() {
+	# patchset
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	epatch "${PATCHES[@]}"
+	epatch_user
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local lo_ext
+	local ext_opts
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use collada; then
+		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+	fi
+
+	# sane: just sane.h header that is used for scan in writer, not
+	#       linked or anything else, worthless to depend on
+	# vigra: just uses templates from there
+	#        it is serious pain in the ass for packaging
+	#        should be replaced by boost::gil if someone interested
+	internal_libs+="
+		--without-system-sane
+		--without-system-vigra
+	"
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+		else
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		java_opts="
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		"
+
+		use libreoffice_extensions_scripting-beanshell && \
+			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+		use libreoffice_extensions_scripting-javascript && \
+			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: disabling causes build breakages
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --disable-systray: quickstarter does not actually work at all so do not
+	#   promote it
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-dicts \
+		--enable-cairo-canvas \
+		--enable-graphite \
+		--enable-largefile \
+		--enable-mergelibs \
+		--enable-neon \
+		--enable-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--disable-hardlink-deliver \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gstreamer-0-10 \
+		--disable-report-builder \
+		--disable-online-update \
+		--disable-systray \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="" \
+		--with-parallelism=$(makeopts_jobs) \
+		--with-system-ucpp \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-help \
+		--with-helppack-integration \
+		--without-sun-templates \
+		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable coinmp) \
+		$(use_enable collada) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable firebird firebird-sdbc) \
+		$(use_enable gltf) \
+		$(use_enable gnome gio) \
+		$(use_enable gstreamer gstreamer-1-0) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mariadb-connector) \
+		$(use_enable odk) \
+		$(use_enable postgres postgresql-sdbc) \
+		$(use_enable telepathy) \
+		$(use_enable vlc) \
+		$(use_with coinmp system-coinmp) \
+		$(use_with collada system-opencollada) \
+		$(use_with gltf system-libgltf) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
+		${internal_libs} \
+		${java_opts} \
+		${ext_opts}
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=icon-themes/galaxy/res/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# Fix bash completion placement
+	newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+	rm -rf "${ED}"etc/ || die
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	# Remove desktop files for support to old installs that can't parse mime
+	rm -r "${ED}"usr/share/mimelnk/ || die
+
+	# FIXME: Hack add missing file
+	exeinto /usr/$(get_libdir)/${PN}/program
+	doexe "${S}"/instdir/program/libsaxlo.so
+
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
 KDE_SCM="git"
 CMAKE_REQUIRED="never"

-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 PYTHON_REQ_USE="threads,xml"

 # experimental ; release ; old
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
 KDE_SCM="git"
 CMAKE_REQUIRED="never"

-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 PYTHON_REQ_USE="threads,xml"

 # experimental ; release ; old
--- a/app-text/zathura-cb/ChangeLog
+++ b/app-text/zathura-cb/ChangeLog
@ -74,3 +74,9 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+  01 Mar 2016; Michael Weber <xmw@gentoo.org> -zathura-cb-0.1.3.ebuild,
+  -zathura-cb-0.1.4.ebuild:
+  Drop old.
+
+  Package-Manager: portage-2.2.27
+
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@ -1,12 +1,8 @@
 DIST zathura-cb-0.1.2.tar.gz 6636 SHA256 72b20e2de452ccb8428fe0007bf12cee06c3422eac8e5e3b2c0ecbc9848850e0 SHA512 bc2c8c846e40ee17aa9df989ca019382d1e4b3074376431c1a2f8190607c4d200ed159de161b8cbb1800bd1f494a770691fec803bc8ce661fe317cf753efc4b7 WHIRLPOOL b0f8c3e67842c7e9469b4d3d21f27fb15ad29bfef5540556c8ae6c23e1bbecc368e3cb60b9f4f8882cdb9d26ddf88f9d75613463acacde23d415f8b4c9857061
-DIST zathura-cb-0.1.3.tar.gz 7191 SHA256 7c9b744201ee690b6d3667481bd5ae97de27abeb4d594a80ecaf4ee8a041023f SHA512 13d64e4e508c35e170db33f5a3fa29894ab26a0ede5a9c55ec4e546faee570a13791af1a48f335c506833d706823554a0fbaeb950a60d6332f3bff41668ce294 WHIRLPOOL b11f7278ddfa7102169eb74863a894846d220238fd289efcc240b10cd34687ff75414641c2565e15c3e9bc4357e00a303737f94a5e8436b02a95a872ba5a54a4
-DIST zathura-cb-0.1.4.tar.gz 7205 SHA256 f21cb140cce02b3ef8b23eff479a7f66285667ab47cdc099c10cd62eaf239626 SHA512 e36b6adad6bb9cfb2f5e5536db6a9392318c000408336376881dae537a1978eaefd3aea99a0de1e33599f433ef6bb14dc0273d1f6c12bce16570a1f544296e77 WHIRLPOOL 86aeb768f717ff7bfd01a5ed00fdbfa368a53098017682e5a3fee2f328638a2f4e886e3d9c0f7eefe7ab990f3e9fececc445b11b8edbdf85fe6ba2c69fcedfc7
 DIST zathura-cb-0.1.5.tar.gz 7193 SHA256 375f6912bd79648603bad51c3635ce28eaca7bf4df521c00ff9673d9b4ff6afd SHA512 bb57f1af3813bf9414dc6843f0e9766179a28d0d0756b3c2402e2872d0f35e09fe69c17f9740635da61099407c1335856351d95788738f3820790f3158ff935d WHIRLPOOL a7288ac461a691727914832c9fed90ba4a5e11f47bbdd597d77f0c3cdf539469a4a44028bb2e7d7b9f5cec0b0a822567ee4ab6a566553727921b702e116f3a45
 EBUILD zathura-cb-0.1.2.ebuild 1062 SHA256 1d30336cf8f501c350441b96f77510d62399036cc94f90e1bd19ad1c51814808 SHA512 1b9a6819ad289ccf969cec5d1205fbecbdeccf7f67f2cc4fa8b3aeb0b4a3f36897d6b00387a672757cf5efcf7aba06b6e09c7a4175a64db3afce6f1d5847f3bd WHIRLPOOL b57c1cd3e87571f592997f8e26312c6046a0034afd2005751a5265a0a09615aba7d1a386bcb859cac1074517c2f2a1fba2f40b81608c7e16c4c98a8c8bfc6fcd
-EBUILD zathura-cb-0.1.3.ebuild 1087 SHA256 b53ede77873e11ddab97b4d92346185d5d3cf367120763409061019e132ebca2 SHA512 0b3a4d65bb49caf119f1b22c492b68c84530ddee7df583e505ece84decba5d05b66244f1256fbc99b3f4f37297211c4bf2df22be51969f23259a203fea67ec41 WHIRLPOOL 17b6f64495ece5b0a6d9524e6d71ec78e643070abdcc17344f51fd604dc65654b8839bfd8e5b431f27a6ce8af0cb13fd5c8095211e1b4df6c463e7dc55a13eb9
-EBUILD zathura-cb-0.1.4.ebuild 1087 SHA256 0ecc9055f981988cb8092709730b2f41fad13af28d749068c853b6c2ea94d676 SHA512 a6b80611e11e46b2e65d78060f13b9f4c4095db3b23c8403660bf137944bec1754880fd81a4e4206d3420253f4f080bfb45eed31c4a963043e7e568cd652c717 WHIRLPOOL 737c6a8a01be9ca7109808ae9e1a64a5e4dea081badeda112606a6e43ff3ce50789d690402e6d10e0548c491f234d6afd48127f106e72dd60c3f0b583aee8e8d
 EBUILD zathura-cb-0.1.5.ebuild 1094 SHA256 a2d3685c887e16b9ff3bc8bafb5d861bca2c7b8c511e6c4f21b7b6668fa4cf63 SHA512 f993df489dabfbb7d3e225706a1e6184e41ea7afea84a8ec3285744d29dda8acf4b6248c5d0872171003488eacda0594d3dbfbe56c71695c05ba48d8906f592c WHIRLPOOL f9e9ad3ec49ee9f8bbdc91420b69c31ceda038e47ff4e0a328a04e0d9bc05409c11a0596b54ac63df693a8cd3d245dbfc9612ec88e3313e066b748b0eaec1fb0
 EBUILD zathura-cb-9999.ebuild 1094 SHA256 00af410badc41b26e1b7cb572d42cba4497d74cec52f622619b341ad3029bbf2 SHA512 76bbbe7b335b8f403dfef035cfdd97cd6943a300cef2bdc789b13bd3ead0d36bda16d5096ddbfb0a1fa94f30069c25671898cb243d6dbcb28030c3555198b80a WHIRLPOOL 1f847db4e04e82e6d869d8a5c7b19d2305ce0aa84df46500159dd5d200bbe9323083404a54f2553b7a0b296bcf29f136e4f045d667109d6ae48b1279a53a423c
-MISC ChangeLog 2709 SHA256 8aa9149de4b86cfcc7c80e1bbfeb729294c888530f2f710e85622fdaed28f708 SHA512 7724b9e6764cb68bfadd1e5b2c2b49887345e7b301592e779141068f56f9637072f861726cb7784e78cc052f31429abb06184066cad7d6ceb2da4d82a6cd7b0f WHIRLPOOL 6530813f6cdd0037bc2f9824eb63fd73057420902fd089fb6b8c00efe9703b2d6532212bb2569ebb6ee0486696487e3deaa8dec6665debcbb7f69ba778f86fa7
+MISC ChangeLog 2857 SHA256 edd1a032bbf94484ca683b2db3fc59e137f6f885cc396a35f6f01ab7427c5833 SHA512 92a3eb5accb621b83fd2dd5323c03baaa910e0cf556eb723c5a37b997828577b6f76b601c167db2a65a37f4cffe4350bc71ea7f1c8e306177c66710d36eedeb2 WHIRLPOOL 90650b53961470293b5e1b127386f68f66a67ed17038fd1c1e9fcbacc0d9c5fd1cd91aefd087194b3a2bd1541c8e71dcfa025189438054d4cc1c1014432f453c
 MISC ChangeLog-2015 2522 SHA256 69883c85859cde216305bb75427183a8a9fec2318a9a52c2d30ef6917660cd73 SHA512 1d5a0d002804b5c70470c4ca22d219172bcd8aa09a686bc0858a3ff53cfa9b060896f78eef27c179d6d4ce59e85eaf2e8bddb73931f6f5638b749a70021b1a95 WHIRLPOOL 4f29086a41965c3b23b3c4773ddcc8eb70d33205ce0ff635b9d9e0046c876721a499fadfc8bc5d11da7c8fe65bf5d22640f95c68c39d0317b584304c4821b1a7
 MISC metadata.xml 820 SHA256 9e0217250681ab384e80385d2e19252ded4a6c780c9ff6d40b561968179a150f SHA512 4be93e2de0186df8784d9ab6a4fe57b6a8cd4d4f3a482e6fceaa3b9b7960b12d23368b7609a9745a0a240a9ecd00397270c0b0f4bf5569db480eaee23defa802 WHIRLPOOL 5e922fcf779c27e8d6c8737ce70dda297bc2a26854d4fbf2ab0873ff43e48e6736c62500ed44786056f2da186970672e25fbe5c5a2c35d384219a253e3872057
--- a/app-text/zathura-cb/zathura-cb-0.1.3.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.3.ebuild
@ -1,56 +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
-[[ ${PV} == 9999* ]] && inherit git-2
-
-DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
-EGIT_BRANCH="develop"
-
-LICENSE="ZLIB"
-SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="~amd64 ~arm ~x86"
-else
-KEYWORDS=""
-fi
-IUSE=""
-
-COMMON_DEPEND=">=app-text/zathura-0.3.1
-	dev-libs/glib:2=
-	app-arch/libarchive:=
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:="
-RDEPEND="${COMMON_DEPEND}
-	app-arch/p7zip
-	app-arch/tar
-	app-arch/unrar
-	app-arch/unzip"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-		DESTDIR="${D}"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
--- a/app-text/zathura-cb/zathura-cb-0.1.4.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.4.ebuild
@ -1,56 +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
-[[ ${PV} == 9999* ]] && inherit git-2
-
-DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
-EGIT_BRANCH="develop"
-
-LICENSE="ZLIB"
-SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="~amd64 ~arm ~x86"
-else
-KEYWORDS=""
-fi
-IUSE=""
-
-COMMON_DEPEND=">=app-text/zathura-0.3.1
-	dev-libs/glib:2=
-	app-arch/libarchive:=
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:="
-RDEPEND="${COMMON_DEPEND}
-	app-arch/p7zip
-	app-arch/tar
-	app-arch/unrar
-	app-arch/unzip"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-		DESTDIR="${D}"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
--- a/app-text/zathura-djvu/ChangeLog
+++ b/app-text/zathura-djvu/ChangeLog
@ -73,3 +73,8 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+  01 Mar 2016; Michael Weber <xmw@gentoo.org> -zathura-djvu-0.2.4.ebuild:
+  Drop old.
+
+  Package-Manager: portage-2.2.27
+
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@ -1,10 +1,8 @@
 DIST zathura-djvu-0.2.3.tar.gz 11181 SHA256 c16e82d525012b788fd01c4189df93708fcffffb7dd34ca09db55005d644ed89 SHA512 6fd9c1d367d02402bc5eaedd853ed0d37aee61a682772c3c2dd543d98c03d85b32cd2b4af4b7f7a6390e97206aa881ebd6df9783e7abf4222352fb4d57de4850 WHIRLPOOL 447aee58bf3c0e9baed6d9d60505245777fd38be8bb2ae4c2f387a98afe334a01cd870995884f99d073904ba6812120c6660d88864bc3d38798d94e1c7d9cd76
-DIST zathura-djvu-0.2.4.tar.gz 11197 SHA256 ac10b8c07fd9f58281225e1a4cb026634cd03bf6b549eaceeea02f99ab5334bc SHA512 192df545b686259089342044ab682c2517f8e377667a9d44f6f416e1ac7fb7b2e45fa22d34004583c6081650a15d2becb350296a39a647a8dcd2ccc7ef1066d8 WHIRLPOOL ca0cf5570ee5529233110b7db1c29e5572ba321b7dbe59a4632ce23861cb15e0b6e85118bd5159c94a7e5d715c10bafc856a4eb4070413eb66601513eaf26542
 DIST zathura-djvu-0.2.5.tar.gz 11137 SHA256 08b7110af13e17a9d221bd7a0f7d3b479b3e31631d78bc6c5efb46271a299c0d SHA512 475ad916ed4b1cb1f7d79cf3417a68084bf00d737ffd5436c8079012dff2c8a3c4af28753dd42ad412269ea340e3844f2f781eee080f5487a13ee3a272ffa55a WHIRLPOOL 1304e9a74e0c8d0703f71e5243a112fbe1fe32fd71df64204770b4b0e1dd74e97a0a6a4a0fa258f5e56d5609ded0bb7b5ab097bc1446edb38b27cd4643e6be00
 EBUILD zathura-djvu-0.2.3.ebuild 924 SHA256 b1c55b8b04195261f609eb76e69fdf57343c672e3b90a78b68e348250502f528 SHA512 4b7f1d38e66385c411050c09b55b5b20feb0a670fa8d7925d2d9cdba44e9e1d3e90dfa5921db1c8756a48d01e2dc57bfd3bec96b76c554ea91905a6cc7dd8e0a WHIRLPOOL e3ca42c9a71310e124bafb6de1f1fa3f5633ff30c329843e4f0f4880c9d993e020cbe686b0dddc533e01abff4c9b0285bc397ed8973a8d6bd01777d19428ca1c
-EBUILD zathura-djvu-0.2.4.ebuild 927 SHA256 7115126cb53d7b1fb4495935482a16efc8502f273a3da5acae737b30d44e1439 SHA512 ba0da73668d7c554922b41b3154a52c86ddd1c077a610cb7363d7c28df0ad4964c876823dd754beccbede54a919a99b1f5723d7cc4412525472755c063289899 WHIRLPOOL 3383360a80f8cd906d70df33ec8712b45b5e92d647492ef42343e856c8ede6d519f8fd6a6e84e5a7febc59cb7122a5dfeb723b00857b4ed8f2a69d2a2914f74b
 EBUILD zathura-djvu-0.2.5.ebuild 934 SHA256 96270684b5fe502f0c3a011c81c782d9abd24cbf5e7a812b6a7049e0eb03835c SHA512 bd98bfcd3f7848f543638bd771435a0d2172fd1ab11b3d545590e4604e727623139d6b22b0edd3e6567e382908c707ea165b4b882953feb7a0cd4733883be05d WHIRLPOOL 2eec832803732c43b4e557b162fc775f866013382a5bd6af5d0dc19240b7c2c6da3435fd5758f74e11f36f841f1d140895efc3e03f29fca06b955ef3dc65f202
 EBUILD zathura-djvu-9999.ebuild 934 SHA256 96270684b5fe502f0c3a011c81c782d9abd24cbf5e7a812b6a7049e0eb03835c SHA512 bd98bfcd3f7848f543638bd771435a0d2172fd1ab11b3d545590e4604e727623139d6b22b0edd3e6567e382908c707ea165b4b882953feb7a0cd4733883be05d WHIRLPOOL 2eec832803732c43b4e557b162fc775f866013382a5bd6af5d0dc19240b7c2c6da3435fd5758f74e11f36f841f1d140895efc3e03f29fca06b955ef3dc65f202
-MISC ChangeLog 2673 SHA256 df4a1f754d311f9d99e189a554e62562ecfd6af84c66b45f713d65fda0251fc1 SHA512 c011ea2e7dd776d779bea136f59d55805726d784e12204f8d6028561fafc348bcf54b7f8192d7d9980225bd320dd9ee6981615091ebe27029201e7f048065046 WHIRLPOOL b15a78fa41416f0425eea7c7fe10d29d4e15e1089ce3b33d5de36665077e1980518cfd6e7d520147a8a0508ba82c469d25b15a01ea306c900eb8a3ae73b76735
+MISC ChangeLog 2795 SHA256 17b027274df790ba4e20265d73c725c92c4c1fd8bdd79d24586e14f381ea6c4a SHA512 b25836853ed925b464f2865945d322abdedf135418bdf6d04d202543e3902e271aedb05777d71b7ba4f265ec3ac05657d490e2ed051dea6558a5c26f03329dcf WHIRLPOOL ead19624564a14b63b42ca23066e2cd9bd0592c29b1baf727648a4913fc406cc1b12f63ab6cbd0acd5489c7822ac57f24183fa6f2160ead2f9161dd27e62ef29
 MISC ChangeLog-2015 3924 SHA256 981c86ecb69ee279836881dac4eb47acb9922d31f79c0ecda67d09b07b831c01 SHA512 e216f2192c264500cee1c7a8fe9b999fbb55f2474c34b23a1cfcfa823d3114cef5ae90469a7a7385c41dd228a1fe4a3c619b600bf9fa0a2e5903d46ee79a7520 WHIRLPOOL afdf4fcddaec8ce969ea03694392a914b1ca1c06425efa09badea253c6d96c2a54503bd86ab1e15809c591b0edc69e34979376f16c2f460e0fbcbd78437a9c1a
 MISC metadata.xml 820 SHA256 9e0217250681ab384e80385d2e19252ded4a6c780c9ff6d40b561968179a150f SHA512 4be93e2de0186df8784d9ab6a4fe57b6a8cd4d4f3a482e6fceaa3b9b7960b12d23368b7609a9745a0a240a9ecd00397270c0b0f4bf5569db480eaee23defa802 WHIRLPOOL 5e922fcf779c27e8d6c8737ce70dda297bc2a26854d4fbf2ab0873ff43e48e6736c62500ed44786056f2da186970672e25fbe5c5a2c35d384219a253e3872057
--- a/app-text/zathura-djvu/zathura-djvu-0.2.4.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.4.ebuild
@ -1,50 +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
-[[ ${PV} == 9999* ]] && inherit git-2
-
-DESCRIPTION="DjVu plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
-EGIT_BRANCH="develop"
-
-LICENSE="ZLIB"
-SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="~amd64 ~arm ~x86"
-else
-KEYWORDS=""
-fi
-IUSE=""
-
-RDEPEND=">=app-text/djvu-3.5.24-r1:=
-	>=app-text/zathura-0.3.1
-	dev-libs/glib:2=
-	x11-libs/cairo:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-		DESTDIR="${D}"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@ -1,7 +1,10 @@
 AUX icedtea-bin-6.env 951 SHA256 c8b7d3ae752f678bc14943d3b0bf8ceabc606217b8a784062c607f05ee2acb16 SHA512 4c9664091c010e4ff210423f25425c3e44a78585cd826d8de160b971cca79b019523dd4c0d852d8029ac71725ec9fb22f57df26959907b3b43cd9d919fa7a67b WHIRLPOOL 31eccb51e5313d64c6c2ae2df1d2ec561ecba6ad102e8e378334fc3e2f8baaf875dfe15ce8a8b90d013d6a3c78a10ec8e9733392563ec1100c7bd45e6dbdd262
 AUX icedtea-bin-7.env 951 SHA256 e4e0c4281aa3eb65c99459fcaa00c94b25c0015ce6e5cabe0f24a44a20355dd8 SHA512 f2eddd6e856b5f7127fa6d9dae6c89b08a66271553e56889a2ee48b6fe8f5df198042633bdf47085594db899f73a2956e8d63445dbfa0429cd8361279df3c3f6 WHIRLPOOL 4b8b08793af0a62d8a9ceda3a5b55e58a59a03d9f0d22df27d1a75b96be95220dc0e2e00365f57aae75d43c3f6b16badf84622da121d766062e50aa26efda08f
 AUX icedtea-bin-8.env 930 SHA256 58631bc843745e150055189a802ee8fc99f2f61f46aa310ca1c085c662d96def SHA512 ad07241e2aa2838f858ec62f42730748eb323d6122f6e40c1bd083124944b49a7235475f1909fc6f625c930d771c0b00c7784c57ca2e7906e2888063e9f1bb5e WHIRLPOOL 88caf649b7869b06c231f5a9ab0a51569f442f9459865c63007e8cf22366f590314fcb0c2a8e3d8475add51f538ec24e2766339ee0a472a8f1bac25dc5ff729c
+DIST icedtea-bin-core-3.0.0_pre09-amd64.tar.xz 56906864 SHA256 9251511101ddd520578b7a737d56825810f66dd3789b3105d2f69d47e20ed4e0 SHA512 5d4c6dae4c5d0da6d8c05cfcf13183f03bc26253e5d3cc134a088769d651292071acb0e00c3f6427222db3db31fe25e93c4693c800e03f7aa92bdc714647ec05 WHIRLPOOL 0395ebc3bb8950fb70920cac9477c43b1dc8a5294742ae21899c0aacec3cfa640a4d2a9c369e533b16fe3c9f31029417d3d708099f65c997c8a86a078b5ac905
+DIST icedtea-bin-core-3.0.0_pre09-arm.tar.xz 48944988 SHA256 d54bf1c9d4ae4158af928ced84bc1c0c5e1de4b7788012ab1f67568680d47334 SHA512 7a1b5169124a63294f19a1de9e126901c4c88c6af8221fee55adeab4a1f8f00d68736bb003122b1bb5f780d7442a6b5bd7739b837b79ab4964d410fc138d4c8e WHIRLPOOL a1f3acf8bd8ba26ad2219f3d3a6dfcd73a0ccfdf9e11b62072e6f213218e0b0fef1e26b3be3f56e5b980cb7768e4a8fa16a90c34084a1060d753edcaca69a545
 DIST icedtea-bin-core-3.0.0_pre09-ppc64.tar.xz 49946420 SHA256 363b17b13a0608e39140316753805311b4c4132c6e7a868072ef37bb8d727735 SHA512 36932e613aa896588dc81fcbc70f85a84c836290ba86376aa9b13f45e2c1b65b0bae0b9c18428fdf814916ab96d46130baf7ba1b8113e44f5c36c802304b9f44 WHIRLPOOL a7d41789ea73dd8dc684e9fe7e19f969df26b885f9339c99f5adea136715aa8061e4ad2ca3ae4b180649512b8b48c03070365c249721206d37e214dc4b1f1454
+DIST icedtea-bin-core-3.0.0_pre09-x86.tar.xz 56347004 SHA256 c0c0db770f78877e14e5c91d0ce9f0e5f1b6c341eafdcbbad47dcc336e1ee3d2 SHA512 7f245fb2e6242d5a416f988ee79cac894a2b4736b73fd5f4985bfec83de919c8d3904c06382b972ca1645bd8b3b2e44c8b0b3d10be09a290545d03810e3cd0b0 WHIRLPOOL ff11fa15cb9eb301145f96edf3ae9ef6f15097c88582bf1bdc0cbd2ff1a33b5e64bcf9d3b96a2a5b9f4112fea901986775b2e2dc348b5087a198ae6cade95205
 DIST icedtea-bin-core-6.1.13.9-amd64.tar.xz 49472280 SHA256 3faf62158a33cf1021f63f137a5b35c1c04bc4366d40d7288a6745911bf15034 SHA512 237266a1843b5d1ed0b4553fa36e88d7dce7f6a9bf6e13277d38bc83bb85cfac9b031ed5b362e73e5bc24464893cfdb37bfe67fcf3d4e218a87f101ab56afae7 WHIRLPOOL dd067ee66e2ce7ebbf08d4187d4699198d9759d6571c7d3bf127b7c8ff3a8eb1bea48bf45ed5d480df8de7320ab4f9a00ed6608935f2b3b794a99141568aa57a
 DIST icedtea-bin-core-6.1.13.9-x86.tar.xz 50947228 SHA256 fbef618f82fc640553bf69383ddf6a4ffb4da5191426d040f0186538fdb3ab2f SHA512 04a066493a0e742da0508fa7e010e7663e73a48e0663939884d22a2f7fa4d440d3680f6a38d7909b2b2f569bbd35facabe838a275cdd589556570601484d443c WHIRLPOOL 9e144546554bf0de5c7cc280fe20a3cd97554d0745b071d0c3f5f97a394556c71246423a39d10de207d0058889ddc010fd367813f4d10fe888d49924b4d7bac7
 DIST icedtea-bin-core-7.2.6.4-amd64.tar.xz 53010708 SHA256 16e33d1f686c657c9b16c63d206bfbc6b079dd2112108f4205057e6998291345 SHA512 ee6674d99d2ffcc9c9209eb22f9efc0f2ff4a57e1cdf6763de7ff505e312cc740068a68c4ad77ff8f9941ebc5407cd2b3cacb17dda22fefb77c9a0dab4ea66a6 WHIRLPOOL e86c06eefd6f7eb605c7a39c6865f8eb56260febe595527cbbd6db41ea2fcb7c0a65bb60846dd2bfaaf6b2ee3548297a0bb3af61df900d10b8c5a7605d95737e
@ -11,7 +14,10 @@ DIST icedtea-bin-core-7.2.6.4-x86.tar.xz 54661536 SHA256 9329914ee4a6072afb940e2
 DIST icedtea-bin-doc-3.0.0_pre09.tar.xz 11648012 SHA256 98e2d1940a5042d5ea9752a5e2783f37e7996cccad20e84a499838a929681f41 SHA512 f577153f2158a6a8984ff21049716981c5ec6e5a524c81d516890b5eef55a457b1071d6a1a05e7df19902a0e6033eb96a4c65f9927680903162c2abae1283ab7 WHIRLPOOL 126e967ae2298951f1b090152a3833fe7ebc1defde34267ea19c613c69fa72d0c4ac566c4b63a9515e8bb0e7b16d096b827bae5e0e099140c806b21e097b945a
 DIST icedtea-bin-doc-6.1.13.9.tar.xz 9853020 SHA256 94ff85ba64be5c8cfcf261cb6293e48cc3239c1c9da69e98fbc744a82620bd16 SHA512 501d483dccfc349c6dd8a55f9d509d2859774054be9b9ca8020a75e3975d740d78d40184aa86f16b5ea948e16b74944ce4d890396d8ccb5209f7a9514a8b649a WHIRLPOOL 751afbb1e0e2384419424d9ae093893c2e377c004c69d0e06979385823f743ee33321b3c3076e0c8e0b16625a159293d81f959455ca6ee779dfdfa5fc5361907
 DIST icedtea-bin-doc-7.2.6.4.tar.xz 10603692 SHA256 07e1bf90c61b56bf311d528891f30ed0cd67f073e6019aa92c8907c86bf1c6ac SHA512 6c97c37926989b1a36bb1fe9712caf6270c539646aeb76d30a10e9479ecbf734f2f56ef934f774a9cfe4d713651fd0b8c99872f6651f2d7e3c86a18294f9ea79 WHIRLPOOL 023eb8ee8851882101cff967d7ee58f69aa569257f113e512faef2ba3eebf066f01b80440cfbb59c7ed67b36630426ea88300724e7348611ae80c498e5da8b84
+DIST icedtea-bin-examples-3.0.0_pre09-amd64.tar.xz 1811968 SHA256 2a497aaec02378dccf7141dccf926afe43f6089832404f7f3bb5e4152ebc67c9 SHA512 c87d7449d556be739b634c44331ca51eb975c8ebb9c3932cf463969898d7ce41169849c1c52273d40ce9701264a1292b8fac45eb81302ed2fe65abc223072719 WHIRLPOOL 581aa58ecfd454e4347aa8733ca12fc6730a4165ac2eb494ff86b061aa3ab5b887abe812f837f4f3599d8f9e351e3b332d276bd6454b1cf0f8dcf9be69ecd8ba
+DIST icedtea-bin-examples-3.0.0_pre09-arm.tar.xz 1794592 SHA256 ad6ab000a0f727a9ed6a6d2b9d35ab553a261586af20238698fed75e33f1027b SHA512 c15ab276a4534b741111cc1628e5bb3893f1dadd03b18c084ff48b41d1a5426060aa63b6025bf9d9e28f2861c8789ba6e22ea4b70b6c401917a70fc7df9d017d WHIRLPOOL 2cd72d7ea034e0b775c3ecad27025c77c4ac01de7e5040a47514a738ed11837099c04dcffba8afd2b0de60c9210ef834a3bd3af8b3b1cdae5d026ebd3175e4a0
 DIST icedtea-bin-examples-3.0.0_pre09-ppc64.tar.xz 1804896 SHA256 8364f463b5a424a7e60ed724ee90b2af0ad30ac6fe2616a96eb5969893474d8e SHA512 dc2feeaa920145f007c29d17ee0cdb6de9d316f2515c2fef4ce5a4db1439895c2fcd7802061ef37e1655bbd617b26f3391ac73574bd75980697d953df6760b59 WHIRLPOOL 0c412aef95eec0c5b0ed2164c2ebb6b82cf9ba98fa830414cbb71227d18f66ee53deb0ef3bd299c04f3b9101aead027fdc783dbb618be4306cc091fa894df07a
+DIST icedtea-bin-examples-3.0.0_pre09-x86.tar.xz 1817136 SHA256 bc3c6adee9d2a50f98bc2262852859252b52d61ecfc55610541cb765f401191e SHA512 3c8e671bdb2e5e0e52a5a15db38e99b7dc79198df05cd630e0cd10773203e41587956b05e6baf7c0dcc8c277379f9e531513eaa87c44df207d559e07b8e35cba WHIRLPOOL d4465cd26ff220686e4ad6e949b0c09a96c75ac9d8978fbd53e2c78b5fc56ad52a143cc2f099a058c92c9f1eb565b9ae8fc7776aea3134dbedd6425770540ccc
 DIST icedtea-bin-examples-6.1.13.9-amd64.tar.xz 1904980 SHA256 aa10b253ba35e14d83852c80999c04bfee7c6ffee7b1baa9df502e253a6a87a1 SHA512 f9be25093aed5b762a268a5fc2cd943fa010bab469e1fd0cc9c39c927a9a154041e637036bfa804cc826f1c674b661ee6d4a5dd7d29820df1de4390db403a229 WHIRLPOOL 121122c84abe3ddbddf5faf6e163ce9a34331cdddfc8cd0ca746d8ba94a79af31c1dadba711aa4bb709edd91605d81785de4fe4ff1e3edd526d4aff592b18816
 DIST icedtea-bin-examples-6.1.13.9-x86.tar.xz 1904548 SHA256 1aaaaa4ba6c37b5f03ecea8a978c9bdac371e5891dd02459cd7f4174286b182a SHA512 fcdae8dc62376f60a19a3de1fbba867fcbcaa069b5d669120e53d1792119a147566ce59e3e3205ca1db0afea3e6809f339a4a443ff0d21cb1a7c4aa8eb5060df WHIRLPOOL 5625b1af755e79c1e4360ac3fcbf786664525c9508f6fe902788f95a1be9b94d429a61ef0e475fa9d0e2c4ea386fe251a299305961e7936f932c8e2c0abcaa3e
 DIST icedtea-bin-examples-7.2.6.4-amd64.tar.xz 1796924 SHA256 1cba4146c597bd9cae873965b2f198fa944a368fe4bd39deb0e0a06df8638143 SHA512 10be9af6a44e0e10fff7df279e4c0912df4f53e48b6fbb3891a1f9b72eb4ca7c696019eee780ad7bfd2cf9001e8acdc44739ba8c95706a46e33278e104c1bbbd WHIRLPOOL d5272f7a711dbf69d976b83623b64e1f55cb1d459a081aa5c71dffb585675c2b05b00798fe034007e7f58d94f7dabb0c8a47c9ffec740c2d55bfbfbec35326cd
@ -21,7 +27,7 @@ DIST icedtea-bin-examples-7.2.6.4-x86.tar.xz 1796620 SHA256 16591cca92ef9470873f
 DIST icedtea-bin-src-3.0.0_pre09.tar.xz 45635304 SHA256 9138300b1ad16e7c5a300887f621093ed38491cd80231cd90c77870459c09d18 SHA512 e81faaa8bf9eda613dbd9be6880b5c3bf99b7a466a2c48c6082f16f8506cdd50664177d0a66b535e5aead6e2836f4f886fb9700ceb2f386239013e845b273498 WHIRLPOOL 978b51c8583883965700f3b6d793e0c4c66e089fe8c79794aec7046ea261e7a425abdc4b0688dda8e46978800c3a1e345f5861060e3439b7b0a52aa74e70d021
 DIST icedtea-bin-src-6.1.13.9.tar.xz 39778948 SHA256 11ed522199d3919f7013f4d3d4fb2324d4505ca60fdbcb015faf635c4dfcfc70 SHA512 4c02e7368ed21882afe68cbba3475a16a30276110282d28984586f1c1e0c3d14278e70e495fc74676ba57df3849b8f60ea24da49c6f41070319c46962f1a221a WHIRLPOOL b6daed3717d434688e8946976d96857ce904d510cb45fc30b464e86d1c123ccb2a81ee07bea432ad6fb5148d1b0a73bebe7f51a0bc2f5b1308701a4fce436d79
 DIST icedtea-bin-src-7.2.6.4.tar.xz 40039764 SHA256 62f0cc8dee7a518c01e3fb1cc821686440171c67e32936faedbfd57500d7a252 SHA512 e4e208766f35b9a0d720c5e853bbded04cc38f5f972ff83c759786bdaef43e5a454361be61f677ff57686007d9e393e15345ba9577abf189f94ebb6067ca885c WHIRLPOOL dc9102f20caf079d61a816ed21c791348fe1717cf4424d5b5b8e1928010bcee7eab885bf44a438934ccf6562f1f8b6259a31f45d32b1bf752e893e1153c1cb0e
-EBUILD icedtea-bin-3.0.0_pre09.ebuild 4627 SHA256 5022187d9a372fc1f1b4893bab8952e225e0b51675e83b813fc66c255ee83780 SHA512 2010b78fd05896aa695e7dfca1f84e94b3830e365e4bc79ab6d51ac2149fbf09a06e38eefa371848a3b7bc3b8dd1a04c065ff86f4cb203b0a32617a7bcfa18f0 WHIRLPOOL e6a18b9c6fab2841792581d4a51222867826a276c158ce62271332165b27a9b1f343ac93ae8559a171209223c98fa9f2815bcb57f3be8e7db534e3787d516847
+EBUILD icedtea-bin-3.0.0_pre09.ebuild 4658 SHA256 5b5b92a3a3b37734847811adb90ba95bc0b9a97605205cccd842906ea7f70f68 SHA512 aa37c8f792eceb387c0f6fd58aa2ef162cc059243c4e29aeba8dbc35c4b923947468848780e868748f6aaf80c81ea255eb378ff0bf9b3cceda7de9ae36ac75f0 WHIRLPOOL 4298e1b8aa11ec9daa1a4c9ca46da1f654d302954f854f896202c116706c1d42baf4a6e069a4c7cf946af9245b8bc9cc18d20b7b9ab7fe40f0c7191795875cb3
 EBUILD icedtea-bin-6.1.13.9.ebuild 4792 SHA256 e8723f410007460e409e3f46d7f0d15a9afc3b96f8130451c2a91666146e5c55 SHA512 923f89249b6ebe992f7552e5ad206109c7e87e2c299046173a3a6ef1f1c79b9bce3542814bb091de6e1751f9b56ad97ec8cc84cbc1ab3c104c3dc8c18cb180fc WHIRLPOOL 0d9af2e6c88892cc61a39f02fe2a8ca0e1b9382e33c393fb6931dd3660ce9596de3994bc9cc560f781489c7d30f676b51774913dab988525bd3b3567e7aedeb9
 EBUILD icedtea-bin-7.2.6.4.ebuild 5623 SHA256 42f76322681160d12d323cb36bdb3ded694711c0dad9c32485b23deb0e78b4e7 SHA512 e92732b0c916a946a3ece6a6c499afb8d209a644fdbe7063612ae44ff2bcf3820c0a337d29a9e758303de2c7fd7138a56e5edf007b7d04f716a160e583b58cee WHIRLPOOL 4223ad33d5ef2556200ae28b46d6e7299476b07586db932ffdf7bb3a4e5b58d6e6b81c5766614aa25deff19bfe47e3403b756da82aeeae604fefe7d0fadf32fb
 MISC ChangeLog 11352 SHA256 a46b3cf616e75c89c05635be4d166f14b397bf4d6d8322e49d85029a3dcffa82 SHA512 45453340770b25cc359b7d2043650165bbbb4666c8bf9e39b24ae0e1dd013e1aecf20c1b150358ca242e1550ccee24ed023860949da0159952c375c4f4181cd8 WHIRLPOOL 891277898d6a7ea8d7396e269e090f2584558911c3f5d82954939b9878a50cdc6de9fd45413226220ca5e2b82daa17604053ca6318fb9abf0b329bbf47b92ac0
--- a/dev-java/icedtea-bin/icedtea-bin-3.0.0_pre09.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.0.0_pre09.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="http://icedtea.classpath.org"
 SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
 	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"

-for arch in ppc64; do
+for arch in amd64 arm ppc64 x86; do
 	SRC_URI+="
 		${arch}? (
 			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
@ -24,7 +24,7 @@ done

 LICENSE="GPL-2-with-linking-exception"
 SLOT="8"
-KEYWORDS="-* ~ppc64"
+KEYWORDS="-* ~amd64 ~arm ~ppc64 ~x86"

 IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin pulseaudio selinux source +webstart"
 REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@ -1,4 +1,4 @@
 DIST 20150729.zip 52114 SHA256 62ecc38b4b86a2d864123f1d68ec9e898e250ea2d4c0798fdff52ba79db52c38 SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c WHIRLPOOL 393a81436e9441b7f0b6eeacf45323c306ffc623c15bb786c46431893318c128e4ab48b4ac610480897673ced33e7706a65a68107d42be0b58a65379db886624
 EBUILD json-20150729.ebuild 683 SHA256 7087e2a85cd0d5d26dbc557cb60d065355daf30d33d0be4f1a33d58246c58bda SHA512 6e9f7819251bdb1c4964b45f2f94c08ac73ca92c28bfec7b061f2bddbcefd5dd86caa7dae2dd793abf29b20f42f44ea58727e8b2a98444240f04fbb515b8ded1 WHIRLPOOL d771b82cef28e1f572bb98f7342194a35090a15bcd5aeaa4306956de7015efcd5fded0a0c2512875fe27bfc14e3c9664c9fc9bd0937a6094d87fc70a97574442
 MISC ChangeLog 1135 SHA256 05e83ad526352e0c4017f8e1f36a37dac7465125c6cfd091157895bdbc18a562 SHA512 e3516643185ade88c16c9fb43a385763642580e295a87f69860ac4aa195d2aaeadd12b68f4c49dc7826450a4dea406c6b590c6955f82e458bf3c921ae2d20d55 WHIRLPOOL 0a1f542d5151ef21b0b04a1dce33ed85f2be818722598d28fcbd1f5925359896f33560cf25e98448356c4acd60ac9f1b09636c41a44249ba2addbe2ca0a9c855
-MISC metadata.xml 455 SHA256 c22c13997841b3a4daddc6681a993389f7841e22186b2c61656e2dfcab7b7e86 SHA512 07ecdd2d820570e90527a221bef39915d7056cf89e7ddc842a2fa745f2b4af4a2d44b442698bd80905981e4f54201f2404838714a9322cccac9c74a0526bf0f0 WHIRLPOOL c41996fc188f39bfca2aa09d1e3c91cde68a0552630b6e78ba77295a81b02f870ef49a62d963622d9984b936ed03676caa280d99cc1870f46ac13ac67078534a
+MISC metadata.xml 454 SHA256 7b4c49ff63003ded36ec1360ba04b34c38dfa26b21ed157be245315717565d70 SHA512 18ba78f62a286b7a86d2dd7f2f407b145946e5b79df2554d3252706f38162e562f176105746dd028ec46f50dfe07e00fdbc6a37ca31a7ea3d1093e069192b2b3 WHIRLPOOL 6891bc715fdd42e2d5f33b9a69bfe174ad2f8a09c50ba9b7c2651b110cffaeb985b9d516761cfb62d1ce457808d5885b6d1a423c278d92398af40e0e076d4d1d
--- a/dev-java/json/metadata.xml
+++ b/dev-java/json/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<longdescription lang="en">
 		JSON (JavaScript Object Notation) is a lightweight data-interchange format.
--- a/dev-lang/lfe/ChangeLog
+++ b/dev-lang/lfe/ChangeLog
@ -57,3 +57,10 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+*lfe-0.10.1 (01 Mar 2016)
+
+  01 Mar 2016; Patrick Lauer <patrick@gentoo.org> +lfe-0.10.1.ebuild:
+  Bump, thanks to Michael Kuijn
+
+  Package-Manager: portage-2.2.27
+
--- a/dev-lang/lfe/Manifest
+++ b/dev-lang/lfe/Manifest
@ -1,5 +1,7 @@
+DIST v0.10.1.zip 296228 SHA256 05de4cd5a15ea37e505049c5d7e9c75fbb61ce1bcabec39d762df3dbeda7d814 SHA512 94719b42ecf6dc5505ea649df00b255b1e901d6104426192f34692e2f7bc85940b96b39fd1bfa00577b63c17e10d8fd51d3de743c02d8ac2263abe2fb47d4498 WHIRLPOOL a3c4420421afd45bf6a0908a3a0f42319a094d4d186636eebe5f58b4f2d11192c0a7cbc6eee7dbc1aa48f326fed8c1869932e4d277c41387f790006675f4985d
 DIST v0.7a.zip 216133 SHA256 c494135bf50a8dd62723e026a6b4cf4c5c4d6b8a01e59b6e41bbb6daf5c25dd3 SHA512 93f1b0e81275af21d3dbee73f364f4b67d4ce2d6beb7fe2c17e17d5f5330ec8762d63978ae291267ddd92d311b2ad7d2572854b5e3da9c884f4c706e23551aaa WHIRLPOOL 44067ac8e529d54e66cb18d0ae11c3f7d3a489b530f995e90eb000aae9e212ce79abc57388c515a681265a0242f568ae7efb3e1307e937c3aad55438b6d7b0da
+EBUILD lfe-0.10.1.ebuild 749 SHA256 0743cbf0fbbab63f24d637838b6041156d4d203b896747d0d29845b0d07a6b91 SHA512 1511c55d9032c9f26bbfbb96a5d1ca43486d7759756787e5c5969320428a5dade2ac87dbd33bbc4e2de766eb5fe0b2c34ee71d72a4a21fd84cf948c9669ef10d WHIRLPOOL a0100f584e4bf52076b680cf8175ffbb710d118dbe1b4e615d1606128aa20cffed7f6f22940c730a081ad4bb59bdb83f786b3f4049d68749da06cb09ab5cad70
 EBUILD lfe-0.7.ebuild 641 SHA256 e1b5248f039cc5b25914bab042db899226a8c27d6c4bf0a8ce5d7ff7e63fad9f SHA512 c1546696d107ef53458ae6e30130caa9aa00775327fdfe4c7d3ccc7b29445600911b980862fd0b9b6e400666ae869b035cc1e5918531540bfc15ad2460466273 WHIRLPOOL d620f5786b38d54ca109aac9790efe7e13ee1fe63390e76579534f2588c16ddc6e822a41dd23ce815146ebc0854ef97f597b61f71538dbacf2a8346426f2f684
-MISC ChangeLog 2160 SHA256 3164cd3254e0eb6c1015a88417bb7dbac7f7f0e5e45164098a92581d9a0d2f75 SHA512 d4a0d5548a4e9193b30fcc5a7c2dbd2698c4a9f8942252710a0ac7892b4ed26976ef025f8c17f08d3389ede219a00e6bbf0d040e6b26c2be3b89a8715e1519ff WHIRLPOOL 24e677e6343a34199b841409c2b12e5aa9282c8f8b972a3126c53d8f43ebed57f58e532b93ae580eb63416e23cb1fe164b976c404d065d8a32d235fba239a02d
+MISC ChangeLog 2325 SHA256 a477155add960925d319e7dc57ad1080e55c490f299a419c1cf30285044539b9 SHA512 18c6a28c0f4302d4773ea987ebfde88674727714d8f29abf714b011c558975272c6fc10141b387c627d911102ffed290927c9fe2a1167060f2c031e510a83912 WHIRLPOOL febff4262ee9381c901cb13aa4cc200f18b087985f401afb89967e1ebf5417a65274fb23305e141e95b4a830914668110c18a28c79273f8c596bd04fbedb0d1d
 MISC ChangeLog-2015 438 SHA256 611a213c9a2fcb154a2e1f9f20138392cf14dcf57def0cc3f2ba9fda03ce80d3 SHA512 7bb93531e2bbb3a05591b9cacaca6aa6e9f25cebc8521b48f4ce3736fe51d604695d93b9277a5871ffe0095441c0bc38ec4eed4871db77cbbc4bdd3d004d5111 WHIRLPOOL a24cce99a0629ad8041ddaa03a97d131697d03563633c46f1366c459404691f2543e5cb6a483d4fceb36b96b64df363b7294b6bb23d04f601cdd76d642afd6d0
 MISC metadata.xml 334 SHA256 5c05720d6616d097793829d572525b9fdcb3ba7b74c50897124eab230ad733e1 SHA512 ef130013e56ca5d9df4312b106383b5d3d8d889f767ea24125e1a9ab11f555cab661c73ad190c7c0b4d7afd10a1e6d3569282233b4da4a76c7fbf1fc6052c8be WHIRLPOOL 071b99f06023e0b8ff62f1cd572ca5f80bca6e7e3690a8d85acad6625e17ddc4a16ab2ed7975d34474f217fb8eacd8b3607a249cdf4a1e96031788535260c33e
--- a/dev-lang/lfe/lfe-0.10.1.ebuild
+++ b/dev-lang/lfe/lfe-0.10.1.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="Lisp-flavoured Erlang"
+HOMEPAGE="http://lfe.github.io/"
+SRC_URI="https://github.com/rvirding/lfe/archive/v${PV}.zip"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/erlang"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	export PATH="${S}/bin:$PATH"
+}
+
+src_compile() {
+	emake compile -j1
+}
+
+src_install() {
+	dobin bin/lfe
+	dobin bin/lfec
+	dobin bin/lfescript
+	dodir /usr/$(get_libdir)/erlang/lib/lfe/ebin/
+	dodir /usr/$(get_libdir)/erlang/lib/lfe/emacs/
+	cp -R "${S}/ebin" "${D}/usr/$(get_libdir)/erlang/lib/lfe/"
+	cp -R "${S}/emacs" "${D}/usr/$(get_libdir)/erlang/lib/lfe/"
+}
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@ -122,3 +122,27 @@

  Package-Manager: portage-2.2.27

+*ocaml-4.03.0_beta1 (01 Mar 2016)
+
+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org>
+  +ocaml-4.03.0_beta1.ebuild:
+  add 4.03 beta1 without keywords
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
+*ocaml-4.02.3-r1 (01 Mar 2016)
+
+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org> +ocaml-4.02.3-r1.ebuild:
+  Add a 4.02.3 version without ocamlbuild to prepare for the dev-ml/ocamlbuild
+  transition needed for ocaml 4.03
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org> ocaml-4.03.0_beta1.ebuild:
+  restore keywords, it is masked in package.mask
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@ -3,10 +3,14 @@ AUX ocaml-rebuild.sh 1120 SHA256 893320630726c58ea3b501ef16913c150c50ea9d6cd38ec
 AUX ocaml.conf 177 SHA256 b7f7ad0ff15bec096dcb87265d87f9b0ce8f946d4a2676dd7638ca0e14bb05c1 SHA512 4f0a48b8101b77d568d8d0a852f2a21fd46b7947c5d3f975ee4cd8a9c37c993d689cf5fb53b54a6b2740cb865051dc50c74c0c373eb697fca800ca143d401aa4 WHIRLPOOL d25c9ac2a565a5384c7f645be433faac192e4c41f55a08d74e99ec022ce06132a560070bb4771b261c6f023d3aec72fddb47279d5ab2cfe8cc93c70c97ff16d5
 DIST ocaml-3.12.1.tar.bz2 2949124 SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7 WHIRLPOOL b7bf4844452ab52027e6b785159df6e4defc548d2f3d31eb73dc0dc05214e7c19ed654c8b3ff234a85691599df0be568ba02fafe257856be7f603177584a7ca0
 DIST ocaml-4.02.3.tar.xz 2058552 SHA256 83c6697e135b599a196fd7936eaf8a53dd6b8f3155a796d18407b56f91df9ce3 SHA512 a815421f6a320b18e7f351bd66884024ad4a33525ba161a198ea356892ce331be6c1ddf4cd07d120ebe9a902bcf815ce1b17e45f405e4e0b2d55ce1b6d2adada WHIRLPOOL 1104cdcf23b773ebf0c0ef8d8ee36b2b4b58b1fab10a41ff7f2d522c34ae6161bc6cba28b279eea03ac183a111fc332557084b017d0c2ad6f9c969204e309597
+DIST ocaml-4.03.0+beta1.tar.xz 2277268 SHA256 ef7e50846b101229f0c2a3a3699c719400c90f1ecdf7d4e038459612e9de6116 SHA512 9d02bfc5bc1f0d412bf026a826c6411ff96c5fbb93118c64103787a17279c42fb5e4f51e5a0e54580f87a9e4a5ba0db536549ba45adddcb974efd7c8285f0a5b WHIRLPOOL 7e68702fd64a14e4ae7221d48ef9baff4e4b2850812002a067711a248c273406ba74109ac23ea78fb2a3f9cb0ec86b9490a50530105d908500c1cccfc6290717
 DIST ocaml-patches-3.tar.bz2 4101 SHA256 c4ceb604f4480c78d1cf4f848b0903c8d37798d9761f582d8d1643d4e38b8658 SHA512 8be5c44de5a6b0b7c14723e41d92fe807b881b218cc5eee38ea7519c0f971415cb7fe30035303da275089dcb8a61c4f334c4a88e0bdbced3953503794b8308a7 WHIRLPOOL f1920606785702c44dead01b1426145653bc1931acba2d614c6818baddc051e4f74ca0322cae66ade63ba0cd0df5651cfd67f511fca5f12973b67a0c50ebab6d
 DIST ocaml-patches-7.tar.bz2 2194 SHA256 71e9496af89ded9852d8e1f32be18a5f0d7e11270958fb4bc8c588420b1e9156 SHA512 63bca96f009e2de24ff6f7a4b37b97c5b7655d5ad6196f06cc2b18ca213e87878a310d169378c341c00aaac698530e458e301620bcc21284bc8b9ea143f642dd WHIRLPOOL 02d17436f901c70b2fa8a104d8b7a6526c65ab9b40408b549c4f4dfe7a1eeae8213620d151fb181833782504e4d7cb6fa3ff7ddebe77efcb88d32fe057cbd8cc
+DIST ocaml-patches-8.tar.bz2 1803 SHA256 bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512 fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411 WHIRLPOOL ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
 EBUILD ocaml-3.12.1.ebuild 4034 SHA256 8a5381eb139b3600f1b1ff24f239d2d9d3008cfd722de14cde54a9c624d5bd00 SHA512 19c8976aa00dcdf8db6aaf10b62d19fdd4f6bafba245136e2bb1c8f3602360d41206d57759bda1ca53131a1fb2008d37ff14fc37a342ec0ecae553e328369043 WHIRLPOOL f67a1ca18bdf7d9d683a9e0b44b33c15ed354944bc429af3e03604578433f5b5797a7b5a31873aab2c7593d83de4879c5ae9eaf8309f5dd36ac8a316a44d5862
+EBUILD ocaml-4.02.3-r1.ebuild 3302 SHA256 96c451be76b21bbc263280ff45214be2424df0c97e8f11059d5769dbadbf5370 SHA512 5b845cbf6810d228f045f214054d8517c7faf46ad86470e32de0f1d25c1ff03b1c8d86534b503e86f3200178d80136139203eedd95b6ff6b59d346b597d79ea1 WHIRLPOOL 0cad3289553204e17ffec6273a0e38e6469295ab947f9ff2bfe0fc8f385ef64b383b525b9c7db8a81d3e41c9d599146cf681f896050e214c023eca8b7719173c
 EBUILD ocaml-4.02.3.ebuild 3272 SHA256 74ff433b98a5722df60f88693e4bd6a47e6658bcc98266dffff32504b00876ab SHA512 d4f33170de6c60e18efcb30773ddcc5c978d301cba7fb282ea3a3cf79b7b27b172fd6fb9ef1c2d9e0b4a26626ac030d922e16ce226050ea2650eb58d455efc05 WHIRLPOOL dd91655ebac53435fe1bd25d6498f3c41f5f7a01ef4831c9f0a2a1b126a8e39075d06b22b239827b7ad40bd848527c84c7c702b8955e91cce9cef3ba17420907
-MISC ChangeLog 4280 SHA256 29c8bb7321d4d46dfb6df17745cb6debc422ac03d1d2a884d1f982a20546f499 SHA512 0e08e6f1a138ded91470cb1e5368ddda79d18178cd8422e72c65198064572bfa46e45d5516b9d3f19fc898a80f1e42e68ff8d33fc770d9bc4bf4cf7541accf28 WHIRLPOOL 1d81a5858948635353654a8e05556b647d92c3d04228ad016fa0c53053f362f9ac9b6ac4608b9cdfba5c484539af32f5b83a5f41201e0158e248fbaf5934accc
+EBUILD ocaml-4.03.0_beta1.ebuild 3279 SHA256 f90fa468167b9ab3052a9b6c2e4057a1d15c1b754d38202518a030760cb6b132 SHA512 aaa47a159fb8355107186d62516f8c1cd5df3fbea5ea7f48f9cde3569dbe544d3e47ac63f4532bd343a8bfdef600d9ab50b086c7530f6cf4cf2411ddf70369b8 WHIRLPOOL 06416d3328b2ec9a1c461c82c22e932c8385178ffe34447761c8024622887dd5ecc151ad0cd21421518f31c5cf0a3871b87ae994bb040b5145b21b2a8d2db617
+MISC ChangeLog 5052 SHA256 b8a6871ab67318e0dffca477147dca340dbf6bf651ddc9aad712e6ab2849bdf1 SHA512 329da94fc761cb21460d67f1ce2fc0bcf011168fce78e7468e2355e6dcd7f115c6f713117447dd1f5d8c9efc6752cf186a6558b68b92e7851ef16767dff51cf9 WHIRLPOOL 6a698d639903780e91345e1cdfd6b7decf1beb61d479582418ef33e0bef1015b974a827cd609000d09d77d549692fdac892f527c0973c5da8d8168b6da88dbc7
 MISC ChangeLog-2015 35188 SHA256 85b9f07747d3a242acec77142ea296133a59bb9d79261d6960cf1e407a1ee2e0 SHA512 3658b2c40895f5dd5b2a74f01aa27bac1416ac2abfbfaff9176331cfe6aff3a4a81e62e222c85a5bc9f36779ca2dfda24c64fbc9e530cbfb64a0f1d221954852 WHIRLPOOL 1108b78932d6ecdc15624297ef6165168956587db4cd0c804e63554daede6be88f76860c76bc8de78131c0d10b9c344406de1eb93205765f08aa7644e4dfaea3
 MISC metadata.xml 243 SHA256 5e9b58b0b795266f973d066675839499e3a56d7d932d702404a4b91ded8eb26c SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449 WHIRLPOOL 085df2e84901cbe563c7c1d30d04c229547f15f8ee26ac61d44d07c3f6999f2bbfa4cf309963172fb507cce5450d27598b762c3ccab92351601965c3afc05e3a
--- a/dev-lang/ocaml/ocaml-4.02.3-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.02.3-r1.ebuild
@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
+PATCHLEVEL="7"
+MY_P="${P/_/+}"
+DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
+HOMEPAGE="http://www.ocaml.org/"
+SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.xz
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="QPL-1.0 LGPL-2"
+# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
+# so here we go with the subslot.
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="emacs latex ncurses +ocamlopt X xemacs"
+
+RDEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	X? ( x11-libs/libX11 x11-proto/xproto )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+	xemacs? ( app-xemacs/ocaml )"
+
+S="${WORKDIR}/${MY_P}"
+pkg_setup() {
+	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
+	# results in relocations if gcc wants to create a PIE executable
+	if gcc-specs-pie ; then
+		append-ldflags -nopie
+		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
+		ewarn "We have appended -nopie to ocaml build options"
+		ewarn "because linking an executable with pie while the objects are not pic will not work"
+	fi
+}
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+}
+
+src_configure() {
+	export LC_ALL=C
+	local myconf=""
+
+	# Causes build failures because it builds some programs with -pg,
+	# bug #270920
+	filter-flags -fomit-frame-pointer
+	# Bug #285993
+	filter-mfpmath sse
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	use ncurses || myconf="${myconf} -no-curses"
+	use X || myconf="${myconf} -no-graph"
+
+	# ocaml uses a home-brewn configure script, preventing it to use econf.
+	RAW_LDFLAGS="$(raw-ldflags)" ./configure \
+		--prefix "${EPREFIX}"/usr \
+		--bindir "${EPREFIX}"/usr/bin \
+		--target-bindir "${EPREFIX}"/usr/bin \
+		--libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
+		--mandir "${EPREFIX}"/usr/share/man \
+		--no-ocamlbuild \
+		-target "${CHOST}" \
+		-host "${CBUILD}" \
+		-cc "$(tc-getCC)" \
+		-as "$(tc-getAS)" \
+		-aspp "$(tc-getCC) -c" \
+		-partialld "$(tc-getLD) -r" \
+		--with-pthread ${myconf} || die "configure failed!"
+
+	# http://caml.inria.fr/mantis/view.php?id=4698
+	export CCLINKFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+	emake world
+
+	# Native code generation can be disabled now
+	if use ocamlopt ; then
+		# bug #279968
+		emake opt
+		emake opt.opt
+	fi
+}
+
+src_install() {
+	emake BINDIR="${ED}"/usr/bin \
+		LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
+		MANDIR="${ED}"/usr/share/man \
+		install
+
+	# Symlink the headers to the right place
+	dodir /usr/include
+	dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
+
+	dodoc Changes INSTALL README
+
+	# Create and envd entry for latex input files
+	if use latex ; then
+		echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
+		doenvd "${T}"/99ocamldoc
+	fi
+
+	# Install ocaml-rebuild portage set
+	insinto /usr/share/portage/config/sets
+	doins "${FILESDIR}/ocaml.conf"
+}
--- a/dev-lang/ocaml/ocaml-4.03.0_beta1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.03.0_beta1.ebuild
@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
+PATCHLEVEL="8"
+MY_P="${P/_/+}"
+DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
+HOMEPAGE="http://www.ocaml.org/"
+SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.xz
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="QPL-1.0 LGPL-2"
+# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
+# so here we go with the subslot.
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="emacs latex ncurses +ocamlopt X xemacs"
+
+RDEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	X? ( x11-libs/libX11 x11-proto/xproto )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+	xemacs? ( app-xemacs/ocaml )"
+
+S="${WORKDIR}/${MY_P}"
+pkg_setup() {
+	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
+	# results in relocations if gcc wants to create a PIE executable
+	if gcc-specs-pie ; then
+		append-ldflags -nopie
+		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
+		ewarn "We have appended -nopie to ocaml build options"
+		ewarn "because linking an executable with pie while the objects are not pic will not work"
+	fi
+}
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+}
+
+src_configure() {
+	export LC_ALL=C
+	local myconf=""
+
+	# Causes build failures because it builds some programs with -pg,
+	# bug #270920
+	filter-flags -fomit-frame-pointer
+	# Bug #285993
+	filter-mfpmath sse
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	use ncurses || myconf="${myconf} -no-curses"
+	use X || myconf="${myconf} -no-graph"
+
+	# ocaml uses a home-brewn configure script, preventing it to use econf.
+	RAW_LDFLAGS="$(raw-ldflags)" ./configure \
+		--prefix "${EPREFIX}"/usr \
+		--bindir "${EPREFIX}"/usr/bin \
+		--target-bindir "${EPREFIX}"/usr/bin \
+		--libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
+		--mandir "${EPREFIX}"/usr/share/man \
+		-target "${CHOST}" \
+		-host "${CBUILD}" \
+		-cc "$(tc-getCC)" \
+		-as "$(tc-getAS)" \
+		-aspp "$(tc-getCC) -c" \
+		-partialld "$(tc-getLD) -r" \
+		--with-pthread ${myconf} || die "configure failed!"
+
+	# http://caml.inria.fr/mantis/view.php?id=4698
+	export CCLINKFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+	emake world
+
+	# Native code generation can be disabled now
+	if use ocamlopt ; then
+		# bug #279968
+		emake opt
+		emake opt.opt
+	fi
+}
+
+src_install() {
+	emake BINDIR="${ED}"/usr/bin \
+		LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
+		MANDIR="${ED}"/usr/share/man \
+		install
+
+	# Symlink the headers to the right place
+	dodir /usr/include
+	dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
+
+	dodoc Changes README.adoc
+
+	# Create and envd entry for latex input files
+	if use latex ; then
+		echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
+		doenvd "${T}"/99ocamldoc
+	fi
+
+	# Install ocaml-rebuild portage set
+	insinto /usr/share/portage/config/sets
+	doins "${FILESDIR}/ocaml.conf"
+}
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@ -99,3 +99,8 @@

  Package-Manager: portage-2.2.27

+  29 Feb 2016; Andreas K. Hüttel <dilfridge@gentoo.org> icu-56.1-r1.ebuild:
+  Restore keywords after build testing
+
+  Package-Manager: portage-2.2.27
+
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@ -5,6 +5,6 @@ DIST icu4c-56_1-src.tgz 25721871 SHA256 3a64e9105c734dcf631c0b3ed60404531bce6c0f
 EBUILD icu-55.1.ebuild 2893 SHA256 b5de4d112190e3e7bdf2b1176346e1f908a673819ba7ac5502e3231f828385e9 SHA512 0ce8384ef4e33323f89e240665b76a4a762b687aa2a3164ee94c408ffd6159a226cbd4b3e8546667058b12b69c98d6f237f104a1c2dc89a44d694a66501c8ff4 WHIRLPOOL 9447955dd5fbc6815dc38e40eaaab692f77f9bb30ccce37b322681cf661eca12160c7a79304ce2bf5da930aa92bb6016630356114935d13d22fae754f7bce2fa
 EBUILD icu-56.1-r1.ebuild 2889 SHA256 cc9212e2ec504272c7a5f71d4186046ee75734c88fdaf6493627102e135e3562 SHA512 c52868c6d23cdf71fad0b1f34ad8c72691d1e9399725536a9d86f5a195cb95c204088da2e479dd7c66e75619fe9cfa2bbdf860b31e147bb144eb587f7f74adcb WHIRLPOOL ac4124ac4e51e659272c5a60528a4930005c9d861b04b91545276be2bd08f58450703d6f67f8911520e0875519be9f5a24125ee73f09de36c4f53838b410bf2a
 EBUILD icu-56.1.ebuild 2906 SHA256 7c476b850f8641242093043abb450240e5c3fd7a045af965e0a76a297c7c844a SHA512 a65caeac95640ceb61d38f7ac165ca5851691fb42f7694cc51544dc6081b82e4daa13f6f4b23281ebcae31658217b813d5f56aac345012b5742d481b364ec4a2 WHIRLPOOL 3ecc4dc02801fffff468654c43f765824bc5fed8d938b7ffadd9a20218b8c70ee1810427fc9c3e8c28ad68e1853cffb1915c1119f0ef7d5cf31cbc6167f78b4f
-MISC ChangeLog 3463 SHA256 fea0d3170a38c25e3117f774beae77292d91ead4ae88f9e83f346df7d6e4aa54 SHA512 1a27ad483ee1da3b05085dd01228ca10ebc5625121dae97e0113cc8039a630583b4fef3bbecc5282c9fc92742e98e692524a5dda212ccc150df80dab7416908f WHIRLPOOL 04961c820425673c95add9854100c6f312c394ae4d37115e2e61c0d82df2bd9c2024f28ca38381f0ad8aff66cd900e56bfea6f18671a7c246dbfbd98f3875e60
+MISC ChangeLog 3615 SHA256 fae917187097944e9194b0ce683315ba56b7e7bfeea645e597807e02776d9283 SHA512 8393b0c4eb97c86c204a43d3852433a6b406c972de5dba977ac617ea09fab4f7ebbe4eeebafc3ff6c5784b0d338989b6d0a802ffee9e9806c530595142054143 WHIRLPOOL 44492e27b98440847428a266844644fece32e9f2d970767c5906d15f1102af7478189cff22bece066b9d945a7caea765314188d5116963ca673b501e3d6cd7f6
 MISC ChangeLog-2015 40840 SHA256 a0753f110b13f5ed6f65cd0051e4b152e5dca9dedec14ee463ef16a7af9ba86e SHA512 4f2c4d74edbb747ba2c8e2111cd89e2b08d8bf1df16bf9db20b67969ce4f8422585b40eb42f9599c37cceb8f35424e74bfa50318d67ffdf35416995609042fc8 WHIRLPOOL 85f6ff953d6647f08988396c7d08805070fcf32b9111261f55dd4300bac54881086ef6bfb2831338fb9207cf042b54f43f098da3bd0ed33575ac7cc6fc164c27
 MISC metadata.xml 255 SHA256 34d028c790cfe86c47c5c3dcf8655fcefc3e23ff52fed38a400ce42d678c8c5e SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3 WHIRLPOOL 87f7199996948fe95e5417f8da0c4c90cd51a68f246ac8ae87a2e2a31c11c709f220d664eb893b34692577415e5f5eb351dd7e310dbc59f508fa40c7edb8ceeb
--- a/dev-libs/libfilezilla/ChangeLog
+++ b/dev-libs/libfilezilla/ChangeLog
@ -48,3 +48,10 @@
  Package-Manager: portage-2.2.27
  RepoMan-Options: --include-arches="arm"

+  01 Mar 2016; Lars Wendler <polynomial-c@gentoo.org>
+  libfilezilla-0.4.0.1.ebuild:
+  Sync KEYWORDS.
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@ -2,5 +2,5 @@ DIST libfilezilla-0.3.1.tar.bz2 372673 SHA256 a4adde9ce2de975e0f8b111705b9f89939
 DIST libfilezilla-0.4.0.1.tar.bz2 373987 SHA256 6003689254e9d250bcdefc1414dcc4a0d324fda3d59436a497e249b225f4b1d1 SHA512 6a86cb7794ace650e2d49c01c668d901d669b0bfbde78a4e72528fea40edfc5579cc4d594ea214fd259113b6cd1be5d4808d1465452745cb7a8cf0aa8c66c9c1 WHIRLPOOL 4c98ff899965f3deab2a13f6d64585e7f4be93ac12a21418e35fadee93ce53343898066b8190785813256644ef77d662a78f89345fd418fc351bb59ff6ed2d1c
 EBUILD libfilezilla-0.3.1.ebuild 861 SHA256 66f122735bdaa6bb5cf8f5e6ea56f81d1ad874c5d1344e30b68f64f287817399 SHA512 8295ed542ab89da33bbec7290e1d7b51ac51018452e345f13e42520d0ee722ba3651b59694da9dd4c7287d5b49629d296f69ea13d1da9bce326f74f7b4cebf4a WHIRLPOOL 180ec129221227c24acd3014b438f1372766f0b3edf5d7c53281d44614cb2d62792e02975280fd4ea6a490c2097d80496029a44d6038c89763f68f7825e08e21
 EBUILD libfilezilla-0.4.0.1.ebuild 861 SHA256 66f122735bdaa6bb5cf8f5e6ea56f81d1ad874c5d1344e30b68f64f287817399 SHA512 8295ed542ab89da33bbec7290e1d7b51ac51018452e345f13e42520d0ee722ba3651b59694da9dd4c7287d5b49629d296f69ea13d1da9bce326f74f7b4cebf4a WHIRLPOOL 180ec129221227c24acd3014b438f1372766f0b3edf5d7c53281d44614cb2d62792e02975280fd4ea6a490c2097d80496029a44d6038c89763f68f7825e08e21
-MISC ChangeLog 1403 SHA256 041cc60f136f3e2ee14ded66ac9e5ca4daae6b92155844f678325c82b7f089aa SHA512 2d72efd3895068fd62aad6ee5895ebc009613223d25544fdd37582c970ad2ff889e30a761fba53a870eda870c81bf22de05058bd8d27f584345969841c326cdc WHIRLPOOL 084fc1a0c6e3026a734d858e4d9ce55c6252e9c237c4e1c8e1d258765e2c1a49c917d10069196947aa958b049b275f6680e4a07b58318c46da24933010813754
+MISC ChangeLog 1597 SHA256 d604227296246858e094336cf1cd3ddfe8288bb9e02de99cc8a62ff6aaab7a61 SHA512 170c25274eb1beac3640d4fc0cf96922a631a1350fab54971c7753883acf1a6d60ed336e5d31b1c9155dd8a41575cade273ef55f28523fa7915960835a16ee4e WHIRLPOOL 5d9393d0790aacb12568e579beea389f578eaeb1653b2a8379127d665e5d677148bd10d0bdaaa2a6ac873637f6b84748ca25f9ca64f13f855eda550622bcc960
 MISC metadata.xml 1055 SHA256 be6b3d9e002bbedcc348b66b8af967c422da3e1d03c755a5027240717d280287 SHA512 08f571e6b679e64ecbef60b1c2694a76f87f9724f3d6d0bc3c1aafef0a54daa4f9f665f9125976218549b6a63f262c1c3c8009a46ff75c51180599ce7d84b2fe WHIRLPOOL c28143484a8aaddf1a9444da99544d583edd615287ff3c33a84ec3e63d064774fa7862c5752b02924d789f01c2839fec7dabc0bdcaf3d9f1b5840509dfd06453
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@ -183,3 +183,24 @@
  This reverts commit c3d074180d6f3aea7ab5304d2c19bb0b00a40978 since it
  doesn't compile

+*nspr-4.12 (29 Feb 2016)
+
+  29 Feb 2016; Ian Stakenvicius <axs@gentoo.org> +nspr-4.12.ebuild:
+  re-committing version bump to 4.12
+
+  Upstream release notes:
+   * added a PR_GetEnvSecure function, which attempts to detect if the program
+     is being executed with elevated privileges, and returns NULL if detected.
+     It is recommended to use this function in general purpose library code.
+
+   * fixed a memory allocation bug related to the PR_*printf functions
+
+   * exported API PR_DuplicateEnvironment, which had already been added in
+     NSPR 4.10.9
+
+   * added support for FreeBSD aarch64
+
+   * several minor correctness and compatibility fixes
+
+  Package-Manager: portage-2.2.26
+
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@ -16,6 +16,6 @@ EBUILD nspr-4.10.10.ebuild 4055 SHA256 4cf29c674ee5de6156acae3980106a685ea12444e
 EBUILD nspr-4.10.8.ebuild 4051 SHA256 739ac74fe11ab35e441bbceba58a82d813481848f0c86cbd458a6e5f7ec01147 SHA512 8b8eaf903facdc02b6bf0f778d1f82f356565c4a3099a74651c1691d8d3061a13e6330f4220f42c7a0f2966d97df8caebd25afea246e45b1d0f0b18e0d4c3bb3 WHIRLPOOL f905b4baf4bafd7274aee9f4e6e262fab6f8a0940508c522ba4ebbc63e2b9adf1902a322399b18b0bfbdebf6fb042b8f12fa350ff494f9434515a26af359b20a
 EBUILD nspr-4.11.ebuild 4175 SHA256 c0ba76a4632482ec8b997aa753db96ef7590863a0700ba288b01d469b8fefe1f SHA512 a5b38f25112c19c0b3a9dfb2f0ad52f52af9fdc1b95439e548a4d0bd6324baf857c45580a1578edf6ba8a96e2a06801512190659644e4ccca223ccef1f0588e1 WHIRLPOOL d4912ead9b9d14103de6a280ee535646133f62eeb89eec3de0a441f1e3e297e1f1d9f4051c9e20a8a5b5d13b7e4e6d651499061cf625963323a007a870db9b3a
 EBUILD nspr-4.12.ebuild 4053 SHA256 1beddc32a3f6305424afbc9a662068f9024daf462531c14546b149a5485e8e17 SHA512 0a6356fa99dc53d4722765d45042ccdc00de20c426e2273e4abdfb8bdcaca4e06bd457a6379f3a3fd429b748159c64e0887618fcba72ea7dc962aa5971fc5756 WHIRLPOOL f6071a217b32dc93183a36a0859bb542830c53fec09c9827bcc02048ca5b4b230858835439f063d8755734b12906ca69af9fe8fae585c9f67e50955fdf42a31a
-MISC ChangeLog 6144 SHA256 75299a66ec1cab35172e9eff99c560d00984632bca89d36afe2bb135d946a111 SHA512 d2c9c6d5adbbc1711a672a5aabf4e0c21369f8ac000e1946869fd51af9d0f2749c728e79e3bba0d3819015c038eba48793ba91d9d95e7967fea32048b95831ab WHIRLPOOL c775658271c9e8571f814b7b6ee16110c38e68e6dc037fa4ff5fc7b58d34e58e3b5b6bf6ff3a3b4496127d27f10deca9e12fd35831ccccbfda733c7df5d8dcd3
+MISC ChangeLog 6834 SHA256 ed9984c3a98e25ed811b1645034bb60567d1069832b3289b1805238275f88778 SHA512 cda52f5e6f0e517aded48258c9b326c463c8ea11bf1110bce1fcdda8ab9a9dbc5c4ba6f316d1ea728003b234a8cc0de004c671709ac72cbf9eed599c0aa1109e WHIRLPOOL a964eaff765f2fdf90bde302a0203dfd6865e9950c152a5ba93313e2d231632f9109ca0f555f31cc205261488f532893735542968e3166400c0c86bef9a7adf9
 MISC ChangeLog-2015 37574 SHA256 9aa5e372370aebb7663d3378348d8d6af2744c1dad1a69f5f8930c4b6e48481b SHA512 0b72ea173a15aafc646dddddc3b485aab165623c4065f773fa3e84839e6f05dc8df55ec3e7d62d1c5a4239e394658ba5ccad0841cad8f700a82a14765eb0f1b2 WHIRLPOOL f76c6f1248d1560495e96b6e356e65639f88dab6eede0b2077859d54025c5f5da8d7752376b347ab3de6408facbd3e0d2443d4ac000b8074e44b06916a09d5b7
 MISC metadata.xml 250 SHA256 6482f1f0210d1b5be8fa75dfbe107df6da702461e36abe6ee77808b4118d5bab SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b WHIRLPOOL bbdc6963f21df602d4bbaec882e9ac860417eccf7528546f4ec24f13368b9b86a1b6830c51feb0bb46bb384fc1aa0e8751c4be88103f9b4895ff9ed4e1d52bbc
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@ -257,3 +257,14 @@
  This reverts commit 8dacf4232b798af79879ca0f8e13a45d13479d0f, since
  nspr-4.12 doesn't compile

+*nss-3.22.2 (29 Feb 2016)
+
+  29 Feb 2016; Ian Stakenvicius <axs@gentoo.org> +nss-3.22.2.ebuild:
+  recommit version bump to 3.22.2
+
+  This version uses the new PR_GetEnvSecure function in nspr-4.12, and
+  contains
+  root CA updates
+
+  Package-Manager: portage-2.2.26
+
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@ -22,6 +22,6 @@ EBUILD nss-3.20.ebuild 9299 SHA256 b950dfcc5a2bd66c32d3f26cba7c4b1e214d913395fa6
 EBUILD nss-3.21-r2.ebuild 9276 SHA256 97f080b8c64d108fb94fa743a9145eadade6a4ba4889f1fa92b5e083af0457b7 SHA512 c4913351f714c2d92bc812812b51de4fd3d2266736ab5967ad552342d46f76e0c4ca015c6c21f0b2042d0e4694229f01d031d8c019dd76f234b5c4f9d2186afc WHIRLPOOL f78bd6c4dad660633c18d1c0a993c8b6fe3a88c4a0ed70e9b92f1295b69afa52308f32b7df0a347a65fe13e6decfcadd745819d0ca494be06d3443e41b6a7659
 EBUILD nss-3.22.2.ebuild 9426 SHA256 8b8f7d11f4196045eb44e5fc856e71b0d55e066aead802a2778677313dc76312 SHA512 d1c2852c9170d15c855e9a33d3aaf6c669eebe75b006f6d6a5441bcfb335029ad4162513cdbfc4b26c9f0b716919910edb600627b1214a1c89eec850723a4771 WHIRLPOOL 3977f8ea99fcb08267a297679a3908d35c37c091da0e9697007ee8b1f8bd628e945acd11a36833a8daa49414557eb7f977bcfa66836958402e53df4e3f1a7bf2
 EBUILD nss-3.22.ebuild 9439 SHA256 756de6d69d11b2948d3fbcb474744452b4baa68925095ff50756003c5dea8234 SHA512 29011b86c9bda7a1cacb81800f51712db974a61d261ad583439ee92ad4c18add9d64894b5fae345ecb16d82621458a6c64d6a97158085ad1e01825bba3de38e1 WHIRLPOOL 7d24e899dcb00d49f3ea9e20467dcbb2c4f87d669b41a7115ab13ce084f04daeca79dd58545b812632423f4447b5391aa8c5062106e12c7cccde1a0d09383c45
-MISC ChangeLog 8350 SHA256 b04bfe8040fd7a92a362be457302e5eeda296940ef80c4ead0bfd55759fbcf88 SHA512 46d7e94c3d73e273457dc2f186d60f44b16eec488faa579dd7beb3ec1291f3016b0e4486e236e10186793dd4aaec46e7b493d7edaabc5c1a1f6f79dc2337c326 WHIRLPOOL ace2bda6d264c03f5ee8cf9cd4b3db20d09e956b4c1ba06663561eb4484b67e25cf5085a898b25fc3433db931d6980ffc80538c7ce906ec078115ce86c4c57ac
+MISC ChangeLog 8617 SHA256 26bdf3016d955f9cf03439e880d1fdf77a4fe662ab74ef0623a4a18758e29426 SHA512 1160f76566c617d3cfb6faa3edd40edb36d69362911f8c2b41a891685e7f3c2a06b33b5f78525eb5bb474895d45fb2982aece5fabea544d18c4196c2801c92eb WHIRLPOOL e53e363b1d7f3cdfe6302990bcf2c264a935c48e94a1ad90b331d614b7dc765a26604a46890211f94656906ce8f4c77ee4c871b880964936c3a54359e0dacfd6
 MISC ChangeLog-2015 54652 SHA256 27f421ca4fde413f810e038d8fec5f0b81badbb9bfd5d2bd550007475754d709 SHA512 73dc5cdbf1d5b8de7d6cc3c8139d521490fb4460367b49b2bf4cf08bef57e6e1120a5f8c6e6b57d44667c832a16d961d229750c92a8eace6a420a359116c9ace WHIRLPOOL aa70e189b8ef13524920ecbf8e2288d3ad4ea004953f06ab4777c5a20824b5856932449ad601d0399b2258b912a84393ba5e08673e74279811303be09fc880bf
 MISC metadata.xml 644 SHA256 25a6b5d1bf06a5716910438ad3632f2a239a2e43e8144d746cf699564c7ea89a SHA512 402f16b71a46ae72f25cf51688da61b957632601f1000e78a70290491cc5b8c9cd1e856d6c1859c24162f0919a64ed4678789acb1d19a4647f9bd8c082ea8e9f WHIRLPOOL 24ecebb61ec52983e62231652afb4b8e4d4802ecd81d9f6aa26c9578a90c8687a2679163e6a7021012fc8b7fbe6c9134312215a1209c9d0c114d175f50b568d1
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@ -384,3 +384,12 @@
  Package-Manager: portage-2.2.26
  Signed-off-by: Doug Goldstein <cardoe@gentoo.org>

+*openssl-1.0.2g (01 Mar 2016)
+
+  01 Mar 2016; Lars Wendler <polynomial-c@gentoo.org>
+  +files/openssl-1.0.2g-parallel-build.patch, +openssl-1.0.2g.ebuild:
+  Security bump to version 1.0.2g (bug #575548).
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@ -12,10 +12,13 @@ AUX openssl-1.0.2a-parallel-obj-headers.patch 1359 SHA256 147c3eeaad614c044749ea
 AUX openssl-1.0.2a-parallel-symlinking.patch 2041 SHA256 30cb49489de5041841a74da9155cd4fabfbce33237262ba7cd23974314ae2956 SHA512 b87ab581784c285ef394b31baa1196a831a86c3b2d578704c9d8b80d68c70a8b19cfa88bd29b84578ed024135ae2d2ac4d622c91e1040074016b8fd104d6c05a WHIRLPOOL c8200ec6755efdce550afd2f59b3d5dc36324c6810b3ae7427af7130be9ba0db5857c13811f97dd6672230b9f096f81ebb4136c9589d53d25dcfe5c064355a46
 AUX openssl-1.0.2a-x32-asm.patch 1561 SHA256 8bcff04217c5ad82448e27d14f3559a157c2cad89b5fb2b6af701fff1664f86d SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c WHIRLPOOL 70163beaed966de948562c3a633828846d12eda7b04526c7e33746c67af5a20ecf47e9e9e5cce33abf7444676f4b15b770204e95db75d0b91a9db13c46ff92bb
 AUX openssl-1.0.2e-parallel-build.patch 9620 SHA256 1200c48f8e209bce505bec23958afa4700681ee97f374064a5484623fe497269 SHA512 8aa64a78bc190a9c04f0093af2cdbcc0bed25be8c5f31c3a31e8b19954a58ba96ab05139d3ae6ecd7bc24e123536eec54fc98330167affcfd13cbd6d90626637 WHIRLPOOL 7ad5e275dce8f644deb3779900940cdbc625ecdcc984386502e1cb8dd7ead6bbd3a32fa41ae537a7ad5b2dc8308a2458ebbfcd3c05aedc4874e5d5a212677f88
+AUX openssl-1.0.2g-parallel-build.patch 9751 SHA256 a2ac3d132f77f6eaca8beabde454d373f1bfaea7a61b56cb3b5b8469293da601 SHA512 29f784f19e1a4eadd4ecdae3f5a1d4f7123db388943b7940b8917db2cb8f6debb633d5e845a45bc73b5159d0a7b6479c7c582da59e53dc063953a67f31c011bb WHIRLPOOL 60fe9c0b138e3070c519c73bdd77b7369ca3440ddc53ccaed920237b356ef1010a919babe09027f66c3d1c1c90a57ce5cce01ec3aa16b913a861615d3efa6048
 DIST openssl-0.9.8zh.tar.gz 3818524 SHA256 f1d9f3ed1b85a82ecf80d0e2d389e1fda3fca9a4dba0bf07adbf231e1a5e2fd6 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6 WHIRLPOOL 8ed3362e6aed89cd6ae02438bc3fb58ff3a91afb8a2d401d1d66c1ee4fd96f4befb50558131dd03a60fc15b588172fc1ede5d56bb1f68e184453bfe3b34f9abf
 DIST openssl-1.0.2f.tar.gz 5258384 SHA256 932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c SHA512 50abf6dc94cafd06e7fd20770808bdc675c88daa369e4f752bd584ab17f72a57357c1ca1eca3c83e6745b5a3c9c73c99dce70adaa904d73f6df4c75bc7138351 WHIRLPOOL 179e1b5ad38c50a4c8110024aa7b33c53634c39690917e3bf5c2099548430beef96132ae9f9588ff0cedd6e08bb216a8d36835baaaa04e506fb3fbaed37d31c9
+DIST openssl-1.0.2g.tar.gz 5266102 SHA256 b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33 SHA512 4d96b6c8a232203483d6e8bee81da01ba10977bfbac92f25304a36dec9ea584b7ef917bc45e097cc7dbe681d71a4570d649c22244c178393ae91fab48323f735 WHIRLPOOL aedbd82af0a550e8329a84312fae492f3bb3cb04af763fc9ef532099b2b2e61a55e4a7cfb06085f045740e2b692bbdb3ecb8bf5ca82f46325c3caf22d2317ffb
 EBUILD openssl-0.9.8z_p8.ebuild 4947 SHA256 81aa87c023da6925fa5cc445cb5af4a1b1ddf6ac493cf892acb711c13eb8e232 SHA512 00ab05012403aa156318a01f6b45764ebf9541bfc011551680ef21521a644871025b959c2a3cd014642976c86e9dc7a9876afd865f0fe633e902280f7e818aca WHIRLPOOL 2f884374b87cc618f71aabfa0d3f63f42d0033e6b97830c1b54ba66faf54d033eb42c8a694106e718f604106597db2be008537fec83d604692f3903fc8c6f6cb
 EBUILD openssl-1.0.2f.ebuild 8781 SHA256 a1073fc828d4d95206eae2393ade25b6b1d2ae2019e08acd7900d0138dcf9151 SHA512 ff3d4aec5ed67c416815464ee8cff9a05fa6a4561c88d783ad3d119454da41c2fd3ff9628226bce33f7401fdbc27de9865abcfc30b055abe72a7e4c8802b348d WHIRLPOOL fb1478c1a76500d2f8e66cee6de3077be95f92ade33007b7831dd4af068d45e0891e9f6ba27188510dd0f639fe94fec2b0bfdf4128122d88ffbafb7899a772a5
-MISC ChangeLog 14371 SHA256 f6cc4f3d443df8e2befa6e70d0c1865f46f7f3f02aab00383e53606274d62c50 SHA512 95b4466d6bb5bc20ba9c73f690c0f54ad73ac82ad2c03a836e4d59e70afe0d08e7ce2d99fe625953052c57943a5142bc6a13573a02519432f49f989601a3b9d2 WHIRLPOOL 596d59fdf0ca7436e6d1b59a325f81aa006f7e32e6b6a4e69ffc854c2dea348a0915cbd4104ab9b5ced039bd90b2f6bc5120ba1bd6c4ac58eb64919f0011155c
+EBUILD openssl-1.0.2g-r1.ebuild 8950 SHA256 27027762155f93378e414a87368ec2ba1ebd96a54bf7891245beb8c64eab8485 SHA512 56f38bf07e525bf59b64d2182d0b86f684bfd2f955c168484699db79912c14dbb9ffe0758bf4462c2c0932a10494eb736efa55633b575ec4047e638e4114bd01 WHIRLPOOL d8b05e685e9a1a96a6fa651202a9ab2d3e728da0d88eddfcc85a86249e1083801804b3d7d8b857f006535e6991f0be30fd8d21f421e692eba289d9e7ee9a439d
+MISC ChangeLog 14667 SHA256 f89f3b68f812cd8ecdde3c33f19b71655e66ea695725e6458b75225270f97348 SHA512 b4a485d628f74129f1307c3b3d0406f685108739ef8921761b8b5e2d2d3279256fa6331e24d4af38002763373f586b64face88bad657893e4de92b7095e795ec WHIRLPOOL 1ba2f4e79c485820583ce61430bb5a73d5ad9eb3b35dab603f21a955548dd384065adcc38991719d3f87737094c057456f8effd18ce0c40e576e05885b7f63bc
 MISC ChangeLog-2015 105012 SHA256 78da8e54f925dd55fa0e87800ab2e3ad9833cb33f6c334a4364339195d44a8a8 SHA512 fa8deec570b40406f273a5ea929f10113d81d828815c67f225968bbbaa6737f6c4832502a100b06fe6c8cf124529fedaa04cbaf7a70f037680a420ce244be1e5 WHIRLPOOL a2acbfb3283a9521492b4b96d9d2283aefc3445df87e47e584c66f87547cfa954914beaddd040c7097fded7029897f9481cded1d1f2d1ad7fa7b2e5425b285ba
 MISC metadata.xml 1060 SHA256 f754c66d2d0505aeb8c81a46bd46bef94f89ff07008bb2ebb8256a210509d820 SHA512 fd8cdf0a980ff6080eba5edec28dad6a1fd1278350b22fa309c31d9741f6c5329ef3402586a81a8ffc4f5465ff20798902fc6df8dbcca32e8aa9e8d1c153f119 WHIRLPOOL a552d23b869c6db11192757408db8e9620af1853dd8d6f8d572e704f7342467ab1cea27df0d9e1a2b2b65737ca64d1c7593715bfa7ee99268588bda5605e0626
--- a/dev-libs/openssl/files/openssl-1.0.2g-parallel-build.patch
+++ b/dev-libs/openssl/files/openssl-1.0.2g-parallel-build.patch
@ -0,0 +1,318 @@
+--- openssl-1.0.2g/crypto/Makefile
+++ openssl-1.0.2g/crypto/Makefile
+@@ -85,11 +85,11 @@
+ 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+ 
+ subdirs:
+-	@target=all; $(RECURSIVE_MAKE)
+	+@target=all; $(RECURSIVE_MAKE)
+ 
+ files:
+ 	$(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
+-	@target=files; $(RECURSIVE_MAKE)
+	+@target=files; $(RECURSIVE_MAKE)
+ 
+ links:
+ 	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
+@@ -100,7 +100,7 @@
+ # lib: $(LIB): are splitted to avoid end-less loop
+ lib:	$(LIB)
+ 	@touch lib
+-$(LIB):	$(LIBOBJ)
+$(LIB):	$(LIBOBJ) | subdirs
+ 	$(AR) $(LIB) $(LIBOBJ)
+ 	test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
+ 	$(RANLIB) $(LIB) || echo Never mind.
+@@ -111,7 +111,7 @@
+ 	fi
+ 
+ libs:
+-	@target=lib; $(RECURSIVE_MAKE)
+	+@target=lib; $(RECURSIVE_MAKE)
+ 
+ install:
+ 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+@@ -120,7 +120,7 @@
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ 	done;
+-	@target=install; $(RECURSIVE_MAKE)
+	+@target=install; $(RECURSIVE_MAKE)
+ 
+ lint:
+ 	@target=lint; $(RECURSIVE_MAKE)
+--- openssl-1.0.2g/engines/Makefile
+++ openssl-1.0.2g/engines/Makefile
+@@ -72,7 +72,7 @@
+ 
+ all:	lib subdirs
+ 
+-lib:	$(LIBOBJ)
+lib:	$(LIBOBJ) | subdirs
+ 	@if [ -n "$(SHARED_LIBS)" ]; then \
+ 		set -e; \
+ 		for l in $(LIBNAMES); do \
+@@ -89,7 +89,7 @@
+ 
+ subdirs:
+ 	echo $(EDIRS)
+-	@target=all; $(RECURSIVE_MAKE)
+	+@target=all; $(RECURSIVE_MAKE)
+ 
+ files:
+ 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+@@ -128,7 +128,7 @@
+ 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
+ 		done; \
+ 	fi
+-	@target=install; $(RECURSIVE_MAKE)
+	+@target=install; $(RECURSIVE_MAKE)
+ 
+ tags:
+ 	ctags $(SRC)
+--- openssl-1.0.2g/Makefile.org
+++ openssl-1.0.2g/Makefile.org
+@@ -279,17 +279,17 @@
+ build_libssl: build_ssl libssl.pc
+ 
+ build_crypto:
+-	@dir=crypto; target=all; $(BUILD_ONE_CMD)
+	+@dir=crypto; target=all; $(BUILD_ONE_CMD)
+ build_ssl: build_crypto
+-	@dir=ssl; target=all; $(BUILD_ONE_CMD)
+	+@dir=ssl; target=all; $(BUILD_ONE_CMD)
+ build_engines: build_crypto
+-	@dir=engines; target=all; $(BUILD_ONE_CMD)
+	+@dir=engines; target=all; $(BUILD_ONE_CMD)
+ build_apps: build_libs
+-	@dir=apps; target=all; $(BUILD_ONE_CMD)
+	+@dir=apps; target=all; $(BUILD_ONE_CMD)
+ build_tests: build_libs
+-	@dir=test; target=all; $(BUILD_ONE_CMD)
+	+@dir=test; target=all; $(BUILD_ONE_CMD)
+ build_tools: build_libs
+-	@dir=tools; target=all; $(BUILD_ONE_CMD)
+	+@dir=tools; target=all; $(BUILD_ONE_CMD)
+ 
+ all_testapps: build_libs build_testapps
+ build_testapps:
+@@ -544,7 +544,7 @@
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ 	done;
+-	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
+	+@set -e; target=install; $(RECURSIVE_BUILD_CMD)
+ 	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
+ 	do \
+ 		if [ -f "$$i" ]; then \
+--- openssl-1.0.2g/Makefile.shared
+++ openssl-1.0.2g/Makefile.shared
+@@ -105,6 +105,7 @@
+     SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
+     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
+     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
+    [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
+     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+     $${SHAREDCMD} $${SHAREDFLAGS} \
+ 	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+@@ -122,6 +123,7 @@
+ 			done; \
+ 		fi; \
+ 		if [ -n "$$SHLIB_SOVER" ]; then \
+			[ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
+ 			( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
+ 			  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
+ 		fi; \
+--- openssl-1.0.2g/test/Makefile
+++ openssl-1.0.2g/test/Makefile
+@@ -139,7 +139,7 @@
+ tags:
+ 	ctags $(SRC)
+ 
+-tests:	exe apps $(TESTS)
+tests:	exe $(TESTS)
+ 
+ apps:
+ 	@(cd ..; $(MAKE) DIRS=apps all)
+@@ -421,130 +421,130 @@
+ 		link_app.$${shlib_target}
+ 
+ $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
+-	@target=$(RSATEST); $(BUILD_CMD)
+	+@target=$(RSATEST); $(BUILD_CMD)
+ 
+ $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
+-	@target=$(BNTEST); $(BUILD_CMD)
+	+@target=$(BNTEST); $(BUILD_CMD)
+ 
+ $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
+-	@target=$(ECTEST); $(BUILD_CMD)
+	+@target=$(ECTEST); $(BUILD_CMD)
+ 
+ $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
+-	@target=$(EXPTEST); $(BUILD_CMD)
+	+@target=$(EXPTEST); $(BUILD_CMD)
+ 
+ $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
+-	@target=$(IDEATEST); $(BUILD_CMD)
+	+@target=$(IDEATEST); $(BUILD_CMD)
+ 
+ $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
+-	@target=$(MD2TEST); $(BUILD_CMD)
+	+@target=$(MD2TEST); $(BUILD_CMD)
+ 
+ $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
+-	@target=$(SHATEST); $(BUILD_CMD)
+	+@target=$(SHATEST); $(BUILD_CMD)
+ 
+ $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
+-	@target=$(SHA1TEST); $(BUILD_CMD)
+	+@target=$(SHA1TEST); $(BUILD_CMD)
+ 
+ $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
+-	@target=$(SHA256TEST); $(BUILD_CMD)
+	+@target=$(SHA256TEST); $(BUILD_CMD)
+ 
+ $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
+-	@target=$(SHA512TEST); $(BUILD_CMD)
+	+@target=$(SHA512TEST); $(BUILD_CMD)
+ 
+ $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
+-	@target=$(RMDTEST); $(BUILD_CMD)
+	+@target=$(RMDTEST); $(BUILD_CMD)
+ 
+ $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
+-	@target=$(MDC2TEST); $(BUILD_CMD)
+	+@target=$(MDC2TEST); $(BUILD_CMD)
+ 
+ $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
+-	@target=$(MD4TEST); $(BUILD_CMD)
+	+@target=$(MD4TEST); $(BUILD_CMD)
+ 
+ $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
+-	@target=$(MD5TEST); $(BUILD_CMD)
+	+@target=$(MD5TEST); $(BUILD_CMD)
+ 
+ $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
+-	@target=$(HMACTEST); $(BUILD_CMD)
+	+@target=$(HMACTEST); $(BUILD_CMD)
+ 
+ $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
+-	@target=$(WPTEST); $(BUILD_CMD)
+	+@target=$(WPTEST); $(BUILD_CMD)
+ 
+ $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
+-	@target=$(RC2TEST); $(BUILD_CMD)
+	+@target=$(RC2TEST); $(BUILD_CMD)
+ 
+ $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
+-	@target=$(BFTEST); $(BUILD_CMD)
+	+@target=$(BFTEST); $(BUILD_CMD)
+ 
+ $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
+-	@target=$(CASTTEST); $(BUILD_CMD)
+	+@target=$(CASTTEST); $(BUILD_CMD)
+ 
+ $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
+-	@target=$(RC4TEST); $(BUILD_CMD)
+	+@target=$(RC4TEST); $(BUILD_CMD)
+ 
+ $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
+-	@target=$(RC5TEST); $(BUILD_CMD)
+	+@target=$(RC5TEST); $(BUILD_CMD)
+ 
+ $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
+-	@target=$(DESTEST); $(BUILD_CMD)
+	+@target=$(DESTEST); $(BUILD_CMD)
+ 
+ $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
+-	@target=$(RANDTEST); $(BUILD_CMD)
+	+@target=$(RANDTEST); $(BUILD_CMD)
+ 
+ $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
+-	@target=$(DHTEST); $(BUILD_CMD)
+	+@target=$(DHTEST); $(BUILD_CMD)
+ 
+ $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
+-	@target=$(DSATEST); $(BUILD_CMD)
+	+@target=$(DSATEST); $(BUILD_CMD)
+ 
+ $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
+-	@target=$(METHTEST); $(BUILD_CMD)
+	+@target=$(METHTEST); $(BUILD_CMD)
+ 
+ $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
+-	@target=$(SSLTEST); $(FIPS_BUILD_CMD)
+	+@target=$(SSLTEST); $(FIPS_BUILD_CMD)
+ 
+ $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
+-	@target=$(ENGINETEST); $(BUILD_CMD)
+	+@target=$(ENGINETEST); $(BUILD_CMD)
+ 
+ $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
+-	@target=$(EVPTEST); $(BUILD_CMD)
+	+@target=$(EVPTEST); $(BUILD_CMD)
+ 
+ $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
+-	@target=$(EVPEXTRATEST); $(BUILD_CMD)
+	+@target=$(EVPEXTRATEST); $(BUILD_CMD)
+ 
+ $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
+-	@target=$(ECDSATEST); $(BUILD_CMD)
+	+@target=$(ECDSATEST); $(BUILD_CMD)
+ 
+ $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
+-	@target=$(ECDHTEST); $(BUILD_CMD)
+	+@target=$(ECDHTEST); $(BUILD_CMD)
+ 
+ $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
+-	@target=$(IGETEST); $(BUILD_CMD)
+	+@target=$(IGETEST); $(BUILD_CMD)
+ 
+ $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
+-	@target=$(JPAKETEST); $(BUILD_CMD)
+	+@target=$(JPAKETEST); $(BUILD_CMD)
+ 
+ $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
+-	@target=$(ASN1TEST); $(BUILD_CMD)
+	+@target=$(ASN1TEST); $(BUILD_CMD)
+ 
+ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
+-	@target=$(SRPTEST); $(BUILD_CMD)
+	+@target=$(SRPTEST); $(BUILD_CMD)
+ 
+ $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
+-	@target=$(V3NAMETEST); $(BUILD_CMD)
+	+@target=$(V3NAMETEST); $(BUILD_CMD)
+ 
+ $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
+-	@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
+	+@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
+ 
+ $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
+-	@target=$(CONSTTIMETEST) $(BUILD_CMD)
+	+@target=$(CONSTTIMETEST) $(BUILD_CMD)
+ 
+ $(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o
+-	@target=$(VERIFYEXTRATEST) $(BUILD_CMD)
+	+@target=$(VERIFYEXTRATEST) $(BUILD_CMD)
+ 
+ $(CLIENTHELLOTEST)$(EXE_EXT): $(CLIENTHELLOTEST).o
+-	@target=$(CLIENTHELLOTEST) $(BUILD_CMD)
+	+@target=$(CLIENTHELLOTEST) $(BUILD_CMD)
+ 
+ $(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o
+-	@target=$(SSLV2CONFTEST) $(BUILD_CMD)
+	+@target=$(SSLV2CONFTEST) $(BUILD_CMD)
+ 
+ #$(AESTEST).o: $(AESTEST).c
+ #	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
+@@ -557,7 +557,7 @@
+ #	fi
+ 
+ dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
+-	@target=dummytest; $(BUILD_CMD)
+	+@target=dummytest; $(BUILD_CMD)
+ 
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+ 
--- a/dev-libs/openssl/openssl-1.0.2g-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2g-r1.ebuild
@ -0,0 +1,267 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+# subslot set to 1.0.2g version as this is the first release without SSLv2
+# support and thus breaks nearly every openssl consumer (see bug #575548)
+SLOT="0/1.0.2g"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+# The blocks are temporary just to make sure people upgrade to a
+# version that lack runtime version checking.  We'll drop them in
+# the future.
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+	!<net-misc/openssh-5.9_p1-r4
+	!<net-libs/neon-0.29.6-r1"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
+		epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
+		epatch "${FILESDIR}"/${PN}-1.0.2g-parallel-build.patch
+		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch
+		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch
+		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028
+		epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch
+		epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
+		epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338
+
+		epatch_user #332661
+	fi
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		$(use_ssl !bindist ec) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+	)
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	emake INSTALL_PREFIX="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
+	dohtml -r doc/*
+	use rfc3779 && dodoc engines/ccgost/README.gost
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	dodir ${SSL_CNF_DIR}/certs
+	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
+	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+
+	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+}
--- a/dev-libs/wayland/ChangeLog
+++ b/dev-libs/wayland/ChangeLog
@ -189,3 +189,30 @@

  Package-Manager: portage-2.2.27

+  01 Mar 2016; Mart Raudsepp <leio@gentoo.org>
+  +files/1.10.0-build-fix-configure-disable-dtd-validation.patch,
+  wayland-1.10.0.ebuild:
+  Fix multilib and add missing libxml2 dependency
+
+  Multilib support was broken in previous versions, as the configure
+  options were in src_configure, not multilib_src_configure, and so
+  it always built with configuration for "native" ABI, meaning that
+  USE=doc with multilib was probably broken. Now with 1.10 this
+  becomes more apparent with a new libxml2 dependency in wayland-scanner
+  for DTD validation.
+  As we do not currently install /usr/bin/wayland-scanner for other ABIs,
+  just disable the dtd validation support there. Ideally we wouldn't
+  build it at all then, but not a clean way to do so upstream right now.
+  For --{dis,en}able-dtd-validation to work, we need to patch the
+  build system to fix the support for the configure flag.
+  Thanks to this we are able to add the missing libxml2 dependency
+  without requiring multilib libxml2 for that (and commonly then also
+  multilib icu), which is nice, as many users haven't had a need for
+  a 32bit version of those as of yet and icu is a bit bigger compile.
+
+  Remove USE=static-libs handling, as autotools-utils takes care
+  of it for us when it's in IUSE. Also make use of the
+  multilib_native_use_enable helper to simplify the ebuild.
+
+  Gentoo-bug: 575212
+
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@ -1,14 +1,15 @@
+AUX 1.10.0-build-fix-configure-disable-dtd-validation.patch 8180 SHA256 5e0221bd4c103286cbf0d9e2864f6b7dda0c120af3911f6fb42ce4136e904479 SHA512 ed5c4376fdcbbad3246949f63fe1867558d9016e4a350e8418bef28e470692ba673848ae96328580a836878db16ef1f358f22b4be0d8ebb15c38eac926daa8d5 WHIRLPOOL 9b03de9a92d4e98ecfa4701aa4de59a990ebf846ce3fa826bde1d46282e7bad82d88f9114bd861fa6984f88f6e898f0aafedcb70fc827038bec0fc6ee5d391ff
 DIST wayland-1.10.0.tar.xz 368976 SHA256 4bf6e790aa6f50ab3825676282ecd75850ec9c4767af96ecb7127b1f3c3d60dc SHA512 772e89bdfa494bc263b5c6c4692784738e55a6c6196d5a8e6180f269e0c2d7592f159efb0dca1b1489273e14ba8cda16f5522e58fc9824beff8688f11a00f985 WHIRLPOOL 35a6c27deee3b2f1fe272c54f242c77bed84feaed0d47d94d03563bf9738c60ed54f9bd7d26a862ed165de6eb8817decad49b100ed1f10179f00b25a0636b6c9
 DIST wayland-1.6.1.tar.xz 418628 SHA256 d1aeb95b433cab33a928b56cb80efa551802e0a064adb4a8ea1517249d3c10b0 SHA512 28a0980ece2fb4ba0ca688f3913ffba34c2741167d7686be80cfbc9cb56f995282a68173d69d2849eb5c2986684ebe6d5cfaca04518ab74a4512c8dfb4d8d0c2 WHIRLPOOL be307a292c8f939921700fc85c9ad1675c491fdc3e1a16ffc52512e39d971f6afdbd378c60c57a64781cdccb364ed77271e07b64f5c3b7b96abd45a1595dfc4e
 DIST wayland-1.7.0.tar.xz 372004 SHA256 bdea47a2db96f7e53f1ce0351559c0af5b7f7aae7e95f0a884a78af9f1057c9c SHA512 2475a5e8c2ef5c4bc97d90f946a89e4155d840a342886a7634df5423e5764973dbf5d721e1a8a941b7bd2305017cdcb74af7a29bee7bb8b58373306e5c03add7 WHIRLPOOL 152be0d1c3ac314cd3dcd765e6a04eaa71b618b1577c423147ccb5b1d82cdeaf09d09c8933746e6bd100b2d59374749084eede36b9075a153328fda179955ea2
 DIST wayland-1.8.1.tar.xz 374116 SHA256 f17c938d1c24fd0a10f650a623a2775d329db3168b5732e498b08388ec776fc8 SHA512 392edd22203fc44a37a66d7a099d0534f047f49e91b28614092346f0167c07a39431c5919f2ea1deaf460dc53a77fba8504a7a7f5d03af638267c767bb07ae19 WHIRLPOOL f15ea109324c0c84b848f458acb6786248fb1c7ee8dafd6ef945d4f80f5b87b911dd2d2c0485b1ceeeed95454990e186e7d8b04d366f903954dd8998a1f3999f
 DIST wayland-1.9.0.tar.xz 351096 SHA256 9c8770720aa0034479735f58a4dc4ca9b172ecfede28f5134312e135b7301efa SHA512 245569f404474ab25e4f771d7652e77674363ac43233d49ecfeff0c52f02d34231064c17d56e61b6822259cb3956fc8c3789d788d9a84716f947915ad62fee6d WHIRLPOOL ce46b5568b6c6b23bec5129030680c7486cb6b6a7e761fbb5041b640d5a14eb45f88f46c4ea6b0a7e9cbda425bed13ae7ff58618ce3d1346f7422f8da4649060
-EBUILD wayland-1.10.0.ebuild 1426 SHA256 3351f9aac9bf931fc83c4e0498510d552542d0225f82e10a6929b48335375593 SHA512 1db91e830be063b88fd205f78fafb8f488495935cdebd3767fe1455fec838b9e86cd06fe9bdf7248c5dc36d751f76cf3afcbedc31564d9072d49eea5b6fe86d9 WHIRLPOOL 98e5bfaee1d421ccccfe3e2b938585fac9ca4dd5850196f98a06ed611b34abae74bcc160f5605cc30af339dea283c59a3f3bf5142924699087c9edabe502dc51
+EBUILD wayland-1.10.0.ebuild 1546 SHA256 6cd425e1b35d0e56ffe019a174b4e1006b50d36b11797c77ce964d9b392c8e24 SHA512 cae2aa95eef3d2baa015dad390f9403ae79edaf6d5f101636f2dd006e9c7c8afb33a92151b43f53c67c1f0c66069bafc77bff58d5018f487375c0e97b23f45a9 WHIRLPOOL 69e2229bbfe33d854bc04bcf3d82c5062da6e1816a6a6beaa4a32076153b31b3b7d7e904501a7f875c3f9f16fa17e6f7d9096bf10b0b0e2128232e41f1a932eb
 EBUILD wayland-1.6.1.ebuild 1318 SHA256 1f137f346dd49e18f6458ed10ef2ea73666005c5ab38f6b1f7bc3bcc1829e6d0 SHA512 b18764c8bad6f2511187e15b486b73f32b438cc6579d63a8ed9d3c9a2f4c8ae9aafa735b4e9cdb76575d1909ba00c1d66be9e6ac6256742fb9d9fbfb24d66406 WHIRLPOOL 741e4e38ef665a4793e20c070efa4f01ca1331e4e5c53dbe972e001b9c015961c94da8240f82ace020f144fc633a5888be2b46e8e283980d5c583af1f70cc000
 EBUILD wayland-1.7.0.ebuild 1401 SHA256 4f3d5e3ba1624076ca50461b578971fff94d42503b1570f4dbd8a3be13d3f3d7 SHA512 1f121e5fe255ca36a590a0b4617975ad809b685970c9c0435033c224ad3f6b79a5a8115f4f4b19c96adaf140ffbc4f4f99793ec27b0e5959fed9ad2ddbf94bb4 WHIRLPOOL 86f3471510c121a947915443f7815c78d693cb48513cebb93223a842c7ab64b8d2af82479adce46076144a5ad006c84409df7f9f6a149a61435696d3cddfafb0
 EBUILD wayland-1.8.1.ebuild 1414 SHA256 6b915d8cdad06021722fc113df2133e30e1321a7b165332642af33ee73721552 SHA512 454b65cf89f3823d19d01603034620cb1fe9d10ef481a47b4ae3441efc1c80a253b9605eab84f1b8b8e267e813d6f2cf2d913d27d83ee457c492bc35b752f2c1 WHIRLPOOL 2ad3d77ff56d0f3f19d7cd8c8b20dda6606fffc10122485b9b341faf8e4dc487d65dc3bd5dc3ea7eb2dd1bae05e64389e4931316ce9913afc26a81065380bf3f
 EBUILD wayland-1.9.0.ebuild 1434 SHA256 bbae0763467852587ba48d137c1b65d9ed79ad3d16f515030783a92a91c28905 SHA512 499365d1271be9a7df40b88d1a5febce03614cce6d2a3bfa2ba4475fbd4fe1cf645afe2a1d55049bf62ffd8b2c5a6e166708d48449060a260b0f922783507af7 WHIRLPOOL 0cca78ee78c687f304a8c32fdc935cbca5f5bdf9dc1062fcdb1c65c5147cb1a99e37ac288782a13ddeaf4fa159d69a401a4869c143607a7a85874a5771fdcc4b
 EBUILD wayland-9999.ebuild 1426 SHA256 5f92c2144eb534409c1d02dd59020fccbf6b4ee733b9b6023fbb5804ce6b9bbe SHA512 3c928ce4d368fad5401e142b6bd3a4646e970d718da470b7e2a67a47270b32e0ed851cb2fcd0eabebc15b0fc32e9edff4c62540fd9d2c0aeaff1ae285730ab79 WHIRLPOOL ed63937d92086231479faadb44e01da6612f4df73b279b5cca3f8852013addebcc04d9ef5eb6460667a3fc5a3514e2193e5b29e66b42e9e2f168acedeed1f56f
-MISC ChangeLog 6273 SHA256 db7d6683e14d9ff1269d7c77c7a39a975d03a9b68911ec802d2610f02e8dc239 SHA512 e8a0c5e0b6533b481dfbcebe46537201c68ea7bbf8ce919175bd9f208dff0fd87525b4703d43812515d43a35b71f6a9c8e24f8fafabbf3132cb0474726697382 WHIRLPOOL 5ab4d875ce004cb23bffdb2231e374894a1b1d148b7ddf1d608cd47365c82916f9b80f389fec8e80d86016a7f805de9f1faa5e87587bb2a9f134081b89f2d73f
+MISC ChangeLog 7646 SHA256 82e01c712625a164d2896a5c7326668059d2d9da7dda49ce68edfd3f9cb088c1 SHA512 9fa38aca4de0a50ef7dd31406b6f81c3398f6d263c7119de132f83936dce3edafd141307bd16567aaa4e72dfc9fb8cef6e81660b4e9d747bbf8815f8fbc841b1 WHIRLPOOL 0713359c418ff044d8068435a36a9438c98dd8d8c5d964b0e20f9471f49759d6f79bc54aae6c2bfd333b512907f70bf6c1a2049676063195c581d1209d015f87
 MISC ChangeLog-2015 7732 SHA256 2177b13b768f49cbf63dd070a21c19c148369ea8a152a21fe51e814ae973d9b6 SHA512 ead3413ae410a0461754088a17c4ddb7ff23e9a6f5c729567fd932e34e49a87230fd110fbcfb786c6d0de816dd50fa2e30192f55ed64d6f5423a4920ec8929cc WHIRLPOOL 0f93f566516a47ae3e6886c575353367b2616f09f67db6002e21da182f426d47f261f96312711e1d505c6f411820ae8d2a0fe6b41dc2d4718481f708cc41b0d6
 MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
--- a/dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch
+++ b/dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch
@ -0,0 +1,223 @@
+From: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
+Date: Mon, 29 Feb 2016 14:59:51 +0200
+Subject: [PATCH] build: fix ./configure --disable-dtd-validation
+
+When configured with --disable-dtd-validation:
+
+  CPPAS    src/dtddata.o
+src/dtddata.S: Assembler messages:
+src/dtddata.S:39: Error: file not found: src/wayland.dtd.embed
+Makefile:1520: recipe for target 'src/dtddata.o' failed
+
+This is because the variable name used does not match the implicit
+variable name in autoconf.
+
+Fix the variable name, making both --disable-dtd-validation and
+--enable-dtd-validation to what they should.
+
+Do not try to build dtddata.S if dtd-validation is disabled. It depends
+on wayland.dtd.embed which is created by configure only if
+dtd-validation is enabled.
+
+If not building dtddata.S, also make sure the extern definitions in
+scanner.c are compiled out.
+
+Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=575212
+Reported-by: leio@gentoo.org
+Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
+Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
+Tested-by: Bryce Harrington <bryce@osg.samsung.com>
+[Mart: Added Makefile.in and configure changes to patch file to avoid autoreconf]
+Signed-off-by: Mart Raudsepp <leio@gentoo.org>
+---
+ Makefile.am   |  5 ++++-
+ Makefile.in   | 20 ++++++++++++--------
+ configure     | 18 ++++++++++++++++--
+ configure.ac  |  5 +++--
+ src/scanner.c |  6 +++---
+ 5 files changed, 38 insertions(+), 16 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index e850abc..49e25a6 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -23,11 +23,14 @@ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA =
+ 
+ bin_PROGRAMS = wayland-scanner
+-wayland_scanner_SOURCES = src/scanner.c src/dtddata.S
+wayland_scanner_SOURCES = src/scanner.c
+ wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(LIBXML_CFLAGS) $(AM_CFLAGS)
+ wayland_scanner_LDADD = $(EXPAT_LIBS) $(LIBXML_LIBS) libwayland-util.la
+ pkgconfig_DATA += src/wayland-scanner.pc
+ 
+if DTD_VALIDATION
+wayland_scanner_SOURCES += src/dtddata.S
+endif
+ src/dtddata.o: protocol/wayland.dtd
+ 
+ if USE_HOST_SCANNER
+diff --git a/Makefile.in b/Makefile.in
+index 6d9ffb2..32e6d51 100644
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -82,8 +82,9 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ bin_PROGRAMS = wayland-scanner$(EXEEXT)
+-@ENABLE_LIBRARIES_TRUE@am__append_1 = libwayland-private.la
+-@ENABLE_LIBRARIES_TRUE@am__append_2 = src/wayland-client.pc \
+@DTD_VALIDATION_TRUE@am__append_1 = src/dtddata.S
+@ENABLE_LIBRARIES_TRUE@am__append_2 = libwayland-private.la
+@ENABLE_LIBRARIES_TRUE@am__append_3 = src/wayland-client.pc \
+ @ENABLE_LIBRARIES_TRUE@	src/wayland-server.pc \
+ @ENABLE_LIBRARIES_TRUE@	cursor/wayland-cursor.pc
+ @ENABLE_LIBRARIES_TRUE@TESTS = array-test$(EXEEXT) \
+@@ -101,7 +102,7 @@ bin_PROGRAMS = wayland-scanner$(EXEEXT)
+ @ENABLE_LIBRARIES_TRUE@	resources-test$(EXEEXT) \
+ @ENABLE_LIBRARIES_TRUE@	message-test$(EXEEXT) \
+ @ENABLE_LIBRARIES_TRUE@	headers-test$(EXEEXT) $(am__EXEEXT_1)
+-@ENABLE_CPP_TEST_TRUE@@ENABLE_LIBRARIES_TRUE@am__append_3 = cpp-compile-test
+@ENABLE_CPP_TEST_TRUE@@ENABLE_LIBRARIES_TRUE@am__append_4 = cpp-compile-test
+ @ENABLE_LIBRARIES_TRUE@check_PROGRAMS = $(am__EXEEXT_2) \
+ @ENABLE_LIBRARIES_TRUE@	exec-fd-leak-checker$(EXEEXT)
+ @ENABLE_LIBRARIES_TRUE@noinst_PROGRAMS = fixed-benchmark$(EXEEXT)
+@@ -382,8 +383,10 @@ am__socket_test_SOURCES_DIST = tests/socket-test.c
+ @ENABLE_LIBRARIES_TRUE@	tests/socket-test.$(OBJEXT)
+ socket_test_OBJECTS = $(am_socket_test_OBJECTS)
+ @ENABLE_LIBRARIES_TRUE@socket_test_DEPENDENCIES = libtest-runner.la
+am__wayland_scanner_SOURCES_DIST = src/scanner.c src/dtddata.S
+@DTD_VALIDATION_TRUE@am__objects_1 = src/dtddata.$(OBJEXT)
+ am_wayland_scanner_OBJECTS = src/wayland_scanner-scanner.$(OBJEXT) \
+-	src/dtddata.$(OBJEXT)
+	$(am__objects_1)
+ wayland_scanner_OBJECTS = $(am_wayland_scanner_OBJECTS)
+ wayland_scanner_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) libwayland-util.la
+@@ -491,7 +494,8 @@ DIST_SOURCES = $(am__libtest_runner_la_SOURCES_DIST) \
+ 	$(am__resources_test_SOURCES_DIST) \
+ 	$(am__sanity_test_SOURCES_DIST) \
+ 	$(am__signal_test_SOURCES_DIST) \
+-	$(am__socket_test_SOURCES_DIST) $(wayland_scanner_SOURCES)
+	$(am__socket_test_SOURCES_DIST) \
+	$(am__wayland_scanner_SOURCES_DIST)
+ RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ 	ctags-recursive dvi-recursive html-recursive info-recursive \
+ 	install-data-recursive install-dvi-recursive \
+@@ -918,8 +922,8 @@ dist_pkgdata_DATA = \
+ 	protocol/wayland.dtd
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = src/wayland-scanner.pc $(am__append_2)
+-wayland_scanner_SOURCES = src/scanner.c src/dtddata.S
+pkgconfig_DATA = src/wayland-scanner.pc $(am__append_3)
+wayland_scanner_SOURCES = src/scanner.c $(am__append_1)
+ wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(LIBXML_CFLAGS) $(AM_CFLAGS)
+ wayland_scanner_LDADD = $(EXPAT_LIBS) $(LIBXML_LIBS) libwayland-util.la
+ @USE_HOST_SCANNER_FALSE@wayland_scanner = $(top_builddir)/wayland-scanner
+@@ -929,7 +933,7 @@ libwayland_util_la_SOURCES = \
+ 	src/wayland-util.c			\
+ 	src/wayland-util.h
+ 
+-noinst_LTLIBRARIES = libwayland-util.la $(am__append_1)
+noinst_LTLIBRARIES = libwayland-util.la $(am__append_2)
+ @ENABLE_LIBRARIES_TRUE@lib_LTLIBRARIES = libwayland-server.la \
+ @ENABLE_LIBRARIES_TRUE@	libwayland-client.la \
+ @ENABLE_LIBRARIES_TRUE@	libwayland-cursor.la
+diff --git a/configure.ac b/configure.ac
+index f54a8b9..b27f34b 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -76,7 +76,7 @@ AC_ARG_ENABLE([dtd-validation],
+ 	      [AC_HELP_STRING([--disable-dtd-validation],
+ 			      [Disable DTD validation of the protocol])],
+ 	      [],
+-	      [enable_dtdvalidation=yes])
+	      [enable_dtd_validation=yes])
+ 
+ AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
+ 
+@@ -112,7 +112,8 @@ PKG_CHECK_MODULES(EXPAT, [expat], [],
+ 	 AC_SUBST(EXPAT_LIBS)
+ 	])
+ 
+-if test "x$enable_dtdvalidation" = "xyes"; then
+AM_CONDITIONAL([DTD_VALIDATION], [test "x$enable_dtd_validation" = "xyes"])
+if test "x$enable_dtd_validation" = "xyes"; then
+ 	PKG_CHECK_MODULES(LIBXML, [libxml-2.0])
+ 	AC_DEFINE(HAVE_LIBXML, 1, [libxml-2.0 is available])
+ 	AC_CONFIG_LINKS([src/wayland.dtd.embed:protocol/wayland.dtd])
+diff --git a/configure b/configure
+index 83e4971..6340d4f 100755
+--- a/configure
+++ b/configure
+@@ -711,6 +711,8 @@ HAVE_XSLTPROC_TRUE
+ XSLTPROC
+ LIBXML_LIBS
+ LIBXML_CFLAGS
+DTD_VALIDATION_FALSE
+DTD_VALIDATION_TRUE
+ EXPAT_LIBS
+ EXPAT_CFLAGS
+ FFI_LIBS
+@@ -15728,7 +15730,7 @@ fi
+ if test "${enable_dtd_validation+set}" = set; then :
+   enableval=$enable_dtd_validation;
+ else
+-  enable_dtdvalidation=yes
+  enable_dtd_validation=yes
+ fi
+ 
+ 
+@@ -16114,7 +16116,15 @@ $as_echo "yes" >&6; }
+ 
+ fi
+ 
+-if test "x$enable_dtdvalidation" = "xyes"; then
+ if test "x$enable_dtd_validation" = "xyes"; then
+  DTD_VALIDATION_TRUE=
+  DTD_VALIDATION_FALSE='#'
+else
+  DTD_VALIDATION_TRUE='#'
+  DTD_VALIDATION_FALSE=
+fi
+
+if test "x$enable_dtd_validation" = "xyes"; then
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML" >&5
+@@ -16669,6 +16679,10 @@ if test -z "${ENABLE_LIBRARIES_TRUE}" && test -z "${ENABLE_LIBRARIES_FALSE}"; th
+   as_fn_error $? "conditional \"ENABLE_LIBRARIES\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+if test -z "${DTD_VALIDATION_TRUE}" && test -z "${DTD_VALIDATION_FALSE}"; then
+  as_fn_error $? "conditional \"DTD_VALIDATION\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+ if test -z "${HAVE_XSLTPROC_TRUE}" && test -z "${HAVE_XSLTPROC_FALSE}"; then
+   as_fn_error $? "conditional \"HAVE_XSLTPROC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+diff --git a/src/scanner.c b/src/scanner.c
+index d3e2328..04747e3 100644
+--- a/src/scanner.c
+++ b/src/scanner.c
+@@ -40,13 +40,13 @@
+ 
+ #if HAVE_LIBXML
+ #include <libxml/parser.h>
+-#endif
+-
+-#include "wayland-util.h"
+ 
+ /* Embedded wayland.dtd file, see dtddata.S */
+ extern char DTD_DATA_begin;
+ extern int DTD_DATA_len;
+#endif
+
+#include "wayland-util.h"
+ 
+ enum side {
+ 	CLIENT,
+-- 
+2.6.4
+
--- a/dev-libs/wayland/wayland-1.10.0.ebuild
+++ b/dev-libs/wayland/wayland-1.10.0.ebuild
@ -29,7 +29,8 @@ SLOT="0"
 IUSE="doc static-libs"

 RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]"
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:="
 DEPEND="${RDEPEND}
 	doc? (
 		>=app-doc/doxygen-1.6[dot]
@ -39,19 +40,19 @@ DEPEND="${RDEPEND}
 	)
 	virtual/pkgconfig"

-src_configure() {
+# dtd validation configure patch is upstream and will be part of 1.11
+PATCHES=( "${FILESDIR}/${PV}-build-fix-configure-disable-dtd-validation.patch" )
+
+multilib_src_configure() {
 	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable doc documentation)
+		$(multilib_native_use_enable doc documentation)
+		$(multilib_native_enable dtd-validation)
 	)
 	if tc-is-cross-compiler ; then
 		myeconfargs+=( --with-host-scanner )
 	fi
-	if ! multilib_is_native_abi; then
-		myeconfargs+=( --disable-documentation )
-	fi

-	autotools-multilib_src_configure
+	autotools-utils_src_configure
 }

 src_test() {
--- a/dev-ml/bolt/ChangeLog
+++ b/dev-ml/bolt/ChangeLog
@ -63,3 +63,9 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org> bolt-1.4.ebuild:
+  add ocamlbuild dep
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
--- a/dev-ml/bolt/Manifest
+++ b/dev-ml/bolt/Manifest
@ -1,5 +1,5 @@
 DIST bolt-1.4.tar.gz 638005 SHA256 595c0441655a82b8e6d3d3f8dacf89e68d33c682dee62a97ea2eece4b5adc088 SHA512 799ca80603fb4f0979ae7bf7ac5acdab7a0187713021a4277d5c3f5af31ffdea042ab312754a6d20a8849b90d36327aa0cad1d6efbc20cc07a3e86dd733e362e WHIRLPOOL c18d42410b1b55b54e8f6fcba0915a8577c26fd80ffb4827d3db1101452624eae4266be1bf4fc59b4c5cc02f49088e7fcd878c42928472f944b8c6b8fafb653b
-EBUILD bolt-1.4.ebuild 669 SHA256 bdb3a908b283be335db6d0bcedff72c6d2e7fd2f699f6001ca5f7adea3cd5dbe SHA512 7140b3d3b615334566386068032d708b511f5f24083e99478fee0b92b9cfcf04915876c883917863b095a9eedcb16c9d853775c49ca9f3d8adf3f3dc2247ec77 WHIRLPOOL 61903d2bcea8b55666987954c260e83885476950dd881da766be34d8b0c9bc533d0db64d03b66ad3b4d74d74b0fba0ffc7525164b270efea955db51687a2bcc4
-MISC ChangeLog 2412 SHA256 f5395ca578c8f7dd2722925a66aa81f33d7b8e4cad272f563cef4f73f7984b26 SHA512 0d0f40c6b70a292227cee8776ff7a7d4d55a33e1cc456bf7b7cf93664afb3e953c3167adbd8782b16b7e16a1628260a96a58e8cd301af8da4aca50d8521467d9 WHIRLPOOL 984d81a6ece5c6253ddc5ccda9e9693c9f1b9ca16a548b0712c3c97c922a7865723aaf71bb62b7422d6cb454acc73d81e1d5dab641aa66346f8290b624e8061c
+EBUILD bolt-1.4.ebuild 660 SHA256 ef6ca55fa135070d84ce5d2446f3a6ae1d1daedd13138b42109de6ba78571e48 SHA512 5e295dd4a6e2645093492b9397f03311f27889356a0930c8cb45c63b7da48c17b4bff69aac8b050848a3e7f518b0fa3ea78bd9ed155c6a1a1d02fdc43ddef16f WHIRLPOOL d22e3dcd6e8209f30026801715f9a67c5b0903bca26dbda9f2ac0c1e0f08441872de84266f945f30610d905f00c303c4f45db9736b57dbc946420cd2e91eab0e
+MISC ChangeLog 2592 SHA256 84d71d44576b1ec634982760f64d1e9d11202324b404dedd3694f8853079b8a1 SHA512 c13b44f6f31752ea2a7b6565cd2bc4c3a0d45b63273465079e9982f417381c190a6035e8dcf33cf931e4a26eb26ee05e0f5f5e95b03da8343a7d20d6c549942a WHIRLPOOL e52caddf0ff9fb8b413b626933e06be9fea1888577fc277db40276eb572ba30ea949cbacc55aa41075bc3254c654775094f71178fc2b70100e4847d9af62cf04
 MISC ChangeLog-2015 884 SHA256 3830a68a9846368c8131637a24561d1e666f39cd63d8c0c71d7fa5d628ad8e95 SHA512 6c422680278baae4e9ea761a6f4e70341ecbcc83131724940949e13f579d0fa8773abe0e4fa5b031a85047d6fc56dff9d40596dfe8085999f02693ccaed72cdd WHIRLPOOL 66b2bbc22e115fa22c4c50fe926e9cf5689e60f38959f4e14739bc13b3d882841e9f86c0114083c3dee0fccaecfbd039c55d13bd97719ffefdd58068827eeb9d
 MISC metadata.xml 243 SHA256 5e9b58b0b795266f973d066675839499e3a56d7d932d702404a4b91ded8eb26c SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449 WHIRLPOOL 085df2e84901cbe563c7c1d30d04c229547f15f8ee26ac61d44d07c3f6999f2bbfa4cf309963172fb507cce5450d27598b762c3ccab92351601965c3afc05e3a
--- a/dev-ml/bolt/bolt-1.4.ebuild
+++ b/dev-ml/bolt/bolt-1.4.ebuild
@ -15,9 +15,11 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="doc"

-DEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt]
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt]
+	dev-ml/camlp4:="
+DEPEND="${RDEPEND}
+	dev-ml/ocamlbuild
+"

 src_configure() {
 	sh configure
--- a/dev-ml/camlp4/ChangeLog
+++ b/dev-ml/camlp4/ChangeLog
@ -106,3 +106,17 @@

  Package-Manager: portage-2.2.27

+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org> camlp4-4.02.1_p3.ebuild:
+  add ocamlbuild dep
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
+*camlp4-4.03_p1 (01 Mar 2016)
+
+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org> +camlp4-4.03_p1.ebuild:
+  bump to 4.03
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@ -1,5 +1,7 @@
 DIST camlp4-4.02.1_p3.tar.gz 646389 SHA256 c28058b20016dac51d492b1a98e6453d2c7097100542c99a0593cc240a3eeada SHA512 59d196be0bb7410ffd48a3d2debff4502ca58e7b032027b27b9d126381c02336f177a47585a7d7a3142049930c21dbe075068852e6369fe7e8a58e3339d96041 WHIRLPOOL bedcbaa86a1282bed6d51a64b1877575e727cbf2485abf38bcbed49b18cbad9e8548e0fb413daf216f3d78fde2710c95de49a5055cbb3548eb284515148a3e7d
-EBUILD camlp4-4.02.1_p3.ebuild 980 SHA256 ca5eef2405632a54f653987e8e18d2c93173113143ccb500f6561d38e163b93f SHA512 5f4e9c46661422c3b0635866a7f7d42601fb7bd3451666fcdbe8f5ec36c3920bfa92ba12a7871c6fb9934cd829f35bc73aadbf78e12df524d471de1b31f61882 WHIRLPOOL 1194ed609c30a7e6590c8c5a26e75b1798c7b80e09f0aac5b649394648f4b67a9748225e7eac418c3f94e78b7ce28b610cc975b836b3748ce99aa40fb8ba41a1
-MISC ChangeLog 3670 SHA256 031022a2ca36640b19b563b4c3a3bc36742888f69c820b7220aa151f04d37c7d SHA512 d50b46c0716e1e8d0a8686a5530e39edb86a5f5d90d7390698eaa21c86ab7b683f480487440251385d49c8acae7423d6a5e2e3ee5833fd14a83c1d51ae49eeba WHIRLPOOL 714f08996c31b8bde2d88e2e63db34b306bd8ef8745b1eb373c573da2f7ad6f5605271ac88531ef2b84916b514e846448296ce16de20bdf8089b61b288120a38
+DIST camlp4-4.03_p1.tar.gz 648030 SHA256 6eefeacced81cca59ddf90c2538505fd5cd6596a3fc1acf4971e9796c2e7f2ae SHA512 0a329e18deffebb5245415f822f91e692076fca4dbe38748f18e72f417ce7354faed744fdff25f9976659192cb02d56ceb2cf1be5c64da463413ec4a28a9d3ac WHIRLPOOL a9aa6ff12957025ab796b02eec2268d51f71ebd64d395b0b5cad2d9d8bde91da4129f4f6606514c0e1b9480cf2e648158b0bdd6878ee29c3adadee64937bc87d
+EBUILD camlp4-4.02.1_p3.ebuild 1051 SHA256 d163f034607197dcc99453fcaf255b4b942b2fe65cc6a5114b26461acf9c3871 SHA512 34af41b8c74f05ee60c8beef7289eac0e240bb0e33fa1d21c418f3ac945c37da791e9cadc541b3d5fd5f0549219a274efd4207ad9bef85be7ab00a9fcec1fe41 WHIRLPOOL 79e31f6ee0bef2fc09eb554bcd155d3541c7841fc150ca2cfe6380f1433bbf46fe3774dae82edf68530c16dadc70764a9bd60a5ec73a49a65eb59034d1aa468c
+EBUILD camlp4-4.03_p1.ebuild 1063 SHA256 e22fdefbcada53ae7b14671bbe0f3053b9ed09d845c21de2f28e6991161ed84b SHA512 e2783e96146b3db7164512c1ba4fac01d9ec499dd95d7dcb2d77770ff4ab866b719ebf70acf1152d76957ddede86ea47be21038c13b9f71e0fde2995fd608726 WHIRLPOOL 0aef16792550697ab61c9273fc3e283801c4c6af4712ab18da3cba8532bfbd2c4e1190c5921f069364e905cd0f2e199a2ea576ffc365566642b7ca2eb350c710
+MISC ChangeLog 4070 SHA256 4439c4c32f3d7bb4cb417d9e68fa7788fd8f04d6b5bb91660f65c1f0c1c66794 SHA512 62dc3949b58a0b16e13406000be0213024cac1a5130389a4c5951de73e6904ec5d4a805ba955b49a8e729b5d95785a4ba6ca28b6b59f88df612eb516dc3667b9 WHIRLPOOL 8562eba02243f57f1d1f4ee89eb2597988c2940ddaf12e6cf29de2758732bae4c48e99f89928e80850fdaeb9da20b8a7712603eaf9f6f2a432b0fb2a7474c6a6
 MISC ChangeLog-2015 1236 SHA256 70b3c7dadda94faeda5ead0990d373f5b61c1af79b8e5374315cebe4793b08ea SHA512 da997ee9065d559466b71662d74cfb19e07c4a7c6b65f1625b4f6824b51140597e1f63688061209229203c9c56167dbc0a7d5a5db5b75286c65581f954a5fb55 WHIRLPOOL 4a49bdd8cf884ee514e4bfd36fec9d5fd866f20f89c3208756cb6f0f4ca4aa08e23a12f7d5200bfb6d96a17f357e73248d3935060e4912876a365676ace58e3c
 MISC metadata.xml 334 SHA256 5df2b0e0c7aa173f043a4846c32fbe9b87fa8149d5595bb44a13d7fad0af0302 SHA512 195b9f2bf651b9f57c1f4333dcb1e0b7766c1d39df2faafcf01b16e4aab28a67e2434c2368d62bff16bf14ea3763d66d0d5a47714ef9f2282cd90d00cc49328f WHIRLPOOL 9ef1ea82d86083f413959a5e6e1938fd190af97911762e72d552dc79496c594b0faf4efa9cda2ba10deabe8efd00d3e9d480b4053658af29db7ca54a9e26778c
--- a/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild
+++ b/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild
@ -20,6 +20,8 @@ DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
 RDEPEND="${DEPEND}
 	!<dev-lang/ocaml-4.02
 	!<dev-ml/findlib-1.5.5-r1"
+DEPEND="${DEPEND}
+	|| ( dev-ml/ocamlbuild <dev-lang/ocaml-4.02.3-r1 )"

 S=${WORKDIR}/${P/_p/-}

--- a/dev-ml/camlp4/camlp4-4.03_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.03_p1.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV=${PV/_p/+}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="System for writing extensible parsers for programming languages"
+HOMEPAGE="https://github.com/ocaml/camlp4"
+SRC_URI="https://github.com/ocaml/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.03_beta:=[ocamlopt?]"
+RDEPEND="${DEPEND}
+	!<dev-lang/ocaml-4.02
+	!<dev-ml/findlib-1.5.5-r1"
+DEPEND="${DEPEND}
+	|| ( dev-ml/ocamlbuild <dev-lang/ocaml-4.02.3-r1 )"
+
+S=${WORKDIR}/${P/_p/-}
+
+src_configure() {
+	./configure \
+		--bindir="${EPREFIX}/usr/bin" \
+		--libdir="$(ocamlc -where)" \
+		--pkgdir="$(ocamlc -where)" \
+		|| die
+}
+
+src_compile() {
+	emake byte
+	use ocamlopt && emake native
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-META
+	dodoc CHANGES.md README.md
+}
--- a/dev-ml/cmdliner/ChangeLog
+++ b/dev-ml/cmdliner/ChangeLog
@ -70,3 +70,15 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org> -cmdliner-0.9.7.ebuild:
+  remove old
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org> cmdliner-0.9.8.ebuild:
+  add ocamlbuild dep
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
--- a/dev-ml/cmdliner/Manifest
+++ b/dev-ml/cmdliner/Manifest
@ -1,7 +1,5 @@
-DIST cmdliner-0.9.7.tbz 50343 SHA256 9c19893cffb5d3c3469ee0cce85e3eeeba17d309b33b9ace31aba06f68f0bf7a SHA512 ea1ee186f6072dc836e23a7fcc0756d016c61d4d34ef2416842d1e6e73707b2bbd6aaccd8f57472560dbeab75d3d26159ad8276813882726a11e4530dc6f45e6 WHIRLPOOL 79acdf4807cc5befad01fa1f22a214bc2c6a66dbba4b2b2c041ba72c0b2982d7ca61c632766bfe498987f61d6636a818fae1c96df1bf02e87073c9247b6babf0
 DIST cmdliner-0.9.8.tbz 53249 SHA256 7dfaafdd88ec9d96abf8ded4c0ea7111948194400220a56e4bb44a1edfa4bd41 SHA512 6c71c360eaba7f7127e422a71a00a830a086f1d6750897bea0ebc1cc10f8fdaf9e9532d354abd84dbc6c5fcc1878f19d3f424fd9335e7226b625b63b51c89cab WHIRLPOOL 25739c09f78cc8ade6d0e5805f48eb14a6c42f0891832747caef44fc6135c81feaa0055b2874256bde2270753106c60accd50c24771333c2cb16913d9bd38c3d
-EBUILD cmdliner-0.9.7.ebuild 987 SHA256 cce6555578cc98adf456be40d1a2374b31f6d6c6bfac5fc518c4ed0ca2da0ffb SHA512 115d19f51cbb483aca571eba228a77ceb1ae7dfaf76a12299da04c213cd5e417e93fad11fe11f4f848028d5e65ed36a178974cbf13985473f2d0a96308cf090c WHIRLPOOL b2a568352505b04038606a1d5135ec14431a9f4aca2b442641a4c637d54a20185d9ee54d089f90ca32a7546aee00a92c3a5018c2668f01d20cdb9ae5012675b3
-EBUILD cmdliner-0.9.8.ebuild 987 SHA256 cce6555578cc98adf456be40d1a2374b31f6d6c6bfac5fc518c4ed0ca2da0ffb SHA512 115d19f51cbb483aca571eba228a77ceb1ae7dfaf76a12299da04c213cd5e417e93fad11fe11f4f848028d5e65ed36a178974cbf13985473f2d0a96308cf090c WHIRLPOOL b2a568352505b04038606a1d5135ec14431a9f4aca2b442641a4c637d54a20185d9ee54d089f90ca32a7546aee00a92c3a5018c2668f01d20cdb9ae5012675b3
-MISC ChangeLog 2587 SHA256 365f5fc51691ae35dae2be528424222f3064b216826b58289932ff771ec3e3ff SHA512 d6beeaa46ab49000d3e138cc8cd2a61a0e4a561b466e80da8662b160257381607026f60a50f65452d7bd9ea02e761985cd29cbc2ef30cfc5441f2c6f3f1f8c1e WHIRLPOOL f1a8a2abce2679df7ce8fee1b719bd51059937d1e29fac6bb1f47b332ca54e22b1a1ad999e1b838656bf64d51d348dca7ae84823d5d32966c89fc4288af84548
+EBUILD cmdliner-0.9.8.ebuild 1007 SHA256 c3ea2b07a98f6ff43ddc7c779d644ce13c2e4337a5d6ac1c3d67ee516b36a8bd SHA512 77a8241a07d3ffa92ecbb65eb843d0ce6e769b4ad3f4c53f2c95e61d7ab4d2c4dd79c04327430ebc0dbcd34eb0eadafcf2ac58069a6af16d0c874d688205806f WHIRLPOOL 027ddd6feeada48e78be00f65c5ba3fa4231ee6b4a3ecb4d958c7a23ab5ba0b624d4fb561d84e0ab8ed94ba906623bc5b93b3261df897cfe53678dcf1d2a7a88
+MISC ChangeLog 2952 SHA256 6adf02972874d47d5772a184cff0d6c06d270cd76150ceae4aa7724b0b46218e SHA512 03594c183bda33b6bb05c13a1f0dd72f9c65ac0c22cb06afdf1dc67e0e16380454153bd23383406b369b4543cdf01598905158e052574305878401f29f6d16cb WHIRLPOOL 7df3bb93650a9a21778a456ea245ab9f9482b0c470bd9ff68f8df642a77894e896bca1b08b132ab420dd721b26eac400cf3df8bac8ab6963b7517383333ca00d
 MISC ChangeLog-2015 900 SHA256 2509a5388e7908fbc5a8b786df0d232070e174d1fbda506966561711fe61e2a4 SHA512 dbb3fc6097fe7c66026caf1e784dcfe4b20baea1276b8e975b7d8c2937453d27c460afda52d69bf25bbdc04d6c950a53ed1ba9f6db8346921f2fd604b4b0d872 WHIRLPOOL 39bd1e7573409dafca334159c2d8969a280d77c9a3e5ede87f4985cbb78ca73670d05cfa3f8d0b4c5671ed9e829e8cc2a31b696872d63de4d3e6c0efc35f8444
 MISC metadata.xml 243 SHA256 5e9b58b0b795266f973d066675839499e3a56d7d932d702404a4b91ded8eb26c SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449 WHIRLPOOL 085df2e84901cbe563c7c1d30d04c229547f15f8ee26ac61d44d07c3f6999f2bbfa4cf309963172fb507cce5450d27598b762c3ccab92351601965c3afc05e3a
--- a/dev-ml/cmdliner/cmdliner-0.9.7.ebuild
+++ b/dev-ml/cmdliner/cmdliner-0.9.7.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Declarative definition of command line interfaces for OCaml"
-HOMEPAGE="http://erratique.ch/software/cmdliner"
-SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="doc +ocamlopt"
-
-DEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	ocaml pkg/build.ml \
-		native=$(usex ocamlopt true false) \
-		native-dynlink=$(usex ocamlopt true false) \
-		|| die
-}
-
-src_install() {
-	# Can't use opam-installer here as it is an opam dep...
-	findlib_src_preinst
-	local nativelibs=""
-	use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)"
-	ocamlfind install cmdliner _build/pkg/META \
-		_build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die
-	dodoc README.md TODO.md CHANGES.md
-	use doc && dohtml -r doc/
-}
--- a/dev-ml/cmdliner/cmdliner-0.9.8.ebuild
+++ b/dev-ml/cmdliner/cmdliner-0.9.8.ebuild
@ -15,8 +15,9 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="doc +ocamlopt"

-DEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
+DEPEND="${RDEPEND}
+	dev-ml/ocamlbuild"

 src_compile() {
 	ocaml pkg/build.ml \
--- a/dev-ml/cppo/ChangeLog
+++ b/dev-ml/cppo/ChangeLog
@ -102,3 +102,9 @@
  Package-Manager: portage-2.2.27
  Signed-off-by: Alexis Ballier <aballier@gentoo.org>

+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org> cppo-1.3.1.ebuild:
+  add ocamlbuild dep
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
--- a/dev-ml/cppo/Manifest
+++ b/dev-ml/cppo/Manifest
@ -1,5 +1,5 @@
 DIST cppo-1.3.1.tar.gz 26259 SHA256 2e3e658b0ba24d7217c59e76df3e92d4e03866143da8d206b3267cebccfefc69 SHA512 0e5180ce21bb605733ca4bfd64f1917ccb8772f6d078a23d39710b4dc1c5ede32dcaa3bd30116f17683c4040a7cfc41a4ca541e9c973265ec1dd988e2ec67238 WHIRLPOOL 37cc6699aaabd2642b55e00d3c55bfe442c978eb540889ee396ebecd5e5343e45b7e4322cff65e5add8ea3cf18f379d1d7632389742bac1f30b7cfa67c5af172
-EBUILD cppo-1.3.1.ebuild 669 SHA256 e0880c365a03fda395c3a9322a0cbbea8539cd482f2c02edeb8d6d6740849326 SHA512 12c5b8af67db0b039277cfadd8970cdcbaa884d492d1603e8401320d9f136e9bc8d657a59cbcfbb925656b3da302d8e181bac98ea23392ccc42f020c574dc75b WHIRLPOOL 4a4c3917ceb87f33593476272fcba04bb6857c5a47ddbc11e01a8fcecee37ecd5148314f64d483fa8bd16826516a5398db13d82b5d433437863e11971f27d9bb
-MISC ChangeLog 3467 SHA256 3c6e52f9ea5f9d7b07bc021bb8e3122d94b357ba34eb5b4b73722660f19372d3 SHA512 de3a41f108764d38d34db1298464933c2fa743b655cb500a1122dbe7ef06d6cc653c5b7e26181a123c4ba01060f1c87e5ccc2f5fa147a40c8a98c9863030795f WHIRLPOOL a20f29686b7063f76cb9e9694e1f62f3ebb140fbb097709db9cd2617e3bed3af7fc6d028f3f4e76af4a21d90e8c3fbb5cf13c83b65958735b2b25718d78ceb9f
+EBUILD cppo-1.3.1.ebuild 688 SHA256 fcad0e9d108110e029b500592a0c33477ece56dfb4c3551b7d39a57a9f229be9 SHA512 099a26d075900d5dffdc6c822421d9d19724782de8639c49631283984f961fea4cf6cf098bfac7562c12a35fedc165b3ddfef4e5d090064bcf064e50cfa9ff17 WHIRLPOOL b423cd273cf2fd6aaded77743e8f89de4d9f2f87d57ddb6a84ae65f5dd46fa4e8760e17d31cfae51a578af38c02f3f4bc1ca8999144e6776bd949441a21f5480
+MISC ChangeLog 3649 SHA256 ceb53b18afd29e64dc9e0b36927b2a5acf0e14da5f32c6271ad2a54b0f5b3ebd SHA512 b3e4cdb79abf956f9eb9b95b62dd36d9bef39487ac212e1bd773063917ba51c1bc1351dc0f8d77c463439d7aa04dc9e23737bd3ea0f29c02ce7f8b9eaa01bc0f WHIRLPOOL 9081341f62f16183279cd68efc808e2c10d2b20e76530177c34485a7cfb57f9e4a610d7ed84e26c357a90ef631b752a0572a5c7e65fe6a61f401df1c6dd49131
 MISC ChangeLog-2015 637 SHA256 c77e690b39e3f1eea4cddd70bcbb71b08c3e9d9234ca0e76e39049e7cee564e7 SHA512 fabd868a66abf21925726ea03611c4ff999fd895bcbb4a09b0d8ed2f19d723c48ae2221bc8e31a923fe942a78919e6504b3839e3358849d2ad3fab38ce2f3164 WHIRLPOOL 735560476c68d02fa19d0d21bc0b2cf480ad580a55146044acaa51f98409b84110969b8b88c91f083d9a46b27f4dd3b13e61b26bac9e130cbf28f79c4116ad52
 MISC metadata.xml 324 SHA256 59a1972629d6453d2d3e85ccf04e7b4fc83563f7787c391e876b9a0a5bd6813e SHA512 18ce12b17096d2de1fddf54e1e1db287a53ccd0d77072806c2efe695dfa9f1d70a55c0ce546fd3a0a1f7db0931a3235231e35f8df93f4adfda81c416561b16ee WHIRLPOOL 2f6ecaef1136e53147892a3209f5bcad0d798c3fd63f953804e3526c1a1974696c6661e83374c561662465efb6a71a074fa4c02d0b4d2b106ef31321e5731e3b
--- a/dev-ml/cppo/cppo-1.3.1.ebuild
+++ b/dev-ml/cppo/cppo-1.3.1.ebuild
@ -17,7 +17,8 @@ KEYWORDS="~amd64"
 IUSE="examples"

 RDEPEND=">=dev-lang/ocaml-3.12:="
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ml/ocamlbuild"

 src_install() {
 	findlib_src_preinst
--- a/dev-ml/cudf/ChangeLog
+++ b/dev-ml/cudf/ChangeLog
@ -64,3 +64,15 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org> -cudf-0.7.ebuild:
+  remove old
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org> cudf-0.8.ebuild:
+  add ocamlbuild dep
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
--- a/dev-ml/cudf/Manifest
+++ b/dev-ml/cudf/Manifest
@ -1,7 +1,5 @@
-DIST cudf-0.7.tar.gz 54821 SHA256 92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701 SHA512 6adf17c076c0308416f6f8bccb361d03645909f535e6cd0ba34860706e5f26628d33ab4f208fb8def28de1499649279febafd895bdde498f35a77e06128e64fa WHIRLPOOL 798ca87c1cc48d00e62a1e6d627fe6d35839fb16d6b2b10ba42f3eea29e3a48e2f5b070b93647a53833a471b1a6a665e759ab3b7cc2bda238d2dec4a8eb0866e
 DIST cudf-0.8.tar.gz 55147 SHA256 06f8ce019c87893e27d545b5cf8dc38041657a4c4856c02be4e99e8175874229 SHA512 cea9e51094076089b1beb657f6b2ccc6ac5f49660e06743f8ec646b277beb4c830f90156ae240a6903de55d09caee78fb0dc75efd76ca65fd2b40ab8756301e3 WHIRLPOOL 2834b5a3d15bbbefc51cd5e54c1ee2155481cecbc91838fca94470b06750576c0719504e51e858145bdae657de739809007bb5b5958469d71010492f245651af
-EBUILD cudf-0.7.ebuild 1306 SHA256 f0c648dd80e98ce9d26a7dd3037b829f6ebb7b9fd01fc5bc7125d5e29ac45a67 SHA512 7bc79961e05be60a1d1ffefe452e4db77ee374efd5e3c87aeadfb78523b49b37625144baa1454853e7a92f9a3bc6ee820c4329dda21f5f9bec0a043f42b55545 WHIRLPOOL 4f54af8e1e065ebd2434916dfe92c2ff47a9589ffe527a0dd5a0c3089a31bb74daa9ac7dace44dd612c170f7128285ecc993f6e08abcbb000a998be1bfc62604
-EBUILD cudf-0.8.ebuild 1306 SHA256 015a8e12fc16b0fcad767576518a10b824a66386dc82b5d724d7fa5d8cc41bdb SHA512 9adaaa90cd656992753e3dcea65c08caf6d668213229d3dc5ac597b33c0c26fe3b27cd18dff1933d2cc2f52ff990609d4af94900d85ca84c27203ae5a674eb62 WHIRLPOOL 9ffaa6eafff3dd6c3d38e2bf4cd9a12b5a41d2c56e44b1861868b8a04f2fa50a14154d3d5f9fa19f839a5c3b6345801117c4f4cc8e68d8fb41d322fe3ef45c27
-MISC ChangeLog 2454 SHA256 b98ddde9cfeb11adc932aa55b69e1bb0afcd3c50ecc694db37897335983b07e6 SHA512 d6237661411c4fb9fc586b08c2118aff243cf0348d3cc2d3a62d433faaabfe52bd62e000011f22795d6879fcda5daff1ae62a39f8b44bc8efa4df49c45b3df0c WHIRLPOOL 0a2474a3ba6b7fc12ee826a575a735067cdfcf67ef7e7e4318890024d8eee9d5abf9c69d46903a9a01fa4fcea72a47612984c7c5c2021597a531143f351a0b2e
+EBUILD cudf-0.8.ebuild 1295 SHA256 cb2a89cdcaaa22550a3ee5c715f641b8b1bdc1cadfdb030ea6ab84aaf1469a29 SHA512 578ef3177d0d6538708bc05f58fdbd361fad855b77746b4f1d1b334e9cbf8c5fd6e249d43e90c55a99b57837486147c68402989dd1ef76b0cb0f45e574c9ae9f WHIRLPOOL 496436815fb41c9b95f4a505832ae96c9524cc3b09e834daed1029224b3c3b10873ce9730525a347e5a8fc36db4296283a243a19d9c64cc66e2c21cdd896961c
+MISC ChangeLog 2807 SHA256 f12dcb2c70d0654a1da387f1032144837c1c455459e26da40460530ce035676f SHA512 209e96e4e31165cb41acd52ed19d28ac5e5dbbbc3af1040b73ddb3c556af02e99fb372a34696696cd1df686e9d443b0c3d6c6ed10b2a14db36e41b8fb8af68df WHIRLPOOL 0dd26e8cf069b0acd062c3812f0f1c2317fe026e56b95089aa042d2854f73e1826e107682b53fe441a36f76879093a6de10563361c3d88088e250b118b12489d
 MISC ChangeLog-2015 761 SHA256 f1cc66cb6789e871024aa3f09400c0844768bcaedb3025050b80fddd73e471e6 SHA512 39464c9b307059bea9fd6b3b2750c5954fbacacea068ac64954fa5f62eec878337aae62621a2294f68b7b498e9150bb5c55b5c0320843ec8ffa567aefeec2474 WHIRLPOOL e84452ceee14e6b36f1eebde49d50360bb7e5725f153bda94294d9fde9dbf1b2ed4ecfae108c99622ff47d7a53be96d0e527d3faa415f6912990e8498ec49d73
 MISC metadata.xml 243 SHA256 5e9b58b0b795266f973d066675839499e3a56d7d932d702404a4b91ded8eb26c SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449 WHIRLPOOL 085df2e84901cbe563c7c1d30d04c229547f15f8ee26ac61d44d07c3f6999f2bbfa4cf309963172fb507cce5450d27598b762c3ccab92351601965c3afc05e3a
--- a/dev-ml/cudf/cudf-0.7.ebuild
+++ b/dev-ml/cudf/cudf-0.7.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Library to parse, pretty print, and evaluate CUDF documents"
-HOMEPAGE="http://www.mancoosi.org/cudf/"
-SRC_URI="https://gforge.inria.fr/frs/download.php/file/33593/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt test"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt?]
-	dev-ml/extlib:=
-	dev-libs/glib:2
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit )
-	dev-ml/findlib
-	dev-lang/perl
-"
-
-src_prepare() {
-	sed -i \
-		-e 's|make|$(MAKE)|g' \
-		Makefile || die
-	sed -i \
-		-e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)|g' \
-		c-lib/Makefile || die
-	sed -i \
-		-e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)|g' \
-		c-lib/Makefile.variants || die
-
-	tc-export CC PKG_CONFIG
-
-	sed -i \
-		-e "s|-lncurses|$( $(tc-getPKG_CONFIG) --libs ncurses)|g" \
-		c-lib/cudf.pc.in || die
-}
-
-src_compile() {
-	emake -j1 all
-	emake c-lib
-	if use ocamlopt ; then
-		emake -j1 opt
-		emake c-lib-opt
-	fi
-}
-
-src_test() {
-	emake test
-	emake c-lib-test
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
-	dodoc BUGS ChangeLog README TODO
-}
--- a/dev-ml/cudf/cudf-0.8.ebuild
+++ b/dev-ml/cudf/cudf-0.8.ebuild
@ -19,11 +19,12 @@ RDEPEND="
 	>=dev-lang/ocaml-3.12:=[ocamlopt?]
 	dev-ml/extlib:=
 	dev-libs/glib:2
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+	dev-ml/camlp4:=
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ml/ounit )
 	dev-ml/findlib
+	dev-ml/ocamlbuild
 	dev-lang/perl
 "

--- a/dev-ml/dose3/ChangeLog
+++ b/dev-ml/dose3/ChangeLog
@ -91,3 +91,9 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org> dose3-4.2.ebuild:
+  add ocamlbuild dep
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@ -1,5 +1,5 @@
 DIST dose3-4.2.tar.gz 281555 SHA256 ed37414baded4a175b47d4e2856c1e827fc7fb9939cc9e176a1d46e5048d8526 SHA512 d64443899f874254834165c44d0400eff5fa80e1d1d41f76b94fbb11ae0b34aa75dcbb8cc9a5e510e2f91d147e11391f36c45ef0fb24536fffcfc68d686c5fa1 WHIRLPOOL cce3baa6dfe922a3b04e8683aea785bbfd3050a70a0c0b533457fe41f274eca1e62343bca34e08307e9818252d09c2d6b24b4b2fb0efb1321fd38fd478b7428e
-EBUILD dose3-4.2.ebuild 1584 SHA256 6dd3bf4f8a5b6dec3969d8249e94e087abb0850af02f6e3376f80e589e74ed94 SHA512 aa9f3bdb3a580176eaa21f3578121cda24156736b08d42795fc85793e9b66126dd876006a99a375fab1886a4385c8021955c4beda883dc8bd724773f41a0f29c WHIRLPOOL 79418cd94140c8b471399b32131f59317bcf475916e63b677f50b782357b5a3f256fc5da8eb431fe0cfc66b7b5a6ab15065919575d2f99fb83356592f4384127
-MISC ChangeLog 3253 SHA256 1ff7a7db568b04b6b651e5834842680d0d2c6710ad73f3d116897a797d975331 SHA512 ea98a74b8e5a5a96298c3fe4dce64fea61ad4f160321f4151339f19e4f120dfb0fd58a657fd61ff4b2548e96ccc95ca9fb0bf9935d8503f8234f7eade9ca3ddf WHIRLPOOL 270325a559595332352d4b885bb3e30eafdce1eb740976b49b2430bb8786ec1aec121f1d19dc8ddb80dca2a1ef21cd626d751a8212fb9847033da2f50bbe6e6a
+EBUILD dose3-4.2.ebuild 1603 SHA256 1f0c7062f333c3e16a38aa9ac7970a40251bd60475c7467cff98cafb84de430c SHA512 88209bb8429d1a38cf59f69f32a59d22edbfe9818ad21a9dd5c32b77318ccb247ee33dfa12889b0a0ac2f889f25ffb60e0dd802dc63e26b78b70eaa49f087ffd WHIRLPOOL 9519fa727dd0dc57c4bf3d62f0fb314e2bc646ea8a0d7b7f74ca6131ee1b9524c0ba821176d4558d11b758edcaaee307375b78c49fa89fc0cf088e29c1932098
+MISC ChangeLog 3434 SHA256 c81e55b6ee057e33f46d8ddde8a5f84f5ad8ae8274cb7cf65423b101d5ede1a2 SHA512 e32af33e91f891825fbd032588a36af99185eb0258f278699c5508909987214c4e88bc2b8a221ba4a45342b0f001ffeaa462f8966e3b81cd881dc3eb9145ecf9 WHIRLPOOL 96a95fd50d5f1d0890785a596c823f93b1073edbfb60346938caff23eaa8dec0bab88fd6337b292ec6bed6844180fc11f0c65c071b705715c2f6d80482f0690d
 MISC ChangeLog-2015 1177 SHA256 ce3a8b0e514ceaae68567397910625aa36c910e2e5a8c503a473aeedd2ede857 SHA512 a84f5d46233c9a93f9252a8a38a99c724e9345ae14ea22e7f86fc44ec92b46c21d8b1ea1af68b3d3bfd38c64a73f8d06ba34aaab484035f0aef28c70b9adb5b3 WHIRLPOOL 2659104ff6a3ddc65cc9a73217cfdfd8825851a2d1d622097f2c782414b42b74699eb70b4bfe6ee3cfcf8801442c6ed856a08e72065138303c70ece278095043
 MISC metadata.xml 483 SHA256 4127d9afb6774bb1d637ce032309b06487bb9620587eb4188205f36661255709 SHA512 7ae1fab219332029fd5727ce843db0a4fd663c455fc323db819cd1276178638ddd96694dc8d70421695f8af5a4149497a272eb2aab1f335768c1e43157db2fb6 WHIRLPOOL 66fadc6495a9227295b088943b04559d1755007c7bd0a212ab5a9aaf28faaffa7124f84fa5959dd0f96279fd8cb57c638bea7365f043783e8eda0ef62bfca272
--- a/dev-ml/dose3/dose3-4.2.ebuild
+++ b/dev-ml/dose3/dose3-4.2.ebuild
@ -32,6 +32,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ml/findlib
+	dev-ml/ocamlbuild
 	test? ( dev-python/pyyaml[libyaml] )
 "
 # missing test data
--- a/dev-ml/eliom/ChangeLog
+++ b/dev-ml/eliom/ChangeLog
@ -108,3 +108,16 @@
  Package-Manager: portage-2.2.27
  Signed-off-by: Alexis Ballier <aballier@gentoo.org>

+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org> -eliom-4.2.ebuild,
+  -files/tyxml36.patch:
+  remove old
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org> eliom-5.0.0.ebuild:
+  add ocamlbuild dep
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
--- a/dev-ml/eliom/Manifest
+++ b/dev-ml/eliom/Manifest
@ -1,8 +1,5 @@
-AUX tyxml36.patch 4043 SHA256 c4b5cb4b321d17e8416cc5742f348c197882401f2c2797f0a78fea94bdd36e49 SHA512 1eb9f91e1838f8352aaa24c3d4a1ddae38581fa3fd2b1189aa2462bdffe9d27b892be66ffdc63e0817ee014ba34064b6ade8a778f4dd3c45e2bb23abcea37027 WHIRLPOOL 4e37d777c2f6e39c5774a69cc1024ee282940324049ae172f97b40d32ad643f0536be94333fe293d530871323591c118d27ed0ccb833a341d5d87360a53bf215
-DIST eliom-4.2.tar.gz 699337 SHA256 30d180b72d21177d09b311785e08e54cc221b148d969f17334f8be6eecfb783d SHA512 c7c75dc00defe0c269aba4e4fbdc00a824b781b124e3f51747e29533c4aeedaecb68c7ebcb38b4cc9a51c3796abdfa680ba0702a83415911406b25cd07ad66c7 WHIRLPOOL 2a36deeb10cbf3b29c76b33185de1c848615293830f7a3701c2d87025be0ed575cdadf238c696ad4716e50f2b0258febef7b7039a1980aafeaf6e1c483ec46ca
 DIST eliom-5.0.0.tar.gz 728278 SHA256 6726500f9a54478def95875d04098dc8dc829d4a10e06896ff4f037bb1c03cbd SHA512 1c5297e376c3a46935de369b418638a772304246b73756f8bc052301b48d62a37af527274bf1a05064f33b60ff9dcde057a0030f083136fa4e1c0cfa07f01887 WHIRLPOOL ca1186787a8f938cf029f9a5c9904ed0324a3d24d2f0d0834dd1e2b2f995de6d57d1040b4d128de8233255ca385478f0ba3bf597c2f0315ab2f1894118755dca
-EBUILD eliom-4.2.ebuild 1283 SHA256 6bb01d1eb8b1d5e0126b0eaadf5ae88948e6ebe2e66cf48a87f67d3ff5c78c96 SHA512 a6ec64d3b3a08fc1c39e87d56adce2e6cc3be9afe0b7537e403a9cff087f2a2cd067a2a1100151a102d7da6696749b2980a32b048c41ab268aa7ae9c17fda3ea WHIRLPOOL 31af6a65da88be8d771a3dd681241c4cc77b11aeb137b65b55f87c639e8fe6ca0ccbd4b1bcc326d1dad5ec68d1719fc78086225078fb3f8413fa3cc595df934f
-EBUILD eliom-5.0.0.ebuild 1334 SHA256 06b86b520b7a3758809db5a428a84d5fe6f1b4ebf43fae21f8ce277d0cf01a95 SHA512 0bd3c92a2b4f4fdd68ebd233be8c812ce9297efc062da7747c382d6926789ca2b98d3c04e0f45bc85f608aef1246bce2ca01ad016fa52b8c3a8edf150bc696d7 WHIRLPOOL f0cc979646f0ce511a172cc2dbfab9fc41b229b38d2f931eee57da14fa726574d0906bc4495f2a70888f109e4f380cdbdb4b506654b89a764a818aa6cbbe3683
-MISC ChangeLog 3847 SHA256 bbdb9d0295452f9ee975501da5b5a85f86d42b449a883a9eb3a917b17ea3bc43 SHA512 6d31a2c01f9a681468afdf23b7672c349f949154384350fac790d641aeb4b3dd9922674c61debf782f74d7ea069b74bb2fd88c73b233b34c2fa981b1623e8bb5 WHIRLPOOL 2f3424c8000857d332fa62b92ba94af14103474d2f2ed66dab1514cd271d96bf0d3b352c7981a0a85efc8228f6e82c8e2f894078aa7941443a1f9e9c50f86332
+EBUILD eliom-5.0.0.ebuild 1353 SHA256 1bc1d7178d7937896f27973a9b1476466a0ba62fefd69374ea3df4c0ee3c4d61 SHA512 e44f15e968b29f51b1bced4e2d9ea5bab076f9f1865ecd781892644bc3e17c28a68f719c2e296655e22a645f63cc6fa9ed409fb9455873b9c2dc1c9e8a6084a5 WHIRLPOOL 8d2af3debfb2a81815e75deb5bbefef0792d76399877bf9354d477851d4e64f6ed81c1d2d148906b67ea25ac61938ccbd7ddea7539483f7c86c3d58fac94c4bb
+MISC ChangeLog 4228 SHA256 3a0f9912b2cd54991d8d7374507fcd64a257ac2fd9342e5867fc2a71cd3a6e5c SHA512 3e4b71f8570af08a81f84d4dab32b8bde27a06b6692fc93314743df81a90d22d9fbe682fd6c919a29a12800e9339a10947171957df259ea65e3a25a971e92b6a WHIRLPOOL 2f2f66ab92138631b9b5f73ce0f4e2fcd6fa643dd9d61844764a78d6a8fbd5ffada33c07840047417eb7a2a59b75c038490fc0cac2ae2573d28f57af4b0e8a4c
 MISC ChangeLog-2015 1416 SHA256 6c4e4dec010c374f890837959c5731076d531690ab2a7bb669e4a17e1489461b SHA512 a29c07dbf15b0ec457678fcac4d1b51986f08aa3350631ab79eca45904a4689c7b550709811dfcdb4961fcd2f236116777eae44e59a06fe6ebe2cbc8d54bb2d2 WHIRLPOOL 68dcaa7a83eac414c7595e7f1f81125fcaa506a9a74a54e7319f07a31829a3061527cda3439c2d8ba29f99eeacb7b3bfe86b7eeec4fa6c2f3997008d53a91289
 MISC metadata.xml 414 SHA256 d1c3ebb907c9b13436c28d16f5d2e220b5458b9d51a4a20a5d75131e0895f6d0 SHA512 28621e40e16a96dac68b8b11c05b3b49d612e52463191597c57181b1d5c39c0c2ab60594f8759cb7c4f43fc31127d6d3c085ba085995cd7b6a96defa0107f61a WHIRLPOOL e7b30a3d2790fc1ba862b8cb52711a351d10e3216407b4f8de2dfa7ceff40f8b1cc193d1b056ef72de2eeeae9a09059eca8d65b38c0d01460d4cae47d79b49a7
--- a/dev-ml/eliom/eliom-4.2.ebuild
+++ b/dev-ml/eliom/eliom-4.2.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib findlib
-
-DESCRIPTION="A web framework to program client/server applications"
-HOMEPAGE="http://ocsigen.org/eliom/"
-SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="doc +ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-4.00:=[ocamlopt?]
-	>=dev-ml/js_of_ocaml-2.5-r1:=
-	>=www-servers/ocsigenserver-2.5:=
-	>=dev-ml/tyxml-3.6:=
-	>=dev-ml/deriving-0.6:=
-	dev-ml/reactiveData:=
-	dev-ml/ocaml-ipaddr:=
-	dev-ml/react:=
-	dev-ml/ocaml-ssl:=
-	>=dev-ml/lwt-2.5.0:=
-	dev-ml/calendar:="
-DEPEND="${RDEPEND}
-	dev-ml/opam"
-
-src_prepare() {
-	epatch "${FILESDIR}/tyxml36.patch"
-}
-
-src_compile() {
-	if use ocamlopt ; then
-		emake all
-	else
-		emake byte
-	fi
-	use doc && emake doc
-	emake man
-}
-
-src_install() {
-	opam-installer \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		--mandir="${ED}/usr/share/man" \
-		|| die
-	dodoc CHANGES README
-	if use doc ; then
-		docinto client/html
-		dodoc -r _build/src/lib/client/api.docdir/*
-		docinto server/html
-		dodoc -r _build/src/lib/server/api.docdir/*
-	fi
-}
--- a/dev-ml/eliom/eliom-5.0.0.ebuild
+++ b/dev-ml/eliom/eliom-5.0.0.ebuild
@ -28,6 +28,7 @@ RDEPEND=">=dev-lang/ocaml-4.00:=[ocamlopt?]
 	dev-ml/calendar:=
 	ppx? ( >=dev-ml/ppx_tools-0.99.3:= )"
 DEPEND="${RDEPEND}
+	dev-ml/ocamlbuild
 	dev-ml/opam"

 src_compile() {
--- a/dev-ml/eliom/files/tyxml36.patch
+++ b/dev-ml/eliom/files/tyxml36.patch
@ -1,125 +0,0 @@
-Backported from:
-
-commit e55552629e9affcaefbe9e0f36212fe3f385a780
-Author: Vasilis Papavasileiou <git@vasilis.airpost.net>
-Date:   Thu Aug 6 13:23:29 2015 +0200
-
-    update for new-style TyXML wrapping
-
-
-Index: eliom-4.2/src/lib/eliom_content.client.mli
-===================================================================
--- eliom-4.2.orig/src/lib/eliom_content.client.mli
-+++ eliom-4.2/src/lib/eliom_content.client.mli
-@@ -74,7 +74,7 @@ module Svg : sig
- 
-   (** Creation of reactive content *)
-   module R : sig
-    module Raw : Svg_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml).T
-+    module Raw : Svg_sigs.Make(Eliom_content_core.Xml_wed).T
-       with type +'a elt = 'a elt
-        and type +'a attrib = 'a attrib
- 
-@@ -397,7 +397,7 @@ module Html5 : sig
-     val filter_attrib : 'a attrib -> bool React.signal -> 'a attrib
- 
-     (** Cf. {% <<a_api project="tyxml" | module Html5_sigs.T >> %}. *)
-    module Raw : Html5_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml)(Svg.R.Raw).T
-+    module Raw : Html5_sigs.Make(Eliom_content_core.Xml_wed)(Svg.R.Raw).T
-       with type +'a elt = 'a elt
-        and type +'a attrib = 'a attrib
- 
-Index: eliom-4.2/src/lib/eliom_content_core.client.ml
-===================================================================
--- eliom-4.2.orig/src/lib/eliom_content_core.client.ml
-+++ eliom-4.2/src/lib/eliom_content_core.client.ml
-@@ -26,6 +26,7 @@ open Eliom_lib
- 
- module Xml = struct
-   include RawXML
-+  module W = Xml_wrap.NoWrap
-   type 'a wrap = 'a
-   type 'a list_wrap = 'a list
-   type econtent =
-@@ -163,8 +164,9 @@ end
- 
- module Xml_wed =
- struct
-  type 'a wrap = 'a Tyxml_js.Xml_wrap.t
-  type 'a list_wrap = 'a Tyxml_js.Xml_wrap.tlist
-+  module W = Tyxml_js.Xml_wrap
-+  type 'a wrap = 'a W.t
-+  type 'a list_wrap = 'a W.tlist
-   type uri = Xml.uri
-   let string_of_uri = Xml.string_of_uri
-   let uri_of_string = Xml.uri_of_string
-@@ -250,7 +252,7 @@ module Svg = struct
-   end
- 
-   module R = struct
-    module Raw = Svg_f.MakeWrapped(Tyxml_js.Xml_wrap)(Xml_wed)
-+    module Raw = Svg_f.Make(Xml_wed)
-     include Raw
- 
-   end
-@@ -322,7 +324,7 @@ module Html5 = struct
- 
-     let node s = Xml.make_react s
- 
-    module Raw = Html5_f.MakeWrapped(Tyxml_js.Xml_wrap)(Xml_wed)(Svg.R)
-+    module Raw = Html5_f.Make(Xml_wed)(Svg.R)
-     let filter_attrib (name,a) on =
-       let v = match a with
-         | Xml.RA a -> Xml.RAReact (React.S.map (function
-Index: eliom-4.2/src/lib/eliom_content_core.client.mli
-===================================================================
--- eliom-4.2.orig/src/lib/eliom_content_core.client.mli
-+++ eliom-4.2/src/lib/eliom_content_core.client.mli
-@@ -22,6 +22,8 @@
- 
- module Xml : sig
- 
-+  module W : Xml_wrap.T with type 'a t = 'a and type 'a tlist = 'a list
-+
-   type uri = string
-   val uri_of_string : uri -> string
-   val string_of_uri : string -> uri
-@@ -147,6 +149,8 @@ module Xml : sig
-   val set_classes_of_elt : elt -> elt
- end
- 
-+module Xml_wed : Xml_sigs.T with module W = Tyxml_js.Xml_wrap
-+
- (** Building SVG tree. *)
- module Svg : sig
- 
-@@ -197,7 +201,7 @@ module Svg : sig
-   (** Typed interface for building valid reactive SVG tree. *)
-   module R : sig
- 
-    module Raw : Svg_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml).T
-+    module Raw : Svg_sigs.Make(Xml_wed).T
-       with type +'a elt = 'a elt
-        and type +'a attrib = 'a attrib
- 
-@@ -298,7 +302,7 @@ module Html5 : sig
- 
-     val filter_attrib : 'a attrib -> bool React.signal -> 'a attrib
- 
-    module Raw : Html5_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml)(Svg.R.Raw).T
-+    module Raw : Html5_sigs.Make(Xml_wed)(Svg.R.Raw).T
-       with type +'a elt = 'a elt
-        and type +'a attrib = 'a attrib
- 
-Index: eliom-4.2/src/lib/eliom_content_core.server.ml
-===================================================================
--- eliom-4.2.orig/src/lib/eliom_content_core.server.ml
-+++ eliom-4.2/src/lib/eliom_content_core.server.ml
-@@ -28,6 +28,7 @@ open Eliom_lib
- 
- module Xml = struct
-   include RawXML
-+  module W = Xml_wrap.NoWrap
-   type 'a wrap = 'a
-   type 'a list_wrap = 'a list
- 
--- a/dev-ml/findlib/ChangeLog
+++ b/dev-ml/findlib/ChangeLog
@ -128,3 +128,19 @@

  Package-Manager: portage-2.2.27

+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org> -findlib-1.5.5.ebuild,
+  -findlib-1.5.5-r1.ebuild:
+  remove old
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
+*findlib-1.6.1-r1 (01 Mar 2016)
+
+  01 Mar 2016; Alexis Ballier <aballier@gentoo.org>
+  +files/externalmeta2.patch, +findlib-1.6.1-r1.ebuild:
+  revbump to avoid installing ocamlbuild META file
+
+  Package-Manager: portage-2.2.27
+  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
+
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@ -1,14 +1,13 @@
 AUX externalmeta.patch 630 SHA256 e24e79e7ff2211e76a494d3c4d8461e2c861e061d8cebac832da06f70efe5d23 SHA512 b8028d07d606ae45a1c03eb2e8cf6b1a100fd254f122e437908a5b3401a5be89e77e4447a29417445790ccd1e7752a2295506d561daddba4d8d8ab57bec155db WHIRLPOOL 1efb6d034ed21bc2bb2d0bc22fd6c58be3f0d516e45704805f7419829eab13982e1237df7082d62603d474398a80435d327e92e1a80eb67f2f1018f6acfd8bb5
+AUX externalmeta2.patch 633 SHA256 fcab6c5af54f98e905e237aca6acfe70fc241365bd4e9f94ab3c9b567ed5f29f SHA512 8770b7541d78121f73c3aa61d574716f23898f294367ec920835e114b9793045e54627958144a69d261ebd1c73e0e9acf4cd7d3fddc2c7bdd4c78a6c9b8702e0 WHIRLPOOL b3396d5638bb9eff89de818880b59e955a672630145a7848cadd1c076692c830cc4e210ac4be4a9723359a5269d265708742a07e930fbcc901f0b029a0d3643e
 AUX quoting.patch 666 SHA256 b0783c688d4903f7eb47ab4b892780d66326e6ded2d98c10c48b2805977aab0f SHA512 53fb9aadd6a2b4e15bcd90320ff58be7307b0d6081615d58a04371905bd4408a1f1cabd38b4df14e94344d34e416339e767c0c3a4e20bad44aee03ea0e6b5f33 WHIRLPOOL 429f548158f364278d20b849ed679595886adbcd1ffca8b5573adf78963d06a8dff90e83dbe23e2cc8462b0976b1d2c7babe0d021f82acaa0dd3eb467d41de2f
 DIST findlib-1.4.tar.gz 231526 SHA256 6e4065e5d79d31176ec213ff94599c4eae17c3904c2896e845d0379a99f1bdf8 SHA512 7ee5bee74f6fc14c8d85496e673d42b63e056d35a724fe4f78fd1010a5af4506a9a962c0403fd96d5bf51f2278bfbe98a60aad65a171803cbde935cc3889157b WHIRLPOOL 31f1d0b9f1605a9a536ae996fb4abe5e1d5c47012759cb7bb45185d58a81e827d80285628b113f79d51b8b260cdff181c3eb05596adeea9a87070994058fce17
-DIST findlib-1.5.5.tar.gz 240247 SHA256 aafaba4f7453c38347ff5269c6fd4f4c243ae2bceeeb5e10b9dab89329905946 SHA512 051817ae897a53b705ad641ae7e9010474f2320d3cc7cfd15edc9345f50566932cb44bf6f45772260706b5f9e9e91194802600c770c9c96f772985678db7209d WHIRLPOOL f1ad9b77c1f38f6d733f2a17c14649d4ca9f05215b5fa8124e71dc3e05b229c34af10415471d56964384c1fe0b0b0db453638d7e1238af916e5ff854b931cd76
 DIST findlib-1.5.6.tar.gz 250865 SHA256 7743b3dcaf8a344c882e89f61601f7f086d46c0f2ea4fcc3e54069236825e3f8 SHA512 18d23861a25b1508cb419af4cdd6e3cd83d51bef259f162c86b91460cf3dad75d6c2fc11173f60fe36b61ce3f81b78e69344f093adb9a82c36256d95180e93d8 WHIRLPOOL eb374e60c3f2fcc6172ec08803fbc5b0e83ea0d38644b4c13cb3d27b3dc13c7240a4f49a9ee51f9465ac6ff6075140c3e98b3eb0ea48690f260f139f37dfb63c
 DIST findlib-1.6.1.tar.gz 254797 SHA256 411c816e89d17d1b5b454e3d42f9b261cf929fc468f9f6e2787273ab69784b09 SHA512 b781d117ff033e8b91b6610c562382c5868a25ceed51f0a5947a77bfdd5825723ad32adcbe1636d4f7952d4c7535093f5c8ad3b954bebb1dcf4738f7a16d3ef8 WHIRLPOOL 1c3ed89aeb53cd95c0eaa82f1df8c364ad79403cf89ca19245620819998353da089daf5d3377919f2b4676c48f4d926d384e5a80312884f84e1efc41307f88fd
 EBUILD findlib-1.4.ebuild 1537 SHA256 c8c80a67c63043044fa517695bbb6c40b503a26453a2b5379bf5b8dcfc004910 SHA512 1bf442e58d69401f156a166ce3e6153afe766f04533d56dbd06056980556fea424d5585fbc0d39f5527c71bf47022ee671c821f65a7a21227a1b1d6746a48a64 WHIRLPOOL 94dfa1ace968d8b67cdd7b9c3a4718866e6fb06ca4fdfd6e0363c35303b8e911d2a5ad319a3c72465263041e6d2b1e3150cce405bf129821f60bc3596a3873c3
-EBUILD findlib-1.5.5-r1.ebuild 1643 SHA256 90ff962edf9968e861d6b1db140c0c15442a4a16bd20e5cc0c8d6c892edcac96 SHA512 2087dafaa1c20ac305f656d1b5c92a177c8b74af36fdf6c9dbc78f26c2c8e8db4cc680350cc5df2b3215ec3c85eef9b33c596b30b44fdf203a094e7bc94e91fc WHIRLPOOL 4fdee14d3578538a80cff4bc1e68b47632c86f1528f8bbdbf38e9812ad172c9ac652a90428826a3df57aeca6a7a633488d5ee61f5874bb6985780f5c88101200
-EBUILD findlib-1.5.5.ebuild 1553 SHA256 d2ec47da9a419cc4f612e275072980ac07c8e1f39974516cf25c1f1ebce5d449 SHA512 1ee7badc14a3be9fc86d39fbd8c907ac4e52ce5d23d86c137cf9f5a70ae2840669ab30679e32082841ed9d5d5d955cbffc06e168575ea2d91f1bbd4f79d7083f WHIRLPOOL 70a0fcd87c32f9ff8af2db52db9179f7796dd3909256b2dc4f44f15c8b6de678141e9fc30d9dae2529cfcd280eaaa0177bb7c0485e34134d12231c6eedb24992
 EBUILD findlib-1.5.6.ebuild 1636 SHA256 8ec7de4e978a530e9b018fec8bb45f87cf16a4f94bfdc44d43227bfaba740ef1 SHA512 a2a52ee4827533125ed0b57c842c71ead1a3af5aa10bc71dfac7b0fc248e6541d9a7899925e47a5c923e535f9ea280fb8a0a75ff4a938da466d2f5fef2a0dd7e WHIRLPOOL d5e30fa90209ae5420591c79340555b254657fe8f7f0efd5ac4f0a7e325ac43e06f7051f72f8bdec180a673edf16c9b719a156eeb244ebf76203eb124f084620
+EBUILD findlib-1.6.1-r1.ebuild 1676 SHA256 f5d585eb856464c47dfb68db3746460f9f27aa67a7441625574f2adf144b5186 SHA512 0081c51d052b27f84d377d480c4ef79b5c098d623abc6ece5ee7f0aae2b5864895ed817f02efe6f6b99d11a2439a61e611f2d092740d7ec496aa17d6f8fa2b30 WHIRLPOOL 16961ed13fd98764524a1ee40fb4a4e0754399f177c9bb6b3b784dcaf8f0477972c9fee515f5a59ea1d241aa9876d5d74422b146341024574a8b323de86351a5
 EBUILD findlib-1.6.1.ebuild 1675 SHA256 16fa2d9e726c351d3ec2935e1a0f392aac56405b328aa5f6c9a94cbf49507921 SHA512 d65c9ccf3e4440b6918edfe8e28f7a45c9329514fda109ac1ed385a542db5b2a6ae699a772470c5e80ab22c94d2982c844366f4fb1dc6d011e494de11b6c64e9 WHIRLPOOL 0267248f86c596437eaeaeb58f68a09ff441de21f2e4d4916446c3faf0e5b0fcdd264f8ad76be0763642a4c04b78ab7c0e3f6dae58ec26068ae208c0aa4a814f
-MISC ChangeLog 4245 SHA256 b243d5c2af495ac239c86f25515aaa7455911e6c8936b1fce7f54ba5650b6bee SHA512 ab00accffa82959a20e57cb6d20829ff8321f8b4e3808fad4c09eb44aaa294ba8428ffdd495fcb75d8478df2fcbc1ca344fed4f8869ec8c52067a1c45f017e9a WHIRLPOOL 0e48e421338ddcccbf9e03788268715fd6eceeda93bef7233e4e7b6fcff62fb79ac66ed73c70e6c60f3120b622eb9c8cad2ccf6f5c2aa1cab05c7cf86ed1901c
+MISC ChangeLog 4733 SHA256 69f1e08f0a9cb9f81e9a8ee01b1caf6c7dfc7903ec06108cf0ef51c758bfcc2b SHA512 b8b593f1d2e2f36ad4b92e761f19b984e788e3d4ea722b4a6f740b5079688b3d577dce98ff186e735b886e74c1d56ec4d1e95ca7494c06dfad80a728e8b4a14d WHIRLPOOL 9866891ac42a2520b13803f776e8aa4fea85f0729d4609773a3b740fccbbe063b1f4ac27a8401080094350500ac14ae31c27283bff1e21c4814a5debb0c1da7e
 MISC ChangeLog-2015 13750 SHA256 c29c08102d80033cf40fa06841ebe136537e97ae3f22ebc3c7820f2bfe220aef SHA512 878b6f3632465fcfc219c1d0985cde887006062309509e8f85b093c9ae8355ca7f27942d1689c98b9fd14a94f3d6ac993dee8c3c29ace453350181c9e46b7f29 WHIRLPOOL db2062fdfebbe01f476b4954f20c96e9dbf6274f10f453fb2a66e032d6e020dd1721d787a8a87792386f72114dcd497f55917495ccb9e484bc29ce7bbabb3938
 MISC metadata.xml 247 SHA256 1e5906c3f850b776eb8532a92da9c868e9ed204a1fb40289cb778d9ee9eb972d SHA512 0f7ebd1264695f56fe6ab78e4e82c07866376f03ebfa12b22b60d0b2df819aa818832cb0d9eb2d77ab642a786b44cd127f579c348f0b2f57bc22e26b3b51c42b WHIRLPOOL 5a7860c9397b969860f00ae555207d30e89f0c9d87c1f191b443635088d0700bd3c78b163a6c862a521ab275ad735b4a2fa8e4f7553020a2ad993f6640259011
--- a/dev-ml/findlib/files/externalmeta2.patch
+++ b/dev-ml/findlib/files/externalmeta2.patch
@ -0,0 +1,16 @@
+Avoid installing META files for labltk, camlp4 and ocamlbuild: Those are provided by their
+respective packages now.
+
+Index: findlib-1.5.5/configure
+===================================================================
+--- findlib-1.5.5.orig/configure
+++ findlib-1.5.5/configure
+@@ -515,7 +515,7 @@ fi
+ 
+ # Generate the META files now.
+ 
+-l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes"
+l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray $lcomplibs $lbytes"
+ 
+ for dir in site-lib-src/*; do
+     # We do not really know if $dir is a directory.
--- a/Show more
+++ b/Show more