gentoo resync : 02.03.2018

4 files changed, 6 insertions, 64 deletions

diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index c5b0d4ac1f6c..ae5c1a6fffbd 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -1,10 +1,7 @@
 DIST elixir-1.4.5.tar.gz 1829098 BLAKE2B bc8e2beafe53c3af507215d913558e295370ed8d3731c8b013f5d1cd2ad1d8a4fad4b3fe1a7ee3397470916f6f6687436ecbaa06c85c47f4b52aa0331b7dad23 SHA512 3fe659a739ded54bfc7d05a96acf3061c860e44cfd7700651d138c7e21997c5703cc62d2bd3b7a258b27064bb222dfdcdc01e4d017451f522f9658a039073611
-DIST elixir-1.5.3.tar.gz 1948057 BLAKE2B c52347284a2f8fd36fb2b189bef2d3f770dac7ce1ba294be69acaa528a94d3f0877319c2190abd32923f45d147d8b1430473a896687d13dfa1c924d1abdd2471 SHA512 b60c9af00e9bf34a19314ff9cbf9fd74a92f4aea41b24259340a1835acec9bec8a60325401a32b4393979ae264fbec0fb82d4ea08929b96f1ff633e6d694bbae
-DIST elixir-1.6.0.tar.gz 2064828 BLAKE2B 2844f8fe59708500cdb0b75e8f5850be2a2ef3740bbb7203aaaceba690426e542e080773c28ad1057739b4aef701a5916e0169f0f2e9dbee343163f6dfcc8c06 SHA512 5af84c134fac299dd723e94219fbb354743a1c75d6f9c21b3976300f6f2c038da1664688c5e024a0b6ef1f7e22f7f2226ea75d190aa3a8e18bd20d1f5d3b4633
 DIST elixir-1.6.1.tar.gz 2068820 BLAKE2B 9bc993ca8b74b704c9009f6e9719a1f57e2da903bb672db11b3b2872a9219dc6d605b3b178da5487e6a08e1c7333451c96501a92f8cd513696686ce6859f3a1a SHA512 db7d3c8b2561e70e0efc44a6ec05428cc085f35d294845546cecb8f7a3c8e63008c666ca14191238728da725e98820315cf2b6abcb7ffdec640fe305926c53ec
+DIST elixir-1.6.2.tar.gz 2072469 BLAKE2B a8feb80abe02192a1a9ece2f87a8aacca090d49c72223d9c14054914bb823a447dc42b334d110272c3a2fce8fa5381651f2391e3abbc623acc1c01c8a1e8f91a SHA512 de94d90b3fa192d572a3adb83207003d353c494943ca96446e0bcf351480a4e8871c976e6decc6b28f0327a6b64cc5ff128085bea3121ad038378c798aa18bdb
 EBUILD elixir-1.4.5.ebuild 610 BLAKE2B da40f0452c6571e8c72f1dc85e845ffced68579db1903479d4df21d20447d3d800ebd69ad75da3675213feee30d0438fa868a377d6cba94b365bac14adbd6132 SHA512 a05d132efcde374b0772b17a92cd13ffb78ab4a8d72c4b33c9cee3ab1312df0d1c7621627042895594ab563f75161f55f0382a348867254be4b3706440f77c17
-EBUILD elixir-1.5.3.ebuild 650 BLAKE2B 0762ba60b4d3ed8462ac30e17fd5facd652be783807c4591d9d5c9f04c54ebe2d3c79b40abd6458f54f5283db0799b936b8d23fef83138634964d560d62bca0c SHA512 56ce6f6ac4e9ead557327f04e60bc18508135855e81e4cb3ea7144653ea9b8027680f5d4ac396dd93f7a905f905e58ff4c51d9640c7860420bfc2a1d7c129138
-EBUILD elixir-1.6.0.ebuild 660 BLAKE2B 2fde12adc796557867462d3c11a35b7e38262210fda5159774484440c0c2214eb0f6623f863d832f6be0912a21c32ed12daaedc811b3ab3e14844bc06042e386 SHA512 c0f38c37fdbe6b3275e7305113abaed5c3c2abb48d8c403848a2a55cd4fc27ca89f15e30ed3a3b4fc9ad568bacf889b04b441b435c0a705714a5a2fe73068365
 EBUILD elixir-1.6.1-r1.ebuild 742 BLAKE2B 017a3956c75e57c612a3f3b2836536da678bc189a95092117aee9bc0602df9e1df26c1ddd8f8ac6a95a354c45b4f6511963add65f83e38efcb486699aa978a37 SHA512 fc902f86e10586266e825fb6eb508389d936470377161c19e45ea0e90287c36c53642db605d8e1241b329e47cc487975c2809484ffc87d3f11e29d15a2685824
-EBUILD elixir-1.6.1.ebuild 660 BLAKE2B 2fde12adc796557867462d3c11a35b7e38262210fda5159774484440c0c2214eb0f6623f863d832f6be0912a21c32ed12daaedc811b3ab3e14844bc06042e386 SHA512 c0f38c37fdbe6b3275e7305113abaed5c3c2abb48d8c403848a2a55cd4fc27ca89f15e30ed3a3b4fc9ad568bacf889b04b441b435c0a705714a5a2fe73068365
+EBUILD elixir-1.6.2.ebuild 742 BLAKE2B 017a3956c75e57c612a3f3b2836536da678bc189a95092117aee9bc0602df9e1df26c1ddd8f8ac6a95a354c45b4f6511963add65f83e38efcb486699aa978a37 SHA512 fc902f86e10586266e825fb6eb508389d936470377161c19e45ea0e90287c36c53642db605d8e1241b329e47cc487975c2809484ffc87d3f11e29d15a2685824
 MISC metadata.xml 790 BLAKE2B 33e4a37225c8f5bd142c5cbbe097ad3330f6c5b1115f834c1c20613281bdc0afa0927734ec3b0a2b1da595980abeec2fcf2bb20e725f5701590d1c3629972910 SHA512 5489797d3771c405edb4c9883082f780279470d7821dbdd1a4790bcdc74c0e31327c8f15286dc421bfe426d7371d6be2819e707389f425101e2d0d0577475586
diff --git a/dev-lang/elixir/elixir-1.5.3.ebuild b/dev-lang/elixir/elixir-1.5.3.ebuild
deleted file mode 100644
index a08ea4e9f6a9..000000000000
--- a/dev-lang/elixir/elixir-1.5.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/elixir/elixir-1.6.1.ebuild b/dev-lang/elixir/elixir-1.6.1.ebuild
deleted file mode 100644
index 123447139076..000000000000
--- a/dev-lang/elixir/elixir-1.6.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 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="${EPREFIX}/usr" install
-	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
-}
diff --git a/dev-lang/elixir/elixir-1.6.0.ebuild b/dev-lang/elixir/elixir-1.6.2.ebuild
index 123447139076..844bd80c8914 100644
--- a/dev-lang/elixir/elixir-1.6.0.ebuild
+++ b/dev-lang/elixir/elixir-1.6.2.ebuild
@@ -15,7 +15,10 @@ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=dev-lang/erlang-18[ssl]"
-RDEPEND="${DEPEND}"
+# 'mix' tool collides with sci-biology/phylip, bug #537514
+RDEPEND="${DEPEND}
+	!!sci-biology/phylip
+"
 
 RESTRICT=test # needs debug symbols