gentoo resync : 10.11.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-11-10 00:43:02 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-11-10 00:43:02 +0000
commit: a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (patch)
tree: e6d8d3589fcd01fbc3f1286185639163daa81424 /dev-util
parent: fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (diff)
76 files changed, 909 insertions, 965 deletions
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 006acd6f9d4e..da65b3f05e0a 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -10,7 +10,7 @@ DIST boost_1_62_0.tar.bz2 84513338 SHA256 36c96b0f6155c98404091d8ceb48319a28279c
 DIST boost_1_63_0.tar.bz2 81984414 SHA256 beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0 SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad WHIRLPOOL 28c241785097272a1e0952e529eef082444e4ef35a8d738161e4a491a986d75359d3afe888b2ea91a4a81b6ec7a5772ebea337c9d09377b43f6eed66cac90378
 DIST boost_1_65_0.tar.bz2 82597718 SHA256 ea26712742e2fb079c2a566a31f3266973b76e38222b9f88b387e3c8b2f9902c SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd WHIRLPOOL ca389eff2ffc4836b88688504c187e57f236a5967654e40377792d59dd2e4fc3d6ccb079174eae095ad610ccd683e795964c5011429845b27ab67166f8a82c19
 EBUILD boost-build-1.62.0-r1.ebuild 3916 SHA256 ca05843f63b44f4927195b8d639039f84b2aa759dae692749727aa74a3926d5b SHA512 56673f5714aa82b4ad00be76b7937d332814c6ac3d4e2824861ffc1565aee1d7f79050a8e4201d8f6144acd1be08f5081c997b1453724c266fcae337894178e1 WHIRLPOOL f5bb30048a5bd7ee68b25c0fd5ccf2d522103be685d4bd629e2f75998298b2516453d0a0dbde0c05fc96d6ab11e105765c47c164b410e8125ce55e69e298322a
-EBUILD boost-build-1.63.0.ebuild 3843 SHA256 9dedc67ad9069015d39c19b502dee244f8a13ed8dfe8b8412c75c9664da31f2a SHA512 fda5adbae2147568b86a14fd972bc219401ed9da9436e5371655d028902be270d56628fe66dec5f5c42a6d98b67aec3258968cdb0722890fb08b201b169a18ef WHIRLPOOL 6ac2e5e8cc6cf8044203574ea8fef336c43b9b9776538a2109aae3489304c529997123fe902878706f4ddcf56e4d096d1818ea54e1c1881647068c6a47b258a2
+EBUILD boost-build-1.63.0.ebuild 3841 SHA256 1281095aba575eee4834493bf2e0c93b3fe08da4e5fc4f0302b32985dbe21584 SHA512 bfd275e90dc1bf4647029545c288fee3debabbc908bb590068be9c5c7e07624fef258de8d10d2025d3b8e74204b43cbba5bbc88085680937f8b05b9ebc8fd90c WHIRLPOOL e5222c3dad23597ab1bd0a28a8ff3d6e0d2db51c2f97e8578000eab631fb899b4ecf2e7427d0f20cefc3a1ade6207462c798fadd4edd90318e4782a97ab9be5d
 EBUILD boost-build-1.65.0.ebuild 3849 SHA256 558401ac239ef3667394def3e2ef7d4851c5934d58d47c36d4a15b1aeecb2cb2 SHA512 fce84e1116e4ff5259d75ed4adf8ac2bb1cbdfd24d5ddcba9f5f964656b3eb737b379bd1d87cbe9b3e02913e3bd4b6bd9e3da91b35f8ee6b0571b8347101c36e WHIRLPOOL 1a47f359b80be66e29f3dc7f65eb113c4f78fc4e4362595c6188444bdef134589cf0fdd4753d2a8b1e7a688fffc4e800ab812669c6ef43f4970e5d88279ddc27
 MISC ChangeLog 6926 SHA256 5b6756f0013121ec09198c73da2d7129ec1ac2b1d6fc61f5747b93dca22eaa12 SHA512 08ca2bc9b31b300716becca8c9d2517ff5f883bb1a9e699c08801422998c5e4d66d081c63365739d656417cf2dbd40d4e6aac11f15bfda0134f8083531d39c19 WHIRLPOOL 437676783bc3e32e926f4f3d73c607c48ac093e92457afc55142b7fed55009cecee6a2ec8d331855ec0450c0aa926663e51c5a2baa89b50b3754e901f5703cf9
 MISC ChangeLog-2015 22458 SHA256 8341068142b55bc555677104798816b8c9a9e135b924faf03d03e6a371003f1f SHA512 b6eee67178faa003cbbee237311dfd302b9544d7c8cfb397a4a26234e6db628e91f3fa802a37dc8df68c88bfd3d5bd156c16e0c33f57e35cb55cd6bfc4513e46 WHIRLPOOL eae5386edd1e2275e2656bf4fba0edfa3adfaa3ecd7cf889eb65177895a91ff1ff31a7e52d2f70b9c3bb7017fffec8045bc607a7ecacd6fca32a9d3b1c1bb33a
diff --git a/dev-util/boost-build/boost-build-1.63.0.ebuild b/dev-util/boost-build/boost-build-1.63.0.ebuild
index 8aa8dfd5beea..746b4da75d9b 100644
--- a/dev-util/boost-build/boost-build-1.63.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.63.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples python test"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 95b313dbb8fd..b80782f1c674 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -3,7 +3,6 @@ AUX buildbot_worker.confd 222 SHA256 1fa81daad2d0b36b5743b5ecd7afb1fb65b4b0b568e
 AUX buildbot_worker.confd2 367 SHA256 eca0268e8763e4382ac0baf77061d1238b1a81523ba099b794138b8535424923 SHA512 d46ca9656ba3f4fa58208954ba80d0c8e3a2a6a1eb14a92128653e56915811ac1f1e0a4aba0755fe4844aa0d85907eef6c657236035d139faf030b5d6940b820 WHIRLPOOL cd01a8e9ba57f2b41a2a23726cbe77eeb9ac09a6555c95252168f3321b697540cab70d5b33550967ba43908dd110fafbd447d79b9e0ffef9948f520f44b289d0
 AUX buildbot_worker.initd 1139 SHA256 e5572d2219c33b9e6c4689eae779d1aeffa2645b9a0942fcb3909bc7ad9c40f5 SHA512 51a8f21f84849eaa8e26abdb8b7bfaa3be4f1af813485fbb294ac09bef5ea003de32ae07566267fb1d52177fedf2541805af60204a8793645ea4909388e39c10 WHIRLPOOL c8f597e988b0e1a884c8947fa56def10d7d28a5b4d2a3d0c1b02720b0d40ff1241f96870a3f8a3d33a6987cf32bb61ec427e8b0884c260f21de78c0caf0a5ec3
 AUX buildbot_worker.initd2 1640 SHA256 5894d6b79e903d82d3981b08957834af33757ba38ea4ed5f97936283421d7a1e SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2 WHIRLPOOL 0f570af7607c066678a328480b3157a3ff04300cf0a13f1f684c8156d20ab0017d801c5461e2b956bbe00464a28a6d956ed312f29e8b0aa7818e58aaaba6eb46
-AUX buildbot_worker.service 296 SHA256 c7bc100f3aa9e9d8b7cd0656e8474776177dd56ba35da864db4750b8ae42d69f SHA512 936035e92d8bd481b8af93450445a82ccf8eb21d3f6bf99c2a02f52ba71d911940b8a6316b7f8b888443f577d73184bf7e7d99329ffbaa995e32ea3d9cf715bc WHIRLPOOL 8c55173c8bff639e031d1bf0212e6231cf12e59da74fbc3a5cd367b7432c7f3ef3eb3244b001ab45b3fc0ccc3fd4cdbcc60b5ce3b6c549f681e95c5374319968
 DIST buildbot-worker-0.9.10.tar.gz 99028 SHA256 1793631d74629cd73bc0df1fadf28fb34d87e63aa72cba82058122bde165a824 SHA512 0f515610d9c788657b10ba6624745841241fe554b472e53abdda221a678eb73d7a21a6529eb0769450de3a79b43bb6e51f4208247a4d8ef25c3d36b6ced6ec89 WHIRLPOOL 67cb199328428167c7e52f7b6ecbe7aa73729b5b453b5a8c16ba4999502bf30d9b139788f755eb4811968a60ce61fde32cdc29a31242d3777302792bb04863a6
 DIST buildbot-worker-0.9.11.tar.gz 100746 SHA256 4254bf964465acb6586fda36b26a424466a265b6a5259138cf4fa63a1e9f6851 SHA512 c7209c3fff8c43a23de71fa61709c9f02a5bdd9c8c8980ac5d205f720abdaa9bdb78d0d4e40fe9f915c8d5cf253b9e3c63401712ee121ac085909b0244d82897 WHIRLPOOL 30e1fb17eda975ff3a1e333a0ae17bdc2b432bd9c139a0c1f8dbea69984311add3a6f0659b7add0a3fecc2acf9460a908709efa8994f5763bfbbd2618df67050
 DIST buildbot-worker-0.9.12.tar.gz 101655 SHA256 d2a9cdf5525bd18965c1f96d2b9afb8b83c46f2d10bfda6a22cbf6724265af41 SHA512 c2e86bd8818eddc2849626a0c7642169bc91fa2cc1d531977736e53c4ad3c87c3f0cb17d7b9acd137e783ae822f558a19f4668e3cd37e90a8435157485bd1d57 WHIRLPOOL 83d914cc94fe99471c830a8615e6a93ccb351c98f75978d6f504cf45a3d87f48a82b07f93b51993c679c1c316c4058fe91e56717f786262d234e230e88b8272b
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.service b/dev-util/buildbot-worker/files/buildbot_worker.service
deleted file mode 100644
index e75a2d51e4f3..000000000000
--- a/dev-util/buildbot-worker/files/buildbot_worker.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=buildbot worker (slave) instances
-After=local-fs.target network.target
-
-[Service]
-Type=forking
-User=buildbot
-ExecStart=/usr/bin/buildbot_worker start /var/lib/buildbot_worker
-ExecStop=/usr/bin/buildbot_worker stop /var/lib/buildbot_worker
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 2ec290579ef1..682dd550a94e 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,6 +1,4 @@
 AUX Remove-distro-version-test.patch 804 SHA256 ba232a084d776b20cfe3a25b7438b4f26af3bf4abbfaa7a28ef954b46056b2bf SHA512 b98005b8a02456d60bdc8085efb4c6fa52386e7b185bf7acefbaf3cd8fe481f87cad68a4d4986f498e35dca1618208032f0a73b04ca0515bbb2703729d3308fe WHIRLPOOL a94c6ae199704ee464cee507cfa394f3f414679caf9b33ba004c30e3621695c87717641661e010a4adedd29c46398bce272414eafc053f9716917be21ada573f
-AUX buildbot-0.9.4.docs.patch 4619 SHA256 25e802ba82315e6f62b536e0002d7af8b6b6c814803d9f142cd70f4aa4e5b815 SHA512 c521b44c9db5d565302bf611842d1b607f240ba89988aacc4d988aa61626be125a5b20a7cc2135fb6e331a50f5de3fc6ba7fe0e5f5a42049700eea46f9cc1c8d WHIRLPOOL 3bead12e5d510d225ad3b8f4070c5d6d206287391c6c5262ae2573123bd1e2e33a214c56e0f88d223cd3df77b04221fb60016e50666ef277c0eab0de76084a40
-AUX buildbot.service 435 SHA256 a94170eaac47b72e3fe86eb3fa3e231c2977940fa77b84ab0736a20a7e68639d SHA512 0baf2696efe3843c93f90c4678696ffe1c7d5df2292b5b3ee48a4e30bf213956052f4772c8e7938f541c08c76b39157b246debf376f9fa26a8773be785cddeab WHIRLPOOL bd2802cc78c5a6a6672e8e84c1330c641911c31bc802be222b9e4c87e3be5ca9115f18e90f3a48012619f7e3bbaf9fddaa0af333526aa034b4d0eae2cd9256f8
 AUX buildmaster.confd 218 SHA256 bb7f93e3867b32a25e2445a66d40573fa5073a80e73e35ae2a904db715f870c6 SHA512 d9339c30d3a92e92b41b0e3139ec89ecbd1460b0e4ee6c6fe2560c4307b2eb3f29b838c2f2312b9c7049bd95eaf652d09039227c691af805bc25a36999ec1840 WHIRLPOOL 0e258348e5882db063e95b3c508f8d92e2a7598e5f76705da2ebba45b4893ae893b0ed67271a112255d3e5b8f5f1ace17b487fc885db30a774dde44be1944c4d
 AUX buildmaster.initd 1573 SHA256 03ee2ccd319a34192f9d42967211b88e32f573af7472e7e8c5149e3ea43a8bab SHA512 22d58baa3500de63ca3d278c2ed44c78694c8f022a9916b0f35344485dbbbe46b054ba9b0cc9a8c56948ea8726e419cb7e1177036124fc3fc5acc957d56f168c WHIRLPOOL 3f0edeaaa5a35c3eabb332b2e3a043a5b244bde966d04ba625906ffa057c762590e9c903f508fb951decaffa1d4ef37044b71fa7942fb280bb4406cdb34f5079
 AUX buildmaster.target 138 SHA256 f232ac65ec161308092cb4f86c43cba8bb9293cd89fe3a3a6c4ad26936067680 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050 WHIRLPOOL c2596791d8d61966bd5ce60763caf7baca27b579ff657e45c6ab428a1f7100dc8940d401f8fa3260dd532c203f6452d4d1c85f6c05950d4ed18404bdfe02d398
diff --git a/dev-util/buildbot/files/buildbot-0.9.4.docs.patch b/dev-util/buildbot/files/buildbot-0.9.4.docs.patch
deleted file mode 100644
index 1a27713cb939..000000000000
--- a/dev-util/buildbot/files/buildbot-0.9.4.docs.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/docs/Makefile b/docs/Makefile
-index 55637302d..c4fde481e 100644
---- a/docs/Makefile
-+++ b/docs/Makefile
-@@ -24,7 +24,7 @@ PAPEROPT_a4     = -D latex_paper_size=a4
- PAPEROPT_letter = -D latex_paper_size=letter
- ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
- 
--.PHONY: help clean towncrier html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
-+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
- 
- help:
- 	@echo "Please use \`make <target>' where <target> is one of"
-@@ -51,38 +51,38 @@ clean:
- towncrier:
- 	cd ../../; towncrier --draft |grep  'No significant changes.' || yes n | towncrier
- 
--html: conf.py towncrier
-+html: conf.py
- 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
- 	@echo
- 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
- 
--dirhtml: conf.py towncrier
-+dirhtml: conf.py
- 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
- 	@echo
- 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
- 
--singlehtml: conf.py towncrier
-+singlehtml: conf.py
- 	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
- 	@echo
- 	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
- 
--pickle: conf.py towncrier
-+pickle: conf.py
- 	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
- 	@echo
- 	@echo "Build finished; now you can process the pickle files."
- 
--json: conf.py towncrier
-+json: conf.py
- 	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
- 	@echo
- 	@echo "Build finished; now you can process the JSON files."
- 
--htmlhelp: conf.py towncrier
-+htmlhelp: conf.py
- 	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
- 	@echo
- 	@echo "Build finished; now you can run HTML Help Workshop with the" \
- 	      ".hhp project file in $(BUILDDIR)/htmlhelp."
- 
--qthelp: conf.py towncrier
-+qthelp: conf.py
- 	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
- 	@echo
- 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-@@ -91,7 +91,7 @@ qthelp: conf.py towncrier
- 	@echo "To view the help file:"
- 	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/BuildbotTutorial.qhc"
- 
--devhelp: conf.py towncrier
-+devhelp: conf.py
- 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
- 	@echo
- 	@echo "Build finished."
-@@ -100,52 +100,52 @@ devhelp: conf.py towncrier
- 	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/BuildbotTutorial"
- 	@echo "# devhelp"
- 
--epub: conf.py towncrier
-+epub: conf.py
- 	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
- 	@echo
- 	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
- 
--latex: conf.py towncrier
-+latex: conf.py
- 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
- 	@echo
- 	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
- 	@echo "Run \`make' in that directory to run these through (pdf)latex" \
- 	      "(use \`make latexpdf' here to do that automatically)."
- 
--latexpdf: conf.py towncrier
-+latexpdf: conf.py
- 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
- 	@echo "Running LaTeX files through pdflatex..."
- 	make -C $(BUILDDIR)/latex all-pdf
- 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
- 
--text: conf.py towncrier
-+text: conf.py
- 	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
- 	@echo
- 	@echo "Build finished. The text files are in $(BUILDDIR)/text."
- 
--man: conf.py towncrier
-+man: conf.py
- 	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
- 	@echo
- 	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
- 
--changes: conf.py towncrier
-+changes: conf.py
- 	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
- 	@echo
- 	@echo "The overview file is in $(BUILDDIR)/changes."
- 
--linkcheck: conf.py towncrier
-+linkcheck: conf.py
- 	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
- 	@echo
- 	@echo "Link check complete; look for any errors in the above output " \
- 	      "or in $(BUILDDIR)/linkcheck/output.txt."
- 
--spelling: conf.py towncrier
-+spelling: conf.py
- 	$(SPHINXBUILD) -b spelling $(ALLSPHINXOPTS) $(BUILDDIR)/spelling
- 	@echo
- 	@echo "Spelling check complete; look for any errors in the above output " \
- 	      "or in $(BUILDDIR)/spelling/output.txt."
- 
--doctest: conf.py towncrier
-+doctest: conf.py
- 	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
- 	@echo "Testing of doctests in the sources finished, look at the " \
- 	      "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/dev-util/buildbot/files/buildbot.service b/dev-util/buildbot/files/buildbot.service
deleted file mode 100644
index 4581a13a0c48..000000000000
--- a/dev-util/buildbot/files/buildbot.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=buildbot master daemon
-After=local-fs.target network.target
-
-[Service]
-Type=forking
-User=buildbot
-WorkingDirectory=/var/lib/buildmaster
-# The following assume there is a 'master' directory
-# in $WorkingDirectory with the master configuration files
-ExecStartPre=/usr/bin/buildbot checkconfig master
-ExecStart=/usr/bin/buildbot start master
-ExecStop=/usr/bin/buildbot stop master
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index d48f2b7f4348..56524ea90150 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -9,8 +9,10 @@ AUX sitedir.patch 884 SHA256 0e0537eaab38dd872153e4179f45074a01e2186b83d59f2f0be
 AUX tests.patch 1640 SHA256 ea0258bc61eec6c03dbd2bcea2640abe9b95677882b169f39879551090867ee1 SHA512 a53ff72bf5302107241d43a0daa8ff18c50b6e69c0e1ecf2a841ace8d37fe7f3e8cb4202b666ad3bdda1bcb7d79f39244308542e1992b9af94d97bcec7086913 WHIRLPOOL bf990fb921745c627d77a3d46d55bf9ce3420c80eba76052fcc631bb1963f7e56b1268ed1605cce9968773c969d49246cd73a8ed778d1701b2b76595c0dc083a
 DIST catkin-0.7.6.tar.gz 202970 SHA256 468725aadfd6b615cd7d7a75fca37777db987b6ad63f73062c3273bd96d380d6 SHA512 9f4ddef3cdef0f81aeb2abe27db797318f813e184d457f6f81439d3b539efe2e2726da7eda8359a803848c5e5f8a2f8fd291b6f2a00a16a06112d084c1ec14ce WHIRLPOOL 863f477d54dd2ed297ea94776102fd31ad68cba3550e2a17a3218acda889c0b1071c9df73f16224fc75445742294df46ba6a7eae20019bb01974bde17db9fab8
 DIST catkin-0.7.7.tar.gz 203773 SHA256 0ab4efd1d42fc586ace5a37aba3c4266cff31593b39b7abe3ab6ced6b160e92f SHA512 616ff6a34ab52d50e383acdcebe66aa8f4ac1515ed3c654d75f32cdfe86ee3b87b17872ea2068ea5ddc5f35b73b5cf53c84c6e386d89ad2c8270228f1c446d01 WHIRLPOOL 40c901f74e39e6239d0967ce997d6ebc011063ed0208123d20e057a3bbd53e4dd7b70c6e8c4bfb31d7f0ae9e57292e17343565b68b9c441a5c10f7ff1dee6117
+DIST catkin-0.7.8.tar.gz 203828 SHA256 f0e2f0548ca40fb401d5badfd34798b39fb1aa6c08d4d369fd9cbf44c638f129 SHA512 c3628c551c8a5a1e544f7816a5bdedf413217c6e1fc7bb612801d29fbb247660b35d634c26f8847ace8984482978a8b8bf72c3373fd1e2e0972917f206ee0605 WHIRLPOOL 6a81046365f821241656c811461859d35945cd558b45172c92c0b911878230443ad95b0445f351633b0ea0835e6dc5aee1b0b3ba506f03bee63754fed2b36ca0
 EBUILD catkin-0.7.6-r1.ebuild 3139 SHA256 404f7d51614d4917c3ffe225d4edcae03183a4af37e0d511d7d97aefc54a8618 SHA512 6376d7edca6f7fea19baf69d9e42f0a75692f9104e9881415e96cfcb8cb2f2a6652901ac01c485f6e7ca1951a454e05439c67b8b36bf92ba8147566e7e006b01 WHIRLPOOL 7fb37095e7523ddc4c35d346f8173c6091f6437e752de87bb0014a35c672369c22358a1f95cdb23f93bf0d4f4e01f462bfe52b9df990e094b62708cd820cf61d
 EBUILD catkin-0.7.7.ebuild 3139 SHA256 404f7d51614d4917c3ffe225d4edcae03183a4af37e0d511d7d97aefc54a8618 SHA512 6376d7edca6f7fea19baf69d9e42f0a75692f9104e9881415e96cfcb8cb2f2a6652901ac01c485f6e7ca1951a454e05439c67b8b36bf92ba8147566e7e006b01 WHIRLPOOL 7fb37095e7523ddc4c35d346f8173c6091f6437e752de87bb0014a35c672369c22358a1f95cdb23f93bf0d4f4e01f462bfe52b9df990e094b62708cd820cf61d
+EBUILD catkin-0.7.8.ebuild 3139 SHA256 404f7d51614d4917c3ffe225d4edcae03183a4af37e0d511d7d97aefc54a8618 SHA512 6376d7edca6f7fea19baf69d9e42f0a75692f9104e9881415e96cfcb8cb2f2a6652901ac01c485f6e7ca1951a454e05439c67b8b36bf92ba8147566e7e006b01 WHIRLPOOL 7fb37095e7523ddc4c35d346f8173c6091f6437e752de87bb0014a35c672369c22358a1f95cdb23f93bf0d4f4e01f462bfe52b9df990e094b62708cd820cf61d
 EBUILD catkin-9999.ebuild 3139 SHA256 404f7d51614d4917c3ffe225d4edcae03183a4af37e0d511d7d97aefc54a8618 SHA512 6376d7edca6f7fea19baf69d9e42f0a75692f9104e9881415e96cfcb8cb2f2a6652901ac01c485f6e7ca1951a454e05439c67b8b36bf92ba8147566e7e006b01 WHIRLPOOL 7fb37095e7523ddc4c35d346f8173c6091f6437e752de87bb0014a35c672369c22358a1f95cdb23f93bf0d4f4e01f462bfe52b9df990e094b62708cd820cf61d
 MISC ChangeLog 5990 SHA256 a018d7be6b058ebfb6830438fedb99c62f5308fef6e3c0578bd69d09c312cbab SHA512 16d316ec40a72e54831a46f067d6c96e2af30e9ec3462f41a31ba0f6381161bbd67b32e052850acc989debf5ab7ac52a4f4087916133a109342a561b237d9960 WHIRLPOOL 284b9f907c2d313b17a76b4e4bc7e87e512854a52b520b59eb95b86ac603a5725c807a01f95b86515a705e7715578627f55ec2426c1ab47fd0461cd40d098c39
 MISC metadata.xml 324 SHA256 76d2cb422285dc8034108df724a94ec65a1d54886954d9ed835abae02d78df48 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94 WHIRLPOOL fceca90068856e6ddaa7e39a1a14129f6bcb3e711bb91980b5bc7f79ef0bc950df3d3540309affff519115a91d060351b36e14af034aeffc2adbe2a1fa6e9bc0
diff --git a/dev-util/catkin/catkin-0.7.8.ebuild b/dev-util/catkin/catkin-0.7.8.ebuild
new file mode 100644
index 000000000000..eb49a4b8c816
--- /dev/null
+++ b/dev-util/catkin/catkin-0.7.8.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros/catkin"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ${SCM} cmake-utils python-r1 python-utils-r1
+
+DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
+HOMEPAGE="http://wiki.ros.org/catkin"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/empy[${PYTHON_USEDEP}]
+	dev-util/cmake
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/distutils.patch"
+	"${FILESDIR}/catkin_prefix_path.patch"
+	"${FILESDIR}/gnuinstalldirs.patch"
+	"${FILESDIR}/catkin_prefix_path_util_py.patch"
+	"${FILESDIR}/package_xml.patch"
+	"${FILESDIR}/etc.patch"
+	"${FILESDIR}/sitedir.patch"
+)
+
+src_prepare() {
+	# fix libdir
+	sed -i \
+		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
+		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
+		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
+		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
+		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
+		cmake/*.cmake || die
+	cmake-utils_src_prepare
+}
+
+catkin_src_configure_internal() {
+	local sitedir="$(python_get_sitedir)"
+	mycmakeargs+=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
+	)
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	export PYTHONPATH="${S}/python"
+	local mycmakeargs=(
+		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
+		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
+		)
+	python_foreach_impl catkin_src_configure_internal
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+	unset PYTHON_SCRIPTDIR
+	python_foreach_impl cmake-utils_src_test
+}
+
+catkin_src_install_internal() {
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_install
+	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
+		dodir /usr/bin
+		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
+			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
+		done
+		touch "${T}/.catkin_python_symlinks_generated"
+	fi
+}
+
+src_install() {
+	python_foreach_impl catkin_src_install_internal
+
+	doenvd "${FILESDIR}/40catkin"
+
+	# needed to be considered as a workspace
+	touch "${ED}/usr/.catkin"
+}
+
+pkg_postinst() {
+	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
+	ewarn "installation path for package.xml files on Gentoo."
+	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
+	ewarn "packages that have it installed in the old location:"
+	ewarn "		emerge -1O /usr/share/*/package.xml"
+	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
+}
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 1a016206762e..2015e0d3d4b1 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -6,12 +6,12 @@ DIST ccache-3.2.5.tar.xz 304592 SHA256 117011534b199dbe290b08acae1591c81525536a1
 DIST ccache-3.2.7.tar.xz 305596 SHA256 f1db1ef3cdcf85cf40c7be926c28b4a3beb12ea4d7f1760edf45e753c5147d95 SHA512 4292bd880f7ec39591a4abc232822121e79e706659e36c6aac3f3846fa119ebe18eed3bfefb535e229da8556fe787f1700ff3c63df56d459c6f44260db24b9fa WHIRLPOOL 9abbb67873fb894d1a82e96773b723ec06830dc2a344e4d1fdfc713bc5a9a219b918633ea2b2e9c9a48a0eddc4eca3ca0eb2eb6c8b484e6e469990010dfee904
 DIST ccache-3.3.3.tar.xz 312160 SHA256 3b02a745da1cfa9eb438af7147e0fd3545e2f6163de9e5b07da86f58859f04ec SHA512 59652955708c11dc4e2a0d76bc3810de0ce4009b93196d7e6a28ecf3829616d278e7dfedbd715136cd20c81f57d3912682bec8dbcd5ebed5aaf6508520b93587 WHIRLPOOL 5da75d4088fe2596eb7dc10354b322e6122114689126c676317747e20c2d82d7d830ff1476a8799844a0e377cbab085c0ccab21480b0231ed68c11a7d1c55991
 DIST ccache-3.3.4.tar.xz 314468 SHA256 24f15bf389e38c41548c9c259532187774ec0cb9686c3497bbb75504c8dc404f SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c WHIRLPOOL ac9c5d1ce87a53dd6144fb842bdbe61f7bbf3542005e742fac7a6d2275d2173c67c9d32e57330e033af0fce6aa0e9339116146c7b543996139efceb66028e157
-EBUILD ccache-3.2.4.ebuild 2062 SHA256 cb3d350bc4435be2daf4eab85a4a9f0a1576e3e028a793000578b9aef2fc3ddc SHA512 20a6dfa29a564532a738e5f5d3781af556c893f6fca1807229af08974b9f59212073db864bb9d3a0f4a59ee248799b544808c91977f56509864c10b166179107 WHIRLPOOL ed6c9995dec443e1ca6546058ae4fa368d2c0655d5534cc16140d10bfa2daa76492b2c43c5fb8a800a165310fb192c01aae11718e83965e928c8f1eb4f325b0e
-EBUILD ccache-3.2.5.ebuild 2081 SHA256 d3bcbfe4d182974a99739d0ed2d84559d7ce0ac74354a0818cee9ac3a8e67302 SHA512 968ef1968c01e4056409c1a78ad049ec1bc2f8f7d72e62ec5952fa5d33bb412a3d4e8bd711aa9fc7fd419c1c9ac4fcbcea0fc38a5eb4fb0779596a165c2e4a4c WHIRLPOOL 3c3db2898cbd7d8a35dd3c9cef563b3a25a3f5560011f4b583e4b2085aa73d974ff044356580a78d94a0ab2a12fcf6f1d91d18c1dd1ecd1184b22ad59d741252
-EBUILD ccache-3.2.7.ebuild 2081 SHA256 d3bcbfe4d182974a99739d0ed2d84559d7ce0ac74354a0818cee9ac3a8e67302 SHA512 968ef1968c01e4056409c1a78ad049ec1bc2f8f7d72e62ec5952fa5d33bb412a3d4e8bd711aa9fc7fd419c1c9ac4fcbcea0fc38a5eb4fb0779596a165c2e4a4c WHIRLPOOL 3c3db2898cbd7d8a35dd3c9cef563b3a25a3f5560011f4b583e4b2085aa73d974ff044356580a78d94a0ab2a12fcf6f1d91d18c1dd1ecd1184b22ad59d741252
-EBUILD ccache-3.3.3.ebuild 2078 SHA256 414e28adefcf8eec67dec4e41aa91f0fdb46e89a3cc9e68ad9c4091f64bea394 SHA512 b1ca8999409606dc0cc868b6bba1ba8a0351cc6596a2b5760da916fc6715b9fa184f5a785bd2b1497211b54883a8e0a56be6e35d4e3c8329d5615b5bcea7e895 WHIRLPOOL bee0286f393a3996ece8afb11a4d78d95d75be0a92f3cd45069ef63fc5b64707a45a608582ca5e81c45fe981684a7c87bf114e26dd43ccb33121a0935e517eb1
-EBUILD ccache-3.3.4-r1.ebuild 1844 SHA256 a60922ed2edc8806ce2722d79e8a85b401f1541867b45cc156c2451d35894a17 SHA512 09cfa9374eb27a22ec886566c37d1204c16f88e05e283d3cdf9aba8b79857982fda6a505c8b5b8d55bbf9f829717273670a68d86e3a6336191cf78ccb0b25889 WHIRLPOOL cd947556d1a690c0242bbdf15069bba4d3eb5cd18d8064200d4efeecf96706805a1610834732e799abab86dfdd92e8c38bb6b72f9738b96e70d521b3480b3a26
-EBUILD ccache-3.3.4.ebuild 2078 SHA256 414e28adefcf8eec67dec4e41aa91f0fdb46e89a3cc9e68ad9c4091f64bea394 SHA512 b1ca8999409606dc0cc868b6bba1ba8a0351cc6596a2b5760da916fc6715b9fa184f5a785bd2b1497211b54883a8e0a56be6e35d4e3c8329d5615b5bcea7e895 WHIRLPOOL bee0286f393a3996ece8afb11a4d78d95d75be0a92f3cd45069ef63fc5b64707a45a608582ca5e81c45fe981684a7c87bf114e26dd43ccb33121a0935e517eb1
+EBUILD ccache-3.2.4.ebuild 2068 SHA256 5f3c957218ec4a7ef2dac7adb3a984749a05378c7d92a08b0ace535a56094e2c SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653 WHIRLPOOL e2408fb97a012d8b214d2c186049026696dcff941949937b388dd380ef591614be90ccb0805e8dc419063d730c41cf78e7b6b1d52d737a366cb280a643e46c8e
+EBUILD ccache-3.2.5.ebuild 2087 SHA256 a4624a1b03f7d5ddbec85bcd721510540a2fc33f92fc3119104d107eab8ccb27 SHA512 82ba23cf1be894ad9232069fadeee4fc8f64607e673eb7bd1edbe560e9ae5ec3feed5d009ee3061a605f4460dbf75a6af375f9e42af8b932b4270f6f8a2323f4 WHIRLPOOL d01a3af301b74f630df1e92048c87f9287012f8047899327272db5c734fd04dbe5c36bd567ac789a83f4212b369c459fdf28ce521920484edf1c807130ff3b07
+EBUILD ccache-3.2.7.ebuild 2087 SHA256 a4624a1b03f7d5ddbec85bcd721510540a2fc33f92fc3119104d107eab8ccb27 SHA512 82ba23cf1be894ad9232069fadeee4fc8f64607e673eb7bd1edbe560e9ae5ec3feed5d009ee3061a605f4460dbf75a6af375f9e42af8b932b4270f6f8a2323f4 WHIRLPOOL d01a3af301b74f630df1e92048c87f9287012f8047899327272db5c734fd04dbe5c36bd567ac789a83f4212b369c459fdf28ce521920484edf1c807130ff3b07
+EBUILD ccache-3.3.3.ebuild 2083 SHA256 26c41227f6ed14b9137006d8d03ae69a8764213d28fdc09b5e88f32e7b9546f0 SHA512 3e48057216c5618b26cdf5361fea268caae0814d7ee7cc5abfd54be4adfb3cfca7da171acda1f17ab2794478ba4c9b2721403023cc04fd468239e7a3a737378f WHIRLPOOL 62dd92ea2a7285dc0da14cb1ea5f8fa703a505fd397d8c63d8945b35bb8bc953c1e925310567121f7a69e95067706f9842db7f2e02d5b5c309f64fca586bd847
+EBUILD ccache-3.3.4-r1.ebuild 1849 SHA256 0f32feb468e52850f3422ced3af24cd1b689e5ded1fa7fcb4de096dbc26fbafc SHA512 a52424b561c952d169f27e82470e72941300fcefbcc431c1100b7f52bcf5c28fba7fedbf715734c098aa896abbd84c71eae820aa4a2552e2ae63005ac6bd4fde WHIRLPOOL f32dc90518a3939167307e7ee932079e8534f126d022ab393791402b2ed6ec89b5b939871f8b465a0e0b8f0df95312a69f5ac0b0be061bdf6e068a24ffcdfccd
+EBUILD ccache-3.3.4.ebuild 2083 SHA256 26c41227f6ed14b9137006d8d03ae69a8764213d28fdc09b5e88f32e7b9546f0 SHA512 3e48057216c5618b26cdf5361fea268caae0814d7ee7cc5abfd54be4adfb3cfca7da171acda1f17ab2794478ba4c9b2721403023cc04fd468239e7a3a737378f WHIRLPOOL 62dd92ea2a7285dc0da14cb1ea5f8fa703a505fd397d8c63d8945b35bb8bc953c1e925310567121f7a69e95067706f9842db7f2e02d5b5c309f64fca586bd847
 MISC ChangeLog 5226 SHA256 83b5264607643d87e0606d6cd7c423812b0008157298eba1083deee111dd2a53 SHA512 12b70582f98da4a23db1214049c7470bd52889dcffe040b16f771bf500502a5ecbab780b99d51572a2c407c385c77612fa5f3629ce548f733539c450fc7c3b89 WHIRLPOOL 24730eea1a632e8832a419109e05e8ac4598b7f0443cdec7288a97c5a24568422bdd7f132df8e5a28315c29eaa4acc7b9fd4ca31cd67483e1537d9f87cc4e247
 MISC ChangeLog-2015 19471 SHA256 1ef22a84660ca8147902eec4e11cd99a79a47e25e7099c6a938eaaab05ff34ea SHA512 073c94a370a3d585b6323e1bd1ad78a368a5f300c8978794539c588768d3b1112ffb4e1c37a7a6cb6d86d227b46241be4f3d96089b52793ec9b0ff7127e29dc0 WHIRLPOOL 145e3d871eb96771fdb2768478822ce3e4b4e09ed1a741a51f7639cbd7d48d4c254114b59d8b34887b234fbbcb93bae3dcf6ffa7cbb1a6f5ff69efa52bf9ac0f
 MISC metadata.xml 535 SHA256 bf767447aba3cf42baab8864adb624dd8f126925a74f148e70519b632bedc1db SHA512 1ea0a9f1079489e0f2cf70f923c0c2594ecabf73aa589fe2ca8474e67f41986757c7074145a5b68bc953cac75580497153356c51283e6a90eae91ac94f2fa910 WHIRLPOOL 4816c46eea6018261b1fe024d53bf577d0641e8ddb7cdcb8f827a9eb57bd209d08b2a2c9a10e07bb2eace0b51490169e5ec0d0c35c76f4060454a611bee3e5c4
diff --git a/dev-util/ccache/ccache-3.2.4.ebuild b/dev-util/ccache/ccache-3.2.4.ebuild
index 3108ac512f5d..41c25b6006ef 100644
--- a/dev-util/ccache/ccache-3.2.4.ebuild
+++ b/dev-util/ccache/ccache-3.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils readme.gentoo
 
 DESCRIPTION="fast compiler cache"
-HOMEPAGE="http://ccache.samba.org/"
-SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
+HOMEPAGE="https://ccache.samba.org/"
+SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/ccache/ccache-3.2.5.ebuild b/dev-util/ccache/ccache-3.2.5.ebuild
index 8eae63e90702..7ca223a160b4 100644
--- a/dev-util/ccache/ccache-3.2.5.ebuild
+++ b/dev-util/ccache/ccache-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit eutils readme.gentoo-r1
 
 DESCRIPTION="fast compiler cache"
-HOMEPAGE="http://ccache.samba.org/"
-SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
+HOMEPAGE="https://ccache.samba.org/"
+SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/ccache/ccache-3.2.7.ebuild b/dev-util/ccache/ccache-3.2.7.ebuild
index 8eae63e90702..7ca223a160b4 100644
--- a/dev-util/ccache/ccache-3.2.7.ebuild
+++ b/dev-util/ccache/ccache-3.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit eutils readme.gentoo-r1
 
 DESCRIPTION="fast compiler cache"
-HOMEPAGE="http://ccache.samba.org/"
-SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
+HOMEPAGE="https://ccache.samba.org/"
+SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/ccache/ccache-3.3.3.ebuild b/dev-util/ccache/ccache-3.3.3.ebuild
index afb341d06124..e320f86f1d07 100644
--- a/dev-util/ccache/ccache-3.3.3.ebuild
+++ b/dev-util/ccache/ccache-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit eutils readme.gentoo-r1
 
 DESCRIPTION="fast compiler cache"
-HOMEPAGE="http://ccache.samba.org/"
-SRC_URI="https://samba.org/ftp/ccache/${P}.tar.xz"
+HOMEPAGE="https://ccache.samba.org/"
+SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/ccache/ccache-3.3.4-r1.ebuild b/dev-util/ccache/ccache-3.3.4-r1.ebuild
index 56fe73b6cea6..d0c81ce1a56a 100644
--- a/dev-util/ccache/ccache-3.3.4-r1.ebuild
+++ b/dev-util/ccache/ccache-3.3.4-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit readme.gentoo-r1
 
 DESCRIPTION="fast compiler cache"
-HOMEPAGE="http://ccache.samba.org/"
-SRC_URI="https://samba.org/ftp/ccache/${P}.tar.xz"
+HOMEPAGE="https://ccache.samba.org/"
+SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/ccache/ccache-3.3.4.ebuild b/dev-util/ccache/ccache-3.3.4.ebuild
index afb341d06124..e320f86f1d07 100644
--- a/dev-util/ccache/ccache-3.3.4.ebuild
+++ b/dev-util/ccache/ccache-3.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit eutils readme.gentoo-r1
 
 DESCRIPTION="fast compiler cache"
-HOMEPAGE="http://ccache.samba.org/"
-SRC_URI="https://samba.org/ftp/ccache/${P}.tar.xz"
+HOMEPAGE="https://ccache.samba.org/"
+SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 319a5f103dfb..52c7a504ca2c 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,10 +1,8 @@
 AUX checkbashisms-2.15.9-command-vV.patch 1269 SHA256 bf03b1ea1966891657086566b1d136b34dc5faf49c5473c8818246dda52decf1 SHA512 7b7966b2c5fc672b0a83f7949076af536a56e910853374b2ee876ad5032f847bd87c7d10c7836d9699e2a4412709b02f5769685acd392e94704549de639ea995 WHIRLPOOL 3fd2df99d1d54483ac38042bee29eb8e752e00f8560a97c0af175c712afb1b07f08d8c4e88f09b2f7f5304f0999ecd75714d79259f40833ca0b71bd49979c165
 DIST devscripts_2.17.10.tar.xz 706396 SHA256 fc28882f4e6f6a0a74119b811df308dac758e1a097f947398ae895e574043aff SHA512 eb2bcd29237696e0e768d2513fa895891cb2b368c41c6d611ad7db815400b22317324b8326d4e71b1ab511a8a7abafdf0a2f2641da955034ae58b3d4aad3fc77 WHIRLPOOL 4494b2926f8f328113aa73c18fc3550721a7ac69a19cc986ea0dc69e9918c93e55eb387a8d3427126ac6f390973729c5f764dde8a632599d0e86f5afd1449cea
-DIST devscripts_2.17.8.tar.xz 696424 SHA256 7e39e296891d2d158b717c0c834cc0c5ab560e5c7d88910e42bf59cda10fbeea SHA512 1495a754346ec3903cb91d9d937b74a1d6a928a84028d19016b7a2d0df5c0f665aba7c777952ae57f5f8b421b696cf631c7a139ea68a98f31030c83b6e67d349 WHIRLPOOL d146b5e3317278b21c49c34af29877e0bb8f463c6bca9ec037953d0da9b53c8aea863d27691fe95667ebedc2d7b1d209d2593b51083537f9c0d8956a34b45855
-DIST devscripts_2.17.9.tar.xz 696500 SHA256 0ef164a9b8e774e8aef7a532302e7ce60ba10a72e56da485865222e68033b73b SHA512 00bc2fea2aa2f5806f6ecedee96c09c0ff31d99283e7b242f85c04a63310ada692df2bbef0cfde73dbcf3ac455026a5262b298fb2348528f2a9d7ce7916d97dd WHIRLPOOL 867d946c6d598ccb67e2e19a872c033d9c22b7b270cf2eadbc81da0d1d4a42d444cc705bff69b6b2e35006d72f6131ee101e34ced34faa8e89da7f950aca5c81
-EBUILD checkbashisms-2.17.10.ebuild 895 SHA256 cf558792f3362633fcb0e51241bdb0a91748ef7a1894b4f2aa864c82749701e9 SHA512 6ae231efbf1bae391b85ca23bf231c66205bd4349014ececb8d22691882d6dc6593787745a79eb686238df10f4921daa41b65b7fc3438cfbd975f0a39ee0f986 WHIRLPOOL d159ad159c7e040ccb3ac01a4e4b02a691bb6de415b6adb2fd6b55dc8f147809ecc1fc5b9a936200dd1c2bf4ec51e8775ffca14f6daee743af59c6bf777c52fa
-EBUILD checkbashisms-2.17.8.ebuild 927 SHA256 5881e71fd78de2e1203332f156cbfe70d3a5fb77728316ed5928c8837809bdaa SHA512 95bf44f663113e19b4f7643cc60c744d736cc02e5de900bdd039682fb9a3595f83595dc3ded1951b148b7387e62cd1377a5fcdacefe2b091032a40820133dcff WHIRLPOOL cf9e63b18391ea296d159b3d518c00b91e8a77859ca219f3bfa71efce5d4db260ea585a550d0dd39afe57d06db43412eb23c5f5263bf73b8e04c4e1100ec024f
-EBUILD checkbashisms-2.17.9.ebuild 895 SHA256 cf558792f3362633fcb0e51241bdb0a91748ef7a1894b4f2aa864c82749701e9 SHA512 6ae231efbf1bae391b85ca23bf231c66205bd4349014ececb8d22691882d6dc6593787745a79eb686238df10f4921daa41b65b7fc3438cfbd975f0a39ee0f986 WHIRLPOOL d159ad159c7e040ccb3ac01a4e4b02a691bb6de415b6adb2fd6b55dc8f147809ecc1fc5b9a936200dd1c2bf4ec51e8775ffca14f6daee743af59c6bf777c52fa
+DIST devscripts_2.17.11.tar.xz 708508 SHA256 2fefafd23e1707b07c4010ca27aa708992911aa474cd33cd888375d868ddc2da SHA512 bcce427b551ba1ee19b794e4a8243ae6c8efdf7fb6f108b7cd0e43a93ce9a12bee99800fc40c2b8a2bbf6451adceaeadf6042752fa2e404cad2d014ff03474bf WHIRLPOOL 53a8fbe7ad2ef850ff41e24039213bc3d7332d0c7b90c8a863f2e272f11c976311dd3e5184339529af2a6a051aa556ca0f47ca32de12cc342fc12d7326dfda31
+EBUILD checkbashisms-2.17.10.ebuild 893 SHA256 0203032b1bce2792c8eafb2669385d7572fe16fb7751bdcd03b05ac5ccd40ab4 SHA512 e4b7e855f6968adf3408c2ac96325833100c63c5ca51e9b81c0d4f679fa8e0a5e53a1ecb13b6f9dc643356ae8591da336d7fbb1bbdaca68809db9f63e8880e2f WHIRLPOOL de6c1512942ea5a514324642d0fe2f8f0830569c631a52b9fe96339571371ff3defbc0f973228a424b78aa184be7d2c4174ba85f30f169d536985de36d1ec588
+EBUILD checkbashisms-2.17.11.ebuild 895 SHA256 cf558792f3362633fcb0e51241bdb0a91748ef7a1894b4f2aa864c82749701e9 SHA512 6ae231efbf1bae391b85ca23bf231c66205bd4349014ececb8d22691882d6dc6593787745a79eb686238df10f4921daa41b65b7fc3438cfbd975f0a39ee0f986 WHIRLPOOL d159ad159c7e040ccb3ac01a4e4b02a691bb6de415b6adb2fd6b55dc8f147809ecc1fc5b9a936200dd1c2bf4ec51e8775ffca14f6daee743af59c6bf777c52fa
 MISC ChangeLog 6794 SHA256 bf844e52ac18703bbee587bd93ae53752e0b6d6929e57bcdecfa11c355bd0808 SHA512 ce65d2a8180155213e7524e1cf118e7488e1c6883f98444d8475327eaf0226a71e2889af26f56e89143260468cc9532a30d6936958bdeb373223f2e306c26261 WHIRLPOOL 01399247c2427a9305079d12ebf7301f3848136afc18b13697e43ab84cc727642f030862244152c712c96e96428330378de8c8f8ffa709a6476cc01321919fdd
 MISC ChangeLog-2015 1633 SHA256 a8c1666a9877877027323f85341b0773852a1e9fc1db551c82700d37f2fa3739 SHA512 877244a4732fce97ba755abd2fd3cd06c1df0fbf8bea414912e621b4f14b47762423cb15ff34bc94c59bddb6c8e56e0372adeda2f94cd0b399e31825c8bdd2ac WHIRLPOOL c72e7b6538342b0b14b86a9fb555e4dfc36b4add6fafee77c6033522b2865326a6f06bc42b35c1b06aef06d1aefb0235a65656212edc16ea11ed7150158d9312
 MISC metadata.xml 433 SHA256 1d1499152658a92a60b866f9f8c8e83ca86a7e98b522b16d5db056218bf7b963 SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716 WHIRLPOOL 14ea58cd4fbaf1a2bcab98e5282e371623285aa495dd0a289eae44805edb55ddd6625064951c6a21bcb2f842c55cd25cbb7e1a78a6a1f4a2f70068219542477d
diff --git a/dev-util/checkbashisms/checkbashisms-2.17.10.ebuild b/dev-util/checkbashisms/checkbashisms-2.17.10.ebuild
index 8524418c7c9a..61b10af9c25e 100644
--- a/dev-util/checkbashisms/checkbashisms-2.17.10.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.17.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
diff --git a/dev-util/checkbashisms/checkbashisms-2.17.9.ebuild b/dev-util/checkbashisms/checkbashisms-2.17.11.ebuild
index 8524418c7c9a..8524418c7c9a 100644
--- a/dev-util/checkbashisms/checkbashisms-2.17.9.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.17.11.ebuild
diff --git a/dev-util/checkbashisms/checkbashisms-2.17.8.ebuild b/dev-util/checkbashisms/checkbashisms-2.17.8.ebuild
deleted file mode 100644
index ac906202e791..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.17.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-inherit eutils
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	!<dev-util/rpmdevtools-8.3-r1"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.15.9-command-vV.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 202bce7b3265..fd7eff7e0f7f 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -14,14 +14,16 @@ AUX cmake-3.9.0_rc2-FindImageMagick.patch 2407 SHA256 5cfef1e684b67f3bc464fdbeb7
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 SHA256 dd3388f12fcaaed08c752f85ed4f27d795fd97896386a0c1f237e2cc4a65a9f9 SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12 WHIRLPOOL 51a499e6df73e9a68f243979a4fef33eb717e1f60fffc3bfbb9289f7a03c7438e44e4d01a77e87ea24c7bb956199a3f5a7fdd7f3583a625384487366ed0ba6a0
 AUX cmake-3.9.0_rc2-prefix-dirs.patch 4030 SHA256 2f07ffa2eb1129b5bd707b0834be1cf00964710974393a301a8cc9995b2e07cf SHA512 116073dd2d63861cb33b7b92d07adbdfe74e05864f488be8df3a6f5b92bee76c518770ad31972323e0ed5d8c07505c7fe18105573e7f5ebeb79b193297dd2ca0 WHIRLPOOL 5b0f3afbddfb202cb12d7b86823a39ab2de81b6ce261aba25afdaabefd5b4ec87804ea1b6d7891c69f6b7b32a2ef2977937e2dda62c88cd5032e5987b16c40ee
 AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc
-DIST cmake-3.10.0-rc3.tar.gz 7820278 SHA256 155431a645a381d2f254058d7c23c9a2063ca37554c8576e5979281b57d80b14 SHA512 28f1435e314697531736ca9dc94cd65dc2d71c3f75b7d197ef200b096ef55f6fd64a2c0706c44692b8ec49cf3861aed879d3c1da0eb2de3b0c2762450466ecb9 WHIRLPOOL 39ace2bcd763f04ec29f7f34184187d265f483aafd35100cf3d15b0bc1a2df6ea73d2170349293f907a408b72ae4ee0901e5b95465ddf07de50560e59335285c
+DIST cmake-3.10.0-rc4.tar.gz 7822506 SHA256 4805df35a6313bd8bbf13d93f6fe9fcd16f54514564ec126d3ed7a359b637619 SHA512 2f584450044a4a2c660c51de075310dff92e51f5e6818c4a853242cb71e73b3e30e00f56e81d6ca75f45a45b09ac38a1523193ec068113e790b8fa30f8e3b1de WHIRLPOOL cdc2434d7a0b1611ce22e2da3ed835dc889a2361f5ce745f0e2edb5e7c45c0409a24ccc187582cb24c15f78133f808218c84ae5667be52fa8917ff18051153fa
 DIST cmake-3.7.2.tar.gz 7361593 SHA256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 SHA512 b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d WHIRLPOOL 1861fe2887f4483856e1964ff1492e196624d3072ad1e21910fba29d0c0d654e7d5035571648386a77cd6cbe895f8cdfbb1f4cc1ad60d14015a01a22494456f7
 DIST cmake-3.8.2.tar.gz 7504706 SHA256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f WHIRLPOOL 8768bffb365852414eda0349d71e59517c8047689303d7873a5889cb8b28c72cd636982a18b039f26daae33023f7e0ad91c3a9ab2d30c30e4b3a9b3cc525b78e
 DIST cmake-3.9.4.tar.gz 7705052 SHA256 b5d86f12ae0072db520fdbdad67405f799eb728b610ed66043c20a92b4906ca1 SHA512 d9172f86df7ddefd0ecf1cd271add8b8af2d712a47ded530e9ff2c26e39087bc11a099125f17add6b563d176f27a68f4998bb53ae390b3f12894d658dfc8eee5 WHIRLPOOL c1cc16977ce1c1a4ac58692694a608bb5996c19db677bb6d25db1e017586ad1d676bb1f086af4016b8017cfe845ed7c6795fad7f1e7b5ab0b4d9b414452d661f
-EBUILD cmake-3.10.0_rc3.ebuild 5926 SHA256 58e0d5a44a8328bbb51af633b403729b1ef219b01fa8cc78a6699d4f325346c6 SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc WHIRLPOOL 2ae8cc6da42d81f51852bd94306f53d3565eb4ad242ea2656efdeb0a541bd65a0750e111d61dea2c8d58fe71acd8b82849c78f9485a54e073666bac89b728e12
+DIST cmake-3.9.5.tar.gz 7705155 SHA256 6220c1683b4e6bb8f38688fa3ffb17a7cf39f36317c2ddfdc3f12f09d086c166 SHA512 71a0848a0c7048c210fe16fbd2b0c2870bd4c2140098225e94fac13a53059f4ae610139115ab8c153989886baa087d506b9ffbc7b91ddc157b0c85e3223828a0 WHIRLPOOL 6d318cf0150d52788a39e33b391e8fc90beeddd3b06087e13e6a317b15c9ee8697648d9b5d35c22330da0ea108fd3855bbfcafd64f434cea51ba5e3ffeb44265
+EBUILD cmake-3.10.0_rc4.ebuild 5926 SHA256 58e0d5a44a8328bbb51af633b403729b1ef219b01fa8cc78a6699d4f325346c6 SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc WHIRLPOOL 2ae8cc6da42d81f51852bd94306f53d3565eb4ad242ea2656efdeb0a541bd65a0750e111d61dea2c8d58fe71acd8b82849c78f9485a54e073666bac89b728e12
 EBUILD cmake-3.7.2.ebuild 5503 SHA256 1f8fde3a0b989b81fa89d4149a9422d118b0459925de3c56106bedc9808f5310 SHA512 8c8b96355c6edf0e84e3cf837042922bc5558f8c488e9ef718553c28eef10bf630671b66a6205cf495e22ceb220fb37c2a7ea1926a5271a63f8c402626dffbb5 WHIRLPOOL ccfbe6cc7c39db516d7fb294a5f656a89d9f8ff9cfb256c389a3e20fe9a3b6c8d3c93b277f71ab4928bfaa88b4de48a2e76a4898caf71782dae9387fd30607e6
 EBUILD cmake-3.8.2.ebuild 5715 SHA256 4f60bc28e164b3c0285390ffb755ee6e1d0bcee547dac3bdde7e20a53f256c65 SHA512 6cb62411dfccd86d12260c6e7d6169d063fc1aa00d5effece2bf3eb9d959591cf28186dab0cfdb76c98dbea1673677b6a9b4f6070b10cfb20acda4d184f23def WHIRLPOOL fec6f8dc7a48150c3cf6e25d895d564ce4bb9ff890313910886b068d511bccab6fb32754c0154bc3f6b6b5b1ef74fa5c0023302009cc7263de7fbcc930be39d9
 EBUILD cmake-3.9.4.ebuild 5975 SHA256 fc9aa836630ebaeafcdc37a23f9871b354b1dd6037f233020adca3c9ccda745b SHA512 b7f3c9d2f72a708e19359b8a0737aecbaacf09ce7b817c785789008353ad758ff7ce889a10e52bce5ac3cfcda4cc1a518f7a49a553e902e3a53e10dc2177849c WHIRLPOOL f2ff6c773f31032d227c1006e5c7c88857a92824168e13afe9ba84d0d9bff88d3086f8837e0c4f852ec27ba2ccac729e262ef1b66c67cda2fb0c1e9d50312799
+EBUILD cmake-3.9.5.ebuild 5975 SHA256 fc9aa836630ebaeafcdc37a23f9871b354b1dd6037f233020adca3c9ccda745b SHA512 b7f3c9d2f72a708e19359b8a0737aecbaacf09ce7b817c785789008353ad758ff7ce889a10e52bce5ac3cfcda4cc1a518f7a49a553e902e3a53e10dc2177849c WHIRLPOOL f2ff6c773f31032d227c1006e5c7c88857a92824168e13afe9ba84d0d9bff88d3086f8837e0c4f852ec27ba2ccac729e262ef1b66c67cda2fb0c1e9d50312799
 MISC ChangeLog 19332 SHA256 2a3d0d8e5bfffb597c1906abb1eca3af3f997ac21673c469afbf6158a6b81b61 SHA512 83435d8060bf76931f512560a3ac4e9ae1f76073e9b8d05f75a5a4fb5d809a949bd55c4891b72475c7f8e19a4d31eb9e23799131fdc66ead7877790d43d3337e WHIRLPOOL 5e3bb823b8460257e98e0431bf55d44e5279f993724293f421e8348640ccf59980ca804bb247dc1f0f19d45aec45245dbf2f6c5d6bd075ed6350167782412c52
 MISC ChangeLog-2015 51428 SHA256 7e79c94e1bc0bc7071915d8e7bdba4812c823812de795931aec29749c410bb8e SHA512 cf217bebf0e7cfcb5771dce5a6df4fb9a4ecf77d296928de0dd2f3f34852a509a403b5b6351b49ab0ce6de755631d7e01b395a5bb9d6be5d6aa49f00185acc8a WHIRLPOOL 8f8585bf220e0a89a7f404108fdd4bc290ca37daf5d24ec3244b0bea8616b066725d7800d94697696a98fd49d6cb7cf834014ff4a0a2b77641119af3a186d451
 MISC metadata.xml 430 SHA256 ea1b72b7fe5cf3e1ac1dce7d4d2924300ff032b9ba410e58c2d26afe68d8e8b8 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015 WHIRLPOOL 36f7027826bdc0614352474beeb56d230a6fdde421bdab8c72e9a8cab9dd0038bb48b49a96bd722f6aaab62ae98402523db7adee2ec28d73bf0984d29c05f5de
diff --git a/dev-util/cmake/cmake-3.10.0_rc3.ebuild b/dev-util/cmake/cmake-3.10.0_rc4.ebuild
index 95dda9d73a6e..95dda9d73a6e 100644
--- a/dev-util/cmake/cmake-3.10.0_rc3.ebuild
+++ b/dev-util/cmake/cmake-3.10.0_rc4.ebuild
diff --git a/dev-util/cmake/cmake-3.9.5.ebuild b/dev-util/cmake/cmake-3.9.5.ebuild
new file mode 100644
index 000000000000..48cd86d38774
--- /dev/null
+++ b/dev-util/cmake/cmake-3.9.5.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs server system-jsoncpp ncurses qt5"
+
+RDEPEND="
+	app-crypt/rhash
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/expat-2.0.1
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	server? ( >=dev-libs/libuv-1.0.0:= )
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindImageMagick.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DCMake_ENABLE_SERVER_MODE="$(usex server)"
+		-DCMAKE_USE_LIBUV="$(usex server)"
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index c188065cea65..d40addd067b1 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,7 +1,7 @@
 DIST dbus-test-runner-12.10.1.tar.gz 382108 SHA256 71f2aa4a48a8f88f1629389f902bbfaf42df4b1fcbea9473acc78de75fab525f SHA512 6d40d607fdc417ebb9aaa6dc3cdd41a8ff1563cb3791689d17a99d105a0c16dad8ffcaf3da7ab6b8c3dcae17d2eba1bf8a6a5d92dc1d3de0975218220ed3c9c0 WHIRLPOOL 2c14b7022aede43c4ce2e4afb1e457a0aebc443ec956552eefd7e6a101aa0045d5bd2e91c9fa0d8ddd93315fc7b5a65d0dadc045acbae11eaa00380b4b45a951
 DIST dbus-test-runner-15.04.0_p100.tar.xz 304760 SHA256 44017df1729b0b3956cc7d3f153626c85eaa9796eb155bc1f5330b97e929df9b SHA512 4ff94fe022d69c0bc83b35fb14397fb59daa0b6a9ff9d7f0c93582bc5468ba6e495d4b95f9b4d8cb56f0b782d4582dc2cb67fc087aefa59295a3b40ecdbfa34d WHIRLPOOL c67bf03e407a0edea8e2fc1df8630608d2acf66840b71e61f6bbe7e19c26755b3357cbb59b0fc794ce8f6149816b6d165e8cefa1513b13e84d71519d26921817
 EBUILD dbus-test-runner-12.10.1.ebuild 748 SHA256 9c50707702bfff9bc40f3bedd0e44e6f7659e5befaf78c7c10f1d6e71f43943b SHA512 9a1f2b4ed8b757ca09a1195d567716620d7ecea9d45e4ee4c31d478c29cc5b2a95941f536a9c59e8c4c61b34f8e55d823d655ebb5641f93e0a41dbb339cf85fa WHIRLPOOL 33eaffc59dac4f13d0cefde4ed4b2b9888087a4b302cca66112020fbc290e137df3c9ed85160127b42a6ba6b677e1e002dfcd7df2eab2ef80b1c3f1b3f97597e
-EBUILD dbus-test-runner-15.04.0_p100.ebuild 1043 SHA256 cd6e6094bb71102132d43ec988a33d7b332fa75fd14deee83b6d89c1ff86f694 SHA512 750a3e416d477858f9cbc0d4f8f952d276df4ea04c03d51916e2e3887c50df12e730d696edf9a3ba03d39608caa6b10ec41fdc06918e7633236f3d74f025fed6 WHIRLPOOL 79f117bbf7e36d666e7f60dba998c31b916751bffde3cba0cf2683b0e2d9a454fe84dc7c31f994d6ef935dd056e96bce3338e4327a5d2ba3754ad0e0acb6867c
+EBUILD dbus-test-runner-15.04.0_p100.ebuild 1048 SHA256 18d03ed0b82df92e11e9f3c219714a6c198178a005211805cf9bdd177c6ea372 SHA512 5a27ce6110fbbcff3c003d12c5fb52573f957f1ec509f4e8dcf13075dcd622e95466106b27e8fd4bbc17dc0e3dc4d2bf47a3e16fac8e1af41e249d26958991bb WHIRLPOOL fcc2e99b19879877e052bcf382c1e3bd8efc31a93bdf6fe22275924add7e1c9e583be5032cfe8a0e9fccc708faed4161b84f62f5b302b7c90169c05761ff19ec
 MISC ChangeLog 2647 SHA256 87ca899066b80705a834a340ceb9a14c3e3b24a68b3fb8ffa7cb05dc0fa8944c SHA512 e44deda9fe256ba469f8ad0fe7f0596bf3da9934e6ea41f13c550446ac76e360f1d5e0c63bc7e3738273912b8c3c3edfb20d292021dd9c1e731ac61dd925d33a WHIRLPOOL 2d72f6606ba814ceea12ae92f06cd121db2537393e99105c936c9bb16d73e7e273a35d137559f6de04b1c6e86e25972aebfec6cc06ddaadd9e158b7079264252
 MISC ChangeLog-2015 2529 SHA256 eb3669534945d3e9fc95c26f488027c074b89acbd7193e17a3a78dbf1069defc SHA512 2a2f3e99f4344c40165ff61ca76b096b5006ccd70d49d79682535580013e4d108151eeb7beb719a935762f923e871d3fb06d5a6dd543432d3de081ea97439965 WHIRLPOOL 6012efe9fea6cfa9c013725d277475972c21d9b5c8e4448aa83fa58d642166b2224cd4895a003f22b56dd89a37b11b051658858ce9075f09c17d30b7459d6ef0
 MISC metadata.xml 333 SHA256 1ee80ff5e994244dcf3e0acc9b1f930409efcd90b854f9e08143c2faef5391a2 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299 WHIRLPOOL e1badd573fd76617288897491698608a132564129ef2c8a088665cf70c4ed298350a3f8c7ab8c44f9017a870b48eb209dcb251a375740f76c8a3e7077f87bd04
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
index 009601bfd42f..25214463eef3 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 2ca246159ae9..a749ff3b669a 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -4,7 +4,7 @@ DIST debootstrap_1.0.91.tar.gz 70171 SHA256 65947fd131217867ce774c4b00d16d6d082d
 DIST debootstrap_1.0.92.tar.gz 70042 SHA256 e1c629430273ac746f2047a730b4c2ddcbcf2ff835f4152bd11340577734f719 SHA512 42d6cdeb1efbe95d9215522648d87165326ae1b5a024608abd476a6b3889c8c04420a0f29f5eb9cfd2e57adb4aa57a606519b09e356d0442cd4a4a0f6f45f656 WHIRLPOOL 2783385fea70c633822005fdf8d3e59a604e134e692425673c6fb4bd1fb69246b5743c4e5c12ca9f04fe25619d4f624e99bdd07f344f962531af105bcabd7fde
 DIST devices.tar.gz 47835 SHA256 0d93f93c8b21160069d14e74f8f990a2e0e1e5a90dc828b29e6b3f5aa5829e48 SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432 WHIRLPOOL 222963bb920e1311bc2f481bba04e49f386b60cce6ce0576424896277e0c4fc6a339d4403d587744c32b0bfb1db6391f200fa8d66117e3f21e1c12f35365d732
 EBUILD debootstrap-1.0.87.ebuild 1174 SHA256 fd31d19c7d2c48addb4f627fd8f26a342eae936ede93b758ae73bdf1c0ecdcb0 SHA512 61168ab5fac341d00a9d58cffb56e3912bfd56b4ff7fc1c3fae945edc6618e582d49c1233082b4e2750849607919b724789bef2a242b837dbf766b288061a16a WHIRLPOOL 61fddf7677fe429990ba5981e8479eeece4b7f2fd4ef31df0a455951842a36c5aa329e6c9483f04c9b6776e572035e0005140157a905ca1817888490e4e5beaf
-EBUILD debootstrap-1.0.89.ebuild 1195 SHA256 39df31b3a9d4ecc8161c8965e82b6dfcdb803cc3682f8c850fb147753daa0cb4 SHA512 c2348330d9f4ed35f62903edf95f7e68a35850fa49e472ea7b441762d5439ed5862f00bff21e6b5804d8da843b8b55596d3c654055035a6985ee87515fab79ee WHIRLPOOL f8e7c0c1fd7486f452de36f0a1385a7ccb6a804349fb56642b31905264cfe28175677a5e5f863598d99e66537a5f0c50769663d9d93bd1b5beb645be0e18dbcb
+EBUILD debootstrap-1.0.89.ebuild 1194 SHA256 20387be28cec67c93ecb328d3027f91d61248ae5863f820b4f285b196ce131c2 SHA512 03b7ac7055a6547255ebb433a62c1ce6eb33fe540764cdef5da631e66341dca64445f22b4956ac209dd38c5ca1daf1d4976c4bc3785747c6f50b5cdc60a28c21 WHIRLPOOL cc9b33134c1582b82d64c9cb68754cc5c63b3a07972410b421220fe7eac0264dc39b65b4ba223d93b9fff44b1339d48ec9020f0214166325ceb24dc17e84d583
 EBUILD debootstrap-1.0.91.ebuild 1183 SHA256 c89005c4f228bf3a98d2319a97dd10c92e523a82bf1b326ee005144735394721 SHA512 c4ddb7e092b5859048f0fceeb4d68ccb119a8e5bc48f691eed82163a83193255a33b77e5e3d8bb5f0b11bca400d668aac45b5ced70a1ef3e9aeaa83c210ed6ba WHIRLPOOL a02146799c2852a721794d52a97cb6cc8a4036c592621d6f892896e7360019d2476b8626ab2edf58ae9c9c88960ab3fa7c29448398dd2773dea117e7099002bd
 EBUILD debootstrap-1.0.92.ebuild 1183 SHA256 c89005c4f228bf3a98d2319a97dd10c92e523a82bf1b326ee005144735394721 SHA512 c4ddb7e092b5859048f0fceeb4d68ccb119a8e5bc48f691eed82163a83193255a33b77e5e3d8bb5f0b11bca400d668aac45b5ced70a1ef3e9aeaa83c210ed6ba WHIRLPOOL a02146799c2852a721794d52a97cb6cc8a4036c592621d6f892896e7360019d2476b8626ab2edf58ae9c9c88960ab3fa7c29448398dd2773dea117e7099002bd
 MISC ChangeLog 9261 SHA256 6e6109fd8207260cbb98ba72e1032252f48179d225e42ca10b74b0c61e29eceb SHA512 f1fd535e1765d7aaaaf7e78024c79618c8a7ccae8cdc420963b8d2101006b901a3c5cf6a3b6b39e0243f52614927141adce3d9f138291cc61a0f20e847ef0e2e WHIRLPOOL 22f14977afce505f0dad9e0684bc528b0a0b8057226312bab58affc45bfef924142cbc6cbcbc1648d2cb08afdc8cef49c6e0dbb20be67cd2e5762646f1eabb6d
diff --git a/dev-util/debootstrap/debootstrap-1.0.89.ebuild b/dev-util/debootstrap/debootstrap-1.0.89.ebuild
index 7e781ab8a49f..406c0e4a96d7 100644
--- a/dev-util/debootstrap/debootstrap-1.0.89.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.89.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/dirdiff/Manifest b/dev-util/dirdiff/Manifest
index 62d5bd3e3191..dd195c1d144d 100644
--- a/dev-util/dirdiff/Manifest
+++ b/dev-util/dirdiff/Manifest
@@ -4,8 +4,8 @@ AUX dirdiff-2.1-include.patch 314 SHA256 faedaf8053619fb773aef44bfa55240910d1001
 AUX dirdiff-2.1-tcl8.6.patch 397 SHA256 3a5bfcec7e76e91c1a2664f3eb6bb306ff5b0269ecfe42bd23d161b0577db916 SHA512 938c6cf4f815f58f0de2c12b5bd19e8128615aba278c91e9c7a8e462f822b79d22f7d50ff331e095ff77ec979c9fc1a1a3a8bfd80f23c2f0e252a1e05098888e WHIRLPOOL 419041f7f5266cd103ecb6ebbb76ce1fb3ec2dc94454bad6e7a9f6be069d1f9f48165905cf1a11ca0ae8bdbfd339cbb77104d430843d34558a4e780e7980e7b9
 AUX dirdiff-2.1-vcs.patch 497 SHA256 92f15883cc407633eca8daf03403b4eddfe8832bc74522b2f82219a2ab5f7623 SHA512 27baa8b3e0710db7ae9b01c1c132681ee71e96e4d19585fe0bdd9584e182ff96e7358df6607a40af054fdb536275b9c5a49581cde2fa934d6cf7f39489eb3a98 WHIRLPOOL 0bb63bc51351f9e2d45f7c649a00ac475db775d05c2a43c23b6f583063aebf0048d67542f855cd256fcf1840dd4dc68443ca48b107d96fe9a1e178111e3fed10
 DIST dirdiff-2.1.tar.gz 43105 SHA256 cb373654d5788027804355e355df0695862c3bfc1f6a3fc6014722b3156a9252 SHA512 826d5a7a633921bec7043c89ccdadff19b4a6328efd09913932b306a48242203fbf6b5bac69d72660acf2c76ce6c8c5e53be62c2e69bbf3e3717e21c544ca261 WHIRLPOOL db5342743f3c6719de6645e11f6eda883d27fc9fa83380022e4a11c5e897fd4a0066aa696316d9f262951a6500c8cfcd48afb3d59d2e9080823eda93f174cda5
-EBUILD dirdiff-2.1-r2.ebuild 913 SHA256 ab50061ff34948e4a111905ca327ea7813bf19098a13795ff466010b6d5d826d SHA512 8ac0e9d7791dbe39ca3e063a22262f00f3cf2dcacf8a64a0af4c99fb90fddf13017cf45ce5409c9c3ca881441b0fc6423539bf59565b76ed7e47888a4f951c6f WHIRLPOOL 0a9a24ef0a994a36e9e2c064ab1911570362d027989e7aa37df07e4a431dd422970b5c232d7faae98e49c833cd2989248b127d60cd92cfeb05193950c3db8f1a
-EBUILD dirdiff-2.1-r3.ebuild 917 SHA256 0b9a25c9d5e9f40ca920750c6b42b4773b3d34d2939fbfdb1c6c8a96a2206dd6 SHA512 4371e3cecd495db6fb5202611666b328ce8a3ccebe8d8785ec1250cf2fb74eeebca3223b1d0bb023418828ce087caf0b3067c91fbebb6dcf135152702ef8d504 WHIRLPOOL 42579a1131dda4834645222455fecba6e079088dea26edf466b8254d82131ad6c20ce99cc58d9269ae6e86a575d1edcf32373f6953d74c8cc02cb9ab1fb29675
+EBUILD dirdiff-2.1-r2.ebuild 923 SHA256 8827e0f23ef59462946e168aca1d22cab435872c6cb3b75c5ae090cf9189a209 SHA512 5ec22626ef3f18f445ccbcc552fa328f59200bb853cc6cd7670be59a8d6a30e612508e9b48380ba146269e05c94e2c4be389fb842e1fb3162779589a120bb240 WHIRLPOOL 3c0182d90e1689ca31c557ef12b1875ac65ddd3b52a44b419368c3c95dbf9944b6bac75536d0341b03ae44207897f83d0af81c0d8d1a67fdc639232e7347e1fd
+EBUILD dirdiff-2.1-r3.ebuild 927 SHA256 8afa824d831b6fac81c3081f7dbd7539eb8420da0765968a43cd5b6d857b36d6 SHA512 97c4df7d6ef588b6a72501e42a88b6efcc32d5e14b7ebae08fefc8d150d777534b2a89dbedb5ba6f988c703aee740c86c94875344d945465aa04792533ddb6ac WHIRLPOOL 2e6f02847504cef71f91d9f6fa273fedf486365ede4aefee0680f9d6e932ed7b20d3aefe1e5ce3b71b555057a9b9845909afa5d10fc6adfbc31fc333e4e319c7
 MISC ChangeLog 2695 SHA256 987e1e0ea5b4d63ab18ff3d05325564073de8bf21295cd1327fc0c8f7ecc822c SHA512 b2dcb5ce37c79f3b20420a935f7dd1ca40171c6cb6797a264755f673a298c3e1cd68dde4dbb23a01f07c1b385b025176089a0f8e78a0dd8ff29af752eac67c64 WHIRLPOOL 0a2479f7c4312d6b9b41919740f0b635019d4a5afb176ac695f3323a9a683c642fd66c8b1ba0ab49375dd9dc6bdecf2530ac34dc4ff5cd7e3c78eef5bf895140
 MISC ChangeLog-2015 2895 SHA256 7a9d69aa9df2254f9d83dc5b47a6fd9764aad62fb1827e38941f74c0c589ad64 SHA512 c9384e147ccb98381cdf6b64c29484425c4668a01c7dbfe5ecb90d85d71c80eb142cd0f336e4d77e28d4e77248594e247a3ccae19b795c8eab38be548d74cb72 WHIRLPOOL 29f35b9f15453c0a1da4aa6fbbf444f718c49a3d5896f36ba55338691ca231fd84b1e40540b411ad3439462e93fdf881874998758443237d81e0aaa330ae337c
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/dev-util/dirdiff/dirdiff-2.1-r2.ebuild b/dev-util/dirdiff/dirdiff-2.1-r2.ebuild
index 7750c5d249ff..c739a93df91f 100644
--- a/dev-util/dirdiff/dirdiff-2.1-r2.ebuild
+++ b/dev-util/dirdiff/dirdiff-2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="A tool for differing and merging directories"
-SRC_URI="http://samba.org/ftp/paulus/${P}.tar.gz"
-HOMEPAGE="http://samba.org/ftp/paulus/"
+SRC_URI="https://www.samba.org/ftp/paulus/${P}.tar.gz"
+HOMEPAGE="https://www.samba.org/ftp/paulus/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/dirdiff/dirdiff-2.1-r3.ebuild b/dev-util/dirdiff/dirdiff-2.1-r3.ebuild
index 0310426e4e56..9c9f48067a95 100644
--- a/dev-util/dirdiff/dirdiff-2.1-r3.ebuild
+++ b/dev-util/dirdiff/dirdiff-2.1-r3.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="A tool for differing and merging directories"
-SRC_URI="http://samba.org/ftp/paulus/${P}.tar.gz"
-HOMEPAGE="http://samba.org/ftp/paulus/"
+SRC_URI="https://www.samba.org/ftp/paulus/${P}.tar.gz"
+HOMEPAGE="https://www.samba.org/ftp/paulus/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/gogland/Manifest b/dev-util/gogland/Manifest
deleted file mode 100644
index c9ce68ac415f..000000000000
--- a/dev-util/gogland/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gogland-173.3415.23.tar.gz 209703562 SHA256 31a13e26729d5288d200f24e295d5009b3260a8b4fe42bfce25c192c8d579127 SHA512 7cfcf07bef5115cecff9913551ec4af8cd493a341e30cb818223b5c36345c5816bba118f53f5ad652dc78533b336530ca98dba9f34e81a322c94a332d49f4524 WHIRLPOOL bd7386ead98ae11f19556a80b7ab564b45037a4b5aedb8171d46e200a78677ae955c0dda12f67509c9f3471fa99619428430bb1ca478e23c0c9724478299115d
-EBUILD gogland-173.3415.23.ebuild 1041 SHA256 caa5ac9230a87d88bd7f6471f1c73d5623d75b932b964257ac8e5646e95bc39c SHA512 a825e2bb7773d525431e09e70588a63771031fb44db44f96754bcd59a69173746fc0be608066dd6f22286d7129d5b6a10165503f507203fc59a0050b2b3790b1 WHIRLPOOL 5e68fcf016437193dd0b0a0c8675cab6c6e85085ae3f4c916d4cad3927142f6e4ec952b5102a17486cb4d5472feb7bfeae8b481bd9b0b3c33cb68b5dbf4e3fdc
-MISC metadata.xml 245 SHA256 6fedd876236c2f1fe2687e73628381650ebecef9734f88f6d483bec5bf475a7f SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4 WHIRLPOOL 4957affde63b54e118270c40ce12683872777b41ec1a798f7b03807a99917148279d392f71cbcf95ec4e5d586ee5fc0400aea77d9e46083873a441a4907ba13d
diff --git a/dev-util/gogland/gogland-173.3415.23.ebuild b/dev-util/gogland/gogland-173.3415.23.ebuild
deleted file mode 100644
index 14e1973f45cd..000000000000
--- a/dev-util/gogland/gogland-173.3415.23.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-SLOT=0
-
-SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
-DESCRIPTION="Golang IDE by JetBrains"
-HOMEPAGE="http://www.jetbrains.com/go"
-
-KEYWORDS="~amd64"
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-
-QA_PREBUILT="opt/${P}/*"
-
-S=${WORKDIR}/Gogland-${PV}
-
-RDEPEND="dev-lang/go"
-
-src_prepare() {
-	default
-	if ! use arm; then
-		rm -rf bin/fsnotifier-arm || die
-	fi
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/gogland/metadata.xml b/dev-util/gogland/metadata.xml
deleted file mode 100644
index 97df2a00971b..000000000000
--- a/dev-util/gogland/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 629b0f7e4f92..a26412cd9e07 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,6 +1,6 @@
 DIST gtk-update-icon-cache-3.22.19.tar.xz 367224 SHA256 1e2b2e8f73ceac4816df2108a4a38a5ec1a3fd6beab95c67ea4750619e186d82 SHA512 3ca12d38781a716c1b3f8584089e2c038aa18584c5e1b4c41098173f73f839cabdbb0e8b25b1c69a8b9b9f016b9c3c8594c4b26c2463cea278754f13afb7c795 WHIRLPOOL 55f92eb65d50292027419292b4d611b72fa5d17631f7fa79b8bcfc6649e0167891bd3b5f612899872db38ca2bfc94e1dfb6dd2038c3e204b8f3e6cafa28583ba
 DIST gtk-update-icon-cache-3.22.2.tar.xz 366364 SHA256 6ad38b0fbd84b5a262dbc8dd3102415f8e2b81d5a05a27c0b1e4b28423bc9dd0 SHA512 a9e7f6c865c0648186954bb75f8032666ef8920513f24ecf5a05388f3b739b4418d4513c7eb81fce91ba4eb7efd6d37ade91950bb40c52f50a5b57c0632be959 WHIRLPOOL 904fef0db243ad6368eeda0207b8e0ca2d3219986191b9fab799c4b7cdd5b1606fcb4241e6a16f07b3ac265163899b4afe1d528b3c60b856eaf71d2a767bd80b
-EBUILD gtk-update-icon-cache-3.22.19.ebuild 975 SHA256 862e5e2ce838b2743750e52770585857a1d98cd8f242f388d0ed4015f00c847e SHA512 355b713cff04b199108b7a438785997027f5f6cf468374906c4f69cdc04be4ad0c9a727a3631f7f81a8ae4e3874b5ae33b6fcc5d024f9067ca1a43998a95378c WHIRLPOOL 7257aefb3d83143587ec4b209223ca49f01f2da69b52e811a90c73cd6c1666030d5cfa25edd747b84bcd6b58054bcb8b275b78c57ab90d7d63261d8943efdfec
+EBUILD gtk-update-icon-cache-3.22.19.ebuild 973 SHA256 704a5381320724d938b109a7818cf587339f5585895dc7aa391bae0114f4a01f SHA512 641bc0a216a58e40568a0826cadabc82b58e0d353b61d068ae324e5e771c82686a74b65b975d4510d755afdca03a8f20ae18d4d20beb4f6bc99be109a8b43a57 WHIRLPOOL c34b44d542dca95912456ddc474a8b6ce9e289edda4c0df5489b155c6be4d8db9c46ac73903808edddefa51984d4fb39725b26a6f9c2ebc9eaf5c56075adc9bc
 EBUILD gtk-update-icon-cache-3.22.2.ebuild 966 SHA256 3ca3e273c3e3a082aa74b4ef10ef79c804d73bbc2f0a7adc4f8c46f7624d8533 SHA512 f08a2be5aeb4f835c9ba482b0af79717d5d0c505d4782fdfe461b82237e67a52958e68b10936cc70f6cec18982b0386f64c37e91610c611bec9424baf81feab1 WHIRLPOOL 360815d3232a83c5b14cbbfa02d15f1a0dada3c619d0ccb9d66ce911863dc3487746846d4164fd8f1fae6f7c0b08267f149e62d6099dad35adf7ae5bc6874e43
 MISC ChangeLog 10154 SHA256 04f9ee9f6925c9dd36d97aebaee6db510a06dd77b7f8e13c50ff6a0b4dd50122 SHA512 5edb1c6439075bf9dd3e8261bef1291537294153315d826fdf9b3aaf30ab50e54924a1f61a0baa5ce6bbde3bf29571c04979481f95ad179b21309b51091d29d2 WHIRLPOOL 0d807741c25df62c0068c0d718ba9aa72d312f2b3d98303598a23a5603642eba2bbe8126071c98356e594ba3fd7ca6844516c37fbedfb2d0d2097d8600dc404a
 MISC ChangeLog-2015 2331 SHA256 b1af82791f72dee2e76b01d97a994886580332d25a418a41e1336544c40c7abd SHA512 1d3c0131d48409779049d5165ab80360ebff1e00bdb2be5f7f8ab4674c86d95080a2e952aacc4fe3d06a535678bdbca13e344b67bfe13f33169495d0a9294a01 WHIRLPOOL a54bac987f3f528651edaaf55c731c348f0564ad27612e48909e6946986096c302700a78aa2a36678dfa7192a795c6a716fe8cb6f0bace551ebaede5d4a8b628
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
index d03a87ea31f9..6e3d2ef65b1e 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index b3691c5b6131..6ec0a309c332 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,11 +3,15 @@ AUX jenkins-bin.confd 998 SHA256 8cd3e217ae11f47b73f8a3f28beb2f94b14e24da4e822f7
 AUX jenkins-bin.init2 1782 SHA256 3ff6ee9428744f616b32db1a7a6da9b99cd78573d2a6c9da90a2e70c1d54875b SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8 WHIRLPOOL 35d6ea0b7b317dbc76222460c4a2219ee7f9a969e88ad04c34e4855b6144abd29c24447ba68012ce511690b0d245c41995e60a68683278b5ee4538153fb04875
 AUX jenkins-bin.service 499 SHA256 51de27d125003a65ff9f8680e741e5f92ccd56e0a2f8a95a4fd0050204f2c3ba SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506 WHIRLPOOL 684d39cd7a2fb9b8e9c1efd29fc6b30ffc1f65b045ec271743c9eeba06a267b4a9e0d54154024308917f0fcbde6d070bd9f68a6437d9de1e592147b650a2d1b7
 DIST jenkins-bin-2.73.2.war 73280014 SHA256 f6d1351beef34d980b32f8c463be505445f637e2fc62156fecd42891c53c97d3 SHA512 36fe7d2581f9a2f13b07c43ac9d5915d057bfede3522a17abc9376f19656166586c207c7516f46df7b2cef46ec67444ec44a97df0fc9af50ff41e9938465cebf WHIRLPOOL 1ab128a9e779de7b1c85283b40cf7401520123302d228462da6e77eacf30b288aa90b50b8f5576579e62287e5545cf6696f75155af1dc27cf6363e569806bc22
+DIST jenkins-bin-2.73.3.war 73286753 SHA256 fcfb932a84ce03795abbf51ae7799439278155b0d42242d1d79a187034649fc8 SHA512 55e25bb9ea058b4a64517faec23ec649f77c3342f074a41d1da00901b759895d0e98fe2de9ab1babf0a0bfb165a6f438b8e5204b1edf1c280dffe2f5442285ad WHIRLPOOL e0a4335ce15e7fac4671f8d7b9f15474b270b6a8df482db7f5e77bf19496d72183ad602a4953bf05dad689f790fca8fa21da2c2da4c6db5a5c849681dbb5176f
 DIST jenkins-bin-2.84.war 73749405 SHA256 067bdf4a3d473a5952e541d7755d8155a6ddf03cc1363d54daeb117d55dc955f SHA512 0074b2299f72f45040b4afd087caae0e08362708d3370d17f3bda047d11240881a3fd779753a49c298961e87c509d0b278ac2712934febed23c13c7e36d6c51c WHIRLPOOL 353d5297e6b5fdbfd95e6ea5ad4e6b8ec80653316029cd5bf108c0fc11be85f4f855c5783091e70d729cac842f16602c2f99f314af7e9bd46038854c15adedbb
 DIST jenkins-bin-2.86.war 73796979 SHA256 207aac187882bcddf665cdee78daa2fd8642f94c02d731b9ea18fdc985640ea5 SHA512 a94abb3230c90319f6a632e56afbbc0d19591a6a67ab6ac35856c2bb99ead33d4b23ab3d19a15c1f9501dbf932b3101f569af0f557fb884cd07dadd8a1c968bf WHIRLPOOL 74f8af0451f91088ab614dae0889fce3d986d59ed3c5c518446bce9925adda4544daf18e02d83fb1f55b299fb224070ba7b9f882c8ccab8d7422b9706cdc4fb4
+DIST jenkins-bin-2.87.war 74271222 SHA256 0ead9cf2ec71224a358eea5aac78fd01e6fa731ab2879dca5652641bac4dfadb SHA512 210c2e23d71c3081d4cd6f28af6bac0db7b43f3f93785ee0b53622b7ff05c25aa6dab0a847bf9ee59a2b4952263a67fbc2cb88fd47557809153e191fd95d4da9 WHIRLPOOL 91c1a90117950b9e10a50333c1fd52c3fff5d2facaa3ef68f707c2dda3fd5b8a5919bb9374324a5ed564af4bbab9adc5fa539af28417d97a7a7eee8f0b06e865
 EBUILD jenkins-bin-2.73.2.ebuild 1110 SHA256 30f40c8b134a22249e4d8949439c683ad89963eec88afba48fb856fb9c44c320 SHA512 7e51e0a6eade5438b25cd1f66220b865a99f7aff7ed4e6615ec8763fe9767a2caabd68eeb71f543c88d5ffddbe57af0e7623b86b693542930fcdd0ff2f9ccd26 WHIRLPOOL 43f029505b191dbdf4b829fa1aae04d2a50176e74333bca916f6092d352a8e57e8ddbc2b378155dfeb0f3c300c7ce99a5e7d3d884f86a202848e8004367ab494
+EBUILD jenkins-bin-2.73.3.ebuild 1110 SHA256 30f40c8b134a22249e4d8949439c683ad89963eec88afba48fb856fb9c44c320 SHA512 7e51e0a6eade5438b25cd1f66220b865a99f7aff7ed4e6615ec8763fe9767a2caabd68eeb71f543c88d5ffddbe57af0e7623b86b693542930fcdd0ff2f9ccd26 WHIRLPOOL 43f029505b191dbdf4b829fa1aae04d2a50176e74333bca916f6092d352a8e57e8ddbc2b378155dfeb0f3c300c7ce99a5e7d3d884f86a202848e8004367ab494
 EBUILD jenkins-bin-2.84.ebuild 1103 SHA256 a10ef477b20d8beb35f4c698b35d2fe56bec72c7ce2729250a61e97750466cea SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6 WHIRLPOOL 97b669904d0d1e086af7d12d0faec6d786cfa5f917a973667cd41a00a233d89604e26b3c1d867535b68b610854d63da798e39a5bface8c8cb8ea20dd119c299f
 EBUILD jenkins-bin-2.86.ebuild 1103 SHA256 a10ef477b20d8beb35f4c698b35d2fe56bec72c7ce2729250a61e97750466cea SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6 WHIRLPOOL 97b669904d0d1e086af7d12d0faec6d786cfa5f917a973667cd41a00a233d89604e26b3c1d867535b68b610854d63da798e39a5bface8c8cb8ea20dd119c299f
+EBUILD jenkins-bin-2.87.ebuild 1103 SHA256 a10ef477b20d8beb35f4c698b35d2fe56bec72c7ce2729250a61e97750466cea SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6 WHIRLPOOL 97b669904d0d1e086af7d12d0faec6d786cfa5f917a973667cd41a00a233d89604e26b3c1d867535b68b610854d63da798e39a5bface8c8cb8ea20dd119c299f
 MISC ChangeLog 17147 SHA256 cedd72ff5b9bf786d1428289ac9ac8579ad33145dfb8404deef944cdf1665e67 SHA512 022d5ac33a69933bb466ee8276cc03191402ac9c20c361beb5bcfc73abf1ab72b96b507da444a31b524a9d764ab96ee91640a5713c2534460a562e23fabe2632 WHIRLPOOL ac693d36948f784cd45016c37a7b242fd7f0697157f818656754512bf907f8e06754179bed804cfc8c27b5662317b9bd0c3f983e34da51831cdf7edef16601a7
 MISC ChangeLog-2015 7461 SHA256 e48db67fcc69ca6960feec378328abd2bf810336a50541e6415fb0b3761fa32b SHA512 63f46144cb8712c22700d70fcdafc26c8113cb314781e6b351ca5254bc5196d86ff53b48e3eb0d722d8e6788e5f9b3a68f7767dc4d24724312844c14b8a476c8 WHIRLPOOL 58fe8bb9da5b4439fcef35aaed534ff6b78822287b4e328dc993580a4c970e8ff3b63d925405b48fe4c47a869f196f2ff59a439743b4a1b27acdbaa0ece4a7a6
 MISC metadata.xml 397 SHA256 f748bd402594de6903f7182113715c4ab3a9b0b382350ff52a3671ed7b11bd0b SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810 WHIRLPOOL 63fdb75a201da6f1a0d1ca73ed6167a0bbf438b568f0d2d68a620eae559ed3aac5e1d8f5e9f57557c5310dd38bcf459d512027c49928c5d82c7e99609c2dca49
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.73.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.73.3.ebuild
new file mode 100644
index 000000000000..fb976b69a9ff
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.73.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.87.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.87.ebuild
new file mode 100644
index 000000000000..2101948a704e
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.87.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kyua/Manifest b/dev-util/kyua/Manifest
index f189b09ce02b..a5b3411670d1 100644
--- a/dev-util/kyua/Manifest
+++ b/dev-util/kyua/Manifest
@@ -1,3 +1,3 @@
 DIST kyua-0.13.tar.gz 663776 SHA256 db6e5d341d5cf7e49e50aa361243e19087a00ba33742b0855d2685c0b8e721d6 SHA512 80ecf4fd888d4759122f3c1d1d5b06a19135e06f7bca1ef8458c7a5e78c1b6baff54969c863c93f11c40611ca256fc0334402531397b16788fb3ec701dd278ae WHIRLPOOL 565f34704941b704fdbd92f441fc85a479322480a005df9999bb1f9c22f155cfe3e3d6d7675f06a4c9618c05accdc4bc753b95464a4dce8d1bcc4bcca687dcfa
-EBUILD kyua-0.13-r1.ebuild 530 SHA256 9e84ee0cc564fc5fd9d898071a930ebd10504a21b104ee8e16f3e959f05fd2e9 SHA512 c06d43203762c7f794bcddf65727a861a90d7b0548ca0709f4f4c5adf22794ad127390146803efe545d4a5185876b4ec0e8311d1463302a7ace4c465c1308003 WHIRLPOOL 44cda455c77bb28ab9c187c9b4da368438a95a3500db1ca1aeb7b1be6b5637a15b49328cef730237c9103986c18a3535b2cacd822568ddb3fd2fb58bdc3fc04d
+EBUILD kyua-0.13-r1.ebuild 529 SHA256 2c53a59a088df7788426279e0a7245791e15f414c149c35c390b3fa88f76aee1 SHA512 1a8490789c01339b7f46263353ecf27e500d0e53f87f3d03f063aa74940d042bcccddf973b74502c0a3d063f9b2118a0d662e9cd50cc93d9d43c1087f3231eb8 WHIRLPOOL c543f515f407875c4db58e57f5c6ecd1ee0eb6c15a9c4bf34552da4974dfe53023c2ebca6a36f457e164f59c7ea7bf709744faa0c767ced35c889aa451f8d149
 MISC metadata.xml 246 SHA256 87fa83ef14035e5fbb6dac93f3d4afd4085e971aab6d7401ac2b6bed9e5eb84d SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b WHIRLPOOL 1e17af59af785717b26fdd3df4e84788475fa23ad410fc7a9214c0b86c57b80b54cd66742f44ef0a29d9c96611842d57d833d41568a4859b3e2fe491d691d55a
diff --git a/dev-util/kyua/kyua-0.13-r1.ebuild b/dev-util/kyua/kyua-0.13-r1.ebuild
index 4fd6520414aa..779c1caba01f 100644
--- a/dev-util/kyua/kyua-0.13-r1.ebuild
+++ b/dev-util/kyua/kyua-0.13-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/kyua/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 # Tests fail
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index efaf54c1b83c..b9276b95de91 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,9 +1,11 @@
 AUX mdds-1.2.3-buildsystem.patch 901 SHA256 45d6419de44de5d978513c013619342f39fae2a493dec0275799915f166a6848 SHA512 bc48b893c0b3d98aa45d7642bbd9bd10ee0f183bcd3da848a0abe4f33547b693e171a327439aba9b76f0683cc15eeb0410be7ed6f834d28483b8f82f8c13678f WHIRLPOOL 067adeafaa0128e26686fab279ae5ae053aca839b6001e9da852e4d9f59ddc126a4ee9fab17761a92085095fafe8f09d44d4784c4e30b9cec318dbef776ad442
 DIST mdds-1.2.2.tar.bz2 286185 SHA256 141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d SHA512 552cb1b65c03cd18eb679c95821e47c1151e1b3015043de4b3a7bc14d27734772fa4d80fd90ab48998d0bc75385a3d29c4dd7ce826cf84b012685573c623bf01 WHIRLPOOL f0b24a886ad6b275267603b73a95c3b83ce14808f90daa0e680babec966a52de19349ac0991d76b9279818897f783d1768ece74f5f1be1157fa8bff94e5e8a5a
 DIST mdds-1.2.3.tar.bz2 287079 SHA256 402fec18256f95b89517d54d85f00bce1faa6e517cb3d7c98a720fddd063354f SHA512 e5935fd99a53df124532cfc8e46349b2ef9ca79f5f184ca2da941c9a77e66ee40e11478e520bf9cb62e1bcea4b69deab5088265e1b89fda04417130aab227c3d WHIRLPOOL 88e154f3e1141d09736a8a9d5b4adf3612cea95a82773f59053d8e83f7fec3a0c292f5453df92627f31ac7e12b2f702dc281c959e7f219de91f2a1acc15cc7b4
+DIST mdds-1.3.0.tar.bz2 287367 SHA256 00aa92a28af9f1168a8e5c38e46f311abb65ef5b113ef56078ff104b94211460 SHA512 9d2c3a69686ce3101fbdeeeb2d1e54ee62bbb26db9e67517d22d5dd13bcb2c3797c813195f81f7f970fe0be4509f55338b69730596f387f364ecbfee0bedf427 WHIRLPOOL 0019a406e81af9a2b7c0eb7a0361eb5c95eed77a4bf701eb834cf515328d5385d20603396d122405061e4dafb7e225a6140819dd21929cef778f96d6f2728e01
 EBUILD mdds-1.2.2.ebuild 956 SHA256 71bbf7a3044057a9659792fb76ae89abac0491e421133a5f651f00edd0f769fa SHA512 3ece29d620b194a208738fda783cdbfa84e743172a893b2f7e9d99f21ca2192cc5fb93db80356b76b1d77d1b9e0fac848fa13d3781cb48cf0ef28cc284e82085 WHIRLPOOL e4b099bbf125bd4c60735626f30f89a92666ebbb64231f9faf9a3654e9f31f3705c6f0080a8819f84d8c7fa3eac181a4a5a72e7f47780800f75fc0a8e108d031
 EBUILD mdds-1.2.3.ebuild 955 SHA256 d02e55cfde032d0107fa24b9878adcb03a537440d421986c6605aacfd710640a SHA512 32e8df21c390a68c2353907b3c72b06ea92f329e36b3b798451576af2c42b025a66baf8eeddc5aed2a5f0bd45440683b4e3bf0bf0373739275189d57fe9bf08d WHIRLPOOL b2bb5ad9ecd79d9c983b2db7112b86e584e2807a7c6f62951be512461d77110e8f54b03537926bf12b01a5fcff726e9d6a5c44a408da12ae9f304b2c34ada453
-EBUILD mdds-9999.ebuild 955 SHA256 bff38399b0581cb05fdcc6d793acc32fc196657854713df06c0c213cac2fc905 SHA512 39b840e056623529b6270de4c6d987ad2bbc2eaf6a52b2bb875af14b09a71f54e8aa6d7318e02fb8bfa51a8159e970c208dc308b85f34d07c2c62c629e80d0ec WHIRLPOOL 17fc37f1aedc9c85288253ea154bc179ff8dd4541c7dc655bf3bb5f92fa33e14411124f4a2930c229b39454bc7e7b502e6dd1494e0dd72b5213517876147036f
+EBUILD mdds-1.3.0.ebuild 972 SHA256 68e349e871da01b9e2437f0ddeeadd31c8dfa836058ae5830c7e6a87f6b01e35 SHA512 b06eabb95a6d2225ce9eb1147007d3e3de57774c2850991e383f293652c82199a2b1c16a84d4b7a8cc0965b85da8ee0d75c8edc244dec1b3ce68b3e9a8dd9232 WHIRLPOOL 2fd3bab98500ff22a7526ac495115efc723447ce0cc7b27701bbec33e9f49e7b6cf21e84da275cea3eb294eca1a8df252da4bd13120ce00a04055184521c37d7
+EBUILD mdds-9999.ebuild 963 SHA256 98530847dfc71ae3f52eab06fd4da033365dedf07d6cac6896d30a125e638380 SHA512 30fc4b8185294db0dc04c3194259961976a48f7ef13944015f5f85b68076bd959f4674513366ec5c8b138c53cd43ed46d8d213701c7dea36bf87d26532cb7569 WHIRLPOOL d5bb4c82c2764aec3035bd8213154a8951b400b46fb580287344fc9bb82a9f2fd40a093a1315d4d8945fcd0d23067665a0994b1a2b1e472635e76af08b01b5d9
 MISC ChangeLog 5315 SHA256 18859341ad9a408d2415201cd065026e65a493f6ebfabd61342a0d245da0fec0 SHA512 aff33b0c0ccd6a9b46f447b90f6891ccddae3f6aa7ea6e3aff635209b297bc82f65ec467247752b006ed6cc33194fc8e591a677b36c45379c5b1f9517b92e747 WHIRLPOOL 221b76a29b10eca5c6fc2ff78ccb1ebba66122930bcd2490ed5360470dd4d32aabb35fe2f913a068af564490b02cf1c0f690c840f4acc508ae8af482a7a24994
 MISC ChangeLog-2015 7826 SHA256 38af778836aa2d7f64ff9f0eaaa15e347bea2b56d5985408847d0fd399dbfe2b SHA512 9a5c77c0720a948edb1171dd60a3612e949f3854c1d26085cda0418bab9138073e465999a425c70b94772523c022fa11fbbe7fce9b222332d1829355a3461fec WHIRLPOOL 0414bab637aed04c46538d1d6a12ad60fe04216bb83c7b795e78f8bb6cb6487efe0b21bd763ebb4e4016c01ada0669b53256989737a7679dce9d69bfcd03ff74
 MISC metadata.xml 456 SHA256 08d30fa3660091cc9feefc6d1822078898b3018a70818bcf30e2887744a3f1bf SHA512 51aa3106f9bb7b962e7225e88fb56335b0bef35dc1749866a4e44290ca0cac510be348aa6b5542f536a8b3bdc83dbf39c4af6b79dc603047a7a6ba6980842d71 WHIRLPOOL 0682ab3ae33742425833ed38c5df478b4a94de3f04986cb6feac1517a2e1b1b53b59a5a6a24063e00b4993a8406306e89ef7be3370867f30233429e8eb0a7dd1
diff --git a/dev-util/mdds/mdds-1.3.0.ebuild b/dev-util/mdds/mdds-1.3.0.ebuild
new file mode 100644
index 000000000000..5fc4896612b0
--- /dev/null
+++ b/dev-util/mdds/mdds-1.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3"
+
+inherit autotools toolchain-funcs ${GITECLASS}
+
+DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
+HOMEPAGE="https://gitlab.com/mdds/mdds"
+[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="1/1.2"
+IUSE="doc valgrind"
+
+[[ ${PV} == 9999 ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-libs/boost:="
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.2.3-buildsystem.patch" )
+
+src_prepare(){
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc docs) \
+		$(use_enable valgrind memory_tests)
+}
+
+src_compile() { :; }
+
+src_test() {
+	tc-export CXX
+	default
+}
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index e87dc4be509d..4f81092bb113 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.ebuild
@@ -10,14 +10,14 @@ inherit autotools toolchain-funcs ${GITECLASS}
 
 DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
 HOMEPAGE="https://gitlab.com/mdds/mdds"
-[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P}.tar.bz2"
+[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1/${PV%.*}"
 IUSE="doc valgrind"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/boost:="
 DEPEND="${RDEPEND}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 29cef8da8ea2..f202d9e48fc6 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,10 +2,10 @@ DIST meson-0.41.2.tar.gz 1013526 SHA256 ad1707717987fe8b7b65392b8327580105fcbdd5
 DIST meson-0.42.0.tar.gz 1042920 SHA256 4ef46250beea2af272a2ab5bdf835dd06e8c8d341c18529d502b5f7be0ac73fe SHA512 0a8c3c8c4da70f19de7e10faaf7aef9e950cc21db116a886d0dd7732a70a3dc26996ef15c5eeed79638cf34ee994008e5cb68f7f38b18174e311572ba44e1594 WHIRLPOOL ea16b78710586f907de63f31d4f8973cac4bdbb062f45532ec27edae3c22b8fce596c9ed0917c219a80acf0da32e9873806966509197d72729f0b239fad619a5
 DIST meson-0.42.1.tar.gz 1044883 SHA256 bb74f7aa0baea94f4d4b8502aea43afd45555c8678e618232ea8a2ca6f0f0ede SHA512 43dc72ea4aa697c0dea6cef57308f487814fb6cf2a4a2338b658172a43603924122ed892c707eb6b974db72f86d767aac23a7397b97270cfe2032d2e6a68911d WHIRLPOOL 4e213bb7ca2fdce33740b8f9ad7b0887fade0ea80ba76b2764fc76d460473811f067703951a85a72b8589337dbbc48d15734da9f34f07f38094efab42f3eeec3
 DIST meson-0.43.0.tar.gz 1066663 SHA256 c1e05a84e7ba34922562b638dbf85ceec817830ec78c776c8d7954b5bf87c562 SHA512 17f7e7f87c344ae0a2f53975c65ef3b4eae204a57eb97141aedb4edf65aa21af29a6f61e3870022efd2d126ce768602fbb894ec7d919875dd44ccdb39a5df044 WHIRLPOOL 88fc7b22a7a3a3725bce6788764c9817877b264e9d9f2679df884ba839332f9ea91f2e5824cb947929efba44e87e84258dc72c25ae5c12bf79cacc83a244f1db
-EBUILD meson-0.41.2.ebuild 785 SHA256 19eca41aa8d04ab604da4b8a547717c663b6367e6a0eb2ff058c10303ae80d34 SHA512 32a88234559f73227e530b04a865e217f7de468152eb44f2da844b3ffb2ce645a0d73d11cdaf3a02c311b0a3c91cc77aa8a19b2fb6d0efcb1dc017d20cd9d804 WHIRLPOOL 681194fda8f8897088968e56f62217744c781aef08a50511e2b0a936ea48f5842f316697a5dfdc350e4c61b9085f0abc32513721cef8e6b6addc27e067eaa641
-EBUILD meson-0.42.0.ebuild 792 SHA256 a26aad28692ce0a800280f176a1e5aee4765a3be254b965b9187097df7537785 SHA512 1f7ab26089b79546881d031a44b57a98715163bb973e7aae9c25ee10caab24a75fbf4bc8ec1bf0ea561e41ca547090dc22e1026ac027730df6d0a8bab8b7d180 WHIRLPOOL c5ec364c32c657fdd31db261bfa45079d85ae63d150dc4f8679afc1a2cde65bbb2e2b2e86705091a81f5c06937671fd11f34ef34673d5acdc7a5d245ea2682ad
-EBUILD meson-0.42.1.ebuild 792 SHA256 a26aad28692ce0a800280f176a1e5aee4765a3be254b965b9187097df7537785 SHA512 1f7ab26089b79546881d031a44b57a98715163bb973e7aae9c25ee10caab24a75fbf4bc8ec1bf0ea561e41ca547090dc22e1026ac027730df6d0a8bab8b7d180 WHIRLPOOL c5ec364c32c657fdd31db261bfa45079d85ae63d150dc4f8679afc1a2cde65bbb2e2b2e86705091a81f5c06937671fd11f34ef34673d5acdc7a5d245ea2682ad
-EBUILD meson-0.43.0.ebuild 785 SHA256 19eca41aa8d04ab604da4b8a547717c663b6367e6a0eb2ff058c10303ae80d34 SHA512 32a88234559f73227e530b04a865e217f7de468152eb44f2da844b3ffb2ce645a0d73d11cdaf3a02c311b0a3c91cc77aa8a19b2fb6d0efcb1dc017d20cd9d804 WHIRLPOOL 681194fda8f8897088968e56f62217744c781aef08a50511e2b0a936ea48f5842f316697a5dfdc350e4c61b9085f0abc32513721cef8e6b6addc27e067eaa641
+EBUILD meson-0.41.2.ebuild 791 SHA256 bf36fabf3846d065561d78c6f76e868fc497fb640695868cc07bce99bcd8bb60 SHA512 de61068488e5457c1f03a330d17f08dabe49cd36f65588046df272e52039ca816bb85b5f11a2f6576fc74aae1a76fd84328ceffad561622803a5965e14fe89e5 WHIRLPOOL 9bfcdd8b08c55c1e31b4cdb07935c5e4cd4f6ed40d38b07bf3a80b89b2bbc1644389b06414384dd898d291ded73820866688dc8e28b0941f307475f10302dc10
+EBUILD meson-0.42.0.ebuild 799 SHA256 2571458772f1ac3d5e6883da4a8be3478350fc7c083de9fdfe5ddad9babb6c15 SHA512 186dbe35a63021389ed94bf8ed24b23181477006dcccc6cd7117031e05bf31637064e27238bb201e6ea72cef2eedcfa3434831be5b6a974a579d2da9f1337f53 WHIRLPOOL 6579f2540f16e0b2b468e7253ec426475830535bdcf3fa773a30932c163cb6b7c47a3f88a74b4a5967ad9717bf420ffa61edc7c8d9accafa05ac005777bd6d22
+EBUILD meson-0.42.1.ebuild 799 SHA256 2571458772f1ac3d5e6883da4a8be3478350fc7c083de9fdfe5ddad9babb6c15 SHA512 186dbe35a63021389ed94bf8ed24b23181477006dcccc6cd7117031e05bf31637064e27238bb201e6ea72cef2eedcfa3434831be5b6a974a579d2da9f1337f53 WHIRLPOOL 6579f2540f16e0b2b468e7253ec426475830535bdcf3fa773a30932c163cb6b7c47a3f88a74b4a5967ad9717bf420ffa61edc7c8d9accafa05ac005777bd6d22
+EBUILD meson-0.43.0.ebuild 792 SHA256 ed9e33ac5e02241c2e53b7c1c307eccb836b1c252e6aa642feec81f6b5d1deb6 SHA512 177c4299767cde14463fdb4232b7e159b1d8b6aeb7738299cdf7c6d50573145daa750d89131bbd931c06c46e77bbf8330bb75348693159a89fff1586833596b9 WHIRLPOOL f31a58ce6a6fcafc795da5bb71bb0e0d5f867bcda4f8a8f3c8a65f0eca1d9328875f556d9c568bc75b2b12e6160093885a3a91f3813c4edd88a2818203af5ca9
 EBUILD meson-9999.ebuild 792 SHA256 a26aad28692ce0a800280f176a1e5aee4765a3be254b965b9187097df7537785 SHA512 1f7ab26089b79546881d031a44b57a98715163bb973e7aae9c25ee10caab24a75fbf4bc8ec1bf0ea561e41ca547090dc22e1026ac027730df6d0a8bab8b7d180 WHIRLPOOL c5ec364c32c657fdd31db261bfa45079d85ae63d150dc4f8679afc1a2cde65bbb2e2b2e86705091a81f5c06937671fd11f34ef34673d5acdc7a5d245ea2682ad
 MISC ChangeLog 1644 SHA256 16a9aa8ce1a9add714323002885f3199f679aff35cba65edc21bbc1ba636ed85 SHA512 8ada51de63f366d4c33e0d08a66687fa37df2ff56bf4767a8f201efac0ef73a5685a13437115e4eb09479a415da6ffc065e412dd38dab8a1e83ecc3349ea3f0b WHIRLPOOL 1fb093e733adccf5923a1a85909042cf083ae69139f8e3ecddd10e8c8f132e42fc4074a916f51c1a27cbfaf7c83abe12726604376f5e534771b4f47e18592c52
 MISC metadata.xml 443 SHA256 741f4eeccedf2aee465c65859a709a21ef5c833e7a804fecddc83d6b6b6907c2 SHA512 acc217d18494f1f968d25b52e58fa268d6a1931c5ecd03350e84ed8094ce5d0a708ba536688dfdd267ca6bfad103a2bffcfece5bb5bd9a34f4853b5f1f655826 WHIRLPOOL 66ed2ff4475484a36ce9f65439abc1bb324f4b0be1c2f3e56f913d609fb96313d81fd574ad9591f3dc1ba49edc2ef1d56fdf2749596564c7b489bcc6fb78f5e0
diff --git a/dev-util/meson/meson-0.41.2.ebuild b/dev-util/meson/meson-0.41.2.ebuild
index 3bd963cb7b3d..4f8853daf672 100644
--- a/dev-util/meson/meson-0.41.2.ebuild
+++ b/dev-util/meson/meson-0.41.2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 x86"
+	KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/meson/meson-0.42.0.ebuild b/dev-util/meson/meson-0.42.0.ebuild
index bd996e33f689..b4d30079140a 100644
--- a/dev-util/meson/meson-0.42.0.ebuild
+++ b/dev-util/meson/meson-0.42.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/meson/meson-0.42.1.ebuild b/dev-util/meson/meson-0.42.1.ebuild
index bd996e33f689..b4d30079140a 100644
--- a/dev-util/meson/meson-0.42.1.ebuild
+++ b/dev-util/meson/meson-0.42.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/meson/meson-0.43.0.ebuild b/dev-util/meson/meson-0.43.0.ebuild
index 3bd963cb7b3d..79db96315d69 100644
--- a/dev-util/meson/meson-0.43.0.ebuild
+++ b/dev-util/meson/meson-0.43.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 x86"
+	KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 7a36a8d2278c..ec9c83a0aa20 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -2,6 +2,7 @@ AUX mingw64-runtime-4.0.1-build.patch 2981 SHA256 35e3dcd14c23241a1eedcaaad25f99
 AUX mingw64-runtime-4.0.1-winpthreads.patch 3142 SHA256 fd9039cb2ff117a661c15a70868af66c44e38206acd158cffa3ed6767939aad8 SHA512 5a4e34257f0eb9f3f9b51677459111b08b389dbebf3f29d30d99dcccd06e41bf1b82d6d0a1ce01fbfa5c0833bff205679203a0146d77b5416ef277c4c047a492 WHIRLPOOL 4dfdc48f45f122869734f22acd75549af9815e472184cb0cb3f87fc8b0f4389f9799af17702c0add54ef93a50e58e3a37141e6f0636ca29a7ceb78a49bc12df5
 AUX mingw64-runtime-5.0.2-implicit-fallthrough.patch 1329 SHA256 4413a9bb9a1d29523f431afdb2f1e22eb5b51673315391dceef1fe93075106a4 SHA512 9de46f074d42fd7dcc7b9ce01343eae22d803a8f20662b57e309aad5c7f349552048fe2ab39983b5f7e4b7b703617e6e884ef2714c9a67ea47129d4ae6dd1f8b WHIRLPOOL 3bedd399bfe152801133fdebd72c09bad5fc86d1314fce7cc34433479e7df86b01920f5d774ea598170fe2c9e80ecf6efc2591a2ddbd6a6235e27146d5f8e2b9
 AUX mingw64-runtime-5.0.2-locale.patch 595 SHA256 450f0ae42d30a66ae5aaa356227f43467a646d241fd7f3978368ba6b782e5136 SHA512 82d1fc293be628f8e967a108001d0e04c53e6c4581be2aa954e05c07e52473a6ffb4cedffc1f27202ea607316e6d38e64997ccc8d3eaee44125ec795d9a30553 WHIRLPOOL c9d151e39c688ffdc520e218229d3ffb3759f2fdfe718e66680506d2ffc2a4580004cf72a43fe8e50b0956a35f3fd55a9cf2559225019310f80b5da2577b0993
+AUX mingw64-runtime-5.0.3-build.patch 1116 SHA256 79352f2e9870a2bf002132067b2880b13d0f81ce4e3681ed4f0005ebdc4453ba SHA512 5f3cebbb246e831617e020e240b8c700be0c31e7fe85a0da30ee36b2e5184fff4061ea205e4e7afa6105d8fcc79b8a956238a6342c314b8c3b38d2da6a8cc0ec WHIRLPOOL 6f011701bb80cbe25169b8387868ef9c4576cc8fb4b99bc1d9c2126231dfb196f1bbaf11993dbe4e1c3c559ad64e9a1844a67337b2a803f0310ba1ac5ac8b6c0
 DIST mingw-w64-v3.0.0.tar.bz2 7012419 SHA256 ffd381a53cb774843667ccdaeb3a23f86be77b0344355e1a5947b3ceb8343c67 SHA512 7fc438908328ae4429f79dfaaae92bc7e88bc0f46517bdebdc3c45b3e8062ff6c27f166eb51103c2d49aae01851d82f33e0b031c8d98198baaeb119e19221989 WHIRLPOOL ea2820ab24dcd6f35fab0404b2bd26273b117731bb25e2e3ef753e9a3a9b6661564605cdae7ed5e6e4f9fc6b3c3d000761fa44afa19f79b5d6deaebca44f709c
 DIST mingw-w64-v3.1.0.tar.bz2 7021162 SHA256 ece7a7e7e1ab5e25d5ce469f8e4de7223696146fffa71c16e2a9b017d0e017d2 SHA512 9f418694aa0f072e2f08766fcee8929ac3022187750028781336243e050495b9709bb9ae87b4a83a8e9d3856478c525d8636277a4c219e282421b269dafa68d8 WHIRLPOOL 90a3a7056df7c4da2e605da1578e65b16e0f831370d8b1d399fed48945828604a94f9402b2d53bc4ca26623f1d34e6c45c862bf1f7590ddf9325fd4a053a18fb
 DIST mingw-w64-v3.2.0.tar.bz2 7053254 SHA256 78a0de610829a1145ae12c4a29603344963a0b8156ba39a9a31a0e79c3b29142 SHA512 dd483bcf7ba0e698a33a0b02a811b181e601cd344b87dafd0f6c477f68efb9a617a4109046fd06735242623f87833cf97688f057583e1378d6d84e7818927593 WHIRLPOOL 99ba5ddaa99c40309d12d75d3953deaf9cc31280ad2446793d1525702963edd1b33e91053e99bdfd06d37980049d30b7fb4e9f3a5358f8277c2fabe587c56037
@@ -10,6 +11,7 @@ DIST mingw-w64-v4.0.4.tar.bz2 10812375 SHA256 89356a0aa8cf9f8b9dc8d92bc8dd01a131
 DIST mingw-w64-v4.0.6.tar.bz2 10853871 SHA256 0c407394b0d8635553f4fbca674cdfe446aac223e90b4010603d863e4bdd015c SHA512 c9ec75b10fe40d80e620b569ca8f452b1f78e9e4dd45ad087a2b69297dc661d06aa30255ea310786f28c042256c35a1d3e709ff7ea8bc19e7f4ea914c120f020 WHIRLPOOL 69015094c14f66e1102d343b220eb17cc245f24a66c1a39ffced2f155cae84315eabb9a843bd9aa8e7874a12e34297a4f7cfff06447972a17beecf070bc70b08
 DIST mingw-w64-v5.0.1.tar.bz2 9160780 SHA256 9bb5cd7df78817377841a63555e73596dc0af4acbb71b09bd48de7cf24aeadd2 SHA512 73b746f227930597a97f117cf9f9aa19ddabb6090907cf6850864cf30089e5d6e1cd07e257b3b0b9ae0ac762cb24a6f5acf7336c9be48760c975ac038569dcfa WHIRLPOOL 26f3e52a5fb0a0332861a919d2b913dcb3e8dceb26bb174e85830282229823366918132c5db22a5d294167ba3c54c6fd461b663ff0ab92373f46519149817e98
 DIST mingw-w64-v5.0.2.tar.bz2 9107077 SHA256 5f46e80ff1a9102a37a3453743dae9df98262cba7c45306549ef7432cfd92cfd SHA512 430065a822afb9901219b1f86ea221ae70ef7820ea298f51828bf1689a014115dade967a806388b7ee3ed1ea1d6c53970514ec64d0185b5024523093d9e96060 WHIRLPOOL fdc7b1f647679b2761cdb306f5400fdcdbcdd64de4aeb6d3d3bd4b31aab81ad5f81c7485c377fa8100da0ebe7e0b53a83674443d61c986df27a616694bb512d6
+DIST mingw-w64-v5.0.3.tar.bz2 9160627 SHA256 2a601db99ef579b9be69c775218ad956a24a09d7dabc9ff6c5bd60da9ccc9cb4 SHA512 85bc0244cd30ef38262792d61502a012348b8220ef249352b68ddfa40663ca1cae5f81bed70caa9579469fad6ad16a95f02387c280effeda7ce8287b549f3fc9 WHIRLPOOL 395cef41bfd4b8adf87b00a5603971f27709a7e7aa920ad3431707ad6a09850ca7a29eed74a7c469a1a74d6080b765f80000e8d9213985ff8a96df8c7dd49d79
 EBUILD mingw64-runtime-3.0.0.ebuild 1813 SHA256 bc4b91670d4970aa1cd9a5a0feaf9a2b3f34064214d83c44898843fffc3c361c SHA512 731699be6c251ab07e7e9f82ec0d477ae1b186c595eabbc9d9a7766e2fdecb8799475772d5e51fab134ec43f76e8da9b50fd3fdef68d90dda585223275bfb643 WHIRLPOOL e7352f6f9091703a49c6b508dc80112c416e9ba0c0dc5d2ddfa73968eafce510c03fb89f5b719520973e6f60fee00aed129b05f477ed74599e1b5bf5cc503ca3
 EBUILD mingw64-runtime-3.1.0.ebuild 1813 SHA256 bc4b91670d4970aa1cd9a5a0feaf9a2b3f34064214d83c44898843fffc3c361c SHA512 731699be6c251ab07e7e9f82ec0d477ae1b186c595eabbc9d9a7766e2fdecb8799475772d5e51fab134ec43f76e8da9b50fd3fdef68d90dda585223275bfb643 WHIRLPOOL e7352f6f9091703a49c6b508dc80112c416e9ba0c0dc5d2ddfa73968eafce510c03fb89f5b719520973e6f60fee00aed129b05f477ed74599e1b5bf5cc503ca3
 EBUILD mingw64-runtime-3.2.0-r1.ebuild 1813 SHA256 bc4b91670d4970aa1cd9a5a0feaf9a2b3f34064214d83c44898843fffc3c361c SHA512 731699be6c251ab07e7e9f82ec0d477ae1b186c595eabbc9d9a7766e2fdecb8799475772d5e51fab134ec43f76e8da9b50fd3fdef68d90dda585223275bfb643 WHIRLPOOL e7352f6f9091703a49c6b508dc80112c416e9ba0c0dc5d2ddfa73968eafce510c03fb89f5b719520973e6f60fee00aed129b05f477ed74599e1b5bf5cc503ca3
@@ -20,6 +22,7 @@ EBUILD mingw64-runtime-5.0.1.ebuild 2560 SHA256 c68fc9b2a61683928eba791e8debf438
 EBUILD mingw64-runtime-5.0.2-r1.ebuild 2651 SHA256 a9b7e5f223757af9fe5dd6a4c3a99f174a38a60a84ad9568a4ee090e2be55796 SHA512 f8c0fd5cc01431016675bf3831488e5852c29d9a0621216842f72b2bef1bdc57585b98885913d7c859a4aa8de01d1294a65ff1f7bd3224c691db7208d96946fc WHIRLPOOL 4b3f116213d58b19765579ba2e4af1b71448166e03bb9aed9d9916b252af12b5c390855fc58a1955be15aa5b17b525461c92ba5970a89f1b95aa56369cf913ec
 EBUILD mingw64-runtime-5.0.2-r2.ebuild 2691 SHA256 08fae1bbb881fda9c284ce4e3644a91d297538f98f92bd48be3df8c3d46543f4 SHA512 33615d4db2e4fe13bc0a63e3b84445392133edbac907514dc41a0bc29f82be0ce54c837bd0dfd6c1872e74f89055cdc3d2b7989f6912f3d8f37e3ffcc72b3106 WHIRLPOOL aede15cb662746ab21535000647aee9f8a7ff66e4fc8c36f550127541e95dd5a2f84fe61dc138c14e65af2521c23838c4cc86b9c67ebe1a724ba8af18505a4a2
 EBUILD mingw64-runtime-5.0.2.ebuild 2560 SHA256 c68fc9b2a61683928eba791e8debf438ed4d35d4dd8030e04d86930e281f57fd SHA512 a701ebddba123544e6c1854beac891ec1104d5bc3c5dbf151d0ed3c1be7e05a13a18885d0c9f5f74cb8e5f615cf30d084692e28770a57bc749a8504a36328392 WHIRLPOOL c2ce5b060706a246946517b39dfac4e54812144d9041c84a0789b5e99e2d2d33c5efa33fe7997e354c82240ae57788d5a68fd907d4108a926f6540b30dcb9779
+EBUILD mingw64-runtime-5.0.3.ebuild 2533 SHA256 ba2140e634b0a16bce5c47c138d54e70cdccfc9ffe4ebdd34ba069475424c15e SHA512 ec22d9a4f4bf860e35167445d521d1e7d8a193b09e334ee17fa5fbb3b8313b565e0d474e18e1e47ddd60bd0dfffdde46a337aa12749502ae550f4d7e341688a5 WHIRLPOOL 276af51476eebbf16abe16e85e8f5a5dbf1bea9b2160dff2eafe218546d9685a8b859764daf7ca90134eeec0a21ecaa65d9e5c7eaeb09b1489ccb2fa49ba1d56
 MISC ChangeLog 3707 SHA256 9003c6e0efa68c344a559d5f47dde2ec8acd29f05fb70d91dd728fae37295f6b SHA512 3923841966d2653e0ddaec0be18a3f258757f1c2d759049536ec85292ab1e82673448b2633ed97a42e6668f30d589294c7dcd16e2c4d634b0ba933c836dc8f05 WHIRLPOOL 7725b8d74d5ea0ef06c1cb577f56609bdef2a6f8baf287473d753a895ab02642052f056df51a1e3efa9c2cf4f1c15fd70c97a905f6da5cce650f339414b75898
 MISC ChangeLog-2015 3670 SHA256 7cd9976de775f8d4c760e6860af327fd3ebf5e8a0e104d364c3ad62decf7a352 SHA512 d514d50ad706d755be69f4821cc092a8b73f614526d372437b95c34b71ce181e934b10c4d44ee1ad7727c3c68a0067ba2d3b956f66c16f3ae5602a50472181e8 WHIRLPOOL 55cf99587928e8fbba9ee6c79b70ded995b73fdd01174d95bb767c1de3381905da1bf3c344b4f6b583c53be1a512e594ab3a3c51c604137c9be5cee79258b172
 MISC metadata.xml 544 SHA256 f3da93654e01312e7805a426a62337a7bc1baa836f3ca4e2df127bb8e9867ca1 SHA512 297a90e704de81f41a4f29871f96bed47aa00c703e79fd825b3a06ab8850fe67896c66dee2603f86cd6596a0c5cbd533c87cb94c1c674714f65767954341a3c8 WHIRLPOOL 41f2a919c459fc2b7c6d0a3d0823ebb68faa846b69ae776a1aea912eadcc1511601a67d966a01a9dbc52f5ed6e0df7402be696706d0730050e4f93e88a68293c
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch
new file mode 100644
index 000000000000..624a492338e3
--- /dev/null
+++ b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch
@@ -0,0 +1,37 @@
+From cb860ab6fba86f646bcd3bff6cadcc2bdd3c6964 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 4 Nov 2017 21:58:10 +0200
+Subject: [PATCH] build: enable pseh only in x86
+
+pseh supports only x86, no point in enabling it when libraries are
+enabled. This enables downstream to enable libraries without failing.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 468d1b19..cfb07362 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,10 +58,14 @@ AC_ARG_WITH([libraries],
+   [with_libraries=no])
+ AS_CASE([$with_libraries],
+   [yes|all],[
+-    with_libraries="libmangle,pseh,winpthreads"
++    with_libraries="libmangle,winpthreads"
+     with_libraries_winpthreads=yes
+     with_libraries_mangle=yes
+-    with_libraries_pseh=yes],
++    AS_CASE([$host_cpu],
++      [i?86], [
++        with_libraries="$with_libraries,pseh"
++        with_libraries_pseh=yes
++      ])],
+   [libmangle],[
+     with_libraries="libmangle"
+     with_libraries_winpthreads=no
+-- 
+2.13.6
+
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild
new file mode 100644
index 000000000000..a21054499a0c
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+WANT_AUTOMAKE="1.15"
+
+inherit autotools flag-o-matic eutils
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crosscompile_opts_headers-only idl libraries tools"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+}
+crt_with() {
+	just_headers && echo --without-$1 || echo --with-$1
+}
+crt_use_enable() {
+	just_headers && echo --without-$2 || use_enable "$@"
+}
+crt_use_with() {
+	just_headers && echo --without-$2 || use_with "$@"
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	CHOST=${CTARGET} strip-unsupported-flags
+
+	if ! just_headers; then
+		mkdir "${WORKDIR}/headers"
+		pushd "${WORKDIR}/headers" > /dev/null
+		CHOST=${CTARGET} "${S}/configure" \
+			--prefix="${T}/tmproot" \
+			--with-headers \
+			--without-crt \
+			|| die
+		popd > /dev/null
+		append-cppflags "-I${T}/tmproot/include"
+	fi
+
+	CHOST=${CTARGET} econf \
+		--prefix=/usr/${CTARGET} \
+		--includedir=/usr/${CTARGET}/usr/include \
+		--libdir=/usr/${CTARGET}/usr/lib \
+		--with-headers \
+		--enable-sdk \
+		$(crt_with crt) \
+		$(crt_use_enable idl idl) \
+		$(crt_use_with libraries libraries) \
+		$(crt_use_with tools tools) \
+		$(
+			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
+				&& echo --disable-lib32 --enable-lib64 \
+				|| echo --enable-lib32 --disable-lib64
+		)
+}
+
+src_compile() {
+	if ! just_headers; then
+		emake -C "${WORKDIR}/headers" install
+	fi
+	default
+}
+
+src_install() {
+	default
+
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+	rm -rf "${ED}/usr/share"
+}
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 5ab1d1bf22e3..b5aa534dfc4f 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -1,14 +1,6 @@
-DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
-DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
-DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
-DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-l10n-8.0.1-20141110.tar.bz2 12065358 SHA256 542d325cbc6e0e617f6076e964e37803ec322b6d0ee4724a6d2127f2f480fb24 SHA512 28242dcbe7bcbc6a9abce15dfe6fd6140a275a417d96ff28228315bdc0ce8110ede899a1815e2fdf9115b48221d50cd3ff5b71a15d36316d04d81f66e9c0cac4 WHIRLPOOL 0318caea3463d3f7bb8876774b1cc9467dadd9bc36497a9304ed12900e2fabdc4dcdfec0b9eaee27bb36c39e9caff3743c5a42ad4c3a432205a716832688c4d6
-DIST netbeans-l10n-8.1-20151105.tar.bz2 11945028 SHA256 33e86aa7315021d28fdb64790233327d7599c98bcf3ab9d936b6fe924884325a SHA512 eb3163eaa8add417a0e8ac3ed4923a6e4992a80eaac00a01eed24e0e1ceb8a5cbd308659bcf0e5e1192ac8e84a79ea36744ad6b2589d60891b03b37102e9435d WHIRLPOOL f214a865bfd8c54341fb9d538da6db4d9b24906b0d94b3ee6cbf4a525e8842d28e852febb2f34c4c31f989d1b6baf750480bc2f04d94bcd7a8bdb8c9553ef590
 DIST netbeans-l10n-8.2-20160920.tar.bz2 12723797 SHA256 90d09843d2e0256f3196f4ea2fe9cdfd77d811f366a5d8cf13320cd813c7cc7a SHA512 4ac086e8189d89e7a0b91e7e03352f691f09edf208017062a8fc798e6f54906f1c85112dd2780feefa6a21c8fcb582b91bdd9758f5a90c05cbd2e3042d6c87c3 WHIRLPOOL 1002d7c6769eb9b4c0ae02e6c17ea91a064e7bbf99e151b720967f70a28bad3159fe5804f3c4ece62f7025da661bc717a098883995b0bebbdb7342b685cd475f
-EBUILD netbeans-8.0.2.ebuild 6630 SHA256 6384b8e5c28deef202f94670a36fc7b856e6e2959f2f9b42065815e23f0e4a79 SHA512 15bf79e13db932b452e9268996e8090d1cb6aa0ed78915e1d588ed730081f37aaa46aa7aa8666900cc84f692aaeff33698e220d150282b43d9daf98694e1f4da WHIRLPOOL d6ce3c6495d95be2c031f0c775b725d6cda24b5842131a05552471a2ff67a2f059e6e118f3de5aca58c8daaf947b4ba57ee946305bd7663c37d7168ee86072f3
-EBUILD netbeans-8.1.ebuild 6628 SHA256 a76c41c66f8edfa5a5277cbc71e20eeb12b3d857e68c244051ce9c95f046daf0 SHA512 168e63312b67e04e72657423812a7854c31d61914b7f0b5215253de03c0417532101c9ad9051dbd72de832bf31e1400ef8346132d909448529b5c9d56d23d899 WHIRLPOOL a43f66f68615a0d4430264f31628c20c7d86cbee9a66725426f7806807f8e5f0d9c975d8dc760307969e4d9d1d37df55365777a4993a3cabb22fad7882cbc617
 EBUILD netbeans-8.2.ebuild 6137 SHA256 4637303149ccb6295953ecaef53a5f479c427c4bfe90403f5574d973bc13dd77 SHA512 0fec52feb8f1577de9a9b9e5c37ae4036b10087c4aac648f90c33e07ebcc1c260b2c0e1aee7ab067b5c76a495ad87abb06702cb936e3849e8d732cceb216bdad WHIRLPOOL fb45f79de341fb32147b1ddee84a5795a80c4960ab882fa759a0b9e6076fb8c1bac4fcb1ed3d7b2a23598777f450b6bcfab216f823445e6b59bfbe51ebd933d5
 MISC ChangeLog 3949 SHA256 5fc0a774a711f3e122269667a1a7b0f4c354c5dffa69647e8d34f3a9fe67cd56 SHA512 b7797ab8ed5bfc45251eca78a6e8374fe4cf653f5a0326439c0d4f1604dfeacfdb64f63cfc1e397b07ac858ed495c276ba72eca6403e04dde1e1ebb6ea917bbe WHIRLPOOL 322e66e52d746be12d87e5c89638b8d8e80e1e32607bfaa0e794d65c925706a9d02e48f84095c34d075c27e07ece9d72f44f7ffa3fe8cb48edae10cbd4589068
 MISC ChangeLog-2015 33263 SHA256 eb573b7d83d4081c431c496b3c5860eb43239174bc6d7d81ec5144f607a85eda SHA512 86b09da142928591e3d2944af87c274330e86731e3968644feaf3a08a52287622b3358638f69e9e2bd5fa51daceac76ca7d5ba493007735bb502c39b901bbd98 WHIRLPOOL 4bf32905a550856debfb89aaf551ff031f790ddbac5d77875dc5cadd7be1b846c724b606b6de2a55acb073a66598083ddb216d772596745df024b235af31fd16
diff --git a/dev-util/netbeans/netbeans-8.0.2.ebuild b/dev-util/netbeans/netbeans-8.0.2.ebuild
deleted file mode 100644
index ffda722d6f7e..000000000000
--- a/dev-util/netbeans/netbeans-8.0.2.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE"
-HOMEPAGE="http://netbeans.org/"
-SLOT="8.0"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
-PATCHES_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2"
-L10N_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2"
-ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
-SRC_URI="l10n_af? ( ${ALL_URLS} )
-	l10n_ar? ( ${ALL_URLS} )
-	l10n_bg? ( ${ALL_URLS} )
-	l10n_ca? ( ${ALL_URLS} )
-	l10n_cs? ( ${ALL_URLS} )
-	l10n_de? ( ${ALL_URLS} )
-	l10n_el? ( ${ALL_URLS} )
-	l10n_es? ( ${ALL_URLS} )
-	l10n_fil? ( ${ALL_URLS} )
-	l10n_fr? ( ${ALL_URLS} )
-	l10n_gl? ( ${ALL_URLS} )
-	l10n_hi? ( ${ALL_URLS} )
-	l10n_id? ( ${ALL_URLS} )
-	l10n_it? ( ${ALL_URLS} )
-	l10n_ja? ( ${ALL_URLS} )
-	l10n_ko? ( ${ALL_URLS} )
-	l10n_lt? ( ${ALL_URLS} )
-	l10n_nl? ( ${ALL_URLS} )
-	l10n_pl? ( ${ALL_URLS} )
-	l10n_pt-BR? ( ${ALL_URLS} )
-	l10n_pt-PT? ( ${ALL_URLS} )
-	l10n_ro? ( ${ALL_URLS} )
-	l10n_ru? ( ${ALL_URLS} )
-	l10n_si? ( ${ALL_URLS} )
-	l10n_sq? ( ${ALL_URLS} )
-	l10n_sr? ( ${ALL_URLS} )
-	l10n_sv? ( ${ALL_URLS} )
-	l10n_ta? ( ${ALL_URLS} )
-	l10n_tr? ( ${ALL_URLS} )
-	l10n_vi? ( ${ALL_URLS} )
-	l10n_zh-CN? ( ${ALL_URLS} )
-	l10n_zh-TW? ( ${ALL_URLS} )
-"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="amd64 x86"
-IUSE_NETBEANS_MODULES="
-	+netbeans_modules_apisupport
-	netbeans_modules_cnd
-	netbeans_modules_dlight
-	netbeans_modules_enterprise
-	netbeans_modules_ergonomics
-	netbeans_modules_extide
-	netbeans_modules_groovy
-	+netbeans_modules_java
-	netbeans_modules_javacard
-	+netbeans_modules_javafx
-	netbeans_modules_mobility
-	netbeans_modules_php
-	+netbeans_modules_profiler
-	netbeans_modules_webcommon
-	+netbeans_modules_websvccommon"
-IUSE_L10N="
-	l10n_af
-	l10n_ar
-	l10n_bg
-	l10n_ca
-	l10n_cs
-	l10n_de
-	l10n_el
-	l10n_es
-	l10n_fil
-	l10n_fr
-	l10n_gl
-	l10n_hi
-	l10n_id
-	l10n_it
-	l10n_ja
-	l10n_ko
-	l10n_lt
-	l10n_nl
-	l10n_pl
-	l10n_pt-BR
-	l10n_pt-PT
-	l10n_ro
-	l10n_ru
-	l10n_si
-	l10n_sq
-	l10n_sr
-	l10n_sv
-	l10n_ta
-	l10n_tr
-	l10n_vi
-	l10n_zh-CN
-	l10n_zh-TW"
-IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_L10N}"
-S="${WORKDIR}"
-
-DEPEND="virtual/jdk:1.7
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}
-	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
-	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
-	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
-	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
-	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
-	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
-	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
-	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
-	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
-	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
-	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
-	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
-	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
-	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
-	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
-	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
-JAVA_PKG_BSFIX="off"
-NBLOCALES=""
-
-pkg_setup() {
-	for lingua in ${IUSE_L10N} ; do
-		local lang=${lingua/l10n_/}
-		lang=${lang/-/_}
-
-		case ${lang} in
-			ar)  lang="ar_EG,ar_SA" ;;
-			es)  lang="es,es_CO"    ;;
-			fil) lang="fil_PH"      ;;
-			gl)  lang="gl_ES"       ;;
-			hi)  lang="hi_IN"       ;;
-			id)  lang="in_ID"       ;;
-			nl)  lang="nl_BE,nl_NL" ;;
-			ta)  lang="ta_IN"       ;;
-		esac
-
-		if use ${lingua} ; then
-			if [ -z "${NBLOCALES}" ] ; then
-				NBLOCALES="${lang}"
-			else
-				NBLOCALES="${NBLOCALES},${lang}"
-			fi
-		fi
-	done
-
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	if [ -n "${NBLOCALES}" ] ; then
-		unpack $(basename ${SOURCE_URL})
-		unpack $(basename ${L10N_URL})
-
-		einfo "Deleting bundled jars..."
-		find -name "*.jar" -type f -delete
-
-		unpack netbeans-8.0.2-build.xml.patch.bz2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Deleting bundled class files..."
-		find -name "*.class" -type f | xargs rm -vf
-
-		epatch netbeans-8.0.2-build.xml.patch
-
-		# Support for custom patches
-		if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
-			local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
-
-			if [ -n "${files}" ] ; then
-				einfo "Applying custom patches:"
-
-				for file in ${files} ; do
-					epatch "${file}"
-				done
-			fi
-		fi
-
-		einfo "Symlinking external libraries..."
-		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	fi
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Compiling support for locales: ${NBLOCALES}"
-		eant -f nbbuild/build.xml bootstrap || die
-		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
-			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
-	fi
-}
-
-src_install() {
-	if [ -n "${NBLOCALES}" ] ; then
-		pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
-			if [ -d "${cluster}" ] ; then
-				insinto /usr/share/netbeans-${cluster}-${SLOT}
-				doins -r ${cluster}/*
-			fi
-		done
-
-		if [ -d nb ] ; then
-			insinto /usr/share/netbeans-nb-${SLOT}/nb
-			doins -r nb/*
-		fi
-
-		popd >/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
-		einfo "the locale is built for Netbeans."
-		einfo "If you want to force specific locale, use --locale argument, for example:"
-		einfo "${PN}-${SLOT} --locale de"
-		einfo "${PN}-${SLOT} --locale pt:BR"
-	fi
-
-	if use l10n_ar ; then
-		einfo
-		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
-	fi
-
-	if use l10n_es ; then
-		einfo
-		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
-	fi
-
-	if use l10n_id ; then
-		einfo
-		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
-	fi
-
-	if use l10n_nl ; then
-		einfo
-		einfo "You selected Dutch locale so you can choose either nl:BE or nl:NL variant."
-	fi
-}
diff --git a/dev-util/netbeans/netbeans-8.1.ebuild b/dev-util/netbeans/netbeans-8.1.ebuild
deleted file mode 100644
index 06d934837090..000000000000
--- a/dev-util/netbeans/netbeans-8.1.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE"
-HOMEPAGE="http://netbeans.org/"
-SLOT="8.1"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
-PATCHES_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2"
-L10N_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2"
-ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
-SRC_URI="l10n_af? ( ${ALL_URLS} )
-	l10n_ar? ( ${ALL_URLS} )
-	l10n_bg? ( ${ALL_URLS} )
-	l10n_ca? ( ${ALL_URLS} )
-	l10n_cs? ( ${ALL_URLS} )
-	l10n_de? ( ${ALL_URLS} )
-	l10n_el? ( ${ALL_URLS} )
-	l10n_es? ( ${ALL_URLS} )
-	l10n_fil? ( ${ALL_URLS} )
-	l10n_fr? ( ${ALL_URLS} )
-	l10n_gl? ( ${ALL_URLS} )
-	l10n_hi? ( ${ALL_URLS} )
-	l10n_id? ( ${ALL_URLS} )
-	l10n_it? ( ${ALL_URLS} )
-	l10n_ja? ( ${ALL_URLS} )
-	l10n_ko? ( ${ALL_URLS} )
-	l10n_lt? ( ${ALL_URLS} )
-	l10n_nl? ( ${ALL_URLS} )
-	l10n_pl? ( ${ALL_URLS} )
-	l10n_pt-BR? ( ${ALL_URLS} )
-	l10n_pt-PT? ( ${ALL_URLS} )
-	l10n_ro? ( ${ALL_URLS} )
-	l10n_ru? ( ${ALL_URLS} )
-	l10n_si? ( ${ALL_URLS} )
-	l10n_sq? ( ${ALL_URLS} )
-	l10n_sr? ( ${ALL_URLS} )
-	l10n_sv? ( ${ALL_URLS} )
-	l10n_ta? ( ${ALL_URLS} )
-	l10n_tr? ( ${ALL_URLS} )
-	l10n_vi? ( ${ALL_URLS} )
-	l10n_zh-CN? ( ${ALL_URLS} )
-	l10n_zh-TW? ( ${ALL_URLS} )
-"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE_NETBEANS_MODULES="
-	+netbeans_modules_apisupport
-	netbeans_modules_cnd
-	netbeans_modules_dlight
-	netbeans_modules_enterprise
-	netbeans_modules_ergonomics
-	netbeans_modules_extide
-	netbeans_modules_groovy
-	+netbeans_modules_java
-	netbeans_modules_javacard
-	+netbeans_modules_javafx
-	netbeans_modules_mobility
-	netbeans_modules_php
-	+netbeans_modules_profiler
-	netbeans_modules_webcommon
-	+netbeans_modules_websvccommon"
-IUSE_L10N="
-	l10n_af
-	l10n_ar
-	l10n_bg
-	l10n_ca
-	l10n_cs
-	l10n_de
-	l10n_el
-	l10n_es
-	l10n_fil
-	l10n_fr
-	l10n_gl
-	l10n_hi
-	l10n_id
-	l10n_it
-	l10n_ja
-	l10n_ko
-	l10n_lt
-	l10n_nl
-	l10n_pl
-	l10n_pt-BR
-	l10n_pt-PT
-	l10n_ro
-	l10n_ru
-	l10n_si
-	l10n_sq
-	l10n_sr
-	l10n_sv
-	l10n_ta
-	l10n_tr
-	l10n_vi
-	l10n_zh-CN
-	l10n_zh-TW"
-IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_L10N}"
-S="${WORKDIR}"
-
-DEPEND=">=virtual/jdk-1.7
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}
-	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
-	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
-	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
-	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
-	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
-	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
-	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
-	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
-	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
-	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
-	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
-	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
-	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
-	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
-	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
-	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
-JAVA_PKG_BSFIX="off"
-NBLOCALES=""
-
-pkg_setup() {
-	for lingua in ${IUSE_L10N} ; do
-		local lang=${lingua/l10n_/}
-		lang=${lang/-/_}
-
-		case ${lang} in
-			ar)  lang="ar_EG,ar_SA" ;;
-			es)  lang="es,es_CO"    ;;
-			fil) lang="fil_PH"      ;;
-			gl)  lang="gl_ES"       ;;
-			hi)  lang="hi_IN"       ;;
-			id)  lang="in_ID"       ;;
-			nl)  lang="nl_BE,nl_NL" ;;
-			ta)  lang="ta_IN"       ;;
-		esac
-
-		if use ${lingua} ; then
-			if [ -z "${NBLOCALES}" ] ; then
-				NBLOCALES="${lang}"
-			else
-				NBLOCALES="${NBLOCALES},${lang}"
-			fi
-		fi
-	done
-
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	if [ -n "${NBLOCALES}" ] ; then
-		unpack $(basename ${SOURCE_URL})
-		unpack $(basename ${L10N_URL})
-
-		einfo "Deleting bundled jars..."
-		find -name "*.jar" -type f -delete
-
-		unpack netbeans-8.1-build.xml.patch.bz2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Deleting bundled class files..."
-		find -name "*.class" -type f | xargs rm -vf
-
-		epatch netbeans-8.1-build.xml.patch
-
-		# Support for custom patches
-		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-			if [ -n "${files}" ] ; then
-				einfo "Applying custom patches:"
-
-				for file in ${files} ; do
-					epatch "${file}"
-				done
-			fi
-		fi
-
-		einfo "Symlinking external libraries..."
-		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	fi
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Compiling support for locales: ${NBLOCALES}"
-		eant -f nbbuild/build.xml bootstrap || die
-		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
-			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
-	fi
-}
-
-src_install() {
-	if [ -n "${NBLOCALES}" ] ; then
-		pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
-			if [ -d "${cluster}" ] ; then
-				insinto /usr/share/netbeans-${cluster}-${SLOT}
-				doins -r ${cluster}/*
-			fi
-		done
-
-		if [ -d nb ] ; then
-			insinto /usr/share/netbeans-nb-${SLOT}/nb
-			doins -r nb/*
-		fi
-
-		popd >/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
-		einfo "the locale is built for Netbeans."
-		einfo "If you want to force specific locale, use --locale argument, for example:"
-		einfo "${PN}-${SLOT} --locale de"
-		einfo "${PN}-${SLOT} --locale pt:BR"
-	fi
-
-	if use l10n_ar ; then
-		einfo
-		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
-	fi
-
-	if use l10n_es ; then
-		einfo
-		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
-	fi
-
-	if use l10n_id ; then
-		einfo
-		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
-	fi
-
-	if use l10n_nl ; then
-		einfo
-		einfo "You selected Dutch locale so you can choose either nl:BE or nl:NL variant."
-	fi
-}
diff --git a/dev-util/omake/Manifest b/dev-util/omake/Manifest
index 2acae10bd199..b67a7836d681 100644
--- a/dev-util/omake/Manifest
+++ b/dev-util/omake/Manifest
@@ -2,8 +2,10 @@ AUX omake-0.10.2-cflags.patch 353 SHA256 0c4a3d96169595539cbb53b43a14b086366f750
 AUX omake-0.9.8.6.0_rc1-cflags.patch 231 SHA256 88e8a494f7591dbd8dc9689820b8ea2f84aaae31c31e48451dbc42eb3fc81424 SHA512 733aeb2288b8c6494eb4a46ceff2a88149477ae95da8470f11fa321b3f1623adae13169effb95f45c16fff893d610af05be54ad892c4d7a97019e2a12fe3d19b WHIRLPOOL 8e59093e87243c20067809a96ed4e982eabb8bdef961796c76468b4d1d59669529a6dce522680ee5f8ea482d53d84a7971a6edc47186324fb019a407afcaeaeb
 AUX omake-0.9.8.6.0_rc1-warnerror.patch 287 SHA256 34e3622e74fb8dc5b2c821fec3e3fb66c6c55a30fabdd8ce91651a61ae315be5 SHA512 0b099c314e2eb19ab48eca873710f3c5716b4a2b82048ddd5baf3b2c7a82de5245ca36f1f72c6dbdbd79bd023de7ab3716a6c46c87986d00db2ec3661daa9d50 WHIRLPOOL 278dde3a985a9f94b3efb4520c4b795932274715a78885304f806322b369c084c905e910eeded529239f819fd1d11dcf261faf6e624e96614af06ba9553f7c36
 DIST omake-0.10.2.tar.gz 2434316 SHA256 c454f20535d91082294b150beebde3d0542f52be81daed17211326f4efa4d6fe SHA512 22c454825287dd54272874ec3aa7c5a79f7eac79e18a3eefd4b2e90a08f9767307b0f627d71049a4c08776c85318ce096e89fcc5619d3ec78cc073744efd0fbd WHIRLPOOL 86078e22c975b03f48968e02722374be61f24f1df9b402eeac87d0305c73e1558f2d9b6e74e419a911f797e74dd330fee192591f695ff2bdfbcfa56a90372a4c
+DIST omake-0.10.3.tar.gz 2438877 SHA256 ff3107e9459615ea6526309c533b04815eef60692a20dcd3a6169f5860786d1d SHA512 77eb87b819048d7d9cb9b89a73c5f922ba3adc93f0d58536b3cfa20abdbf1d2a4c576b77921c52e8ea5f80171e8a503b573bf2a92b65fa0579f6492574079733 WHIRLPOOL 959b7f7285bcbd45670b478b092fc520c90bf151f25fa8785e114b74f4cecfc382921d7207b46ae384e93f001f28b6b75b8c3ddd72d7117aa65ca5f393927358
 DIST omake-0.9.8.6-0.rc1.tar.gz 3254283 SHA256 23c498f071723621dd5e1e29c1abefd6937c73c67bb85d223fd514b9ae005ae9 SHA512 10a7ef6746c656d25852d408fafdd67a95acc59b73c892f0dbc316f2a01949b5349d5203c9fe2400cc7c05e14a7b1bc075603bd462ab74b60427d944f8e177d0 WHIRLPOOL d7da243aff8b6ff12f943db997bb644cfb88117b4deadb8ebea698537d864ede4084acc4afe7314a93eb24fa3a4092dbb24ecfb28cabff85c0214a03d89b44c6
 EBUILD omake-0.10.2.ebuild 1155 SHA256 5e7a27d2e7c03b584b1ab0f51c7d7c33283baf3efcbc3fe659d216c9d9b918ad SHA512 79b90c2feab16dc5520897f752e771ab0c1578d92f0d7d8fd6a6e88e298c7e6493334ad10895efef98158d7f4e42e0971954a81ab4a0037f5aa89dc72e895c06 WHIRLPOOL 777c995ff7cd5adffc4b078c1225a2cdc06fa37f7b9eff1ef545724a2042b2d64c7236702a6c67d357893c55a42533434063f29822ca9e3842009444c98be709
+EBUILD omake-0.10.3.ebuild 1163 SHA256 813c3e3ae6c92eccbbef380cf73587f955e4f4943c3e95472f98d97c520dbe5b SHA512 43625219b14f8e501af79cddb0ee180c12c2c7320343e7138bdea3d7e661a89949ca5ab7da1d0179aa8eac28d1476a937821ea8bdae646efeb4037ff20108727 WHIRLPOOL a4c0906bc09df1a2a5eb9048e587cd0431b110b9634442c385f48d7665c412daa0c5854a2f657640a79a22a0109a1751c81be5fef14a34a57b8ac968a4a1d871
 EBUILD omake-0.9.8.6.0_rc1.ebuild 2000 SHA256 f2171eac7c4c123dc89189a27f25ea9436fb9cb740785724b0c77b09d23e10cb SHA512 b1ca3e4b4687a1535fb4908cd02235706f8138ee6f2b2de66e3363c6800b3b4eb63c5389fba03e8e630848edbe03ca74ac3f1351c20f148595554095cd5cc25e WHIRLPOOL 29149e37aa1519d179f87cb3355956550fb93767ec4a4b9e4b9e3d349569fbc6ddd51804301c537762e1013b32a02add078c6bd65f88b14c673a92370390c717
 MISC ChangeLog 2811 SHA256 4aad1c278d91673b85084d4df551b082e0e1d2c4900592511285416148a9c025 SHA512 575f16d9822f230948ac315a538f15642943f8abc8396b84e22867ca1d58b59a9d34caf9e3bb6a49435c0e592befa724a7c4451374648e13d0eea22ca5c007cb WHIRLPOOL aaee3010bc1d9896d5a36d752ab95fde1e0f4b5fb16421ab458d22e7cc6ecd92870efc00dfb8b65d1b88366bc2de95669e4f13a26884f698d5958692ae9ca8cd
 MISC ChangeLog-2015 4069 SHA256 0c6239db1f9e051e14dd7965585385f133b2b605513055247e3cf2cd97d68129 SHA512 ef2c842904c4ff51b6ae893c2bc4ae3e926580e127ca79e73a7a564ea7b0ce1ac1ebbfec9fb157561cbf11b0714425f4a4cf80de71e050ec987b6f2d309ddf5c WHIRLPOOL 0026dba5815d841efef936a165d4b14bbb3dbc5bc157931e5f7cfcb7c56ae1e26c2097ae2dd364e224cbdcdd27096c2261cb7aae3f55e54de7024ea9eefb5f04
diff --git a/dev-util/omake/omake-0.10.3.ebuild b/dev-util/omake/omake-0.10.3.ebuild
new file mode 100644
index 000000000000..019e3e3775e7
--- /dev/null
+++ b/dev-util/omake/omake-0.10.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs multilib eutils
+
+RESTRICT="installsources"
+DESCRIPTION="Make replacement"
+HOMEPAGE="http://projects.camlcity.org/projects/omake.html"
+SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc fam ncurses +ocamlopt readline"
+DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+	ncurses? ( >=sys-libs/ncurses-5.3:0= )
+	fam? ( virtual/fam )
+	readline? ( >=sys-libs/readline-4.3:0= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-0.10.2-cflags.patch"
+}
+
+src_configure() {
+	./configure \
+		-prefix "${EPREFIX}/usr" \
+		$(use readline || echo '-disable-readline') \
+		$(use ncurses  || echo '-disable-ncurses' ) \
+		$(use fam      || echo '-disable-fam'     ) \
+		|| die
+}
+
+src_compile() {
+	emake all
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc ChangeLog CONTRIBUTORS.org README.md
+	if use doc; then
+		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
+		dohtml -r doc/html/*
+	fi
+	use ocamlopt || export STRIP_MASK="*/bin/*"
+}
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 285bb38269b5..673a16ebafaa 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -15,7 +15,7 @@ EBUILD pkgconf-1.1.0.ebuild 1295 SHA256 e8af1b74a21421c2efc27a53634862b44e322772
 EBUILD pkgconf-1.2.2.ebuild 1295 SHA256 e8af1b74a21421c2efc27a53634862b44e32277219e66b4f62172a0a639d1e7b SHA512 d41d54e6334840e3c9ecafbabb70832b0be6c1f03dd27a41c6de949e59c1c1a071504bb55258c257efa7e4026b8e0f08d9f2777bc226af86416733d0991cd173 WHIRLPOOL f0b8617f5fefc39b7c0f660b3e8217a9d59f534a2f538d764a0644c73be90ceecfcf28552e8cab6c79588a41cfd8c99c28a42ae09659cef74d2ffcf11ba9f9ed
 EBUILD pkgconf-1.3.10.ebuild 1291 SHA256 02ea5213da567c4277015e56740004921d3d4af85fe460bedb8c0546c9af8fb0 SHA512 5eaeecc9bdc66cadec2b799a787357f3df9aaae45d7a71cf4c869f33fdd59b80b3ee06d0729a18e94b5e7cad2d7a8bec86f38ed3713cdcc762dd215cbdb9f071 WHIRLPOOL f9eb449ff058f9276e217f2cddc144490b2e96e1737051c3f1f2b94d1de75bd560b44ae78b6439f0a01ed7c05c5704fe50f28400bdcdc83c9814d114be426b58
 EBUILD pkgconf-1.3.5.ebuild 1272 SHA256 80733afd086cf2bcad49b21d7701491c02be6852125d7c5ff9b8567a473841b6 SHA512 77bc9917d6729cd9743885d4a1ce852e1cc96b4e340550530cf4fd0f41948706767b7ae966ad4acecddeef2379a46088c8118db91dc8defcbae05020619de90e WHIRLPOOL 3fa279d7fbe73feed6560a5fc4bde93b4e9aea661d721494726f8a106b418a73f2a8ef86d33abd0e379075f30989dae28aaa646533b38d55b238aea8d184fde1
-EBUILD pkgconf-1.3.7.ebuild 1283 SHA256 bed593dfbc55b8ddd1aae4c787fad509428dbb1de184b20df025871887b00c38 SHA512 90e3bdf45e17651bb637da4e7f0c2b39d3dbbd4f2e204b70a9e64898533b113ac046d335ff42936f07e8d9c3d04130e4311356c39ee4e289102ed6a5da51c04b WHIRLPOOL b85b784b0a3f78c1b36bed6a95135c4d13d06c84b576013dc77bcc41b3e32e526694897215e61934822b6eadca5badeea0dcbc1ae3514532d13815aae18217da
+EBUILD pkgconf-1.3.7.ebuild 1282 SHA256 f78f55301699c91aa20c71b833852b882d1225fcc33a40914644d806a29309c5 SHA512 d4ee275154775d1649522cb7fdad0d2b1c539d9e23531df798e80f195b5593f4e83c0201bcce3ee6dc85a89e8adcccff0fb379b20ab947b6593db33bfceda391 WHIRLPOOL c9af6b2a95df06b99694126a6a18e49c6c421a69b3a506c454f561e15aeac3678ae8a99b53bbdf2f1e45eea5777cc6c9cb0992d33b5d2800f3027a6845c1915b
 EBUILD pkgconf-9999.ebuild 1291 SHA256 02ea5213da567c4277015e56740004921d3d4af85fe460bedb8c0546c9af8fb0 SHA512 5eaeecc9bdc66cadec2b799a787357f3df9aaae45d7a71cf4c869f33fdd59b80b3ee06d0729a18e94b5e7cad2d7a8bec86f38ed3713cdcc762dd215cbdb9f071 WHIRLPOOL f9eb449ff058f9276e217f2cddc144490b2e96e1737051c3f1f2b94d1de75bd560b44ae78b6439f0a01ed7c05c5704fe50f28400bdcdc83c9814d114be426b58
 MISC ChangeLog 7530 SHA256 2cb6920981942e5a75642525b6e4454c014d0d0d05c479fdf407b064dd6f89a7 SHA512 c6ccd4e6f8d231a5803375911567b69126d40dd1328b93cd0f1b39f8d3258c66aeb37a27ff86fad910589b2900bfe0bca6799d0fb3451168e11adf3caa6abfd7 WHIRLPOOL 5cab7b57c38537cd92fff5163bec3a5970d3b2cf19306a6f3ca547dda6e22a11fb86463dca0f77bf7d13e5d425fb4b32441ef9d496308135cc9a80b6b59db999
 MISC ChangeLog-2015 11246 SHA256 f1671c26b687b39a50c7f1ba82101c29be5ec42d74976218bb84aed74243d3d0 SHA512 6ae9486e7429401f19d21c12056929374a49840e305114394fecfdd55e49ad8ed3f4ede7dea5b5da67438c77a8c031b539b356a9b950b4182b2149f9d233a048 WHIRLPOOL b9547d35ac17482faa1fd283fe45e1a2ee805506fd89a03f99735b0a627b1ba2083116c70d460708fbf3313039c562a5f5d6ee669d4cfd6a218a1a897869072a
diff --git a/dev-util/pkgconf/pkgconf-1.3.7.ebuild b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
index 252bab470e29..ddb7bfea2fa5 100644
--- a/dev-util/pkgconf/pkgconf-1.3.7.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 fi
 
 inherit ltprune multilib-minimal
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 18bece8feb8b..13374fca11ca 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -2,10 +2,12 @@ DIST re2c-0.13.5.tar.gz 782725 SHA256 f3a995139af475e80a30207d02728b1e0065b0caad
 DIST re2c-0.16.tar.gz 4892417 SHA256 48c12564297641cceb5ff05aead57f28118db6277f31e2262437feba89069e84 SHA512 d4fb8078d9566a1fa177331b649cac79e2e45cc9558a22a2212503f6c77c9e6b4238aa01c85c66b86fa4831cdc669cedf8b430d395be6a0c6cfabfb7c61cf8a3 WHIRLPOOL de28f65acac11ea36aad72eb8ba8f63949dcc10e9712ac84be91a66cd4216c01dee9eb360bf95db1c32de79cf9aa7ad2a1656eb877c52d44dd95a45e2b24253a
 DIST re2c-1.0.1.tar.gz 5758988 SHA256 605058d18a00e01bfc32aebf83af35ed5b13180b4e9f279c90843afab2c66c7c SHA512 ab3b652d8f97b0d1be4c7561ce65e28870ab8976f8a31d74a6629b43d2057bfa608c7f393d5e5d59d26f991552a60e6274f554ef58752bdfcfeba330578f1299 WHIRLPOOL ed42bfdbe88a194c3972c09f7040009d5e804ce071549dff3d7b2a4916efb71c0f3ecba58402f3a1c4df1fdcf8035c01effdebaeb4aa6f1e7111a1c9746672ae
 DIST re2c-1.0.2.tar.gz 5805526 SHA256 b0919585b50095a00e55b99212a81bc67c5fab61d877aca0d9d061aff3093f52 SHA512 9d85933ae874cb9240175ce7210d3808173bafe246c67b9c333578846239b7bcef074287f26040b5a048bcd98db8d0393035c417918b80db1f74098695a77176 WHIRLPOOL b67af97e088af4d21df45a47a8c8560fe70cbe5e9d207a77f945a84a60b4dc1dbb9eb9d297d5ffc750a690ec087a163dac925cd16b6e3530104eaab8bf174bde
+DIST re2c-1.0.3.tar.gz 5806555 SHA256 cf56e0de3f335f6a22d3e8c06b8b450d858a4e7875ea1b01c9233e084b90cb52 SHA512 7b2a43828da872a957af88fb0a226e1936a45c8a1020ba1f6544b588aaa61dff8df40e84f9053c30ac8e17c41164e70627d57f5d3721a34b2aba7b1dbf25b6ae WHIRLPOOL 0aed0bb9153c1f5bff4aa5abaf6cba337086536394c26fa624c9524a7e50bab0a572d0fb54849317d3e429dc20e5a2fa67a71a842bd3b90c5429819498aa6bdc
 EBUILD re2c-0.13.5-r1.ebuild 712 SHA256 58b5eefb88530dbc262d2d90a30dece27114fbe1d219167be3633c10f380bd4a SHA512 446a7fe4ff39783c7172ae3110200e896955cf36bb2fa26133a671adc6394ca4efb92f012b074e3cf2dd392d27b4ee6bfbf43a86755b4b6edebb8fe77e395f86 WHIRLPOOL 6e9b9a47ebfaf9e32c8d0c630e3d1de01be98f7c76b166470e3b3ed7a92eb36bd4c139062ee56d0e376d5114d2366517eb30c1e7f0160b0d777dc3204b7ab5b0
 EBUILD re2c-0.16.ebuild 755 SHA256 647b7d33c4a11670844122e5df9ab5db53f2634320381fef1468f648158b16e9 SHA512 8bd63d72cb9bd092ce626def2946ee5167d98c91ced9497f8fa895115c868fb199b2afe4173fd0f5fa14f0aacd763170f72817e4cf2444a2bebbccf307a45653 WHIRLPOOL 4a12c146f133f78320149cd526760e6fb0e3ffdfc4a6f169c3ec4dc937eb4e6af4ed6ae509f63e83a159006b1c46ba7adfbed2c979859b1e3b2ef2b3c3ef5675
 EBUILD re2c-1.0.1.ebuild 763 SHA256 468a6c6013746d15bbea5cd27690acf41e85b0ad0196f0f149c9c9724ed93f71 SHA512 ded3ef724bc5624a00994a80739483e7a21278bb45f7d54001e060b71d591c44cca59e7202e1af5f36ec84b39003c97f7f9161d735a8ba67925d29bdb65253a7 WHIRLPOOL b134ac2e4739c1f460786a5d4f4cce1c1958cec72a226bc0d355a41aee32abdb90d097241643c3a3ef70cb6466a75aeae6fc88c87bda7e0bc6c526084585bbaa
 EBUILD re2c-1.0.2.ebuild 769 SHA256 07624245d78053cbab05efbc168eaabd12b32147ea68b7bb13b2d5aec91908cc SHA512 2845c30b034de806ec2339ad15e9a966349006db475d614c0399988cc1f6fee866f37e6d5c671d73414c11a14c28b7e56645b8cdebf1f785f47c15c5ca225d86 WHIRLPOOL 022e690c0731257a3abf56e226eba2525bc262b287bb1b0774445ad71c798844c33bb5d1884b9497839723cf43e508c8d3b9ae95a2b7dbab968ebe367dea37da
+EBUILD re2c-1.0.3.ebuild 769 SHA256 07624245d78053cbab05efbc168eaabd12b32147ea68b7bb13b2d5aec91908cc SHA512 2845c30b034de806ec2339ad15e9a966349006db475d614c0399988cc1f6fee866f37e6d5c671d73414c11a14c28b7e56645b8cdebf1f785f47c15c5ca225d86 WHIRLPOOL 022e690c0731257a3abf56e226eba2525bc262b287bb1b0774445ad71c798844c33bb5d1884b9497839723cf43e508c8d3b9ae95a2b7dbab968ebe367dea37da
 MISC ChangeLog 4634 SHA256 9720b96cb59c7a752579116a5722cb5c078ff090ce339847b533ae35f43facf6 SHA512 db2448c60fe672933c2f848d2146af8fe6db82fa318da52f940fc6eb6fc6e57dd5327b95a95d6138d536f490862471050829d5d39baa07450b9b8e69be0b69a9 WHIRLPOOL 58ee96416a2079052ddf3a8fa962c9f68afa4a0e9a94a74b2c2360b553ebb0520ffb0a404761d52f91050a2f73c08505ee2fbf09d03fc43dfd81fa17bf57872b
 MISC ChangeLog-2015 11944 SHA256 83231e58dc4d3c7ca92d55dceb7a7b62e997299156a828be942176ad30cb904d SHA512 a8c6ab17ba21b7c6b8e3a6e99c88f8e74edbe223efe323d4af025a4f54ae6dd9108308328939e268168685e80a4d76fe6fe86d13908f2b0dc935d031bf7c76f7 WHIRLPOOL 8f1fed9dfc047924eab55b3bae15e8a74eb46dab0ac03e433cf4bbb93a93376b4f6f946c20c3a20f44ef601c6819e1f0b83b70761daf04df2290f64c2c0ee5ff
 MISC metadata.xml 423 SHA256 405af3772ed2ee867686c5c204eb602475dee4f0b8ef16dd31888c813b28cde1 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9 WHIRLPOOL 8105f64cb55da72e78651ed400e537ae31e5b1980a1fbfa9de4760a78de11295da1d56027c33d90a695e8f7a07f4d4211ec60d3d1ac6cacf24a36169557295d3
diff --git a/dev-util/re2c/re2c-1.0.3.ebuild b/dev-util/re2c/re2c-1.0.3.ebuild
new file mode 100644
index 000000000000..bce28d1d0814
--- /dev/null
+++ b/dev-util/re2c/re2c-1.0.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.org/"
+SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+
+src_prepare() {
+	default
+	export ac_cv_path_BISON="no"
+}
+
+src_install() {
+	default
+
+	docompress -x /usr/share/doc/${PF}/{examples,paper}
+	dodoc -r README CHANGELOG examples
+	docinto paper
+	dodoc doc/loplas.ps doc/tdfa/tdfa.pdf
+}
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 38413feac882..f2af7a69a308 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1,9 +1,10 @@
+AUX systemtap-3.1-ia64.patch 885 SHA256 278d4338c4a494f72f7a207efb79b3709fe95141e1252fe06384f0a5e9b38984 SHA512 a9f068dafc2fb4c96696d8cfe1501fc3610f4ab0aaea9a20ffc5f57cda09561f9712896616c548661bbbc5c10dfe275d218c7b232645a5240507c80bec1850cd WHIRLPOOL 29c85258ad4ab5fdfc913dcccf19e3036358d7c70c5f0fef5fd5521d60669c0b20c8b44390c73aefe11ccfc5ee274cadab4042c65cd6ecf5757ce21078fb86ec
 DIST systemtap-2.4.tar.gz 2664988 SHA256 fdcee37c4db188819a69f67a72ad1977251e80673cebf729a443b6c00be779f4 SHA512 40c30942eb50948f11f06f9f37c76d96f5ebc8eb6d164c9af5d54845b3f43f38594ddebf5f0d42ac4704b0a2563cd23edf818c196ee1330db00011a85ae11b0c WHIRLPOOL 7441504b167b9f90da52abb7f0c934263c9ce984de4caedc43f3694c7a1c492fe7c5bdd56357d7eebc8d306aea6873cdf8c0dadb0fafcc4f0bb192d5e9cfb9d3
 DIST systemtap-2.9.tar.gz 3258026 SHA256 04f2c607512f4867f345a3d173940e1023441c5d3560f2e580b4a82dfe4d6353 SHA512 00d24ad52d5634b540241a9fc64efbab7fa1d34d31a0254b43474101d3024f050ab7ec284aba0c082889066e1b4cf4c38799801910bff7516ca2e380684089dc WHIRLPOOL fa8d3978f0768091c5cc3bd1cd4b13b6ff9643e2e37ee8e8b59c1801fd7ddcad7029d06e4a1207dc5add5faf423de9ccdb9df677b7db88a5199b1fde731fcb3a
 DIST systemtap-3.1.tar.gz 4885480 SHA256 a7b679877502db9b3ac9dfb658c05b49f77e29d42ad2eb36105b62bf2d32f676 SHA512 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d WHIRLPOOL ebb6c085c74747e54434c4ca6b6cf840bc3268dfb66cf95cd7a51553c73b75f4b34ab76ea715163986b601e5ffbaa8340a88dfa5cc203537856c30a3d88fa5c4
 EBUILD systemtap-2.4-r1.ebuild 1999 SHA256 e036dc241ba8779ebf27d0fd21dac609a466931d37b8741a532b07db7e521136 SHA512 930ff6b23986fa9c6ddaa5655db7fd7eb3dbe4e0e1039d14aeedc1993aa89eda63029e50768413c1182793c209a55c41fefac9ea03a673108e142d92f45491d1 WHIRLPOOL 5b4cf502cdfaf6fe13e8da1e69072d1e545820a2e6fc1b5a0c544c7f4501442950325f4b2d8c4c5e846a787630813608ef5462f9c4ad40dc995b68f01cc9012c
 EBUILD systemtap-2.9.ebuild 2029 SHA256 7e227ab12188ea134f435871faa79e98e7e2dd0b59fe4fcfb00474b48599db99 SHA512 e85f7c8f9bdf73b54f11090850e2a401f7ed0978a80281e9b1b6a126dea14f0dc117c71a63e1cd48fec96008812b47b40aa375fd5eae31bd04777666c7955b06 WHIRLPOOL d5861dfcd84548beff94ce6dc8e0124b6258224883634ff058e15f76d1c326ec59563324ca4fb959f964dde1b6e8d87f7bc6dead54a05fab96f7483e6f315b4c
-EBUILD systemtap-3.1-r1.ebuild 2106 SHA256 bbc6c016231aab7000fd8e5384e2fc6604e2ad516135fe993bbf4133138d65ba SHA512 74a60c0917c2e77fa71f09f25e7d76f2bdc75032945fb76a3e76eae854aeefe872a8d78ac7bcf5230fd95eae7fefc97e00dde40e93271907baf0a3ac9d0eb5fe WHIRLPOOL 89f4864384a44cb4580bfe554f18f9f7917babf69b6acf8b84da9b7272699903907259f79ddc67710e6a38b0708dbdcef43599975a3e3fa3a1c9e53256d2cd76
+EBUILD systemtap-3.1-r1.ebuild 2150 SHA256 76f5e1921b41529a9f3e33a804c52c5c19701c7b0ebb1c75b80383ba89781fb8 SHA512 1e6aa3b01fa8efbb3871c28e46c454c5119579dde0e451fc6d46d0abc307b2c3bd59abfc19d158d21f04f271fe0931c8865f9ffe9b97675a0d01c92494eed8bc WHIRLPOOL 04a1bd456b69e621ffb32500b6241b7be6253ea0358f4cee6186bb4db026c139fd9d061bc3a6c54dac6b7e531371a9bbec97b36a571aa258cc6f39eeb0978632
 EBUILD systemtap-3.1.ebuild 2025 SHA256 f9f8c5e5256023182a9c4133728ff881f3b71e93c83cd92e02a2184c270a309d SHA512 eaf7f9e37a7ea1ad61b4193f20414c500f662a61bb19d799b60d84722dc7dffbfecb112326e9cb23fd14e26b4a6d9bc46f1f6431736b8e7f63f4c772ac103893 WHIRLPOOL b3208f7e9f5bf3d5fd70b4acebb0d9919cb2a417367d91c43ef608827516237e686e2541d8d772f43ca566d98ccabbe92aa5fc793719fa1b9b95dc26a93a5e10
 MISC ChangeLog 2897 SHA256 9f126d03a53fc3e6ee4f1b2564fd12afbb5562e0a4ea532c94e977dbf1704a9f SHA512 1ff92e3ab4904c650618a708255eb87d07a60650f9f587d5b1b582465037cc88b9e4fcaa46f5b8cd9689ba7efbe2ec01acec021580e0a273e3db0d67d4725fd4 WHIRLPOOL 55526412784dfb2d328b33e41f06ee657a31f7e2ba947a62fea51415356360e7f300160f3bb99676e011503fb7beacc163980fb132f4dabe593dace786e8a542
 MISC ChangeLog-2015 20184 SHA256 959e517e7b3fe2cfb593f1d9181aacdfbb1ddacbfc972f80f1312f71db215751 SHA512 3dc443727de960e7a94365e886d94303b2801d51b491d9b602c2b536280789662c8c67f2834d3531aafbb13b16f3102d6584074cf477b8ed27761d8a62d4f344 WHIRLPOOL e82a32819f5e23419694d0ad2c707e81460a7e781c501b61d8e4b5f5468ff87baafcb3a7dac53b4b5b5c543c82eca9c734438a04860e32ab78a2af79f21a1b4d
diff --git a/dev-util/systemtap/files/systemtap-3.1-ia64.patch b/dev-util/systemtap/files/systemtap-3.1-ia64.patch
new file mode 100644
index 000000000000..832bfc1a47f9
--- /dev/null
+++ b/dev-util/systemtap/files/systemtap-3.1-ia64.patch
@@ -0,0 +1,33 @@
+Workaround build failure on ia64
+
+Avoid 'o' constraint to allow gcc to select register operand.
+That way instruction selector can satisfy all constraints
+for PROBE2 macro.
+
+Reported-by: Émeric Maschino
+Bug: https://bugs.gentoo.org/510134
+--- a/cache.cxx
++++ b/cache.cxx
+@@ -8,2 +8,10 @@
+ 
++#ifdef __ia64__
++// Default is: nor
++// We disable 'o' because gcc fails to select register
++// constraint for second instruction in 'add_script_to_cache'
++//     https://bugs.gentoo.org/510134
++#    define STAP_SDT_ARG_CONSTRAINT nr
++#endif
++
+ #include "config.h"
+--- a/staprun/mainloop.c
++++ b/staprun/mainloop.c
+@@ -1 +1,9 @@
++#ifdef __ia64__
++// Default is: nor
++// We disable 'o' because gcc fails to select register
++// constraint for second instruction in 'add_script_to_cache'
++//     https://bugs.gentoo.org/510134
++#    define STAP_SDT_ARG_CONSTRAINT nr
++#endif
++
+ /* -*- linux-c -*-
diff --git a/dev-util/systemtap/systemtap-3.1-r1.ebuild b/dev-util/systemtap/systemtap-3.1-r1.ebuild
index cd13a9e21c2e..e025bb2783bc 100644
--- a/dev-util/systemtap/systemtap-3.1-r1.ebuild
+++ b/dev-util/systemtap/systemtap-3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="libvirt sqlite"
 
 RDEPEND=">=dev-libs/elfutils-0.142
@@ -33,6 +33,8 @@ ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) -
 
 DOCS="AUTHORS HACKING NEWS README"
 
+PATCHES=("${FILESDIR}"/${PN}-3.1-ia64.patch)
+
 pkg_setup() {
 	linux-info_pkg_setup
 	python-single-r1_pkg_setup
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index e18346f069bb..08ac5d97e87b 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,6 +1,9 @@
 AUX umockdev-0.8.11-sysmacros.patch 1132 SHA256 da413e9a204d3ef6d31a8eb060ade6d3b2a52510d27662ff9221a27c870c10cd SHA512 43cd12d94dc4f1370b15a33c1b551332eb67d1a7be4318b9a844eba66aaa25f9bcd3b50eab4b2f2af12c0296bafb8433959e2417bd531bf9c28406c58dcf0ea1 WHIRLPOOL 96e3d036e4d24e94a7a54e13d81699673f39e4bc42f00928ddb7b94d369b04090e6254f80a642f69cf1178fddcfe9be87ed1e25ba98c6b903ce9ca25f2de84a2
+AUX umockdev-0.9.4-sysmacros.patch 599 SHA256 0b346e7d3ab4e5ca238e07e7cc79517194772e1b47e89a83ec6e9edd6b912ea2 SHA512 3deb38bb44ea4bb2cf7f4b2dc88db0c0d71045ccaae48acecd3fde9e0006262111202c8e3ae490a5fccd610abf0c24ca11699720872998dfc55bc29f58f923b6 WHIRLPOOL fb997b015f1a85159c8c4974b2a5ccb833e67bd61015064a9bfdafc6c7303319cbd0d61e3c50369fa2a8eacf4e4af7ff516861d45805290e257e016188f0bdd4
 DIST umockdev-0.8.11.tar.xz 741812 SHA256 222518a634c57b1d6d9f51b042e8c80641251260d9c43e6c6273d446d577ccb7 SHA512 dd6aa23873060c2778796f7300b61aa46e6f9bed8b2b2dc107eb747ade93f9d9027385a414f2107f3da4932065e1f7ec488cc91c6f24c3204a7abbbdf4cb8e84 WHIRLPOOL b736ca9d9f73294e5aabc3be75e006efcfdba8f8ecb96cdeb2fb88a12cc3ba53870c416c82c315acc7da7929d07a9efcdc6ceadaa324e0c63a9a60589d66148c
+DIST umockdev-0.9.4.tar.xz 754856 SHA256 968cea51804d1de7a1db1c96958326e2f2207a0fdaae18940445e29430e94468 SHA512 c291d3f40a0ab366f14021aa0960852de049f4299a0207d93cec28d5961f3bc7f89448add6f7b35c1262d805d1d638837d4d5e6b734879ffb5910da50019e1cd WHIRLPOOL 76ffb5c7d0ce53f1a7126247d8d7e9e99f7fafb537b19ef8ae48b794664a713c6ade3565abf20a1bbc10857dc8c4c20d3d75a4543dba7e010b63d4fe2a62f3a5
 EBUILD umockdev-0.8.11.ebuild 688 SHA256 7378eff0ba66e1b78564d900b5224efc5d248f2cea743833f6fde223ce8f7f33 SHA512 6fc1c9a49890d5751b2b8ccd762d6ce9987197cdf9d8f13d70bb7cc328b7c0acb4f9d6270085046599e2fb6a57d3d14817b4cf3f7d25e32c35baff2c90c1c999 WHIRLPOOL 8ee0e80355d8b43f8a6d647b00bb447b6d18b18cba51207a77696ceb3103da54634e380fdef720ccb53436894a1650c22da0b78949804d1a49adbb6c603a6857
+EBUILD umockdev-0.9.4.ebuild 733 SHA256 ef7ccc4bfd5f8f830deaac4c00a267da0d69701fe77fc471381fd6743a76015c SHA512 585f9841137d1d74981e7d64d0bcaadf7834a0b1a5689458b8cff8462272e86a48b6878d289bb40a7c8a6b52cb696298008124f048eac9bf38619d0e145eef3e WHIRLPOOL ee1505fa07a520110a302bb366229f50afd1a502ae089ca600cf6adccb2fa0c6b5cfdc3b1e603c42d45929186134467c43931621b3bbb988d4f12762f3afe8ae
 MISC ChangeLog 3601 SHA256 e02b4b19aba763d9c353e0f41c2bf39abf0f4b906947d93f075119a709f1dcfe SHA512 526ab7d4c1ec6505929460ef8841eb2ba55671097ac2939f29fc31984933c3b94123cc5f228ca7b5cedd68c3c5b88f3af6584a0e7b14552ff84cc2274efff12b WHIRLPOOL 694ec9ea0dd506334b3a54b83c33878c6b133b08b13f5d0149548a743946caf775156b2dfca9e44b1953b1a63ad832ceec623dfbd39a3388ec0f7401ef897fbd
 MISC ChangeLog-2015 3842 SHA256 257981323d1418f62ca3a04c5b697d4c6d48123b1b97c1bd3cbbb64da531d554 SHA512 02d29f6c9237ebf7ca1708b7780725ef364796f84aed300705453c0998a228d83fa17bfe7d7a9b5790b158f90cba5ed0bb32c4b10d95c37c3810a1f3f793f835 WHIRLPOOL 11831144c764058452bab4ce6494dd2c3e334cddf981c87ec77b94b312d560359b29f29819a165d7fc5d9cf8bba44e758d8e2ee0f1e9abff118ba7a7445ca073
 MISC metadata.xml 302 SHA256 3e34db58bacb628ede41c44dd9237420086178e6eadeee38e2ac869399aae24d SHA512 2ff22fa67bfa335de8cbbb0bd802232a7a1e3d8771fe65409477cb9164b5aa88f12127e86a41e04c07c2d3d581af70d15233f1d145c2c6c1d9f929e952a10706 WHIRLPOOL 8e768aec57877cf857445540acd7a28a0d00f507cfb05e4d930fef8ee79ff30443adf46652d7098612c9603d910741f9ae56a5a16a1ebe96c6ac9704a16974fa
diff --git a/dev-util/umockdev/files/umockdev-0.9.4-sysmacros.patch b/dev-util/umockdev/files/umockdev-0.9.4-sysmacros.patch
new file mode 100644
index 000000000000..bfc8bc9ed535
--- /dev/null
+++ b/dev-util/umockdev/files/umockdev-0.9.4-sysmacros.patch
@@ -0,0 +1,20 @@
+--- umockdev-0.9.4/src/umockdev-record.c
++++ umockdev-0.9.4/src/umockdev-record.c
+@@ -30,6 +30,7 @@
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <glib/gstdio.h>
+--- umockdev-0.9.4/tests/test-umockdev-vala.c
++++ umockdev-0.9.4/tests/test-umockdev-vala.c
+@@ -36,6 +36,7 @@
+ #include <unistd.h>
+ #include <glib/gstdio.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <gobject/gvaluecollector.h>
+ 
+ #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
diff --git a/dev-util/umockdev/umockdev-0.9.4.ebuild b/dev-util/umockdev/umockdev-0.9.4.ebuild
new file mode 100644
index 000000000000..56a4b358cf1e
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.9.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit python-any-r1
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="virtual/libgudev:=
+	virtual/libudev:=
+	>=dev-libs/glib-2.32:2"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sysmacros.patch #579988
+)
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index fee952e87516..66cb5f2b1f78 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -1,8 +1,10 @@
 AUX uncrustify-0.59-unistdh.patch 473 SHA256 92918a0a216d9bd3aaf3fbe8dbd6ab8981b73d1d2212632acb70f27bbff13e31 SHA512 a7ed9c1e0a587dc9923085c7a830192fece50ba18c2a19617de60209e051ec44d517d337738c7948454669b3d2061625379cacb301e44d239b3c2b90b09e6114 WHIRLPOOL 00fd81603560c73c48b586f9567898931879b8bac3789e5ecdb870829dd5bfe4e3d30ee245958c0e1a151c19e5a261e836fe70788cc2b1fa8c3faa0955701ebf
 DIST uncrustify-0.59.tar.gz 983822 SHA256 3f2ba1ca15f7ed1cd0871d54a5dd4ecf006fd167a0fa0fe1d5d76c91106238b5 SHA512 eb228ecb63f777e90ecca44bdef2312fbca2cdbdf9dd899e1f67e9917265667584796b983050138bae39773ab2627e3c3035e519f64dfe51475f207a0e3af900 WHIRLPOOL 85d702e2968d6fbbce7f15fb23d2bbb5e2131f462076e82adf109c684c9b09410c409aa0d75114e7d5b8951d1dfdee80186d483e48d57c1e183d4c3a27bfa8b5
 DIST uncrustify-0.64.tar.gz 1178957 SHA256 2a8cb3ab82ca53202d50fc2c2cec0edd11caa584def58d356c1c759b57db0b32 SHA512 bc7361520adc3c95c9ba3dffeabadec4219af1827ed2f4ae0c4ad94a0f366490854ed40d09ecc6bf3f34941bf87722f013e01d1a1684c9f7fb1adac6dd4fee01 WHIRLPOOL 1e45748b8dc3c2c99dd774677d539b4bd7e1f4f52c3e9a40894df3ab67780767604dd845e9ffc6f69eb23980e447ce8d82c526eba1236454194baac5f25d9a84
+DIST uncrustify-0.66.tar.gz 1435142 SHA256 ae5ca91419be71291d4a5be15439c11bdfc0adb350cbc0688b9a51085489a7f9 SHA512 607486c6c34ab1551707c0c5e1c4ce73d53f518f9db478734a3af6711569b0c91e371d9b88b4fc3c34a4d9459feba32c24c87b82bd2c2645fa9d9a6a674f429d WHIRLPOOL a4127e3430c54b17e02d7062d3ed5cbf6148a11d7949d38610b63d7b89410b5b82ad5513274b6f4249ecde5a4966f4639043bec9a60e1423902c1c56ecc64f3e
 EBUILD uncrustify-0.59.ebuild 726 SHA256 85248fa0eb2c4d56bdaedc45d3a14995490429f01fc3e80715855bea8960f9b3 SHA512 a0aa2fca968e77a7eb0d92d183d97cea5d19a781c28d48167ecbd1b410560436cfd3c31b57876cea5aca4afabad0db76c5a4cfcbd10b0f8a8a72913ca8c7da5e WHIRLPOOL 27bdf8250c17e7d226c9df0d475d1efbbc02b1da5a31907f0dcb3f946d02b26a3ba917e48a902c982fdbaf555603271bdd05f10f4fdfd44addc9c50458eb31fd
 EBUILD uncrustify-0.64.ebuild 768 SHA256 76c768a475b959d28a5907985a044bb592bdfdc0cb803342c9dff839c9fbe3ec SHA512 ddd9587992e64a9872591669e20301ae9955a533dc6dabb7e35ba3764edacf39155221f48107b30c852e863cb4c1e9a049f3efde5742233d4a81415f3d6e87e9 WHIRLPOOL 6e867c87feb35ac1c31cf287e30d28f8707619c2506dd060f7084e1d33bcaf4cf9b826c10b3c2b887f2a7ac138a8d8b429062632b790093257a28c27698180f5
+EBUILD uncrustify-0.66.ebuild 768 SHA256 76c768a475b959d28a5907985a044bb592bdfdc0cb803342c9dff839c9fbe3ec SHA512 ddd9587992e64a9872591669e20301ae9955a533dc6dabb7e35ba3764edacf39155221f48107b30c852e863cb4c1e9a049f3efde5742233d4a81415f3d6e87e9 WHIRLPOOL 6e867c87feb35ac1c31cf287e30d28f8707619c2506dd060f7084e1d33bcaf4cf9b826c10b3c2b887f2a7ac138a8d8b429062632b790093257a28c27698180f5
 EBUILD uncrustify-9999.ebuild 768 SHA256 76c768a475b959d28a5907985a044bb592bdfdc0cb803342c9dff839c9fbe3ec SHA512 ddd9587992e64a9872591669e20301ae9955a533dc6dabb7e35ba3764edacf39155221f48107b30c852e863cb4c1e9a049f3efde5742233d4a81415f3d6e87e9 WHIRLPOOL 6e867c87feb35ac1c31cf287e30d28f8707619c2506dd060f7084e1d33bcaf4cf9b826c10b3c2b887f2a7ac138a8d8b429062632b790093257a28c27698180f5
 MISC ChangeLog 3400 SHA256 602e5d33aede1dd33db105f1e1f661fbb63c347d002356001e324ebe36bf70de SHA512 503e0de64a4df10f642c4f8d3f8b32a957d4789c0e4be35ec426275de976a3676c3baf3cea43b14dc25a6e043cfe139873ac6dbee67a0d05231d2e9e773145ed WHIRLPOOL 9e4099b301bf0febf48bc648ae054b0887b7f37655794a2cec9f43dcf0908a1e34e207c4b283ae8ea37f34347ec78a149022494d90141db51cf916cbe3970815
 MISC ChangeLog-2015 3653 SHA256 0cd5e3fcd9b0852be17bcdabfd68e3ffe0d0232647efcc681344f69a4beff524 SHA512 9dc5b75579b82c7fffff9f98b1596b8e064ae6bd26cfe98e4c67c63fe8b4718a9c2f2e347e65001f00a1042b65fefcbf57404b9c9246820c42bede15cc2ce3cf WHIRLPOOL e2f17eb15a1b2cc3dbc437e3a53ac66d6e4e8c0f36b4ac33c72660226ea57cbba87b8ecdcded76f5e5e770e5a480e4ad8aeafbce520ee8b773d53096d32470e3
diff --git a/dev-util/uncrustify/uncrustify-0.66.ebuild b/dev-util/uncrustify/uncrustify-0.66.ebuild
new file mode 100644
index 000000000000..d0891fcae6c3
--- /dev/null
+++ b/dev-util/uncrustify/uncrustify-0.66.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ $PV == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	KEYWORDS=""
+	SRC_URI=""
+	scm_eclass=git-r3
+else
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+	S=${WORKDIR}/${PN}-${P}
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
+HOMEPAGE="http://uncrustify.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+python_test() {
+	cd tests
+	${EPYTHON} run_tests.py || die "tests failed"
+}
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index 000632b9cd6c..f569fa69d30a 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,15 +1,7 @@
-AUX org-netbeans-modules-profiler-kit.xml 480 SHA256 f2b7ef384e71241dd91a49825b62a97875231dc5ac539e1ca1919a0edc02b6ca SHA512 43c979dce3996ef49de4cea4e46d1869bcf707cdabd0af04442ea7ba1ecb7e4f0d35e0355114e0382a1b7e105c02a7aedf0846ccab3e0cdc1f82f0a829dc9e40 WHIRLPOOL 1c7d2b7e3ac98850147dde1c17f6de7bf46cada3837b5933777305271b104e0ce8bb0011680f4ce3b48f0b5517cc0b588832b0a868d1992d1085bae1039e1341
-AUX org-netbeans-modules-profiler-nbimpl.xml 486 SHA256 86d7dd0bb435f9fe97a54ab1dff2d6f5a2cc8413add1ac78c9abed9600e0de5f SHA512 608089dfe84c19542ebabf484b4ba4ac0c0fd9be62d0e86f1a46f5b99cc00e702236618037aa5afa9d2f866af8b360fc4cfe9683998616e96964595068e73f4a WHIRLPOOL e8913740280b7a5f73082789d55f48b4d1a970f24074981771e116404a5028ab679e55faa7636502935442be171e0a231cf78f659d28c6bd3473195e83af9be0
-AUX org-netbeans-modules-profiler-options.xml 488 SHA256 fdef7c3e062df1cfddff844c11b0763190a92f863a9d308de240b67a42ea110a SHA512 00012a71334794b5b454f7de1ddecd2dd5ea90f11c8a4fdade520d0128d4cd27af13f5dc707b00231c68bf302189f06eaf2addc9cdfe403773421497ae4f1dcd WHIRLPOOL 028d335379785361e582016f8279914d2baf00c037f15c7e9e3094e19c1c53a6242669cd990c914437fe0447cbd12773fa67047671d704bebce58abdd3ee518a
-AUX org-netbeans-modules-profiler-oql-language.xml 498 SHA256 dec11f45e21b886b98841e058e7dfa2be8d34cec1309e8401d334f7f23471738 SHA512 95962ba87c85c7f0ae9378eab7b29d377e3e4cd5173e65f428f26d0c2e9d35d69f140877d1fbb77dbdca4ca0473d8beeae48674101412c9b41e0be832895f4b2 WHIRLPOOL 445fd2ab096125512f7ab0599cf7b1a3938ddba9bb5570596d1fb9e307e8ad1fbdcd905dea808bf7447c696f0973a5aa239cb6666f73977f62718ac8bd716517
 AUX visualvm-r1.conf 786 SHA256 a024c926b7d9136e86065614c2772c57963a84eb0afbdc1f6d81b26297b8ebfa SHA512 243ab8ac4472492edf796582dea5164f53261f654168cde9ccf863e0f265ec5c50442c1c44de89ca759c8d0dee6c00c10a3f807ad45d039976ff4d91c89d8397 WHIRLPOOL e484fc1383ec2cac390f670605bee5583e187eab5ad5482f8848d4450fa4689d4c6242ec49339d79fe32063626cd9bbab484debaa44c2b58081fa7a123a23949
 AUX visualvm-r1.sh 424 SHA256 0e8eda79c2478bf58d7f6cca5d6fe4eadca96697212615a348c97bcc01b38df5 SHA512 8e579f126142f52e14f235a23c3834933b59a9df95ba76b6b9a82175cfc5e12d759bc0d7234ae3cea7684bdfe12f2efb9785afbe6844394f458cff05ae8342f7 WHIRLPOOL 31b198715d7d5750cfce99ecea0e13279b9e54284cd9b34421b7840e072b7cd5c2456bf1cf03146a0356518cbd2b47823652b0072dc0311af7e9f09f25dd518e
-AUX visualvm.conf 383 SHA256 8ee4e0cb4a69cd0db8f581bef42ae8504ba14323dfe163f7c275e9f821d1a3ae SHA512 a5537c7ff8e3821ea435cb6236eac6d0f8941d16541f14862cf5ad15fc2d3621cd50aa296dd316f54f7137196981163b211fe984d21a38ababfce05d575203ff WHIRLPOOL f53de8d9401fbeb86ffb23825da5d228dee2ff1a6b158a74190a6bc37ec24d36d819d65242d0d7b1e0732baadc98766740b33381bc93eb1a9210051b48a9f849
-AUX visualvm.sh 730 SHA256 3828b835d52d7c3a8d452b4cca0273559318bdd66c8a1e6e3fa27354ec06d6f6 SHA512 5f8ba3cbb1c74c9807c016fff5ce31abeb15275df68c710acfb2d0e5f9ecf7e9c5c6aa85c865350bc8225caa278117cda8d6005e28759cc327baf0d14546b95b WHIRLPOOL 85d6857376ccb4ec84391cc4ae9c259911a60060d23753217f6bb26f8fee53bbdd3324bc014bcd030a558080ebc9949b3c5123b7516cd979c75a73aba2d27e92
 DIST nb802_visualvm_02102016.zip 23257637 SHA256 9f5cfe0d8c4f7a01c7b7df0f04e7c12f860b8e2efa9136dcfa105e00b90b873b SHA512 e33dba0cdfb509e9351fac343a4fbec07d3a893b6f484d0aeab972aefe41b061422dba8695003c6ca33db52d5be2f4ce218ea4fc7129f67dbd48c991c35349b5 WHIRLPOOL 7012d24b74bc92221ce257357bb3f69dfc360422512e6f3ada164f5bd5b76f4056a5a6f2308c87da891d2a1a561d1c15ae734e63e015635ec78bc7eb20ed96fa
-DIST visualvm-1.3.9.tar.gz 3622508 SHA256 92006824ba3b79ad86d543a81a5cdbcdf1cc8f6243a613c252eb1416287ff82f SHA512 884c04952dbb418de1bcd68b584f9053f03bd72ed6a9327d9f80897eee4f338a71343836efdd7a8172377552ab1f11d34c75c8804dd31da3fb67ee83c6edbf74 WHIRLPOOL b74b4e5f6c9967664d7150fd9411b0121ea3990e112f23ea75a4e2266c9cfd27003273315dd7845156e69ddea9da05f265c3b3c151059723f8ad4f5e755000c6
-DIST visualvm_138-src.tar.gz 1052176 SHA256 e34cd0425d74055e03394c572735067d3b98095ed5c04268707b52f1dc7c6144 SHA512 f418fcd3316f793c6fc77c6bcdf1e53dc543f7de2ee638f3d500a4de61505246fd07829b25cdf988836f515b72c59c71a2a4fecbb569910e9203e5b490e837a1 WHIRLPOOL c2d83fd92687d07d2f240d4a6c1f150471041e0e0ab1c13f7cd1804a98d3565ed1df29c5124002ced0c403fec98b5464f8ad113cc76ae264d95413c81c4dc129
-EBUILD visualvm-1.3.8-r1.ebuild 1801 SHA256 430d3eb62f58d9aba67fc46fecd0fa95bbb9dd5acc2d8fad13cb36ee2e7dc4d9 SHA512 68b0dd605e34df43883caa8476913cf77f804141e0d90b2cbd68827fe152984296b6895f2520ee14b81a4ad01d35eaa6af4c7eae3b126b3bb12f7dd747778dc3 WHIRLPOOL 56f22c4d1d1e7fe65267ea3c6f5af73776f07aa0ed438af8a96ff3fa840e743e7b63d266acb0115d890a0dbab0a2c5d7c918ee9b7561992e5397350535b0b2cf
+DIST visualvm-1.3.9.tar.gz 3623394 SHA256 6f4bcd525c1adb05310bf344a75105c05a06e2c81061877d3dab74e2abc954c9 SHA512 580e2f3dd7cab1f71c8ae3004101c1067d04a7b4c164e6a59bbe95ca927dd275b8b4389e724cb7d8b38586986762126f261abc1779fb229a778c1c8db0f20387 WHIRLPOOL 8de1a38c9afacd20cbca161888996329a38dee9fd63e5d8880fb94cb0f793e3e3068bdd90f4c03b5e97ca81615b72316a6283691550d70488e32995f70575ed9
 EBUILD visualvm-1.3.9.ebuild 1448 SHA256 dd36064f16196b8645decc558d9deb791d48ff6986b1f9083e7d95893c301b7a SHA512 53f14fe6f1ceb34d9a1b0c3da20baa510f115c99b479603a2af36510b20826d6e23f71b7102288ea0a4f817c8ad0e4511bc9c2d427b2324e9eeed9106395d6fe WHIRLPOOL 1c6aeb0597de87f47c71297bf6d9cca26ff9ec89ce46f72cf2437525109f49ad4db5e0adb3598841fa42ad24b0c53c661f320f5fc694499ff92713143f797f74
 MISC ChangeLog 2950 SHA256 9b5c0dd533ce296b0bfa4f1ea2ae5df7bd3f65c71cb4341ef91a6b51d1785ae4 SHA512 bc1cd08ad0b17a63f8727c9d6987aa6c981b9ff631e58614809c4d46635bbac691f058f8ad7acb49fa99087d06e6a852c0cf67e9186cf6c89b01ec9107279573 WHIRLPOOL 1787ce34ab59e9509c7c8afd1f23e06b151e8a0b6b97b43984d06aeb56306121a9eb3b2e759eacc299aeabe81643a9e66ca47c3c4a7641d3a0955cc13dbd4a23
 MISC ChangeLog-2015 2106 SHA256 cd9d0b9eebe63b3dd597a4a000c396c0975d129be3a492740bb7c017e66124aa SHA512 4c7428777f2f257866aa253a160c062d9f368b0831076b9f8804f81ee93e0f6dd98f572fde056ce2093807fdce805132ebda1268d703ce14e188fdf06ff4ad9c WHIRLPOOL 83081cbbfa408fdf21b4dce0a6d92dd4cc08c4e668b529cca3c77d4f33d1c6698bd06bef670e9f6c001d0412e510ee34aadbdfb2e3fc9dfb9b80184cc89d9f67
diff --git a/dev-util/visualvm/files/org-netbeans-modules-profiler-kit.xml b/dev-util/visualvm/files/org-netbeans-modules-profiler-kit.xml
deleted file mode 100644
index 94021f8ef293..000000000000
--- a/dev-util/visualvm/files/org-netbeans-modules-profiler-kit.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//NetBeans//DTD Module Status 1.0//EN"
-                        "http://www.netbeans.org/dtds/module-status-1_0.dtd">
-<module name="org.netbeans.modules.profiler.kit">
-    <param name="autoload">false</param>
-    <param name="eager">false</param>
-    <param name="enabled">false</param>
-    <param name="jar">modules/org-netbeans-modules-profiler-kit.jar</param>
-    <param name="reloadable">false</param>
-</module>
diff --git a/dev-util/visualvm/files/org-netbeans-modules-profiler-nbimpl.xml b/dev-util/visualvm/files/org-netbeans-modules-profiler-nbimpl.xml
deleted file mode 100644
index d33e48d5b7f5..000000000000
--- a/dev-util/visualvm/files/org-netbeans-modules-profiler-nbimpl.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//NetBeans//DTD Module Status 1.0//EN"
-                        "http://www.netbeans.org/dtds/module-status-1_0.dtd">
-<module name="org.netbeans.modules.profiler.nbimpl">
-    <param name="autoload">false</param>
-    <param name="eager">false</param>
-    <param name="enabled">false</param>
-    <param name="jar">modules/org-netbeans-modules-profiler-nbimpl.jar</param>
-    <param name="reloadable">false</param>
-</module>
diff --git a/dev-util/visualvm/files/org-netbeans-modules-profiler-options.xml b/dev-util/visualvm/files/org-netbeans-modules-profiler-options.xml
deleted file mode 100644
index d56b0c8fe32a..000000000000
--- a/dev-util/visualvm/files/org-netbeans-modules-profiler-options.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//NetBeans//DTD Module Status 1.0//EN"
-                        "http://www.netbeans.org/dtds/module-status-1_0.dtd">
-<module name="org.netbeans.modules.profiler.options">
-    <param name="autoload">false</param>
-    <param name="eager">false</param>
-    <param name="enabled">false</param>
-    <param name="jar">modules/org-netbeans-modules-profiler-options.jar</param>
-    <param name="reloadable">false</param>
-</module>
diff --git a/dev-util/visualvm/files/org-netbeans-modules-profiler-oql-language.xml b/dev-util/visualvm/files/org-netbeans-modules-profiler-oql-language.xml
deleted file mode 100644
index 0ba0c5aa0660..000000000000
--- a/dev-util/visualvm/files/org-netbeans-modules-profiler-oql-language.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//NetBeans//DTD Module Status 1.0//EN"
-                        "http://www.netbeans.org/dtds/module-status-1_0.dtd">
-<module name="org.netbeans.modules.profiler.oql.language">
-    <param name="autoload">false</param>
-    <param name="eager">false</param>
-    <param name="enabled">false</param>
-    <param name="jar">modules/org-netbeans-modules-profiler-oql-language.jar</param>
-    <param name="reloadable">false</param>
-</module>
diff --git a/dev-util/visualvm/files/visualvm.conf b/dev-util/visualvm/files/visualvm.conf
deleted file mode 100644
index 117e25436e8d..000000000000
--- a/dev-util/visualvm/files/visualvm.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default user directory
-visualvm_default_userdir="${HOME}/.visualvm"
-
-# Default runtime options
-visualvm_default_options="-J-Dnetbeans.logger.console=true -J-ea -J-client -J-Xms24m -J-Xmx256m -J-Dnetbeans.accept_license_class=com.sun.tools.visualvm.modules.startup.AcceptLicense -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false"
-
-# JDK home
-visualvm_jdkhome="$(java-config -O)"
diff --git a/dev-util/visualvm/files/visualvm.sh b/dev-util/visualvm/files/visualvm.sh
deleted file mode 100644
index d26306a9ac37..000000000000
--- a/dev-util/visualvm/files/visualvm.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# source the configuration file
-source /etc/visualvm/visualvm.conf
-
-# if visualvm userdir does not exist, create it and put in the default module configuration
-# so that user does not face warning that some (unneeded) modules were not found
-if [ ! -e "${visualvm_default_userdir}" ] ; then
-	mkdir -p "${visualvm_default_userdir}/config/Modules"
-	cp /usr/share/visualvm/config/* "${visualvm_default_userdir}/config/Modules/"
-fi
-
-# launch visualvm
-/usr/share/netbeans-platform-8.0/lib/nbexec --jdkhome ${visualvm_jdkhome} --userdir ${visualvm_default_userdir} \
-	--branding visualvm --clusters /usr/share/visualvm/cluster:/usr/share/netbeans-platform-8.0:/usr/share/netbeans-profiler-8.0 \
-	${visualvm_default_options}
diff --git a/dev-util/visualvm/visualvm-1.3.8-r1.ebuild b/dev-util/visualvm/visualvm-1.3.8-r1.ebuild
deleted file mode 100644
index 911a74a645a5..000000000000
--- a/dev-util/visualvm/visualvm-1.3.8-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
-HOMEPAGE="http://visualvm.java.net/"
-SRC_URI="https://java.net/downloads/visualvm/release138/visualvm_138-src.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEP="
-	|| ( virtual/jdk:1.7 virtual/jdk:1.8 )
-	dev-java/netbeans-platform:8.0
-	dev-java/netbeans-profiler:8.0"
-RDEPEND="${COMMON_DEP}"
-DEPEND="${COMMON_DEP}
-	dev-java/netbeans-harness:8.0"
-
-S="${WORKDIR}/visualvm"
-INSTALL_DIR=/usr/share/${PN}
-
-EANT_BUILD_TARGET="build"
-
-src_prepare() {
-	mkdir "${S}/netbeans" || die "Failed to create netbeans directory"
-	ln -s /usr/share/netbeans-harness-8.0 "${S}/netbeans/harness" || die "Failed to symlink harness"
-	ln -s /usr/share/netbeans-platform-8.0 "${S}/netbeans/platform" || die "Failed to symlink platform"
-	ln -s /usr/share/netbeans-profiler-8.0 "${S}/netbeans/profiler" || die "Failed to symlink profiler"
-}
-
-src_install() {
-	# this is the visualvm cluster
-	insinto ${INSTALL_DIR}
-	doins -r "${S}/build/cluster"
-
-	# these are netbeans platform configuration files that prevent display of missing modules during startup
-	insinto ${INSTALL_DIR}/config
-	doins "${FILESDIR}"/org-netbeans-modules-profiler-*.xml
-
-	# configuration file that can be used to tweak visualvm startup parameters
-	insinto /etc/visualvm
-	doins "${FILESDIR}/visualvm.conf"
-
-	# visualvm runtime script
-	into ${INSTALL_DIR}
-	dobin "${FILESDIR}/visualvm.sh"
-	fperms 755 ${INSTALL_DIR}/bin/visualvm.sh
-	dosym ${INSTALL_DIR}/bin/visualvm.sh /usr/bin/visualvm
-
-	# makes visualvm entry
-	make_desktop_entry "/usr/bin/visualvm" "VisualVM" "java" "Development;Java;"
-}
author	V3n3RiX <venerix@redcorelinux.org>	2017-11-10 00:43:02 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-11-10 00:43:02 +0000
commit	a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (patch)
tree	e6d8d3589fcd01fbc3f1286185639163daa81424 /dev-util
parent	fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (diff)