gentoo resync : 21.12.2017

25 files changed, 370 insertions, 161 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index a0ba2a8743b9..f8e40089ec3b 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/closure-compiler-bin/Manifest b/dev-lang/closure-compiler-bin/Manifest
index be96c0050159..761062667c95 100644
--- a/dev-lang/closure-compiler-bin/Manifest
+++ b/dev-lang/closure-compiler-bin/Manifest
@@ -1,5 +1,3 @@
-DIST closure-compiler-bin-20150126.tar.gz 5654460 BLAKE2B e23ae36a74cbc3d6835d0c42e31e3edf03de777366dcdd88f21cf8a04ab61c59065fb46cebc19a6a12a24ff5387621d52cd4c1d880c5dc815d7a0703a17c4687 SHA512 fe302299aa9f5e21c6db4ebb628b63b83a84faea57a533c52d5f1590617d7df1ab484a1f32a4f666ed23de12860e30cd2f43da33fa5ec7dbb27048d2905d537c
 DIST closure-compiler-bin-20170218.tar.gz 6515448 BLAKE2B ddf7600776445c90059bcee037596af9c7b14265d55c51c1c4a2a55acf2fc97e8f9ab04f854f8a7ba0a32147e63c9e4e7723f4d7f34e842efae96fc86953d305 SHA512 4ddbb339615edb104ddcb84775b1da2f096d49dc921b70c5094a7b7afba25e40c1212bbc9f0e51ad643a3a72bfc46a301efcadd7909d09a77d0bb5e68e41bd81
-EBUILD closure-compiler-bin-20150126.ebuild 639 BLAKE2B 9be12fd4e343f5d5ee668f78b7023c95baa7fffc303e254e70c816807ceaed4868f928a5a215ab53e34c759fc97e44baf4442ce69c0e171fcf260c0d0a1b6591 SHA512 b7b12eadc93f2889366428a028a3be9dc5fb5a0e1b2a85a2ba0c4f7bc0f92d17584cafb26291eb98c9ab5cec04019d44d4fa8434519811923b3cf082a63818b1
 EBUILD closure-compiler-bin-20170218.ebuild 648 BLAKE2B 5db8df0be8f17f5a1c7b9067c471885c31ce68765208332dd64991e6ab4eb5642229ce389a3c9a107b5dd3a374a0ebed540cbb9c76ffff834f39f8152d551733 SHA512 c8be5a5abe654036b7a8baed6d1856a35b94d7e13b5ca16de5a9b3028f4333451347331c5565af167da2c103f91ddd80a1551e818dfd2e33e8b3f6aa9e8d4cb9
-MISC metadata.xml 444 BLAKE2B 8abc06144745a7b7166b95528d54ec9b36427ceafde9a3135045332855f9e3c86a954a097fa5dbff44fd8d6840cf58fa2dac9642a70df5fa92cf68ae2983c7da SHA512 6cf0a8a51e82601f5806b38a2cca855632acff369a6de2c6dcff1fb36ca6e7e073ff0295069b2ae859e22421ee4321aa4cb635bea0e2c1da558a562bc7916825
+MISC metadata.xml 260 BLAKE2B 2ef5592d54d4239c4ea7257368245d4adf72cba5decbbfd56b3e4e472241de40f06d5fc4a1a3ce666a72116f3374082cdee12b61dbb3439598abff3feb983e3c SHA512 7610b5cbfca271ea58d78662bc007727be45f0db490793f0822e8e1ff26bfbf9343a9918417359d6385466cdb78bb20220da17a8a689446bc8f47a9c84b453fb
diff --git a/dev-lang/closure-compiler-bin/closure-compiler-bin-20150126.ebuild b/dev-lang/closure-compiler-bin/closure-compiler-bin-20150126.ebuild
deleted file mode 100644
index 4db97caba630..000000000000
--- a/dev-lang/closure-compiler-bin/closure-compiler-bin-20150126.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit java-pkg-2
-
-DESCRIPTION="JavaScript optimizing compiler"
-HOMEPAGE="https://github.com/google/closure-compiler"
-SRC_URI="https://dl.google.com/closure-compiler/compiler-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-
-S=${WORKDIR}
-
-src_install() {
-	java-pkg_jarinto /opt/${PN}-${SLOT}/lib
-	java-pkg_newjar compiler.jar ${PN}.jar
-	java-pkg_dolauncher \
-		${PN%-bin} \
-		--jar /opt/${PN}-${SLOT}/lib/${PN}.jar \
-		-into /opt
-	dodoc README.md
-}
diff --git a/dev-lang/closure-compiler-bin/metadata.xml b/dev-lang/closure-compiler-bin/metadata.xml
index 2b30008525b9..4b808e719a5a 100644
--- a/dev-lang/closure-compiler-bin/metadata.xml
+++ b/dev-lang/closure-compiler-bin/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-    <description>make whatever changes you want except for removal -- i need a compiler that avoids installing a jdk</description>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">google/closure-compiler</remote-id>
   </upstream>
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index ff2d088840d1..368e6f1f4477 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -1,6 +1,11 @@
+AUX crystal-0.22.0-blocking-stdio-hack.patch 564 BLAKE2B ca388a6e18ef26d03bd0ef25f30a5424dbd814387e832a6f8a1e8f1097f180a4f3393df5c2d733259cb46f0be3e466d2496baa9b9e76eb2e4bb5968882cba513 SHA512 51df3a464efc7b34db970854577d89027177179cb4e72fdf74b6c9ae754749e30c93155bb18a5daf22db78b0f8985ec341092a95435f8de19800c33bca2f983e
+AUX crystal-0.23.0-verbose-LDFLAGS.patch 653 BLAKE2B dcbb7c4e421bc554a83363eae5a699f94023f3469bbe6f0f1d258f509c34334f01f52588711832600988e618131c42aa0eb07881759a2cbbe5521f47a0550c30 SHA512 76494f1dcd97665f787fac76f2b94ef8428259133f13b52cf21c6e5b816ab7697a96f90dad0dc658de6373c6df28b72809cce5656d4b8356a6b3eca73f23856a
+AUX crystal-0.24.0-verbose-LDFLAGS.patch 703 BLAKE2B 3395a7c4bf98280ebef331ec99fbd46bda571b84614e7a71f6cee1b322548dadd363b6b82f3bfd58e034bce5052dab8876a02838ba850d8bbccb25be47c6bb34 SHA512 a009215413e100096cc74088679d603115b80b2d6e59180a466d0f177662376ee6e31e151d2d02a7277d0025e6cd68666e4b1f99b8bf79b50106fed72adb40e1
 DIST crystal-0.23.0-1-linux-i686.tar.gz 18498501 BLAKE2B 7a8e4e5a2b1425b6effe0a634b74b28c340c4d23c4bfccc0abac4e5d47473e10421d025e68e1fb1fa5b0ba8296108e36cd17d393fb143b8012168d595e5852f9 SHA512 8745114c4824d2859c569ed1bd1057d6d649d57b10d41d22c17627f623704eb98ec2e3ab2bf06622de624906f53e053975a6b9d852aeaafeae4f43585609de28
 DIST crystal-0.23.0-1-linux-x86_64.tar.gz 18729061 BLAKE2B bfca07702b2f7c7d6b11aac864475316cabe86bdba90b1819ecd5cb45769b2b7fd9fb4c9f80e46301785209cc5b35fe39bf689163b9376a32b24f8a685a6281b SHA512 6a4e427b4ab3c3be6efcfaee5c1a19eff04eaf00db949d1e1ba8f29c3277affe96a7aba4273d93fd05251453d5b5b937aa792bc448ff2f6d6aa7f2b17d175f75
 DIST crystal-0.23.1-patchset.tar.bz2 7268 BLAKE2B 135990ac9f1a225f169dbc5bb6034d2194d9fc917954764564d68afec09af703382743965a801c9ce54a5866af60847b4c4fc0b9daf2cf5ea99052fbeb771b2a SHA512 68896fc5d1772eeb3dd263f1615fc8031a63d0f3eebca1feb35165adf14a610157302541c84cbc9031a3070fd5566ffe88ad03a8c523f55980520e5614b00b89
 DIST crystal-0.23.1.tar.gz 1646650 BLAKE2B 3105a683e61835d1e514d5d403b00d3dfae01100a9862d6346c45201c5fb6cba879255469652463719998e976afc495ee9fd4f14f829a709f832cd323cfc2b3b SHA512 06ee0d45cc79cc343d04c346e9cd47b6e4ebc79bf21833662f268f9604f7d2080f7696824e1959de341539f801ae8f898fe1d7b18e4c75378d4eb191878668d5
-EBUILD crystal-0.23.1.ebuild 2362 BLAKE2B 2f704cebf99c97743ebe6dca1ec0f3bb81634842ef4e6415957efa7d4074b8b6764fe999592e6bb15c6ca528df63b001b06662c5e90860386e0e28c09673ab48 SHA512 cd9e414e5b81a23a93aec49a1f9021e6ee07792ed09281f9bd1ff91aa26bf94a2d8709e0379d46b9a3ec7207f77a945048a15bce024a685f9aa8698b697485da
+DIST crystal-0.24.1.tar.gz 1744210 BLAKE2B e3a49a75f42e734753b369f1ad22db011b3af055acb0886b74151281480015c19b079cfc7246070c96e45942e51ed47d183606906bef8f2a0e6786ec7b39dbc8 SHA512 f27b64922eaff45228d9cc16bb229528e523500b8f64a3b4a5ed0584445bebf7812457e17952d0eabac2869ee259949bb12fbc80d60a6aa717307a80932345b8
+EBUILD crystal-0.23.1.ebuild 2338 BLAKE2B bb9f07465783a19ffaec8b8aca29a3a85e4b272ac7b43e7c4a1fe61e110d04e1d513e671637cbd08b7974027c6663d302dd9c423880a65703bc58b550eca267d SHA512 df371dd8c31178279ef4ec8e65f160006aa895160b21864fb9194d7a1ad265c764ed240daec0a7b642452818d3fadc8a18e3cd6d3a5fe3be41a8c076d15b03e4
+EBUILD crystal-0.24.1.ebuild 2217 BLAKE2B 910f8841612a9730b651f53220a34b0493a2efdfbc803f6f1e55cda231fe2ba881d682d3f8d432f627b33ebe1db606915356f93c607692d8c711adf77c6ae581 SHA512 327a7b8747224bcdf9f9443e918424d39d82edf7ff35bbe69de7aab01e6e8c40e4c6b5d91966ec16ecbac18d198db742cbd49b935f5a75e12c425cdb60085f45
 MISC metadata.xml 1217 BLAKE2B 88f4d14814fe23df2d80ff0db254175504df5fe44a592484d99c71171c1ae64b333c8c6cec3ebf3c1d3fe6baac3c6961ff27eee6ea7f629d74363cb7f64b280f SHA512 ab6182218a9b597cb7d2ed45eb6204fe30b1567e288e897ca1e2fe78433da260a24f1f79b988fe7d8ace37c7f6c0da7ad4789bc79e15775be44b645d485738bd
diff --git a/dev-lang/crystal/crystal-0.23.1.ebuild b/dev-lang/crystal/crystal-0.23.1.ebuild
index 41f26d88e363..c1b0b8859244 100644
--- a/dev-lang/crystal/crystal-0.23.1.ebuild
+++ b/dev-lang/crystal/crystal-0.23.1.ebuild
@@ -38,14 +38,14 @@ RDEPEND="${DEPEND}
 "
 
 PATCHES=(
-	"${WORKDIR}"/${P}-patchset/${PN}-0.23.0-verbose-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-0.23.0-verbose-LDFLAGS.patch
 	"${WORKDIR}"/${P}-patchset/${PN}-0.23.1-llvm-5.patch
 )
 
 src_prepare() {
 	default
 
-	use blocking-stdio-hack && eapply "${WORKDIR}"/${P}-patchset/${PN}-0.22.0-blocking-stdio-hack.patch
+	use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch
 }
 
 src_compile() {
diff --git a/dev-lang/crystal/crystal-0.24.1.ebuild b/dev-lang/crystal/crystal-0.24.1.ebuild
new file mode 100644
index 000000000000..5436a7888dd9
--- /dev/null
+++ b/dev-lang/crystal/crystal-0.24.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 multiprocessing toolchain-funcs
+
+BV=0.23.0-1
+BV_AMD64=${BV}-linux-x86_64
+BV_X86=${BV}-linux-i686
+
+DESCRIPTION="The Crystal Programming Language"
+HOMEPAGE="https://crystal-lang.org"
+SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz )
+	x86? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc debug examples blocking-stdio-hack +xml +yaml"
+
+# dev-libs/boehm-gc[static-libs] dependency problem,  check the issue: https://github.com/manastech/crystal/issues/1382
+DEPEND="
+	sys-devel/llvm:5
+	dev-libs/boehm-gc[static-libs,threads]
+	dev-libs/libatomic_ops
+	dev-libs/libevent
+	dev-libs/libpcre
+	sys-libs/libunwind
+	dev-libs/pcl
+	dev-libs/gmp:0
+"
+RDEPEND="${DEPEND}
+	xml? ( dev-libs/libxml2 )
+	yaml? ( dev-libs/libyaml )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.24.0-verbose-LDFLAGS.patch
+)
+
+src_prepare() {
+	default
+
+	use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch
+}
+
+src_compile() {
+	emake \
+		$(usex debug "" release=1) \
+		progress=true \
+		stats=1 \
+		threads=$(makeopts_jobs) \
+		verbose=1 \
+		\
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		AR=$(tc-getAR) \
+		\
+		PATH="${WORKDIR}"/${PN}-${BV}/bin:"${PATH}" \
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV} \
+		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
+	use doc && emake doc
+}
+
+src_test() {
+	emake spec \
+		$(usex debug "" release=1) \
+		progress=true \
+		stats=1 \
+		threads=$(makeopts_jobs) \
+		verbose=1 \
+		\
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		AR=$(tc-getAR) \
+		\
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV}
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/crystal
+	doins -r src/.
+	dobin .build/crystal
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/completion.zsh _crystal
+
+	use examples && dodoc -r samples
+
+	if use doc ; then
+		docinto api
+		dodoc -r doc/.
+	fi
+
+	newbashcomp etc/completion.bash ${PN}
+}
diff --git a/dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch b/dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch
new file mode 100644
index 000000000000..07b7dba7be65
--- /dev/null
+++ b/dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch
@@ -0,0 +1,20 @@
+Workaround tty corruption in crystal.
+
+Patch restores blocking mode of file desriptors
+in exchange of potential runtime deadlocks
+when dealing with stdio.
+
+Reported-by: Renich Bon Ciric
+Bug: https://github.com/crystal-lang/crystal/issues/2065
+Bug: https://bugs.gentoo.org/616256
+diff --git a/src/compiler/crystal/stdio.cr b/src/compiler/crystal/stdio.cr
+new file mode 100644
+index 000000000..e65f65089
+--- /dev/null
++++ b/src/compiler/crystal/stdio.cr
+@@ -0,0 +1,5 @@
++module Crystal
++  STDIN.blocking = true
++  STDOUT.blocking=true
++  STDERR.blocking = true
++end
diff --git a/dev-lang/crystal/files/crystal-0.23.0-verbose-LDFLAGS.patch b/dev-lang/crystal/files/crystal-0.23.0-verbose-LDFLAGS.patch
new file mode 100644
index 000000000000..35eace15dae0
--- /dev/null
+++ b/dev-lang/crystal/files/crystal-0.23.0-verbose-LDFLAGS.patch
@@ -0,0 +1,9 @@
+diff --git a/Makefile b/Makefile
+index eff69e5..5c0c024 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,3 +28,3 @@ SOURCES := $(shell find src -name '*.cr')
+ SPEC_SOURCES := $(shell find spec -name '*.cr')
+-FLAGS := $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )
++FLAGS := $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(verbose),--verbose )$(if $(LDFLAGS),--link-flags="$(LDFLAGS)" )
+ SPEC_FLAGS := $(if $(verbose),-v )$(if $(junit_output),--junit_output $(junit_output) )
diff --git a/dev-lang/crystal/files/crystal-0.24.0-verbose-LDFLAGS.patch b/dev-lang/crystal/files/crystal-0.24.0-verbose-LDFLAGS.patch
new file mode 100644
index 000000000000..3d02a119f858
--- /dev/null
+++ b/dev-lang/crystal/files/crystal-0.24.0-verbose-LDFLAGS.patch
@@ -0,0 +1,9 @@
+diff --git a/Makefile b/Makefile
+index eff69e5..5c0c024 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,3 +28,3 @@ SOURCES := $(shell find src -name '*.cr')
+ SPEC_SOURCES := $(shell find spec -name '*.cr')
+-FLAGS := $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(static),--static )
++FLAGS := $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(static),--static )$(if $(verbose),--verbose )$(if $(LDFLAGS),--link-flags="$(LDFLAGS)" )
+ SPEC_FLAGS := $(if $(verbose),-v )$(if $(junit_output),--junit_output $(junit_output) )
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 9b55a668faa3..3a861b027389 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -4,10 +4,12 @@ DIST elixir-1.4.5.tar.gz 1829098 BLAKE2B bc8e2beafe53c3af507215d913558e295370ed8
 DIST elixir-1.5.0.tar.gz 1944255 BLAKE2B 3b52acbb346fb69f8ef410bf8a5aff730a85e761e1d6806be1eca6daff409db765aaddc22801a2d7acc1f0857f519e39232a60ead0bd6b5ff8b2b81ea001d85f SHA512 8323eacf14cae4c01566b2958642f16b80b3a83a97bc870b0fb464c5880c5d04f05fb5cdd3470d6c3cdc3890d17ca67d17face9d6ef23c3e7d608cb743e67c49
 DIST elixir-1.5.1.tar.gz 1945765 BLAKE2B dda65ac8a24b57982a89808482bf1cf51880a605f88621c26abff9845c382ac68d872ada93a407bcc23f74603201c713172162a02c088703e721953c352de8d6 SHA512 92895e5a688b5a906656c0fe974ca28a25b35c7ea9cdb3739290cf8f6ce5e4bdc61ca96309e8d87d6d73607f8f5eb22ce4385da10954582136a02f4b15b3cbc1
 DIST elixir-1.5.2.tar.gz 1947836 BLAKE2B 4b82fa3804f9a380a970db6c4152f4118836966ed28b5042fce8f0e432503c126edf1d59e63238f4f102199b5d0c100c4197100d3d60701dc49daafb4165a5d9 SHA512 ca8bdd8d97d68a49f9db1cffbb2ff028363ff7679c88aad543208688909f915c55f5a69293c423747f34be6171b38e0180f3654581ab38014c4988a3972cd024
+DIST elixir-1.5.3.tar.gz 1948057 BLAKE2B c52347284a2f8fd36fb2b189bef2d3f770dac7ce1ba294be69acaa528a94d3f0877319c2190abd32923f45d147d8b1430473a896687d13dfa1c924d1abdd2471 SHA512 b60c9af00e9bf34a19314ff9cbf9fd74a92f4aea41b24259340a1835acec9bec8a60325401a32b4393979ae264fbec0fb82d4ea08929b96f1ff633e6d694bbae
 EBUILD elixir-1.3.0-r1.ebuild 610 BLAKE2B 3aae4cb4fc2e2a828ca44dd31ee69870df654b9ed3b243327366420c6123854cedbe164a77001d45ed5f05f2fe5f4f7625f32a75bafe1aa81dfe055f68ba1c66 SHA512 17c8068a7ac20a001171041fff35ebfe2b2b3491df2cae76d770247dc9dff2ca43b7008dbacca4736105f032cfae1f138ccc2f71e40a18f034ba16bd835d769e
 EBUILD elixir-1.4.4.ebuild 613 BLAKE2B 6dd46434cbbf48b65a8fce32ed85392248036614f2a40bddfe59689ae53ab6f873d2fa8bd9dc15c09b3b1e7931b324a4031a32a519e4390f2f38694b7f92fa6c SHA512 2b1c5a2238279be2ddf24cb2c9b74be9bb075c2d1da6bbb1ca7ac2c8c996057b89ea92611856c0e68fcead4310d1eb67ae04b4cbac53a68fed90fe11ab02bf76
 EBUILD elixir-1.4.5.ebuild 610 BLAKE2B da40f0452c6571e8c72f1dc85e845ffced68579db1903479d4df21d20447d3d800ebd69ad75da3675213feee30d0438fa868a377d6cba94b365bac14adbd6132 SHA512 a05d132efcde374b0772b17a92cd13ffb78ab4a8d72c4b33c9cee3ab1312df0d1c7621627042895594ab563f75161f55f0382a348867254be4b3706440f77c17
 EBUILD elixir-1.5.0.ebuild 674 BLAKE2B af8ee11eec7e8f45edfbe6bb7d0cd79d917191d770bf50369294ea6132285dba03d229ac34560b3c99af94e6b29f4494e1afbd3fe986d8c0eb4b677473de0061 SHA512 626d46ea82a7062e754923847bed2512ac86cfd0cc50fc825c3a4b307055fe027b172353bd319965a397621c960d297c806bb7cd99dcd45a874e54cbd0eb37a9
 EBUILD elixir-1.5.1.ebuild 650 BLAKE2B 0762ba60b4d3ed8462ac30e17fd5facd652be783807c4591d9d5c9f04c54ebe2d3c79b40abd6458f54f5283db0799b936b8d23fef83138634964d560d62bca0c SHA512 56ce6f6ac4e9ead557327f04e60bc18508135855e81e4cb3ea7144653ea9b8027680f5d4ac396dd93f7a905f905e58ff4c51d9640c7860420bfc2a1d7c129138
 EBUILD elixir-1.5.2.ebuild 650 BLAKE2B 0762ba60b4d3ed8462ac30e17fd5facd652be783807c4591d9d5c9f04c54ebe2d3c79b40abd6458f54f5283db0799b936b8d23fef83138634964d560d62bca0c SHA512 56ce6f6ac4e9ead557327f04e60bc18508135855e81e4cb3ea7144653ea9b8027680f5d4ac396dd93f7a905f905e58ff4c51d9640c7860420bfc2a1d7c129138
+EBUILD elixir-1.5.3.ebuild 650 BLAKE2B 0762ba60b4d3ed8462ac30e17fd5facd652be783807c4591d9d5c9f04c54ebe2d3c79b40abd6458f54f5283db0799b936b8d23fef83138634964d560d62bca0c SHA512 56ce6f6ac4e9ead557327f04e60bc18508135855e81e4cb3ea7144653ea9b8027680f5d4ac396dd93f7a905f905e58ff4c51d9640c7860420bfc2a1d7c129138
 MISC metadata.xml 790 BLAKE2B 1ec4e494164c2519387913b30893e5212e6c296479dc5fa2bce62b1e8552121665d11b115d3ca7542ebeb6d16cf1525f1f3573b5ba23586aebe80ad45f64fc09 SHA512 e96737086e81fac63d37ec20b0f932b538f7548984e8378c2b1746c173afc84644f35215b75ab39ac24338fe9dacda94614c5f50291b483d38133bb1cf46e970
diff --git a/dev-lang/elixir/elixir-1.5.3.ebuild b/dev-lang/elixir/elixir-1.5.3.ebuild
new file mode 100644
index 000000000000..a08ea4e9f6a9
--- /dev/null
+++ b/dev-lang/elixir/elixir-1.5.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="https://elixir-lang.org"
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/erlang-18[ssl]"
+RDEPEND="${DEPEND}"
+
+RESTRICT=test # needs debug symbols
+
+src_compile() {
+	emake Q=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="/usr" install
+	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
+}
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index fe24225d4b4c..41926cd642f1 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -4,12 +4,14 @@ AUX mono-2.10.9-CVE-2012-3543.patch 6960 BLAKE2B eb3e9796ccdec10c8d3751990ac9de4
 AUX mono-2.10.9-CVE-2012-3543_2.patch 1569 BLAKE2B ea9b9bcb01870d1708c92f8ea84405b035d47ffe67a70485ec5112567568d4e9f6c5e39e7fe9472c4391b45143115ed2dde8987d42db8bd089b17b67e8ed5cf7 SHA512 e574e8224d00c7636198c1c374163efca724b2b1058378080687b6d8d7f83d72d27b8db510af03eac9ac185a09eeed0467d59e2d1ca40f7cfa255b43c2a5a45a
 AUX mono-4.8.0.371-makedev.patch 900 BLAKE2B 9e79240ce38a06c375674123d8182f9b9db646f85b2140b1420ac465b19639b910674a1d6e5ce0cb1e9e74d099d338cf3395e95015de4bdf1c4a0dd1ccf63f68 SHA512 afdcb69c2de195bcc6d0a47cc5bad6b6679de6d1c8f0577f8a2f5716610f131e71a327540ba7e23353f35dfe7c552f16b98c9e88c3ecf91f2225a68a6d034971
 AUX mono-4.8.0.371-x86_32.patch 1033 BLAKE2B cfcd8163180de91aec85841ce6c129faba242aa54db0d99b45195b8474e83ce96da4c5111fbb28cf0cb23d2a9a4be6a3856a18ef8bfda35fd7365f87c88509ae SHA512 f12ffda9eddb8fbd51844a6cc7bd3d4d147a97ddde9e4a4435051da88eb72603303ba7d21124747ab23033eacb70ae75ee8e96bc5887d898cc21ac1904c36aab
+AUX mono-5.0.1.1-x86_32.patch 751 BLAKE2B 1a19219c5667715a9afb7dc74ba9714893eea684a0c48945bcb70bdd83e34138a77ca029bcc8341b58af93617b4eab3251885affb3d129e8bf072a0279b8d29b SHA512 8c3d3a65f9d9a9a51c4a01dfd14e32e01bcc7cb98bd4f6a196a2a166968521ff859ccb1efd689c612c8bab5d6a384b148039de5033235a2c0552bc455dd636b7
 DIST mono-2.10.9.tar.bz2 34038017 BLAKE2B 5d9ef975353c7e6f66fd66a17b9c5dd67d40fcc590d979c257986b4fa57f949588e4a05ec7d0d64f896b0594e96d804e1773a730c1fc7a09eed9ab267090971f SHA512 426881873e7f9aaf01e1306bed7b3ac220082ca40dce91fa4f4f331944e8d91453b3cdcc4918882ab039ed694ae8819eeb787edf6a2ad42cc661614076725c01
 DIST mono-4.4.1.0.tar.bz2 85897587 BLAKE2B 79651189e696aa7352704e1ac659302423b1212c88337da8d522aad8e8a49855b74c43020f506b3455ce1a99566e96ae464fecced584b14470d0c8dfe605c5b6 SHA512 d9b6c57c2d9327ea551083b81a2e6cc222ded9a04862056b0dfded1c5df56efbfc4960097df034595012231fe50d172174ab7b3e3f2d8c4c6953ab2106b1cb6a
 DIST mono-4.6.1.5.tar.bz2 83174665 BLAKE2B ce4586af882c6592d1615156d009e496b8405dcf3a2b59e53bb58d1949c33d68645506378eab272a6ef340194582333c515b38f635e961edc64767078905a2df SHA512 1d0c1ec2930ecea3faf1be572bc045300ef4a90d3fe7519f2a9c797be79298c61528d83baa5a24a57143a35be80f78297196556c33cd0f345d9907a973fe625a
 DIST mono-4.8.0.425.tar.bz2 87955541 BLAKE2B dd3c7d26d9818c0512ddbbea6c0980ce5411904c93d5aff8aef581016268594ea1a887dc51332afc225db25d735ef3ef379a5f7b72acd95892e9efe399fb9df9 SHA512 7bab64adbebc277d3fc10301fa6af6cd64ea0836e2d74dfdd9b59684d9402689f9a4e397f3d36f519c7a892c14dcf8f8867d40a5119891874dfd10f9bbce2ac4
 DIST mono-4.8.0.495.tar.bz2 87540431 BLAKE2B c067054c27e61fbd46cae962876afdf65fa4660db41482a7931436009d986ffd25cd9120f9d61f1db5e16b95423fb6cb81abf6be8eada408a9ed2e812f112e6d SHA512 0052b7b04ae25e7cb5970d742369b74c83a10c6c82da591e8d26ad9e13e8b2590a1cde27ca99e43aebc622c7a2a590b9e6c7ce519ac4185b0b6cf7134527cc9d
 DIST mono-4.8.0.524.tar.bz2 87392723 BLAKE2B ac17c3da6d6c08c4cb72c4fa300ded92625bd8c14c1e45ea9539efa42c8d085759f7bb298fe5df57bd41f18abf83f293d26a9e6272944933fcff0a3c16a7e4f3 SHA512 eb77b768a4a26e6a2a872f4845769cdc83f01af3377ecd6d932437d2a1b54bfd1ce727563906146195a54997b4b624fb75449a6f0bcfe818cbc4e6544841bf2b
+DIST mono-5.4.1.6.tar.bz2 204934321 BLAKE2B 7aa3450a9bc4033f8084c4271b215af636e0df72d6349c97e0acd110d91e276d22b735d19bac2fb1e995ec34fa9e041831358a01d5c098b9c5e8b567d98350fe SHA512 d3618e9f127bc95b15feba5bf73317574872208770d83b8b545a9888df81a629e6fb14160db8a38526ffeb005f682e8dd9b8ced84bdb0cbb36dc9e7b28c240a4
 EBUILD mono-2.10.9-r2.ebuild 7372 BLAKE2B d4abcc9e0227ca18716686dc58791b2ded6e8bd8d9d87d615d693308404d0fea558c50013b9569c15dfab125e1b30b28ed762fbe643dd68a2f910929be91aa00 SHA512 e4b9f11f99343cefb489b818e777a0d948687513ffeca34083cb96af1cb83d08f2ee12af61f8e53eebbea24490c561f64dbae66d139ed67645ed13370dcc0f26
 EBUILD mono-4.4.1.0.ebuild 3363 BLAKE2B 89c6dfedc8ed10c254458ec264bfb0d8b7c28b01315508d122e67a9829a02ee34675c40ca6be3be53c6ff24086f04462a92894c5b2032f2fb62f2a5fd08ca3e3 SHA512 478620383d1d8e6cd52c46cc2bed0ca8101f42f037454814f4c829e1a0ed52650e47a93f8449d4335b0be52c75c4590725ef58a96e20374b12651f38e7fea88d
 EBUILD mono-4.6.1.5-r1.ebuild 3506 BLAKE2B a69d7954689ac665cd54f7283e6bf0e4a254d79f28d025a76c20929a5a948bc906bee87d1dc8c8313caea8c736f327bdfcbaa99adb5e08b9c341cb26d38a3f20 SHA512 453e1c30b2eb4edd3d7c3aa2e769cb31efff63f75ffde986b95ce14c7bffea7c005af16d8b4d9559c58a20ef200c2a4d2989fe5c65718a30b200f844af26688e
@@ -17,4 +19,5 @@ EBUILD mono-4.6.1.5.ebuild 3366 BLAKE2B 61dcd126d3aff2b990c56361eb92905f3e389da5
 EBUILD mono-4.8.0.425.ebuild 3039 BLAKE2B b16e7de8dade445b3836e426ea6e1a1beb7286a5acca35e474982d74ce0479edc24a577e826e92a93a845bbc82548095660ea55250cc2e51ad4f81cad5d9521b SHA512 73c27f8263657fd2075a938756c79372eb1044a645a4b651cc4e469e8131e5108c2c46ea8ccc17c8d662121f2fcac75fe3c1ebc6fdfa273278c615b0ede4379c
 EBUILD mono-4.8.0.495.ebuild 3039 BLAKE2B b16e7de8dade445b3836e426ea6e1a1beb7286a5acca35e474982d74ce0479edc24a577e826e92a93a845bbc82548095660ea55250cc2e51ad4f81cad5d9521b SHA512 73c27f8263657fd2075a938756c79372eb1044a645a4b651cc4e469e8131e5108c2c46ea8ccc17c8d662121f2fcac75fe3c1ebc6fdfa273278c615b0ede4379c
 EBUILD mono-4.8.0.524.ebuild 3046 BLAKE2B 9175b1a7bd0711f40e1589ad7d5b21aaec4917346c3ef37ad092830a699d4e464fd4d81acc2bf50a07e49a52f61cc91e83b4ad13edb1dd66449854f36c10b5df SHA512 057f1b024ff6a9747a5bf00a9e1ec6ff9acb81fbbeb46ddca2158cfaf98283c9a89ca99fb5e62fff2d7027591148947bdf7881e4dcde154a9307339d65f6020b
+EBUILD mono-5.4.1.6.ebuild 3001 BLAKE2B a12cab9bb96a5b26b8e8cf445f1142d3fd5aa09e12e9d840fd06fb8b96cde916acf72c038d0cfa687f5618e6ac4c8145b039cc4387dfae0150ba4d51830bb53e SHA512 18a1e30a234a3ecb4ea90601813bca83427d1bf70a66a0ce235f2ec5e603af7ae5fad90f3478487839eed9fe324735959212769cf724f2a692b83d8760adccc3
 MISC metadata.xml 507 BLAKE2B 91655de22fc1ff309c36ecef9d77aa8cada0b8f13ae30677665de837e99b7b43622a1dc0c677b0f5455c06b8e8a295c3c4f39753f66e749163a4f002ee481016 SHA512 e072a1abbf66276b0d139c3e918593010312c2059a0c6feba7b324689cdf90efe28bef0286ad9888125acfdd1fed2dee3e05e79a0aeb7f9ec1809bd128cf8a20
diff --git a/dev-lang/mono/files/mono-5.0.1.1-x86_32.patch b/dev-lang/mono/files/mono-5.0.1.1-x86_32.patch
new file mode 100644
index 000000000000..08d443a22038
--- /dev/null
+++ b/dev-lang/mono/files/mono-5.0.1.1-x86_32.patch
@@ -0,0 +1,21 @@
+Native toolchain can default to different ABI (amd64 in bug case).
+Set target to i386.
+https://bugs.gentoo.org/600664
+diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
+index 0656a57..690c96b 100644
+--- a/mono/mini/aot-compiler.c
++++ b/mono/mini/aot-compiler.c
+@@ -9926,4 +9926,6 @@ compile_asm (MonoAotCompile *acfg)
+ #ifdef TARGET_WIN32_MSVC
+ #define AS_OPTIONS "-c -x assembler"
++#elif defined(TARGET_X86) && !defined(TARGET_MACH)
++#define AS_OPTIONS "--32"
+ #elif defined(TARGET_AMD64) && !defined(TARGET_MACH)
+ #define AS_OPTIONS "--64"
+@@ -9981,4 +9983,6 @@ compile_asm (MonoAotCompile *acfg)
+ #elif defined(TARGET_POWERPC64)
+ #define LD_OPTIONS "-m elf64ppc"
++#elif defined(TARGET_X86)
++#define LD_OPTIONS "-m elf_i386"
+ #endif
+ 
diff --git a/dev-lang/mono/mono-5.4.1.6.ebuild b/dev-lang/mono/mono-5.4.1.6.ebuild
new file mode 100644
index 000000000000..f25dd8d91380
--- /dev/null
+++ b/dev-lang/mono/mono-5.4.1.6.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils linux-info mono-env flag-o-matic pax-utils versionator multilib-minimal
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.mono-project.com/Main_Page"
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64"
+
+IUSE="nls minimal pax_kernel xen doc"
+
+COMMONDEPEND="
+	!minimal? ( >=dev-dotnet/libgdiplus-2.10 )
+	ia64? ( sys-libs/libunwind )
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${COMMONDEPEND}
+	|| ( www-client/links www-client/lynx )
+"
+DEPEND="${COMMONDEPEND}
+	sys-devel/bc
+	virtual/yacc
+	pax_kernel? ( sys-apps/elfix )
+	dev-util/cmake
+	!dev-lang/mono-basic
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.1.1-x86_32.patch
+)
+
+#S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	if use kernel_linux; then
+		if linux_config_exists; then
+			linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel"
+		else
+			# https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
+			ewarn "kernel config not found"
+			ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
+			ewarn "See https://bugs.gentoo.org/261869 for more info."
+		fi
+	fi
+}
+
+pkg_setup() {
+	mono-env_pkg_setup
+}
+
+src_prepare() {
+	# we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
+	# get killed in the build proces when MPROTECT is enable. #286280
+	# RANDMMAP kill the build proces to #347365
+	# use paxmark.sh to get PT/XT logic #532244
+	if use pax_kernel ; then
+		ewarn "We are disabling MPROTECT on the mono binary."
+
+		# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
+		sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
+	fi
+
+	# mono build system can fail otherwise
+	strip-flags
+
+	#TODO: resolve problem with newer binutils
+	#bug: https://bugs.gentoo.org/show_bug.cgi?id=600664
+	#append-flags -fPIC
+
+	default
+	# PATCHES contains configure.ac patch
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-silent-rules
+		$(use_with xen xen_opt)
+		--without-ikvm-native
+		--disable-dtrace
+		$(use_with doc mcs-docs)
+		$(use_enable nls)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	cd mcs/tests || die
+	emake check
+}
+
+multilib_src_install() {
+	default_src_install
+
+	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
+	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
+	# for reference.
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
+}
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 600eb1393a5b..4a8050370bd8 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -11,7 +11,7 @@ DIST ruby-patches-2.3.6.tar.bz2 3030 BLAKE2B 7c1e80ff0569a03672f53820c665933056b
 DIST ruby-patches-2.4.2.tar.bz2 3443 BLAKE2B d90cfb496ad8701fccb061fd314a7f2394b251c921f270f17c8335f617e71dacc8e4a2df4e76842b67eb34627e5f5291d8a2723f6dfed53a36ace3abad95a179 SHA512 fb8349c67c72caf10ec12c4b5410194b4df24345446c2e3b6c6176d00727bfe803f4a905ef094a2d52315b6f4c3ce74fb8fbaa2fdf5efe46e6ccb24bf8418b17
 DIST ruby-patches-2.4.3.tar.bz2 2898 BLAKE2B e46502dbb0aa25c3d71693a6c04b433bd4de60f194cdd283517c4b08da190356885d9bca4a6765402088185fa8ec681156e8e8eecf0703a2c1ea7bb81adc0bf9 SHA512 d767d43c7df737469247e42e1c4205b8c6850c8f335a2869c884f145c037e9bab10492cc7cd2903f5c33e232cdc5bbdabb3e8da837c7bf420b9d58d1d33149ed
 EBUILD ruby-2.2.8.ebuild 6914 BLAKE2B 7c2786f023183c10e863890e9fac82228985d67bdde66546df59079c8a5c7b053b02e909ea5f6c0efc86df37c1d5ba000caa0a1c49cb260ed41291764f556aaa SHA512 2b5ab88539f49a91f4876598a910bfd80eb1789e738aa5c25489e12d9f7acefece189681c4600dd378da79049ae3712b0e90e2ec414163ef99333e54a0b5da68
-EBUILD ruby-2.2.9.ebuild 6921 BLAKE2B f825fbdf6356a4fe02a231e67960dc67a1f92c6ae09cbf3803dac240848789c2c473b7e1841cac7c512441f6c948777e4b7d2b3888983a2e382a1c5ae70ce805 SHA512 1d5dd94578e771168856f2b8b7d0aec6f39a4ba2868dc57b0e8e65aec64a8f25da5a3957808517a5112ba6191ae159da4f44a41e4191aeee493a4872f1ff5ee2
+EBUILD ruby-2.2.9.ebuild 6919 BLAKE2B 726849417e9b193bd8a44d588609144b98a5ab1714d174300bae5b0a99ca366286f6a5027382773b1c5154a360e1649207b8faa28913cc5394ed024c553c0580 SHA512 33995d4093b6f637800c21d0d0838292a17b12e5a9e93ad0e8e8f01fae5ddfeb253fa0903124f256fd46af357e5ed750e294adcfd6b379762ff6b55588f3a3a8
 EBUILD ruby-2.3.5.ebuild 6877 BLAKE2B 5d55fe0c3bd56afed1c040fba22f7ead461ef5c55edb43bf1d7a435db24921434f1a2a7d48f473d2bdc3d56f714ffbc3c0c3de24855f1b8aee10b0e3266b89f0 SHA512 059ec424075082c9809a0951dec55e38b9861124632b10167ed696081ed2402c14a7575dfb9a62152529957f768f69f6bf6424d70a85e5b6d3374884ea86d1fc
 EBUILD ruby-2.3.6.ebuild 6877 BLAKE2B 5d55fe0c3bd56afed1c040fba22f7ead461ef5c55edb43bf1d7a435db24921434f1a2a7d48f473d2bdc3d56f714ffbc3c0c3de24855f1b8aee10b0e3266b89f0 SHA512 059ec424075082c9809a0951dec55e38b9861124632b10167ed696081ed2402c14a7575dfb9a62152529957f768f69f6bf6424d70a85e5b6d3374884ea86d1fc
 EBUILD ruby-2.4.2.ebuild 6978 BLAKE2B 0262a40a78def3c9a83931573282cd2da8aa3ebeff7cdd8d36c3064a75cac1ef2d4196c0e7dc814d3f33473af17bc343ed77ecb7e807aa1848d826dcc0a1b6d1 SHA512 c6f48c8357e5248046ec8e811d6e96c57c073d5494cefded64baf1b5c177bc9e7a4a5e545b3ca5e977bd648066b568b1f5c9df59387540f2a145159e75f09795
diff --git a/dev-lang/ruby/ruby-2.2.9.ebuild b/dev-lang/ruby/ruby-2.2.9.ebuild
index 51528d63a211..15c6fa65de97 100644
--- a/dev-lang/ruby/ruby-2.2.9.ebuild
+++ b/dev-lang/ruby/ruby-2.2.9.ebuild
@@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
 		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
 
 RDEPEND="
diff --git a/dev-lang/solidity/Manifest b/dev-lang/solidity/Manifest
index c37ddcb291a8..b61ff514f917 100644
--- a/dev-lang/solidity/Manifest
+++ b/dev-lang/solidity/Manifest
@@ -1,4 +1,4 @@
-AUX solidity-0.4.2-commit_hash.txt 9 BLAKE2B 34c6552f84854047ae6aea393db49418cbbef86bc37a0a3c58e21a0b358f7b3177807bda8fd5b81af405fc34a55bdab52525ada3d21a014abf8bb6b9fe3c0800 SHA512 766569e9ffb283e6efbb81dc546502df8b294a445713392ae9717a845a014f3170c29448d3d7256256b4e467c7c6ea9d9eba45c83ec68c7798a2c67d1cab3033
-DIST solidity-0.4.2.tar.gz 495039 BLAKE2B ee09fc457d64727468eedb3d9150ad123f8e7cbfe80a71de0a730f43bd3b0b71f2ceb01ba189b542e273cfe4c1bccef3f0e0c5077512992c058729f52fded015 SHA512 2ef2e58775e22eefce867ee73dbab61f54def1edd95e089ec3a388b5aaba316c44fe18b92d45e070014b9df6e450b2b27fe78434f5db40f0476c505b2541572c
-EBUILD solidity-0.4.2.ebuild 1023 BLAKE2B 69544d30dcde700079bf1e5a143ecc95e0650f49cee7c7a7a40f9d285530ef0f678d10d644f981552cfb374eb4078749ae28a2faa330e6f4712c9074370490fb SHA512 cd7095e9f5c54d3ef42b568ebe019ef337ac64e52f4d6b6041548d964ce39384ed4cdbdb3d3c58f4a061f87dbeb6e1966b7052431ec95a1bd6bc86f619024e6e
+AUX solidity-0.4.18-fix-cmake-external-jsoncpp.diff 378 BLAKE2B 00e8ae9719e3d7faaf22ff806793ccd47222e4eee34e8528327396dbeb0333a723e5a8959513f980c11a8d7d5fab57fe07a06226b3ec398c201911db65e1bf60 SHA512 44b76b9dd9a1cd37c4fcf39d7aa585873ed9b394d54b0d862b6909dbe905d2202e1d2a9ef0e84e959931b0805d6f049c6567ad424f9561229803768ceafad4ff
+DIST solidity-0.4.18.tar.gz 1005571 BLAKE2B b7748f1e9ceb260ee5c02a5e6ddb7a3387a6f1df252889258045cf03e3cab365f1ac41c7e75805a49b71beceb88439855c53b6c59a81d610db48f9fe5256da55 SHA512 aa88060567a50fa833a81ef2c9ce9614ed0fddd9dc82c1546998dacd9a7cad1863882aa0700d830f80fe52bd91659a9fa07434af193624206876ba7224c34eb7
+EBUILD solidity-0.4.18.ebuild 766 BLAKE2B cbba8496a179b2f273efa677f82749ce0b6bca2e2e642c7d01579c9c59ae14233ee80e3ff017f35bb9257cd3f43bbe518d92e14ef7a2f7e76692ed10d52bd12e SHA512 a6a19af46537d59bf273e9a031250fc57d1f743296fd02416c9289921f201d0c98129714d2b6212fddc4bfa8be2f5ca102b77e190c06bb088266b17dad47a42f
 MISC metadata.xml 450 BLAKE2B 43358d0df6ec754300e4e95ef6cf3abd0702ab121cd70c58bc7808ee3d47346c5a42843ce895b1a9974bba8ed9716ba5256cd74a31343ac2fc29f4ef60196232 SHA512 8de6f5dadccb7020d6fbbd17a3800dd9a44e4b19f484e38799fd00b240fbd2a4d213454eb7cec2d99ab8ea7834fe5a0d3f792c62420870e55986b2978af9789d
diff --git a/dev-lang/solidity/files/solidity-0.4.18-fix-cmake-external-jsoncpp.diff b/dev-lang/solidity/files/solidity-0.4.18-fix-cmake-external-jsoncpp.diff
new file mode 100644
index 000000000000..1acafc9d9e36
--- /dev/null
+++ b/dev-lang/solidity/files/solidity-0.4.18-fix-cmake-external-jsoncpp.diff
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 24bea3b3..4326927b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,7 +18,9 @@ include(EthCcache)
+ 
+ # Let's find our dependencies
+ include(EthDependencies)
+-include(jsoncpp)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(JSONCPP jsoncpp)
++include_directories("${JSONCPP_INCLUDE_DIRS}")
+ 
+ find_package(Threads)
+ 
diff --git a/dev-lang/solidity/files/solidity-0.4.2-commit_hash.txt b/dev-lang/solidity/files/solidity-0.4.2-commit_hash.txt
deleted file mode 100644
index fd2779b63759..000000000000
--- a/dev-lang/solidity/files/solidity-0.4.2-commit_hash.txt
+++ /dev/null
@@ -1 +0,0 @@
-af6afb04
diff --git a/dev-lang/solidity/solidity-0.4.18.ebuild b/dev-lang/solidity/solidity-0.4.18.ebuild
new file mode 100644
index 000000000000..8a36d44a9092
--- /dev/null
+++ b/dev-lang/solidity/solidity-0.4.18.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="The Solidity Contract-Oriented Programming Language"
+HOMEPAGE="https://github.com/ethereum/solidity"
+SRC_URI="https://github.com/ethereum/${PN}/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="=dev-libs/jsoncpp-1.8.1:=
+	>=dev-libs/boost-1.54:=
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Upstream downloads and builds a static jsoncpp during build
+	"${FILESDIR}"/${P}-fix-cmake-external-jsoncpp.diff
+)
+
+src_configure() {
+	local mycmakeargs=(
+		"-DBoost_USE_STATIC_LIBS=off"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-lang/solidity/solidity-0.4.2.ebuild b/dev-lang/solidity/solidity-0.4.2.ebuild
deleted file mode 100644
index 7deebb0fb767..000000000000
--- a/dev-lang/solidity/solidity-0.4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="The Solidity Contract-Oriented Programming Language"
-HOMEPAGE="https://github.com/ethereum/solidity"
-SRC_URI="https://github.com/ethereum/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/jsoncpp:=
-	dev-libs/boost:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# The build won't work without this file but it is missing from
-	# the release tarball.
-	#
-	# Reported upstream: https://github.com/ethereum/solidity/issues/1183
-
-	cp "${FILESDIR}"/${P}-commit_hash.txt "${S}"/commit_hash.txt || die "Could not copy commit hash"
-
-	# Without this file the build is marked as a developer version
-	# but it is missing from the release tarball.
-	#
-	# Reported upstream: https://github.com/ethereum/solidity/issues/1183
-
-	touch "${S}"/prerelease.txt || die "Could not mark as release version"
-}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 956b0f8d27c5..b0a04dbbf3eb 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -1,13 +1,9 @@
 DIST vala-0.32.1.tar.xz 2759528 BLAKE2B cce23844ee5769216ef5cccb20476f4bdd2cb809a226236dd8a6bd533bb8ceb5b87add1d4d1c9eec60e0a94e64cafafcd1f46b2b2ae12fc951515fe8571e2195 SHA512 d59db1bd9132f93f187c30ccabff9d21fe8685293a6494e5b009d883de4f844cc4b8dc5d3b6eb4e026a93490f2e4ff7ba83ff22a093c6f8f85e68d83f5fe1bb0
 DIST vala-0.34.8.tar.xz 2778228 BLAKE2B ce48baeaa2ba88e09234c8a6e14c6aed60771476f4f2d25d1654ed07e0de78bb98f506fbf9f3990f13e2946ed541a0da2364a6fd1834c36e58c99e905afdf15b SHA512 03739173aa2b4e5d476037c77ac86543b97bd6eeb94f40dcce952da127e32baefa0dfa83f9d6e8ea254d4aee5ecd557964520926239bd119da72c771e30ece14
 DIST vala-0.34.9.tar.xz 2783952 BLAKE2B e90728075ac546e8abc125886182abd5fc357be5138bfea1ed058f41bf07968e55e032469cc068cefdb6a4d53f1c029ca7e728c57b00f6b9845e32c4410e8258 SHA512 8128dfbb50d0db2317feb4a358310de972ecb6f4dccaceb4d55cf3a024f4d83422e3137c92238e1a0a0b4766367ad307909a1310445017c71944ac30fc68d01f
-DIST vala-0.36.4.tar.xz 2846516 BLAKE2B 9b310457249ff0d75a76abcf7bcf3855bf0f75f3115883ab11ea04c4faf982fa3ddacc4245eacad7aebb62bbf1ef29f7866b6260d275b135c85ecba6173186d3 SHA512 cc804b9ad0bda4968660084c5d5e38761b0d478a6c504d3d2e6188fdd2deef4a4315d7278191f19b3bcbee66e0b02733deb6050d168305c85cef8f203ecc13ac
-DIST vala-0.36.5.tar.xz 2849320 BLAKE2B 5592ff226869ea4aacc8a485a6f1c7fcf62a81acce6039946b01179aa3529f8beb76a1d468cd373fb2b823e156f0cca8f6855b910166e607d0936e30fa6e1511 SHA512 1059fb52aa0d40fc04e8bc46a8cd54e1538554aa32e0e92e4a27779558fa1a9f460988d27667a613d958f3eb9dbe02fdac7e1632b91e8324bdfb5663e1cf0aac
 DIST vala-0.36.7.tar.xz 2854668 BLAKE2B 2fcb528b26a56ee9f9d362ec1891c873ee26580132c052554a3d021fea32c0cee6dc6e8c6419f88798f5066a70d54084757893b2d46e3b286b441a51a4169c92 SHA512 7a6daac5be72240ae998b2c26e240a8b6bbc44c8bb6a036357fc0419cd7b40e14ea76c8125eb49a8d252627425613512410ba7868eb579b13d299e2ff0f4082b
 EBUILD vala-0.32.1.ebuild 730 BLAKE2B 9450d1f91714a86dedd803aafcfbb5aa744416e3c65792b566975b654cd96c9537be76c72c40ce041c38c01a4733abd4859274f0f56c5895efb37297c168aff3 SHA512 398bbcbedcce2e1dabd2c86d0c770f78bd380833e117d07196872e732a7763213747996ef5a44a68d4bac52f0a30de6f4361620acfaf3e87b1278771d02cfbbd
 EBUILD vala-0.34.8.ebuild 730 BLAKE2B 4103e7fb4100c296d33f2d101a9abde439f055937a6198517626f2f2c2c1acf73dc4b495f23d71b4130ae561c1b1a5930b87aa3abd99f1d95b1c3d0ef02754ca SHA512 c8b77206bb700f239dd7900b2dcba92be66a817292945f5e4c497e60eff6560ab12236f5ade4ffa4d868f9292b709e782de16d3ee7b890d8fe4ce3ceafd062b8
 EBUILD vala-0.34.9.ebuild 731 BLAKE2B 5f1d0ac1a21508a558295e54b28cb0cd1eb18b092fc52ffd8b966d3155595db5887033f6c6b1cb331a08d287d4c9000e20b7db16cede029f6128adee98e1b1ca SHA512 736bf4f9b123e32cf76e95c3c41b1957ead6172b8578e57b80bdb9086cd49b1827d841f9d4e3728d890a0878808f2224c5128c7be5d8eaf114f708bb27e337e4
-EBUILD vala-0.36.4.ebuild 822 BLAKE2B 29abd8f141edf688132a4a71de0d52a5e4a523c7892592ba885e697c877e8e525738a4d4cedcb08e6e19ab5b471146db20cdba1f52366807f03a07558d234d86 SHA512 6071be0ef45009914e22d54f6f860f3f77ef1d7d5338d1743eac455863a26eaa2f7bb740e72bc84e4d8edd208f180001c58553a79acae9d17baee3e38f62f27a
-EBUILD vala-0.36.5.ebuild 822 BLAKE2B 29abd8f141edf688132a4a71de0d52a5e4a523c7892592ba885e697c877e8e525738a4d4cedcb08e6e19ab5b471146db20cdba1f52366807f03a07558d234d86 SHA512 6071be0ef45009914e22d54f6f860f3f77ef1d7d5338d1743eac455863a26eaa2f7bb740e72bc84e4d8edd208f180001c58553a79acae9d17baee3e38f62f27a
 EBUILD vala-0.36.7.ebuild 822 BLAKE2B 29abd8f141edf688132a4a71de0d52a5e4a523c7892592ba885e697c877e8e525738a4d4cedcb08e6e19ab5b471146db20cdba1f52366807f03a07558d234d86 SHA512 6071be0ef45009914e22d54f6f860f3f77ef1d7d5338d1743eac455863a26eaa2f7bb740e72bc84e4d8edd208f180001c58553a79acae9d17baee3e38f62f27a
 MISC metadata.xml 255 BLAKE2B 51dc9e0030d68ac68f075bb4a7b4c5f42122c16f354e10463d7338e652b272b26fa1eb12a144ed4a00d29a020af4df19029d909b4591162347184b1684402c94 SHA512 1970039db79f50391650a9fea933485c6102d1165946ab8efe9395403a02f49d4b17c2942795282469ac7c0306e7353002dcbaa797fb1060982b31ea3540b98b
diff --git a/dev-lang/vala/vala-0.36.4.ebuild b/dev-lang/vala/vala-0.36.4.ebuild
deleted file mode 100644
index 6b41e12db525..000000000000
--- a/dev-lang/vala/vala-0.36.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0.36"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/vala-common-${PV}
-"
-DEPEND="${RDEPEND}
-	!${CATEGORY}/${PN}:0
-	dev-libs/libxslt
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-	test? (
-		dev-libs/dbus-glib
-		>=dev-libs/glib-2.26:2
-		dev-libs/gobject-introspection )
-"
-
-src_configure() {
-	# weasyprint enables generation of PDF from HTML
-	gnome2_src_configure \
-		--disable-unversioned \
-		VALAC=: \
-		WEASYPRINT=:
-}
diff --git a/dev-lang/vala/vala-0.36.5.ebuild b/dev-lang/vala/vala-0.36.5.ebuild
deleted file mode 100644
index 6b41e12db525..000000000000
--- a/dev-lang/vala/vala-0.36.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0.36"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/vala-common-${PV}
-"
-DEPEND="${RDEPEND}
-	!${CATEGORY}/${PN}:0
-	dev-libs/libxslt
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-	test? (
-		dev-libs/dbus-glib
-		>=dev-libs/glib-2.26:2
-		dev-libs/gobject-introspection )
-"
-
-src_configure() {
-	# weasyprint enables generation of PDF from HTML
-	gnome2_src_configure \
-		--disable-unversioned \
-		VALAC=: \
-		WEASYPRINT=:
-}