diff --git a/app-admin/localepurge/metadata.xml b/app-admin/localepurge/metadata.xml
index 9b9ffeb6f5b4..779ea9e0804e 100644
--- a/app-admin/localepurge/metadata.xml
+++ b/app-admin/localepurge/metadata.xml
@@ -1,15 +1,7 @@
-
- wimmuskee@gmail.com
- Wim Muskee
- Proxied maintainer; set to assignee in all bugs
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
Just a simple tool to erase all uneeded locale and man files
usually generated for USE="nls"
diff --git a/app-admin/logstalgia/Manifest b/app-admin/logstalgia/Manifest
index ffb9abacbda2..e7854034a502 100644
--- a/app-admin/logstalgia/Manifest
+++ b/app-admin/logstalgia/Manifest
@@ -1,2 +1 @@
-DIST logstalgia-1.0.3.tar.gz 841822 SHA256 d3338a9fffb9b60ecb90986c81f27a09a18fa8627b5b884a79c70fee7f6461eb SHA512 ca7b0fbb3341d6561a980e1daa42e20a4f307a794c96f02a3530e5b9d8ae19ae1d9acce127bf0aad59547f1cff3e5a6425ae3558c973f67b9d68c4151e31679b WHIRLPOOL 0729b4919c418670a99d2023acfaeafba4ad653796d22827cb5c6b4271183706b6c77c0ba638b53535c8c24786fef5989b8b2c7e78db62aeadc7a76c407c5cc5
-DIST logstalgia-1.0.6.tar.gz 902147 SHA256 a81b94742cce64b0b2d1b1683f2f7ac6d06456056f353896153b1b8181855f34 SHA512 9b264c65e412efc7cc8ae9a3b53c71bb769b52dfa759c7e9f84b41e55363b803bc776379658eab2c7975000766c26879f8bc3b33e436224113ae15c9846676a1 WHIRLPOOL 2797514fa648cbcd0516927a9c7a255997c5018f8d40b37207ffb4b21b67ff4aaf797d53b3bf8d94e9d8c749fe79706acdc70682e422a318f8a94c6bd13f752b
+DIST logstalgia-1.0.7.tar.gz 902050 SHA256 5553fd03fb7be564538fe56e871eac6e3caf56f40e8abc4602d2553964f8f0e1 SHA512 862950ec387e27d72fe127fcccd37d1e6a0ed8b77fb243c119ef8b48b5bc45092d1b6881b9afbc016969e80a427fa4e210aa5d35524baf191d0c4fad5f91e3a9 WHIRLPOOL 499afaa7dc95231a619bc69be3337463ea75784d23a435d862d6a587f4fbd7fd89fd4a5d821b6a7f14636c988e33fb1feb26e689736c1b0525283106e8dd5759
diff --git a/app-admin/logstalgia/logstalgia-1.0.3-r1.ebuild b/app-admin/logstalgia/logstalgia-1.0.3-r1.ebuild
deleted file mode 100644
index 3fcc54d82b03..000000000000
--- a/app-admin/logstalgia/logstalgia-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Replays or streams an access_log as a retro arcade game-like simulation"
-HOMEPAGE="http://logstalgia.io/"
-SRC_URI="https://logstalgia.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/libpcre
- media-libs/libsdl[opengl]
- media-libs/libpng:0=
- media-libs/sdl-image
- media-libs/ftgl
- virtual/jpeg
- virtual/glu
- virtual/opengl"
-DEPEND="${DEPEND}
- virtual/pkgconfig"
-
-DOCS=( ChangeLog INSTALL README THANKS )
diff --git a/app-admin/logstalgia/logstalgia-1.0.6.ebuild b/app-admin/logstalgia/logstalgia-1.0.7.ebuild
similarity index 84%
rename from app-admin/logstalgia/logstalgia-1.0.6.ebuild
rename to app-admin/logstalgia/logstalgia-1.0.7.ebuild
index 5f9fc439efd5..91fcf17890cc 100644
--- a/app-admin/logstalgia/logstalgia-1.0.6.ebuild
+++ b/app-admin/logstalgia/logstalgia-1.0.7.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-
-inherit eutils
+EAPI=6
DESCRIPTION="Replays or streams an access_log as a retro arcade game-like simulation"
HOMEPAGE="http://logstalgia.io/"
@@ -21,13 +19,9 @@ RDEPEND="dev-libs/libpcre
media-libs/sdl2-image[jpeg,png]
virtual/glu
virtual/opengl"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
dev-libs/boost
media-libs/glm
virtual/pkgconfig"
DOCS=( ChangeLog INSTALL README THANKS )
-
-src_prepare() {
- epatch_user
-}
diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index dccd920673fa..69b898dbd420 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -1,6 +1,2 @@
-DIST mcollective-2.10.1.tar.gz 1509293 SHA256 b47662b8ab3f150df6153f18c453bad049d8baf0cc8b5589436ae411258492fc SHA512 907bc4bb8527053f0813d19fd9a2fd19701af364d45385356772b09f3db50fd8c4d8e4e53ad9c3ad7c53c78bed52fcfec2354505272302c770c9cfea553309c5 WHIRLPOOL 4e283c42ae8f4161a47e95e1fc223d47fed3bc5308df09b3bd43a7b7d90e1927c2a6067faa872404e261f7e4597e900b7c994266587e8a73c53420d90614b6c6
-DIST mcollective-2.10.3.tar.gz 1509914 SHA256 1de8531a286754a5490b1acd18565bbb6aace1720743c9d7503ef8b587de1c79 SHA512 ee053fa4cb38b1f8d5b5a91c4a6980095039210443b4dc6a5468f1dcba9749152e5feeaeb437660d65e118f8d7a99f7f5082f4c83f4260dfb4ac9d6c007ce638 WHIRLPOOL 75b5111c9593c832af1f96fa5200d5c2300eed99ff8c03c579520a69f88afee34afe37f7d8362f72f46f6e591595ea68433d01960453292766afb0441bad7d2f
DIST mcollective-2.10.5.tar.gz 1510725 SHA256 7da307010c40bdd1e2104f94e6e4ee1f53bd6dfde54a0aa3950cc558a3468d8f SHA512 51cf6ee018f36ae9d223c7afe79b08ede9dee8bbc78a8d9e8d48399b0f26b264b3fedb459f82713fbabd4a015f5376e983363997e223b3a0bc0e4bec6bbd1e82 WHIRLPOOL 56bb3a954421c672cf39061ffec3425ef5d576a8e6f7e829c16747030bbeb618c57292f9a95077e0acc9de581439843b115538cb27d23208abe3d4656d702bad
-DIST mcollective-2.11.0.tar.gz 1516290 SHA256 0046465f7ef4544aa250887afb9a0eef08d1939098bcfbd43feeead99185a6fc SHA512 ba59b1a86c11a34cea2d5492782f34b34c4b58034b3a9df84b822f299f4024a13e1a3137af9a43df2211cccb81f58c782ac2d410f5c7905da50a649b391fa74e WHIRLPOOL c6c588ce86370cea3395e27bf52aaa6c0697294496ea5a500b8940cc795c863fbed8e0b5c085759b5787f1145d7083570b34dde2e47b3c75137036e53d52f277
DIST mcollective-2.11.1.tar.gz 1516922 SHA256 d5e150408e61d51b3844e14c6304cf61f27243c5dc658e689bbaaee91dce6b0b SHA512 88d2511829936a5987c8ddab068f59d17f16230cb339801672238ae54ce2115e93d7271a78001176ccc203a1b70f7ee2f35992e414059f1db9cb05db210463e5 WHIRLPOOL cff40347c46464a18d6d98e3a3e2a7dab4169f5c0e1b60f08f3292cc87adcc123fc423203d664bcee1dac47a1dd44e44726702de5c2ea0ed0c5e55d8dbe0b45a
-DIST mcollective-2.9.1.tar.gz 1504607 SHA256 89bc9fbd72846b22220074a57d19bbfac56473649078fc3ac8182cc728159249 SHA512 29fedacb61084e1952afd3b9deb302abde3e763d13630d85dc70f78b0853f5b353fb44ccbd00e48e5864d04bf2c7568d7cbe21b06af31e1da72e52aeef3c04cf WHIRLPOOL 8affee96fa344d12b34b5a4e120029ab315133df6fd6cd456d840ab608ceb2027b9411a6a1a74bc5b9d0b029968255a926de888b7a2a1183d1c7aed195f65f7a
diff --git a/app-admin/mcollective/mcollective-2.10.1.ebuild b/app-admin/mcollective/mcollective-2.10.1.ebuild
deleted file mode 100644
index ec955b142317..000000000000
--- a/app-admin/mcollective/mcollective-2.10.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-inherit ruby-ng
-
-DESCRIPTION="Framework to build server orchestration or parallel job execution
-systems"
-HOMEPAGE="http://marionette-collective.org/"
-SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/all/marionette-collective-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc +client"
-
-DEPEND=""
-RDEPEND="dev-ruby/stomp"
-
-src_compile() {
- einfo "nothing to compile"
-}
-
-each_ruby_install() {
- cd "marionette-collective-${PV}"
- doruby -r lib/*
- insinto /usr/share/mcollective
- use client && dosbin bin/mco
- dosbin bin/mcollectived
- if use doc ; then
- dohtml -r doc/*
- insinto /usr/share/doc/${P}/ext
- doins -r ext/*
- fi
- newinitd "${FILESDIR}"/mcollectived.initd mcollectived
- insinto /etc/mcollective
- cd etc
- for cfg in *.dist ; do
- newins "${cfg}" "${cfg%%.dist}"
- sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
- "${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
- done
- insinto /etc/mcollective/plugin.d
-}
-
-pkg_postinst() {
- einfo "Mcollective requires a stomp server installed and functioning before"
- einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
- einfo "any other stomp compatible server should work."
- einfo
- einfo "It is recommended you read the \'getting started\' guide [2] if this"
- einfo "is a new installation"
- einfo
- einfo "[1] http://activemq.apache.org/"
- einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
-}
diff --git a/app-admin/mcollective/mcollective-2.10.3.ebuild b/app-admin/mcollective/mcollective-2.10.3.ebuild
deleted file mode 100644
index ec955b142317..000000000000
--- a/app-admin/mcollective/mcollective-2.10.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-inherit ruby-ng
-
-DESCRIPTION="Framework to build server orchestration or parallel job execution
-systems"
-HOMEPAGE="http://marionette-collective.org/"
-SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/all/marionette-collective-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc +client"
-
-DEPEND=""
-RDEPEND="dev-ruby/stomp"
-
-src_compile() {
- einfo "nothing to compile"
-}
-
-each_ruby_install() {
- cd "marionette-collective-${PV}"
- doruby -r lib/*
- insinto /usr/share/mcollective
- use client && dosbin bin/mco
- dosbin bin/mcollectived
- if use doc ; then
- dohtml -r doc/*
- insinto /usr/share/doc/${P}/ext
- doins -r ext/*
- fi
- newinitd "${FILESDIR}"/mcollectived.initd mcollectived
- insinto /etc/mcollective
- cd etc
- for cfg in *.dist ; do
- newins "${cfg}" "${cfg%%.dist}"
- sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
- "${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
- done
- insinto /etc/mcollective/plugin.d
-}
-
-pkg_postinst() {
- einfo "Mcollective requires a stomp server installed and functioning before"
- einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
- einfo "any other stomp compatible server should work."
- einfo
- einfo "It is recommended you read the \'getting started\' guide [2] if this"
- einfo "is a new installation"
- einfo
- einfo "[1] http://activemq.apache.org/"
- einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
-}
diff --git a/app-admin/mcollective/mcollective-2.10.5.ebuild b/app-admin/mcollective/mcollective-2.10.5.ebuild
index 975f85e142ee..ec955b142317 100644
--- a/app-admin/mcollective/mcollective-2.10.5.ebuild
+++ b/app-admin/mcollective/mcollective-2.10.5.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/all/marionette-collective-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc +client"
DEPEND=""
diff --git a/app-admin/mcollective/mcollective-2.11.0.ebuild b/app-admin/mcollective/mcollective-2.11.0.ebuild
deleted file mode 100644
index 6afdfaded515..000000000000
--- a/app-admin/mcollective/mcollective-2.11.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-inherit ruby-ng
-
-DESCRIPTION="Framework to build server orchestration or parallel job execution
-systems"
-HOMEPAGE="http://marionette-collective.org/"
-SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/all/marionette-collective-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc +client"
-
-DEPEND=""
-RDEPEND="dev-ruby/stomp"
-
-src_compile() {
- einfo "nothing to compile"
-}
-
-each_ruby_install() {
- cd "marionette-collective-${PV}"
- doruby -r lib/*
- insinto /usr/share/mcollective
- use client && dosbin bin/mco
- dosbin bin/mcollectived
- if use doc ; then
- dohtml -r doc/*
- insinto /usr/share/doc/${P}/ext
- doins -r ext/*
- fi
- newinitd "${FILESDIR}"/mcollectived.initd mcollectived
- insinto /etc/mcollective
- cd etc
- for cfg in *.dist ; do
- newins "${cfg}" "${cfg%%.dist}"
- sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
- "${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
- done
- insinto /etc/mcollective/plugin.d
-}
-
-pkg_postinst() {
- einfo "Mcollective requires a stomp server installed and functioning before"
- einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
- einfo "any other stomp compatible server should work."
- einfo
- einfo "It is recommended you read the \'getting started\' guide [2] if this"
- einfo "is a new installation"
- einfo
- einfo "[1] http://activemq.apache.org/"
- einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
-}
diff --git a/app-admin/mcollective/mcollective-2.11.1.ebuild b/app-admin/mcollective/mcollective-2.11.1.ebuild
index 67a7aed01371..4caa041bf9c9 100644
--- a/app-admin/mcollective/mcollective-2.11.1.ebuild
+++ b/app-admin/mcollective/mcollective-2.11.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/all/marionette-collective-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc +client"
DEPEND=""
diff --git a/app-admin/mcollective/mcollective-2.9.1.ebuild b/app-admin/mcollective/mcollective-2.9.1.ebuild
deleted file mode 100644
index 7c46ea108b52..000000000000
--- a/app-admin/mcollective/mcollective-2.9.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-inherit ruby-ng
-
-DESCRIPTION="Framework to build server orchestration or parallel job execution
-systems"
-HOMEPAGE="http://marionette-collective.org/"
-SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/all/marionette-collective-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc +client"
-
-DEPEND=""
-RDEPEND="dev-ruby/stomp"
-
-src_compile() {
- einfo "nothing to compile"
-}
-
-each_ruby_install() {
- cd "marionette-collective-${PV}"
- doruby -r lib/*
- insinto /usr/share/mcollective
- use client && dosbin bin/mco
- dosbin bin/mcollectived
- if use doc ; then
- dohtml -r doc/*
- insinto /usr/share/doc/${P}/ext
- doins -r ext/*
- fi
- newinitd "${FILESDIR}"/mcollectived.initd mcollectived
- insinto /etc/mcollective
- cd etc
- for cfg in *.dist ; do
- newins "${cfg}" "${cfg%%.dist}"
- sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
- "${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
- done
- insinto /etc/mcollective/plugin.d
-}
-
-pkg_postinst() {
- einfo "Mcollective requires a stomp server installed and functioning before"
- einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
- einfo "any other stomp compatible server should work."
- einfo
- einfo "It is recommended you read the \'getting started\' guide [2] if this"
- einfo "is a new installation"
- einfo
- einfo "[1] http://activemq.apache.org/"
- einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
-}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index ac33995fa949..fa67c17a5bf7 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -2,5 +2,9 @@ DIST puppet-agent_1.10.1-1xenial_amd64.deb 16276180 SHA256 e0dc22258c2f23302ed2f
DIST puppet-agent_1.10.1-1xenial_i386.deb 16205078 SHA256 22cdd5e41c82e63ae038f4c96ed8f19218f3eda600f1f6149eca9b1e7b60a560 SHA512 be310ae8db1bf1670b480a382866feb2fc247e69f0a4c26aac2b8f67f1b43984b581809ccfc1e0182fe71895aca8dadf20f6ff7b99506e84b787a62555e547c3 WHIRLPOOL 50563a4a85200e675d408e8a5618763821e7bf408f65172dadcf1b33ba3f4b9930bfaece3a21d744a8df513f9b91cce1f9ed45d770b1e9601e0d84642755e3b7
DIST puppet-agent_1.10.4-1xenial_amd64.deb 16157840 SHA256 4e6ec3496e9d30b06b2064f066465ae268765760c0251390292e1fe2c0b5120e SHA512 25c1be6ebfdd2b2c9f8d10347c681af1cb7265b6d95f7e573f31c4b580bf5df046945cdf9d87841d792233b7227db0c46ae348bf6e6ff18b44f6f746794a3627 WHIRLPOOL 7fd01b43f627647960ee588eb20a8a8d35223e711d295f83a283d13d896bb93c251f51a20f082bdcb8830f4508ba28cdf7c0cd4d8e73e3f3c5cd15fd8ac8d071
DIST puppet-agent_1.10.4-1xenial_i386.deb 16053584 SHA256 ef42df8facaffb47bd926842886b988276111b67a887619873d146c0dee8f55c SHA512 b2e519b2a24f40a8d099b2fa8690a706d9105693affad70e6f38c3b4cc3539044bc805462c45b828147349bfbdc04859e8563fca2588e3fb538de3798df8f262 WHIRLPOOL 51e5faed153d8aa8ee4b1acadc66f8be5e60534faad28cdf37504e91bdbd60441859cb00e2a8746c96c22cd88de3c58c8e188b2abc699758e0c3a02f01d480e8
+DIST puppet-agent_1.10.5-1xenial_amd64.deb 16457578 SHA256 70bdc6be278a5b9734054063379bbf09627e2446af59a9a41cb655bda94c9460 SHA512 4c527a8dd69a2de24ed374024b225f98b481beed3a829649a0db34de9f2f846442a84a4ff5bdb9c4cdda3540f4139c647510504baa7326140cb86d47d2117281 WHIRLPOOL e759d0df31d741556c7e0b42606dee441291bbf3fc7fbf673685449eb9022332ff5b842529177d0d73ebdcfc772af303f71b45a039c0e69e7ca8eae8a2553a97
+DIST puppet-agent_1.10.5-1xenial_i386.deb 16130300 SHA256 064867c3e9a9e4ab0ffdee9a9ae1a4a1c651194662290e05d3fd936f8c092787 SHA512 0780edf969ca97a00a7720fa2573efba7298be887acbad5318cbb5b9914bd67adc31c305aa44f879d667c2e56419b3fa85fdee10e00386edb75dede673c4cbc4 WHIRLPOOL 7ee4d69748ed80f7693ae28b20a8a90699e74016dcbf8626f90b443ecc299546760d878bcdf1be2d08003f54c381cab6f1fd2673de5ca191842103a6ebdc9ca3
DIST puppet-agent_5.0.0-1xenial_amd64.deb 15120014 SHA256 b2983d7a01c056c306e5a5534a9059515b68ff5f72f05dab8a3751fee4276ce4 SHA512 b1255a8db15e6c922d7a102ad3541c496c4fac1cc484e763c6083bb09cbb93db5abf185ea0a39d13d6bee1b18ba53803691d024dbaa64431cda5e9517f3c3c6a WHIRLPOOL 6c36343e5ee50941bab714d0ea8d7b7e7236c78c7f51ede2672b9fe7c883a897fe303d063dce37e411f9b4e89222f7affb38579f72b31ae0d2aa0e2c102be639
DIST puppet-agent_5.0.0-1xenial_i386.deb 15619584 SHA256 820367b49827855f19d3094d156184c8da2958e00e7dda4a3da37bbac7696cf5 SHA512 9264b1143189c620cbf9dc7ff0b67939427c732c6bf27941a214066dcf88ed6570641a122f243774d01524607361129a777e50fa7b97addf15e9966d7701dee2 WHIRLPOOL 1cafcce45fb1072b8c4ba49192c0bd8da7a7cf60542530626468e12bb11f09fc7568b761403d1f03725c368e73209c0be00c07e5a5a007e9d653ef2e7cd32c41
+DIST puppet-agent_5.0.1-1xenial_amd64.deb 15171814 SHA256 44b67741a276256cbee8dfad72053d6be9a9b1e4aeea43cb80413d569129a2c0 SHA512 0dc388b2f561b2ddd7d9064188298de212648c31bbf0e70e15f20de9c851a2efba1f648e38b593c6f0e8f027f7161d50051e1039dda1a1abbaed1b90c8e9a72c WHIRLPOOL b40844b6b873e4dfa63d90ee0f17a08b7f2d4862c9353d2fbb6590fa6387071f3b414a5063407ab75ee04c1f2f8e14186197cbc7be3bd617ee640f2283b596ab
+DIST puppet-agent_5.0.1-1xenial_i386.deb 15591958 SHA256 d302ae9543812ef64252f04ef031ae2c46929c6950c8356e5e1d23526e47d24f SHA512 e7da74e534993c896ce79a27667717adecd8cbcb6002335210c0a29ca5002f58e03528d9da820908a0ed76c9a02f70b3bad7f82cdfa63eebc28aae01f7aaeee5 WHIRLPOOL c8061395adfd91b49e36975a971b36679bc0600e8df56e04902828c41b5389792161df83d00bbec4c4440f97fb1815bd4740635c457c66bc1326c37ea458dbcb
diff --git a/app-admin/puppet-agent/puppet-agent-1.10.5.ebuild b/app-admin/puppet-agent/puppet-agent-1.10.5.ebuild
new file mode 100644
index 000000000000..669892ac4a97
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-1.10.5.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
+SRC_URI="
+ amd64? ( ${SRC_BASE}_amd64.deb )
+ x86? ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+ !app-admin/mcollective
+ !app-admin/puppet
+ !dev-ruby/hiera
+ !dev-ruby/facter
+ !app-emulation/virt-what"
+
+DEPEND="
+ ${CDEPEND}"
+RDEPEND="${CDEPEND}
+ app-portage/eix
+ sys-apps/dmidecode
+ sys-libs/glibc
+ >=sys-libs/readline-6.0
+ =dev-ruby/puppetdb-termini-3.1.0 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+ /opt/puppetlabs/puppet
+ /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
+ /opt/puppetlabs/puppet/lib/engines/*
+ /opt/puppetlabs/puppet/lib/virt-what/*
+ /opt/puppetlabs/puppet/lib/*
+ /opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_prepare() {
+ if use experimental; then
+ epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
+ fi
+}
+
+src_install() {
+ # conf.d
+ doconfd etc/default/puppet
+ doconfd etc/default/mcollective
+ doconfd etc/default/pxp-agent
+ # logrotate.d
+ insinto /etc/logrotate.d
+ doins etc/logrotate.d/mcollective
+ doins etc/logrotate.d/pxp-agent
+ # puppet itself
+ insinto /etc/puppetlabs
+ doins -r etc/puppetlabs/*
+ # logdir for systemd
+ dodir var/log/puppetlabs/puppet/
+ fperms 0750 var/log/puppetlabs/puppet/
+ # the rest
+ insinto /opt
+ dodir opt/puppetlabs/puppet/cache
+ doins -r opt/*
+ fperms 0750 /opt/puppetlabs/puppet/cache
+ # init
+ newinitd "${FILESDIR}/puppet.initd" puppet
+ newinitd "${FILESDIR}/mcollective.initd" mcollective
+ systemd_dounit lib/systemd/system/puppet.service
+ systemd_dounit lib/systemd/system/mcollective.service
+ systemd_dounit lib/systemd/system/pxp-agent.service
+ systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+ # symlinks
+ chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+ chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+ dosym /opt/puppetlabs/bin/facter /usr/bin/facter
+ dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
+ dosym /opt/puppetlabs/bin/mco /usr/bin/mco
+ dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
+ dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+ dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+ dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+ dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+ dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
diff --git a/app-admin/puppet-agent/puppet-agent-5.0.1.ebuild b/app-admin/puppet-agent/puppet-agent-5.0.1.ebuild
new file mode 100644
index 000000000000..15f80df9e2b0
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-5.0.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/xenial/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
+SRC_URI="
+ amd64? ( ${SRC_BASE}_amd64.deb )
+ x86? ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+ !app-admin/mcollective
+ !app-admin/puppet
+ !dev-ruby/hiera
+ !dev-ruby/facter
+ !app-emulation/virt-what"
+
+DEPEND="
+ ${CDEPEND}"
+RDEPEND="${CDEPEND}
+ app-portage/eix
+ sys-apps/dmidecode
+ sys-libs/glibc
+ >=sys-libs/readline-6.0
+ =dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+ /opt/puppetlabs/puppet
+ /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
+ /opt/puppetlabs/puppet/lib/engines/*
+ /opt/puppetlabs/puppet/lib/virt-what/*
+ /opt/puppetlabs/puppet/lib/*
+ /opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+ # conf.d
+ doconfd etc/default/puppet
+ doconfd etc/default/mcollective
+ doconfd etc/default/pxp-agent
+ # logrotate.d
+ insinto /etc/logrotate.d
+ doins etc/logrotate.d/mcollective
+ doins etc/logrotate.d/pxp-agent
+ # puppet itself
+ insinto /etc/puppetlabs
+ doins -r etc/puppetlabs/*
+ # logdir for systemd
+ dodir var/log/puppetlabs/puppet/
+ fperms 0750 var/log/puppetlabs/puppet/
+ # the rest
+ insinto /opt
+ dodir opt/puppetlabs/puppet/cache
+ doins -r opt/*
+ fperms 0750 /opt/puppetlabs/puppet/cache
+ # init
+ newinitd "${FILESDIR}/puppet.initd" puppet
+ newinitd "${FILESDIR}/mcollective.initd" mcollective
+ systemd_dounit lib/systemd/system/puppet.service
+ systemd_dounit lib/systemd/system/mcollective.service
+ systemd_dounit lib/systemd/system/pxp-agent.service
+ systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+ # symlinks
+ chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+ chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+ dosym /opt/puppetlabs/bin/facter /usr/bin/facter
+ dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
+ dosym /opt/puppetlabs/bin/mco /usr/bin/mco
+ dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
+ dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+ dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+ dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+ dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+ dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 7472cff5a846..e926e79b4d2a 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,6 +1,8 @@
DIST puppet-3.8.7.tar.gz 2650247 SHA256 50460a3dd8d25118e25eb01178d09743dabc01cd185f6b2cc723bae21ff023c2 SHA512 f86568d4f33c8c18da270e089e1274ce2e3c705c116b078531bb66656f0bbb9a2fc95effbb8bf5355a082d4f32ce5b44e7f6e316937164aa0d71dd47e654c618 WHIRLPOOL 6e3b754f9e6f40c6037652dc7d746e616871a653640e2a91ab7dd3e70b4240c0b377d0f79c543ca95c5d661046c6431e30f263e0f18998cac0ca3089a4634273
DIST puppet-4.10.1.tar.gz 2954351 SHA256 271738d2b5aaec8faafd543076ac0d9012fcd6051bccd2f70a66cd479362c605 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032 WHIRLPOOL 1a5b8c3fc87fdb4e23196cc13ad46c963cdb6314cfc0e4d3a6d44adad4545289cf41886c6150ee14fcd0d30d9b29f32987c6e31a7c39077a2c53aac7147c69dd
DIST puppet-4.10.4.tar.gz 2968202 SHA256 59b8510ddf2f49342a39ccbe26bc7b2ea5e16d79de9dd572d929de58967aab90 SHA512 e7a47c95a30ccfe31ff6a245ce5df0e2aa1d6b1f07fd70623e40e1822c3df9322a87bcd6e624b4483c7b90756ef3ed34242aa9c6a880df57ff65918c4d31267f WHIRLPOOL f808cb84cebae7294f887fdb3ac0005b4129fca368cc58dcc0e558fa2dbd185b1f416ace96b7428ad7577fc3df45edf1fab0c150880d1205e0e3d1a9afcc7072
+DIST puppet-4.10.5.tar.gz 2976455 SHA256 656a64e158c1453087099096d035adae53263dae752d3bac3c8fe0250b3894d1 SHA512 655a89dc5605f722389fbccc3fdfe5304220a45678f6d087170ba77d70a4d8574f9d7d9aadfe331107dbf663dee8ef920775fafebe63d22e91c739402abd419a WHIRLPOOL 87d63967afd7ab7bcd3e4e5ae082fc989b52606c0432d20e9060836d3eecc8966745201c5b88092d1d2003809be2ed736d6e98a893593a30db81ebb88df21ec1
DIST puppet-4.8.1.tar.gz 2873371 SHA256 8b3ee6b60639e2a2839ad7403fab8f8ecc390a93e6e47b03f1b053aa262bcf17 SHA512 9ecde04c68874652b501e779764bb3227d226564e80f06c2c15bd982620529ec55f8e11911bcf68db994ee98287746761752538aa5aeee474ddf37f21976e2d1 WHIRLPOOL d3a4b0b4b15dceb75cb3f161b73843af53f5d21121ba1fb06fdae422ec458f62f5fa47d0f5c7bfb96e3e9b04eb62c4c1e1a97f7131101e4f6f4ff952127c0685
DIST puppet-4.9.1.tar.gz 2912770 SHA256 db02cffb8339b349bd1ab2b15899511d3f5d449f0f591038256f0fb862f4c7db SHA512 db2bd324e4f58c583debe417ca233c613c296aa8824520c5373c8da45056ae9d09e54ceecba5c6b7d0250ea7228d6e1b83e5b690b1203de43dca8942c8f24ce2 WHIRLPOOL fd5554d5de319f8534fbada7ae6f4100d6de5a98f6646985e21c250a52a3d415ac31fc46c15c987bd7bcbc688bc8bb4d7dc9d37ebd93ecd183b3bd01d3426687
DIST puppet-5.0.0.tar.gz 2706319 SHA256 09ae5b56ff799ccfd78e3a1999aa27d6f2bf69a7a5ed19bd758cf88c17a004ab SHA512 4423001340623d00a72de16e7b585ce3874019b020b91abd4edb9b9a524bd0d709107bee4dfcdf20b2eaf99e67b3401e2883ea297659ad1debfea8fb33a665bd WHIRLPOOL 66bbb279fb9d646ada78ce28af3d2377abf63ce059b9e61ee15fc0b3b48796ea0f708f5f2c380e5dd986d4469f6a8b73606c61dfc3280aca5913d9c7fffa4f2f
+DIST puppet-5.0.1.tar.gz 2715867 SHA256 ff80092c7bfde7198ec2cf776b8d0b8ba1c2c95be927a5cb5edae9f670038c4a SHA512 6038ce27f5144112bed080f0a33d0d866d4aac41b0e49436fb8a5a428ffd4c952b1e8582c4840803f9ebd6619ac0837b7b1413451f5665a9a4e02bb3f24464b3 WHIRLPOOL 6537888f122d4cfa76ec3d8a18086f7c53cbdb96f7e88f84f1910d00a6d90973b44610919863e1f569c75df9e0451f5fd134f83c3aeb1b3a563223658bd28e4f
diff --git a/app-admin/puppet/puppet-4.10.5.ebuild b/app-admin/puppet/puppet-4.10.5.ebuild
new file mode 100644
index 000000000000..9709758f9047
--- /dev/null
+++ b/app-admin/puppet/puppet-4.10.5.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ dev-ruby/hiera
+ >=dev-ruby/rgen-0.6.5
+ dev-ruby/json:=
+ >=dev-ruby/facter-3.0.0
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl"
+
+# ruby_add_bdepend "
+# test? (
+# dev-ruby/mocha:0.14
+# =dev-ruby/rack-1*
+# dev-ruby/rspec-its
+# dev-ruby/rspec-collection_matchers
+# >=dev-ruby/vcr-2.9:2
+# >=dev-ruby/webmock-1.24:0
+# )"
+
+DEPEND+=" ${DEPEND}
+ xemacs? ( app-editors/xemacs )"
+RDEPEND+=" ${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # can't be run within portage.
+ epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+ # fix systemd path
+ epatch "${FILESDIR}/puppet-systemd.patch"
+
+ if use experimental; then
+ epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
+ fi
+
+ # Use working version of mocha
+ sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb || die
+
+ # Avoid failing specs that need further investigation.
+ sed -i -e '/should resolve external facts/,/^ end/ s:^:#:' \
+ spec/integration/indirector/facts/facter_spec.rb || die
+ sed -i -e "/describe 'cfacter'/,/^ end/ s:^:#:" spec/unit/defaults_spec.rb || die
+ rm -f spec/unit/indirector/ldap_spec.rb \
+ spec/unit/parser/functions/create_resources_spec.rb || die
+
+ # Avoid specs that rely on tools from other OSs
+ rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
+ spec/unit/provider/user/directoryservice_spec.rb || die
+
+ # Avoid specs that depend on hiera-eyaml to avoid circular
+ # dependencies
+ rm -f spec/unit/functions/lookup_spec.rb || die
+
+ # Avoid specs that fail due to an unpackaged file
+ sed -i -e '/when loading pp resource types using auto loading/,/^ end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
+}
+
+all_ruby_compile() {
+ if use xemacs ; then
+ # Create a separate version for xemacs to be able to install
+ # emacs and xemacs in parallel.
+ mkdir ext/xemacs
+ cp ext/emacs/* ext/xemacs/
+ xemacs-elisp-compile ext/xemacs/puppet-mode.el
+ fi
+}
+
+each_ruby_install() {
+ each_fakegem_install
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ # systemd stuffs
+ insinto /usr/lib/systemd/system
+ doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ insinto /usr/lib/tmpfiles.d
+ newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init-4.x puppet
+ newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+ newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+ keepdir /etc/puppetlabs/puppet/ssl
+
+ keepdir /var/lib/puppet/facts
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/lib/puppet
+
+ fperms 0750 /var/lib/puppet
+
+ fperms 0750 /etc/puppetlabs
+ fperms 0750 /etc/puppetlabs/puppet
+ fperms 0750 /etc/puppetlabs/puppet/ssl
+ fowners -R :puppet /etc/puppetlabs
+ fowners -R :puppet /var/lib/puppet
+
+ if use xemacs ; then
+ xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+ xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ if use ldap ; then
+ insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+ fi
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"; dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Portage Puppet module with Gentoo-specific resources:"
+ elog "http://forge.puppetlabs.com/gentoo/portage"
+ elog
+
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if [ "$(get_major_version $v)" = "3" ]; then
+ elog
+ elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+ elog "/etc/puppetlabs/puppet"
+ elog "Also, puppet now uses config directories for modules and manifests."
+ elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+ elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+ elog "for more information."
+ elog
+ fi
+ done
+
+ use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+ use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/puppet/puppet-5.0.1.ebuild b/app-admin/puppet/puppet-5.0.1.ebuild
new file mode 100644
index 000000000000..20a7d9bce622
--- /dev/null
+++ b/app-admin/puppet/puppet-5.0.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+USE_RUBY="ruby21 ruby22 ruby23"
+# need to get deps up to date for this
+#USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+inherit eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ dev-ruby/hiera
+ dev-ruby/json:=
+ >=dev-ruby/facter-3.0.0
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl
+ dev-ruby/hocon"
+
+ruby_add_bdepend "
+ doc? ( dev-ruby/yard )
+ test? (
+ dev-ruby/mocha
+ dev-ruby/rack
+ dev-ruby/rspec-its
+ )"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+# dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # can't be run within portage.
+ epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+ # fix systemd path
+ epatch "${FILESDIR}/puppet-systemd.patch"
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb || die
+
+ # Avoid failing spec that need further investigation.
+ rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ # systemd stuffs
+ insinto /usr/lib/systemd/system
+ doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ insinto /usr/lib/tmpfiles.d
+ newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init-4.x puppet
+ newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+ newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+ keepdir /etc/puppetlabs/puppet/ssl
+
+ keepdir /var/lib/puppet/facts
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/lib/puppet
+
+ fperms 0750 /var/lib/puppet
+
+ fperms 0750 /etc/puppetlabs
+ fperms 0750 /etc/puppetlabs/puppet
+ fperms 0750 /etc/puppetlabs/puppet/ssl
+ fowners -R :puppet /etc/puppetlabs
+ fowners -R :puppet /var/lib/puppet
+
+ if use ldap ; then
+ insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+ fi
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"; dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Portage Puppet module with Gentoo-specific resources:"
+ elog "http://forge.puppetlabs.com/gentoo/portage"
+ elog
+
+ for v in ${REPLACING_VERSIONS}; do
+ if [ "$(get_major_version $v)" = "4" ]; then
+ elog
+ elog "Please see the following url for the release notes for puppet-5"
+ elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+ elog
+ fi
+ done
+}
diff --git a/app-arch/mscompress/mscompress-0.3-r1.ebuild b/app-arch/mscompress/mscompress-0.3-r1.ebuild
index 7619b3afee67..e7a2b9214c20 100644
--- a/app-arch/mscompress/mscompress-0.3-r1.ebuild
+++ b/app-arch/mscompress/mscompress-0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.penguin.cz/pub/users/mhi/mscompress/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
src_prepare() {
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index 03a75a386829..3b1eaa534a4e 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,3 +1,4 @@
DIST duplicity-0.7.10.tar.gz 1543523 SHA256 485fef15526d163c061e00ec08de216cf7d652e67d41de5dc3bed9fb42214842 SHA512 d04273384749c88d0a4f46bc1dcdcbb945ec1a78fb21064f12f0ca6c92cc73ad36fc3149461dbe0a660cd752a1147b2fa5d2b4056a5414c7790747eb5983e0bd WHIRLPOOL 1532b1e5ffc764951155ce248662d3ebf23fff71c538270ee1b2d37c7ad0a90705361b34418a323dfb4947ede42cd356e0daba18e4124e7342e5baadc5d0af22
DIST duplicity-0.7.11.tar.gz 1550197 SHA256 b047a1590a1f5bb3974643ad2cc9dfdd32f61adbf2c1989191fb12cb59c2ec07 SHA512 81ccb868625b261356b9cb2439659eb7574343c0a15ea7db099746216689a881d9a37b05711c232103ae0e7660b5cdc7dff6475eda81ecbdcfc28bced0eabe75 WHIRLPOOL 1c106933fe4e9ba535a7923e93474457f2ede8979c2f9ed400fb7a819872c05ec2adfd08920d7b81b3e97feb90844f141721fc5ff184e97ec0b3df9da1d311df
DIST duplicity-0.7.12.tar.gz 1552442 SHA256 11cbad44a90891af1bf9e294260ba7c21a1660ccd3ab2c6e736ba74ac5cf0fe6 SHA512 8a532e7bb548c170184666a0ba2b41a15f3002c14edd64b1b1eb4df862647fc6dfde797d6ecf38e326d7c160c31ff521baf351e520835495e1d0e2ddbdb19f0f WHIRLPOOL 872d0b52a0f73507849d585fd5888d4754d5711ab5cc48d72b571cfb14fd1278093022f52238facf608c8b26aa0149f2e614a4819c85aeb9ee94305e81824147
+DIST duplicity-0.7.13.1.tar.gz 1553736 SHA256 adb8668fb10e0b0f91cb77f758d02c02bf5c02e6c4835904a82cbdab6db4bef2 SHA512 08672910e61a089086992a1106ffc1e161ae3173514d35ae854eac719a095e48efaf7e298c1329ba3b439c0e97236644e88c615a013bd0e8ea9d956b38346ca6 WHIRLPOOL 2a9fddd1c41cadaa713c83805bce5d3e2de01540de29a47c7d545236e9e713b2004abfbae9977a115727db5fc661904f679cae7d0c9fb01ece04bdce212fb08c
diff --git a/app-backup/duplicity/duplicity-0.7.13.1.ebuild b/app-backup/duplicity/duplicity-0.7.13.1.ebuild
new file mode 100644
index 000000000000..46196df24caa
--- /dev/null
+++ b/app-backup/duplicity/duplicity-0.7.13.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+DESCRIPTION="Secure backup system using gnupg to encrypt data"
+HOMEPAGE="http://www.nongnu.org/duplicity/"
+SRC_URI="https://code.launchpad.net/${PN}/$(get_version_component_range 1-2)-series/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="s3 test"
+
+CDEPEND="
+ net-libs/librsync
+ app-crypt/gnupg
+ dev-python/fasteners[${PYTHON_USEDEP}]
+"
+DEPEND="${CDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND="${CDEPEND}
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ s3? ( dev-python/boto[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+ # workaround until failing test is fixed
+ local PATCHES=( "${FILESDIR}"/${PN}-0.6.24-skip-test.patch )
+
+ distutils-r1_python_prepare_all
+
+ sed -i "s/'COPYING',//" setup.py || die
+}
+
+python_test() {
+ esetup.py test
+}
+
+pkg_postinst() {
+ einfo "Duplicity has many optional dependencies to support various backends."
+ einfo "Currently it's up to you to install them as necessary."
+}
diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest
index b86ea3ff4deb..b32ebe5d37ae 100644
--- a/app-backup/spideroak-bin/Manifest
+++ b/app-backup/spideroak-bin/Manifest
@@ -1,6 +1,2 @@
-DIST spideroak-bin-6.1.3_amd64.deb 26655852 SHA256 65ecab3096e6de675fd9facf81f387775c2419158112c4914447fa0af07d8015 SHA512 f9d4e4178721609ec4a544ac8b84e581088ad9be5aaf3aa68de12e2d7e17d7c148d9a619917b69ecfd9c08087d1987b0b67081673b81f56908089caa9ab0edc5 WHIRLPOOL 6751d84d9739bc66f189b52cf944544213f10e978b9e2cb1b85fcf1303fb4ae0373d7bf9633638586cceea659c2448a442b459fdaefc7306854f8b1f58c189d9
-DIST spideroak-bin-6.1.3_x86.deb 26173318 SHA256 50fd7d442291bb9ec64d51308444c83b7d76d55bafcc3e9f5d3009e6a49eee0f SHA512 0ddf1be909b44042e3fe0f7e791558e50c649a3d4472c3a05c78835c593d6db3369c0e862b79f2a4812232503346defc1c889fbc4c701a125d3364810b524481 WHIRLPOOL 2e19e4ac0f9028acea19eb2f395faba2031959c09544c07a7f10c690f67317558ac0fbdf2e1fe1b52a922e4ac9480486348b0c4cf053b03336018d3aef7f2dab
-DIST spideroak-bin-6.1.5_amd64.deb 26882606 SHA256 7ef458381c17f7a3712043aa672b5509500e7e6999cd52ba5d85ba76f7a29d2c SHA512 c23e41d359879ce671f8af66e32d08affe10c92492ed46dc6eea5942f14190d28a4b1b96722959bfcec98b05f9176c0a959c93c32bf22709139332b42d805a52 WHIRLPOOL 8f9b56f091951dafb6849cfbafd60314708dd5a5deed0852d5bb06869b36f1fa5d8e55508407c5bbf34024523531bfe26325fce7895ac04b59f6f1dd1aa50c58
-DIST spideroak-bin-6.1.5_x86.deb 26405076 SHA256 a001e464b87406e775f421ff041fbc80a3f3b33548c792a095c9632e137a3e89 SHA512 4aa87c2fd35569bb4acaf5492ca520d66bb9d53c5a53d5e8f418ae0518cb143f35bc769a7d37bc1ea6e4536b944780a3403d3800c45973bed537f573f3e07d0a WHIRLPOOL 7471b8ebf394cbcbc05400cc0e0c390ea30d92194567458b6955bd9a25f5f40fbe27c52e30767e467aa4f45ecf6fa304b82ab60bf30d1408846c4cff7f4087b9
DIST spideroak-bin-6.3.0_amd64.deb 26860946 SHA256 82f39594ac3c5b22324912a633b51a03dd1d6a6b3460bf9426f3bfe712af12e7 SHA512 b9c2635c141c4aaffa0a744b155563a64f4ec16c7f07e38c15cc47db5d810a13997facb4cf75f1567212e613abfa2da6477dcb7ee8f81b35276f115ff3d71051 WHIRLPOOL c9b532c9f90508447baf7d080ccda9e358a386352fd917d2e473183c4afc3aa89b211a789ce0442ced0d5d86ebe8b5bf3b9e2d4ce6eb4087773dd1bc81abfe7a
DIST spideroak-bin-6.3.0_x86.deb 26384374 SHA256 943b324f1f1daae8fc52e952665a0b8f543f5294e21736a90c94f234a217512b SHA512 beb19703541df684f9c322916cb033846b730f5da7efa34a90250ce6da46f34f741fcfe12bc41bc82770b6cfd54f5376314c3689885d1ce1591f162361339a99 WHIRLPOOL f290963d2f714bf5c63fd03cf4d53ae455ef7520289149f4fcaf88693cd8dd403cb4686e6c00728da2a883096047a6d6fc0d1d43abff4dad5e68a6145f7a2665
diff --git a/app-backup/spideroak-bin/spideroak-bin-6.1.3.ebuild b/app-backup/spideroak-bin/spideroak-bin-6.1.3.ebuild
deleted file mode 100644
index 843efdf251c4..000000000000
--- a/app-backup/spideroak-bin/spideroak-bin-6.1.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils unpacker
-
-SRC_URI_BASE="https://spideroak.com/getbuild?platform=ubuntu"
-
-DESCRIPTION="Secure free online backup, storage, and sharing system"
-HOMEPAGE="https://spideroak.com"
-SRC_URI="x86? ( ${SRC_URI_BASE}&arch=i386&version=${PV} -> ${P}_x86.deb )
- amd64? ( ${SRC_URI_BASE}&arch=x86_64&version=${PV} -> ${P}_amd64.deb )"
-RESTRICT="mirror strip"
-
-LICENSE="spideroak"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus X"
-
-DEPEND="dev-util/patchelf"
-RDEPEND="
- app-crypt/mit-krb5[keyutils]
- dbus? ( sys-apps/dbus )
- X? (
- media-libs/fontconfig
- media-libs/freetype:2
- dev-libs/glib:2
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXrender
- x11-libs/libXt
- )
-"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_prepare() {
- # Set RPATH for preserve-libs handling (bug #400979).
- cd "${S}/opt/SpiderOakONE/lib" || die
- local x
- for x in `find` ; do
- # Use \x7fELF header to separate ELF executables and libraries
- [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
- patchelf --set-rpath '$ORIGIN' "${x}" || \
- die "patchelf failed on ${x}"
- done
-}
-
-src_install() {
- #install the wrapper script
- exeinto /usr/bin
- doexe usr/bin/SpiderOakONE
-
- # inotify_dir_watcher needs to be marked executable, bug #453266
- #chmod a+rx opt/SpiderOakONE/lib/inotify_dir_watcher
-
- #install the executable
- exeinto /opt/SpiderOakONE/lib
- doexe opt/SpiderOakONE/lib/SpiderOakONE
- doexe opt/SpiderOakONE/lib/inotify_dir_watcher
- rm -f opt/SpiderOakONE/lib/{SpiderOakONE,inotify_dir_watcher}
-
- #install the prebundled libraries
- insinto /opt/SpiderOakONE
- doins -r opt/SpiderOakONE/lib
-
- #install the config files
- use dbus || rm -rf etc/dbus-1
- insinto /
- doins -r etc
-
- #install the manpage
- doman usr/share/man/man1/SpiderOakONE.1.gz
-
- if use X; then
- domenu usr/share/applications/SpiderOakONE.desktop
- doicon usr/share/pixmaps/SpiderOakONE.png
- fi
-}
-
-pkg_postinst() {
- if ! use X; then
- einfo "For instructions on running SpiderOakONE without a GUI, please read the FAQ:"
- einfo " https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
- einfo " https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
- fi
-}
diff --git a/app-backup/spideroak-bin/spideroak-bin-6.1.5.ebuild b/app-backup/spideroak-bin/spideroak-bin-6.1.5.ebuild
deleted file mode 100644
index 885e81a1a1db..000000000000
--- a/app-backup/spideroak-bin/spideroak-bin-6.1.5.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils unpacker
-
-SRC_URI_BASE="https://spideroak.com/getbuild?platform=ubuntu"
-
-DESCRIPTION="Secure free online backup, storage, and sharing system"
-HOMEPAGE="https://spideroak.com"
-SRC_URI="x86? ( ${SRC_URI_BASE}&arch=i386&version=${PV} -> ${P}_x86.deb )
- amd64? ( ${SRC_URI_BASE}&arch=x86_64&version=${PV} -> ${P}_amd64.deb )"
-RESTRICT="mirror strip"
-
-LICENSE="spideroak"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus X"
-
-DEPEND="dev-util/patchelf"
-RDEPEND="
- app-crypt/mit-krb5[keyutils]
- dbus? ( sys-apps/dbus )
- X? (
- media-libs/fontconfig
- media-libs/freetype:2
- dev-libs/glib:2
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXrender
- x11-libs/libXt
- )
-"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_prepare() {
- # Set RPATH for preserve-libs handling (bug #400979).
- cd "${S}/opt/SpiderOakONE/lib" || die
- local x
- for x in `find` ; do
- # Use \x7fELF header to separate ELF executables and libraries
- [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
- patchelf --set-rpath '$ORIGIN' "${x}" || \
- die "patchelf failed on ${x}"
- done
-
- #Remove the libraries that break compatibility in modern systems
- #SpiderOak will use the system libs instead
- rm -f "${S}/opt/SpiderOakONE/lib/libstdc++.so.6"
- rm -f "${S}/opt/SpiderOakONE/lib/libgcc_s.so.1"
- rm -f "${S}/opt/SpiderOakONE/lib/libpng12.so.0"
- rm -f "${S}/opt/SpiderOakONE/lib/libz.so.1"
-}
-
-src_install() {
- #install the wrapper script
- exeinto /usr/bin
- doexe usr/bin/SpiderOakONE
-
- # inotify_dir_watcher needs to be marked executable, bug #453266
- #chmod a+rx opt/SpiderOakONE/lib/inotify_dir_watcher
-
- #install the executable
- exeinto /opt/SpiderOakONE/lib
- doexe opt/SpiderOakONE/lib/SpiderOakONE
- doexe opt/SpiderOakONE/lib/inotify_dir_watcher
- rm -f opt/SpiderOakONE/lib/{SpiderOakONE,inotify_dir_watcher}
-
- #install the prebundled libraries
- insinto /opt/SpiderOakONE
- doins -r opt/SpiderOakONE/lib
-
- #install the config files
- use dbus || rm -rf etc/dbus-1
- insinto /
- doins -r etc
-
- #install the manpage
- doman usr/share/man/man1/SpiderOakONE.1.gz
-
- if use X; then
- domenu usr/share/applications/SpiderOakONE.desktop
- doicon usr/share/pixmaps/SpiderOakONE.png
- fi
-}
-
-pkg_postinst() {
- if ! use X; then
- einfo "For instructions on running SpiderOakONE without a GUI, please read the FAQ:"
- einfo " https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
- einfo " https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
- fi
-}
diff --git a/app-backup/spideroak-bin/spideroak-bin-6.3.0.ebuild b/app-backup/spideroak-bin/spideroak-bin-6.3.0-r1.ebuild
similarity index 98%
rename from app-backup/spideroak-bin/spideroak-bin-6.3.0.ebuild
rename to app-backup/spideroak-bin/spideroak-bin-6.3.0-r1.ebuild
index 75cf8ec90ac9..a71e99a92d63 100644
--- a/app-backup/spideroak-bin/spideroak-bin-6.3.0.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-6.3.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="6"
inherit eutils unpacker
@@ -22,6 +22,7 @@ IUSE="dbus X"
DEPEND="dev-util/patchelf"
RDEPEND="
app-crypt/mit-krb5[keyutils]
+ media-libs/libpng:1.2
dbus? ( sys-apps/dbus )
X? (
media-libs/fontconfig
@@ -58,6 +59,8 @@ src_prepare() {
rm -f "${S}/opt/SpiderOakONE/lib/libgcc_s.so.1"
rm -f "${S}/opt/SpiderOakONE/lib/libpng12.so.0"
rm -f "${S}/opt/SpiderOakONE/lib/libz.so.1"
+
+ eapply_user
}
src_install() {
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index 01744fd41aa1..0496aba016f3 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -1,3 +1 @@
-DIST focuswriter-1.6.3-src.tar.bz2 10211589 SHA256 7de693e8786738c50bde53d4e325334ecf3b8155d7c9b37e64bbd9adedcb9f40 SHA512 015a9153a331bffc1b87bb0d13c6aa1340f46da72084caad8a4a8811f213e5ae17802363570052702c1f1b990ccb3d314f179da0a94898bdc988b7798a3b9b0f WHIRLPOOL a8ed601dc2e53665af3be74cac385ec8afdc7c9029812250964ee660a52b4eafe568c4f5405a7348c64244c7c9ab7da1af3d43f6e923e0c7729e0c0f6fec80bd
-DIST focuswriter-1.6.4-src.tar.bz2 10214364 SHA256 1f019e75b5581d3e7ed96977e92c9a5f6eba8456eccbad1f481adaabae34055c SHA512 0f3e0af0efab3cae7e2c4086c500dcf75b1d48f3d4f2cfa5fa3663443f109e90ab3dac01fcac240fa0d65ffe5f11faec9145083192492c9eefa6c1b48ed22c7a WHIRLPOOL 4728d5768daaa5298632c3a2cd745cbd6aeb32b23d03aa64a021d19ab8d0084e3edf15211a2c2536c4280006fcc497204fe1a391a8c00716984679d4a0ef070c
DIST focuswriter-1.6.5-src.tar.bz2 10194695 SHA256 48e949986a65bc51f46f10c075de2904b2e1feb0e1c74c0a8efe99cd8c2de0ce SHA512 a15024bc94f0212db2ec4f8d88b942fc3640b2917f130b1fbfb04ab616ed4d10baa11f9cab8d27a8fc40150bfa3e25d3afe1d76581dbe96a3cd6d62530207e12 WHIRLPOOL acb8fb4cc802a4f12758d02250fb14ef9b1eef4dad5aa98219c3a985f5df56c9fb780f7668a52e4ef7944b5e153386b00aff86c0e8e6161a99aa2bbf818d92b0
diff --git a/app-editors/focuswriter/focuswriter-1.6.3.ebuild b/app-editors/focuswriter/focuswriter-1.6.3.ebuild
deleted file mode 100644
index 52ddd59f06e0..000000000000
--- a/app-editors/focuswriter/focuswriter-1.6.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fdo-mime gnome2-utils qmake-utils
-
-DESCRIPTION="A fullscreen and distraction-free word processor"
-HOMEPAGE="https://gottcode.org/focuswriter/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- app-text/hunspell:=
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsingleapplication[qt5,X]
- dev-qt/qtwidgets:5
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- dev-qt/qtconcurrent:5
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog CREDITS NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" )
-
-src_configure() {
- eqmake5 PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
diff --git a/app-editors/focuswriter/focuswriter-1.6.4.ebuild b/app-editors/focuswriter/focuswriter-1.6.4.ebuild
deleted file mode 100644
index c0817727f18a..000000000000
--- a/app-editors/focuswriter/focuswriter-1.6.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fdo-mime gnome2-utils qmake-utils
-
-DESCRIPTION="A fullscreen and distraction-free word processor"
-HOMEPAGE="https://gottcode.org/focuswriter/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- app-text/hunspell:=
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsingleapplication[qt5,X]
- dev-qt/qtwidgets:5
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- dev-qt/qtconcurrent:5
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog CREDITS NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" )
-
-src_configure() {
- eqmake5 PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
diff --git a/app-editors/focuswriter/focuswriter-1.6.5.ebuild b/app-editors/focuswriter/focuswriter-1.6.5.ebuild
index 00b883cea9f2..aee21c9571a5 100644
--- a/app-editors/focuswriter/focuswriter-1.6.5.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.6.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
LICENSE="LGPL-3 GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/app-editors/tea/Manifest b/app-editors/tea/Manifest
index 6a4531809b66..9cc488e6aff8 100644
--- a/app-editors/tea/Manifest
+++ b/app-editors/tea/Manifest
@@ -1,2 +1,3 @@
DIST tea-43.1.0.tar.bz2 398524 SHA256 36fa3e28391d06f75f67926f5259999829c40c069fb76331a19f3528b463573a SHA512 1b647e1df81ebbcdf73e2335df34a73aca49c80b90b5bbabc05f52277f142e52e35922f788fbff12627f68aafd9ab18601e4cda964628a16025545240cf6e3de WHIRLPOOL 2f01a342d352e419ef7db264d654918494a769f2dfa76561274a3e1911ec194c68f3f8a40bb997b856781fd0b51b542c2db7b6ee10f2ec6f92c4be10d4042bda
DIST tea-44.0.0.tar.bz2 420495 SHA256 c7a7a6777a816bfce006852040abfc9fe72669301eaa637b7cde8c00ad05fe85 SHA512 cc97270eb92ecec7bd1690e337ae5d9749fd24d7e185d083318bf4bb7c79efe5a15c9e2a85111e498e83716fd58e76c7285c697ba4ebbca96e72770d1cadfc48 WHIRLPOOL 4550279244696e56f4f92f631ea41ddcb40986b3239de914ab89d721a6384081bdfcde91231cbd99736d040bb2eb8f240c89b8e915604e7bd795787891ccefa9
+DIST tea-44.1.0.tar.bz2 402335 SHA256 28b665a4ab30defa6699f8625a771612c6e0ae3160abf19e0e3d0a3778599890 SHA512 a430ed6d23d828b12235f61ad3d37f36c28754dcde8ac6d382a251f4b21cc253d70adab96814ee2d31fd6e92d4b5fbc941386b6d485716020800b5fa5e71b194 WHIRLPOOL 363e729d3b3046dc064269f5c245fa751b003fc56b0241fdbe16de891c209be51e7d89a64b3d2527b5f47777c95aafd46c953c0581f2d6d6f6006ede4b5aabb3
diff --git a/app-editors/tea/tea-44.1.0.ebuild b/app-editors/tea/tea-44.1.0.ebuild
new file mode 100644
index 000000000000..e138f5083a4e
--- /dev/null
+++ b/app-editors/tea/tea-44.1.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils qmake-utils
+
+DESCRIPTION="Small, lightweight Qt text editor"
+HOMEPAGE="https://tea.ourproject.org/"
+SRC_URI="https://tea.ourproject.org/dloads/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="aspell djvu hunspell pdf"
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ sys-libs/zlib
+ aspell? ( app-text/aspell )
+ djvu? ( app-text/djvu )
+ hunspell? ( app-text/hunspell:= )
+ pdf? ( app-text/poppler[qt5] )
+"
+DEPEND="${RDEPEND}
+ hunspell? ( virtual/pkgconfig )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS-RU TODO )
+
+src_configure() {
+ eqmake5 src.pro \
+ $(use aspell || echo CONFIG+=noaspell) \
+ $(use djvu && echo CONFIG+=usedjvu) \
+ $(use hunspell || echo CONFIG+=nohunspell) \
+ $(use pdf && echo CONFIG+=usepoppler)
+}
+
+src_install() {
+ dobin bin/tea
+
+ einstalldocs
+ docinto html
+ dodoc manuals/*.html
+
+ insinto /usr/share/qt5/translations
+ doins translations/${PN}_*.qm
+
+ newicon icons/tea-icon-v3-01.png ${PN}.png
+ make_desktop_entry ${PN} 'Tea Editor'
+}
diff --git a/app-emulation/flannel/Manifest b/app-emulation/flannel/Manifest
index a053a1664e35..1b8360c7a4e6 100644
--- a/app-emulation/flannel/Manifest
+++ b/app-emulation/flannel/Manifest
@@ -3,6 +3,7 @@ DIST beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz 10593 SHA256 d
DIST bolt-1.3.0.tar.gz 80322 SHA256 e417fccc1186dcf8807e3b2a7afb31bad31faf2ca383d203002a7d783c872f13 SHA512 51b72f82cf055ab1b47ca51c16c9f3cd1293de4596e1294db83f348d7da62ee2230fc94cb11347483f81783e23e5763424f697a4d028050fb434e0455dd06934 WHIRLPOOL a079999c027ae0cf2031beeb6a6c98917153ed4bf85de306f0192c8ec60ebe8c8bdfcff5f2bb6586f261d4cfce8809cb056225a3ed7256d059adb2ea211cfd6f
DIST flannel-0.5.5.tar.gz 592235 SHA256 dbbcb08c0e70713b0c920387a9967e5b30ef833c8118c847edbbca4f68ff0562 SHA512 5300583752fbfa0da3c1a066268a7441271c02a0304213cc854c252727b5035db4a51a4747ad54db3c741b6f623363c99920a5bf2292c59dc3dc4d653b366f83 WHIRLPOOL c97b7ece323309343fef40b36a826b420f3be5df61ac7bb9ae4faa48802c395be886b8a6740765779e2023a5bdbffde21dda1934179e4e284204aa821275e645
DIST flannel-0.6.2.tar.gz 9239397 SHA256 40c315ee78e50b97d2e48e5c32e2d07690b7361fe1ca09efe16d3edda4bc7e33 SHA512 6bee7edfc5ba13ff9b157ca79ea4abf1c2575a4a0c7b92279d297d395dfe411fd5a01c9b94fd182868bbb5a2a77e2e01e8f7e726b04e875e5b46c4ce8ac2c3a5 WHIRLPOOL 3f9cb2824c91b393edb77c5ebcf0dd1717bf7841a803b871dcf7595fdcb839b88af1e2894e809cb920da309afa8075a8d6980d6c15b1b7d9d0b3552eea4fc77a
+DIST flannel-0.8.0.tar.gz 8089967 SHA256 8905f1706b649db8c9852ddd0d559ff8c1844886278455b8ff0c22b909b1e059 SHA512 8d3693d95f67ab273c68671d0b2ab76dd3761868bb956cb14c171525bbefab8223d202f2356de249e1add1bbac89f995367a6d5c1b8e1358bebaa317b4f0a2fc WHIRLPOOL c6c2d4cc2f864b2e3271933a99d5ae8b4ef08c12b7e5cca771ca86c4902a4f2469cee990c46b5a40337a89b52c44d17cebcd56be77b502c2fedc371aad299be1
DIST go-crypto-b2fa06b6af4b7c9bfeb8569ab7b17f04550717bf.tar.gz 1298465 SHA256 423a29190851ee1a1a0b4d7539ff725f7de9f0fb9a3d3d76a491025a6ee7b492 SHA512 8721402dc0a3486cfe9898e83d686307af13995d1edb4b21c58a3c3e3d13abe5fb9860270ca9f721be6147338c2f54d66489d2f5c7cc45dbfa98c7d678d00ce3 WHIRLPOOL c215c893a5cf7ad93d014f544f97c8d14317edc63a0000858058d571848c765caac458c146c1a00077eb149ae54ea3bff4d42de1bcdf005697f7db8af18a4917
DIST go-semver-0.2.0.tar.gz 8474 SHA256 0f15084aee23324e12e5e4542c9f7b0c809d7207b0e90829d1554b234cd8dd4a SHA512 93cf037a5994fe42d890e26a7547f56593ce4e6b8e149ba4f8437226b0d06a7b948b67c1d5a96d1389baa837cc046220f389a695c999a089b5f30a051bf92a38 WHIRLPOOL 3463ff0f01f86787105fb185cb3fcd4fc578823d010387e09a1b17c8ace1dbea134077b7b29bfe07dae6404425eaff3d3c9919597eb4b40c0adc8321a718d9b4
DIST go-systemd-13.tar.gz 49200 SHA256 5bad52a1e16b17038f86d336ac3c5aefbde9074f6f0aaa677dc866c0582de783 SHA512 a53e2ed6b418ea04dbf4e0ba36590ea64c3453b09f0bc7431c20970cd25c12797b5ce80c95c69e2ba85e62d5aa804d71217edbefd6c9e847ba1b192432159cd2 WHIRLPOOL abc1fa6760239da574fb9bbc22c0bd9a9233ca11642caf503d4d2c266ee02d436413bfe3d8be40963af8afd6a6b436ce2bb0498bf31cc27632d6f1a4eaa09cf4
diff --git a/app-emulation/flannel/flannel-0.8.0.ebuild b/app-emulation/flannel/flannel-0.8.0.ebuild
new file mode 100644
index 000000000000..a63436a1230f
--- /dev/null
+++ b/app-emulation/flannel/flannel-0.8.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="An etcd backed network fabric for containers"
+EGO_PN="github.com/coreos/flannel"
+HOMEPAGE="https://github.com/coreos/flannel"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
+ -i "${S}/src/${EGO_PN}/version/version.go" || die
+}
+
+src_compile() {
+ GOPATH="${WORKDIR}/${P}" \
+ go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
+ [[ -x bin/${PN} ]] || die
+}
+
+src_test() {
+ GOPATH="${WORKDIR}/${P}" \
+ go test -v -work -x "${EGO_PN}" || die
+}
+
+src_install() {
+ newbin "bin/${PN}" ${PN}d
+ cd "src/${EGO_PN}" || die
+ exeinto /usr/libexec/flannel
+ doexe dist/mk-docker-opts.sh
+ insinto /etc/systemd/system/docker.service.d
+ newins "${FILESDIR}/flannel-docker.conf" flannel.conf
+ systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf
+ systemd_dounit "${FILESDIR}/flanneld.service"
+ dodoc README.md
+}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 1584f9709919..54e8e4af7180 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,5 +1,4 @@
DIST VBoxGuestAdditions_5.0.16.iso 60063744 SHA256 8190f1e4031f8195971c2a97d2d3b1cf2d86fc83219f750d05cee9255c7dad85 SHA512 8a9d3fcb96a450163f357b92f8149f58700ec65c127fb872b103554417979fbe624a9e1bced3bb6cbf4b0bb6a5c3bbcae9581836cc5d3fde7a034d4032e519f9 WHIRLPOOL 89ed9064014a715a892388b5dbe3c4b577a5a813580be4fd2bd604672354f258b00a619980ba1369aeaceff6a77c6d370cc2b6bf3c17d2cd73a5c8fc9dcad1e8
-DIST VBoxGuestAdditions_5.0.32.iso 58433536 SHA256 4d60a243373ce2b61fe26bcaeb9e300482b16c3407c4c94f02a16f8fd0539319 SHA512 ffae693070a7b401792f67318e3389ec78079634a84834b874bf076400ffeb2f35f3e0b219186a8e51bd969db71285544d12b30c34a076659df45fabde2577b6 WHIRLPOOL e95b286dbb601877814ead39dbf3d0b694005d88d9c45f793ed207f1a27a75aab832a35fc03d0d94a625c7792f194dfefb0d412103a5d7ae5336cdf8381bf902
DIST VBoxGuestAdditions_5.0.40.iso 58466304 SHA256 df3a1849fe796b476b1095576fd72a27fd3f253d4770a2fb6bc792593ed9726b SHA512 f92dc50cfa0be3583c1b15e041d73948fba4d2a83dfd1a7a750feecede13a00e70b641da03533dd0f23f520cc5778cfeb824b3d8455042dcc85ee4f677f3d699 WHIRLPOOL 5e9d0a01bb1a065789b9a16416dde0156c9e3a0b28161f2944ad143e00905a2e328c93e2301f73ad518bac9c50dd5d3b946e1676fa3465a84f5c68bb52d56083
-DIST VBoxGuestAdditions_5.1.22.iso 59445248 SHA256 54df14f234b6aa484b94939ab0f435b5dd859417612b65a399ecc34a62060380 SHA512 1e933b55456d42be020048de08ba728d4393a1d391ea101c4f0f982dd342dab72f2693eb975253fb386221c6e2ddb7b56342aea4a6f77f5813799993ac63c903 WHIRLPOOL c63899ba9102669860daf09d7e0ee38c3a51793db65af671619a022ee83d95d44d2f09ca8a6767d345dea46534184661840264b8a1be13f21032db6294537a03
DIST VBoxGuestAdditions_5.1.24.iso 59494400 SHA256 01a77500df9127d8d6aa27c7d784af8f773d8e84b2b252c9e866b9038ed8bd43 SHA512 4b266ccad53217d03eee7ebe0fbc52ca47ee9a70eb4f50ae9bf87ea3c0707d87e97e65b2a3e4616cc4ad1ab746e2fa88d9f5dbb234dbf1cd96487e231fd15870 WHIRLPOOL a432d973fabaf2da5db419b0229e9c1bb1037d89da43ae195f05f7cc8417f67101d182087537a3a27735e53d8c91c979e09408ffec6814183d9304baf1993062
+DIST VBoxGuestAdditions_5.1.26.iso 59496448 SHA256 6df8c8ab6e7ac3a70a5e29116f8a5dcdb7dfbd0b226ef849a5cd9502e956b06f SHA512 5329ce9bb787efed088a9f89412974cef3a982a351c0053b3daf15a9c95c55f99556e2b86cdcd39c168042503eb00eaa83fb99f8f5c4c97d177dd2b61bb33f5d WHIRLPOOL d8c2bd468673a0d9cee9b7f3630a6581c8124cd4b6bfe942b69ceff70cfa7096b7c1e947a86ed4fd00d7d4dac3eeae52b55bbed4bbb9c3268dd864fcd53068e9
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.32.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.32.ebuild
deleted file mode 100644
index 4fd01d14b29e..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.32.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
- !=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
- return 0
-}
-
-src_install() {
- insinto /usr/share/${PN/-additions}
- newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.40.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.40.ebuild
index 967492859a76..4fd01d14b29e 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.40.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.40.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RESTRICT="mirror"
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.22.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.26.ebuild
similarity index 100%
rename from app-emulation/virtualbox-additions/virtualbox-additions-5.1.22.ebuild
rename to app-emulation/virtualbox-additions/virtualbox-additions-5.1.26.ebuild
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 9ff68445a573..9ae7e065c65d 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,20 +1,16 @@
DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.16-105871.tar.gz 16896587 SHA256 c234e158c49f4f92c38e41918c117d756a81236ff1030a896e44faf88284ecc7 SHA512 39a7c6726e57c89a970e771f80369617c95e154498174deed025ca953e85197981215dd1250317285213a8e9bf6b7140e06311bd6df464613bfe90a37ef1c3c8 WHIRLPOOL 8bdf4a499e8d2d463249fb98ea35ee3a91d81004418e171396c0a26d91f3de9eda6fe632a1d85df58e1de1c32c5c939a365277ad836c685f83600277bd7282bf
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.32-112930.tar.gz 18966317 SHA256 3a0c45eb2471566787def7d73f8c01b03a806e5b2042c21911c2142dafdf9a44 SHA512 138b1ee971f396cdde58874c220e9e1d791561dad4e5a5cf14e8bc7aca40d851e3017ef179645cc235c0cf2848dc5e4f500a0ef8865c997371043bf02836acbc WHIRLPOOL 27733c658f1a6cbe31950b89e51b5a18dc5deeaac3a907e302e041e1aa2bea5b013fde83e4c6b7d5c120a022ce4d89355fc54cac9fe7a79ee716c011c638fd3d
DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.40-115130.tar.gz 19050961 SHA256 ebb29de8962d60760a2f25c318833a1fe163368b824b6b26802b6b284af70585 SHA512 fb27a8efa376b2a51558e0a8dfcb87a7116e950783030c1aab996675c776c46cdf4d4ff35d111f925f6b2b4c6fd070ff80a971fd2f6ce77b857b17898950f5a3 WHIRLPOOL db1ba8492abf791f2244d12b7a62643c02c8c7999c607464e117cc42360c876d9ee83d36ea8860e18912b52171d12291d93fdcc3d3ff18ff05c2b3a4cea5373c
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.22-115126.tar.gz 19559514 SHA256 244e6f450cba64e0b025711050db3c43e6ce77e12cd80bcd08796315a90c8aaf SHA512 55841287d580d984142a0572aff4124a180bbe10cb8536426992b5d9e0ce0f3f6d3858aae12de728995a237101a581aa6500b312e457b812f079e3ad67e7ec10 WHIRLPOOL fd883e9f4c77b282528c938296ab820a719334abd3573e4fb9f2023b9a4f2dfa09261aad94f808a6bc1203cf5419f17cbc39d7af8e1b6938b05b14ea51470990
DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.24-117012.tar.gz 19624088 SHA256 65198a2e048d30fc7d18cd4670fb84fed9a878cca1b77f416b4fea4efe8ca2a4 SHA512 fc821a446c67c4046dd2aa2078d6a71a63a490d59c96f76b29a5a46b26ad7e51588c1009efbafa448e73c799dc816de0b5f0ee17b10d306d3e701a15f69c595d WHIRLPOOL b86d40a08774cd56f612e4bd1edd1bea0e070185e9fab19ca21c0a08ffe092c73877a62dfa5be68e7a963145a84785330c935dd43b5c9ddcfbfc3ee2236f9e0a
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.26-117224.tar.gz 19624237 SHA256 14f152228495a715f526eb74134d43c960919cc534d2bc67cfe34a63e6cf7721 SHA512 c6e31e8fb26b8ca32c423d14e85e15f6372a030ec40e9f06ce1e1234913d3586cc58d46819684c99cf3ced37f35d0a964339199cad5cf43580c88bf1afa63ef6 WHIRLPOOL 9b0ceb8ab21ce54a199ac312879ae4bf17b5bbf3bae6d28035436ae8dd8295ea6fa1d8bb3fc095867a017fdcc357b630436dca46d4875bcdd2aad1ce0cfd9d9f
DIST VirtualBox-5.0.16-105871-Linux_amd64.run 85913042 SHA256 2fc30af485c67162a8f1fafb5a0d9c6cbab4dc17ec362e6d8d2487071b4daa47 SHA512 706159c25ad144a489d7519dcc5a9fa6ee47415bac8fc48bb56fbbe72953f5e65fcdf9d045fbe686520ea676dbf511a19208adfd81f199c804e1b632de581f6b WHIRLPOOL 298235fe47a08136232916b990675b4b26dbab7155fd00c82d2405170fd7d255cfa5f93c07a13a89cdc0a129662f3a14d3386be17e11c02bbd3a564de554bcf3
DIST VirtualBox-5.0.16-105871-Linux_x86.run 84909518 SHA256 46421f6ebed4de2466d32193597fbcfe71c2a89c5fd5ac1493856b509d6259e1 SHA512 a16e5a9ee4c643985d48c6ac8e7224074dd2a775bf05b9ef712fff898962493a2126bb1ced20b5ec525ddd86d0ce6c42c06e286f03758aad5d39d58b87db51a8 WHIRLPOOL dbc4af908d3e2879388426defd733539f3bbff10a4f957858f42ae7c328a5cbd0480667b50777a69e860be475d8c66a392badb79503d9f22c267688edc6a1e4e
-DIST VirtualBox-5.0.32-112930-Linux_amd64.run 84387282 SHA256 c5bf59227730855c3f56d4e4f755528ad27d2f5f01bd12791f5b4490364540bf SHA512 22f50362d4b611a55d331d5104b81cbea5e80515c8e992b6ad3f834f80d106fb0d055ce0e534878ad2eeb899b4fef8ec5149bea8c48dce3109685c16ede55f44 WHIRLPOOL 9eb268d9eb69bed9ed4dba0ff0c20c119a9d70d2ae4151d6d2f4c29c300e884c1cbe0f9d356d4053ec069169d5851272f9de620eff8c680d7e1a75a49f5e3896
-DIST VirtualBox-5.0.32-112930-Linux_x86.run 83690958 SHA256 f735bcdb7a93c7b794d610970e537dd4961e1a34453d124a472de10e816aa356 SHA512 cf57024ccc9f306f0108ad3b2ce4d29fa960bafdbdbdcc7bde34094a07e8a62b6f361e7cb77b8d3bb58bb31763b19397c2a0f8fe958600261e8adddab8e9b0b8 WHIRLPOOL 973c2c6b2c71c60ecacfae47b922ed32bdfaa249a08e0c49b3d540031ed3aaa63d5a67da7dccbb9ae24e4b49420b1f6aa85cc7662c9c42333c318e7f1e47cb03
DIST VirtualBox-5.0.40-115130-Linux_amd64.run 84571603 SHA256 f633e88b22470b36b4586fbc8a14e0ee99dad5e094cb1ed73a77016fdbc616c8 SHA512 51e23c3b5eed256e799f9cd6be950a00d0c4f57276d8554cad8c1beb6310ee8625b6eaa364d47dab54274ef0ebd37114d3c6a1312313dce748ca9c985e08b59c WHIRLPOOL 2d6f465cee91be4637c84d65655c0b3c667d6f88af85c3c4b577ad416136d99094ad0fa089314730f7dce89224ed99f5be4ad6fd35db8bc2c23d1e0826400e76
DIST VirtualBox-5.0.40-115130-Linux_x86.run 83793358 SHA256 1371ae3ceec0f2af5e31e569eab1ffd405a75bbf6fb8889a836d07167806d6cd SHA512 98f249e6a461b40856231f31ceb0914093dd97e513ff01fbeb308cb9d0e5d1fee98e69a9f5c1f73c082676c3273517ff2a1f3c658e57035c5d8d6b0cc0627a6b WHIRLPOOL f659c4edd9fa16e532f1c1729a2044b3ebb3a56c9d087c2310c0443e95545d96640b31b9f06f55529c765f4d52b835e528c3914e3a09d58f5cc62aa5cc4b9864
-DIST VirtualBox-5.1.22-115126-Linux_amd64.run 87909843 SHA256 8e48de705d5a2a182a5f248c9a6a431e0f26075f28b916c733a6cc3d27bdd95c SHA512 42de5914b80cfea6c792163c3f662ef0ccabaa3b2d13601de087b16357c822410fa056f204c382a3702bf1175c688fa5828e514081010bcb5afe676ee74019f2 WHIRLPOOL 1ccf3b8e2b168ef1bafb5ab5b57f53395a4f9c6dac6b8ae86bc810261ccf4fc772349504b472179863390634f6ca20984e422bb0ef155f5daf65290c7edff7e1
-DIST VirtualBox-5.1.22-115126-Linux_x86.run 87070158 SHA256 34f02bda93a139df4ea358e7210bdf3b7c5d1655842d24fbafd233a97abb8599 SHA512 ec71ac46652bdaa46ffe1cdda24d1ab18a518d29f2ac6f8240173788e80db2ecfd2147c612a231b75926c7e4ebdb73263f7fb2025ba056b24bbdff9b52a13abc WHIRLPOOL 3d5a33dea5bb753fab7eb2512f161781495ea08e2c69b31cbd9d5fb9fe1b47f8b40170faec7951bf455e0e7cdda496828744fa0818078ebb28383f8e6d20b03d
DIST VirtualBox-5.1.24-117012-Linux_amd64.run 87971283 SHA256 6a01f975558707153cd95d6789e6d92f65751db26e9443ee8656cf9ee17a29b3 SHA512 31718701bdb44660923a2897c15d4943cf64cd99be44625751ac0829573a6dd2e63a497fede8511670e72b73c240b2cc7379fd9e3efff33fbe0d30e38b3ea07f WHIRLPOOL b28bdb1220b0c6be67a74c2042f499ac389812b53d5a31e22f7948f9116ce38d4a297f30bab135bf07aefc54cacc27e4cae40d0cf8e02e383af5baa06bcf0906
DIST VirtualBox-5.1.24-117012-Linux_x86.run 87182799 SHA256 f4151be5c046b4271cba8c8f2bc776114ef8cad3b26f8880fe87f1302f500f64 SHA512 890fd9433f69e5dfb8854fbb1eb546b3ac558cedc121ebf346d6c20d1fc14cc2a9962be5bfff454bcd963f079395c720510b8ba3e119e52028e73d3885a6e202 WHIRLPOOL a33cd9f1f4bea0efe1a943176707348fa10601a06e667b1068a193b6af3d1f9d16a579a9753d7a84bac248d561cded59edbab09e48bed69feb4c38d5e79af0e1
+DIST VirtualBox-5.1.26-117224-Linux_amd64.run 87981522 SHA256 be541c9ad60655b436bb27dc91c482e2e1485da4fc0e632ec92bfbed625a48ed SHA512 9b486fd52918469fdffaa39bbef234d22fad9d3b562fa04443bf6c1040e744db6dc9bd103ead299127b82c5d4bc96c1e05f677cacd623affa6569408c8d26df5 WHIRLPOOL 3c3c7b8254f85223f06cdfdea6cb0cb982222889b899018ea03a6e7807243f5e85ec37ef4a5f829dc09d1fa0123c1c28738b0d1826cd381d4b550360efd9a268
+DIST VirtualBox-5.1.26-117224-Linux_x86.run 87090639 SHA256 05f82b704558efdda8a9c569b52fcf761793a54e8405d062fd20a4a56fffd5da SHA512 3aafad5374dc79c0fdd9bf1da6708ae4ce2f43d9fce3222326424bf03d6b73a7283ba5ebeb01a9ab6b24eeb8a8ec7c23af84e40f3edeb512c2101c329f4091e7 WHIRLPOOL 58c4ff741fed816f08c44af68eaae4fe0d206c59ea1300975d754781a44a8ab513054b5601cc23caefa7fbeb950bc41e8d544e6008e2de377e25661fadc9f9e1
DIST VirtualBoxSDK-5.0.16-105871.zip 9639569 SHA256 df1bd5ed7f7fe9c401555498a1abed6f1f98e001c0069f16d401ccf3afe3061b SHA512 f4e1af1d97a26818722124fbbaffa6d61369b1a5f3b350b749284afdde038802f4a0e93e9bbb4c9ab0f49aad1f4fa19bbc4b0bdb04aa172a433a77a538816e25 WHIRLPOOL 0598061b47e5d0ef775665300ab61ad7b94638d32fb358a9c189536b00b2456ce4c90dfbcc00bac86da736289253e84a3b586b8b7d1da4087db76e8845a8ca33
-DIST VirtualBoxSDK-5.0.32-112930.zip 9674720 SHA256 37165cd54271e3e84117228a2c1836a368a313176397c7455ed303683e9950d1 SHA512 aad7beb301b0376cad102d935b09217428331027b57863464aaa6b3db6418202f9f68b8c1361ee409f8c5fda2cc8169166a5b067ef020ca3a509fe17f64f34fc WHIRLPOOL ee737ac9f24bd854daddbb766df4fbbb071dd3fbf6fd9fbb71b985fc52f84374f4899096ad463510e5caf32d5c965b60ba4c0f408bed59984aedee9d99c31a45
DIST VirtualBoxSDK-5.0.40-115130.zip 9674379 SHA256 9c27d4963f0afd9e11c0105739720b63df919162dfb6c88c52bb1f0e4f68c8ea SHA512 fc02623b5a4d288e37d8895f936f1552c284be2523762688e62d2fb57d3b2e83a2edb7193d0775bc481282e93242d8a691c408e931c8a42e2945a6507625f5f3 WHIRLPOOL b84f02c03e2de1baa3eda5ebc1d4de82d8c16205a2e624a9ecc7985ed70ccdfa8bc5cf066bcc9066cd4e82722600a76972dc472665ef576e6ac41045f5fa8047
-DIST VirtualBoxSDK-5.1.22-115126.zip 9858899 SHA256 41fa067526f4eab29a85644fe84b85d89fdd668b27eac35364f74593ae435c51 SHA512 e2832d01268da7180b5c82ec32c3a7cb19f416c444d9650f17ea4b56946bda4395d62f8e9d193a8d855703c499f84e54e55eccd2e4c704c961299c0c17a73ae8 WHIRLPOOL 02dd280f4ae2196a5453abc74054569119d4d3c7e4520a1b7f64d038a697153d83ad57013f052dd5a2bfef2d27d865d04a0b98c9e744215d440b7fe6fa6e0b05
DIST VirtualBoxSDK-5.1.24-117012.zip 9862325 SHA256 559aa1805d8f341e9d17168bde70b1a6a50898432f4fd854be3a2212f978b6d2 SHA512 7b5f2b0b54bb895ffcc9bb8b391f0b5ca1eaf67fcad081fa9c4233a10beda9454350c2c3acea5ea336fc5155ca1758c30a1edc8b1b8567c273946f8259d91e63 WHIRLPOOL 801491377068d63d8ad611be2448a4f99b761e76ad82002304e1f559b148c9a427063526343f75f3e9f6e043ac71b5c41de63a3cfecbffafcc3039eab78e82a7
+DIST VirtualBoxSDK-5.1.26-117224.zip 9860247 SHA256 fb3e7e3cc425bd7ec3555cd4b1db6a69c85ae1744fb7df8060e4884ad26f09e5 SHA512 d2bef837d61bfb35ba550f004345c2c412c2f62da23ffded6dff8aa33281fdce7c0a8f6b70c131b35e04c34ca0a4221bf97a78e65a470c657980572ebedb0774 WHIRLPOOL 098de72faec934092150abe5a75dff3712b8b0e160eaba3c435d0131e323c74f584841ecbb5a14fd5c29fa2495d7717ef29ddad609939de8ad15752a6111cbf9
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.32.112930.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.32.112930.ebuild
deleted file mode 100644
index 6d69cd21118d..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.32.112930.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils fdo-mime gnome2 pax-utils python-r1 udev unpacker versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
- MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
- MY_PV="${MY_PV/beta/BETA}"
- MY_PV="${MY_PV/rc/RC}"
-else
- MY_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
-MY_P="VirtualBox-${VBOX_PV}-Linux"
-# needed as sometimes the extpack gets another build ID
-EXTP_PV="${VBOX_PV}"
-EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
-EXTP_P="${EXTP_PN}-${EXTP_PV}"
-# needed as sometimes the SDK gets another build ID
-SDK_PV="${VBOX_PV}"
-SDK_P="VirtualBoxSDK-${SDK_PV}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
- x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
- http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-if [[ "${PV}" != *beta* ]] ; then
- SRC_URI+="
- sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
- IUSE+=" sdk"
-fi
-
-DEPEND="app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="!!app-emulation/virtualbox
- !app-emulation/virtualbox-additions
- ~app-emulation/virtualbox-modules-${MAIN_PV}
- !headless? (
- x11-libs/libXcursor
- media-libs/libsdl[X]
- x11-libs/libXrender
- x11-libs/libXfixes
- media-libs/libpng
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXinerama
- x11-libs/libXft
- media-libs/freetype
- media-libs/fontconfig
- x11-libs/libXext
- dev-libs/glib
- chm? ( dev-libs/expat )
- )
- dev-libs/libxml2
- sys-fs/lvm2
- x11-libs/libXau
- x11-libs/libX11
- x11-libs/libXt
- x11-libs/libXmu
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libXdmcp
- ${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-S=${WORKDIR}
-
-QA_PREBUILT="opt/VirtualBox/*"
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_unpack() {
- unpack_makeself ${MY_P}_${ARCH}.run
- unpack ./VirtualBox.tar.bz2
-
- mkdir "${S}"/${EXTP_PN} || die
- pushd "${S}"/${EXTP_PN} &>/dev/null || die
- unpack ${EXTP_P}.tar.gz
- popd &>/dev/null || die
-
- if [[ "${PV}" != *beta* ]] && use sdk ; then
- unpack VirtualBoxSDK-${SDK_PV}.zip
- fi
-}
-
-src_configure() {
- :;
-}
-
-src_compile() {
- :;
-}
-
-src_install() {
- # create virtualbox configurations files
- insinto /etc/vbox
- newins "${FILESDIR}/${PN}-config" vbox.cfg
-
- if ! use headless ; then
- newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-
- # set up symlinks (bug #572012)
- dosym /opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
-
- local size ico icofile
- for size in 16 24 32 48 64 72 96 128 256 ; do
- pushd "${S}"/icons/${size}x${size} &>/dev/null || die
- if [[ -f "virtualbox.png" ]] ; then
- doicon -s ${size} virtualbox.png
- fi
- for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
- icofile="virtualbox-${ico}.png"
- if [[ -f "${icofile}" ]] ; then
- doicon -s ${size} ${icofile}
- fi
- done
- popd &>/dev/null || die
- done
- doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
- insinto /usr/share/pixmaps
- newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
- fi
-
- pushd "${S}"/${EXTP_PN} &>/dev/null || die
- insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
- doins -r linux.${ARCH}
- doins ExtPack* PXE-Intel.rom
- popd &>/dev/null || die
- rm -rf "${S}"/${EXTP_PN}
-
- insinto /opt/VirtualBox
- dodir /opt/bin
-
- doins UserManual.pdf
-
- if [[ "${PV}" != *beta* ]] && use sdk ; then
- doins -r sdk
- fi
-
- if use additions; then
- doins -r additions
- fi
-
- if use vboxwebsrv; then
- doins vboxwebsrv
- fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
- fperms 0750 /opt/VirtualBox/vboxwebsrv
- dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
- newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
- newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
- fi
-
- if use rdesktop-vrdp; then
- doins rdesktop-vrdp
- doins -r rdesktop-vrdp-keymaps
- fperms 0750 /opt/VirtualBox/rdesktop-vrdp
- dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
- fi
-
- if ! use headless && use chm; then
- doins kchmviewer VirtualBox.chm
- fowners root:vboxusers /opt/VirtualBox/kchmviewer
- fperms 0750 /opt/VirtualBox/kchmviewer
- fi
-
- # This ebuild / package supports only py2.7. When py3 comes is unknown.
- # The compile phase makes VBoxPython2_7.so.
- # py3 support would presumably require a binary pre-compiled by py3.
- use python && doins VBoxPython.so VBoxPython2_7.so
-
- rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
- vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
- VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
- webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
- 90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
- VBoxPython?_*.so
-
- if use headless ; then
- rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
- fi
-
- doins -r * || die
-
- # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
- dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
- dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
- dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
- dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
- dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
- local each
- for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
- fowners root:vboxusers /opt/VirtualBox/${each}
- fperms 0750 /opt/VirtualBox/${each}
- pax-mark -m "${D}"/opt/VirtualBox/${each}
- done
- # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
- fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
- fperms 4750 /opt/VirtualBox/VBoxNetDHCP
- fperms 4750 /opt/VirtualBox/VBoxNetNAT
-
- if ! use headless ; then
- # Hardened build: Mark selected binaries set-user-ID-on-execution
- for each in VBox{SDL,Headless} VirtualBox; do
- fowners root:vboxusers /opt/VirtualBox/${each}
- fperms 4510 /opt/VirtualBox/${each}
- pax-mark -m "${D}"/opt/VirtualBox/${each}
- done
-
- dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
- dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
- else
- # Hardened build: Mark selected binaries set-user-ID-on-execution
- fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
- fperms 4510 /opt/VirtualBox/VBoxHeadless
- pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
- fi
-
- exeinto /opt/VirtualBox
- newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
- fowners root:vboxusers /opt/VirtualBox/VBox.sh
- fperms 0750 /opt/VirtualBox/VBox.sh
-
- dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
- dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
- dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
- dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
- # set an env-variable for 3rd party tools
- echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
- doenvd "${T}/90virtualbox"
-
- local udevdir="$(get_udevdir)"
- insinto ${udevdir}/rules.d
- doins "${FILESDIR}"/10-virtualbox.rules
- sed "s@%UDEVDIR%@${udevdir}@" \
- -i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
- # move udev scripts into ${udevdir} (bug #372491)
- mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
- fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-
- gnome2_icon_cache_update
-
- udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
- elog ""
- if ! use headless ; then
- elog "To launch VirtualBox just type: \"VirtualBox\""
- elog ""
- fi
- elog "You must be in the vboxusers group to use VirtualBox."
- elog ""
- elog "For advanced networking setups you should emerge:"
- elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
- elog ""
- elog "Please visit http://www.virtualbox.org/wiki/Editions for"
- elog "an overview about the different features of ${PN}"
- elog "and virtualbox-ose"
- if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
- elog ""
- elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
- elog "or else USB in ${PN} won't work."
- fi
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.40.115130.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.40.115130.ebuild
index 14d781b7cf6d..6d69cd21118d 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.40.115130.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.40.115130.ebuild
@@ -34,7 +34,7 @@ SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd
LICENSE="GPL-2 PUEL"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
RESTRICT="mirror"
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.22.115126.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild
similarity index 100%
rename from app-emulation/virtualbox-bin/virtualbox-bin-5.1.22.115126.ebuild
rename to app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 56096c151f77..32ac809df9bd 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,5 +1,4 @@
DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.16-105871.tar.gz 16896587 SHA256 c234e158c49f4f92c38e41918c117d756a81236ff1030a896e44faf88284ecc7 SHA512 39a7c6726e57c89a970e771f80369617c95e154498174deed025ca953e85197981215dd1250317285213a8e9bf6b7140e06311bd6df464613bfe90a37ef1c3c8 WHIRLPOOL 8bdf4a499e8d2d463249fb98ea35ee3a91d81004418e171396c0a26d91f3de9eda6fe632a1d85df58e1de1c32c5c939a365277ad836c685f83600277bd7282bf
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.32-112930.tar.gz 18966317 SHA256 3a0c45eb2471566787def7d73f8c01b03a806e5b2042c21911c2142dafdf9a44 SHA512 138b1ee971f396cdde58874c220e9e1d791561dad4e5a5cf14e8bc7aca40d851e3017ef179645cc235c0cf2848dc5e4f500a0ef8865c997371043bf02836acbc WHIRLPOOL 27733c658f1a6cbe31950b89e51b5a18dc5deeaac3a907e302e041e1aa2bea5b013fde83e4c6b7d5c120a022ce4d89355fc54cac9fe7a79ee716c011c638fd3d
DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.40-115130.tar.gz 19050961 SHA256 ebb29de8962d60760a2f25c318833a1fe163368b824b6b26802b6b284af70585 SHA512 fb27a8efa376b2a51558e0a8dfcb87a7116e950783030c1aab996675c776c46cdf4d4ff35d111f925f6b2b4c6fd070ff80a971fd2f6ce77b857b17898950f5a3 WHIRLPOOL db1ba8492abf791f2244d12b7a62643c02c8c7999c607464e117cc42360c876d9ee83d36ea8860e18912b52171d12291d93fdcc3d3ff18ff05c2b3a4cea5373c
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.22-115126.tar.gz 19559514 SHA256 244e6f450cba64e0b025711050db3c43e6ce77e12cd80bcd08796315a90c8aaf SHA512 55841287d580d984142a0572aff4124a180bbe10cb8536426992b5d9e0ce0f3f6d3858aae12de728995a237101a581aa6500b312e457b812f079e3ad67e7ec10 WHIRLPOOL fd883e9f4c77b282528c938296ab820a719334abd3573e4fb9f2023b9a4f2dfa09261aad94f808a6bc1203cf5419f17cbc39d7af8e1b6938b05b14ea51470990
DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.24-117012.tar.gz 19624088 SHA256 65198a2e048d30fc7d18cd4670fb84fed9a878cca1b77f416b4fea4efe8ca2a4 SHA512 fc821a446c67c4046dd2aa2078d6a71a63a490d59c96f76b29a5a46b26ad7e51588c1009efbafa448e73c799dc816de0b5f0ee17b10d306d3e701a15f69c595d WHIRLPOOL b86d40a08774cd56f612e4bd1edd1bea0e070185e9fab19ca21c0a08ffe092c73877a62dfa5be68e7a963145a84785330c935dd43b5c9ddcfbfc3ee2236f9e0a
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.26-117224.tar.gz 19624237 SHA256 14f152228495a715f526eb74134d43c960919cc534d2bc67cfe34a63e6cf7721 SHA512 c6e31e8fb26b8ca32c423d14e85e15f6372a030ec40e9f06ce1e1234913d3586cc58d46819684c99cf3ced37f35d0a964339199cad5cf43580c88bf1afa63ef6 WHIRLPOOL 9b0ceb8ab21ce54a199ac312879ae4bf17b5bbf3bae6d28035436ae8dd8295ea6fa1d8bb3fc095867a017fdcc357b630436dca46d4875bcdd2aad1ce0cfd9d9f
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.32.112930.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.32.112930.ebuild
deleted file mode 100644
index 3c6c739d35e3..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.32.112930.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
- MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
- DEP_PV="${MY_PV}"
- MY_PV="${MY_PV/beta/BETA}"
- MY_PV="${MY_PV/rc/RC}"
-else
- MY_PV="${MAIN_PV}"
- DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
- insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
- doins -r linux.${ARCH}
- doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.40.115130.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.40.115130.ebuild
index 4d09c1248e68..3c6c739d35e3 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.40.115130.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.40.115130.ebuild
@@ -25,7 +25,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack
LICENSE="PUEL"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RESTRICT="mirror strip"
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.22.115126.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.26.117224.ebuild
similarity index 100%
rename from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.22.115126.ebuild
rename to app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.26.117224.ebuild
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 1ba38529e64c..bb1c12b911db 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,6 +1,5 @@
DIST VirtualBox-5.0.16.tar.bz2 111062984 SHA256 f5a44d33a1db911f445b2eb2d22d9293a96a535cba488b5a235577ef868fa63c SHA512 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074 WHIRLPOOL ea709057c588f28820790c2b193decba9ee0c57e0f82aa4361ca87aef661315182e18b5ee29558e47ed92f6037eb91befa5390680661a7b9f2248c7819b4a85c
-DIST VirtualBox-5.0.32.tar.bz2 111684963 SHA256 4a48d4a8b6ca68353bd39f2c9d2896e1659818959f858e8326ef649481d15550 SHA512 77e479e43a08bd9656792cc8e58bbb4e57e1290803bc100a00b9595f2dfdf580607c9a1d38f72aebf638cf6ba3f63bef79913301c8b2a135b5cfcf35a44707e4 WHIRLPOOL 1b03a9368259e1704981dcd64f773f8097d03c582e8c18a012c55463d5bbb15b2521e83f51fe3cf4fe30822db26726c9ff145d711cb97ae2287368068338a9a4
DIST VirtualBox-5.0.40.tar.bz2 112997095 SHA256 e4275b7ada40b358e6e3bd1231b3a320aa06c72ae301283cac5adb42eaa8e4b5 SHA512 70cd4355591c5aed82148954bf55637a5dcdd1a5177dba78192e7c6eadfbf3f7023f352ba8f89d9eb3c3fc55b049f7c76af6bc94e04d1766d7fbe39e51a1393c WHIRLPOOL 9f471e63814c9d48063857f3b95410f5acdd4a3bd2716c525f2449f1eae95d0e91dbe5422374a49f31f8219daa155f716455f0259d131d93afb5cd9e13a7d467
-DIST VirtualBox-5.1.22.tar.bz2 115838360 SHA256 fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899 SHA512 e48457371c9139fc04477c82fbd18974378fde08af2a6f9058a0eafa6e522987bd129b8d87c9f381789c4e817aded752fde6ea7fcb2ade471997373802e09348 WHIRLPOOL c6034aad69c8a25eaf5909b6889f04f8090ace562e18a76bc55ad4d3e8347844fa1ab466d32e92b09180dff71e0f928826db0994d34b03f44b11bdb03ccc40d2
DIST VirtualBox-5.1.24.tar.bz2 116135442 SHA256 ee2db169a322bf0db3c3b6d8b84aa39236f36cbf37d0a4c10ab65902a396bb60 SHA512 3c9ad230a53f9159e648ae1f342bdb220ffd85f2ddd45ae4c61d6606f358e9343a4968b2a91784893fb1284288ad41c538b1ab299b3a49e7739bfc8c4fdea910 WHIRLPOOL aad73184e2d36928449e688fd86c6f42c061f77e86c7e6119a205154b307846ed25175f49e3f8e451844b48c0e71e9531902753f1fd917123c401ffbf7744a2d
+DIST VirtualBox-5.1.26.tar.bz2 115915813 SHA256 b5715035e681a11ef1475f83f9503d34a00f0276b89c572eebec363dda80c8a9 SHA512 680e9646a51a0a5923b3ded10007ee1c1e2a41c6d8a961d2b2540db6578bed2847154f4cac87e3cfe1118a62595b47c7df99da854f6c340e173b9eb8cacf2add WHIRLPOOL 9d7950ec3ec2cd9b8aaa0ea319f9f5089eed7d2cd2879d313426b448a27570b5582235aa46c5ad5a0fd4d0b967f8d58a963f001549232136d6a8609262af71d0
DIST virtualbox-5.1.24-patches-01.tar.xz 2708 SHA256 8ea5e08da07d555a4868abf6f4d689c2f6695bdb773010a01915fcc6c354f361 SHA512 0028e593818013f809831ac5a73eec63988c0aefb4b309fb3c928efbea8db8b8f46bd7c82f156396adc704f0567474df262dfe9bb6e09af0b2c23528fe2c6e2d WHIRLPOOL 5a1af78c2767608d2b1c2a4b262dbce038d2b6ed9d0499eb60ac1eb64fd6b832efdbafc2b85881ac67efd8794adcc3490fcbf61b74ad7ae576d52e8aff597b04
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.32.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.32.ebuild
deleted file mode 100644
index 6e24c6b0f084..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.32.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils linux-mod systemd user toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-RDEPEND="X? ( x11-apps/xrandr
- x11-apps/xrefresh
- x11-libs/libXmu
- x11-libs/libX11
- x11-libs/libXt
- x11-libs/libXext
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libSM
- x11-libs/libICE
- x11-proto/glproto )
- sys-apps/dbus
- !!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
- >=dev-util/kbuild-0.1.9998_pre20131130
- >=dev-lang/yasm-0.6.2
- sys-devel/bin86
- sys-libs/pam
- sys-power/iasl
- X? ( x11-proto/renderproto )
- !X? ( x11-proto/xproto )"
-PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
- vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
- use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
-
- linux-mod_pkg_setup
- BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
- enewgroup vboxguest
- enewuser vboxguest -1 /bin/sh /dev/null vboxguest
- # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
- enewgroup vboxsf
-}
-
-src_unpack() {
- unpack ${A}
-
- # Create and unpack a tarball with the sources of the Linux guest
- # kernel modules, to include all the needed files
- "${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
- unpack ./vbox-kmod.tar.gz
-
- # Remove shipped binaries (kBuild,yasm), see bug #232775
- cd "${S}"
- rm -rf kBuild/bin tools
-}
-
-src_prepare() {
- # PaX fixes (see bug #298988)
- pushd "${WORKDIR}" &>/dev/null || die
- eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
- popd &>/dev/null || die
-
- # Disable things unused or splitted into separate ebuilds
- cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
- use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
- # stupid new header references...
- for vboxheader in {product,revision,version}-generated.h ; do
- for mdir in vbox{guest,sf} ; do
- ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
- "${WORKDIR}/${mdir}/${vboxheader}"
- done
- done
-
- # Remove pointless GCC version check
- sed -e '/^check_gcc$/d' -i configure || die
-
- eapply_user
-}
-
-src_configure() {
- # build the user-space tools, warnings are harmless
- local cmd=(
- ./configure
- --nofatal
- --disable-xpcom
- --disable-sdl-ttf
- --disable-pulse
- --disable-alsa
- --with-gcc="$(tc-getCC)"
- --with-g++="$(tc-getCXX)"
- --target-arch=${ARCH}
- --with-linux="${KV_OUT_DIR}"
- --build-headless
- )
- echo "${cmd[@]}"
- "${cmd[@]}" || die "configure failed"
- source ./env.sh
- export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
- MAKE="kmk" \
- emake TOOL_YASM_AS=yasm \
- VBOX_ONLY_ADDITIONS=1 \
- KBUILD_VERBOSE=2
-
- # Now creating the kernel modules. We must do this _after_
- # we compiled the user-space tools as we need two of the
- # automatically generated header files. (>=3.2.0)
- linux-mod_src_compile
-}
-
-src_install() {
- linux-mod_src_install
-
- cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
- insinto /sbin
- newins mount.vboxsf mount.vboxsf
- fperms 4755 /sbin/mount.vboxsf
-
- newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
- insinto /usr/sbin/
- newins VBoxService vboxguest-service
- fperms 0755 /usr/sbin/vboxguest-service
-
- insinto /usr/bin
- doins VBoxControl
- fperms 0755 /usr/bin/VBoxControl
-
- # VBoxClient user service and xrandr wrapper
- if use X ; then
- doins VBoxClient
- fperms 0755 /usr/bin/VBoxClient
-
- pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
- || die
- newins 98vboxadd-xclient VBoxClient-all
- fperms 0755 /usr/bin/VBoxClient-all
- popd &>/dev/null || die
- fi
-
- # udev rule for vboxdrv
- local udev_rules_dir="/lib/udev/rules.d"
- dodir ${udev_rules_dir}
- echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
- >> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
- || die
- echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
- >> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
- || die
-
- # VBoxClient autostart file
- insinto /etc/xdg/autostart
- doins "${FILESDIR}"/vboxclient.desktop
-
- # sample xorg.conf
- insinto /usr/share/doc/${PF}
- doins "${FILESDIR}"/xorg.conf.vbox
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
- if ! use X ; then
- elog "use flag X is off, enable it to install the"
- elog "X Window System video driver."
- fi
- elog ""
- elog "Please add users to the \"vboxguest\" group so they can"
- elog "benefit from seamless mode, auto-resize and clipboard."
- elog ""
- elog "The vboxsf group has been added to make automount services work."
- elog "These services are part of the shared folders support."
- elog ""
- elog "Please add:"
- elog "/etc/init.d/${PN}"
- elog "to the default runlevel in order to start"
- elog "needed services."
- elog "To use the VirtualBox X driver, use the following"
- elog "file as your /etc/X11/xorg.conf:"
- elog " /usr/share/doc/${PF}/xorg.conf.vbox"
- elog ""
- elog "Also make sure you use the Mesa library for OpenGL:"
- elog " eselect opengl set xorg-x11"
- elog ""
- elog "An autostart .desktop file has been installed to start"
- elog "VBoxClient in desktop sessions."
- elog ""
- elog "You can mount shared folders with:"
- elog " mount -t vboxsf "
- elog ""
- elog "Warning:"
- elog "this ebuild is only needed if you are running gentoo"
- elog "inside a VirtualBox Virtual Machine, you don't need"
- elog "it to run VirtualBox itself."
- elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.40.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.40.ebuild
index b68afcdba160..6e24c6b0f084 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.40.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.40.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="X"
RDEPEND="X? ( x11-apps/xrandr
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.22.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.26.ebuild
similarity index 97%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.22.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.26.ebuild
index b68afcdba160..3ed0d06ac32a 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.22.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.26.ebuild
@@ -10,7 +10,8 @@ MY_PV="${MY_PV/rc/RC}"
MY_P=VirtualBox-${MY_PV}
DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+ https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.24-patches-01.tar.xz"
LICENSE="GPL-2"
SLOT="0"
@@ -92,6 +93,8 @@ src_prepare() {
# Remove pointless GCC version check
sed -e '/^check_gcc$/d' -i configure || die
+ eapply "${WORKDIR}/patches"
+
eapply_user
}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 7a054479187c..be6e7669d49e 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,5 +1,4 @@
DIST vbox-kernel-module-src-5.0.16.tar.xz 593944 SHA256 8905e174069a6caf0200808fda6726704a947ab56fc48c3b6ebbf8831dde4123 SHA512 5311f6cfd917c04bcb51182ad414c0930fb85a73a90d81156f08640cdb4e4d442ed46a10b62b5d07ed81aa1ad65430d5186e95cc64293502c9b84937a6470bb4 WHIRLPOOL daf741cd8465ce65ae0e3f304b7c49d55be828da5fc285ac3a2b8e6fc7e68865b184b738a79fa7fbf1e106d647200a40224902ef7041e4dd5ab2c9ef054e4199
-DIST vbox-kernel-module-src-5.0.32.tar.xz 600916 SHA256 30fdc07a999b7ef7e401d425e6663c7da31df477ef810b69405b0752c36bfbd9 SHA512 22c7ade7c8d4b3883bd09893fdb2016d54394d54a1ce0b442caae0b63fecead2b817e22290cb14ea1089b259f31d0f39ceb991e97c9a6b93067819b7eb5e7436 WHIRLPOOL 1a512ecb033f5803a41009e5decc6b420ac50d01f3619d011d8a3fc21975dfbb05d680221ade03b810435f54228b87a82f2f770dfb9ac93f519bb54f2cce1f1c
DIST vbox-kernel-module-src-5.0.40.tar.xz 601604 SHA256 fb5dd2a62e1a53266f32c35523fa5ccc1d7928d4867c92637ef7368686acb70d SHA512 1236b16f2138872233a1a4f8933ec8803c7a15370cfadc148d338c803da572480d978d6be4b2512c3c80f7ee77cfef3d0a939b876ba9c53afbd267b24e2bfa65 WHIRLPOOL 59916e48536e1711cf0d98fecd3fe3ea0cce4b2eec622d34e5e52f20b05adb45dc627f4de5e55cfc92e2669b0fe71d4e1ba361d911d51da5bad3d80c42a66d24
-DIST vbox-kernel-module-src-5.1.22.tar.xz 620064 SHA256 e4d92a9cc6eb677d75364cb09f7e47360f80fb80f434caea2cc65b25853f94c4 SHA512 e38f67cc36bdb5b98546816eb66ad29b5b93830afa12e850ae00aae4382acd13e1a25d9c7f3e8bfb5e42636499798c95eb632c599ab96e51c55e0a77fa693e73 WHIRLPOOL c90c86e2c4c78c82f25c3c97d6efc13d5f098bd6266ad4f7b5a62f79d0dc2c2a823ec955b0d58d72aa363475b2ff784634b50742be40fc801f62707928e405b7
DIST vbox-kernel-module-src-5.1.24.tar.xz 625508 SHA256 279e8ac5d5342896c63fd94dfe04d2462f759318b1dfc9eb3a617fbf8cc5e683 SHA512 2a2de8b4b328234470ed5f2209d792efef0c81251c20e45c13b923865fe5855d76512f17f8727daa17c10b09306748f70c1ec588a027c31645f7c676f96fca4c WHIRLPOOL eeaea483c46e0533053aff80af1f990fbaaeb073c7fbe535ec8425be6e73840c332dc3f22ccb0b6cd3b0f05a24fd206beb50dcdf8edf0245f4fa5be957bbb8d7
+DIST vbox-kernel-module-src-5.1.26.tar.xz 625384 SHA256 5ba4f728c5b62c3d93828d99c5b54b8fb24a16bc8674e704714c4f71eb95ddc4 SHA512 c77e0d8dfade2abac95162e7e7a424be4875e44d43bcf2a13e0e50caa69f5fd0d21c77f03bb2cd4cbd5df4ab31e9fbd49ecd9220a49af8cd10081b960e014010 WHIRLPOOL 519246aeae6637cb8eb4b841552dc5e63f9a3d761fa6bcec43601c8a3194264457e4e78d200e975e31266af2944aa81f7487cf389f43d93db08f60a700a7758e
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.32.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.32.ebuild
deleted file mode 100644
index fc282ccbb370..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.32.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-# package that comes from virtualbox-bin
-
-EAPI=6
-
-inherit eutils linux-mod user
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
- enewgroup vboxusers
-
- CONFIG_CHECK="!TRIM_UNUSED_KSYMS"
- ERROR_TRIM_UNUSED_KSYMS="The kernel option CONFIG_TRIM_UNUSED_KSYMS removed kernel symbols that are needed by ${PN} to load correctly."
-
- linux-mod_pkg_setup
-
- BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
- if kernel_is -ge 2 6 33 ; then
- # evil patch for new kernels - header moved
- grep -lR linux/autoconf.h * | xargs sed -i -e 's:::'
- fi
-
- if use pax_kernel && kernel_is -ge 3 0 0 ; then
- epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
- fi
-
- default
-}
-
-src_install() {
- linux-mod_src_install
- insinto /usr/lib/modules-load.d/
- doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
- elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\","
- elog "\"vboxnetadp\" and \"vboxpci\" to:"
- elog " /etc/conf.d/modules"
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.40.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.40.ebuild
index 6600e4fb53b0..fc282ccbb370 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.40.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.40.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="pax_kernel"
RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.22.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.26.ebuild
similarity index 100%
rename from app-emulation/virtualbox-modules/virtualbox-modules-5.1.22.ebuild
rename to app-emulation/virtualbox-modules/virtualbox-modules-5.1.26.ebuild
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 58ba0e33546b..e431434fef86 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,9 +1,7 @@
DIST VirtualBox-5.0.16.tar.bz2 111062984 SHA256 f5a44d33a1db911f445b2eb2d22d9293a96a535cba488b5a235577ef868fa63c SHA512 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074 WHIRLPOOL ea709057c588f28820790c2b193decba9ee0c57e0f82aa4361ca87aef661315182e18b5ee29558e47ed92f6037eb91befa5390680661a7b9f2248c7819b4a85c
-DIST VirtualBox-5.0.32.tar.bz2 111684963 SHA256 4a48d4a8b6ca68353bd39f2c9d2896e1659818959f858e8326ef649481d15550 SHA512 77e479e43a08bd9656792cc8e58bbb4e57e1290803bc100a00b9595f2dfdf580607c9a1d38f72aebf638cf6ba3f63bef79913301c8b2a135b5cfcf35a44707e4 WHIRLPOOL 1b03a9368259e1704981dcd64f773f8097d03c582e8c18a012c55463d5bbb15b2521e83f51fe3cf4fe30822db26726c9ff145d711cb97ae2287368068338a9a4
DIST VirtualBox-5.0.40.tar.bz2 112997095 SHA256 e4275b7ada40b358e6e3bd1231b3a320aa06c72ae301283cac5adb42eaa8e4b5 SHA512 70cd4355591c5aed82148954bf55637a5dcdd1a5177dba78192e7c6eadfbf3f7023f352ba8f89d9eb3c3fc55b049f7c76af6bc94e04d1766d7fbe39e51a1393c WHIRLPOOL 9f471e63814c9d48063857f3b95410f5acdd4a3bd2716c525f2449f1eae95d0e91dbe5422374a49f31f8219daa155f716455f0259d131d93afb5cd9e13a7d467
-DIST VirtualBox-5.1.22.tar.bz2 115838360 SHA256 fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899 SHA512 e48457371c9139fc04477c82fbd18974378fde08af2a6f9058a0eafa6e522987bd129b8d87c9f381789c4e817aded752fde6ea7fcb2ade471997373802e09348 WHIRLPOOL c6034aad69c8a25eaf5909b6889f04f8090ace562e18a76bc55ad4d3e8347844fa1ab466d32e92b09180dff71e0f928826db0994d34b03f44b11bdb03ccc40d2
DIST VirtualBox-5.1.24.tar.bz2 116135442 SHA256 ee2db169a322bf0db3c3b6d8b84aa39236f36cbf37d0a4c10ab65902a396bb60 SHA512 3c9ad230a53f9159e648ae1f342bdb220ffd85f2ddd45ae4c61d6606f358e9343a4968b2a91784893fb1284288ad41c538b1ab299b3a49e7739bfc8c4fdea910 WHIRLPOOL aad73184e2d36928449e688fd86c6f42c061f77e86c7e6119a205154b307846ed25175f49e3f8e451844b48c0e71e9531902753f1fd917123c401ffbf7744a2d
+DIST VirtualBox-5.1.26.tar.bz2 115915813 SHA256 b5715035e681a11ef1475f83f9503d34a00f0276b89c572eebec363dda80c8a9 SHA512 680e9646a51a0a5923b3ded10007ee1c1e2a41c6d8a961d2b2540db6578bed2847154f4cac87e3cfe1118a62595b47c7df99da854f6c340e173b9eb8cacf2add WHIRLPOOL 9d7950ec3ec2cd9b8aaa0ea319f9f5089eed7d2cd2879d313426b448a27570b5582235aa46c5ad5a0fd4d0b967f8d58a963f001549232136d6a8609262af71d0
DIST virtualbox-5.0.16-patches-01.tar.xz 4024 SHA256 200eb980a12323a61d0fa6dbf61ed64ee1e2bb5e18e16eabdf8668d8fd8be3e4 SHA512 4eed117253754abee9088d4c320b4a6f0b3e1c8313b98f354cb727001156fe68d553a677073d40b921437f4cc073420866d1533aad4e61a79607d8360abbfd4a WHIRLPOOL ab40851873d55ae873ca8ff88670a17476c0d502116f4abda7b766064a2daa71929eb69b4b68c64c3d2d0762134fe85d07044bdedde4bf15924520a604972aaa
DIST virtualbox-5.0.32-patches-01.tar.xz 4400 SHA256 e5bf5b5b391b3402172b5a30952da50affacaeaf40a75df0430ad623fcd8ed6f SHA512 5df0ecb4f9190375edc62d231aacd381c36a1697cc33df48b2f2d68a05ca1c855d127e466eda62030736dbcee76f5c67a519a2f42b72eacaf7ed65a8cf991e8a WHIRLPOOL 4c11787951848aadacc0772df5a46ce8d54445e0120901be280f493d4cc6333e986d0376f33ac0217dbb23758240c025028ea1d21c360fc2840c8e3003a0ff62
-DIST virtualbox-5.1.18-patches-01.tar.xz 4512 SHA256 1aa525a8230f77abc672e61bea76af9ddfbb8f22acf21ef382b7a0a88de92764 SHA512 f1c88dd9b7fbafb9764df0a88dc5615aa78a01408d0a14c0dae33e3a53bd75c191c0181934848e17f5fd77784f9e01bf44b444f1485fc302cb1538c2e8ddac95 WHIRLPOOL c11adda0297cc18f0ac614a3492c411413bf640090c9cdb4c5382c4da0391734c479d92c2933e46e0dc8ccf59e155ce35e72182abcb5015a7e03ec33d51c1ab0
DIST virtualbox-5.1.24-patches-01.tar.xz 2708 SHA256 8ea5e08da07d555a4868abf6f4d689c2f6695bdb773010a01915fcc6c354f361 SHA512 0028e593818013f809831ac5a73eec63988c0aefb4b309fb3c928efbea8db8b8f46bd7c82f156396adc704f0567474df262dfe9bb6e09af0b2c23528fe2c6e2d WHIRLPOOL 5a1af78c2767608d2b1c2a4b262dbce038d2b6ed9d0499eb60ac1eb64fd6b832efdbafc2b85881ac67efd8794adcc3490fcbf61b74ad7ae576d52e8aff597b04
diff --git a/app-emulation/virtualbox/virtualbox-5.0.32.ebuild b/app-emulation/virtualbox/virtualbox-5.0.32.ebuild
deleted file mode 100644
index e691c0abfb19..000000000000
--- a/app-emulation/virtualbox/virtualbox-5.0.32.ebuild
+++ /dev/null
@@ -1,435 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
- https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.32-patches-01.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug doc headless java libressl lvm pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
- ~app-emulation/virtualbox-modules-${PV}
- dev-libs/libIDL
- >=dev-libs/libxslt-1.1.19
- net-misc/curl
- dev-libs/libxml2
- media-libs/libpng:0=
- media-libs/libvpx:0=
- sys-libs/zlib
- !headless? (
- media-libs/libsdl:0[X,video]
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- opengl? ( virtual/opengl media-libs/freeglut )
- qt4? (
- dev-qt/qtgui:4
- dev-qt/qtcore:4
- opengl? ( dev-qt/qtopengl:4 )
- x11-libs/libXinerama
- )
- )
- java? ( >=virtual/jre-1.6:= )
- libressl? ( dev-libs/libressl:= )
- !libressl? ( dev-libs/openssl:0= )
- lvm? ( sys-fs/lvm2 )
- udev? ( >=virtual/udev-171 )
- vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
- >=dev-util/kbuild-0.1.9998_pre20131130
- >=dev-lang/yasm-0.6.2
- sys-devel/bin86
- sys-libs/libcap
- sys-power/iasl
- virtual/pkgconfig
- alsa? ( >=media-libs/alsa-lib-1.0.13 )
- doc? (
- app-text/docbook-sgml-dtd:4.4
- dev-texlive/texlive-basic
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexrecommended
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-fontsextra
- )
- !headless? ( x11-libs/libXinerama )
- java? ( >=virtual/jre-1.6:= )
- pam? ( sys-libs/pam )
- pulseaudio? ( media-sound/pulseaudio )
- vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
- ${PYTHON_DEPS}"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
- usr/lib/virtualbox/VBoxSDL.so
- usr/lib/virtualbox/VBoxSharedFolders.so
- usr/lib/virtualbox/VBoxDD2.so
- usr/lib/virtualbox/VBoxOGLrenderspu.so
- usr/lib/virtualbox/VBoxPython.so
- usr/lib/virtualbox/VBoxDD.so
- usr/lib/virtualbox/VBoxDDU.so
- usr/lib/virtualbox/VBoxREM64.so
- usr/lib/virtualbox/VBoxSharedClipboard.so
- usr/lib/virtualbox/VBoxHeadless.so
- usr/lib/virtualbox/VBoxRT.so
- usr/lib/virtualbox/VBoxREM.so
- usr/lib/virtualbox/VBoxSettings.so
- usr/lib/virtualbox/VBoxKeyboard.so
- usr/lib/virtualbox/VBoxSharedCrOpenGL.so
- usr/lib/virtualbox/VBoxVMM.so
- usr/lib/virtualbox/VirtualBox.so
- usr/lib/virtualbox/VBoxOGLhosterrorspu.so
- usr/lib/virtualbox/components/VBoxC.so
- usr/lib/virtualbox/components/VBoxSVCM.so
- usr/lib/virtualbox/components/VBoxDDU.so
- usr/lib/virtualbox/components/VBoxRT.so
- usr/lib/virtualbox/components/VBoxREM.so
- usr/lib/virtualbox/components/VBoxVMM.so
- usr/lib/virtualbox/VBoxREM32.so
- usr/lib/virtualbox/VBoxPython2_7.so
- usr/lib/virtualbox/VBoxXPCOMC.so
- usr/lib/virtualbox/VBoxOGLhostcrutil.so
- usr/lib/virtualbox/VBoxNetDHCP.so
- usr/lib/virtualbox/VBoxNetNAT.so"
-
-REQUIRED_USE="
- java? ( sdk )
- python? ( sdk )
- vboxwebsrv? ( java )
- ${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
- if ! use headless && ! use qt4 ; then
- einfo "No USE=\"qt4\" selected, this build will not include"
- einfo "any Qt frontend."
- elif use headless && use qt4 ; then
- einfo "You selected USE=\"headless qt4\", defaulting to"
- einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
- fi
-
- if ! use opengl ; then
- einfo "No USE=\"opengl\" selected, this build will lack"
- einfo "the OpenGL feature."
- fi
- if ! use python ; then
- einfo "You have disabled the \"python\" USE flag. This will only"
- einfo "disable the python bindings being installed."
- fi
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
-
- tc-ld-disable-gold #bug 488176
- tc-export CC CXX LD AR RANLIB
- export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
- # Remove shipped binaries (kBuild,yasm), see bug #232775
- rm -r kBuild/bin tools || die
-
- # Remove pointless GCC version check
- sed -e '/^check_gcc$/d' -i configure || die
-
- # Disable things unused or split into separate ebuilds
- sed -e "s@MY_LIBDIR@$(get_libdir)@" \
- "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
- # Respect LDFLAGS
- sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
- -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
- # Do not use hard-coded ld (related to bug #488176)
- sed -e '/QUIET)ld /s@ld @$(LD) @' \
- -i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
- # Use PAM only when pam USE flag is enbaled (bug #376531)
- if ! use pam ; then
- elog "Disabling PAM removes the possibility to use the VRDP features."
- sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
- sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
- src/VBox/HostServices/Makefile.kmk || die
- fi
-
- # add correct java path
- if use java ; then
- sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
- -i "${S}"/Config.kmk || die
- java-pkg-opt-2_src_prepare
- fi
-
- #if ! gcc-specs-pie ; then
- rm "${WORKDIR}/patches/050_${PN}-5.0.2-nopie.patch" || die
- #fi
-
- eapply "${WORKDIR}/patches"
-
- eapply_user
-}
-
-src_configure() {
- local myconf
- use alsa || myconf+=( --disable-alsa )
- use debug && myconf+=( --build-debug )
- use doc || myconf+=( --disable-docs )
- use java || myconf+=( --disable-java )
- use lvm || myconf+=( --disable-devmapper )
- use opengl || myconf+=( --disable-opengl )
- use pulseaudio || myconf+=( --disable-pulse )
- use python || myconf+=( --disable-python )
- use vboxwebsrv && myconf+=( --enable-webservice )
- use vnc && myconf+=( --enable-vnc )
- if ! use headless ; then
- use qt4 || myconf+=( --disable-qt4 )
- else
- myconf+=( --build-headless --disable-opengl )
- fi
- if use amd64 && ! has_multilib_profile ; then
- myconf+=( --disable-vmmraw )
- fi
- # not an autoconf script
- ./configure \
- --with-gcc="$(tc-getCC)" \
- --with-g++="$(tc-getCXX)" \
- --disable-dbus \
- --disable-kmods \
- ${myconf[@]} \
- || die "configure failed"
-}
-
-src_compile() {
- source ./env.sh || die
-
- MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
- MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') #'
- MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
- MAKE="kmk" emake \
- VBOX_BUILD_PUBLISHER=_Gentoo \
- TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
- TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
- TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
- TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
- VBOX_GCC_OPT="${CXXFLAGS}" \
- TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
- all
-}
-
-src_install() {
- local binpath="release"
- use debug && binpath="debug"
- cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
-
- local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile
-
- vbox_inst() {
- local binary="${1}"
- local perms="${2:-0750}"
- local path="${3:-${vbox_inst_path}}"
-
- [[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
- [[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
- insinto ${path}
- doins ${binary}
- fowners root:vboxusers ${path}/${binary}
- fperms ${perms} ${path}/${binary}
- }
-
- # Create configuration files
- insinto /etc/vbox
- newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
- # Set the right libdir
- sed -i \
- -e "s@MY_LIBDIR@$(get_libdir)@" \
- "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
- # Install the wrapper script
- exeinto ${vbox_inst_path}
- newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
- fowners root:vboxusers ${vbox_inst_path}/VBox
- fperms 0750 ${vbox_inst_path}/VBox
-
- # Install binaries and libraries
- insinto ${vbox_inst_path}
- doins -r components
-
- # *.rc files for x86_64 are only available on multilib systems
- local rcfiles="*.rc"
- if use amd64 && ! has_multilib_profile ; then
- rcfiles=""
- fi
- for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
- vbox_inst ${each}
- done
-
- # These binaries need to be suid root in any case.
- for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
- vbox_inst ${each} 4750
- done
-
- # Install EFI Firmware files (bug #320757)
- pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
- for fwfile in VBoxEFI{32,64}.fd ; do
- vbox_inst ${fwfile} 0644
- done
- popd &>/dev/null || die
-
- # VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
- # VBoxXPCOMIPCD (bug #524202)
- for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
- pax-mark -m "${D}"${vbox_inst_path}/${each}
- done
-
- # Symlink binaries to the shipped wrapper
- for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
- dosym ${vbox_inst_path}/VBox /usr/bin/${each}
- done
- dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-
- # VRDPAuth only works with this (bug #351949)
- dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-
- # set an env-variable for 3rd party tools
- echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
- doenvd "${T}/90virtualbox"
-
- if ! use headless ; then
- vbox_inst VBoxSDL 4750
- pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
-
- for each in vboxsdl VBoxSDL ; do
- dosym ${vbox_inst_path}/VBox /usr/bin/${each}
- done
-
- if use opengl && use qt4 ; then
- vbox_inst VBoxTestOGL
- pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
- fi
-
- if use qt4 ; then
- vbox_inst VirtualBox 4750
- pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
-
- for each in virtualbox VirtualBox ; do
- dosym ${vbox_inst_path}/VBox /usr/bin/${each}
- done
-
- insinto /usr/share/${PN}
- doins -r nls
-
- newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
- fi
-
- pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
- for size in 16 32 48 64 128 ; do
- newicon -s ${size} ${PN}-${size}px.png ${PN}.png
- done
- newicon ${PN}-48px.png ${PN}.png
- doicon -s scalable ${PN}.svg
- popd &>/dev/null || die
- fi
-
- if use lvm ; then
- vbox_inst VBoxVolInfo 4750
- dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
- fi
-
- if use sdk ; then
- insinto ${vbox_inst_path}
- doins -r sdk
-
- if use java ; then
- java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
- java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
- fi
- fi
-
- if use udev ; then
- # New way of handling USB device nodes for VBox (bug #356215)
- local udevdir="$(get_udevdir)"
- insinto ${udevdir}
- doins VBoxCreateUSBNode.sh
- fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
- fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
- insinto ${udevdir}/rules.d
- sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
- > "${T}"/10-virtualbox.rules || die
- doins "${T}"/10-virtualbox.rules
- fi
-
- if use vboxwebsrv ; then
- vbox_inst vboxwebsrv
- dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
- newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
- newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
- fi
-
- if use doc ; then
- dodoc UserManual.pdf
- fi
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-
- if use udev ; then
- udevadm control --reload-rules \
- && udevadm trigger --subsystem-match=usb
- fi
-
- if ! use headless && use qt4 ; then
- elog "To launch VirtualBox just type: \"virtualbox\"."
- fi
- elog "You must be in the vboxusers group to use VirtualBox."
- elog ""
- elog "The latest user manual is available for download at:"
- elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
- elog ""
- elog "For advanced networking setups you should emerge:"
- elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
- elog ""
- elog "IMPORTANT!"
- elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
- elog "\"env-update\" as root and logout and relogin as the user you wish"
- elog "to run ${PN} as."
- elog ""
- elog "Starting with version 4.0.0, ${PN} has USB-1 support."
- elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
- elog " app-emulation/virtualbox-extpack-oracle"
- elog "package."
- elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
- elog "the \"extension\" USE flag. For installation of the guest additions ISO"
- elog "image, please emerge"
- elog " app-emulation/virtualbox-additions"
- elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
- elog " app-emulation/virtualbox-extpack-oracle"
- if ! use udev ; then
- elog ""
- elog "WARNING!"
- elog "Without USE=udev, USB devices will likely not work in ${PN}."
- elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
- elog ""
- elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
- elog "or else USB in ${PN} won't work."
- fi
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-5.0.40.ebuild b/app-emulation/virtualbox/virtualbox-5.0.40.ebuild
index b10aa02ea3df..e691c0abfb19 100644
--- a/app-emulation/virtualbox/virtualbox-5.0.40.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.0.40.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.virtualbox.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="alsa debug doc headless java libressl lvm pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
RDEPEND="!app-emulation/virtualbox-bin
diff --git a/app-emulation/virtualbox/virtualbox-5.1.24.ebuild b/app-emulation/virtualbox/virtualbox-5.1.24.ebuild
index 8249f3d55e26..e874868ea021 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.24.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.24.ebuild
@@ -182,9 +182,9 @@ src_prepare() {
fi
# Only add nopie patch when we're on hardened
- #if ! gcc-specs-pie ; then
- # rm "${WORKDIR}"/patches/050_${PN}-*-nopie.patch || die
- #fi
+ if gcc-specs-pie ; then
+ eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
+ fi
# Only add paxmark patch when we're on pax_kernel
if use pax_kernel ; then
@@ -192,7 +192,6 @@ src_prepare() {
fi
eapply "${WORKDIR}/patches"
- eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
eapply_user
}
diff --git a/app-emulation/virtualbox/virtualbox-5.1.22-r1.ebuild b/app-emulation/virtualbox/virtualbox-5.1.26.ebuild
similarity index 92%
rename from app-emulation/virtualbox/virtualbox-5.1.22-r1.ebuild
rename to app-emulation/virtualbox/virtualbox-5.1.26.ebuild
index fda76d43805c..9dcba04f6d28 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.22-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.26.ebuild
@@ -4,13 +4,13 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev
+inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev xdg-utils
MY_PV="${PV/beta/BETA}"
MY_PV="${MY_PV/rc/RC}"
MY_P=VirtualBox-${MY_PV}
SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
- https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.1.18-patches-01.tar.xz"
+ https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.1.24-patches-01.tar.xz"
S="${WORKDIR}/${MY_P}"
DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
@@ -147,8 +147,12 @@ src_prepare() {
# Remove shipped binaries (kBuild,yasm), see bug #232775
rm -r kBuild/bin tools || die
- # Remove pointless GCC version check
- sed -e '/^check_gcc$/d' -i configure || die
+ # Replace pointless GCC version check with something less stupid.
+ # This is needed for the qt5 version check.
+ sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' -i configure || die
+
+ # Don't use "echo -n"
+ sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -i configure || die
# Disable things unused or split into separate ebuilds
sed -e "s@MY_LIBDIR@$(get_libdir)@" \
@@ -178,8 +182,8 @@ src_prepare() {
fi
# Only add nopie patch when we're on hardened
- if ! gcc-specs-pie ; then
- rm "${WORKDIR}"/patches/050_${PN}-*-nopie.patch || die
+ if gcc-specs-pie ; then
+ eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
fi
# Only add paxmark patch when we're on pax_kernel
@@ -188,13 +192,17 @@ src_prepare() {
fi
eapply "${WORKDIR}/patches"
- eapply "${FILESDIR}/${P}-opengl_dlopen_fix.patch" #616238
eapply_user
}
src_configure() {
- local myconf=()
+ local myconf=(
+ --with-gcc="$(tc-getCC)"
+ --with-g++="$(tc-getCXX)"
+ --disable-dbus
+ --disable-kmods
+ )
use alsa || myconf+=( --disable-alsa )
use debug && myconf+=( --build-debug )
use doc || myconf+=( --disable-docs )
@@ -214,21 +222,15 @@ src_configure() {
myconf+=( --disable-vmmraw )
fi
# not an autoconf script
- ./configure \
- --with-gcc="$(tc-getCC)" \
- --with-g++="$(tc-getCXX)" \
- --disable-dbus \
- --disable-kmods \
- ${myconf[@]} \
- || die "configure failed"
+ ./configure ${myconf[@]} || die "configure failed"
}
src_compile() {
source ./env.sh || die
# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
- MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
- MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') #'
+ MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+ MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
MAKE="kmk" emake \
VBOX_BUILD_PUBLISHER=_Gentoo \
@@ -408,7 +410,7 @@ src_install() {
}
pkg_postinst() {
- fdo-mime_desktop_database_update
+ xdg_desktop_database_update
if use udev ; then
udevadm control --reload-rules \
@@ -445,13 +447,13 @@ pkg_postinst() {
elog ""
elog "WARNING!"
elog "Without USE=udev, USB devices will likely not work in ${PN}."
- elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+ elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
elog ""
- elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+ elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
elog "or else USB in ${PN} won't work."
fi
}
pkg_postrm() {
- fdo-mime_desktop_database_update
+ xdg_desktop_database_update
}
diff --git a/app-eselect/eselect-php/eselect-php-0.9.4.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r1.ebuild
similarity index 97%
rename from app-eselect/eselect-php/eselect-php-0.9.4.ebuild
rename to app-eselect/eselect-php/eselect-php-0.9.4-r1.ebuild
index a05df2fe1bb9..4dec17a54184 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.4.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.4-r1.ebuild
@@ -45,7 +45,7 @@ src_install() {
if use fpm ; then
systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
exeinto /usr/libexec
- newexe "${FILESDIR}/php-fpm-launcher-r1" php-fpm-launcher
+ newexe "${FILESDIR}/php-fpm-launcher-r2" php-fpm-launcher
fi
}
diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild
index 7a707fb14809..f695558d423a 100644
--- a/app-eselect/eselect-php/eselect-php-9999.ebuild
+++ b/app-eselect/eselect-php/eselect-php-9999.ebuild
@@ -50,7 +50,7 @@ src_install() {
if use fpm ; then
systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
exeinto /usr/libexec
- newexe "${FILESDIR}/php-fpm-launcher-r1" php-fpm-launcher
+ newexe "${FILESDIR}/php-fpm-launcher-r2" php-fpm-launcher
fi
}
diff --git a/app-eselect/eselect-php/files/php-fpm-launcher-r1 b/app-eselect/eselect-php/files/php-fpm-launcher-r1
deleted file mode 100644
index c7cc2e983a01..000000000000
--- a/app-eselect/eselect-php/files/php-fpm-launcher-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-source /lib/gentoo/functions.sh
-
-PHPSLOT="${1}"
-[ -z "${PHPSLOT}" ] && PHPSLOT="$(eselect php show fpm)"
-shift
-
-exec /usr/$(get_libdir)/${PHPSLOT}/bin/php-fpm "${@}"
diff --git a/app-eselect/eselect-php/files/php-fpm-launcher-r2 b/app-eselect/eselect-php/files/php-fpm-launcher-r2
new file mode 100644
index 000000000000..db07a1352d8c
--- /dev/null
+++ b/app-eselect/eselect-php/files/php-fpm-launcher-r2
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -o errexit
+
+. /lib/gentoo/functions.sh
+
+# If there are no arguments, then "shift" will fail (bug 626496).
+if [ $# -eq 0 ]; then
+ PHP_SLOT=$(eselect php show fpm)
+else
+ PHP_SLOT=$1
+ shift
+fi
+
+exec "/usr/$(get_libdir)/${PHP_SLOT}/bin/php-fpm" "${@}"
diff --git a/app-misc/sl/sl-5.02.ebuild b/app-misc/sl/sl-5.02.ebuild
index 9df694b3499d..223474eab81f 100644
--- a/app-misc/sl/sl-5.02.ebuild
+++ b/app-misc/sl/sl-5.02.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mtoyoda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Toyoda"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="l10n_ja"
RDEPEND="sys-libs/ncurses:0="
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index 027308891f32..96fce57e9fe7 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -1,4 +1,4 @@
DIST homebank-4.6.3.tar.gz 1899045 SHA256 f6e31bb789d626b507c2af9d176a0bac0cbaec770ede73048ba7a6df113a6948 SHA512 aab7374d90ffc52a40188eb334fc9b3461c299014d6134f236488991400fffe9f6dcb69247501857fe4caafbb08f0c5d729211b13551203f1231d136e99e024d WHIRLPOOL e8f6a421c64eb1bf6f2d97910e4687b00cf794fd27c8aff83ce9d39e18393cccca1984e73a44110ff5e87427fd0ed74963dcb997490d97614116800100daca5b
DIST homebank-5.0.9.tar.gz 2734386 SHA256 d0bc763e94da0cba544495b07070e79faecf1d5de0cfb092d126482525e062b7 SHA512 832229de9812621bcce3037f1f70eb63cf96cb33468e0e76202ebe3a489544090d5b54fdc7b42feefaf7722c3f42c6d9bc45ee5fbd1b8638c2e54b65ea03357f WHIRLPOOL 4cc8d4a062e4b2f94324307e2b8a8b63caf26095708a814d8561d8818046d6c9fb1d4608fb254366c97cbe0baa8c1d3986d3f233e1a4c32e7cd53ee1380a6add
-DIST homebank-5.1.1.tar.gz 2675174 SHA256 9cd36ddc6931fd95ef5bcc6a723b3df0651b32e19465570d223c21ac1d5aa4bd SHA512 46dea5ed5d134cb30aafaf6890853156753733a89266e2b83297315e4b2a4b570c73d89ff6aa12799a8bc502cc31a95174c09f273260049375f14fa896ce33c8 WHIRLPOOL 5074618039f5d7d6329f119ab4ab9644998e96c0961f5eecfd86514d574509d3fa967f888e4e3b4f1211049123c4acbe83a5b273f43524e209c800debe88b7f1
DIST homebank-5.1.3.tar.gz 2686661 SHA256 22b2baf2e66fee2f97c7a6050298aa6d2502d75f02f046259e4181512714fb73 SHA512 c95ac2871c3219d734aeb35d11e1e678efc50e166e2f8c1f05971fd341ac1598d6d672bd4b7cd7bcc206443af5305c9e1eb0557c3fcaab1ea35f4950acdef103 WHIRLPOOL 0d6e6fc3ddc82a4aedaadec62c4743166b8718c44e1dec37767f332ef8437c58b7cb32b44e92e97450ad7b6f256e89ea57b12043f815423f24a4a8aff5b29646
+DIST homebank-5.1.5.tar.gz 2698391 SHA256 5c3fd3478577e91a5d8e6e28fced58b5ad611eecb06e8f335a9585b817a1330f SHA512 674a6385f427ba23039745b476d7474c9f41f0183d5a41d6fa340fe36cc9b0b3a4a3da30dfecc4c4c3b8bfc72aba751799a5750b71eaf28b13333475d31e92e0 WHIRLPOOL 6c5cbaab7f08016934d12f14ed374c26c49204e27fcbef35dc4364042af0d34c7638634b597850d179513dcc3c5120798729ca55be4fd51573fe3dac58916bbb
diff --git a/app-office/homebank/homebank-5.1.1.ebuild b/app-office/homebank/homebank-5.1.5.ebuild
similarity index 74%
rename from app-office/homebank/homebank-5.1.1.ebuild
rename to app-office/homebank/homebank-5.1.5.ebuild
index e123addd9007..7fd086f1ad40 100644
--- a/app-office/homebank/homebank-5.1.1.ebuild
+++ b/app-office/homebank/homebank-5.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-inherit fdo-mime eutils gnome2-utils
+inherit xdg-utils eutils gnome2-utils
DESCRIPTION="Free, easy, personal accounting for everyone"
HOMEPAGE="http://homebank.free.fr/index.php"
@@ -29,6 +29,11 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog README )
+src_prepare(){
+ echo src/hb-payee.c >> po/POTFILES.in || die
+ eapply_user
+}
+
src_configure() {
econf $(use_with ofx)
}
@@ -38,13 +43,13 @@ pkg_preinst() {
}
pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
gnome2_icon_cache_update
}
pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
gnome2_icon_cache_update
}
diff --git a/app-office/projectlibre-bin/Manifest b/app-office/projectlibre-bin/Manifest
index 297fc14773e0..10c56561b536 100644
--- a/app-office/projectlibre-bin/Manifest
+++ b/app-office/projectlibre-bin/Manifest
@@ -1 +1,2 @@
DIST projectlibre-1.6.2.tar.gz 14735171 SHA256 72ea964533a2da0af0882acb91268647e7f5a99151b0abb8f3b84c6f26229fc4 SHA512 128319a37aeeb4603fd45433e3961805b0de30e5760394d5eef2de1910bff3815e600462aa3264fa64df55eb8568849895c9d673e5574badafcbc1df89e2c9e7 WHIRLPOOL 78124a7a2dd488b55938cd0e2465ab5212dd3cc9dfb673a408664667fe49458ac6cf8aa9b684832e51c1af18f7fdd48acd5fd967db70eb4ee5f9f3b70c615289
+DIST projectlibre.png 7955 SHA256 a466a61385aa61b00ab38dfcf030eb223931247b90c543d17f973ba270c7477b SHA512 db6e87e74fac3274be34b36cd9daf7231f06e19096cfbe2feeb616c1ae1a60ffc838a81b45b94621d806e00ef5e220391f1d1be3148f9895aa467fdbcac62843 WHIRLPOOL f3d9f800c3c6b3ecbb7c90768184aa1e45b3d7f1b701455d339575a78ff98024fbec5a58de59986edf204627eb04a6576a3e4061d0c05303d8261e351c87b39b
diff --git a/app-office/projectlibre-bin/files/projectlibre.png b/app-office/projectlibre-bin/files/projectlibre.png
deleted file mode 100644
index a68aff0629ff..000000000000
Binary files a/app-office/projectlibre-bin/files/projectlibre.png and /dev/null differ
diff --git a/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild b/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild
index caff7f33b159..4631aa88b465 100644
--- a/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild
+++ b/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild
@@ -10,7 +10,8 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="An open source desktop alternative to Microsoft Project"
HOMEPAGE="http://www.projectlibre.org/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz
+ mirror://gentoo/${MY_PN}.png"
LICENSE="CPAL-1.0"
SLOT="0"
@@ -24,7 +25,7 @@ S=${WORKDIR}/${MY_P}
src_unpack() {
unpack ${MY_P}.tar.gz
- cp "${FILESDIR}"/${MY_PN}.{desktop,png} ./ || die
+ cp "${FILESDIR}"/${MY_PN}.desktop "${DISTDIR}"/${MY_PN}.png ./ || die
cd "${S}"
rm -rf license projectlibre.bat
}
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 15f162212ce4..c4c11e14cb92 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,2 +1,3 @@
DIST ansifilter-2.4.tar.bz2 114180 SHA256 c57cb878afa7191c7b7db3c086a344b4234df814aed632596619a4bda5941d48 SHA512 2eaecd7dc6027c6976775d2a817b8fde0221fb1cce967bd4f6e272230b64e0bb77ed0cbddbc41533aa6087897b94903efa9633dffdd76df57ba029f6776ae6d2 WHIRLPOOL df5f96802c4b988ee3c3326dc0a6ecc2ab594fe766c6e5118d1695a05adf3969d51b0a89b1bfbc0b94cb84325131dc39622334c549a47e0ffa76c0e3fca7a997
DIST ansifilter-2.5.tar.bz2 435332 SHA256 30d05ccfa9be98b0328ee29fe39473e55047f1d32a9a2460d3d4d1ff2475f0e2 SHA512 2fca95a5a47e72f9348beef8b09a7fd995f0b99e0d6605cf7694f8fd1ddba40c64e5c30b9134f55319c902d45011605ba30184c0205d41573ac77c3cd98debe7 WHIRLPOOL 5c3c3cd8f1cef99ad0d4ea5ce7635301776cb5ce14442d74a1949894c24becb4d3727344f7b1cf2e137bc8abfc8469c23d13e0055529c04f9aafeb991e7cf7f6
+DIST ansifilter-2.6.tar.bz2 436252 SHA256 4e3abd8c18197db85575c38418dbc8ee424d0caa0681589e5296fc8e72251175 SHA512 2b1aabb37eaee6bdd853dce7a1509e1c7df1a03c58e9f4f34dca6237e71115faff0ec6a6b788fa1035264b4bb9cb5e927f2d2c6d8eb870b23806f40a9d9129f3 WHIRLPOOL d12fdb240d613ba16b2c0c7eb3535dae33be6519a2135395473dd94126c963b634a47dff7bd214fb9168ff031d4a8cdc2d92b59c003e0f6bce363b840956b4b4
diff --git a/app-text/ansifilter/ansifilter-2.6.ebuild b/app-text/ansifilter/ansifilter-2.6.ebuild
new file mode 100644
index 000000000000..a4c7a3b32c73
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-2.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs qmake-utils
+
+DESCRIPTION="Handles text files containing ANSI terminal escape codes"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt5"
+
+RDEPEND="
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+
+ # bug 431452
+ rm src/qt-gui/moc_mydialog.cpp || die
+}
+
+src_configure() {
+ if use qt5 ; then
+ pushd src/qt-gui > /dev/null || die
+ eqmake5
+ popd > /dev/null || die
+ fi
+}
+
+src_compile() {
+ emake -f makefile CC="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -DNDEBUG -std=c++11"
+
+ if use qt5 ; then
+ pushd src/qt-gui > /dev/null || die
+ emake
+ popd > /dev/null || die
+ fi
+}
+
+src_install() {
+ dobin src/${PN}
+ use qt5 && dobin src/qt-gui/${PN}-gui
+
+ gunzip man/${PN}.1.gz
+ doman man/${PN}.1
+ einstalldocs
+}
diff --git a/app-text/cb2bib/Manifest b/app-text/cb2bib/Manifest
index dd6f15c733d3..4336bcdc9482 100644
--- a/app-text/cb2bib/Manifest
+++ b/app-text/cb2bib/Manifest
@@ -1,2 +1 @@
-DIST cb2bib-1.9.6.tar.gz 845129 SHA256 a2715a670ad405d6599b237d058cccf9e0dbe47070ee8e5d7f799c24ea4715af SHA512 2e13d50996a5461f544ece6cac96ca32f1df1c703b9872d0ec8852a43fd0ba51041a136363fbed433b464163254b4d42ab2e6239a48567961155ae068ad6b27c WHIRLPOOL fbaaa3c77c5d90098d33c31dd13c75484be05b8c5fbf81d33b5a9a620bd9dec452fb9877f2d3c69213354763c63b56d07ff0c282d0ddd2077b8a58942a6d0571
DIST cb2bib-1.9.7.tar.gz 845121 SHA256 fae8520d85a01066434dbdc9357663467c20b4578229cea3047cc6f069dd283f SHA512 87a438288c6e7776db136de63de1a8e27f2abf8499d28c0691b60ad3ef4f848e8987af4fc47d1f2cfb1d47009e28e7535f6bab998811cb721bfc9f384941b1e4 WHIRLPOOL a4dc37345e93f815a50503108b9997717ea96885869a6aef5991f39aa1698810d7289a55da6cf330729e8e12c8399781b0eaebdbae256ac245d2700900da9529
diff --git a/app-text/cb2bib/cb2bib-1.9.6.ebuild b/app-text/cb2bib/cb2bib-1.9.6.ebuild
deleted file mode 100644
index ee41902c48f2..000000000000
--- a/app-text/cb2bib/cb2bib-1.9.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Tool for extracting unformatted bibliographic references"
-HOMEPAGE="http://www.molspaces.com/cb2bib/"
-SRC_URI="http://www.molspaces.com/dl/progs/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lzo webengine +webkit"
-
-REQUIRED_USE="?? ( webkit webengine )"
-
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- lzo? ( dev-libs/lzo:2 )
- webkit? ( dev-qt/qtwebkit:5 )
- webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS CHANGELOG COPYRIGHT )
-
-src_prepare() {
- default
-
- sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die
-
- use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die
- use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
-}
-
-src_configure() {
- eqmake5 \
- $(use !lzo && echo -config disable_lzo)
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
-}
-
-pkg_postinst() {
- einfo
- elog "For best functionality, emerge the following packages:"
- elog " app-text/poppler[utils] - for data import from PDF files"
- elog " app-text/dvipdfm - for data import from DVI files"
- elog " app-text/bibutils - for data import from ISI, endnote format"
- elog " media-fonts/jsmath - for displaying mathematical notation"
- elog " media-libs/exiftool - for proper UTF-8 metadata writing in PDF"
- elog " text strings"
- elog " virtual/latex-base - to check for BibTeX file correctness and to get"
- elog " nice printing through the shell script bib2pdf"
- einfo
-}
diff --git a/app-text/cb2bib/cb2bib-1.9.7.ebuild b/app-text/cb2bib/cb2bib-1.9.7.ebuild
index 43999dbe5292..ee41902c48f2 100644
--- a/app-text/cb2bib/cb2bib-1.9.7.ebuild
+++ b/app-text/cb2bib/cb2bib-1.9.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.molspaces.com/dl/progs/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+lzo webengine +webkit"
REQUIRED_USE="?? ( webkit webengine )"
diff --git a/app-text/dos2unix/dos2unix-7.3.5.ebuild b/app-text/dos2unix/dos2unix-7.3.5.ebuild
index 5ae2e2d762f5..7e09f7d15bea 100644
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug nls test"
RDEPEND="
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index f0644c49d58b..cb9ec8da13b8 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,3 +1,3 @@
-DIST libmwaw-0.3.10.tar.xz 1229964 SHA256 b246a0c15fcf98076f2a1f2cf4d44a714f5c8eb39690442fc7fbbd01fa34f220 SHA512 5d225ecb89466d486900a33abf10b61e6f6bbff00053c5f6ab0046960c64c3022529a1e637594eca47b14c96c9f8440db9331d1db687f761c1026c64fb8301d5 WHIRLPOOL 7d537d55cc8491f8be2676d5b9a0e36ecdeb041e38e9416c43547730871bf757409c8b77460e507d87c4cc287b62ad2b449a5af8bed4b0406fbcca3759ef3ff4
DIST libmwaw-0.3.11.tar.xz 1254200 SHA256 4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a SHA512 d4a810c6066023608a15ece8a6bbc958e586d679fc4ad51156091ec88355292872f10198e723e28776b45e140a830fd4c698732cf6103743d6e80ad8e1d778ab WHIRLPOOL 2de11bde90937727372eb7e7d4d1af52b66e8ef2f14bd78ce1d26399aa6ee853dc1fe11000cfcf8a361698296866ced2f2da7848f75763a22458ae0504903b48
+DIST libmwaw-0.3.12.tar.xz 1258972 SHA256 7691a6e6e7221d61c40e3f630a8907e3e516b99a587e47d09ec53f8ac60ed1e7 SHA512 8af8477ff6fc251600f9a66059b20fd8b9fad8d599c01e847d7185944447b3a34567036daff4d4510934aa1462bd4810a39467e8ac0ec223147b3b53447220ec WHIRLPOOL 9dd39fc43c7b8cf3806889a1cabde4c1bbd4f21e5e1ea2dfa66a6ea69f28ab28c966e160d157f0ee4559e85b6b7fac07dfa314d2ef0597986c85660b3a5cc0f9
DIST libmwaw-0.3.8.tar.xz 1200052 SHA256 6afcbb250b6bed042149cd4dfb3ba7b4be796b11fe2322dfcdebd121199a3b05 SHA512 3e3684479460d22b83da225f8f1bc4de306f8e4a9e48c7ea128cba08f122b093c529f2e73b8f8ae1b235665d4f3c7de2fc461692e21f13364da678add707d01c WHIRLPOOL 77d9b1253191089da5c869e7bb160253672747cfd502350b28acde538e02b8418c0ee63899bf903b4c3c9f1561d145d0626c822f26467cb8ba7aa4de04287158
diff --git a/app-text/libmwaw/libmwaw-0.3.11.ebuild b/app-text/libmwaw/libmwaw-0.3.11.ebuild
deleted file mode 100644
index ed8c879dc73f..000000000000
--- a/app-text/libmwaw/libmwaw-0.3.11.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://git.code.sf.net/p/libmwaw/libmwaw"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="Library parsing many pre-OSX MAC text formats"
-HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="doc static-libs tools"
-
-RDEPEND="
- dev-libs/librevenge
- dev-libs/libxml2
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- # zip is hard enabled as the zlib is dep on the rdeps anyway
- econf \
- --enable-zip \
- --disable-werror \
- --with-sharedptr=c++11 \
- $(use_with doc docs) \
- $(use_enable static-libs static) \
- $(use_enable tools)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libmwaw/libmwaw-0.3.10.ebuild b/app-text/libmwaw/libmwaw-0.3.12.ebuild
similarity index 98%
rename from app-text/libmwaw/libmwaw-0.3.10.ebuild
rename to app-text/libmwaw/libmwaw-0.3.12.ebuild
index ed8c879dc73f..b0434c260bc2 100644
--- a/app-text/libmwaw/libmwaw-0.3.10.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.12.ebuild
@@ -20,7 +20,6 @@ IUSE="doc static-libs tools"
RDEPEND="
dev-libs/librevenge
- dev-libs/libxml2
sys-libs/zlib
"
DEPEND="${RDEPEND}
diff --git a/app-text/libstaroffice/Manifest b/app-text/libstaroffice/Manifest
index 368e4ecd5f5d..3d11505a4c65 100644
--- a/app-text/libstaroffice/Manifest
+++ b/app-text/libstaroffice/Manifest
@@ -1 +1,2 @@
DIST libstaroffice-0.0.3.tar.xz 679800 SHA256 bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6 SHA512 ea60576537761a5b969a861ac43c8d4a9da5e5261d0a31f3d7743f8507e6979ccd4cba1784e8c3d909c08b692349ae11e87428834fd3df5b8d56e423caa7bcd8 WHIRLPOOL c8ba69eb347aa0c77f886511d79dba5011aa0ff25c3e9f4ec4af31b8b9303fd9dc1df32742bbc3c87d2a7fba32a7f830fdc3a38ca391559038388f4d97afe9af
+DIST libstaroffice-0.0.4.tar.xz 681828 SHA256 6e728784d002144716b10fe122973b3e4edda9004538386b0b58bb303404903a SHA512 d591e554ce108165f1952ae82835241df0f986ce51f1a4fe43d282733358bb8d72418621f91f431367a5c09f9a40a9784666ffa2da303c5543ee000b1d6abf38 WHIRLPOOL ac295aa290f92bc2071a56439dafb4280c52e2de8e36e6e686cdf31150bff8c87989bbc693cc4175d96c1ae5a155f21bb8f9344b0ed10920ebec161ba20a7110
diff --git a/app-text/libstaroffice/libstaroffice-0.0.4.ebuild b/app-text/libstaroffice/libstaroffice-0.0.4.ebuild
new file mode 100644
index 000000000000..57dbc81af329
--- /dev/null
+++ b/app-text/libstaroffice/libstaroffice-0.0.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+DESCRIPTION="Import filter for old StarOffice documents"
+HOMEPAGE="https://github.com/fosnola/libstaroffice"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="debug doc tools +zlib"
+
+RDEPEND="
+ dev-libs/librevenge
+ zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+ default
+ [[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-werror \
+ $(use_enable debug) \
+ $(use_with doc docs) \
+ $(use_enable tools) \
+ $(use_enable zlib zip)
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index f341e451fb29..1c5c3b10abab 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1 +1,2 @@
DIST libwps-0.4.6.tar.xz 592276 SHA256 e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0 SHA512 00d1d9108f405cb5eeb67985057f0c6a5d9dd8ef9c3daeebb6739e10a38a5db7cbf22a9e4d09684452376896009993ba08cb015ec0616b56c222244d87a3241e WHIRLPOOL 31198a1889148c87357c0411cd7c28c75de69048ed9c589e98c8a9f866a18295a6d572308966bc1173f207499616bcd1e87eb48bbbec5193fef36228a23ca5c5
+DIST libwps-0.4.7.tar.xz 595580 SHA256 2f2cab630bceace24f9dbb7d187cd6cd1f4c9f8a7b682c5f7e49c1e2cb58b217 SHA512 d38b778016f8ca6a44edba86177d28a3f0bcd338e57276a615eeb9d470def71aa9326c3077789129418b38e88ae6f6d1901d08f5716081ba2eb9847a133c96da WHIRLPOOL 8dd7cc93f9a9da8e1685ab40c9a8fbe92bc0b1ca1c2888c9d70681156fdaea918dcef2bc6ed31f8d0d6a1345009275cb5517cdb513bea8abd90c17b124aba5e7
diff --git a/app-text/libwps/libwps-0.4.7.ebuild b/app-text/libwps/libwps-0.4.7.ebuild
new file mode 100644
index 000000000000..93c2ec4fbaa7
--- /dev/null
+++ b/app-text/libwps/libwps-0.4.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
+IUSE="doc debug static-libs tools"
+
+RDEPEND="
+ dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+ econf \
+ --disable-werror \
+ --with-sharedptr=c++11 \
+ $(use_enable debug) \
+ $(use_with doc docs) \
+ $(use_enable static-libs static) \
+ $(use_enable tools)
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index cfb9614de571..e9a8cde8f75c 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1 +1,2 @@
DIST t1utils-1.39.tar.gz 175047 SHA256 0faef3e5c4927b38b05ac99ee177b7d7cddbbf5b4452f98b244f684b52b0d4c4 SHA512 930fa0f264136fdc5d3d18e9a3b45c4818413d01ed12a32daa1b5ecfcc0ea4d6554faf428c6bab9247a2cfc16973787c0b6f0dfbb0273fa6a03a3e8d1d501301 WHIRLPOOL 976452434ea273cc1a42973cec28cd7587925490e37369715eeebb5e1d4aebca829d61893060512d621fe9393dd3758d670f0e1827347d8240cb622aa7afa1be
+DIST t1utils-1.40.tar.gz 176192 SHA256 56060d147f628fb3a356aea35e5119c0b3fdf1ed8c750e0ab16b95cdf1713d8b SHA512 790a6196b9dedd7ff7b25b7933678190d6380a341d543ca9064372c2c1c8eb8114a054dadd67f7f198084f1d7ed2cc10d78a6dbee6805b8e614328e0809a1807 WHIRLPOOL 9dc53f775ac66879ab9f3a2ab5fcfca9459bdb30871e21b210ffb76b9ee6d1b251c866ea568930d5b5605944056e5986ecfbe04b4fc825792ed3642d973443bf
diff --git a/app-text/t1utils/t1utils-1.40.ebuild b/app-text/t1utils/t1utils-1.40.ebuild
new file mode 100644
index 000000000000..2023fde00df1
--- /dev/null
+++ b/app-text/t1utils/t1utils-1.40.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+IUSE=""
+
+DESCRIPTION="Type 1 Font utilities"
+SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
+HOMEPAGE="http://www.lcdf.org/type/#t1utils"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+LICENSE="BSD"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ !> "${S}/sql/CMakeLists.txt"
+ fi
+
+ # Don't build bundled xz-utils for tokudb
+ echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+ sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+ sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
+ # Remove the bundled groonga
+ # There is no CMake flag, it simply checks for existance
+ rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+
+ eapply "${PATCHES[@]}"
+ eapply_user
+}
+
+src_configure(){
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+ # Bug #114895, bug #110149
+ filter-flags "-O" "-O[01]"
+
+ append-cxxflags -felide-constructors
+
+ # bug #283926, with GCC4.4, this is required to get correct behavior.
+ append-flags -fno-strict-aliasing
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+ # debug hack wrt #497532
+ mycmakeargs=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+ -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+ -DSYSCONFDIR="${EPREFIX}/etc/mysql"
+ -DINSTALL_BINDIR=bin
+ -DINSTALL_DOCDIR=share/doc/${PF}
+ -DINSTALL_DOCREADMEDIR=share/doc/${PF}
+ -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_INFODIR=share/info
+ -DINSTALL_LIBDIR=$(get_libdir)
+ -DINSTALL_MANDIR=share/man
+ -DINSTALL_MYSQLSHAREDIR=share/mariadb
+ -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+ -DINSTALL_SCRIPTDIR=share/mariadb/scripts
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+ -DINSTALL_SBINDIR=sbin
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+ -DWITH_COMMENT="Gentoo Linux ${PF}"
+ -DWITH_UNIT_TESTS=$(usex test ON OFF)
+ -DWITH_LIBEDIT=0
+ -DWITH_ZLIB=system
+ -DWITHOUT_LIBWRAP=1
+ -DENABLED_LOCAL_INFILE=1
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DWITH_DEFAULT_COMPILER_OPTIONS=0
+ -DWITH_DEFAULT_FEATURE_SET=0
+ -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+ -DENABLE_STATIC_LIBS=$(usex static-libs ON OFF)
+ # The build forces this to be defined when cross-compiling. We pass it
+ # all the time for simplicity and to make sure it is actually correct.
+ -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+ -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+ -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+ -DCONC_WITH_EXTERNAL_ZLIB=YES
+ -DWITH_EXTERNAL_ZLIB=YES
+ -DSUFFIX_INSTALL_DIR=""
+ -DWITH_UNITTEST=OFF
+ )
+ if use test ; then
+ mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+ else
+ mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+ fi
+
+ if ! use yassl ; then
+ mycmakeargs+=( -DWITH_SSL=system )
+ else
+ mycmakeargs+=( -DWITH_SSL=bundled )
+ fi
+
+ # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+ if multilib_is_native_abi; then
+ mycmakeargs+=(
+ -DWITH_READLINE=$(usex bindist 1 0)
+ -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+ )
+ else
+ mycmakeargs+=(
+ -DWITHOUT_TOOLS=1
+ -DWITH_READLINE=1
+ -DNOT_FOR_DISTRIBUTION=0
+ )
+ fi
+
+ if multilib_is_native_abi && use server ; then
+
+ # Federated{,X} must be treated special otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ mycmakeargs+=(
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_FEDERATEDX=NO )
+ fi
+
+ mycmakeargs+=(
+ -DWITH_JEMALLOC=$(usex jemalloc system)
+ -DWITH_PCRE=system
+ -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO)
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+ -DPLUGIN_CASSANDRA=NO
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO)
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO)
+ -DCONNECT_WITH_MYSQL=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DCONNECT_WITH_JDBC=$(usex jdbc)
+ -DWITH_WSREP=$(usex galera)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+ -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+ -DWITH_MARIABACKUP=$(usex backup ON OFF)
+ -DWITH_LIBARCHIVE=$(usex backup ON OFF)
+ -DINSTALL_SQLBENCHDIR=share/mariadb
+ -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+ # systemd is only linked to for server notification
+ -DWITH_SYSTEMD=$(usex systemd)
+ )
+ if use test ; then
+ # This is needed for the new client lib which tests a real, open server
+ mycmakeargs+=( -DSKIP_TESTS=ON )
+ fi
+
+ if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+ ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+ ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+ ewarn "You MUST file bugs without these variables set."
+
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+ -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+ )
+
+ elif ! use latin1 ; then
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=utf8
+ -DDEFAULT_COLLATION=utf8_general_ci
+ )
+ else
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=latin1
+ -DDEFAULT_COLLATION=latin1_swedish_ci
+ )
+ fi
+ mycmakeargs+=(
+ -DEXTRA_CHARSETS=all
+ -DMYSQL_USER=mysql
+ -DDISABLE_SHARED=$(usex static YES NO)
+ -DWITH_DEBUG=$(usex debug)
+ -DWITH_EMBEDDED_SERVER=$(usex embedded)
+ -DWITH_PROFILING=$(usex profiling)
+ )
+
+ if use static; then
+ mycmakeargs+=( -DWITH_PIC=1 )
+ fi
+
+ if use jemalloc || use tcmalloc ; then
+ mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+ fi
+
+ # Storage engines
+ mycmakeargs+=(
+ -DWITH_ARCHIVE_STORAGE_ENGINE=1
+ -DWITH_BLACKHOLE_STORAGE_ENGINE=1
+ -DWITH_CSV_STORAGE_ENGINE=1
+ -DWITH_HEAP_STORAGE_ENGINE=1
+ -DWITH_INNOBASE_STORAGE_ENGINE=1
+ -DWITH_MYISAMMRG_STORAGE_ENGINE=1
+ -DWITH_MYISAM_STORAGE_ENGINE=1
+ -DWITH_PARTITION_STORAGE_ENGINE=1
+ )
+
+ else
+ mycmakeargs+=(
+ -DWITHOUT_SERVER=1
+ -DWITHOUT_EMBEDDED_SERVER=1
+ -DEXTRA_CHARSETS=none
+ -DINSTALL_SQLBENCHDIR=
+ -DWITH_SYSTEMD=NO
+ )
+ fi
+
+ # systemtap only works on native ABI bug 530132
+ if multilib_is_native_abi; then
+ mycmakeargs+=( -DENABLE_DTRACE=$(usex systemtap) )
+ else
+ mycmakeargs+=( -DENABLE_DTRACE=0 )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ # headers with ABI specific data
+ local MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/mysql/my_config.h
+ /usr/include/mysql/private/embedded_priv.h
+ /usr/include/mysql/mysql_version.h
+ /usr/include/mariadb/mariadb_version.h
+ /usr/include/mysql/mariadb_version.h
+ /usr/include/mysql/private/probes_mysql_nodtrace.h
+ /usr/include/mysql/private/probes_mysql_dtrace.h )
+
+ # wrap the config scripts
+ local MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
+ multilib-minimal_src_install
+}
+
+# Intentionally override eclass function
+multilib_src_install() {
+ cmake-utils_src_install
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+ if [[ -f "${D}${MY_INCLUDEDIR}/private/config.h" ]] ; then
+ rm "${D}${MY_INCLUDEDIR}/private/config.h" || die
+ fi
+
+ if ! multilib_is_native_abi && use server ; then
+ insinto /usr/include/mysql/private
+ doins "${S}"/sql/*.h
+ fi
+
+ # Install compatible symlinks to libmysqlclient
+# use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
+# dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
+ dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
+
+ # Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
+ find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
+}
+
+multilib_src_install_all() {
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
+ dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+ dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+ dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+ # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+ if [[ -d "${ED}/usr/data" ]] ; then
+ rm -Rf "${ED}/usr/data" || die
+ fi
+
+ # Unless they explicitly specific USE=test, then do not install the
+ # testsuite. It DOES have a use to be installed, esp. when you want to do a
+ # validation of your database configuration after tuning it.
+ if ! use test ; then
+ rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+ fi
+
+ # Configuration stuff
+ einfo "Building default configuration ..."
+ [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+ cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+ eprefixify "${TMPDIR}/my.cnf"
+ doins "${TMPDIR}/my.cnf"
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+ cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+ eprefixify "${TMPDIR}/50-distro-client.cnf"
+ doins "${TMPDIR}/50-distro-client.cnf"
+
+ if use server ; then
+ mycnf_src="my.cnf.distro-server"
+ sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+ "${FILESDIR}/${mycnf_src}" \
+ > "${TMPDIR}/my.cnf.ok" || die
+ if use prefix ; then
+ sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+ "${TMPDIR}/my.cnf.ok" || die
+ fi
+ if use latin1 ; then
+ sed -i \
+ -e "/character-set/s|utf8|latin1|g" \
+ "${TMPDIR}/my.cnf.ok" || die
+ fi
+ eprefixify "${TMPDIR}/my.cnf.ok"
+ newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+ einfo "Creating initial directories"
+ # Empty directories ...
+ diropts "-m0750"
+ if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+ dodir "${MY_DATADIR#${EPREFIX}}"
+ keepdir "${MY_DATADIR#${EPREFIX}}"
+ chown -R mysql:mysql "${D}/${MY_DATADIR}"
+ fi
+
+ diropts "-m0755"
+ local folder
+ for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
+ dodir "${folder}"
+ keepdir "${folder}"
+ chown -R mysql:mysql "${ED}/${folder}"
+ done
+
+ einfo "Including support files and sample configurations"
+ docinto "support-files"
+ local script
+ for script in \
+ "${S}"/support-files/magic
+ do
+ [[ -f "$script" ]] && dodoc "${script}"
+ done
+
+ docinto "scripts"
+ for script in "${S}"/scripts/mysql* ; do
+ [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+ done
+ fi
+
+ #Remove mytop if perl is not selected
+ [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+ if ! multilib_is_native_abi ; then
+ einfo "Server tests not available on non-native abi".
+ return 0;
+ fi
+
+ _disable_test() {
+
+ local rawtestname testname testsuite reason mysql_disabled_file mysql_disabled_dir
+ rawtestname="${1}" ; shift
+ reason="${@}"
+ ewarn "test '${rawtestname}' disabled: '${reason}'"
+
+ testsuite="${rawtestname/.*}"
+ testname="${rawtestname/*.}"
+ for mysql_disabled_file in \
+ "${S}/mysql-test/disabled.def" \
+ "${S}/mysql-test/t/disabled.def" ; do
+ [[ -f ${mysql_disabled_file} ]] && break
+ done
+ #mysql_disabled_file="${S}/mysql-test/t/disabled.def"
+ #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
+ echo ${testname} : ${reason} >> "${mysql_disabled_file}"
+
+ if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
+ for mysql_disabled_file in \
+ "${S}/mysql-test/suite/${testsuite}/disabled.def" \
+ "${S}/mysql-test/suite/${testsuite}/t/disabled.def" \
+ FAILED ; do
+ [[ -f ${mysql_disabled_file} ]] && break
+ done
+ if [[ ${mysql_disabled_file} != "FAILED" ]]; then
+ echo "${testname} : ${reason}" >> "${mysql_disabled_file}"
+ else
+ for mysql_disabled_dir in \
+ "${S}/mysql-test/suite/${testsuite}" \
+ "${S}/mysql-test/suite/${testsuite}/t" \
+ FAILED ; do
+ [[ -d ${mysql_disabled_dir} ]] && break
+ done
+ if [[ ${mysql_disabled_dir} != "FAILED" ]]; then
+ echo "${testname} : ${reason}" >> "${mysql_disabled_dir}/disabled.def"
+ else
+ ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
+ fi
+ fi
+ fi
+ }
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
+
+ if ! use server ; then
+ einfo "Skipping server tests due to minimal build."
+ return 0
+ fi
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if [[ $UID -eq 0 ]]; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+ # Run CTest (test-units)
+ cmake-utils_src_test
+ retstatus_unit=$?
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+ # Enable parallel testing, auto will try to detect number of cores
+ # You may set this by hand.
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+ # create directories because mysqladmin might run out of order
+ mkdir -p "${T}"/var-tests{,/log} || die
+
+ # Run mysql tests
+ pushd "${TESTDIR}" > /dev/null || die
+
+ # These are failing in MariaDB 10.0 for now and are believed to be
+ # false positives:
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+
+ local t
+ for t in plugins.cracklib_password_check plugins.two_password_validations ; do
+ _disable_test "$t" "False positive due to varying policies"
+ done
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp ; do
+ _disable_test "$t" "False positives in Gentoo"
+ done
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+ retstatus_tests=$?
+
+ popd > /dev/null || die
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ local failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+}
+
+mysql_init_vars() {
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+ MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
+ MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=""
+ if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+ MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1`
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+ | sed -e 's/.*=\s*//' \
+ | tail -n1`
+ fi
+ fi
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR="${MY_LOCALSTATEDIR}"
+ einfo "Using default MY_DATADIR"
+ fi
+ elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+ if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+ if [[ -e "${MY_DATADIR}" ]] ; then
+ # If you get this and you're wondering about it, see bug #207636
+ elog "MySQL datadir found in ${MY_DATADIR}"
+ elog "A new one will not be created."
+ PREVIOUS_DATADIR="yes"
+ else
+ PREVIOUS_DATADIR="no"
+ fi
+ export PREVIOUS_DATADIR
+ fi
+ else
+ if [[ ${EBUILD_PHASE} == "config" ]]; then
+ local new_MY_DATADIR
+ new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1`
+
+ if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+ ewarn "MySQL MY_DATADIR has changed"
+ ewarn "from ${MY_DATADIR}"
+ ewarn "to ${new_MY_DATADIR}"
+ MY_DATADIR="${new_MY_DATADIR}"
+ fi
+ fi
+ fi
+
+ export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+ export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
+ export MY_INCLUDEDIR MY_DATADIR
+}
+
+pkg_config() {
+ _getoptval() {
+ local mypd="${EROOT}"/usr/bin/my_print_defaults
+ local section="$1"
+ local flag="--${2}="
+ local extra_options="${3}"
+ "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+ }
+ local old_MY_DATADIR="${MY_DATADIR}"
+ local old_HOME="${HOME}"
+ # my_print_defaults needs to read stuff in $HOME/.my.cnf
+ export HOME=${EPREFIX}/root
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+ if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
+ die "Minimal builds do NOT include the MySQL server"
+ fi
+
+ if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+ local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+ MY_DATADIR_s="${MY_DATADIR_s%%/}"
+ local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+ old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+ if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+ if [[ -d "${MY_DATADIR_s}" ]]; then
+ ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+ ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+ else
+ elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+ mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+ || die "Moving MY_DATADIR failed"
+ fi
+ else
+ ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+ if [[ -d "${MY_DATADIR_s}" ]]; then
+ ewarn "Attempting to use ${MY_DATADIR_s}"
+ else
+ eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+ die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+ fi
+ fi
+ fi
+
+ local pwd1="a"
+ local pwd2="b"
+ local maxtry=15
+
+ if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+ local tmp_mysqld_password_source=
+
+ for tmp_mysqld_password_source in mysql client; do
+ einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+ if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
+ if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+ ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+ MYSQL_ROOT_PASSWORD=
+ continue
+ fi
+
+ einfo "Found password in '${tmp_mysqld_password_source}' section!"
+ break
+ fi
+ done
+
+ # Sometimes --show is required to display passwords in some implementations of my_print_defaults
+ if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+ fi
+
+ unset tmp_mysqld_password_source
+ fi
+ MYSQL_TMPDIR="$(_getoptval '--mysqld' tmpdir)"
+ # These are dir+prefix
+ MYSQL_RELAY_LOG="$(_getoptval '--mysqld' relay-log)"
+ MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+ MYSQL_LOG_BIN="$(_getoptval '--mysqld' log-bin)"
+ MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+ if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
+ einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+ install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
+ fi
+ if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
+ einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+ install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
+ fi
+ if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
+ einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+ install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
+ fi
+
+ if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+ ewarn "You have already a MySQL database in place."
+ ewarn "(${ROOT}/${MY_DATADIR}/*)"
+ ewarn "Please rename or delete it if you wish to replace it."
+ die "MySQL database already exists!"
+ fi
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+ einfo "Please provide a password for the mysql 'root' user now"
+ einfo "or through the ${HOME}/.my.cnf file."
+ ewarn "Avoid [\"'\\_%] characters in the password"
+ read -rsp " >" pwd1 ; echo
+
+ einfo "Retype the password"
+ read -rsp " >" pwd2 ; echo
+
+ if [[ "x$pwd1" != "x$pwd2" ]] ; then
+ die "Passwords are not the same"
+ fi
+ MYSQL_ROOT_PASSWORD="${pwd1}"
+ unset pwd1 pwd2
+ fi
+
+ local options
+ local sqltmp="$(emktemp)"
+
+ # Fix bug 446200. Don't reference host my.cnf, needs to come first,
+ # see http://bugs.mysql.com/bug.php?id=31312
+ use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+ local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
+ [[ -r "${help_tables}" ]] \
+ && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
+ || touch "${TMPDIR}/fill_help_tables.sql"
+ help_tables="${TMPDIR}/fill_help_tables.sql"
+
+ # Figure out which options we need to disable to do the setup
+ local helpfile="${TMPDIR}/mysqld-help"
+ "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+ for opt in grant-tables host-cache name-resolve networking slave-start \
+ federated ssl log-bin relay-log slow-query-log external-locking \
+ log-slave-updates \
+ ; do
+ optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+ egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+ done
+ # But some options changed names
+ egrep -sq external-locking "${helpfile}" && \
+ options="${options/skip-locking/skip-external-locking}"
+
+ use prefix || options="${options} --user=mysql"
+
+ einfo "Creating the mysql database and setting proper permissions on it ..."
+
+ # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+ PID_DIR="${EROOT}/var/run/mysqld"
+ if [[ ! -d "${PID_DIR}" ]]; then
+ mkdir -p "${PID_DIR}" || die "Could not create pid directory"
+ chown mysql:mysql "${PID_DIR}" || die "Could not set ownership on pid directory"
+ chmod 755 "${PID_DIR}" || die "Could not set permissions on pid directory"
+ fi
+
+ pushd "${TMPDIR}" &>/dev/null
+
+ # Filling timezones, see
+ # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+ "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+
+ local cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
+ [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
+ if [[ -r "${help_tables}" ]] ; then
+ cat "${help_tables}" >> "${sqltmp}"
+ fi
+ cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
+ einfo "Command: ${cmd[*]}"
+ "${cmd[@]}" \
+ >"${TMPDIR}"/mysql_install_db.log 2>&1
+ if [ $? -ne 0 ]; then
+ grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+ die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+ fi
+ popd &>/dev/null
+ [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+ || die "MySQL databases not installed"
+ chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
+ chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
+
+ local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+ local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+ local mysqld="${EROOT}/usr/sbin/mysqld \
+ ${options} \
+ $(use prefix || echo --user=mysql) \
+ --log-warnings=0 \
+ --basedir=${EROOT}/usr \
+ --datadir=${ROOT}/${MY_DATADIR} \
+ --max_allowed_packet=8M \
+ --net_buffer_length=16K \
+ --default-storage-engine=MyISAM \
+ --socket=${socket} \
+ --pid-file=${pidfile}
+ --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
+ #einfo "About to start mysqld: ${mysqld}"
+ ebegin "Starting mysqld"
+ einfo "Command ${mysqld}"
+ ${mysqld} &
+ rc=$?
+ while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+ eend $rc
+
+ if ! [[ -S "${socket}" ]]; then
+ die "Completely failed to start up mysqld with: ${mysqld}"
+ fi
+
+ ebegin "Setting root password"
+ # Do this from memory, as we don't want clear text passwords in temp files
+ local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
+ "${EROOT}/usr/bin/mysql" \
+ "--socket=${socket}" \
+ -hlocalhost \
+ -e "${sql}"
+ eend $?
+
+ if [[ -n "${sqltmp}" ]] ; then
+ ebegin "Loading \"zoneinfo\", this step may require a few seconds"
+ "${EROOT}/usr/bin/mysql" \
+ "--socket=${socket}" \
+ -hlocalhost \
+ -uroot \
+ --password="${MYSQL_ROOT_PASSWORD}" \
+ mysql < "${sqltmp}"
+ rc=$?
+ eend $?
+ [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+ fi
+
+ # Stop the server and cleanup
+ einfo "Stopping the server ..."
+ kill $(< "${pidfile}" )
+ rm -f "${sqltmp}"
+ wait %1
+ einfo "Done"
+}
diff --git a/dev-db/postgresql/postgresql-9.6.3-r1.ebuild b/dev-db/postgresql/postgresql-9.6.3-r1.ebuild
index 670a488d1ee7..08c8e0ce0039 100644
--- a/dev-db/postgresql/postgresql-9.6.3-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-embedded/gnome-avrdude/metadata.xml b/dev-embedded/gnome-avrdude/metadata.xml
index 9b4102817211..13dbe7261495 100644
--- a/dev-embedded/gnome-avrdude/metadata.xml
+++ b/dev-embedded/gnome-avrdude/metadata.xml
@@ -1,10 +1,6 @@
-
- calchan@gentoo.org
- Denis Dupeyron
-
embedded@gentoo.org
Embedded Gentoo
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 8514c2b6a47a..d5b3aa735d2f 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,2 +1,2 @@
DIST jdk-7u80-docs-all.zip 61168809 SHA256 0494bd49bc9cb3cbe3203120ae8b2c8e0aeb1579cb15c0fbd3cd780d19aa200a SHA512 c673c00e55c9a19938c42512cb9c6ae65de9803a1307d11a2043903d87cc36d9ed1f5a1e287040d8570e430cfe55f496354c1242fe6e242f1245f8271394ea1a WHIRLPOOL ad18886c401ec42735665081a0dd5ba3dc7678de0171f3aa8151c2e4ce3392e467be65c602f393da38373e589fa9800ed1afd3601d2cef4e48b06e57f491698e
-DIST jdk-8u141-docs-all.zip 93441458 SHA256 77e3d2c07bdf29838580eac7cf6d5191d64c6892104df265e7c4da6ab471cbcf SHA512 2025b799886cf30719529ee13f9b281eb6ff4abb038cfb8c6666a63e18350b61bc0066c3d3e1811052555a490c5566c23aa5778890b6c25e4d33acaf748af54e WHIRLPOOL 4c8abba048c09ead4382448a27014fb7596a5de0d6575d5803aceb2b1f2410281657ed4786348b97c0d758e30a491f70b61357fc24257f1a63e3cb4e2e77ce64
+DIST jdk-8u144-docs-all.zip 93446459 SHA256 ae2b2fdb162ca5716fe60d8fddbe7b0d2059d2b571311d27d488a20a40c6b3be SHA512 28b4aa92453e61693fd72f190326c69956ab022400031b54490e11d81fb16b847eab8308e51126980d04b7ac21e1ea10c3446e621fef2293bc6e5f6ec9acf970 WHIRLPOOL ac12d6a2d83e6106e30d78ce50091c0f92cdbaefaaf94d61ac21b82e472ce606729a02c0ed9362098bc121ace16f149048df2b9d61640bda685a0d32dfea7555
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.141.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.144.ebuild
similarity index 100%
rename from dev-java/java-sdk-docs/java-sdk-docs-1.8.0.141.ebuild
rename to dev-java/java-sdk-docs/java-sdk-docs-1.8.0.144.ebuild
diff --git a/dev-lang/R/metadata.xml b/dev-lang/R/metadata.xml
index 30cef9895e33..8972d9ed88ca 100644
--- a/dev-lang/R/metadata.xml
+++ b/dev-lang/R/metadata.xml
@@ -1,10 +1,6 @@
-
- calchan@gentoo.org
- Denis Dupeyron
-
sci-mathematics@gentoo.org
Gentoo Mathematics Project
diff --git a/dev-lang/elixir/elixir-1.4.5.ebuild b/dev-lang/elixir/elixir-1.4.5.ebuild
index 421593f9fa8b..a00a4c6afd24 100644
--- a/dev-lang/elixir/elixir-1.4.5.ebuild
+++ b/dev-lang/elixir/elixir-1.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="Apache-2.0 ErlPL-1.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
IUSE=""
DEPEND=">=dev-lang/erlang-18[ssl]"
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index e57f0f958c04..94e3e7fd4156 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -1,9 +1,7 @@
-DIST MoarVM-2016.10.tar.gz 3386119 SHA256 d8cb9fe74267dd933c3e405b098dea99cb9c0561aedb06e8efd8ddaef43396d0 SHA512 f8bd5ee1cd8206642408fde92b6f042c18f1ed6513fa52062d1882414ae58c2a601eafcc405f4e82d7d56d7a3d26dd13df2292ab77d26a92880b73334f139157 WHIRLPOOL 723a118d4a9e5c72c306b82efe0593458c5de83ed7fe7844a7c470c1b1d7d499b835a995083c61db53a16b13d061575aab7166c135ce5cf2911c1c139f6f5285
-DIST MoarVM-2016.11.tar.gz 3402963 SHA256 5eaa8ff47b1c25e023a900947f88222fffe0884ce74652659ecd2265ae2d1387 SHA512 b049f0031a57c468189dcd4f6fd1a5e37e2572b026a769d564cb48e9b4e3e72c28049396481adae03b4e52d1112a24f65871316c67029293f3b024ad65eb2c00 WHIRLPOOL 738b05dd8bb769e392bb0fe567198a6b8f48b8b374455121cdae580d8c87766dc961146068c0e3987db05c48198e7a65cb08e5430637a36c2c9702bd86d61474
-DIST MoarVM-2016.12.tar.gz 3409704 SHA256 70abf2f9aca87fecb73603843137016dd29aa40b92af0e3e06c608561ecf9721 SHA512 af1db57818fbe3f11a0b8fbe329cb81d953da42bb1e4e6284a79620bdd4fb3fdadf44274420f9e2be254e2642adc7a773e7c9e2d0638242077743a35c46a146e WHIRLPOOL 916431a779a5987bd8e74362dff553908c3f5a17e4d4c733c822909264747a307731bef99f0e7e37fc29772e594546bb517b5a1751640de82b9729670af2f1a1
DIST MoarVM-2017.01.tar.gz 3718510 SHA256 2074693a42a7f31218bf69b70fd5b73d6fd1a1d0e31eaf3f528e204963e94c53 SHA512 d31b292edc4468c4dd26a367944230ce02286cc601c231b175273b0c61d1fb907aced5b63c1f7426eabfd9148b17aee63dea12c74829206fb38250cd4193804f WHIRLPOOL 83a01f8e54b427d1a958df56f13cc780f85978ecb81b01430e074fe1ef948552866ab321131637cc0ffa33b0fb182c4e566c595a8d49775ba262602e4b3dd120
DIST MoarVM-2017.02.tar.gz 3775575 SHA256 3a486ca5d19a8e6256e379655ec9ed09ff2f1c4f6a57a7969a278819b5bcb4eb SHA512 9b15eb62863f828f4ec3d97c6668b26c51abb50dd277a63e54e919782f5efd1db1a14864b1ac4b8cf1244ee1012ef1c06a802815eaae5dc404d1ece31503ce4a WHIRLPOOL 3878445ef324fb06afce0c962dde5ff1ba0cad9b44d899c3a432b840de7936581bf16d50b5c28c92f9807bc5ac481ebc2b8bdc3e3c6b973e228747662bd163b2
DIST MoarVM-2017.03.tar.gz 4361623 SHA256 c562a91d462a15f3a964969ddea8b33eae4558e3b25d9e2105f81c259249dbee SHA512 2dfc1a75876d2744d74b1c2df6cbdec1fb73650bde755a534764ca564a3a7c9435691e60ee15f78df798e276c0af3c4db19e4f67df058a79aaa201aab3f96443 WHIRLPOOL 060204b69e91822dc2bb3fe0d6eaeaf9e7331b2e41d058e2025d0c3ffeed5d888acc14ca6ad820bb6f8ea0a652db5096f1598bd11c14c5e3f3699aa9ddb7de23
DIST MoarVM-2017.04.tar.gz 4383487 SHA256 7838c92e50afe75669f751db8e15f06666e32d5951d026a89de28f7c7a8c347f SHA512 52cac6743f3d3005d388261c676405ba27db184ed1b4498d81c09ad844ef8b9a7810a4a210537b55c699ea838222cc667fbdff2677f62973f571112a6925d0df WHIRLPOOL 6e8c3ac6d7bb018133acf5e31ce469f2df966ea91f12219ce1bc6788e7ac4f7d68fbf5686943bdb161aa8c525b3f7f1480cc38ab4499ecdfbfba71055eb87476
DIST MoarVM-2017.05.tar.gz 4386504 SHA256 7cb9b7a871b14ac9b6cddc57e646d277177c4b3b21220e6fbc204084a15a4e41 SHA512 a8fc79a41c30bc79e5d872c7c822cc658c258a2e8fffcfd053afe78fc985646db76af40dc2d610001819953784d9bf4e6c6f20a5e5d7de3027f9d1a3d1279edb WHIRLPOOL e27ef8969170db8c6a4c38cb3d2dcb33895292f233ff000df9dc43533f3076bd6db1fa8344b62ca551e23454c1ac72bc959a322a09f45be074c7965886a84c6a
DIST MoarVM-2017.06.tar.gz 4391465 SHA256 5102793557625ff812291ade39f6b3a32fc02d12a5e6845e7822e5ae15f2a293 SHA512 32a14c5426ade7681f452dcc43a3c513cd7d73cfd4eca394005ea9e5f2c65e6651d442eaec9a27ef6656bb342f572b964fab587018e39012acecfc01b50db274 WHIRLPOOL 2b347e9d9adf0e5320451b9eef5f326c8c22f0db7c3c588662be497221e927e2bf752ec62629905d4a5b2a6597150f5ea255d149c2a94a61658bca576c5e95c6
+DIST MoarVM-2017.07.tar.gz 4396077 SHA256 21c6c85464bcc012af4fa3ed5fe2a54262439f197c5141cfc71f57e2841ba67a SHA512 675633bdc97e30eb6a7a2208338b7124215a92ed1a129076b0e59f9f2f0996b903120e3aa2a915a370c637d6529fdccef0bbcc31ce91c1485df60f9ce7e9e689 WHIRLPOOL 83b38aae50904680c58970f51bb33aa2b112a0cb8b92f04900085083e3e12c0905829107759782531b301714283dfdb044508133b02e4d4a5f271d6bd5eca6bc
diff --git a/dev-lang/moarvm/moarvm-2016.10-r1.ebuild b/dev-lang/moarvm/moarvm-2016.10-r1.ebuild
deleted file mode 100644
index f119a7ae28bc..000000000000
--- a/dev-lang/moarvm/moarvm-2016.10-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-MY_PN="MoarVM"
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
- inherit git-r3
- KEYWORDS=""
- S="${WORKDIR}/${P}"
-else
- SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
-HOMEPAGE="http://moarvm.org"
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="asan clang debug doc +jit static-libs optimize ubsan"
-
-RDEPEND="dev-libs/libatomic_ops
- >=dev-libs/libtommath-1.0
- dev-libs/libuv
- jit? ( dev-lang/lua:0[deprecated]
- dev-lua/LuaBitOp )
- virtual/libffi"
-DEPEND="${RDEPEND}
- clang? ( >=sys-devel/clang-3.1 )
- dev-lang/perl"
-
-DOCS=( CREDITS README.markdown )
-
-# Tests are conducted via nqp
-RESTRICT=test
-
-src_configure() {
- use doc && DOCS+=( docs/* )
- local myconfigargs=(
- "--prefix=/usr"
- "--has-libtommath"
- "--has-libuv"
- "--has-libatomic_ops"
- "--has-libffi"
- "--libdir=$(get_libdir)"
- "--compiler=$(usex clang clang gcc)"
- "$(usex asan --asan)"
- "$(usex debug --debug --no-debug)"
- "$(usex jit --lua=/usr/bin/lua --no-jit)"
- "$(usex optimize --optimize= --no-optimize)"
- "$(usex static-libs --static)"
- "$(usex ubsan --ubsan)"
- )
- use optimize && filter-flags '-O*'
-
- perl Configure.pl "${myconfigargs[@]}" || die
-}
diff --git a/dev-lang/moarvm/moarvm-2016.11-r1.ebuild b/dev-lang/moarvm/moarvm-2016.11-r1.ebuild
deleted file mode 100644
index f119a7ae28bc..000000000000
--- a/dev-lang/moarvm/moarvm-2016.11-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-MY_PN="MoarVM"
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
- inherit git-r3
- KEYWORDS=""
- S="${WORKDIR}/${P}"
-else
- SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
-HOMEPAGE="http://moarvm.org"
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="asan clang debug doc +jit static-libs optimize ubsan"
-
-RDEPEND="dev-libs/libatomic_ops
- >=dev-libs/libtommath-1.0
- dev-libs/libuv
- jit? ( dev-lang/lua:0[deprecated]
- dev-lua/LuaBitOp )
- virtual/libffi"
-DEPEND="${RDEPEND}
- clang? ( >=sys-devel/clang-3.1 )
- dev-lang/perl"
-
-DOCS=( CREDITS README.markdown )
-
-# Tests are conducted via nqp
-RESTRICT=test
-
-src_configure() {
- use doc && DOCS+=( docs/* )
- local myconfigargs=(
- "--prefix=/usr"
- "--has-libtommath"
- "--has-libuv"
- "--has-libatomic_ops"
- "--has-libffi"
- "--libdir=$(get_libdir)"
- "--compiler=$(usex clang clang gcc)"
- "$(usex asan --asan)"
- "$(usex debug --debug --no-debug)"
- "$(usex jit --lua=/usr/bin/lua --no-jit)"
- "$(usex optimize --optimize= --no-optimize)"
- "$(usex static-libs --static)"
- "$(usex ubsan --ubsan)"
- )
- use optimize && filter-flags '-O*'
-
- perl Configure.pl "${myconfigargs[@]}" || die
-}
diff --git a/dev-lang/moarvm/moarvm-2016.12-r1.ebuild b/dev-lang/moarvm/moarvm-2017.07.ebuild
similarity index 100%
rename from dev-lang/moarvm/moarvm-2016.12-r1.ebuild
rename to dev-lang/moarvm/moarvm-2017.07.ebuild
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index 7717de5e6842..781d2101fac1 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1,9 +1,7 @@
-DIST nqp-2016.10.tar.gz 3943840 SHA256 d66905006e74b6d55f7abd3fba051fdf9a2583879bbf3cecaab076c07d39d476 SHA512 8a42fd4062237838d71870718e8cb9c166fb022fa05d624543479d9476890aa4eaaba0f4ba0d9c5ca1684559f34d999acdfbb5173d15a462ae94a9aaabbd1dbd WHIRLPOOL 62868016c516888df327601be2f4bb30b156bd0d3a14a3a1e9f7d162c5dfe089f3bf2946b69237eff559e44870a07e702480947bc47e13c6b4b7ca81a947ad31
-DIST nqp-2016.11.tar.gz 3946759 SHA256 08d3eb664ad049e72bd9821755564ee7cbbf0da4833f1bcc9441e970c5f73ccd SHA512 bd99e286dc09fa5096429cc35847e43893d30a9ce9efdfb55346c04eeeda0c44307fd39217107a2210040b7a4dcc900f69279e19d1cc54a469ab286377e28f6a WHIRLPOOL 373fe379cf8fe965d9c1097042a55472d69322c08e613a9d55749bbb4da084b84adee5c5dfe93c4f9bf81298e28308d697f66482b80a16ada3ea9ea81754f54b
-DIST nqp-2016.12.tar.gz 3643470 SHA256 3dfd71f7f51b78a8266d159a41a4b9d0a3fff1b93b7366054c2daf14ec5df981 SHA512 5967029227b6f527f25cfdc0f27e5466cbff4286e2ef7252b3767fe5f752210d5637d634c4e946f32797e4e380f2f937523a325497214767fae3fa39764eecb2 WHIRLPOOL 67e7138d8d7bd428f77d37721f206a613498cabb07ea0cdfa9afa730505e303709f86373dc36d0ac149f35e08193e85621e41131832e5bafbd5765d1b0d8ed51
DIST nqp-2017.01.tar.gz 3654574 SHA256 6b407aa2a908cc66dc60b8a1b5a7a76990afcecd25cafd3ecf2ef4c7e8804f62 SHA512 4c32a80df0c982700a2efad8c614efd8595a7dc67ad431fec05e83619e986c9cc8810a8ab80356892e6f42b8c421b38f11a147a3216b7011eb837158b08fdaea WHIRLPOOL b9e5ea5ae91e2964255f6caa9c4aaccc4463cc0427a8056b304e8dcc8b42b143c19840d4dbf77882bf1db0f7e691c91be51e0568034e370778b0e63dc350bbae
DIST nqp-2017.02.tar.gz 3657637 SHA256 cf2f094296fc7706b2c2f0037331dd624dcdcb2cb41239883c8297b3b1fd38ce SHA512 4781fccfbe0bbcbb4529c8ed540263fc620bfcff2923c39dabd437824353caba6d2627082312bb7841b40b01caaf39282d6af9fcaa18601f9647e769e220d369 WHIRLPOOL d97b5aa9e119bf85fbc8c8da5954466455ff5b26580e61f668ae539ccf6ec4284cdd5be3afa2da053df9459903a3fbe6f0bebc9a47213e9e1e46ecfec943c1ef
DIST nqp-2017.03.tar.gz 3674277 SHA256 2dce67d6a4388a177a0a3c46b95717a47f31c705b0d8f825f936f65358b655e0 SHA512 8ca0be68785d8f0923d1ef63eca7eb9d7075c475b836911117d62f5030398933e0711bfc5b0ec082e4b4720d6f0fd0f1a74b8c35510f0fffe1e36a972937cd67 WHIRLPOOL 3f2a7b0ea4a7ac5ba1eefd4d4a3453a6c02b10d7c0e93570bdb89e33eadba29f664660024b532ed9a41718db767414b0e1ab362263ecd88490b9a1045d370070
DIST nqp-2017.04.tar.gz 3693688 SHA256 7c270fc91bb869094fdc981236beefd4e8ecad8b8f4129e7c83abeec67880634 SHA512 f68e3f63a57bffbaa94267e8da59336cb0c59b1b2538996619fa96d964062e13536208432cb778a717c65438c006a490d8cb5355c899add7146b54664b696fd9 WHIRLPOOL 7e9a92a82f80f3fac672fac58d9bb7014b2ab39de585e2cb43326b1b9a7982d5af72cae17db7dd8e8803c59dac25e66e764846e72e3b6783534e98771ef5ebcb
DIST nqp-2017.05.tar.gz 3698847 SHA256 e5326a0a4c791f70802cadfc1a71ba119f0da6697b5c57ac6afcc367e21ee1ca SHA512 2679c48160179e5ed96ceba218a54e0841d89ea9d4ec931e6bd9fabd4541f48da3c3c66b866bb1d11311e9a342fbd77a694f88cb4256f8009a51ec1fbcef849f WHIRLPOOL d213dd6986a7fd1d81fad26c0dfc4112f443836de5c47a88c80dddf301e0dcaadf87228070dc76871871af0d55759d27ecb8cc24c72921263ef6190ca680e18f
DIST nqp-2017.06.tar.gz 3714001 SHA256 8275f0172b1256cc6bfa60c895a5534b65a70a29c20025b011c9edca2a4eb922 SHA512 7a067c6650442fc1071bc5ce61b01755f2746a825aa48cf8d127cd7fb15aad6729872313df2a18270d6ff995564bdbc3d68138afaaa7a3680567700109595197 WHIRLPOOL ea44ee01c19845f7c59125b5daed1ae63a722ead1f5cffc55ff2cdae78cb989e941be26428324cab746ccda72fa5b2ad8189442e0ccfc6b574c6af42a34ad790
+DIST nqp-2017.07.tar.gz 3713517 SHA256 31fefc7fa02441b45ff0ca465b58a8b391522b7090965a85323134aa17cb1166 SHA512 55ef0827c6e013b898d8a5034d2568e787bb89b510234cd58239f13c9f8f9ff24bb3790838aeade79fe09d721c2d2384c94bc4714b24f3d602a9b4a0dbcdcafc WHIRLPOOL 71ee1e98810b32a8fe5220fb0efd5d99c393bbf1b1fd13898cf21c7ba82d5815a9136cc6965077cb58a8777c040f4578b3a50fb180b01e190d8f9f6b82366bae
diff --git a/dev-lang/nqp/nqp-2016.11.ebuild b/dev-lang/nqp/nqp-2016.11.ebuild
deleted file mode 100644
index 5361a230c0c4..000000000000
--- a/dev-lang/nqp/nqp-2016.11.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-opt-2 multibuild
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
- inherit vcs-snapshot
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="http://rakudo.org/"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
- dev-java/asm:4
- dev-java/jline:0
- dev-java/jna:4
- )
- moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.7 )"
-DEPEND="${CDEPEND}
- clang? ( sys-devel/clang )
- java? ( >=virtual/jdk-1.7 )
- dev-lang/perl"
-
-pkg_pretend() {
- if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
- ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
- ewarn "already being installed. So if it fails, try uninstalling both"
- ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
- ewarn "(see Bug #584394)"
- fi
-}
-
-java_prepare() {
- # Don't clean stage0 jars.
- einfo "Cleaning upstream jars"
- java-pkg_clean 3rdparty/
-
- # Don't use jars we just deleted.
- sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
- src/vm/jvm/runners/nqp-j || die
-}
-
-src_prepare() {
- MULTIBUILD_VARIANTS=()
- use moar && MULTIBUILD_VARIANTS+=( moar )
- use java && MULTIBUILD_VARIANTS+=( jvm )
-
- multibuild_copy_sources
-
- # This will pull in conditional java_prepare
- default
-}
-
-nqp_configure() {
- pushd "${BUILD_DIR}" > /dev/null || die
- local myconfargs=(
- "--backend=${MULTIBUILD_VARIANT}"
- "--prefix=/usr" )
-
- perl Configure.pl "${myconfargs[@]}" || die
- popd || die
-}
-
-nqp_compile() {
- if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
- emake -j1 \
- -C "${BUILD_DIR}" \
- THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
- JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
- elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
- emake -j1 \
- -C "${BUILD_DIR}"
- fi
-}
-
-nqp_test() {
- emake -j1 \
- -C "${BUILD_DIR}" \
- test
-}
-
-nqp_install() {
- # This is the actual reason we need multibuild.eclass.
- # We need to distinguish the install procedure for MoarVM and JVM backends.
- case "${MULTIBUILD_VARIANT}" in
- moar)
- emake \
- DESTDIR="${ED}" \
- -C "${BUILD_DIR}" \
- install
- ;;
- jvm)
- pushd "${BUILD_DIR}" > /dev/null || die
- # Set JAVA_PKG_JARDEST early.
- java-pkg_init_paths_
-
- # Upstream sets the classpath to this location. Perhaps it's
- # used to locate the additional libraries?
- java-pkg_addcp "${JAVA_PKG_JARDEST}"
-
- insinto "${JAVA_PKG_JARDEST}"
- local jar
-
- for jar in *.jar; do
- if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
- # jars for NQP itself.
- java-pkg_dojar ${jar}
- else
- # jars used by NQP.
- doins ${jar}
- fi
- done
-
- # Upstream uses -Xbootclasspath/a, which is faster due to lack
- # of verification, but gjl isn't flexible enough yet. :(
- java-pkg_dolauncher ${PN}-j --main ${PN}
- dosym ${PN}-j /usr/bin/${PN}
- dobin tools/jvm/eval-client.pl
- popd > /dev/null || die
- ;;
- *)
- die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
- ;;
- esac
-}
-
-src_configure() {
- multibuild_foreach_variant nqp_configure
-}
-
-src_compile() {
- multibuild_foreach_variant nqp_compile
-}
-
-src_test() {
- multibuild_foreach_variant nqp_test
-}
-
-src_install() {
- multibuild_foreach_variant nqp_install
-
- dodoc CREDITS README.pod
- use doc && dodoc -r docs/*
-}
diff --git a/dev-lang/nqp/nqp-2016.12.ebuild b/dev-lang/nqp/nqp-2016.12.ebuild
deleted file mode 100644
index 5361a230c0c4..000000000000
--- a/dev-lang/nqp/nqp-2016.12.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-opt-2 multibuild
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
- inherit vcs-snapshot
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="http://rakudo.org/"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
- dev-java/asm:4
- dev-java/jline:0
- dev-java/jna:4
- )
- moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.7 )"
-DEPEND="${CDEPEND}
- clang? ( sys-devel/clang )
- java? ( >=virtual/jdk-1.7 )
- dev-lang/perl"
-
-pkg_pretend() {
- if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
- ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
- ewarn "already being installed. So if it fails, try uninstalling both"
- ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
- ewarn "(see Bug #584394)"
- fi
-}
-
-java_prepare() {
- # Don't clean stage0 jars.
- einfo "Cleaning upstream jars"
- java-pkg_clean 3rdparty/
-
- # Don't use jars we just deleted.
- sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
- src/vm/jvm/runners/nqp-j || die
-}
-
-src_prepare() {
- MULTIBUILD_VARIANTS=()
- use moar && MULTIBUILD_VARIANTS+=( moar )
- use java && MULTIBUILD_VARIANTS+=( jvm )
-
- multibuild_copy_sources
-
- # This will pull in conditional java_prepare
- default
-}
-
-nqp_configure() {
- pushd "${BUILD_DIR}" > /dev/null || die
- local myconfargs=(
- "--backend=${MULTIBUILD_VARIANT}"
- "--prefix=/usr" )
-
- perl Configure.pl "${myconfargs[@]}" || die
- popd || die
-}
-
-nqp_compile() {
- if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
- emake -j1 \
- -C "${BUILD_DIR}" \
- THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
- JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
- elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
- emake -j1 \
- -C "${BUILD_DIR}"
- fi
-}
-
-nqp_test() {
- emake -j1 \
- -C "${BUILD_DIR}" \
- test
-}
-
-nqp_install() {
- # This is the actual reason we need multibuild.eclass.
- # We need to distinguish the install procedure for MoarVM and JVM backends.
- case "${MULTIBUILD_VARIANT}" in
- moar)
- emake \
- DESTDIR="${ED}" \
- -C "${BUILD_DIR}" \
- install
- ;;
- jvm)
- pushd "${BUILD_DIR}" > /dev/null || die
- # Set JAVA_PKG_JARDEST early.
- java-pkg_init_paths_
-
- # Upstream sets the classpath to this location. Perhaps it's
- # used to locate the additional libraries?
- java-pkg_addcp "${JAVA_PKG_JARDEST}"
-
- insinto "${JAVA_PKG_JARDEST}"
- local jar
-
- for jar in *.jar; do
- if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
- # jars for NQP itself.
- java-pkg_dojar ${jar}
- else
- # jars used by NQP.
- doins ${jar}
- fi
- done
-
- # Upstream uses -Xbootclasspath/a, which is faster due to lack
- # of verification, but gjl isn't flexible enough yet. :(
- java-pkg_dolauncher ${PN}-j --main ${PN}
- dosym ${PN}-j /usr/bin/${PN}
- dobin tools/jvm/eval-client.pl
- popd > /dev/null || die
- ;;
- *)
- die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
- ;;
- esac
-}
-
-src_configure() {
- multibuild_foreach_variant nqp_configure
-}
-
-src_compile() {
- multibuild_foreach_variant nqp_compile
-}
-
-src_test() {
- multibuild_foreach_variant nqp_test
-}
-
-src_install() {
- multibuild_foreach_variant nqp_install
-
- dodoc CREDITS README.pod
- use doc && dodoc -r docs/*
-}
diff --git a/dev-lang/nqp/nqp-2016.10.ebuild b/dev-lang/nqp/nqp-2017.07.ebuild
similarity index 98%
rename from dev-lang/nqp/nqp-2016.10.ebuild
rename to dev-lang/nqp/nqp-2017.07.ebuild
index 5361a230c0c4..e2dfdc734d8e 100644
--- a/dev-lang/nqp/nqp-2016.10.ebuild
+++ b/dev-lang/nqp/nqp-2017.07.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
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 6f551eb9b83b..ee73f898da57 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -1,9 +1,7 @@
-DIST rakudo-2016.10.tar.gz 2798155 SHA256 a1446049610a5de9609a8570be3f916c48fe90027094ae7c30f82ffafcea1a7c SHA512 b9b4ccd4cd3bbc442b2e1989c43ad76e8a2710562f9006bb43052bbdd6b5f70c845ab2d22260167c3a8a95437f6db2f562dc4db613bf95802e35bd3959f255fe WHIRLPOOL 866a0d6723d27d67f5c546984982a48ec4e9599fe98e2be6648e40b01c60fd028eeb63d2f31da7234995f61ad1cd7ca71f38f6fe2f88fd5aeff7cac32288ebff
-DIST rakudo-2016.11.tar.gz 2824346 SHA256 49c7231032ebeaf32335d8564a65e54d4021a33c7aa8310db6e5048540f4527f SHA512 81d2491a834c724bc90d0539eeb3ee9ea510fc35542be61c86ccad0098a3a9466a2e9526d97cce1f0de89a3691fc51124159dbf790e74aae8e6670abe088e56b WHIRLPOOL 340fc1ebbe2bad57ebf31191ea199134f61496243018c99a76bf7cbb27dac40e22e9d3bfc81f735f472f53a27e068ccc7afb6b847a09354adf2b1fdc9d422a55
-DIST rakudo-2016.12.tar.gz 2843706 SHA256 e5b1b7ed8e6e5eb26eae75691e90a61255d87b73c91c595b412cbd30300e7cb8 SHA512 656c654d893b2ca9cc947711d78d433b462d8bb8cf39c5e8e77dd518c57c4754949f1bb87392d31ee82a412c788bc193c251b1e3d852e87e2c9d2fcb1d71a497 WHIRLPOOL b362392e5965c923538ff57187b4e0dade7a5dc0b8ef6dd09716ced7e8d876d46136a8a93e45388c9a74e725201d3aab8f9b94bbef2e4fd74dbf8367b57c6703
DIST rakudo-2017.01.tar.gz 2868425 SHA256 2651f60f3123aeb015e9fa11d55c5b506abb88a1725f1fdd801dd3ea34f2a783 SHA512 4de0ce2534cde19676b7f1d88dd80d1c4ad65ba16c86eba97dac09d703fa0aade6d163ec5cbfc2226b6b6bf096121100c2f3fea4202b6e071b5e96077ecaa6bf WHIRLPOOL 1f749eb30121a1480aca749a0c3a9e71f5e9d637c89e3fbe324030797c6bf3566ebc24e394b36d464460419d1bb40bc7feca3ff924086f0552931e8e0a13b4f9
DIST rakudo-2017.02.tar.gz 2886120 SHA256 475aafbcdaf4c9ed0ac43cafb86e94a204b7124b394b94f3a7657820f3801848 SHA512 67dd0686c0604aebf79e6499c1e6b332e3878a59b8eec25d4993caa00e673597a77391fa69b928b0cec1ab0c6d281a83cfef72f79ed512ee74701712b1446b10 WHIRLPOOL 98fb76e270e36f84f7556aee6a7725f6c8ed2119ae8c12cafa18223ef711b3a5a0a780cfdb8079077214b7e142207dff88ad82b89a1a1bb7ec48a7da40486284
DIST rakudo-2017.03.tar.gz 2901724 SHA256 2dabc619c7ba3a935dd1b12caa8151cd220f18d516d807e268787dd10eefad09 SHA512 1f38db076cfa6932093d96b08573ffa691f7e68a676ce56826d64fc36828c9712f717df0c569d860b364aff587f974854bd47d5fb77b2d0c49e7e0d986466be0 WHIRLPOOL 8662b740870335d75be2b4089c56be565c3cbde673bcf041130c337edb01cf4c6b025112acfbaf4f616a2cd3f023a08309ec76eb2b54cf25248b09b3e4585f9c
DIST rakudo-2017.04.2.tar.gz 2937523 SHA256 3085e07241d8c483b8d9c7ca65dbf03c02fc8d22a56f9443e5316f6bd9673b7a SHA512 e4a87b7c8b1b0a51ffa3c20150b0cd8623b8a54d55d3c5bbb369f0ccbc732cd809247a8a4662838b95a8783c750009ea3e5b9db113d699a08a8b3c198e0534d7 WHIRLPOOL 2d2d45e04e7662c44296cd661b3d83311df64c44405967ed131970231c0bd57d6cf30d0363fe36102a5f8bda3f8aa0826bb70e53b593993ad5a13ea3b100a040
DIST rakudo-2017.05.tar.gz 2958481 SHA256 5ec50c0b12255109341eb60535a7dcae0fd68672d272f66ba038521799ae3fe4 SHA512 f285b8920c6f2f5ba8b75c47ab5327470fa08987a207bdb5d0120b89a4b45a3a9a66641887629357889b62957a25fcfc64a88f1af177a5331fc30c3aae72deaa WHIRLPOOL 32a9f90a84d5e39c752d78434a94d85775c621b5aa16334b2e30a72e423cceeeb9ba9e95da642884fe791503196d86d0384265da72d94c17e3f45f166f810799
DIST rakudo-2017.06.tar.gz 2963199 SHA256 f4ff7b27edcbe44a7e80956f17abf1bb19e6d168d75d61fdd7f59d97988e429b SHA512 fff211f200f9ff949ae7608edae099e08177e0edf6fee4f6dfb5357779f79ea1bb6f6ec629742744d2720979cb9d012f92730d6361e76e87a3550a33e203f6d5 WHIRLPOOL 99b81c465179d78f9557970fa6da5c76298b970173685f9830cb0fba6ba97eeb7fb488604a47061cb80050b17107ea56a5d7e3f2e9d1b074511ec0f87eb357b4
+DIST rakudo-2017.07.tar.gz 2984621 SHA256 a1d55c2bfef84c32739535e0638e87496ececf4c97a74796f97fa97edb51edea SHA512 a80fba71bce8a6537962c5728ef1b54c6bfd275b9a4b7caacc6497f12a826b293a3a2bf8c412b21e91bb29bd3a325d9da17ecd8abb0ba2ffd4b8eecf0297d39f WHIRLPOOL 6c45f3e323bae859b00a2c97d37e40e0fe1e97daf359a692de8a9fd176899805ced1b5ebc98f57f471efca9ce35061b191b85132d7945c0bd39859cf9fbe2e4b
diff --git a/dev-lang/rakudo/rakudo-2016.11.ebuild b/dev-lang/rakudo/rakudo-2016.11.ebuild
deleted file mode 100644
index 6e8c1b30fc93..000000000000
--- a/dev-lang/rakudo/rakudo-2016.11.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-opt-2
-
-DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="http://rakudo.org"
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Artistic-2"
-SLOT="0"
-# TODO: add USE="javascript" once that's usable in nqp
-IUSE="clang java +moar test"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.7 )"
-DEPEND="${CDEPEND}
- clang? ( sys-devel/clang )
- java? ( >=virtual/jdk-1.7 )
- >=dev-lang/perl-5.10"
-
-pkg_pretend() {
- if has_version dev-lang/rakudo; then
- ewarn "Rakudo is known to fail compilation/installation with Rakudo"
- ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
- ewarn "then do a new installation."
- ewarn "(see Bug #584394)"
- fi
-}
-
-src_configure() {
- local backends
- use moar && backends+="moar,"
- use java && backends+="jvm"
-
- local myargs=(
- "--prefix=/usr"
- "--sysroot=/"
- "--sdkroot=/"
- "--backends=${backends}"
- )
-
- perl Configure.pl "${myargs[@]}" || die
-
- if use java; then
- NQP=$(java-pkg_getjars --with-dependencies nqp)
- fi
-}
-
-src_compile() {
- emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
-}
-
-src_install() {
- emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
-}
-
-src_test() {
- RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
-}
diff --git a/dev-lang/rakudo/rakudo-2016.12.ebuild b/dev-lang/rakudo/rakudo-2016.12.ebuild
deleted file mode 100644
index 6e8c1b30fc93..000000000000
--- a/dev-lang/rakudo/rakudo-2016.12.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-opt-2
-
-DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="http://rakudo.org"
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Artistic-2"
-SLOT="0"
-# TODO: add USE="javascript" once that's usable in nqp
-IUSE="clang java +moar test"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.7 )"
-DEPEND="${CDEPEND}
- clang? ( sys-devel/clang )
- java? ( >=virtual/jdk-1.7 )
- >=dev-lang/perl-5.10"
-
-pkg_pretend() {
- if has_version dev-lang/rakudo; then
- ewarn "Rakudo is known to fail compilation/installation with Rakudo"
- ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
- ewarn "then do a new installation."
- ewarn "(see Bug #584394)"
- fi
-}
-
-src_configure() {
- local backends
- use moar && backends+="moar,"
- use java && backends+="jvm"
-
- local myargs=(
- "--prefix=/usr"
- "--sysroot=/"
- "--sdkroot=/"
- "--backends=${backends}"
- )
-
- perl Configure.pl "${myargs[@]}" || die
-
- if use java; then
- NQP=$(java-pkg_getjars --with-dependencies nqp)
- fi
-}
-
-src_compile() {
- emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
-}
-
-src_install() {
- emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
-}
-
-src_test() {
- RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
-}
diff --git a/dev-lang/rakudo/rakudo-2016.10.ebuild b/dev-lang/rakudo/rakudo-2017.07.ebuild
similarity index 93%
rename from dev-lang/rakudo/rakudo-2016.10.ebuild
rename to dev-lang/rakudo/rakudo-2017.07.ebuild
index 6e8c1b30fc93..0916271bb833 100644
--- a/dev-lang/rakudo/rakudo-2016.10.ebuild
+++ b/dev-lang/rakudo/rakudo-2017.07.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
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
KEYWORDS=""
else
- SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
+ SRC_URI="https://rakudo.perl6.org/downloads/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 965a951b16e4..119cf9736a03 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -8,3 +8,4 @@ DIST swipl-7.5.2.tar.gz 16507767 SHA256 e16a5e74af16b1830d6a6f9950e56e2039b73e9d
DIST swipl-7.5.3.tar.gz 16511917 SHA256 252779a25c964c0ee5efb698f2f9bb55ef5b27a1b7ada43b62a51633d1ddf3b2 SHA512 11c0effb791f0ef8da03a659127b94ff34c0dd9b122fe48c7c6cef88fcf31fbfc72b0d40bd14daeb425aa4928622e91367dec56f7e7ca1a997c4bb72a31752e9 WHIRLPOOL a0f5435e5a5535148df2591ed8fda7a61418da68d6f9edea5265be08958237b7db6362634e96fc4f132992b7edcc44018ea91cc150d985f70b48602b5707b3e1
DIST swipl-7.5.4.tar.gz 16670599 SHA256 b8cbaf40a65003fb3c1177097323430bbdebf33a93c867cb17eca12d16e00167 SHA512 a6475d2545ada4d5d25761433b4055fe2c09ad240439985f7ed9b640de968390e50324c8575448f1b531bd2a5e9a300f70b7e47e5217390e2c12751374279c6c WHIRLPOOL b63851cd51656e8d292b8dd59b3c21a5adef21c035ee01c94cbc820c57fe42efa23c7d3139abd8e2c696515f96b5967a0c4adac93ef419b099cf0f8f64f44fe0
DIST swipl-7.5.5.tar.gz 16670102 SHA256 285f8531908d7e6964e115c844e930a8c4797029e667b5f3209bab497800ec68 SHA512 2c07d8d2a69129e8932ccd90c1ac959cd405cbe1124e99c5ebbdff09fbf0914fdbfa58849ed1b4aa8193d93e5571c4a07d6f7013d50701602387784ae6880043 WHIRLPOOL 0ead9fcc93ff3a10c8a60e47f06e6d65e7c330c17509c374b42c1a43373e3d5eff6338162558c64b97f850a2c27dcfcba5dd958115d6d9d6809f968d6fdaf81d
+DIST swipl-7.5.6.tar.gz 16672920 SHA256 47c31d4d3140e96706295555b01916dd7bde6c4151c80515a48e7aabfc747288 SHA512 5809878d3381ca8646e8526382e9edad0c378e1e7b6d57e1f88df7500a6a78ddf2d80f5e6e0bff2efa77781e3e1e77d6097205bd1433572f6e9cfe7d04a217c1 WHIRLPOOL 05527e99580ce3b536bfda47ee6ae4709765b2edc8a13c4de86994effbb6eb39ca8c58d84618fc07a609a7025767f5df121e0ae8749114e3ae9adfa5fe83fa39
diff --git a/dev-lang/swi-prolog/swi-prolog-7.5.6.ebuild b/dev-lang/swi-prolog/swi-prolog-7.5.6.ebuild
new file mode 100644
index 000000000000..ece2fd907ab4
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.5.6.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses:=
+ archive? ( app-arch/libarchive )
+ berkdb? ( >=sys-libs/db-4:= )
+ zlib? ( sys-libs/zlib )
+ odbc? ( dev-db/unixODBC )
+ readline? ( sys-libs/readline:= )
+ libedit? ( dev-libs/libedit )
+ gmp? ( dev-libs/gmp:0 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ java? ( >=virtual/jdk-1.5:= )
+ uuid? ( dev-libs/ossp-uuid )
+ X? (
+ virtual/jpeg:0
+ x11-libs/libX11
+ x11-libs/libXft
+ x11-libs/libXpm
+ x11-libs/libXt
+ x11-libs/libICE
+ x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+ X? ( x11-proto/xproto )
+ java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+ EPATCH_FORCE=yes
+ EPATCH_SUFFIX=patch
+ if [[ -d "${WORKDIR}"/${PV} ]] ; then
+ epatch "${WORKDIR}"/${PV}
+ fi
+
+ if ! use uuid; then
+ mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+ fi
+
+ # OSX/Intel ld doesn't like an archive without table of contents
+ sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ use ppc && append-flags -mno-altivec
+ use hardened && append-flags -fno-unit-at-a-time
+ use debug && append-flags -DO_DEBUG
+
+ # ARCH is used in the configure script to figure out host and target
+ # specific stuff
+ export ARCH=${CHOST}
+
+ export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+ cd "${S}"/src || die
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_enable gmp) \
+ $(use_enable static-libs static) \
+ --enable-shared \
+ --enable-custom-flags COFLAGS="${CFLAGS}"
+
+ if ! use minimal ; then
+ local jpltestconf
+ if use java && use test ; then
+ jpltestconf="--with-junit=$(java-config --classpath junit)"
+ fi
+
+ cd "${S}/packages" || die
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_with archive) \
+ $(use_with berkdb bdb ) \
+ $(use_with java jpl) \
+ ${jpltestconf} \
+ $(use_with libedit) \
+ $(use_with odbc) \
+ $(use_with readline) \
+ $(use_with ssl) \
+ $(use_with X xpce) \
+ $(use_with zlib) \
+ COFLAGS='"${CFLAGS}"'
+ fi
+}
+
+src_compile() {
+ cd "${S}"/src || die
+ emake
+
+ if ! use minimal ; then
+ cd "${S}/packages" || die
+ emake
+ ./report-failed || die "Cannot report failed packages"
+ fi
+}
+
+src_test() {
+ cd "${S}/src" || die
+ emake check
+
+ if ! use minimal ; then
+ unset DISPLAY
+ cd "${S}/packages" || die
+ emake \
+ USE_PUBLIC_NETWORK_TESTS=false \
+ USE_ODBC_TESTS=false \
+ check
+ ./report-failed || die
+ fi
+}
+
+src_install() {
+ emake -C src DESTDIR="${D}" install
+
+ if ! use minimal ; then
+ emake -C packages DESTDIR="${D}" install
+ if use doc ; then
+ emake -C packages DESTDIR="${D}" html-install
+ fi
+ ./packages/report-failed || die "Cannot report failed packages"
+ fi
+
+ dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
+}
diff --git a/dev-libs/appstream/appstream-0.10.6-r1.ebuild b/dev-libs/appstream/appstream-0.10.6-r1.ebuild
index 42512cfdb32c..5d7a92367ffe 100644
--- a/dev-libs/appstream/appstream-0.10.6-r1.ebuild
+++ b/dev-libs/appstream/appstream-0.10.6-r1.ebuild
@@ -13,7 +13,7 @@ else
MY_PV="$(replace_all_version_separators '_')"
MY_P="APPSTREAM_${MY_PV}"
SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
S="${WORKDIR}/${PN}-${MY_P}"
fi
diff --git a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
new file mode 100644
index 000000000000..fa2b87364355
--- /dev/null
+++ b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/"
+SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3" # libcapstone.so.3
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="python"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-CVE-2017-6952.patch
+ "${FILESDIR}"/${P}-FLAGS.patch
+)
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+wrap_python() {
+ if use python; then
+ pushd bindings/python >/dev/null || die
+ distutils-r1_${1} "$@"
+ popd >/dev/null
+ fi
+}
+
+src_prepare() {
+ default
+
+ wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+ {
+ cat <<-EOF
+ # Gentoo overrides:
+ # verbose build
+ V = 1
+ # toolchain
+ AR = $(tc-getAR)
+ CC = $(tc-getCC)
+ RANLIB = $(tc-getRANLIB)
+ # toolchain flags
+ CFLAGS = ${CFLAGS}
+ LDFLAGS = ${LDFLAGS}
+ # libs
+ LIBDIRARCH = $(get_libdir)
+ EOF
+ } >> config.mk || die
+
+ wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+ default
+
+ wrap_python ${FUNCNAME}
+}
+
+src_test() {
+ default
+
+ wrap_python ${FUNCNAME}
+}
+
+src_install() {
+ default
+
+ wrap_python ${FUNCNAME}
+}
diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest
new file mode 100644
index 000000000000..9640179089ac
--- /dev/null
+++ b/dev-libs/cudnn/Manifest
@@ -0,0 +1 @@
+DIST cudnn-8.0-linux-x64-v6.0.tgz 201134139 SHA256 9b09110af48c9a4d7b6344eb4b3e344daa84987ed6177d5c44319732f3bb7f9c SHA512 ddeeacb5b449920d942a26b98c353d78fd6f7d7fb3b3ce42a078626473efdda25c7ae641232702d62eb5749e39ecfd03e88346119c920c19348ac3ee82d3ff47 WHIRLPOOL 363679f192130201e3140ec5e15ab01ce0ef1f6c4cbefca0ab8a4ebe1676489184c4d36adcc282c31cca8791ef452965d0ae87bff16859c0fee9d01de38b8d1e
diff --git a/dev-libs/cudnn/cudnn-6.0.ebuild b/dev-libs/cudnn/cudnn-6.0.ebuild
new file mode 100644
index 000000000000..233215c6c587
--- /dev/null
+++ b/dev-libs/cudnn/cudnn-6.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CUDA_PV=8.0
+
+DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
+HOMEPAGE="https://developer.nvidia.com/cuDNN"
+SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz"
+
+SLOT="0/6"
+KEYWORDS="~amd64 ~amd64-linux"
+RESTRICT="fetch"
+LICENSE="NVIDIA-cuDNN"
+
+S="${WORKDIR}"
+
+DEPENDS="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
+RDEPENDS="${DEPENDS}"
+
+src_install() {
+ insinto /opt
+ doins -r *
+}
diff --git a/dev-libs/cudnn/metadata.xml b/dev-libs/cudnn/metadata.xml
new file mode 100644
index 000000000000..8425c0d53cb0
--- /dev/null
+++ b/dev-libs/cudnn/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ sci@gentoo.org
+ Gentoo Science Project
+
+
diff --git a/dev-libs/dbus-glib/dbus-glib-0.108.ebuild b/dev-libs/dbus-glib/dbus-glib-0.108.ebuild
index a78833444eb1..130ecc98c2d7 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.108.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.108.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
LICENSE="|| ( GPL-2 AFL-2.1 )"
SLOT="0"
-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 ~m68k-mint ~sparc-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 ~m68k-mint ~sparc-solaris ~x86-solaris"
IUSE="debug static-libs test"
CDEPEND="
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index 0640c010d593..b3af42e78589 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1 +1,2 @@
DIST flatbuffers-1.6.0.tar.gz 440968 SHA256 768c50ebf5823f8cde81a9e38ffff115c8f5a5d031a37520d0024e7b9c6cd22e SHA512 d1e4d47cac663010eda58ca801e6da5e9d54104115dbb70b125b9251041611229e39c17a4b63f06eee2424f3cdd733b8efa49c723759ad533a07d33ef8406bcc WHIRLPOOL 1572de7bf181d00bbdf68d27b6ce369693f7eeb4a27aa56adfd9eb46554c520d0a66350eb2db071c5b4a8fb00b2bf67cb06732a2c7d1e716d2347ea72a4882a0
+DIST flatbuffers-1.7.1.tar.gz 475449 SHA256 0f8dcdcfbbaba034756f97e4f9946a3784399b578f1b60c8deee3c85fafa3089 SHA512 57732fc352c216c4be6d3237f93b872abf9dd2b62361d7d2856f99804a178760e4665ead2e33d5acdd00984ad03a746f581c9784ece583e1b2df1a10776f967a WHIRLPOOL 8a86ca1a5d0af6b0a637e1716cf32e8a7784b45d22ddaaf76fce5189c8a67dcbac74eb9d7e852c79d3f4c47543a95bb1765e5a297c5025b0a1ac0e3fae9a76da
diff --git a/dev-libs/flatbuffers/flatbuffers-1.7.1.ebuild b/dev-libs/flatbuffers/flatbuffers-1.7.1.ebuild
new file mode 100644
index 000000000000..80004da23625
--- /dev/null
+++ b/dev-libs/flatbuffers/flatbuffers-1.7.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Memory efficient serialization library"
+HOMEPAGE="https://google.github.io/flatbuffers/"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+
+src_prepare() {
+ sed -i -e "s/DESTINATION lib/DESTINATION $(get_libdir)/" CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ append-cppflags -std=c++11
+
+ local mycmakeargs=(
+ -DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
+ -DFLATBUFFERS_BUILD_SHAREDLIB=ON
+ -DFLATBUFFERS_BUILD_TESTS=$(usex test)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index c187e5f41a90..a09b09a1e312 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,2 +1,2 @@
DIST gjs-1.46.0.tar.xz 490812 SHA256 2283591fa70785443793e1d7db66071b36052d707075f229baeb468d8dd25ad4 SHA512 14af40668e95d269ac87556c75cf45680c41bc8246f04c46726d34bd80e9344045c0a510567f156c2c25c1f10dd474dc38bd50581d1b2e5abe0daa0cf570e2bc WHIRLPOOL 4aaf910c344d7df028a52e43b60b49e4fb0aefd92968e068d0effc4817b0f6b3d388c8287c6f7e3f85bc92c9e5605c03ff4743677ebc95dcd383d5a84d06f4fa
-DIST gjs-1.48.5.tar.xz 596484 SHA256 cc37998e283b6e25e1814026aa5bb96e145e1ce902b02133977bbdac8db3e042 SHA512 7b41dfd573fac325fbf3c429a4925ee1c3ae202a8f9a8300824ec4978b3cddcdcaec49abd1fe02098026f55e52e8759dbb44e4439bf8c590c0c565d111828371 WHIRLPOOL 4596dafbd1a25a8bff42599fb5a86bf863947f714feab10fcc24bbcfc9a1357e9f3642308a60e41643345f9be2fff3d7167fa0dfe6d1f6db93703d97eeff4644
+DIST gjs-1.48.6.tar.xz 596964 SHA256 e85f65ba4b38bf80b6174949dfe6fce89e88b8213bbdde4ac1fde473c08bd312 SHA512 29d70bbee722bbb58eb95acf1409d5e34930d11ebd9525f3b7d0050a13b72eb50e357df7c2bb9bc2ba147dcfdbc2dfb1f1f7b710347473d05cd484006b6ea256 WHIRLPOOL e18a79c04b2b49f250d378bbaf43aa461b8673a819ca1fb2ba02c5b0985fec4555e700c07213654eba57e390856b4951ad158ff669f12e24b6325f5ca7f681b6
diff --git a/dev-libs/gjs/files/1.48.5-disable-unittest.patch b/dev-libs/gjs/files/1.48.6-disable-unittest.patch
similarity index 100%
rename from dev-libs/gjs/files/1.48.5-disable-unittest.patch
rename to dev-libs/gjs/files/1.48.6-disable-unittest.patch
diff --git a/dev-libs/gjs/gjs-1.48.5.ebuild b/dev-libs/gjs/gjs-1.48.6.ebuild
similarity index 100%
rename from dev-libs/gjs/gjs-1.48.5.ebuild
rename to dev-libs/gjs/gjs-1.48.6.ebuild
diff --git a/dev-libs/leatherman/leatherman-1.0.0.ebuild b/dev-libs/leatherman/leatherman-1.0.0.ebuild
index fa1c63c54840..cdc882c01b08 100644
--- a/dev-libs/leatherman/leatherman-1.0.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
IUSE="debug test"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
RDEPEND="net-misc/curl"
DEPEND=">=dev-libs/boost-1.54[nls]
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 743cea94b697..9ce1431b710a 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,2 +1 @@
-DIST libqtxdg-1.3.0.tar.xz 52472 SHA256 850cad7c25412f70ccc997d1f3013a788d35deae42d9c1376556dc779ea92a89 SHA512 2cc70c4d779c83afdfd83e6e36f1b9362aa5b2bd8f5d9839880e31c30e317da812e97dfd8d7188816ef60e7e27471b02bf9248b5781b2b81f299040a4a7a5b65 WHIRLPOOL 317a017b5dcfc64f0fbb2f483478dab116881ca717513e9e0ce27d302dcf099cbab01289f140ab02682679a09290e711e139a901a324dc4a7adc581fce425a85
DIST libqtxdg-2.0.0.tar.xz 62404 SHA256 8c89ebaa3c0ee946f9048828e064c1c510c5639779a7688ed0b240307645dbcb SHA512 f4e32346eddedd31195093214a45e9831742ee886a14b5d7ba1d640a91e05473b9b8adc7bca9970090f1fa8187597cd10796c32ecea4ac02229e9869cd4f1db3 WHIRLPOOL d7b7a729e30774ccfb0cc0b6fed42b7a92cb16fa9e3c5d108bafe7385b1c141d31d843754be959e8a8c4e4432ffb475b23d8cdb15ff9f1f5d920fa55c6f0d1d0
diff --git a/dev-libs/libqtxdg/libqtxdg-1.3.0.ebuild b/dev-libs/libqtxdg/libqtxdg-1.3.0.ebuild
deleted file mode 100644
index b5cd0b3ad618..000000000000
--- a/dev-libs/libqtxdg/libqtxdg-1.3.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils virtualx
-
-DESCRIPTION="A Qt implementation of XDG standards"
-HOMEPAGE="http://lxqt.org/"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-else
- SRC_URI="http://downloads.lxqt.org/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="test"
-
-CDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${CDEPEND}
- x11-misc/xdg-utils
-"
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTS=$(usex test)
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake
-}
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.21.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.21-r1.ebuild
similarity index 92%
rename from dev-libs/pkcs11-helper/pkcs11-helper-1.21.ebuild
rename to dev-libs/pkcs11-helper/pkcs11-helper-1.21-r1.ebuild
index bc8ac998b72f..90c676f280b6 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.21.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.21-r1.ebuild
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
src_configure() {
econf \
+ --disable-crypto-engine-polarssl \
+ --disable-crypto-engine-mbedtls \
$(use_enable doc) \
$(use_enable gnutls crypto-engine-gnutls) \
$(use_enable nss crypto-engine-nss) \
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index 810ddfab6f8b..2748890b6bab 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1 +1,2 @@
DIST softhsm-2.2.0.tar.gz 966806 SHA256 eb6928ae08da44fca4135d84d6b79ad7345f408193208c54bf69f5b2e71f85f7 SHA512 6ef17deef491f7298244a3d2ddefe25843fc17534c4e5f2e08927f05cafdaf05601beb953539fce5d34fa02fe355cbd4ab3aaabb6e5a106936b04c06aae9793c WHIRLPOOL 9e2ead19b2091fc46c6cdf63d2aaa26ad21dfe7d69d047ea85b38d725576885c8a1c6656cbec9d79e480158a9b8f9a90d36cf3fad0a80af317b883ee59ffba06
+DIST softhsm-2.3.0.tar.gz 992417 SHA256 5ed604c89a3a6ef9d7d1ee92c28a2c4b3cd1f86f302c808e2d12c8f39aa2c127 SHA512 ef9ee41aa6eaeeb004d4ff5c78ca6e00895cc47e36551025a4422806eee8eead985cfd28476a867761a810f6957b0759edaac769bcdedf4ad974e426cfefce0f WHIRLPOOL adf718c757f2f1ab3bdc8dade04790e89fd5ef1e51d957b3506b8a89a61ef19cb5225805ed7a8e5c8073298f19e60a59b140339cc3693121cb21fbd15a670794
diff --git a/dev-libs/softhsm/softhsm-2.3.0.ebuild b/dev-libs/softhsm/softhsm-2.3.0.ebuild
new file mode 100644
index 000000000000..c3836c3fc9ad
--- /dev/null
+++ b/dev-libs/softhsm/softhsm-2.3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune
+
+DESCRIPTION="A software PKCS#11 implementation"
+HOMEPAGE="http://www.opendnssec.org/"
+SRC_URI="http://www.opendnssec.org/files/source/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bindist libressl migration-tool test"
+SLOT="2"
+LICENSE="BSD"
+
+RDEPEND="
+ sys-devel/gcc:=[cxx]
+ migration-tool? ( dev-db/sqlite:3 )
+ !libressl? ( dev-libs/openssl:=[bindist=] )
+ libressl? ( dev-libs/libressl )
+ !=dev-libs/softhsm-2.0.0:0
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( dev-util/cppunit )
+"
+
+DOCS=(
+ NEWS
+ README.md
+)
+
+src_configure() {
+ econf \
+ --disable-static \
+ --localstatedir="${EROOT}var" \
+ --with-crypto-backend=openssl \
+ --disable-p11-kit \
+ $(use_enable !bindist ecc) \
+ $(use_enable !libressl gost) \
+ $(use_with migration-tool migrate)
+}
+
+src_install() {
+ default
+ prune_libtool_files --modules
+}
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild
index 8b5f36845df9..59c3d41f14f4 100644
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.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"
@@ -10,7 +10,7 @@ SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
IUSE=""
RDEPEND=">=dev-lang/lua-5.1.5-r2:*[${MULTILIB_USEDEP}]"
diff --git a/dev-lua/lpeg/lpeg-1.0.1.ebuild b/dev-lua/lpeg/lpeg-1.0.1.ebuild
index a3f02c029a24..9bf23d5a55b4 100644
--- a/dev-lua/lpeg/lpeg-1.0.1.ebuild
+++ b/dev-lua/lpeg/lpeg-1.0.1.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=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
IUSE="debug doc luajit"
RDEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
index 31847e88e925..26b4cdecaef2 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r1.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
@@ -11,7 +11,7 @@ SRC_URI="http://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
IUSE=""
RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]
diff --git a/dev-lua/luajson/luajson-1.3.3.ebuild b/dev-lua/luajson/luajson-1.3.3.ebuild
index eb19676cff05..f38c914fbd8a 100644
--- a/dev-lua/luajson/luajson-1.3.3.ebuild
+++ b/dev-lua/luajson/luajson-1.3.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/harningt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc ~x86"
IUSE="test"
RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r3.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r3.ebuild
index aba778da6436..b2b42fd1b64b 100644
--- a/dev-lua/luasocket/luasocket-3.0_rc1-r3.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0_rc1-r3.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
IUSE="debug"
RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]"
diff --git a/dev-ml/bin-prot/Manifest b/dev-ml/bin-prot/Manifest
index e050ff3bb2a6..e530cf1be090 100644
--- a/dev-ml/bin-prot/Manifest
+++ b/dev-ml/bin-prot/Manifest
@@ -1 +1,2 @@
DIST bin-prot-0.9.0.tar.gz 338958 SHA256 1fc88602788a802570ba81376a71dd76a1815b74ce80245e3fc4cfd7e259817e SHA512 111e0a9d07bdf22db6e3e7e9a165d196a264a3652e4cc363ec8f49c4ef385b8b76982a9d42fa8e0954e15a4a80c35ca6876c70fe6f20d7497fd8a2d53fab24c1 WHIRLPOOL 2d0fe47a957023d99bcde79146bef54c6e15801427db83697d16506d508231e95d6983f506502661740636ede95d2b36144c6d2f0953169785b27abe4d894764
+DIST bin-prot-0.9.1.tar.gz 338969 SHA256 b301a350fc951cbaba711c28395802121752a0ee927f0ec14fdd74ba4af1cb42 SHA512 6575f51931c6dfb0f640bc6eb8bb789fd1ca4b1ca95876df906bd5d5c3320dc8aebedd44b5c6feee6b66b40007bd0077da6cc628c791daba0c8cf806d7af7b9c WHIRLPOOL b6113a806457f7982b0e018d7fd828eb57156bc6e541fa0812565710861de5a1c4d955e194f7ca1da77fb8f9c9dd6db2d6a9d18d6db92bd024bd045c93a5e676
diff --git a/dev-ml/bin-prot/bin-prot-0.9.1.ebuild b/dev-ml/bin-prot/bin-prot-0.9.1.ebuild
new file mode 100644
index 000000000000..5c2d435fef0b
--- /dev/null
+++ b/dev-ml/bin-prot/bin-prot-0.9.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Binary protocol generator"
+HOMEPAGE="https://github.com/janestreet/bin_prot"
+SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-lang/ocaml:=
+ dev-ml/base:=
+ dev-ml/ppx_compare:=
+ dev-ml/ppx_custom_printf:=
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_fields_conv:=
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/ppx_type_conv:=
+ dev-ml/ppx_variants_conv:=
+ dev-ml/sexplib:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+S="${WORKDIR}/bin_prot-${PV}"
+
+src_test() {
+ jbuilder runtest || die
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN/-/_}.install || die
+ dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild
index 052fa649710d..f094afad03be 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild
@@ -26,12 +26,12 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
LICENSE="UoI-NCSA"
SLOT="0/${PV}"
KEYWORDS=""
-IUSE="test ${ALL_LLVM_TARGETS[*]}"
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
RDEPEND="
>=dev-lang/ocaml-4.00.0:0=
dev-ml/ocaml-ctypes:=
- ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,}]
+ ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
!sys-devel/llvm[ocaml(-)]"
# configparser-3.2 breaks the build (3.3 or none at all are fine)
DEPEND="${RDEPEND}
@@ -81,7 +81,7 @@ src_configure() {
-DLLVM_ENABLE_TERMINFO=OFF
-DHAVE_HISTEDIT_H=NO
-DWITH_POLLY=OFF
- -DLLVM_ENABLE_ASSERTIONS=OFF
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-DLLVM_ENABLE_EH=ON
-DLLVM_ENABLE_RTTI=ON
@@ -97,6 +97,9 @@ src_configure() {
-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
)
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ # also: custom rules for OCaml do not work for CPPFLAGS
+ use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
cmake-utils_src_configure
local llvm_libdir=$(llvm-config --libdir)
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild
index b6885c5b6232..d5f507e9e101 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild
@@ -25,12 +25,12 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
LICENSE="UoI-NCSA"
SLOT="0/${PV}"
KEYWORDS=""
-IUSE="test ${ALL_LLVM_TARGETS[*]}"
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
RDEPEND="
>=dev-lang/ocaml-4.00.0:0=
dev-ml/ocaml-ctypes:=
- ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,}]
+ ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
!sys-devel/llvm[ocaml(-)]"
# configparser-3.2 breaks the build (3.3 or none at all are fine)
DEPEND="${RDEPEND}
@@ -80,7 +80,7 @@ src_configure() {
-DLLVM_ENABLE_TERMINFO=OFF
-DHAVE_HISTEDIT_H=NO
-DWITH_POLLY=OFF
- -DLLVM_ENABLE_ASSERTIONS=OFF
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-DLLVM_ENABLE_EH=ON
-DLLVM_ENABLE_RTTI=ON
@@ -96,6 +96,9 @@ src_configure() {
-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
)
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ # also: custom rules for OCaml do not work for CPPFLAGS
+ use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
cmake-utils_src_configure
local llvm_libdir=$(llvm-config --libdir)
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 95bd984488ad..d5328dfb465a 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -2,3 +2,4 @@ DIST merlin-2.5.3.tar.gz 3090459 SHA256 3538a02ad025090240825596fc4e1f86806d3808
DIST merlin-2.5.4.tar.gz 3094234 SHA256 e4e53f680e5e143ed0fb1a5dee4aba2e39e65e2d5619247526b85f5d6cc77e00 SHA512 ca6a1cc1da0b0211bac4f0e8b9c78b531fdd0ed97f7d978ae740b7bf7a97bb02d318bde97d8a9f143b6207b72bd47eb626748b86feebf6a60bcd222d5bddb759 WHIRLPOOL 50c33f65da5dfa9949fa1e21360580f52d5d73092a5ec791085bc53d9d834765a745d8f14a9df8717812d0f565c6c871a38a624e7ae885f7367effabcfb99daa
DIST merlin-2.5.5.tar.gz 3094071 SHA256 5730cc1128bf6cf0af63985178307bbfd684bb5a03dc9dd62f14e4d3f8ae3d89 SHA512 9ba79f2fd2e2cdefe94da60b52096696bf08dcfd332188496c35074377a106bb3987025069784a96846a6c1cef1c0793b0525781aed8192227dd0c67266baaf1 WHIRLPOOL 263f0adb685d361cc72f99f9ff43dad75a54c92ff1341e12fa2b199c6a4351549e5fe1f13be22fe5053822179efaf0ead92a0f579910a85d36e7971bb2881baa
DIST merlin-3.0.0.tar.gz 3971353 SHA256 dc215cc974e41e21e47d02497b67b94a2ac1682295c5f8ec58de753b9de67dbb SHA512 674495c01d4afef8273e904f656475d1e05e6c06b9f8a39ce2e3eb8aacd870a2e721ba510dccd2d9d154f5b6fbfb42840603d189819a573d136a3bcc85ff4551 WHIRLPOOL 94992412ac18fef020539738f19bd8a529f526cb589e53ebd8f55179f3b56467e690b1434b73590ea5fcb4efab90c0d33bfcea990ede9d745fd95024061d8da0
+DIST merlin-3.0.1.tar.gz 3971680 SHA256 1dac05fde93de570473e48a89ac19975734c524218893300aff9cbfcce4b7cc6 SHA512 7f6bedba954fde712b5eda80910c27f80f74f1346c67b0c29b896944c7d51dd268db0aa996610a1dda6edc0798b322369390bb3213f8c42584676790756542ec WHIRLPOOL 2940783f8a05aba48c96538aebbcbae0309ef24893ac45d6593d71b6ef12b09ab399427a8fb61a3d161008d92354fff82addd4e26268d48af3e015aa8df7eaf6
diff --git a/dev-ml/merlin/merlin-3.0.1.ebuild b/dev-ml/merlin/merlin-3.0.1.ebuild
new file mode 100644
index 000000000000..609f9767e4cc
--- /dev/null
+++ b/dev-ml/merlin/merlin-3.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+ || ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+ ./configure \
+ --prefix "${EPREFIX}/usr" \
+ --vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+ || die
+}
+
+src_install() {
+ default
+}
diff --git a/dev-ml/ocaml-dispatch/Manifest b/dev-ml/ocaml-dispatch/Manifest
index 2ab3e314bede..f9f4dc4fc5f2 100644
--- a/dev-ml/ocaml-dispatch/Manifest
+++ b/dev-ml/ocaml-dispatch/Manifest
@@ -1 +1,2 @@
DIST ocaml-dispatch-0.3.0.tar.gz 51453 SHA256 ebb6bb60ec5a7c17a68711a801006f204b283989b5b9fa1dbe9bd781645f3913 SHA512 0f09eae45a2ecae27d07e247b6a47f307e074342e337e7be262f5183f77090f0aef81fb5c0bf499732bd0a711d4d51775cbcea5e463011f43a1777582d78806b WHIRLPOOL f77f459b34df41506ef1eb13e4d880a0bfed8166e60e2770b0cb6dc3ac2285281f4fc35c2b12465743492d8f730b6ad5585e995a3152a2c5e72638c335158256
+DIST ocaml-dispatch-0.4.0.tar.gz 7554 SHA256 6c8e77f2960742c16e187355bd1bdaf51ff83c377bf91c6cf4db72de026de5b2 SHA512 d5318bda4079c21820fce5b21d178ed88fd0535a5cdc559dd6ceeb4d06ffb08456ee5aec1e56efd40b6d4f456f7d5c7eda17dc728666e6514dc936898b605b36 WHIRLPOOL 646bcbe74eb10f8935010c797d65c65bf5e74bb532ae375cad00953fcdc0cd9ca93a28e5a453db311114aaf296805893877e8a3bc65cd86ece995e9cea6cf934
diff --git a/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild b/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild
new file mode 100644
index 000000000000..562ef548b9a1
--- /dev/null
+++ b/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Path-based dispatching for client- and server-side applications"
+HOMEPAGE="https://github.com/inhabitedtype/ocaml-dispatch"
+SRC_URI="https://github.com/inhabitedtype/ocaml-dispatch/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+ dev-ml/result:=
+ dev-lang/ocaml:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/jbuilder
+ dev-ml/opam
+ test? ( dev-ml/ounit )
+"
+
+src_compile() {
+ jbuilder build -p dispatch || die
+}
+
+oinstall() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ --mandir="${ED}/usr/share/man" \
+ ${1}.install || die
+}
+
+src_install() {
+ oinstall dispatch
+}
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.1.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.1.ebuild
index 4c7db9b3f7a6..7cc9e3cb40de 100644
--- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.1.ebuild
+++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/${PV}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~arm64"
IUSE=""
DEPEND="
diff --git a/dev-ml/ocaml-stdint/Manifest b/dev-ml/ocaml-stdint/Manifest
index e0e2fadd3893..491a59a061b2 100644
--- a/dev-ml/ocaml-stdint/Manifest
+++ b/dev-ml/ocaml-stdint/Manifest
@@ -1 +1,2 @@
DIST ocaml-stdint-0.3.0.tar.gz 80556 SHA256 08fd03cff102f8264f9964a638d1efb223c155ce1794e3aa99def014fe53bba6 SHA512 554f816cfff052058bea63f3daa790be34da3006713dfa83096af2e4866cfb439b549d4bc8d5fe08261762c97d4f98cbbd45196f7adb4698e0a8542c1676008b WHIRLPOOL 1de97e0be66c34e0492c6cbbc82314337dc88011e12881c0b60a200320f9e238a6ddf038d4dce212970d4dfd3a2316a83bf1bb02f9e3090330e7573760637359
+DIST ocaml-stdint-0.4.1.tar.gz 79615 SHA256 a26ae71e12c76788e149ce529d9b3158b7d9ab1e489c7756895219d3ab956391 SHA512 52f46387f5f14121d1ca8509714a88253cc26dd91a2ad03cbaba67346a9a371536373fc574b5db8105c6d218746ffabb1e728848df62e9900ed6a19f69a3daeb WHIRLPOOL bb7fee3ee047090183fa847c729e98355785ece37952f3670f4c2186c43d3f50e07cc5cfdd67d83bf302ee8d3cdbe4147689e674c0fae542b04a3adf729e13b3
diff --git a/dev-ml/ocaml-stdint/ocaml-stdint-0.4.1.ebuild b/dev-ml/ocaml-stdint/ocaml-stdint-0.4.1.ebuild
new file mode 100644
index 000000000000..f2c7b3938e6b
--- /dev/null
+++ b/dev-ml/ocaml-stdint/ocaml-stdint-0.4.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Various signed and unsigned integers for OCaml"
+HOMEPAGE="https://github.com/andrenth/ocaml-stdint"
+SRC_URI="https://github.com/andrenth/ocaml-stdint/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ocaml-webmachine/ocaml-webmachine-0.4.0.ebuild b/dev-ml/ocaml-webmachine/ocaml-webmachine-0.4.0.ebuild
index 428929a6c100..1f8b5e502946 100644
--- a/dev-ml/ocaml-webmachine/ocaml-webmachine-0.4.0.ebuild
+++ b/dev-ml/ocaml-webmachine/ocaml-webmachine-0.4.0.ebuild
@@ -20,7 +20,7 @@ IUSE=""
DEPEND="
dev-ml/calendar:=
dev-ml/ocaml-cohttp:=[ocamlopt?]
- dev-ml/ocaml-dispatch:=[ocamlopt?]
+ dev-ml/ocaml-dispatch:=[ocamlopt(+)?]
dev-ml/ocaml-re:=[ocamlopt?]
dev-ml/ocaml-uri:=[ocamlopt(+)?]
"
diff --git a/dev-ml/ppx_inline_test/Manifest b/dev-ml/ppx_inline_test/Manifest
index d8214c259d86..91836adf585f 100644
--- a/dev-ml/ppx_inline_test/Manifest
+++ b/dev-ml/ppx_inline_test/Manifest
@@ -1,2 +1,3 @@
DIST ppx_inline_test-0.9.0.tar.gz 19059 SHA256 c69968b180d524a13712bba3869078fe224f4214fa65a8713cc3e309075af9bf SHA512 639614beaeb4aedd5450062f90a42898db24347f94f1595fc9adad2a837a54723e6f92e72b16709cb15a18c0b9ae3eb7089cc92bb239266a0d6d7e82f5f9e642 WHIRLPOOL 796dac694898c26ebb5d727de82cabcd8391ab01748a2f8ce725965b50b0cf1ee394ce3a5cb0c8f228379852ee76cea5897272bd1857e3f597936608311d3461
DIST ppx_inline_test-0.9.1.tar.gz 19262 SHA256 04409caa79873ccaed8ff2e32d70fec9258477bf5c414654d8e7d26006668443 SHA512 c3ef0db2a79523c3c223db19f80ceef207aec1f354e2ff746049c81bdea6dd3a4cd0e24c8f1fe99be17f03b47ae201823849f9204a2a990a9eb6794d8d26b95a WHIRLPOOL 1afcfa11575a5c78306783ff93d2afe5ded5a8bc6e6c03e6ef1302b5d5423a463aca4994a4a95588e49f9e4e12b8b05ac9bb84044347b37875c1a308486410de
+DIST ppx_inline_test-0.9.2.tar.gz 19280 SHA256 fee108d69d12efab43c0100dc49e021d253957d6f352ed99af0b4149c75e12d0 SHA512 39261a51201b2b7fbd6f4f53c72b2921da9f5a47f726479f65f976ed3979630f0a8587328f4536e42d24315d341afbe2770084ffd951569564a3145cd154be5f WHIRLPOOL ed66b9e67859868a4c2ae75dfe0b5c93fa211330952772d35ff2d99fa754b87228f95b9e21fc0289d4aa5f153dba93382abe7463592b78e49b7b6c3e321c0e2d
diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.9.2.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.9.2.ebuild
new file mode 100644
index 000000000000..68e2df835200
--- /dev/null
+++ b/dev-ml/ppx_inline_test/ppx_inline_test-0.9.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Syntax extension for writing in-line tests in ocaml code"
+HOMEPAGE="https://github.com/janestreet/ppx_inline_test"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-lang/ocaml:=
+ dev-ml/base:=
+ dev-ml/ppx_core:=
+ dev-ml/ppx_driver:=
+ dev-ml/ppx_metaquot:=
+ dev-ml/ppx_traverse_builtins:=
+ dev-ml/ocaml-migrate-parsetree:=
+"
+
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+}
diff --git a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild b/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild
index 96eef40e368c..92ac168b00ee 100644
--- a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild
+++ b/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/let-def/ppx_tools_versioned/archive/${MY_PV}.tar.gz
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~arm64"
IUSE=""
DEPEND="
diff --git a/dev-ml/sexplib/Manifest b/dev-ml/sexplib/Manifest
index f35fbb41eb03..00578d477cfa 100644
--- a/dev-ml/sexplib/Manifest
+++ b/dev-ml/sexplib/Manifest
@@ -1 +1,2 @@
DIST sexplib-0.9.1.tar.gz 75004 SHA256 4cfea2edbe90db2227409abc5e93e86ee4413c8c7aeeb73f2fd69a86a7d55766 SHA512 c9b938c3fcbf50768f4db55c7bc8fe979400066b39b6bd0d431960e4f4c15d0d8265a9fdac9eda5278415a78119d8a2721df4aab1bca980fb1090c065c34d931 WHIRLPOOL 359ed2983ca6fba813ffd49c7db8bbaaeb63c918cd0e8eaed5a35134ec347cdc8493248d6662cc82b4c1c4299229fb69b61fec008dd52aa4c1d19ea49f800839
+DIST sexplib-0.9.2.tar.gz 75035 SHA256 8dbcd78d3625b71ed60ac7eee9da83da6f979fee62be103f82bb9af90d26d1e1 SHA512 d9e02ae9e7e8be4387c5d4e5c4a23222e2ebbd3355d52c26e0d6ac0ccc4f4e09653ac2852e6698d6128ff954888e65d97dd7a494b9404bad2e8349cd592bab1d WHIRLPOOL 6a75c41c4e57e6ed08d56b901df069eefd03eec2e6e1b4f504507f08512d34e9817180cc958925038f4b779b0f33bd157515a0b8214215a0509b8bda14f73c5f
diff --git a/dev-ml/sexplib/sexplib-0.9.2.ebuild b/dev-ml/sexplib/sexplib-0.9.2.ebuild
new file mode 100644
index 000000000000..8ea3c1e31504
--- /dev/null
+++ b/dev-ml/sexplib/sexplib-0.9.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
+HOMEPAGE="https://github.com/janestreet/sexplib"
+SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc"
+IUSE=""
+
+RDEPEND="dev-lang/ocaml:="
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_test() {
+ jbuilder runtest || die
+}
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ ${PN}.install || die
+ dodoc CHANGES.md README.org
+}
diff --git a/dev-php/cphplib/cphplib-0.51-r1.ebuild b/dev-php/cphplib/cphplib-0.51-r1.ebuild
new file mode 100644
index 000000000000..c79a4a612094
--- /dev/null
+++ b/dev-php/cphplib/cphplib-0.51-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Cute PHP Library (cphplib)"
+HOMEPAGE="http://cphplib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cphplib/${P}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc"
+
+DEPEND=">=dev-php/PEAR-DB-1.7.6-r1"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/constructor.patch" )
+
+src_install() {
+ local DOCS=( ChangeLog README TODO )
+ local -a HTML_DOCS
+ insinto "/usr/share/php/${PN}"
+ doins -r i18n cphplib_formular.inc cphplib.inc
+ use doc && HTML_DOCS=( doc/packages.html doc/blank.html
+ doc/classtrees_cphplib.html doc/index.html doc/cphplib/
+ doc/errors.html doc/__filesource/ doc/elementindex.html
+ doc/li_cphplib.html doc/elementindex_cphplib.html doc/media/ )
+ einstalldocs
+}
diff --git a/dev-php/cphplib/cphplib-0.51.ebuild b/dev-php/cphplib/cphplib-0.51.ebuild
deleted file mode 100644
index 3a273920d676..000000000000
--- a/dev-php/cphplib/cphplib-0.51.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Cute PHP Library (cphplib)"
-HOMEPAGE="http://cphplib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cphplib/${P}.tar.bz2"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-DB-1.7.6-r1"
-RDEPEND="${DEPEND}"
-
-src_install() {
- insinto "/usr/share/php/${PN}"
- doins *.spec *.inc
-
- dodoc ChangeLog COPYRIGHT LGPL README TODO
-}
diff --git a/dev-php/cphplib/files/constructor.patch b/dev-php/cphplib/files/constructor.patch
new file mode 100644
index 000000000000..1ab88d212c1f
--- /dev/null
+++ b/dev-php/cphplib/files/constructor.patch
@@ -0,0 +1,42 @@
+diff -uarN a/cphplib_formular.inc b/cphplib_formular.inc
+--- a/cphplib_formular.inc 2006-05-25 05:03:44.000000000 -0400
++++ b/cphplib_formular.inc 2017-07-27 10:49:10.928727081 -0400
+@@ -130,6 +130,11 @@
+
+ function cphplib_formular($locale="de_DE")
+ {
++ __construct($locale);
++ }
++
++ function __construct($locale="de_DE")
++ {
+ parent::cphplib($locale);
+
+ $this->os_type = $this->os_type();
+@@ -1390,4 +1395,3 @@
+ }
+ }
+
+-?>
+\ No newline at end of file
+diff -uarN a/cphplib.inc b/cphplib.inc
+--- a/cphplib.inc 2006-05-25 05:03:58.000000000 -0400
++++ b/cphplib.inc 2017-07-27 10:59:51.910098156 -0400
+@@ -215,6 +215,11 @@
+ */
+ function cphplib($locale="de_DE")
+ {
++ __construct($locale);
++ }
++
++ function __construct($locale="de_DE")
++ {
+ if (!empty($locale))
+ {
+ $this->locale = $locale;
+@@ -4539,4 +4544,3 @@
+ }
+ }
+
+-?>
+\ No newline at end of file
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
index ad10daaf227b..1d3d6dcf1f0d 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
@@ -16,7 +16,8 @@ LICENSE="PHP-3.01"
SLOT="0"
IUSE=""
KEYWORDS="~amd64 ~x86"
-DEPEND="net-libs/libssh2"
+# Upstream notes say there are errors with gcrypt backend
+DEPEND="net-libs/libssh2[-gcrypt]"
RDEPEND="${DEPEND}"
PDEPEND="php_targets_php7-0? ( dev-php/pecl-ssh2:7 )
php_targets_php7-1? ( dev-php/pecl-ssh2:7 )"
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
index 28dc40b3371e..53f184049f81 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
@@ -16,7 +16,8 @@ LICENSE="PHP-3.01"
SLOT="7"
IUSE=""
KEYWORDS="~amd64 ~x86"
-DEPEND=">=net-libs/libssh2-1.2"
+# Upstream notes say there are errors with gcrypt backend
+DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
RDEPEND="${DEPEND}
php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
diff --git a/dev-python/dbus-python/dbus-python-1.2.4.ebuild b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
index cd5bc3649310..317140e3e735 100644
--- a/dev-python/dbus-python/dbus-python-1.2.4.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
IUSE="doc examples test"
# API docs generated with epydoc, which is python2-only
REQUIRED_USE="
diff --git a/dev-python/ipython/ipython-5.4.1.ebuild b/dev-python/ipython/ipython-5.4.1.ebuild
index 04565eb60a57..5dedf5e9ea25 100644
--- a/dev-python/ipython/ipython-5.4.1.ebuild
+++ b/dev-python/ipython/ipython-5.4.1.ebuild
@@ -53,6 +53,7 @@ DEPEND="${CDEPEND}
doc? (
dev-python/ipykernel[${PYTHON_USEDEP}]
dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
)"
PDEPEND="
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index e99135962708..18c695b6f544 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,7 +1,2 @@
-DIST keyring-10.0.2.tar.gz 36587 SHA256 91c31fd805b3ce6343406c7c51437f7505f3e9abb6e14ccac8242ea1fc912d77 SHA512 e9018415e99c50d806e2c1d4a057551afedbd91efef7163ceac150f2b0857244ba6ab7cb867596a94b96ea23eb6b0b765ccd62ce7283e52d1d926c15cf92f9ba WHIRLPOOL 2be86bde3cf433a8129f34428206f0ce345a29de58ed229e1e074a5822dc922b5e0216a5748c75961a8df863ad7bf7554faf592cc6cde7f363c21b6b08baf944
-DIST keyring-10.1.tar.gz 37088 SHA256 af7f02d8ad957523842651f1a2247ff178c387476f7d366880f04fd195468f2f SHA512 955cc59eaef2f8fd690ee68e646196c1579fcae227c8df5012f3a884a7f596d964a8a2f1a37c17dc7f7c34a4aea88920e95e0adfbaf25a7a0f7474274696bae6 WHIRLPOOL b827d42553175a06bdeb21e08a5e702d81b4debaed25f98ad16e7319d493c82e7f9541c39e97db1584a901a892096af8c2206f345321fd4f2da834db67714915
-DIST keyring-10.2.tar.gz 37110 SHA256 bf49be09b31db401791bde1799da30d6926e7de2f0fb836c3dfc85aa5538a572 SHA512 ee2bb8e612d542ed4cf28f911d436a4b27a04eda0407f8a638189098c729d5e2aa70205783f5320fbbd4a5cdd524f12796880e46f9d1369ff27d2346e5959040 WHIRLPOOL 889550e38e65af3b188037083fe4101169454fce374fe8bddd621e6beaf187943aa18c3d37bbcfb405db1b1de930a9578800744f6f555526264acbf53c2a4503
-DIST keyring-10.3.2.tar.gz 39244 SHA256 f462698bc8b96ef5f9fb31d392611f416c808a8244d679fb02530b72bab01ad6 SHA512 4d9737b47bf728d9c8cce222ed9da833955599c210c77c1fd99d67543ff936f79a99a14e3bad927c0b209f18612fc21d8682b065aa3f2601b1365f4e38e96d36 WHIRLPOOL bcfb915cdac58b1bff3ed55520d7d674edf01b109270bf8c1dddea4a0a124342792d2884ee34a99b0503fa6c6af16932ab6be7998ec27d9e2a52a2f9e126afe6
DIST keyring-10.3.3.tar.gz 39531 SHA256 86a7db0ed1026853d1235f4901efbcaafdba52357f2a0b0347ec1adbdc9b9026 SHA512 6087b9553d3a8df4abbcc0bacc18d769fda04c092781bd79817ceb5984a2548b5c3a4a2bda15a95040b9db59750a91d8eebbc2420d5f9dbd2fa3d6f10884e26a WHIRLPOOL ca25219e54280a75c08147baec88e795d23bca18f9ddc8b5e562dcd70635c61d4cab7e354eb04417cef6b2c9dfbd1c29ab3f5c4e53d4a0fb859e67415272ecfe
DIST keyring-10.4.0.tar.gz 39632 SHA256 901a3f4ed0dfba473060281b58fd3b649ce70f59cb34a9cf6cb5551218283b26 SHA512 34b1503588fedd480b2031d5557349bc6cd70108e68205a38338e091d2865df512f9a9aa3525fb11fbbb9bc06b2cfa759685495ca94b4044ec034070aa3dc0bb WHIRLPOOL 87dda84b89dd6823b161898be8656cc0bd6ab2a549238193f24fcd27fd4b7fae73e77005fdb56b259c2eec3fb0b8f38e856b749ca313cf1b465cebb7804b6721
-DIST keyring-9.3.1.tar.gz 40579 SHA256 3be74f6568fcac1350b837d7e46bd3525e2e9fe2b78b3a3a87dc3b29f24a0c00 SHA512 b899e45e479806e9d01cb490925e291608dfa32bdac212a09922c2fa11196bf18b3ccdefd05aa3777588df43f1dbc5352d6705b93cae23bc7525c727254a938c WHIRLPOOL 5e0213331bafa0e387129f6ae705835cfb01aac3daadd2e142b3ebccc9b6bde1c2ebf7ba30610a89bbcffe728f1fc6efa42227ab2afccef81144ec3d0a7cc935
diff --git a/dev-python/keyring/keyring-10.0.2-r1.ebuild b/dev-python/keyring/keyring-10.0.2-r1.ebuild
deleted file mode 100644
index 22cbe9e6dc57..000000000000
--- a/dev-python/keyring/keyring-10.0.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
- dev-python/secretstorage[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
- )"
-RDEPEND=""
-
-python_test() {
- py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-10.1-r1.ebuild b/dev-python/keyring/keyring-10.1-r1.ebuild
deleted file mode 100644
index ed713b5bb05b..000000000000
--- a/dev-python/keyring/keyring-10.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
- dev-python/secretstorage[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
- )"
-RDEPEND=""
-
-python_test() {
- py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-10.1.ebuild b/dev-python/keyring/keyring-10.1.ebuild
deleted file mode 100644
index f50fac8a19d0..000000000000
--- a/dev-python/keyring/keyring-10.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
- dev-python/secretstorage[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
- )"
-RDEPEND=""
-
-python_test() {
- py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-10.2.ebuild b/dev-python/keyring/keyring-10.2.ebuild
deleted file mode 100644
index 59be7018be7f..000000000000
--- a/dev-python/keyring/keyring-10.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
- dev-python/secretstorage[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
- )"
-RDEPEND=""
-
-python_test() {
- py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-10.3.2.ebuild b/dev-python/keyring/keyring-10.3.2.ebuild
deleted file mode 100644
index d67327ce6b9e..000000000000
--- a/dev-python/keyring/keyring-10.3.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
- dev-python/secretstorage[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
- )"
-RDEPEND=""
-
-python_test() {
- py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-10.4.0.ebuild b/dev-python/keyring/keyring-10.4.0.ebuild
index 8987c7c8a6b3..2ed6a9125603 100644
--- a/dev-python/keyring/keyring-10.4.0.ebuild
+++ b/dev-python/keyring/keyring-10.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="PSF-2"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="
diff --git a/dev-python/keyring/keyring-9.3.1.ebuild b/dev-python/keyring/keyring-9.3.1.ebuild
deleted file mode 100644
index e0261d01eebe..000000000000
--- a/dev-python/keyring/keyring-9.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
- )"
-RDEPEND=""
-
-python_test() {
- py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/nltk/nltk-3.2.2.ebuild b/dev-python/nltk/nltk-3.2.2.ebuild
index df645a464b57..79fb3644aaee 100644
--- a/dev-python/nltk/nltk-3.2.2.ebuild
+++ b/dev-python/nltk/nltk-3.2.2.ebuild
@@ -4,7 +4,7 @@
EAPI="6"
PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE="tk?,xml(+)"
+PYTHON_REQ_USE="sqlite,tk?,xml(+)"
inherit distutils-r1
diff --git a/dev-python/nltk/nltk-3.2.3.ebuild b/dev-python/nltk/nltk-3.2.3.ebuild
index ccf9c62b9c3e..00df16dee538 100644
--- a/dev-python/nltk/nltk-3.2.3.ebuild
+++ b/dev-python/nltk/nltk-3.2.3.ebuild
@@ -4,7 +4,7 @@
EAPI="6"
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="tk?,xml(+)"
+PYTHON_REQ_USE="sqlite,tk?,xml(+)"
inherit distutils-r1
diff --git a/dev-python/pycups/pycups-1.9.73-r1.ebuild b/dev-python/pycups/pycups-1.9.73-r1.ebuild
index 46c1f8808124..d4a765ec3a35 100644
--- a/dev-python/pycups/pycups-1.9.73-r1.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
SLOT="0"
IUSE="doc examples"
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index 75891700a7b5..779156a48055 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,4 +1,3 @@
DIST pysnmp-4.3.3.tar.gz 403779 SHA256 c837d35cbb2c1e067b7b8ed752d962481ef8d7ff11e4cdd8bfb0840c4a786318 SHA512 4b3e4a1785a852eb0b03266d2efbc586c01030f4653482bfea91b64a78098554589e76d38fe43c6b2d734ea3624a42878a2e3b6b7cfbf883e8bf8ad07ff43f81 WHIRLPOOL f04c9f6eece5d31bb4941cfdbfa3216fb5a65b2b2b1b097bd72ca500506262c0458d6d774b99c766f2016fb46ea50bc9a8b741825f820a0a7970dac7ac934977
-DIST pysnmp-4.3.5.tar.gz 404793 SHA256 38253fe95cea33f352fb36e85f3c2874043401724300c4888df74835161169d2 SHA512 0878ff1b42a28aaea9ed97137971d606457ae392b701eb7a2f6fd5eb59349e7d2ca1193a3d468ad83ee3eb91cd74ec160c7d90ef750164a717c0ae57fcef5784 WHIRLPOOL 5bfc88686232bdad59208984588418b3811d6d92dc58a0d5e0a18364eb44d99032981a5ee65a3f9fdbf7947e2bd6038763d44880ab19e59ff4611df824e06134
-DIST pysnmp-4.3.7.tar.gz 424464 SHA256 fd0e139bf3768eaaa1e2b339c23c19a74c8086fe4307252e2e5b4c3a070d89db SHA512 c6c5f8927b9e142cfd0731ad2e2fc0b9e479b9e2e177acdd2e49e9e8744dd248a0dc79e05066389ad16ca869a88abc44cde1e987fa5ec2ee92f5d2ffb02c8560 WHIRLPOOL 590ac6f51407ba9f66ee108d7dccbe6d362a0b0f57bf2fba1c0d30b7e02a8006f80e8c8a98f88435722fe1928e919967eecd0c628a632e23e1ff212a8c22b254
DIST pysnmp-4.3.8.tar.gz 424591 SHA256 882c1d3edfafad83eea7c29c13f566acc757459f18582217dcb9de6cfe86ba2a SHA512 b8e5329f10f9032a6beb790b3eb7ec18f3ed3aeca011abef4a73a4cd6310e70a2a672e5028bddfc8885b8770c23b07f65f4877d06a70059822854529e7f1fd0f WHIRLPOOL 2daad771ee847824dc708b001f37f2aa47caf0ccfffcfd208a080fb8d88443eedf5ee3f42dcac0ec0e473ee44177ba8b0212ff11a0f9fb8bc4a8c47958d696d9
+DIST pysnmp-4.3.9.tar.gz 425302 SHA256 59c196ce599617ad6f484d20bc61336bff64d3dca4bc99282ba06047248fc70c SHA512 b6992eed9cccb39c77527c871249e98ad758372a7e462ecc9c8b7aa476e29804aefe4974712719428ad8ba80f425f725a97ea7117e43ffd92c0bdc45605ea440 WHIRLPOOL a45695731cdced683c5af8735bbb1cea5aec67e7cf1a3e930832f3866a428c433681b97d9283e454486d362a97b54af9bebeb8a963e7805dc0933e24fb6a0d95
diff --git a/dev-python/pysnmp/pysnmp-4.3.3.ebuild b/dev-python/pysnmp/pysnmp-4.3.3.ebuild
index 4e42194a0392..38083e2b1ad9 100644
--- a/dev-python/pysnmp/pysnmp-4.3.3.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.3.3.ebuild
@@ -22,7 +22,10 @@ DEPEND="
"
RDEPEND="
>=dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
- dev-python/pycrypto[${PYTHON_USEDEP}]
+ || (
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
+ dev-python/pycrypto[${PYTHON_USEDEP}]
+ )
"
python_compile_all() {
@@ -46,5 +49,5 @@ pkg_postinst() {
elog "You may also be interested in the following packages: "
elog "dev-python/pysnmp-apps - example programs using pysnmp"
elog "dev-python/pysnmp-mibs - IETF and other mibs"
- elog "net-libs/libsmi - to dump MIBs in python format"
+ elog "dev-python/pysmi - to dump MIBs in python format"
}
diff --git a/dev-python/pysnmp/pysnmp-4.3.7.ebuild b/dev-python/pysnmp/pysnmp-4.3.7.ebuild
deleted file mode 100644
index 0b3d4e9fa7d7..000000000000
--- a/dev-python/pysnmp/pysnmp-4.3.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python SNMP library"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc examples"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-RDEPEND="
- >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
- dev-python/pycrypto[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
- default
-
- if use doc; then
- touch docs/source/conf.py
- emake -C docs html
- fi
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/build/html/* )
- docinto examples
- use examples && dodoc -r examples/* docs/mibs
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- elog "You may also be interested in the following packages: "
- elog "dev-python/pysnmp-apps - example programs using pysnmp"
- elog "dev-python/pysnmp-mibs - IETF and other mibs"
- elog "net-libs/libsmi - to dump MIBs in python format"
-}
diff --git a/dev-python/pysnmp/pysnmp-4.3.8.ebuild b/dev-python/pysnmp/pysnmp-4.3.8.ebuild
index 0b3d4e9fa7d7..237ed7a23499 100644
--- a/dev-python/pysnmp/pysnmp-4.3.8.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.3.8.ebuild
@@ -22,7 +22,10 @@ DEPEND="
"
RDEPEND="
>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
- dev-python/pycrypto[${PYTHON_USEDEP}]
+ || (
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
+ dev-python/pycrypto[${PYTHON_USEDEP}]
+ )
"
python_compile_all() {
@@ -46,5 +49,5 @@ pkg_postinst() {
elog "You may also be interested in the following packages: "
elog "dev-python/pysnmp-apps - example programs using pysnmp"
elog "dev-python/pysnmp-mibs - IETF and other mibs"
- elog "net-libs/libsmi - to dump MIBs in python format"
+ elog "dev-python/pysmi - to dump MIBs in python format"
}
diff --git a/dev-python/pysnmp/pysnmp-4.3.5.ebuild b/dev-python/pysnmp/pysnmp-4.3.9.ebuild
similarity index 87%
rename from dev-python/pysnmp/pysnmp-4.3.5.ebuild
rename to dev-python/pysnmp/pysnmp-4.3.9.ebuild
index 0b3d4e9fa7d7..237ed7a23499 100644
--- a/dev-python/pysnmp/pysnmp-4.3.5.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.3.9.ebuild
@@ -22,7 +22,10 @@ DEPEND="
"
RDEPEND="
>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
- dev-python/pycrypto[${PYTHON_USEDEP}]
+ || (
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
+ dev-python/pycrypto[${PYTHON_USEDEP}]
+ )
"
python_compile_all() {
@@ -46,5 +49,5 @@ pkg_postinst() {
elog "You may also be interested in the following packages: "
elog "dev-python/pysnmp-apps - example programs using pysnmp"
elog "dev-python/pysnmp-mibs - IETF and other mibs"
- elog "net-libs/libsmi - to dump MIBs in python format"
+ elog "dev-python/pysmi - to dump MIBs in python format"
}
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index 6290308fadda..718207f73709 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,3 +1,4 @@
DIST sympy-0.7.6.1.tar.gz 6431571 SHA256 1fc272b51091aabe7d07f1bf9f0a47f3e28657fb2bec52bf3ef0e8f159f5f564 SHA512 18877abd3c530418e4f4942cbb0a03140dc81e5a1004720c472fb97cf8eaa41acca59765f6278715ea88bcd0cd07ad5952863a0d1b6e6d00994d257e8c0a6574 WHIRLPOOL b0c0c74e7865c91585d1a2c8510fe328b8e697dec02bd17aaa446ef6e089b9cf2ca5b4f58b6b59febccf142384b907e1bd47451e22fa305843bd883355801226
DIST sympy-1.0.tar.gz 4281528 SHA256 3eacd210d839e4db911d216a9258a3ac6f936992f66db211e22767983297ffae SHA512 977db6e9bc6a5918cceb255981a57e85e7060c0922aefd2968b004d25d704e25a5cb5bbe09eb387e8695581e23e2825d9c40310068fe25ece7e9c23037a21f39 WHIRLPOOL df02cc8603c23f621226f28b4f0555e765f145d968869058ed9420fedd3c6d6d0f095ee14fa864cd505455f245e5adf10794fc3b1392fb5a331ed5dc506b988b
+DIST sympy-1.1.1.tar.gz 4580952 SHA256 ac5b57691bc43919dcc21167660a57cc51797c28a4301a6144eff07b751216a4 SHA512 ff8857fd5810795554ca4f636b2d8e633057d7ea7df76461003d823ecbaddc98cde0561eb79a1058741c5ece233c13bfcb5e30d5bfb8ac6dbab3d05d8226f92b WHIRLPOOL 3ab86021e99de620127bbd3da994745d265e66fbe7ebf77984106f998443200dd7a5a3295cc62e3bca7e3eb1df58b331d1faba568760230fab550c5c2c3f92b9
DIST sympy-1.1.tar.gz 4579454 SHA256 e42d7b8cc719bb0427b503d49f8489ec6292c74957c3bd04216a8392bee37782 SHA512 4129752778b50fbc08180fe413d2109ad418b54b79caea461b9a6cf6856ab4f50ce95df6131b07791ed633c840648aa7c4dd130ab3f1cbb1e03e7346e995747b WHIRLPOOL bcee355015504a464c89f1cc2c35b3085af6d53a4d8c2245eda124ddbf53fb562b6a768b2d6cd79688b1255a21540094bd18e3f814dd729541a85767e27adb3c
diff --git a/dev-python/sympy/files/sympy-1.1.1-zeta.patch b/dev-python/sympy/files/sympy-1.1.1-zeta.patch
new file mode 100644
index 000000000000..d9bab8096fac
--- /dev/null
+++ b/dev-python/sympy/files/sympy-1.1.1-zeta.patch
@@ -0,0 +1,29 @@
+diff -U2 -r sympy-1.1.1.orig/sympy/functions/special/zeta_functions.py sympy-1.1.1/sympy/functions/special/zeta_functions.py
+--- sympy-1.1.1.orig/sympy/functions/special/zeta_functions.py 2017-07-22 05:17:42.000000000 +0700
++++ sympy-1.1.1/sympy/functions/special/zeta_functions.py 2017-07-28 06:35:28.477927184 +0700
+@@ -272,4 +272,5 @@
+ @classmethod
+ def eval(cls, s, z):
++ from sympy import unpolarify
+ if z == 1:
+ return zeta(s)
+@@ -277,5 +278,11 @@
+ return -dirichlet_eta(s)
+ elif z == 0:
+- return 0
++ return S.Zero
++
++ # branch handling
++ if (1 - abs(z)).is_nonnegative:
++ newz = unpolarify(z)
++ if newz != z:
++ return cls(s, newz)
+
+ def fdiff(self, argindex=1):
+@@ -483,5 +490,5 @@
+ For `\operatorname{Re}(s) > 0`, this function is defined as
+
+- .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^n}{n^s}.
++ .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^{n-1}}{n^s}.
+
+ It admits a unique analytic continuation to all of :math:`\mathbb{C}`.
diff --git a/dev-python/sympy/sympy-1.1.1.ebuild b/dev-python/sympy/sympy-1.1.1.ebuild
new file mode 100644
index 000000000000..35ea4c1cc066
--- /dev/null
+++ b/dev-python/sympy/sympy-1.1.1.ebuild
@@ -0,0 +1,90 @@
+# 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 distutils-r1 eutils virtualx
+
+DESCRIPTION="Computer Algebra System in pure Python"
+HOMEPAGE="http://sympy.org"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
+ ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+ latex? (
+ virtual/latex-base
+ dev-texlive/texlive-fontsextra
+ png? ( app-text/dvipng )
+ pdf? ( app-text/ghostscript-gpl )
+ )
+ mathml? (
+ dev-libs/libxml2:2[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7)
+ gtk? ( x11-libs/gtkmathview[gtk] )
+ )
+ opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+ pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
+ symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
+ texmacs? ( app-office/texmacs )
+ theano? ( dev-python/theano[${PYTHON_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X )
+ test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-zeta.patch
+ "${FILESDIR}"/${PN}-1.0-doc-makefile.patch
+)
+
+pkg_setup() {
+ use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_compile_all() {
+ if use doc; then
+ export XDG_CONFIG_HOME="${T}/config-dir"
+ mkdir "${XDG_CONFIG_HOME}" || die
+ chmod 0700 "${XDG_CONFIG_HOME}" || die
+ emake -j1 -C doc html info man cheatsheet
+ fi
+}
+
+python_test() {
+ virtx "${PYTHON}" setup.py test
+}
+
+python_install_all() {
+ local DOCS=( AUTHORS README.rst )
+ if use doc; then
+ DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \
+ doc/_build/cheatsheet/combinatoric_cheatsheet.pdf )
+ local HTML_DOCS=( doc/_build/html/. )
+ doinfo doc/_build/texinfo/${PN}.info
+ fi
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+ distutils-r1_python_install_all
+
+ if use texmacs; then
+ exeinto /usr/libexec/TeXmacs/bin/
+ doexe data/TeXmacs/bin/tm_sympy
+ insinto /usr/share/TeXmacs/plugins/sympy/
+ doins -r data/TeXmacs/progs
+ fi
+}
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
index 0c90a5561c66..bf48cd474a38 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc64 ~s390 ~sh sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/xlwt/xlwt-1.2.0.ebuild b/dev-python/xlwt/xlwt-1.2.0.ebuild
index f6c1c545352b..f2f6f8804d9c 100644
--- a/dev-python/xlwt/xlwt-1.2.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
DEPEND="
diff --git a/dev-ros/rqt_tf_tree/Manifest b/dev-ros/rqt_tf_tree/Manifest
index b9a8f4f089e6..0c9b04446462 100644
--- a/dev-ros/rqt_tf_tree/Manifest
+++ b/dev-ros/rqt_tf_tree/Manifest
@@ -1,2 +1,3 @@
DIST rqt_robot_plugins-0.5.6.tar.gz 2107696 SHA256 d5f1b509df54b253d3b2952560e8dc5e764c3259b0e9dcff08541e27ac9fed71 SHA512 871f660e22afafd510e34984b94d2530bc3314db194c06ff458430e15b1183a60147289e9544a5fb070665a3c83034cbcccefe2f820e62f091c3bbc0edfd0a51 WHIRLPOOL a90882b1e762f5e53b7ce7ff92695ba8eb63242b53304a08c928f2667ceb206cfda72e64d81b73d1d951e6b92cb5f16327528846f6b54e28b2acaf898424a664
DIST rqt_tf_tree-0.5.7.tar.gz 8021 SHA256 cdbff410571205460724c941d52cb1a921b9f0e0da9427ec33981a435d597e8d SHA512 024a38d446288e620728210a3de1569d93dafc3040c600a2de5359f3d6fef6074700562e8ff0c5cb2571cc0abef8db3e7071994d6ec916fea336ae1b8d267140 WHIRLPOOL 4694079c2f267d52f6941fb11368d7c78656e5729a525910a1203edb43979554d603aa2824db973b8f90eadd64441d99e669a70caed67d3c240ebc2e166d1961
+DIST rqt_tf_tree-0.5.8.tar.gz 8111 SHA256 b614bffe73b055836f6cfe3b61393d40e21e52b8cabd17e350f1732aa53e0edf SHA512 6bfbb692da82edbbbcae90bdba8b69f0023b7b5b9e67c64a33864be3ec8359ee87922b7957dfff9ba4db6febb07e3106f9742e89bacfc31d85ef4e0db34c02bc WHIRLPOOL 46838b1a984bf5c4acd0d007aabb8200b2588b2fcb69122d49cfd9abdc9757983082294c07cfcdab42042507b9c33bcf5c99b7fdf5e6dce93208c765be6f8689
diff --git a/dev-ros/rqt_tf_tree/rqt_tf_tree-0.5.8.ebuild b/dev-ros/rqt_tf_tree/rqt_tf_tree-0.5.8.ebuild
new file mode 100644
index 000000000000..acd62217748c
--- /dev/null
+++ b/dev-ros/rqt_tf_tree/rqt_tf_tree-0.5.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_tf_tree"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for visualizing the ROS TF frame tree"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]
+ dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rqt_graph[${PYTHON_USEDEP}]
+ dev-ros/rqt_gui[${PYTHON_USEDEP}]
+ dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+ dev-ros/tf2
+ dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/tf2_ros[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 0f950577b5c8..413ace4a5e9f 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,11 +1,8 @@
DIST facter-2.4.6.gem 246272 SHA256 56ffc5fbcd550fcdb4788bc4d7fd0199bff69937d6df1e5a1f61c92d143d78fe SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a WHIRLPOOL fca6165c55d6123e1ab123e5d3459943fda845e696b111520fb6de682ab56fd51a9a4ca072e0a533496c0aedd83b2b26f827147ed01a30dbe72389250437301e
DIST facter-2.5.0.gem 246784 SHA256 dd9c42a76630a7334570419b03886a1e2f0dc298db3630f92ed25090fad5241c SHA512 a67fc220a181152a639f130f9b0f2313eed2f7bcadf7b956d71051a6a6e1e6f099d2db9f86e8c67a14d1101f7d97481556028b7a559f7c5aaa27aad7515654eb WHIRLPOOL f723ed180a93a837b7b8abdd7af08175c8042f71c4339c6f0a3d8342138d364e9502f2abd04241ca0833367edc0edbe6468a73e3ade47a4f2033b9d2e5859d27
-DIST facter-3.1.4.tar.gz 620501 SHA256 7ca1872edbdc5ffcd11dc292e5e0625c9e0d35aa7966d8803859da0d035c7fcf SHA512 2fcc990c8e26349b9fa87cd1f7c43dffd49ffacf03c3467e836ea0bcd7527e1d40b6240646fd7dd6346121ca802fe86e996e209d838db91e8fe55298fdab4e0e WHIRLPOOL 224b17990fc559fce3a7c9b31c14dd45033127b078d68fac024cb6db192573085187163932c9dacd8fd94a281bd8d58ac1c75229a8e3bce4c4f070ebc81ff0f3
DIST facter-3.1.8.tar.gz 324710 SHA256 bd393026640baf149507c11d36be144759889d4c90174d7c6bfb35e0a341fbca SHA512 2884c2c0bb3075b2552763dee7f33228b0e70b4eb46367f52c4cbf9e01930ddc5e58d062d06ced4174900fc3eae5214d80471a4fe499bf0f2ac0278640e0e8c7 WHIRLPOOL 465432940e068318da0028ce1c8ea3084392212cfc6a50449a3ba034fe721836c88ba16c2248b4b3f062a890087421c93a3d14574c8d03e1eafe4f4f82b49d0d
-DIST facter-3.6.1.tar.gz 364596 SHA256 cee28c3fb0134cfd90417c6facec795c1de724ea067911aa4f5b21b1c3785591 SHA512 7cb01536c2682576a8074abf0d617de31f3c9b79eb7f753e8a2ea8b231a9dc4d2017a1e8cf383f6a664596799111803b40e3772f0559c6de74351b8bb75ec0f3 WHIRLPOOL 2eafcfdae1cf83592907624716e21b8f030f96a42b4fa613eacde99ea895a0eae06bb6571d4a197c418aa0db9ad8f04b56938fc8f490d05423824b321ee11b74
DIST facter-3.6.3.tar.gz 370771 SHA256 8c7491db7937a350d738985ee9b4ab370f074d82d89b6ed0115cc21e5adadcbe SHA512 cdcc6bd848c664f395f656d57e0bd28b62cccfdaeccdc9cd364d90a96693c6c8cdc079aa70409297f0ecfdee041c28bad52b3cb4b8981e66de2887bc5eb1bf33 WHIRLPOOL 91d7b8df9e79455f65e89f7a4e17c1cd7076e08091af89a8eb2116bc4716a7b4d4163559cdbed55f356d2fafc6a86cd075de6e15d8b9103be62d6ec3f68b69f6
DIST facter-3.6.4.tar.gz 373722 SHA256 de12c53c74dd3f39633e61f62a900842d829cbe24b76e72b0c6e85000a99b8bc SHA512 d5e03bb40da448805a56accc2fb972569f686a1e8c8b343d4e0defb5a00a982665496049174c225a8b04abb4d09112bd2117a8a96c9360bb2e36e4d569d86337 WHIRLPOOL f7a05a044c7031f248a888458678b48fc8d7996a2d0bc588323bf6c76513ff4fc838f0299db19f212dd0b5ba094b8135558db7da7f4ff596267832354d369634
DIST facter-3.6.5.tar.gz 371967 SHA256 00e37c4c2cb0e8a95e3957239477e23c778c37d61d71f66bdab3e905ff969876 SHA512 d925a9f8e0c0a2b94f56b6683b99fc70b7d48ad3388001bc341abed5b9c4594701a1756430fa2fd6a9ac8a2d3ec73562f1f8b909d364dc8b1c1e3c81f15041d6 WHIRLPOOL ac4f5a1d52c8890a085f7f4aa6ee76a93c6af76021e4c1461164ba6d5536c0d1a371450247e40ecf5803533e27b25dbc6aa0b992d8444d65b0c76902703b6662
DIST facter-3.6.6.tar.gz 372137 SHA256 a06b6907d39a0974f39535a162a409a31bb9c4e99f9969aaa4cd1cb04062039f SHA512 a0b83b1a03ae1abc0822d69b190dcfbf269f8219b3c17c887517fafcc16d9cdabd0938a14103ce3ed66e13d4b528620694a9f7e2697d23fadb108c44686dd8af WHIRLPOOL adea4eeb562c0995b1c7dfa972c4e83bea9c480451be3f88d4957fcfa41bef0bef9163c385eb385b17cdc98bc463147e3d6d7ab5c5ef44354c73c765c3da380c
-DIST facter-3.7.0.tar.gz 374550 SHA256 b5b507df89757982309c089f10bde333124fa11eba7de6aec3639b51570d28b3 SHA512 c2c1e08526625fc031a79c57fa8d3e7d7ce4271c84ba11e1a721bdc421103ef70144e0a85b612bb5936bfc3c275a562ddc40fda675083a03c5d8b46779304a7e WHIRLPOOL 0400b3cc42d5e1fa298b68d865839562b6e356c2ade764d683110f754e214e373356420e6b4ed54b1014a4dcf0c03185eedf53c7d1ee24145d8da3f4e4d167a5
DIST facter-3.7.1.tar.gz 374576 SHA256 fe62b0a33c9edd3f945c1d3057e45172a26952439e0e922341d3844864b92320 SHA512 3b2d218d60f5ad9ef756a50540f638303b7a4eb0ea2afca10d2c41f4e6e3f6c2bb6337de417e4989664e32317b0f8db921fed68e813e4cebe10083c943b33fee WHIRLPOOL 342d3d26cb23116a469530f4e3621575650dbfce0b66f8e5debcd05d05736b24df14b20213b4540a0be2065b50e445385b4c3cc583c88490dce4b59b1408e806
diff --git a/dev-ruby/facter/facter-3.1.4-r1.ebuild b/dev-ruby/facter/facter-3.1.4-r1.ebuild
deleted file mode 100644
index 580fc79cb517..000000000000
--- a/dev-ruby/facter/facter-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-inherit cmake-utils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://downloads.puppetlabs.com/facter/${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 x86"
-
-CDEPEND="
- >=sys-devel/gcc-4.8:*
- >=dev-libs/boost-1.54[nls]
- >=dev-cpp/yaml-cpp-0.5.1
- dev-libs/openssl:*
- sys-apps/util-linux
- app-emulation/virt-what
- net-misc/curl
- ! "${D}/etc/env.d/00facterdir"
- fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/facter/facter-3.7.0.ebuild b/dev-ruby/facter/facter-3.7.0.ebuild
deleted file mode 100644
index cc659bb14f6a..000000000000
--- a/dev-ruby/facter/facter-3.7.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit cmake-utils eutils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-BDEPEND="
- >=sys-devel/gcc-4.8:*
- >=dev-libs/leatherman-1.0.0
- dev-cpp/cpp-hocon"
-CDEPEND="
- dev-libs/openssl:*
- sys-apps/util-linux
- app-emulation/virt-what
- net-misc/curl
- >=dev-libs/boost-1.54[nls]
- >=dev-cpp/yaml-cpp-0.5.1
- ! "${D}/etc/env.d/00facterdir"
- fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index a636861122ef..03795030d7a4 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,3 +1,4 @@
DIST faraday_middleware-0.10.0.tar.gz 22646 SHA256 210e69fc76e2f5c2b76771452e1b859129869961749262e16bee7b50ff98ddc3 SHA512 f516f040a7be7b14635e8685d6d63647fd49ef595f31c655b6cd8e6b9443a80e1d4c68a516cd4088c129a73e411748d15d97b24cbcf321fd15953292ca3c7964 WHIRLPOOL 5c1b3d64358a71b35bd7b721ffff1e76da248e59b3eff6404ef0d46c8c149d1c5045422b05a10bef5205d2bf65c19edff6ad7f96c7ff863ee4a3bd05def2035b
DIST faraday_middleware-0.11.0.1.tar.gz 24349 SHA256 5c823e30a0d4ba4cc83103752947c1380344974cf4dffa9de08055edc6bacf91 SHA512 0bda75432ffa406485e60e9f71dc850a13dc1dd89a8262c9a4101d982fec44b63c72452458d29c49b529ca3483b577ea760400b465bf4b30ae1623a42cb96051 WHIRLPOOL 0034d1054809d47f10a18227d0ab444e36ac0b7b5af95d9f84ce3f748e82a43750819ee7be61b0964d0effd6f2383b2c409838701ee8e42a9fd05a0392a104c8
DIST faraday_middleware-0.11.0.tar.gz 24345 SHA256 254413e5e63b8b5879a75090fd796181fb54fba7536a56e4bcc2bc2e0fe4c645 SHA512 555407c2daa220fe050a33a6572626bdd47b800f75a87cc0b4da7a311aa3a89c24873434fdb8c14ae92e34c253179697471c25a42d18034b8a1e1e8c332f0e13 WHIRLPOOL 00ce78b1b6f9b7ff093da0e13f7f7619a53e627191ef977f2894e7dc3827bb8321def94184d588b0124369a55f5a50edabc08481d746ee35631e96a0947568da
+DIST faraday_middleware-0.12.0.tar.gz 24896 SHA256 ca5346e0aa668ea33257cc539ab16f6df90e6ca1e705025b01d46c2b245820fa SHA512 e4867c122d69e3b8e8a405a85bc8be4c1489861f4acf42369f34ecda67ca0e821509ef522e742bc8b7a20fb0650a45866a04f4b4469829fbc50cd040cef374af WHIRLPOOL 110b39978e3e3aa02e021c8ea5fbedb051abe215a1e2db856da769bb32c3495f871bb70598b2862a89f2eb0b6c73b95a7597070e571d9196b6fb7cf3798ad3d8
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.12.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.12.0.ebuild
new file mode 100644
index 000000000000..3f3eefd7c5d3
--- /dev/null
+++ b/dev-ruby/faraday_middleware/faraday_middleware-0.12.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Various middleware for Faraday"
+HOMEPAGE="https://github.com/lostisland/faraday_middleware"
+SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+parsexml +oauth +mashify +rashify"
+
+ruby_add_rdepend "
+ >=dev-ruby/faraday-0.7.4 =dev-ruby/multi_xml-0.5.3 )
+ oauth? ( >=dev-ruby/simple_oauth-0.1 )
+ mashify? ( >=dev-ruby/hashie-1.2:* )
+ rashify? ( >=dev-ruby/rash_alt-0.4.3 )"
+
+# Bundler must be used because the optional dependencies have different
+# version requirements that must be resolved.
+ruby_add_bdepend "test? (
+ dev-ruby/bundler
+ dev-ruby/addressable
+ dev-ruby/rake
+ dev-ruby/webmock:0
+ dev-ruby/json:0
+ >=dev-ruby/multi_xml-0.5.3
+ >=dev-ruby/rack-cache-1.1
+ >=dev-ruby/simple_oauth-0.1
+ >=dev-ruby/hashie-1.2
+ >=dev-ruby/rash_alt-0.4.3 )"
+
+all_ruby_prepare() {
+ sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \
+ -e '/rspec/ s/>=/~>/' \
+ -e "/addressable/ s/, '< 2.4'//" \
+ -e "/rake/ s/, '< 11'//" \
+ -e "/rack-cache/ s/, '< 1.3'//" \
+ -e "/simple_oauth/ s/, '< 0.3'//" Gemfile || die
+
+ # Avoid unneeded dependency on git
+ sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+ ${RUBY} -S bundle exec rspec-3 spec || die
+}
diff --git a/dev-ruby/jquery-rails/jquery-rails-3.1.4.ebuild b/dev-ruby/jquery-rails/jquery-rails-3.1.4.ebuild
index 7c8769a8f087..495b7ae29d89 100644
--- a/dev-ruby/jquery-rails/jquery-rails-3.1.4.ebuild
+++ b/dev-ruby/jquery-rails/jquery-rails-3.1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby21 ruby22 ruby23"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/lockfile/lockfile-2.1.3.ebuild b/dev-ruby/lockfile/lockfile-2.1.3.ebuild
index 856791997ffa..e4a0c68fd14e 100644
--- a/dev-ruby/lockfile/lockfile-2.1.3.ebuild
+++ b/dev-ruby/lockfile/lockfile-2.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
RUBY_FAKEGEM_TASK_TEST=""
RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild
index fa47b419f1f4..6f1423fcac9c 100644
--- a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild
+++ b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/halostatue/minitest-bonus-assertions"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-pretty_diff )"
diff --git a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1.ebuild b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1.ebuild
index 1b4949552837..9b3c7bc98a1a 100644
--- a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1.ebuild
+++ b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/adammck/minitest-pretty_diff"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
each_ruby_test() {
diff --git a/dev-ruby/mixlib-shellout/Manifest b/dev-ruby/mixlib-shellout/Manifest
index 47a7de2a0284..a91ca44d3aba 100644
--- a/dev-ruby/mixlib-shellout/Manifest
+++ b/dev-ruby/mixlib-shellout/Manifest
@@ -1 +1,2 @@
DIST mixlib-shellout-2.2.7.tar.gz 35122 SHA256 9fc9cd467d27ac3cb50cb3993a55d1aeb04ec92e74de4b2d73d839bce9f2e6e9 SHA512 e1179e296471d3aa0c22f2d7a9dfd957da4870f7fd5456c9f6788fca6a1efc62487fd719e45a6c3f85539db46cad0fbf4a67eddac087393004a179a19ce36fa3 WHIRLPOOL 35e98ebedb21c5a5852cac4d734ea90206a1a727c2884a82411126b42d03ef39ef611447240ba8ebe7b0b91448fc86d501eb83ef709a194d5115bd632ff4132e
+DIST mixlib-shellout-2.3.2.tar.gz 35828 SHA256 b80209525ae4232c9e6a51c3c0c508a9cec89958553a79a323babc63099ba399 SHA512 72f4979d1c444b1f097ecfd4767a2989e60398e84a78106b80077b664bc01d6fc68022cec26172f1e7c0384dd3fc4f64c723ad3a2882db7284dbadacc7cf24c9 WHIRLPOOL df320d02a6b29578ba8989f48cfffb3292ca353fe0f023aace1579f48908c5d620b52f74c586e5b8c634e77ad6500f3869e806cfb8f4895c6f5341bd47da4d1a
diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-2.3.2.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-2.3.2.ebuild
new file mode 100644
index 000000000000..adcdf80bf37e
--- /dev/null
+++ b/dev-ruby/mixlib-shellout/mixlib-shellout-2.3.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Run external commands on Unix or Windows"
+HOMEPAGE="https://github.com/opscode/mixlib-shellout"
+SRC_URI="https://github.com/opscode/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+each_ruby_prepare() {
+ # Make sure we actually use the right interpreter for testing
+ sed -i -e "/ruby_eval/ s:ruby :${RUBY} :" spec/mixlib/shellout_spec.rb || die
+}
diff --git a/dev-ruby/multi_xml/multi_xml-0.6.0.ebuild b/dev-ruby/multi_xml/multi_xml-0.6.0.ebuild
index ad9193466ee1..dce162cfc6de 100644
--- a/dev-ruby/multi_xml/multi_xml-0.6.0.ebuild
+++ b/dev-ruby/multi_xml/multi_xml-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
RUBY_FAKEGEM_TASK_DOC="yard"
diff --git a/dev-ruby/rash_alt/Manifest b/dev-ruby/rash_alt/Manifest
new file mode 100644
index 000000000000..1c3a460a369f
--- /dev/null
+++ b/dev-ruby/rash_alt/Manifest
@@ -0,0 +1 @@
+DIST rash_alt-0.4.3.gem 8704 SHA256 dd4c51d8124be00d4a8b411fa2be04b81deaabbdf0c43ca996d5982b6e54b47a SHA512 4b56a92b6a73cf92dd9ccb251a2b980d60f8c7e1fa24206fe08b3a825dbf1d56797d05b771935012bd75ee609df5a0a46b55aad59d74eee5194f416912ade7e9 WHIRLPOOL 6be029cae30768d9a84b14ce79d5c8dcca3bae6f32e10b1d652fbd6d6fc4a32d467a2809f741e7b38355ae72a0366680884a0efb6af4eed6133be3c8b619d6d1
diff --git a/dev-ruby/rash_alt/metadata.xml b/dev-ruby/rash_alt/metadata.xml
new file mode 100644
index 000000000000..26567bbc1b4a
--- /dev/null
+++ b/dev-ruby/rash_alt/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ ruby@gentoo.org
+ Gentoo Ruby Project
+
+
+ shishi/rash_alt
+
+
diff --git a/dev-ruby/rash_alt/rash_alt-0.4.3.ebuild b/dev-ruby/rash_alt/rash_alt-0.4.3.ebuild
new file mode 100644
index 000000000000..658e61db5f92
--- /dev/null
+++ b/dev-ruby/rash_alt/rash_alt-0.4.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="rash.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rash alt version for Hashie's own Rash"
+HOMEPAGE="https://github.com/shishi/rash_alt"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/hashie-3.4:3"
+
+all_ruby_prepare() {
+ rm Gemfile || die
+ sed -i -e '/[Bb]undler/d' Rakefile || die
+
+ sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rex-arch/Manifest b/dev-ruby/rex-arch/Manifest
index 748674b463fe..ed426f34c556 100644
--- a/dev-ruby/rex-arch/Manifest
+++ b/dev-ruby/rex-arch/Manifest
@@ -1,4 +1,2 @@
-DIST rex-arch-0.1.1.gem 19968 SHA256 f502716c1d23e97e6082797a31edad61202ffdc2db3047641c2181e8500baf2a SHA512 ec6963d7256451dc35a768ba16ac6f44ccdb35d1be1427134f191b39a6b62f519db3de4529109bcddb5887afc6bdd65756c07ccc231425271aaee0838b7eec38 WHIRLPOOL d400643d3bc8b19c88394c9521295d9c4e702234153ba093c6216aa17f3f18d88cfb2100827b754802861273f832840cc9114f212a4e0acf8bde87fd828a7a36
-DIST rex-arch-0.1.2.gem 19968 SHA256 a3c5817ead9f84e19ecb6e4ae00e37c569aa99e27d61bbd5604988625806311e SHA512 330cd6eb6c5f913736e223d82da73e40104ecb537ee3e22a7aa16d1a31aa03ef6a10ae82306b10654718baf33f0f3d1c0a5da001099d6874eb3c1b16f8ae4b7c WHIRLPOOL 25939fd45c2cbd26f675db33dd8fb3bd8e5235d842ff4c6a3d28aab3da03c8017882cb0dd9d12c9605692adc8d765b76dab5bb2e6f96a5cedab5770ea16cdfdc
DIST rex-arch-0.1.4.gem 19968 SHA256 81596dd393243e1318113b64e2ed5a8f51d0086eb5981e68a7ece1c9cdfe55f8 SHA512 9ba3a429e98b884694dd3981fb1b72491dc9c7e10ee15e34e3286f446788532633938a9e2f07e55e31cb28f7b561d41164d7b7e8f88fef60e9cfc6750ace1355 WHIRLPOOL b1d5c014e10113a8d88c44904fc6b91432376e7c19a5f9641683546c87c3c017a56ff687ce2727e705886031f25c019a783c7af438eba40bd0118cf7de2a52e3
DIST rex-arch-0.1.5.gem 19968 SHA256 b5ef0e371ca0566b19ccf1351957363f9cfbc014e37c02248ecdf9071466aa8c SHA512 5d6d1ef95a54c8ec4e33f7a126789cbf1aa10f3154c6fa0c32282af1e235ef467abb9e423a1feadbd8fa28b9752b82b125c9838b97372e7263acdd9770d52d5a WHIRLPOOL f494a51c8f3d37c9841d6986ddea38762df31814ae6535fa347ed46770bd5d3bb148cf5e649d551fe3f6cc05751744738cead585af5363b7d427715131a8d1f1
diff --git a/dev-ruby/rex-arch/rex-arch-0.1.1.ebuild b/dev-ruby/rex-arch/rex-arch-0.1.1.ebuild
deleted file mode 100644
index bb5c3ee3f965..000000000000
--- a/dev-ruby/rex-arch/rex-arch-0.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="architecture specific information for Rex"
-HOMEPAGE="https://rubygems.org/gems/rex-arch"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# doesn't seem to actually run any tests
-RESTRICT=test
-
-ruby_add_bdepend "dev-ruby/rex-text"
diff --git a/dev-ruby/rex-arch/rex-arch-0.1.2.ebuild b/dev-ruby/rex-arch/rex-arch-0.1.2.ebuild
deleted file mode 100644
index bb5c3ee3f965..000000000000
--- a/dev-ruby/rex-arch/rex-arch-0.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="architecture specific information for Rex"
-HOMEPAGE="https://rubygems.org/gems/rex-arch"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# doesn't seem to actually run any tests
-RESTRICT=test
-
-ruby_add_bdepend "dev-ruby/rex-text"
diff --git a/dev-ruby/rex-core/Manifest b/dev-ruby/rex-core/Manifest
index a25044084d94..24dfb3244f24 100644
--- a/dev-ruby/rex-core/Manifest
+++ b/dev-ruby/rex-core/Manifest
@@ -1,2 +1,3 @@
DIST rex-core-0.1.10.gem 30720 SHA256 ce04c953ce3793f3e5d40713cc228f0c1463d86b3778226e062db1c533d5ab27 SHA512 aeb868f60680c4a023e6bc511039d5a880aeb8a318b185fbecd8cdcf9711732da892482b8361eade3066c01eb8f9098f75d9ca8facebacb4f2439c4a2d67c848 WHIRLPOOL cfd531f6f88dc9c46317f051d2d66ce71568d25bd9092a4c265ab2fb2bb5d23fb9dae07681b484837557142e1051e20c7201dc7588fcb0ba8df85fb603312a4b
+DIST rex-core-0.1.12.gem 30208 SHA256 f37e5afc571e90ad6f3c7426cec0767243be7b8d81884d7747fdaec32f71bc99 SHA512 87d2e04752ea019f327f5a3bf07149d3245d2dc709485033ac069f31bb592a4840cfd547042f5537b0a2c90988aff54a6067999e02f2dacc8e0f4029dd9a3537 WHIRLPOOL 61c4a40b1e15b78add854dbba4e11400a825e503a7d17621794891ddaff07d13f70019a9ae0336807bbe8f7d09048c8deec477701bf094fa9b7b089330730f5d
DIST rex-core-0.1.9.gem 30720 SHA256 423cef7ef1154ee3124043357bea0279c1da3c3ed57572fd9c513f6416931904 SHA512 0edbcd227575f025bce55923ae3df4ea37359bc53d2353d06a856e760f42a8f2a11573fe56647eeb26fee7499fecf453804d940c3672088e2e86af26cb87cce9 WHIRLPOOL 6b53ce10b4c3c0b4839701362d9284c143b135cf2b3a0991f0e523db22c989c293d6c0e7fb284e867c9c9b4f5a9ebefa02953af4a88786928181c40795ef96c9
diff --git a/dev-ruby/rex-core/rex-core-0.1.12.ebuild b/dev-ruby/rex-core/rex-core-0.1.12.ebuild
new file mode 100644
index 000000000000..b7aa58d0bcd6
--- /dev/null
+++ b/dev-ruby/rex-core/rex-core-0.1.12.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Core libraries required for the Ruby Exploitation(Rex) Suite"
+HOMEPAGE="https://rubygems.org/gems/rex-core"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+ sed -i '/bundler/d' Rakefile
+}
diff --git a/dev-ruby/rinku/rinku-2.0.2.ebuild b/dev-ruby/rinku/rinku-2.0.2.ebuild
index 14ec382d8668..4f279dff1a65 100644
--- a/dev-ruby/rinku/rinku-2.0.2.ebuild
+++ b/dev-ruby/rinku/rinku-2.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="README.markdown"
diff --git a/dev-ruby/rubyzip/rubyzip-1.2.1.ebuild b/dev-ruby/rubyzip/rubyzip-1.2.1.ebuild
index 5d4be3b63b85..8bc0db6b3d79 100644
--- a/dev-ruby/rubyzip/rubyzip-1.2.1.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-1.2.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tg
LICENSE="Ruby"
SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND=""
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.4.4.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.4.4.ebuild
index 946f0d04c4ea..9c991789564e 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.4.4.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.4.4.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="https://github.com/seleniumhq/selenium"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index 3c5fea01ac8e..881c1e52b06b 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,3 +1,4 @@
DIST tilt-1.4.1.gem 42496 SHA256 39820562c4f5db45fe18de87ccc30a0e77a998bf5334b1d8c10a2f7dbc1f5903 SHA512 10fec263596d0e18a7a1440a7edfa08a161526cc46cc70427bc251951c447c40b4a4e8675e9162a9ed288879682b4aceeeb35b48cf3f4925921025194543363f WHIRLPOOL 5d70949358b97e867cdec160bd3c3726dabfec94bfeadc3a12f17463d378779d8502dda6458c7deb92bd3d9def91e306077ef806a7f75bd6c892554739ce46e9
DIST tilt-2.0.5.gem 52224 SHA256 0ec3e46ff4dcbabe0e90af1e92786b3c88312ebca55816b04f2511d1dd42f351 SHA512 b032439d00e09d3968b20f5ea5937c5918b1e10e0255cce402b6859b7d59ecdc265523a151c0fcca0034e0de26ca5fe422944790939896d7e0000641980764fa WHIRLPOOL ab98e857c456b664e8364d037b800ace4559b3de317c72da116402d0845a697e1979c33a77606ebd976b7ac03d0ecd24d4c56711e53190ae62edb63bc19f8b9c
DIST tilt-2.0.7.gem 54272 SHA256 eb684011d518d16d293a9fdc1ac52bdeb7b6c04153537dda453f1150b85741c7 SHA512 5becf05d870db6ddb656e7a1c45615aa821e0b9827a9cdc4212dcca25c24db671bd8d9fb8f8d6a6ea4095dbe6a80fc0b4792b4382d50ada6c0eec81fd6270064 WHIRLPOOL f3ca0c00b217140589da31255e2dcb62d873d65a54aee4777a7fbddee584194a571781e4832c9748727c70c6c68cbe37696890e1ee39c5dafb9ed4ec603462f2
+DIST tilt-2.0.8.gem 54784 SHA256 2a3be6c56a8cc6338203c02910e20e858664b633adb550e1103804d75eae4000 SHA512 1767f2e5ce45afe95d84d32de7c2b6fe24ff7cb6f7ee8485d84344820b2f6e969ae60a6fbaa7141f7fe135c6540d96fa5b27fd8010b95c0ded5d049a315001d5 WHIRLPOOL a2978224e803febba2dd3d25a8c1b4a3618f5d3794631e806f9de90a186f260e7fb8a1705bec36059272ee976f280d2b0252a6294fdb4d0ba1c280cce8d0bf74
diff --git a/dev-ruby/tilt/tilt-2.0.8.ebuild b/dev-ruby/tilt/tilt-2.0.8.ebuild
new file mode 100644
index 000000000000..2d2b204f530d
--- /dev/null
+++ b/dev-ruby/tilt/tilt-2.0.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Thin interface over template engines to make their usage as generic as possible"
+HOMEPAGE="https://github.com/rtomayko/tilt"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Block on some of the potential test dependencies. These dependencies
+# are optional for the test suite, and we don't want to depend on all of
+# them to faciliate keywording and stabling.
+ruby_add_bdepend "test? (
+ dev-ruby/bluecloth
+ dev-ruby/coffee-script
+ dev-ruby/erubis
+ dev-ruby/nokogiri
+ !!
+
+
+
+ kde@gentoo.org
+ Gentoo KDE Project
+
+
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index e6cd6cf48fe0..c7c15045a350 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -2,4 +2,5 @@ DIST debootstrap_1.0.87.tar.gz 65875 SHA256 e48c931b8c0a4981c580db1a85418177bf62
DIST debootstrap_1.0.88.tar.gz 65590 SHA256 a08332bb288223a7afca125b5d5946dcfa36720f36138fee3fea299aad80d2f8 SHA512 339b574a1a556a65d8f1091064e128d48b5d7954eb4c7ce94a34787a51b7de8ed82cb31ebd86de9c61c5569384dd22088d437090d7111d1720204c1bb3f4b8a7 WHIRLPOOL adf0ebd60ab148251c259012ef7944308913ea416429a524c3184efdb464b893d731382374fb6eef0ef65a661b7117bcbd940e6541f1c5d483d260fec7a37e74
DIST debootstrap_1.0.89.tar.gz 69020 SHA256 3fde1e34eae8744d802ff4f4ba5464b8c8829c0afe9d394c8a536cfdaca23885 SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a WHIRLPOOL 3eb2b66794d0e49e52eb87761bf2dad8980c20d41c032b1ec06742945a0999ac18ff721907721c00a92d0f1597b1560d47e461fe78bd3081af6cb5ec4d3d1cb4
DIST debootstrap_1.0.90.tar.gz 69936 SHA256 4d1f434b093051a27fe9482063e2b09aa88cdcc51877228b04729e302ba9145e SHA512 f8fc584d08b63f9f3fe1120b7b7ca41ef4acab4201ded08a45d7d5c1e4be67ff365840fbb65dad97c0798fd3d565148df2c465bc4cd3f62c0b31226dd1b2575d WHIRLPOOL 3f43d8e35dcb2c9adceec27d71b4430ff69fa42c5ab4b319a5af1aa58d28f78cf012a5d3e898dfe9f2e5e6ebd25161511456ca09d8f1d68d618f242bea0cefcc
+DIST debootstrap_1.0.91.tar.gz 70171 SHA256 65947fd131217867ce774c4b00d16d6d082da21751b4338cfe9270970fdbe011 SHA512 5d1633c31b6a17aa3da4644a750875fd05bdfd448f90bcd453fc7bdb64df13e6bc4f2e8a6968e0c36302fa0458b9ac321e2ed3dbc68a4f4c071f7c16d950953c WHIRLPOOL 14574aa707e93d2d3718e14ee6f21fec4ff97c568679a26ba4884c53de0384f92b45b23436bb4f676195fa24f348756fcc3076f01cc60677d2c453e93b0b6992
DIST devices.tar.gz 47835 SHA256 0d93f93c8b21160069d14e74f8f990a2e0e1e5a90dc828b29e6b3f5aa5829e48 SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432 WHIRLPOOL 222963bb920e1311bc2f481bba04e49f386b60cce6ce0576424896277e0c4fc6a339d4403d587744c32b0bfb1db6391f200fa8d66117e3f21e1c12f35365d732
diff --git a/dev-util/debootstrap/debootstrap-1.0.91.ebuild b/dev-util/debootstrap/debootstrap-1.0.91.ebuild
new file mode 100644
index 000000000000..fc955a4bad4e
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.91.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+ mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ app-arch/dpkg
+ net-misc/wget
+ sys-devel/binutils
+"
+
+DOCS=( TODO debian/changelog )
+
+src_unpack() {
+ unpack ${PN}_${PV}.tar.gz
+ cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+ return
+}
+
+src_install() {
+ default
+ doman debootstrap.8
+}
+
+pkg_postinst() {
+ if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+ elog "To check Release files against a keyring (--keyring=K), please"
+ elog "install app-crypt/gnupg"
+ fi
+
+ if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
+ elog "To check Release files from Debian or Ubuntu, please install"
+ elog " app-crypt/debian-archive-keyring or"
+ elog " app-crypt/ubuntu-keyring as required"
+ fi
+}
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index ed83d2bcfc64..d4a2802776c2 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,2 +1,3 @@
DIST eric6-17.03.tar.gz 18904799 SHA256 cfa78bea6812303689223d42efdc8de530e7c714acc0d1d5aeb375cc9006a2d3 SHA512 3bc71e87475eeeac02c9a186cd5c0044c5196d884ec56a228ff66e2af6ee5dd3d0e7356486e284b28aa945b0e225c9b626e1a21773878d6834e211d4151af3a7 WHIRLPOOL c7cb12562424395b12687e6f4f3489b57a50fa1363ebbd2aa0a4e48051ae52ce62512904af1104a881999ea4fdfa355544e8fdee802c0584255e9c9697486ea9
DIST eric6-17.04.1.tar.gz 18688754 SHA256 b6c08e646d920551392f1a93f231adefd504999933891eb8bb4038fe6ab405ba SHA512 e3f2bd47e3d3308db2c6443b3f616db130cc6a04e904930a2f1733c32dab8114e3094520c2def044d923fc5e7f526dc1ca1f30ebbefa1bf70ff2beef0508547d WHIRLPOOL bc09e505d2e44763d87c17786e3a4268d11e1ea0dff518611862a8bb497fc63836c105356b1936c8469c6b159fdbf41527fd382e432b3ab7f349da089fdb14a2
+DIST eric6-17.07.tar.gz 18822449 SHA256 6d3d83c6815e89634aca532468cbedff8ae636dfc0b4187206e548af24468e04 SHA512 5d1430262fce9eba19487f45c663c5e455bbf85b07c753d9bca78ec658db5f4eedd4db177d293335466dbc2362dc8a775ffac8d18eb48592451a61ef7592ca13 WHIRLPOOL 43f089156dccfe40f56cc026a5b5fc4fa982aca50c741990595bd4e8a210169f10cef0627ffd1fd99d1c717fba818fcb62b74295fbf0f1ced1a149542971561a
diff --git a/dev-util/eric/eric-17.07.ebuild b/dev-util/eric/eric-17.07.ebuild
new file mode 100644
index 000000000000..02c5b8f9d387
--- /dev/null
+++ b/dev-util/eric/eric-17.07.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="sqlite,xml"
+
+inherit python-single-r1
+
+DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
+HOMEPAGE="http://eric-ide.python-projects.org/"
+LICENSE="GPL-3"
+SLOT="6"
+
+MY_P=${PN}${SLOT}-${PV}
+SRC_URI="mirror://sourceforge/eric-ide/${PN}${SLOT}/stable/${PV}/${MY_P}.tar.gz"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+ ${PYTHON_DEPS}
+ >=dev-python/sip-4.14.3[${PYTHON_USEDEP}]
+ >=dev-python/PyQt5-5.5.1[${PYTHON_USEDEP},gui,help,network,printsupport,sql,svg,webkit]
+ >=dev-python/qscintilla-python-2.8[qt5,${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+ >=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+ >=dev-python/coverage-4.1.0[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+ !dev-util/eric:4
+ !dev-util/eric:5
+"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=(changelog README.rst THANKS)
+
+src_prepare() {
+ default
+
+ # Delete internal copies of dev-python/chardet and dev-python/pygments
+ rm -fr eric/ThirdParty/{CharDet,Pygments} || die
+
+ # Delete internal copy of dev-python/coverage
+ rm -fr eric/DebugClients/Python{,3}/coverage || die
+ sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \
+ $(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
+
+ # Fix desktop files (bug 458092)
+ sed -i -re '/^Categories=/s:(Python|QtWeb):X-&:g' eric/eric6{,_{,web}browser}.desktop || die
+}
+
+src_install() {
+ "${PYTHON}" install.py \
+ -b "${EPREFIX}/usr/bin" \
+ -d "$(python_get_sitedir)" \
+ -i "${D}" \
+ -c \
+ -z \
+ || die
+
+ python_optimize
+ einstalldocs
+}
diff --git a/dev-util/include-what-you-use/include-what-you-use-4.0-r1.ebuild b/dev-util/include-what-you-use/include-what-you-use-4.0-r1.ebuild
new file mode 100644
index 000000000000..4876be740986
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-4.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils flag-o-matic llvm python-single-r1
+
+DESCRIPTION="Find unused include directives in C/C++ programs"
+HOMEPAGE="https://include-what-you-use.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-devel/llvm:4
+ sys-devel/clang:4
+ ${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${PN}-clang_${PV}
+
+pkg_setup() {
+ llvm_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ python_fix_shebang .
+ default
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DIWYU_LLVM_INCLUDE_PATH=$(llvm-config --includedir)
+ -DIWYU_LLVM_LIB_PATH=$(llvm-config --libdir)
+
+ # Note [llvm install path]
+ # Unfortunately all binaries using clang driver
+ # have to reside at the same path depth as
+ # 'clang' binary itself. See bug #625972
+ # Thus as a hack we install it to the same directory
+ # as llvm/clang itself.
+ -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+ )
+ cmake-utils_src_configure
+}
+
+src_test() {
+ "${EPYTHON}" run_iwyu_tests.py
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 368569d9c67f..4ee1b6f7c9dc 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,3 +3,4 @@ DIST jenkins-bin-2.57.war 70476328 SHA256 5d7a66864d0941629e1fb8ef82ed98a38e54da
DIST jenkins-bin-2.60.1.war 70611723 SHA256 34fde424dde0e050738f5ad1e316d54f741c237bd380bd663a07f96147bb1390 SHA512 0eef089380bc3acff62b5dcf2e36bbd7d5f973d269cc8d8d429bfaae80835dd321055038ceb0b7d39a6c291685347fa905a249f312c3970d5210450596b78518 WHIRLPOOL 2717a9dd9a3a678f563575c412c294d7c342e0414b59816715c7101d533fad090b06a87a050a9927957a3c512c33125b26107e0daa5120d42b01ad304b459911
DIST jenkins-bin-2.60.2.war 70613578 SHA256 14d0788d89be82958a46965de039a55813f9727bd4d0592dc77905976483ba95 SHA512 310fd1054641582d189dc9f8057c03fdfc88ed1dfeee04dcc4f7d597ad6ce94a544b50b103dd4be1d39980afdee16e07634eeaf3b4887b5ce7c4d84ee4c22953 WHIRLPOOL 81c937f8356a7e55fb6f8cb77cf496ea00b997757ae73e5a2d27293dbb7e7aec44729e68ceaf28a0a6e971bc525fed9377c0ad189bdbf660ca43009dc794af28
DIST jenkins-bin-2.67.war 71617234 SHA256 2def7deae23ffdcfece481548b3f6d7083d50a2696c91cfb5a9c5e84afcdf704 SHA512 c4b9af585888d2d1dd672569aeb92d2458dba808aa3cd664af31310cf847a7625afe7aad133f709c24598646b6e96d504bd53e54cf14490fbe756273b8494041 WHIRLPOOL b68d78f8e0dfddd3ffae89f2797b62b5a0480581b618f73dbeeff992eb961c52ef2da3de93170f3c97761dd4cf9f743d250cfc13e9fe99d92ea44e47659e8f1c
+DIST jenkins-bin-2.71.war 72956752 SHA256 14727da24054e956dc8b8514998e19001c99efce637891f544d2a9b3d9ea752c SHA512 d5718c70c7a1569f7389a8da2618382abe8799abb98faf87f4b25519b9336af904f32d72c8b30b2ca0f33e72c37d7984b901d4b26179c742333a538152c05b3b WHIRLPOOL bd592e4fe99ce66c6b659b8c28c3f29a2e8b7eb4b953bd1f5920998ff06519492504c525c17ad38d56cb257ad78e7e9e70a897dd43abf6ffc0f557f44e0de807
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.71.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.71.ebuild
new file mode 100644
index 000000000000..2101948a704e
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.71.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/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 7edbbf86a0b7..447dc7a9ef6c 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1 +1,2 @@
DIST kdevelop-pg-qt-2.0.tar.xz 635604 SHA256 2f778d324b7c0962e8bb5f62dd2643bac1a6f3ac971d145b6aace7cd61878993 SHA512 50eb540f16c0a32b78ecb1b53ce7005a70c53497f1ca755afd321eb09d12ab646fae216f34a1efc310510a5aa27cb3f895c34aa71e38bcc9c415ca36099e9022 WHIRLPOOL 0758f63b1da3fb607cffe6ea60177f61ba432da991540afd9aa3934a2c76c7206c2483cefb227e7c56d55c27766e5374ee3e9b4bc48611b914219371898c604a
+DIST kdevelop-pg-qt-2.1.0.tar.xz 660268 SHA256 20d84d25bd40610bd6c0964e4fe0642e56c41b76a65575122dc5196649621e5d SHA512 0d0350c921a85ce6682219b0d67617aac21f5e3a95f6d50869c172200db02099e10cc025439ca5a08a93b711e21a3393c5bc50bc709fb4f6a57f19266c6f469d WHIRLPOOL c7c21513e6e04e5dce3f82433989159e2519bd8c9a8f9ae1edcf15365056c135effc47eef197e15c9696a0ee8e2269fcc48f7b0d750c9e2aa701e39135bc2f4e
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild
index 7b764a5c3b71..60b9707f24d1 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild
@@ -9,7 +9,7 @@ KDE_TEST="forceoptional"
inherit kde5
DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
-SRC_URI="mirror://kde/stable/${_kdebase}/${PV}/src/${PN}-${PV%.0}.tar.xz"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${PN}-${PV%.0}.tar.xz"
LICENSE="LGPL-2+ LGPL-2.1+"
IUSE=""
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0.ebuild
new file mode 100644
index 000000000000..6300a1b09e02
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDEBASE="kdevelop"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+LICENSE="LGPL-2+ LGPL-2.1+"
+IUSE=""
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ sys-devel/bison
+ sys-devel/flex
+"
+RDEPEND="
+ !dev-util/kdevelop-pg-qt:4
+"
diff --git a/dev-util/meson/meson-0.41.2.ebuild b/dev-util/meson/meson-0.41.2.ebuild
index 493a4df2c561..392883a3b7c5 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 ~arm64 ~ia64 ~mips ~ppc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~x86"
fi
inherit distutils-r1
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index a0f3e6270529..c93e3088f8ac 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -52,11 +52,6 @@ DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )
"
-PATCHES=(
- "${FILESDIR}/${PN}-0.1.0-remove-external-gtest.patch"
- "${FILESDIR}/${PN}-0.1.0-respect-libdir.patch"
-)
-
if [[ ${PV} == 9999 ]]; then
src_unpack() {
default
@@ -73,6 +68,7 @@ src_configure() {
-DWITH_TESTS="$(usex test)"
-DDOWNLOAD_TITLE_SEQUENCES=OFF
-DDISABLE_RCT2_TESTS=ON
+ -DSYSTEM_GTEST=ON
)
cmake-utils_src_configure
diff --git a/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild b/games-strategy/0ad-data/0ad-data-0.0.22_alpha.ebuild
similarity index 68%
rename from games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
rename to games-strategy/0ad-data/0ad-data-0.0.22_alpha.ebuild
index ce552973bda7..2413f34ee5d1 100644
--- a/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
+++ b/games-strategy/0ad-data/0ad-data-0.0.22_alpha.ebuild
@@ -1,27 +1,26 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit games
+EAPI=6
MY_P=0ad-${PV/_/-}
DESCRIPTION="Data files for 0ad"
HOMEPAGE="https://play0ad.com/"
-SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-data.tar.xz"
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
src_prepare() {
+ default
rm binaries/data/tools/fontbuilder/fonts/*.txt
}
src_install() {
- insinto "${GAMES_DATADIR}"/0ad
+ insinto /usr/share/0ad
doins -r binaries/data/*
- prepgamesdirs
}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index 65eccd4c70a5..269758bba93d 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1,2 +1,2 @@
-DIST 0ad-0.0.20-alpha-unix-data.tar.xz 575064564 SHA256 db5eb387ae131bece98a2685e9568cfc4e701a561dd8bb930dfa2dec2043f4d3 SHA512 02d78f2147f573b201d779f636faba6175c93ebc9df2f2a1e5c593cbee983f822040daf38729b743a8b720f8678935415fd772c2d3d2abb1c2665050a20babb8 WHIRLPOOL 6d08c719bb7cfb6297f5de6fd8f101b5a1a303151ece18b9a4ff15a971e67564c1aeb59679b54270ba6dc48514c947528d32de1b0b25c94854d739fb026748a0
DIST 0ad-0.0.21-alpha-unix-data.tar.xz 587025496 SHA256 f3ab3c58ffd3bd647a9baba93ea009d5945d2b5bc7db7053a547e07db36faa97 SHA512 526bce35da0d86aa344f634fc661189211478b9a9b7759bb6d0cf6b2096cfcf3449d53ded38c23583877fed47aa438da0e379088a37819ae890526f5996afd36 WHIRLPOOL ebce2dd81bc3672b42847f63e5fee78574ed4bfd720b96a0c46393bb55f3ec112481e0dd5108dcce3e30683496d0467ff377d42eb89486560adb32bdb05c6f3e
+DIST 0ad-0.0.22-alpha-unix-data.tar.xz 632555792 SHA256 4c32cd0a346815cd260357d55d5a61430f670c78a2fa7a321957c0e4559a766e SHA512 ff9928a59b461d4a6082227dce11b7a497e9e518b6cd3a58723963bed9241f7afc2b228e7728a3d03bd2a8c3708f756639b87abd6520d09dab01309c8444ff1d WHIRLPOOL 4368da3799b1000b034a023d13b8c4d360c1a36edc891601963bbfe10433d85564c213711c2397b515900dcca0115c7231f151ec06636efb4f04c8c0c71e92b1
diff --git a/games-strategy/0ad/0ad-0.0.20_alpha.ebuild b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
similarity index 85%
rename from games-strategy/0ad/0ad-0.0.20_alpha.ebuild
rename to games-strategy/0ad/0ad-0.0.22_alpha.ebuild
index 5ccfab2942cb..0eac8acb7676 100644
--- a/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
@@ -1,19 +1,19 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
WX_GTK_VER="3.0"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads,ssl"
-inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
MY_P=0ad-${PV/_/-}
DESCRIPTION="A free, real-time strategy game"
HOMEPAGE="https://play0ad.com/"
-SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
SLOT="0"
@@ -47,16 +47,15 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( dev-lang/perl )"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
pkg_setup() {
- games_pkg_setup
python-any-r1_pkg_setup
}
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
+)
src_configure() {
local myconf=(
@@ -70,9 +69,9 @@ src_configure() {
$(usex editor "--atlas" "")
$(usex lobby "" "--without-lobby")
--collada
- --bindir="${GAMES_BINDIR}"
- --libdir="$(games_get_libdir)"/${PN}
- --datadir="${GAMES_DATADIR}"/${PN}
+ --bindir="/usr/bin"
+ --libdir="/usr/$(get_libdir)"/${PN}
+ --datadir="/usr/share/${PN}"
)
# stock premake4 does not work, use the shipped one
@@ -118,13 +117,13 @@ src_test() {
}
src_install() {
- newgamesbin binaries/system/pyrogenesis 0ad
- use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
+ newbin binaries/system/pyrogenesis 0ad
+ use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
- insinto "${GAMES_DATADIR}"/${PN}
+ insinto /usr/share/${PN}
doins -r binaries/data/l10n
- exeinto "$(games_get_libdir)"/${PN}
+ exeinto /usr/$(get_libdir)/${PN}
doexe binaries/system/libCollada.so
doexe libraries/source/spidermonkey/lib/*.so
use editor && doexe binaries/system/libAtlasUI.so
@@ -132,17 +131,13 @@ src_install() {
dodoc binaries/system/readme.txt
doicon -s 128 build/resources/${PN}.png
make_desktop_entry ${PN}
-
- prepgamesdirs
}
pkg_preinst() {
- games_pkg_preinst
gnome2_icon_savelist
}
pkg_postinst() {
- games_pkg_postinst
gnome2_icon_cache_update
}
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index d7fbed78d56b..f0cbb7ea63cc 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,2 +1,2 @@
-DIST 0ad-0.0.20-alpha-unix-build.tar.xz 25610932 SHA256 a396d5cb37057ddd3cd523434f70c56be21588a2228443e7508d2b2d610fc68e SHA512 786f92b74c2e0c64c07ef2f5578dcb5c753fb4fed7238d385bca23549805fcfaeecb9bfbfae809a2ac09a7dfc804455237346588099db347c28a3ff0ae284c43 WHIRLPOOL 2d4b4e96dcb80e265cbbbddfe3b52e72110a419713f6644a68d2a9d499ffc57f03d5b68e612d00ccd889ec9a19609b968af450b228ef586d9567bd16cbc76fcb
DIST 0ad-0.0.21-alpha-unix-build.tar.xz 29196476 SHA256 96be23e4284a3931ef9536f988f2517040bde1f8700ee048bff18c932d8683cf SHA512 68f3586375f7dcbf3dfb6476040b8b43da8e2ea1e74947223ff5c9936b54a93caef919d8982d78c6f4ad01ee8f707b38a2c37cdab88ea5c5408544364cff4c37 WHIRLPOOL 8e72c2c3311169eabab5a8a028ffc90b8d6838f72d23ebbac3e5331a7f9434bbe7cae8cf0f5a97bf30b913f7f7f737d264aaf86298f8f65c81a270b0c4e5f871
+DIST 0ad-0.0.22-alpha-unix-build.tar.xz 29199308 SHA256 fddd36df4fd32b5b31fd8871bc5ed3ec71a921de79517fb6199ba7571ec9f5b1 SHA512 3f917e77c6cc1d3fb585c98950db6eab3f5895ba3db41a8737f8172c769b5582689b436cab31eeafecce0e9639ee456afc7b78ebb03435b06512eb9fe7393771 WHIRLPOOL ae33f4f77cb981a0e8f00969c6b1ee05a2f06bacb70f79bfac74fda383bffedd4c6027370d5003e3d7815d5c68e13308b3553d8810bc69eebee143231968e95c
diff --git a/games-strategy/0ad/files/0ad-0.0.20_alpha-gentoo.patch b/games-strategy/0ad/files/0ad-0.0.20_alpha-gentoo.patch
deleted file mode 100644
index 37a4ef9131dc..000000000000
--- a/games-strategy/0ad/files/0ad-0.0.20_alpha-gentoo.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -Naur 0ad-0.0.20-alpha.old/build/premake/premake4/build/gmake.unix/Premake4.make 0ad-0.0.20-alpha/build/premake/premake4/build/gmake.unix/Premake4.make
---- 0ad-0.0.20-alpha.old/build/premake/premake4/build/gmake.unix/Premake4.make 2016-04-01 20:13:10.176916471 +0200
-+++ 0ad-0.0.20-alpha/build/premake/premake4/build/gmake.unix/Premake4.make 2016-04-01 20:17:20.456909743 +0200
-@@ -26,12 +26,12 @@
- DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
- INCLUDES += -I../../src/host/lua-5.1.4/src
- CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
-- CFLAGS += $(CPPFLAGS) -Wall -Os
-- CXXFLAGS += $(CPPFLAGS) -Wall -Os
-- LDFLAGS += -s -rdynamic
-- LIBS += -lm -ldl
-- RESFLAGS += $(DEFINES) $(INCLUDES)
-- LDDEPS +=
-+ CFLAGS += $(CPPFLAGS) -Wall
-+ CXXFLAGS += $(CPPFLAGS) -Wall
-+ LDFLAGS += -rdynamic
-+ LIBS += -lm -ldl
-+ RESFLAGS += $(DEFINES) $(INCLUDES)
-+ LDDEPS +=
- LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LDDEPS) $(LIBS)
- define PREBUILDCMDS
- endef
-@@ -48,12 +48,12 @@
- DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
- INCLUDES += -I../../src/host/lua-5.1.4/src
- CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
-- CFLAGS += $(CPPFLAGS) -Wall -g
-- CXXFLAGS += $(CPPFLAGS) -Wall -g
-+ CFLAGS += $(CFLAGS) $(CPPFLAGS) -Wall
-+ CXXFLAGS += $(CXXFLAGS) $(CPPFLAGS) -Wall
- LDFLAGS += -rdynamic
-- LIBS += -lm -ldl
-- RESFLAGS += $(DEFINES) $(INCLUDES)
-- LDDEPS +=
-+ LIBS += -lm -ldl
-+ RESFLAGS += $(DEFINES) $(INCLUDES)
-+ LDDEPS +=
- LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LDDEPS) $(LIBS)
- define PREBUILDCMDS
- endef
-diff -Naur 0ad-0.0.20-alpha.old/build/premake/premake4/src/tools/gcc.lua 0ad-0.0.20-alpha/build/premake/premake4/src/tools/gcc.lua
---- 0ad-0.0.20-alpha.old/build/premake/premake4/src/tools/gcc.lua 2016-04-01 20:13:10.170916472 +0200
-+++ 0ad-0.0.20-alpha/build/premake/premake4/src/tools/gcc.lua 2016-04-01 20:15:21.051912953 +0200
-@@ -136,8 +136,6 @@
- if not cfg.flags.Symbols then
- if cfg.system == "macosx" then
- table.insert(result, "-Wl,-x")
-- else
-- table.insert(result, "-s")
- end
- end
-
-diff -Naur 0ad-0.0.20-alpha.old/libraries/source/fcollada/src/Makefile 0ad-0.0.20-alpha/libraries/source/fcollada/src/Makefile
---- 0ad-0.0.20-alpha.old/libraries/source/fcollada/src/Makefile 2016-04-01 20:13:10.197916471 +0200
-+++ 0ad-0.0.20-alpha/libraries/source/fcollada/src/Makefile 2016-04-01 20:14:17.511914661 +0200
-@@ -9,9 +9,9 @@
-
- CXX ?= g++
- CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
--CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
--CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL
--CXXFLAGS_TEST := -O0 -g -D_DEBUG
-+CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
-+CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
-+CXXFLAGS_TEST := -D_DEBUG
- LIBS += `pkg-config libxml-2.0 --libs`
- INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`
- INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)
-diff -Naur 0ad-0.0.20-alpha.old/libraries/source/spidermonkey/build.sh 0ad-0.0.20-alpha/libraries/source/spidermonkey/build.sh
---- 0ad-0.0.20-alpha.old/libraries/source/spidermonkey/build.sh 2016-04-01 20:13:10.185916471 +0200
-+++ 0ad-0.0.20-alpha/libraries/source/spidermonkey/build.sh 2016-04-01 20:19:03.800906965 +0200
-@@ -79,20 +79,8 @@
- cd js/src
-
- # Clean up data generated by previous builds that could cause problems
--rm -rf build-debug
- rm -rf build-release
-
--# We want separate debug/release versions of the library, so we have to change
--# the LIBRARY_NAME for each build.
--# (We use perl instead of sed so that it works with MozillaBuild on Windows,
--# which has an ancient sed.)
--perl -i.bak -pe 's/(LIBRARY_NAME\s+=).*/$1 '\''mozjs31-ps-debug'\''/' moz.build
--mkdir -p build-debug
--cd build-debug
--CXXFLAGS="${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-debug --disable-optimize --enable-js-diagnostics --enable-gczeal # --enable-root-analysis
--${MAKE} ${MAKE_OPTS}
--cd ..
--
- perl -i.bak -pe 's/(LIBRARY_NAME\s+=).*/$1 '\''mozjs31-ps-release'\''/' moz.build
- mkdir -p build-release
- cd build-release
-@@ -134,12 +122,9 @@
- mkdir -p ${INCLUDE_DIR_DEBUG}
- mkdir -p ${INCLUDE_DIR_RELEASE}
- cp -R -L mozjs31/js/src/build-release/dist/include/* ${INCLUDE_DIR_RELEASE}/
--cp -R -L mozjs31/js/src/build-debug/dist/include/* ${INCLUDE_DIR_DEBUG}/
-
- mkdir -p lib/
--cp -L mozjs31/js/src/build-debug/dist/lib/${LIB_PREFIX}mozjs31-ps-debug${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs31-ps-debug${LIB_DST_SUFFIX}
- cp -L mozjs31/js/src/build-release/dist/lib/${LIB_PREFIX}mozjs31-ps-release${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs31-ps-release${LIB_DST_SUFFIX}
--cp -L mozjs31/js/src/build-debug/dist/bin/${LIB_PREFIX}mozjs31-ps-debug${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs31-ps-debug${DLL_DST_SUFFIX}
- cp -L mozjs31/js/src/build-release/dist/bin/${LIB_PREFIX}mozjs31-ps-release${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs31-ps-release${DLL_DST_SUFFIX}
-
- # Flag that it's already been built successfully so we can skip it next time
diff --git a/gnome-extra/cinnamon/cinnamon-3.4.2.ebuild b/gnome-extra/cinnamon/cinnamon-3.4.2-r1.ebuild
similarity index 99%
rename from gnome-extra/cinnamon/cinnamon-3.4.2.ebuild
rename to gnome-extra/cinnamon/cinnamon-3.4.2-r1.ebuild
index 448c84c7bb48..7a62d8ff83f3 100644
--- a/gnome-extra/cinnamon/cinnamon-3.4.2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.4.2-r1.ebuild
@@ -57,7 +57,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=x11-libs/startup-notification-0.11
x11-libs/libX11
>=x11-libs/libXfixes-5.0
- >=x11-wm/muffin-3.0.0[introspection]
+ >=x11-wm/muffin-3.2.0[introspection]
networkmanager? (
gnome-base/libgnome-keyring
>=net-misc/networkmanager-0.8.999:=[introspection] )
diff --git a/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild b/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild
index 9cbf55d64c62..24145aa1ebba 100644
--- a/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 gtk +introspection"
RDEPEND="
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.2.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.2.ebuild
index a2c15c630331..de0fe22de25d 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.2.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
LICENSE="GPL-2+"
SLOT="0"
IUSE="+introspection gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
RDEPEND="
app-crypt/libsecret
diff --git a/kde-apps/libgravatar/libgravatar-17.04.3.ebuild b/kde-apps/libgravatar/libgravatar-17.04.3.ebuild
index e3f91c435ee0..cf9e9b568f86 100644
--- a/kde-apps/libgravatar/libgravatar-17.04.3.ebuild
+++ b/kde-apps/libgravatar/libgravatar-17.04.3.ebuild
@@ -26,3 +26,12 @@ DEPEND="
RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
"
+
+src_test() {
+ # bug 624584 - needs internet connection
+ local myctestargs=(
+ -E "(gravatar-gravatarresolvurljobtest)"
+ )
+
+ kde5_src_test
+}
diff --git a/kde-plasma/kwin/files/kwin-5.10.4-globalaccel.patch b/kde-plasma/kwin/files/kwin-5.10.4-globalaccel.patch
new file mode 100644
index 000000000000..88d373c1dde7
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.10.4-globalaccel.patch
@@ -0,0 +1,45 @@
+From 4c996a57d4c01f092f9ed8f98a9f476c14c0c777 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Fl=C3=B6ser?=
+Date: Thu, 20 Jul 2017 19:14:07 +0200
+Subject: Call Platform::setupActionForGlobalAccel on the Client shortcut
+
+Summary:
+Platform::setupActionForGlobalAccel is an important call on X11 platform.
+Without the x11 timestamp doesn't get updated and calls in KWin might
+fail - e.g. the activation of the Client which is supposed to happen.
+
+Test Plan: compiles
+
+Reviewers: #kwin, #plasma
+
+Subscribers: plasma-devel, kwin
+
+Tags: #kwin
+
+Differential Revision: https://phabricator.kde.org/D6802
+---
+ useractions.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/useractions.cpp b/useractions.cpp
+index 502be96..d92b027 100644
+--- a/useractions.cpp
++++ b/useractions.cpp
+@@ -37,6 +37,7 @@ along with this program. If not, see .
+ #include "input.h"
+ #include "workspace.h"
+ #include "effects.h"
++#include "platform.h"
+ #include "screens.h"
+ #include "virtualdesktops.h"
+ #include "scripting/scripting.h"
+@@ -1050,6 +1051,7 @@ void Workspace::clientShortcutUpdated(Client* c)
+ if (!c->shortcut().isEmpty()) {
+ if (action == NULL) { // new shortcut
+ action = new QAction(this);
++ kwinApp()->platform()->setupActionForGlobalAccel(action);
+ action->setProperty("componentName", QStringLiteral(KWIN_NAME));
+ action->setObjectName(key);
+ action->setText(i18n("Activate Window (%1)", c->caption()));
+--
+cgit v0.11.2
diff --git a/kde-plasma/kwin/kwin-5.10.4-r1.ebuild b/kde-plasma/kwin/kwin-5.10.4-r1.ebuild
new file mode 100644
index 000000000000..5dd83a938124
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.10.4-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE window manager"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gles2 multimedia"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem X)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep plasma)
+ $(add_plasma_dep breeze)
+ $(add_plasma_dep kdecoration)
+ $(add_plasma_dep kscreenlocker)
+ $(add_qt_dep qtcore)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui 'gles2=')
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ >=dev-libs/libinput-1.5
+ >=dev-libs/wayland-1.2
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/libepoxy
+ media-libs/mesa[egl,gbm,gles2?,wayland]
+ virtual/libudev:=
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libdrm
+ >=x11-libs/libxcb-1.10
+ >=x11-libs/libxkbcommon-0.7.0
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-keysyms
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ multimedia? (
+ || (
+ $(add_qt_dep qtmultimedia 'gstreamer,qml')
+ $(add_qt_dep qtmultimedia 'gstreamer010,qml')
+ )
+ )
+ !
+Date: Thu Jul 27 17:50:17 2017 +0200
+
+ Drop unused dependency
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ba61d1cc..ab5536ff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@ include(ECMQtDeclareLoggingCategory)
+ include(KDEPackageAppTemplates)
+
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+- Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet KCMUtils
++ Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet
+ IdleTime Declarative TextWidgets KDELibs4Support Crash GlobalAccel
+ DBusAddons Wayland)
+ find_package(KF5NetworkManagerQt ${KF5_MIN_VERSION})
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r1.ebuild
similarity index 95%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.10.4.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r1.ebuild
index b25435137375..aff99b2e38bc 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.10.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r1.ebuild
@@ -12,11 +12,12 @@ DESCRIPTION="KDE Plasma workspace"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
+REQUIRED_USE="gps? ( geolocation )"
+
COMMON_DEPEND="
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kauth)
$(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kcmutils)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
@@ -25,7 +26,6 @@ COMMON_DEPEND="
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdeclarative)
$(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep kdesu)
$(add_frameworks_dep kglobalaccel)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep ki18n)
@@ -56,7 +56,6 @@ COMMON_DEPEND="
$(add_plasma_dep kscreenlocker)
$(add_plasma_dep kwin)
$(add_plasma_dep libksysguard)
- $(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui 'jpeg')
@@ -75,6 +74,7 @@ COMMON_DEPEND="
x11-libs/libxcb
x11-libs/libXfixes
x11-libs/libXrender
+ x11-libs/libXtst
x11-libs/xcb-util
x11-libs/xcb-util-image
calendar? ( $(add_kdeapps_dep kholidays) )
@@ -86,6 +86,7 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
+ $(add_frameworks_dep kdesu)
$(add_kdeapps_dep kio-extras)
$(add_plasma_dep kde-cli-tools)
$(add_plasma_dep ksysguard)
@@ -114,10 +115,14 @@ RDEPEND="${COMMON_DEPEND}
!kde-plasma/plasma-workspace:4
"
DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
x11-proto/xproto
"
-PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${P}-unused-dep.patch"
+)
RESTRICT+=" test"
@@ -132,12 +137,13 @@ src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package calendar KF5Holidays)
$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
- $(cmake-utils_use_find_package gps libgps)
$(cmake-utils_use_find_package prison KF5Prison)
$(cmake-utils_use_find_package qalculate Qalculate)
$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
)
+ use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+
kde5_src_configure
}
diff --git a/licenses/NVIDIA-cuDNN b/licenses/NVIDIA-cuDNN
new file mode 100644
index 000000000000..4c2f346d49f3
--- /dev/null
+++ b/licenses/NVIDIA-cuDNN
@@ -0,0 +1,378 @@
+NVIDIA cuDNN License Agreement
+
+This Software License Agreement ("SLA”), made and entered into as of the time and date of click through action (“Effective Date”), is
+a legal agreement between you and NVIDIA Corporation ("NVIDIA") and governs the use of the NVIDIA computer software and the
+documentation made available for use with such NVIDIA software. By downloading, installing, copying, or otherwise using the NVIDIA
+software and/or documentation, you agree to be bound by the terms of this SLA. If you do not agree to the terms of this SLA, do not
+download, install, copy or use the NVIDIA software or documentation. IF YOU ARE ENTERING INTO THIS SLA ON BEHALF OF A
+COMPANY OR OTHER LEGAL ENTITY, YOU REPRESENT THAT YOU HAVE THE LEGAL AUTHORITY TO BIND THE ENTITY TO THIS SLA, IN
+WHICH CASE “YOU” WILL MEAN THE ENTITY YOU REPRESENT. IF YOU DON’T HAVE SUCH AUTHORITY, OR IF YOU DON’T ACCEPT ALL
+THE TERMS AND CONDITIONS OF THIS SLA, THEN NVIDIA DOES NOT AGREE TO LICENSE THE LICENSED SOFTWARE TO YOU, AND YOU
+MAY NOT DOWNLOAD, INSTALL, COPY OR USE IT.
+1. LICENSE.
+1.1
+License Grant. Subject to the terms of the AGREEMENT, NVIDIA hereby grants you a non-exclusive, non-transferable
+license, without the right to sublicense (except as expressly set forth in a Supplement), during the applicable license term unless
+earlier terminated as provided below, to have Authorized Users install and use the Software, including modifications (if expressly
+permitted in a Supplement), in accordance with the Documentation. You are only licensed to activate and use Licensed Software for
+which you a have a valid license, even if during the download or installation you are presented with other product options. No
+Orders are binding on NVIDIA until accepted by NVIDIA. Your Orders are subject to the AGREEMENT.
+SLA Supplements: Certain Licensed Software licensed under this SLA may be subject to additional terms and conditions that will be
+presented to you in a Supplement for acceptance prior to the delivery of such Licensed Software under this SLA and the applicable
+Supplement. Licensed Software will only be delivered to you upon your acceptance of all applicable terms.
+1.2
+Limited Purpose Licenses. If your license is provided for one of the purposes indicated below, then notwithstanding
+contrary terms in Section 1.1 or in a Supplement, such licenses are for internal use and do not include any right or license to sublicense and distribute the Licensed Software or its output in any way in any public release, however limited, and/or in any manner
+that provides third parties with use of or access to the Licensed Software or its functionality or output, including (but not limited to)
+external alpha or beta testing or development phases. Further:
+(i) Evaluation License. You may use evaluation licenses solely for your internal evaluation of the Licensed Software for broader
+adoption within your Enterprise or in connection with a NVIDIA product purchase decision, and such licenses have an expiration date
+as indicated by NVIDIA in its sole discretion (or ninety days from the date of download if no other duration is indicated).
+(ii) Educational/Academic License. You may use educational/academic licenses solely for educational purposes and all users must be
+enrolled or employed by an academic institution. If you do not meet NVIDIA’s academic program requirements for educational
+institutions, you have no rights under this license.
+(iii) Test/Development License. You may use test/development licenses solely for your internal development, testing and/or
+debugging of your software applications or for interoperability testing with the Licensed Software, and such licenses have an
+expiration date as indicated by NVIDIA in its sole discretion (or one year from the date of download if no other duration is indicated).
+NVIDIA Confidential Information under the AGREEMENT includes output from Licensed Software developer tools identified as “Pro”
+versions, where the output reveals functionality or performance data pertinent to NVIDIA hardware or software products.
+1.3
+Pre-Release Licenses. With respect to alpha, beta, preview, and other pre-release Software and Documentation (“PreRelease Licensed Software”) delivered to you under the AGREEMENT you acknowledge and agree that such Pre-Release Licensed
+Software (i) may not be fully functional, may contain errors or design flaws, and may have reduced or different security, privacy,
+accessibility, availability, and reliability standards relative to commercially provided NVIDIA software and documentation, and (ii) use
+of such Pre-Release Licensed Software may result in unexpected results, loss of data, project delays or other unpredictable damage
+or loss. THEREFORE, PRE-RELEASE LICENSED SOFTWARE IS NOT INTENDED FOR USE, AND SHOULD NOT BE USED, IN PRODUCTION
+OR BUSINESS-CRITICAL SYSTEMS. NVIDIA has no obligation to make available a commercial version of any Pre-Release Licensed
+Software and NVIDIA has the right to abandon development of Pre-Release Licensed Software at any time without liability.
+NVIDIA SOFTWARE LICENSE AGREEMENT (V. 10.20.2016)
+
+1
+
+1.4
+Enterprise and Contractor Usage. You may allow your Enterprise employees and Contractors to access and use the Licensed
+Software pursuant to the terms of the AGREEMENT solely to perform work on your behalf, provided further that with respect to
+Contractors: (i) you obtain a written agreement from each Contractor which contains terms and obligations with respect to access to
+and use of Licensed Software no less protective of NVIDIA than those set forth in the AGREEMENT, and (ii) such Contractor’s access
+and use expressly excludes any sublicensing or distribution rights for the Licensed Software. You are responsible for the compliance
+with the terms and conditions of the AGREEMENT by your Enterprise and Contractors. Any act or omission that, if committed by you,
+would constitute a breach of the AGREEMENT shall be deemed to constitute a breach of the AGREEMENT if committed by your
+Enterprise or Contractors.
+1.5
+Services. Except as expressly indicated in an Order, NVIDIA is under no obligation to provide support for the Licensed
+Software or to provide any patches, maintenance, updates or upgrades under the AGREEMENT. Unless patches, maintenance,
+updates or upgrades are provided with their separate governing terms and conditions, they constitute Licensed Software licensed to
+you under the AGREEMENT.
+2.
+
+LIMITATIONS.
+
+2.1
+License Restrictions. Except as expressly authorized in the AGREEMENT, you agree that you will not (nor authorize third
+parties to): (i) copy and use Software that was licensed to you for use in one or more NVIDIA hardware products in other unlicensed
+products (provided that copies solely for backup purposes are allowed); (ii) reverse engineer, decompile, disassemble (except to the
+extent applicable laws specifically require that such activities be permitted) or attempt to derive the source code, underlying ideas,
+algorithm or structure of Software provided to you in object code form; (iii) sell, transfer, assign, distribute, rent, loan, lease,
+sublicense or otherwise make available the Licensed Software or its functionality to third parties (a) as an application services
+provider or service bureau, (b) by operating hosted/virtual system environments, (c) by hosting, time sharing or providing any other
+type of services, or (d) otherwise by means of the internet; (iv) modify, translate or otherwise create any derivative works of any
+Licensed Software; (v) remove, alter, cover or obscure any proprietary notice that appears on or with the Licensed Software or any
+copies thereof; (vi) use the Licensed Software, or allow its use, transfer, transmission or export in violation of any applicable export
+control laws, rules or regulations; (vii) distribute, permit access to, or sublicense the Licensed Software as a stand-alone product;
+(viii) bypass, disable, circumvent or remove any form of copy protection, encryption, security or digital rights management or
+authentication mechanism used by NVIDIA in connection with the Licensed Software, or use the Licensed Software together with
+any authorization code, serial number, or other copy protection device not supplied by NVIDIA directly or through an authorized
+reseller; (ix) use the Licensed Software for the purpose of developing competing products or technologies or assisting a third party in
+such activities; (x) use the Licensed Software with any system or application where the use or failure of such system or application
+can reasonably be expected to threaten or result in personal injury, death, or catastrophic loss including, without limitation, use in
+connection with any nuclear, avionics, navigation, military, medical, life support or other life critical application (“Critical
+Applications”), unless the parties have entered into a Critical Applications agreement; (xi) distribute any modification or derivative
+work you make to the Licensed Software under or by reference to the same name as used by NVIDIA; or (xii) use the Licensed
+Software in any manner that would cause the Licensed Software to become subject to an Open Source License. Nothing in the
+AGREEMENT shall be construed to give you a right to use, or otherwise obtain access to, any source code from which the Software
+or any portion thereof is compiled or interpreted. You acknowledge that NVIDIA does not design, test, manufacture or certify the
+Licensed Software for use in the context of a Critical Application and NVIDIA shall not be liable to you or any third party, in whole or
+in part, for any claims or damages arising from such use. You agree to defend, indemnify and hold harmless NVIDIA and its Affiliates,
+and their respective employees, contractors, agents, officers and directors, from and against any and all claims, damages, obligations,
+losses, liabilities, costs or debt, fines, restitutions and expenses (including but not limited to attorney’s fees and costs incident to
+establishing the right of indemnification) arising out of or related to you and your Enterprise, and their respective employees,
+contractors, agents, distributors, resellers, end users, officers and directors use of Licensed Software outside of the scope of the
+AGREEMENT or any other breach of the terms of the AGREEMENT.
+2.2
+Third Party License Obligations. You acknowledge and agree that the Licensed Software may include or incorporate third
+party technology (collectively “Third Party Components”), which is provided for use in or with the Software and not otherwise used
+separately. If the Licensed Software includes or incorporates Third Party Components, then the third-party pass-through terms and
+conditions (“Third Party Terms”) for the particular Third Party Component will be bundled with the Software or otherwise made
+available online as indicated by NVIDIA and will be incorporated by reference into the AGREEMENT. In the event of any conflict
+between the terms in the AGREEMENT and the Third Party Terms, the Third Party Terms shall govern. Copyright to Third Party
+Components are held by the copyright holders indicated in the copyright notices indicated in the Third Party Terms.
+Audio/Video Encoders and Decoders. You acknowledge and agree that it is your sole responsibility to obtain any additional third
+NVIDIA SOFTWARE LICENSE AGREEMENT (V. 10.20.2016)
+
+2
+
+party licenses required to make, have made, use, have used, sell, import, and offer for sale your products or services that include or
+incorporate any Third Party Components and content relating to audio and/or video encoders and decoders from, including but not
+limited to, Microsoft, Thomson, Fraunhofer IIS, Sisvel S.p.A., MPEG-LA, and Coding Technologies as NVIDIA does not grant to you
+under the AGREEMENT any necessary patent or other rights with respect to audio and/or video encoders and decoders.
+2.3
+Limited Rights. Your rights in the Licensed Software are limited to those expressly granted under the AGREEMENT and no
+other licenses are granted whether by implication, estoppel or otherwise. NVIDIA reserves all rights, title and interest in and to the
+Licensed Software not expressly granted under the AGREEMENT.
+3. CONFIDENTIALITY. Neither party will use the other party’s Confidential Information, except as necessary for the performance of
+the AGREEMENT, nor will either party disclose such Confidential Information to any third party, except to personnel of NVIDIA and
+its Affiliates, you, your Enterprise, your Enterprise Contractors, and each party’s legal and financial advisors that have a need to
+know such Confidential Information for the performance of the AGREEMENT, provided that each such personnel, employee and
+Contractor is subject to a written agreement that includes confidentiality obligations consistent with those set forth herein. Each
+party will use all reasonable efforts to maintain the confidentiality of all of the other party’s Confidential Information in its
+possession or control, but in no event less than the efforts that it ordinarily uses with respect to its own Confidential Information of
+similar nature and importance. The foregoing obligations will not restrict either party from disclosing the other party’s Confidential
+Information or the terms and conditions of the AGREEMENT as required under applicable securities regulations or pursuant to the
+order or requirement of a court, administrative agency, or other governmental body, provided that the party required to make such
+disclosure (i) gives reasonable notice to the other party to enable it to contest such order or requirement prior to its disclosure
+(whether through protective orders or otherwise), (ii) uses reasonable effort to obtain confidential treatment or similar protection
+to the fullest extent possible to avoid such public disclosure, and (iii) discloses only the minimum amount of information necessary
+to comply with such requirements.
+4. OWNERSHIP. You are not obligated to disclose to NVIDIA any modifications that you, your Enterprise or your Contractors make
+to the Licensed Software as permitted under the AGREEMENT. As between the parties, all modifications are owned by NVIDIA and
+licensed to you under the AGREEMENT unless otherwise expressly provided in a Supplement. The Licensed Software and all
+modifications owned by NVIDIA, and the respective Intellectual Property Rights therein, are and will remain the sole and exclusive
+property of NVIDIA or its licensors, whether the Licensed Software is separate from or combined with any other products or
+materials. You shall not engage in any act or omission that would impair NVIDIA’s and/or its licensors’ Intellectual Property
+Rights in the Licensed Software or any other materials, information, processes or subject matter proprietary to NVIDIA. NVIDIA’s
+licensors are intended third party beneficiaries with the right to enforce provisions of the AGREEMENT with respect to their
+Confidential Information and/or Intellectual Property Rights.
+5. FEEDBACK. You have no obligation to provide Feedback to NVIDIA. However, NVIDIA and/or its Affiliates may use and include
+any Feedback that you provide to improve the Licensed Software or other NVIDIA products, technologies or materials. Accordingly, if
+you provide Feedback, you agree that NVIDIA and/or its Affiliates, at their option, may, and may permit their licensees, to make,
+have made, use, have used, reproduce, license, distribute and otherwise commercialize the Feedback in the Licensed Software or in
+other NVIDIA products, technologies or materials without the payment of any royalties or fees to you. All Feedback becomes the
+sole property of NVIDIA and may be used in any manner NVIDIA sees fit, and you hereby assign to NVIDIA all of your right, title and
+interest in and to any Feedback. NVIDIA has no obligation to respond to Feedback or to incorporate Feedback into the Licensed
+Software.
+6. NO WARRANTIES. THE LICENSED SOFTWARE AND ANY OTHER CONFIDENTIAL INFORMATION AND/OR SERVICES ARE
+PROVIDED BY NVIDIA “AS IS” AND “WITH ALL FAULTS,” AND NVIDIA EXPRESSLY DISCLAIMS ALL OTHER WARRANTIES OF ANY KIND
+OR NATURE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF OPERABILITY,
+CONDITION, VALUE, ACCURACY OF DATA, OR QUALITY, AS WELL AS ANY WARRANTIES OF MERCHANTABILITY, SYSTEM
+INTEGRATION, WORKMANSHIP, SUITABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON -IN FRIN GE ME N T, OR THE ABSENCE OF
+ANY DEFECTS THEREIN, WHETHER LATENT OR PATENT. NO WARRANTY IS MADE BY NVIDIA ON THE BASIS OF TRADE USAGE,
+COURSE OF DEALING OR COURSE OF TRADE. NVIDIA DOES NOT WARRANT THAT THE LICENSED SOFTWARE OR ANY OTHER
+CONFIDENTIAL INFORMATION AND/OR SERVICES PROVIDED BY NVIDIA UNDER THE AGREEMENT WILL MEET YOUR
+REQUIREMENTS OR THAT THE OPERATION THEREOF WILL BE UNINTERRUPTED OR ERROR-FREE, OR THAT ALL ERRORS WILL BE
+CORRECTED. YOU ACKNOWLEDGE THAT NVIDIA’S OBLIGATIONS UNDER THE AGREEMENT ARE FOR THE BENEFIT OF YOU ONLY.
+Nothing in this warranty section affects any statutory rights of consumers or other recipients to the extent that they cannot be
+waived or limited by contract under applicable law.
+NVIDIA SOFTWARE LICENSE AGREEMENT (V. 10.20.2016)
+
+3
+
+7. LIMITATION OF LIABILITY. TO THE MAXIMUM EXTENT PERMITTED BY LAW, NVIDIA OR ITS LICENSORS SHALL NOT BE LIABLE FOR
+ANY SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR ANY LOST PROFITS, LOSS OF USE, LOSS OF DATA OR LOSS
+OF GOODWILL, OR THE COSTS OF PROCURING SUBSTITUTE PRODUCTS, ARISING OUT OF OR IN CONNECTION WITH THE AGREEMENT
+OR THE USE OR PERFORMANCE OF THE LICENSED SOFTWARE AND ANY OTHER CONFIDENTIAL INFORMATION AND/OR SERVICES
+PROVIDED BY NVIDIA UNDER THE AGREEMENT, WHETHER SUCH LIABILITY ARISES FROM ANY CLAIM BASED UPON BREACH OF
+CONTRACT, BREACH OF WARRANTY, TORT (INCLUDING NEGLIGENCE), PRODUCT LIABILITY OR ANY OTHER CAUSE OF ACTION OR
+THEORY OF LIABILITY. IN NO EVENT WILL NVIDIA’S TOTAL CUMULATIVE LIABILITY UNDER OR ARISING OUT OF THE AGREEMENT
+EXCEED THE NET AMOUNTS RECEIVED BY NVIDIA FOR YOUR USE OF THE PARTICULAR LICENSED SOFTWARE DURING THE TWELVE
+(12) MONTHS BEFORE THE LIABILITY AROSE (or up to US$10.00 if you acquired the Licensed Software for no charge). THE NATURE OF
+THE LIABILITY, THE NUMBER OF CLAIMS OR SUITS OR THE NUMBER OF PARTIES WITHIN YOUR ENTERPRISE THAT ACCEPTED THE
+TERMS OF THE AGREEMENT SHALL NOT ENLARGE OR EXTEND THIS LIMIT. THE FOREGOING LIMITATIONS SHALL APPLY REGARDLESS
+OF WHETHER NVIDIA OR ITS LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND REGARDLESS OF
+WHETHER ANY REMEDY FAILS ITS ESSENTIAL PURPOSE. The disclaimers, exclusions and limitations of liability set forth in the
+AGREEMENT form an essential basis of the bargain between the parties, and, absent any such disclaimers, exclusions or limitations of
+liability, the provisions of the AGREEMENT, including, without limitation, the economic terms, would be substantially different.
+8.
+
+TERM AND TERMINATION.
+
+8.1
+AGREEMENT, Licenses and Services. This SLA shall become effective upon the Effective Date, each Supplement upon their
+acceptance, and both this SLA and Supplements shall continue in effect until your last access or use of the Licensed Software and/or
+services hereunder, unless earlier terminated as provided in this “Term and Termination” section. Each Licensed Software license ends
+at the earlier of (a) the expiration of the applicable license term, or (b) termination of such license or the AGREEMENT. Each service
+ends at the earlier of (x) the expiration of the applicable service term, (y) termination of such service or the AGREEMENT, or (z)
+expiration or termination of the associated license and no credit or refund will be provided upon the expiration or termination of the
+associated license for any service fees paid.
+8.2
+Termination and Effect of Expiration or Termination. NVIDIA may terminate the AGREEMENT in whole or in part: (i) if you
+breach any term of the AGREEMENT and fail to cure such breach within thirty (30) days following notice thereof from NVIDIA (or
+immediately if you violate NVIDIA’s Intellectual Property Rights); (ii) if you become the subject of a voluntary or involuntary petition in
+bankruptcy or any proceeding relating to insolvency, receivership, liquidation or composition for the benefit of creditors, if that petition
+or proceeding is not dismissed with prejudice within sixty (60) days after filing, or if you cease to do business; or (iii) if you commence or
+participate in any legal proceeding against NVIDIA, with respect to the Licensed Software that is the subject of the proceeding during
+the pendency of such legal proceeding. If you or your authorized NVIDIA reseller fail to pay license fees or service fees when due then
+NVIDIA may, in its sole discretion, suspend or terminate your license grants, services and any other rights provided under the
+AGREEMENT for the affected Licensed Software, in addition to any other remedies NVIDIA may have at law or equity. Upon any
+expiration or termination of the AGREEMENT, a license or a service provided hereunder, (a) any amounts owed to NVIDIA become
+immediately due and payable, (b) you must promptly discontinue use of the affected Licensed Software and/or service, and (c) you
+must promptly destroy or return to NVIDIA all copies of the affected Licensed Software and all portions thereof in your possession or
+control, and each party will promptly destroy or return to the other all of the other party’s Confidential Information within its
+possession or control. Upon written request, you will certify in writing that you have complied with your obligations under this
+section. Upon expiration or termination of the AGREEMENT all provisions survive except for the license grant provisions.
+9.
+
+CONSENT TO COLLECTION AND USE OF INFORMATION.
+
+You hereby agree and acknowledge that the Software may access, collect non-personally identifiable information about your
+Enterprise computer systems in order to properly optimize such systems for use with the Software. To the extent that you use the
+Software, you hereby consent to all of the foregoing, and represent and warrant that you have the right to grant such consent. In
+addition, you agree that you are solely responsible for maintaining appropriate data backups and system restore points for your
+Enterprise systems, and that NVIDIA will have no responsibility for any damage or loss to such systems (including loss of data or
+access) arising from or relating to (a) any changes to the configuration, application settings, environment variables, registry, drivers,
+BIOS, or other attributes of the systems (or any part of such systems) initiated through the Software; or (b) installation of any
+Software or third party software patches initiated through the Software. In certain systems you may change your system update
+preferences by unchecking "Automatically check for updates" in the "Preferences" tab of the control panel for the Software.
+
+NVIDIA SOFTWARE LICENSE AGREEMENT (V. 10.20.2016)
+
+4
+
+In connection with the receipt of the Licensed Software or services you may receive access to links to third party websites and
+services and the availability of those links does not imply any endorsement by NVIDIA. NVIDIA encourages you to review the privacy
+statements on those sites and services that you choose to visit so that you can understand how they may collect, use and share
+personal information of individuals. NVIDIA is not responsible or liable for: (i) the availability or accuracy of such links; or (ii) the
+products, services or information available on or through such links; or (iii) the privacy statements or practices of sites and services
+controlled by other companies or organizations.
+To the extent that you or members of your Enterprise provide to NVIDIA during registration or otherwise personal information, you
+acknowledge that such information will be collected, used and disclosed by NVIDIA in accordance with NVIDIA's privacy policy,
+available at URL http://www.nvidia.com/object/privacy_policy.html.
+10. GENERAL.
+This SLA, any Supplements incorporated hereto, and Orders constitute the entire agreement of the parties with respect to the
+subject matter hereto and supersede all prior negotiations, conversations, or discussions between the parties relating to the subject
+matter hereto, oral or written, and all past dealings or industry custom. Any additional and/or conflicting terms and conditions on
+purchase order(s) or any other documents issued by you are null, void, and invalid. Any amendment or waiver under the
+AGREEMENT must be in writing and signed by representatives of both parties.
+The AGREEMENT and the rights and obligations thereunder may not be assigned by you, in whole or in part, including by merger,
+consolidation, dissolution, operation of law, or any other manner, without written consent of NVIDIA, and any purported assignment
+in violation of this provision shall be void and of no effect. NVIDIA may assign, delegate or transfer the AGREEMENT and its rights and
+obligations hereunder, and if to a non-Affiliate you will be notified.
+Each party acknowledges and agrees that the other is an independent contractor in the performance of the AGREEMENT, and each
+party is solely responsible for all of its employees, agents, contractors, and labor costs and expenses arising in connection therewith.
+The parties are not partners, joint ventures or otherwise affiliated, and neither has any authority to make any statements,
+representations or commitments of any kind to bind the other party without prior written consent.
+Neither party will be responsible for any failure or delay in its performance under the AGREEMENT (except for any payment
+obligations) to the extent due to causes beyond its reasonable control for so long as such force majeure event continues in effect.
+The AGREEMENT will be governed by and construed under the laws of the State of Delaware and the United States without regard
+to the conflicts of law provisions thereof and without regard to the United Nations Convention on Contracts for the International
+Sale of Goods. The parties consent to the personal jurisdiction of the federal and state courts located in Santa Clara County,
+California. You acknowledge and agree that a breach of any of your promises or agreements contained in the AGREEMENT may
+result in irreparable and continuing injury to NVIDIA for which monetary damages may not be an adequate remedy and therefore
+NVIDIA is entitled to seek injunctive relief as well as such other and further relief as may be appropriate. If any court of competent
+jurisdiction determines that any provision of the AGREEMENT is illegal, invalid or unenforceable, the remaining provisions will
+remain in full force and effect. Unless otherwise specified, remedies are cumulative.
+The Licensed Software has been developed entirely at private expense and is “commercial items” consisting of “commercial
+computer software” and “commercial computer software documentation” provided with RESTRICTED RIGHTS. Use, duplication or
+disclosure by the U.S. Government or a U.S. Government subcontractor is subject to the restrictions set forth in the AGREEMENT
+pursuant to DFARS 227.7202-3(a) or as set forth in subparagraphs (c)(1) and (2) of the Commercial Computer Software - Restricted
+Rights clause at FAR 52.227-19, as applicable. Contractor/manufacturer is NVIDIA, 2701 San Tomas Expressway, Santa Clara, CA
+95050.
+You acknowledge that the Licensed Software described under the AGREEMENT is subject to export control under the U.S. Export
+Administration Regulations (EAR) and economic sanctions regulations administered by the U.S. Department of Treasury’s Office of
+Foreign Assets Control (OFAC). Therefore, you may not export, reexport or transfer in-country the Licensed Software without first
+obtaining any license or other approval that may be required by BIS and/or OFAC. You are responsible for any violation of the U.S. or
+other applicable export control or economic sanctions laws, regulations and requirements related to the Licensed Software. By
+accepting this SLA, you confirm that you are not a resident or citizen of any country currently embargoed by the U.S. and that you
+are not otherwise prohibited from receiving the Licensed Software.
+NVIDIA SOFTWARE LICENSE AGREEMENT (V. 10.20.2016)
+
+5
+
+Any notice delivered by NVIDIA to you under the AGREEMENT will be delivered via mail, email or fax. Please direct your legal notices
+or other correspondence to NVIDIA Corporation, 2701 San Tomas Expressway, Santa Clara, California 95050, United States of
+America, Attention: Legal Department.
+GLOSSARY OF TERMS
+Certain capitalized terms, if not otherwise defined elsewhere in this SLA, shall have the meanings set forth below:
+a. “Affiliate” means any legal entity that Owns, is Owned by, or is commonly Owned with a party. “Own” means having more than
+50% ownership or the right to direct the management of the entity.
+b. “AGREEMENT” means this SLA and all associated Supplements entered by the parties referencing this SLA.
+c. “Authorized Users” means your Enterprise individual employees and any of your Enterprise’s Contractors, subject to the terms
+of the “Enterprise and Contractors Usage” section.
+d. “Confidential Information” means the Licensed Software (unless made publicly available by NVIDIA without confidentiality
+obligations), and any NVIDIA business, marketing, pricing, research and development, know-how, technical, scientific, financial
+status, proposed new products or other information disclosed by NVIDIA to you which, at the time of disclosure, is designated in
+writing as confidential or proprietary (or like written designation), or orally identified as confidential or proprietary or is otherwise
+reasonably identifiable by parties exercising reasonable business judgment, as confidential. Confidential Information does not and
+will not include information that: (i) is or becomes generally known to the public through no fault of or breach of the AGREEMENT by
+the receiving party; (ii) is rightfully known by the receiving party at the time of disclosure without an obligation of confidentiality;
+(iii) is independently developed by the receiving party without use of the disclosing party’s Confidential Information; or (iv) is
+rightfully obtained by the receiving party from a third party without restriction on use or disclosure.
+e. “Contractor” means an individual who works primarily for your Enterprise on a contractor basis from your secure network.
+f. “Documentation” means the NVIDIA documentation made available for use with the Software, including (without limitation)
+user manuals, datasheets, operations instructions, installation guides, release notes and other materials provided to you under the
+AGREEMENT.
+g. “Enterprise” means you or any company or legal entity for which you accepted the terms of this SLA, and their subsidiaries of
+which your company or legal entity owns more than fifty percent (50%) of the issued and outstanding equity.
+h. “Feedback” means any and all suggestions, feature requests, comments or other feedback regarding the Licensed Software,
+including possible enhancements or modifications thereto.
+i.
+“Intellectual Property Rights” means all patent, copyright, trademark, trade secret, trade dress, trade names, utility models,
+mask work, moral rights, rights of attribution or integrity service marks, master recording and music publishing rights, performance
+rights, author’s rights, database rights, registered design rights and any applications for the protection or registration of these rights,
+or other intellectual or industrial property rights or proprietary rights, howsoever arising and in whatever media, whether now
+known or hereafter devised, whether or not registered, (including all claims and causes of action for infringement, misappropriation
+or violation and all rights in any registrations and renewals), worldwide and whether existing now or in the future.
+j. “Licensed Software” means Software, Documentation and all modifications owned by NVIDIA.
+k. “Open Source License” includes, without limitation, a software license that requires as a condition of use, modification, and/or
+distribution of such software that the Software be (i) disclosed or distributed in source code form; (ii) be licensed for the purpose of
+making derivative works; or (iii) be redistributable at no charge.
+l. “Order” means a purchase order issued by you, a signed purchase agreement with you, or other ordering document issued by
+you to NVIDIA or a NVIDIA authorized reseller (including any on-line acceptance process) that references and incorporates the
+AGREEMENT and is accepted by NVIDIA.
+m. “Software” means the NVIDIA software programs licensed to you under the AGREEMENT including, without limitation, libraries,
+sample code, utility programs and programming code.
+n. “Supplement” means the additional terms and conditions beyond those stated in this SLA that apply to certain Licensed
+Software licensed hereunder.
+
+NVIDIA SOFTWARE LICENSE AGREEMENT (V. 10.20.2016)
+
+6
+
+cuDNN SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT
+Release date: January 5, 2017
+The terms set forth in this cuDNN Supplement (“Supplement”) govern your use of the CUDA Deep Neural Network library (cuDNN)
+(the “cuDNN Licensed Software”) under the terms of your software license agreement (“SLA”) as modified by this Supplement. This
+Supplement is an exhibit to the SLA and is hereby incorporated as an integral part thereto. Capitalized terms used but not defined
+herein shall have the meaning assigned to them in the SLA. In the event of conflict between the terms in this Supplement and the
+terms in the SLA, this Supplement shall control.
+1. CUDNN DISTRIBUTION. Subject to the terms of the SLA and this Supplement, NVIDIA hereby grants you a non-exclusive, nontransferable license during the applicable license term unless earlier terminated pursuant to the SLA, to distribute the runtime files
+(.so, .h) when delivered to you as part of the cuDNN Licensed Software in source code form or binary form (but not when provided to
+you as part of a hardware product), subject to such distribution being solely in binary form to your licensees (“Customers”) only as a
+component of your own software products having additional material functionality beyond the redistributable cuDNN Licensed
+Software (each, a “Licensee Application"). Subject to the terms and conditions of the SLA and this Supplement, you may further
+authorize Customers to redistribute the cuDNN Licensed Software as incorporated into a Licensee Application, solely in binary form,
+provided, however, that you shall require in your agreements with your Customers that their distributions be on terms at least as
+restrictive as those applicable for your use of the cuDNN Licensed Software within a Licensee Application. The expiration or
+termination of your licenses to the cuDNN Licensed Software under the SLA and this Supplement will not affect your previous cuDNN
+distributions in compliance with the SLA and this Supplement.
+The above distributions are subject to the following: (a) all distributions by you or your distribution channels must be consistent with
+the terms of the AGREEMENT; (b) the distributed cuDNN License Software must include valid copyright notices indicating NVIDIA’s
+ownership of the Licensed Software and (if permitted) modifications; and (c) you must enter into enforceable agreements that pass
+down terms consistent with the terms set forth in the AGREEMENT for use of the distributable cuDNN License Software, including
+(without limitation) terms relating to the license grant and license restrictions, confidentiality and protection of NVIDIA’s Intellectual
+Property Rights in and to the cuDNN Licensed Software. You are liable for the distribution and use of cuDNN Licensed Software if you
+failed to comply with the distribution requirements of this Supplement. You agree to notify NVIDIA in writing of any known or
+suspected distribution or use of the cuDNN Licensed Software not in compliance with the terms of the AGREEMENT, and to enforce
+the terms of your agreements with respect to cuDNN Licensed Software you distributed.
+2. LICENSE DURATION. Each cuDNN Licensed Software is licensed to you for an initial duration of one year starting from the date of
+delivery or download. The licenses granted will automatically renew for successive one year periods, provided that NVIDIA reserves
+the right to terminate licenses upon ninety days (90) days written notice to you prior to the commencement of a renewal year in
+addition to the termination rights set forth in the SLA.
+3. AUDIT. During the term of the AGREEMENT and for three (3) years thereafter, you will maintain all usual and proper books and
+records of account relating to the cuDNN Licensed Software and services provided under the AGREEMENT. During such period and
+upon written notice to you, NVIDIA or its authorized third party auditors subject to confidentiality obligations will have the right to
+inspect and audit your Enterprise books and records for the purpose of confirming compliance with the terms of the AGREEMENT.
+Any such inspection and audit will be conducted during regular business hours and no more frequently than annually unless noncompliance was previously found. If such an inspection and audit reveals an underpayment of any amounts payable to NVIDIA, then
+you will promptly remit the full amount of such underpayment to NVIDIA, including interest accruing (without the requirement of a
+notice) from the time underpayment began at the lower of 1.5% per month or the highest rate permissible by law. If the underpaid
+amount exceeds five percent (5%) of the amounts payable to NVIDIA for the period audited and/or such an inspection and audit
+reveals a material non-conformance with the terms of the AGREEMENT, then you will also pay NVIDIA’s reasonable costs of
+conducting the inspection and audit. Further, you agree that the party delivering the cuDNN Licensed Software to you may collect
+and disclose to NVIDIA information for NVIDIA to verify your compliance with the terms of the AGREEMENT including (without
+limitation) information regarding your use of the cuDNN Licensed Software.
+4. EXPIRATION OF TERMINATION OF THIS SUPPLEMENT. Your failure to comply with the terms of this Supplement is ground for
+termination for breach by NVIDIA under the SLA. This Supplement will automatically expire or terminate upon the expiration or
+termination of your rights to cuDNN Licensed Software under the SLA or this Supplement.
+
+NVIDIA SOFTWARE LICENSE AGREEMENT (V. 10.20.2016)
+
+7
+
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index b5869a5fd8d2..458a109be75e 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,2 +1,3 @@
DIST feh-2.18.3.tar.bz2 2127924 SHA256 d82f68c7a96e1860dab3584ed58bda69446b692ae79a4ca999018507da310563 SHA512 3ffb44f8a2207c2c8725a519a23b7235a6df86aa8578b7b79a8819122e509d18dcc8263859e02cdbdeb5fb5ca56229f90aef567d53d63d763f8259fbc1fff515 WHIRLPOOL 27b5cf4cb2431f09d7e971330e53435d1dd575706d6228ee6b4bdb4e80f15806571d0435f2cca3567bbb124da715eabf59d5a9f84e52274729ce85c06e8161a8
+DIST feh-2.19.1.tar.bz2 2128270 SHA256 ec8824596b8c4f668195b2a445832c903c438c2931e5b60095eab61155659eb4 SHA512 cc019654c36a8fec9a4fb8d7fd47ea75e7a0ef5a754f06702da6898a9ec7a48f9f8bde10a60e25a077dd46b3defe67dbf6a6bc4c7d9ba7079ea5e472840a36d9 WHIRLPOOL 60ef61686d0c68029bbb107b4038f31eef843405855112e8b0acce3e08848ede0d77c06938bf9f355a61b3e723759e572715da68926c38820e6903126535c07c
DIST feh-2.19.tar.bz2 2128358 SHA256 cebe25d8393a07aa79a6b2f99beb133d8de0cbc00d46bccc4df276248cc9d0e9 SHA512 19786749c4e82b21f73e08d1022518bb9bffa2abd52d5fe5f10a1c7e240d22cea4e7af96f986c81152f06f356ccc3a51034799b319507deb021e0c97fcf7d777 WHIRLPOOL 5263466aa264f743b7de474f57d1224fffbfab419e47f1ccaf20b8a8b07fbf7a0fa0456148ca72fcd4d195d2ebdc2a15e0cdb78c1adf8ffe6bcb7e6755b95643
diff --git a/media-gfx/feh/feh-2.19.1.ebuild b/media-gfx/feh/feh-2.19.1.ebuild
new file mode 100644
index 000000000000..16b0c4192e9c
--- /dev/null
+++ b/media-gfx/feh/feh-2.19.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="http://feh.finalrewind.org/"
+SRC_URI="http://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+ >=media-libs/libpng-1.2:0=
+ x11-libs/libX11
+ curl? ( net-misc/curl )
+ exif? ( media-libs/libexif )
+ xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+ virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+ x11-libs/libXt
+ x11-proto/xproto
+ test? (
+ >=dev-lang/perl-5.10
+ dev-perl/Test-Command
+ )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch )
+
+pkg_setup() {
+ use_feh() { usex $1 1 0; }
+
+ fehopts=(
+ DESTDIR="${D}"
+ PREFIX="${EPREFIX}"/usr
+ doc_dir='${main_dir}'/share/doc/${PF}
+ example_dir='${main_dir}'/share/doc/${PF}/examples
+ curl=$(use_feh curl)
+ debug=$(use_feh debug)
+ xinerama=$(use_feh xinerama)
+ exif=$(use_feh exif)
+ )
+}
+
+src_compile() {
+ tc-export CC
+ emake "${fehopts[@]}"
+}
+
+src_install() {
+ emake "${fehopts[@]}" install
+}
diff --git a/media-libs/exempi/exempi-2.4.2.ebuild b/media-libs/exempi/exempi-2.4.2.ebuild
index 5e323615c1c0..aadfb65dbcf8 100644
--- a/media-libs/exempi/exempi-2.4.2.ebuild
+++ b/media-libs/exempi/exempi-2.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
LICENSE="BSD"
SLOT="2/3"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
IUSE="examples static-libs test"
RDEPEND="
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 8092acce8408..55f0b976d115 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,2 +1,2 @@
-DIST Image-ExifTool-10.55.tar.gz 4257555 SHA256 029b81a43f423332c00b76b5402fd8f85dee975fad41a734b494faeda4e41f7d SHA512 7c11ae53cf43a621d1144860cc6d5c2f2c0f3bb7b5b4a6ecfd090112df7b829c152c4b91bbf24b4ce03d33300748fa19cae842d8a108f7e3d52572f0ab2b0c39 WHIRLPOOL ed404d5a602af1d3a439f5fa6a812132b04a76236f1dc0200ff4d49ddfa68c322fc4fbe8b3a0241406b1e3efa2e9bb0afc33aadf2a3167c403b249cbfc0f69bc
DIST Image-ExifTool-10.59.tar.gz 4263896 SHA256 c2a7906edc2c62171bfd1afcf5123f7e720fd33867eee3e40b5251c1304952f3 SHA512 b68abe8b76694e9e26e188e61e1d0f94f4e694a3239718fc31d183b6734314692418b7842056be6bf020c2c8e7ecc3a69eb0cf12b6af7da1562caccc9ad892fd WHIRLPOOL c3c97eacbb3d54f81c8ad25c68edf5ca4b0985009f41dee261de71d35e957132575849f88d2bea09c5b2f1cdc63ed0e3e07892fb3bd7d27724792fe5bf8ff838
+DIST Image-ExifTool-10.60.tar.gz 4265747 SHA256 df0988f60e1a6c086799e1f2ecd419e8abbad4dfb5dfa66c6080c78a5cb7acfa SHA512 c3c113fd5771faca61663a6ed217a4d373271c3ec909e0fc871ad8320a8d4c9ef87d6a43cfcf6b3a9219ddcbdafad3bf78bb697440d96c425ff605b1809ee9c4 WHIRLPOOL e61040b317cd16fac878bf6c56a0db2fc8aa7fb70f2f84162475e1747aeefa3ce690ab9f11c4261a86f088db257edfa6efdc2b6b6f09caf5c518104f75d07169
diff --git a/media-libs/exiftool/exiftool-10.59.ebuild b/media-libs/exiftool/exiftool-10.59.ebuild
index 88f3bab6f236..eca5784e9860 100644
--- a/media-libs/exiftool/exiftool-10.59.ebuild
+++ b/media-libs/exiftool/exiftool-10.59.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
IUSE="doc"
SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-10.55.ebuild b/media-libs/exiftool/exiftool-10.60.ebuild
similarity index 91%
rename from media-libs/exiftool/exiftool-10.55.ebuild
rename to media-libs/exiftool/exiftool-10.60.ebuild
index eca5784e9860..88f3bab6f236 100644
--- a/media-libs/exiftool/exiftool-10.55.ebuild
+++ b/media-libs/exiftool/exiftool-10.60.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
IUSE="doc"
SRC_TEST="do"
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild
index a19a9672ee00..8ab1d92eced5 100644
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild
+++ b/media-libs/gupnp-dlna/gupnp-dlna-0.10.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=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
LICENSE="LGPL-2"
SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="+introspection"
RDEPEND="
diff --git a/media-libs/libcue/libcue-1.4.0.ebuild b/media-libs/libcue/libcue-1.4.0.ebuild
index 40988a79c693..0c80188e0d62 100644
--- a/media-libs/libcue/libcue-1.4.0.ebuild
+++ b/media-libs/libcue/libcue-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86"
IUSE="static-libs"
RDEPEND=""
diff --git a/media-libs/libiec61883/metadata.xml b/media-libs/libiec61883/metadata.xml
index 79b6e93beae4..d179585f3e60 100644
--- a/media-libs/libiec61883/metadata.xml
+++ b/media-libs/libiec61883/metadata.xml
@@ -5,12 +5,6 @@
media-video@gentoo.org
Gentoo Video project
-
- calchan@gentoo.org
- Denis Dupeyron
- Main maintainer for this is the herd, please CC on
- bugs.
-
This library provides third generation media reception and transmission for DV,
MPEG2-TS, and AMDTP (audio and music) using only raw1394 and not the complicated
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
index 222a5404ed5c..5169a9e48f51 100644
--- a/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
+++ b/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
IUSE="doc examples nls python"
RDEPEND="python? ( ${PYTHON_DEPS} )
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 05e48e8e1d33..7ff37b4694d5 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -7,3 +7,5 @@ DIST libpng-1.6.29-apng.patch.gz 10313 SHA256 6120948990a86f8118d67471ff04e35ca1
DIST libpng-1.6.29.tar.xz 987652 SHA256 4245b684e8fe829ebb76186327bb37ce5a639938b219882b53d64bd3cfc5f239 SHA512 070393423ec11f19e3264a0200959ae09238aa005615571586987253028b4ffb7e6b7c734a132f65180252b0259f79add03896d79fdc7dcfd8773b82c82a5ffc WHIRLPOOL c4f8a3ff526146c49cf773b5819b313e454cf86b22d732b0d17d7f29b11d092e7b3b04a1f7b07580d9f3f9e765bcef497a68612fe30a3e36b112bdc64dfa6c6d
DIST libpng-1.6.30-apng.patch.gz 10296 SHA256 92908f7f15ce39a18442a9d8a0f586ab8f058f52af893e1c7ed64c960f534aec SHA512 81d194a698e3f2cee0eda380f32037bbe74465966ec3432708b828e6df23109b53d9172556690a1e35f655ad10895b5b72d46d233d38273b9b8efad259c487ad WHIRLPOOL c305bb1cdcb0285ef999f40c0cad773e061a05ff35d2fd24e9269c899f2f2669938f45e0652c857392fd8f93eeed1e4c37aadaabff0bcf85f83d50ea4986e8dc
DIST libpng-1.6.30.tar.xz 988608 SHA256 267c332ffff70cc599d3929207869f698798f1df143aa5f9597b007c14353666 SHA512 8c58f0f8523d7c7e8e641134c9a0e7fb6b60cddd6b4689afaafde0c99cff74652c6fb800a45149910aa2d8f06695ba4774f6a4d64810f2419a714d4188d72f82 WHIRLPOOL 6be937da391c91858ce5ab980b0d5c6d1b1634e191211ecec65e62fb2a00def30050095e5903d24f36c74d8ae71dd9ed188807d5e2161bbe50362394bf16bd32
+DIST libpng-1.6.31-apng.patch.gz 10308 SHA256 a10645f0af2aa23e0f437b2b7ce784c1398ba9e05555a1b61fee510bab22c227 SHA512 58d9893adf5b5e225c06fa9bb9f8d2e1deb8f9de7eeeeb79f63ac96bb70441b375f33524c0decc693cbb4c7753ea6ad10a0c2c2fa5fef6b3d524765df479fab2 WHIRLPOOL 3149eff21d8f280cb7d3b74e3e310ba3fb2c5a3216c72bbec3a5edfde1ecf3e22687e04b8c0b1f6c8df40ff93ee431dec957d32156b00480da076f83bf0d0cce
+DIST libpng-1.6.31.tar.xz 991824 SHA256 232a602de04916b2b5ce6f901829caf419519e6a16cc9cd7c1c91187d3ee8b41 SHA512 714da63e19d32eadeeb44edf7f2afeaf6ac59f2756e0951015313a98c0f3c1216296886301c5704958b56f4c96b00725791ba2efe9f26b4a92cd743410cc36a9 WHIRLPOOL d49556f8e8780ac6e6691937417e4a67f0e56f12873c3fe21988597e4ef7f69c17ae72a25baf59d4c817b9cd1c504cc3ab0d5554a92f5b8a1c11e03a2c8adedb
diff --git a/media-libs/libpng/libpng-1.6.31.ebuild b/media-libs/libpng/libpng-1.6.31.ebuild
new file mode 100644
index 000000000000..055b9b2c16ad
--- /dev/null
+++ b/media-libs/libpng/libpng-1.6.31.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit libtool ltprune multilib-minimal
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+ apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
+
+LICENSE="libpng"
+SLOT="0/16"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="apng cpu_flags_x86_sse neon static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils"
+
+src_prepare() {
+ default
+ if use apng; then
+ eapply -p0 "${WORKDIR}"/${PN}-*-apng.patch
+ # Don't execute symbols check with apng patch wrt #378111
+ sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
+ fi
+ elibtoolize
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable cpu_flags_x86_sse intel-sse)
+ $(use_enable static-libs static)
+ --enable-arm-neon=$(usex neon)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
+ einstalldocs
+ prune_libtool_files --all
+}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild
index 51d6460a724f..afedb31c4500 100644
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild
+++ b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/quvi/${P}.tar.xz"
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
IUSE="offensive"
RDEPEND=">=dev-lua/LuaBitOp-1.0.1-r1[${MULTILIB_USEDEP}]
diff --git a/media-libs/libquvi/libquvi-0.9.4-r1.ebuild b/media-libs/libquvi/libquvi-0.9.4-r1.ebuild
index 572fe843f5e9..65071c5c9132 100644
--- a/media-libs/libquvi/libquvi-0.9.4-r1.ebuild
+++ b/media-libs/libquvi/libquvi-0.9.4-r1.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
LICENSE="AGPL-3"
SLOT="0/8" # subslot = libquvi soname version
-KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
IUSE="examples nls static-libs"
RDEPEND="! "${T}"/62${PN} <<-_EOF_ || die
+ OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
+ CSSTRNGS="${EPREFIX}/usr/share/locale"
+ _EOF_
+ if use stk ; then
+ echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
+ fi
+ doenvd "${T}"/62${PN}
+
+ if use examples ; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ use samples && dodoc -r samples
+
+ if use vim-syntax ; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins installer/misc/vim/csound_{csd,orc,sco}.vim
+ insinto /usr/share/vim/vimfiles/plugin
+ doins installer/misc/vim/csound.vim
+ fi
+
+ # rename extract to csound_extract (bug #247394)
+ mv "${ED%/}"/usr/bin/{,csound_}extract || die
+
+ use python && python_optimize
+
+ # install docs
+ if [[ ${PV} != "9999" ]] && use doc ; then
+ dodoc "${WORKDIR}"/*.pdf
+ dodoc -r "${WORKDIR}"/html
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog
+ elog "The extract tool is now installed as csound_extract"
+ elog "due to collisions with many other packages (bug #247394)."
+ elog
+ fi
+}
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index 93c01700dd08..73a1cd391971 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -2,31 +2,35 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-
PYTHON_COMPAT=( python2_7 )
-inherit eutils java-pkg-opt-2 toolchain-funcs versionator python-single-r1 cmake-utils
+inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/csound/csound.git"
inherit git-r3
else
- SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ DOC_P="Csound${PV}"
+ SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz
+ doc? (
+ https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+ https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+ )"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="A sound design and signal processing system for composition and performance"
HOMEPAGE="http://csound.github.io/"
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
SLOT="0"
-IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
+IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples
fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
portaudio portmidi pulseaudio python samples score static-libs stk tcl test
+threads +utils vim-syntax websocket"
-LANGS=" de en_US es_CO fr it ro ru"
-IUSE+="${LANGS// / linguas_}"
+IUSE_LANGS=" de en_US es es_CO fr it ro ru"
+IUSE+="${IUSE_LANGS// / linguas_}"
REQUIRED_USE="
csoundac? ( || ( lua python ) )
@@ -86,6 +90,15 @@ DEPEND="${RDEPEND}
)
"
+if [[ ${PV} != "9999" ]]; then
+ DEPEND+="
+ doc? (
+ app-arch/unzip
+ !app-doc/csound-manual
+ )
+ "
+fi
+
# requires specific alsa settings
RESTRICT="test"
@@ -109,7 +122,7 @@ src_prepare() {
-i CMakeLists.txt || die
local lang
- for lang in ${LANGS} ; do
+ for lang in ${IUSE_LANGS} ; do
if ! use linguas_${lang} ; then
sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
fi
@@ -175,7 +188,7 @@ src_install() {
cmake-utils_src_install
dodoc -r Release_Notes/.
- # Generate env.d file
+ # generate env.d file
cat > "${T}"/62${PN} <<-_EOF_ || die
OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
CSSTRNGS="${EPREFIX}/usr/share/locale"
@@ -203,6 +216,12 @@ src_install() {
mv "${ED%/}"/usr/bin/{,csound_}extract || die
use python && python_optimize
+
+ # install docs
+ if [[ ${PV} != "9999" ]] && use doc ; then
+ dodoc "${WORKDIR}"/*.pdf
+ dodoc -r "${WORKDIR}"/html
+ fi
}
pkg_postinst() {
diff --git a/media-sound/csound/files/csound-6.09.1-python.patch b/media-sound/csound/files/csound-6.09.1-python.patch
new file mode 100644
index 000000000000..47461e48aaf4
--- /dev/null
+++ b/media-sound/csound/files/csound-6.09.1-python.patch
@@ -0,0 +1,23 @@
+Respect externally set PYTHON_MODULE_INSTALL_DIR.
+
+--- csound-6.09.1/CMakeLists.txt
++++ csound-6.09.1/CMakeLists.txt
+@@ -218,11 +218,13 @@
+ set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
+ endif()
+
+-execute_process (
+- COMMAND python -c
+- "import site, sys; sys.stdout.write(site.getusersitepackages())"
+- OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
+- )
++if(NOT DEFINED PYTHON_MODULE_INSTALL_DIR)
++ execute_process (
++ COMMAND python -c
++ "import site, sys; sys.stdout.write(site.getusersitepackages())"
++ OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
++ )
++endif()
+
+ set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
+ set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 0822417874d7..48f81deda1c7 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -2,3 +2,4 @@ DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875c
DIST lilypond-2.19.54.tar.gz 17068093 SHA256 0ee709f1e58caf13cf5abea9bb74179ba5c7a4f2dc470ec48d9aefb553e68a58 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b WHIRLPOOL 7ce1cc7e89c5907515f8505a1e1efe1aadf8df48c24d70a2fe39924cf9301b6c676121e6c6ceac75b76a085e5d940c6c3bb6c31e87d314dda72c68f0af1307c8
DIST lilypond-2.19.61.tar.gz 17154903 SHA256 fc42103824cbd9e5d230ded0f73c8ecffae14998b2ad2e136914f7eab1eecb0a SHA512 870d747f6d29644824e965f4a0ff37555afbf8d8013f01965f64d4b95ca6487d15468aee27fa44036ed2d35b00f8e9bc69c22a670ad97f04ae39a16d57ea83b9 WHIRLPOOL bc690e42b2b52a5b39dea956f83558e3adb72f8027a1acb2441cd104fd5d85f2860f2a9f0c76ec882a9404ed6cbfcecd3ee4aa60d3148e79405ca9487e4de26f
DIST lilypond-2.19.63.tar.gz 17172960 SHA256 803f3bbf87d68fbde4ea364fc62394e5907e73cecd6188bb8f12fa4f433d9b43 SHA512 58f8922e2965bb37a08472f49d88e650d2c530a29e4672b858c0d8d91dbd8a94db78668c37424ab59084cc03c7cd07e931b138374d351ecd580f23986035f106 WHIRLPOOL 926916f23237c6ea10aaae4081b00c04aa10706cf81be51d99afba2e1eb8c8638039def026a16b6cca2e0d57120e737f0f2d4809c1e12118e78a987467162749
+DIST lilypond-2.19.64.tar.gz 17174255 SHA256 9b660fe99914c54cf30b391976d6e30f7dc7683928b3bf9b3454250c86990137 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9 WHIRLPOOL b13d8d9fc72392653d090175ec4cba7858ed7015607e4c249454a42a4d3027f5c1799f527aab86b57eac38b36510ce5b08b7b79f3f536386c14b7f3f285ed15c
diff --git a/media-sound/lilypond/lilypond-2.19.64.ebuild b/media-sound/lilypond/lilypond-2.19.64.ebuild
new file mode 100644
index 000000000000..5dd683dc4186
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.19.64.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+[[ "${PV}" = "9999" ]] && inherit git-r3
+inherit elisp-common autotools python-single-r1 xdg-utils
+
+if [[ "${PV}" = "9999" ]]; then
+ EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+else
+ SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+fi
+
+DESCRIPTION="GNU Music Typesetter"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+ >=dev-scheme/guile-1.8.2:12[deprecated,regex]
+ media-fonts/tex-gyre
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=x11-libs/pango-1.12.3
+ emacs? ( virtual/emacs )
+ guile2? ( >=dev-scheme/guile-2:12 )
+ !guile2? (
+ >=dev-scheme/guile-1.8.2:12[deprecated,regex]
+ =metapost-1.803 is selected if it's installed, bug 498704
+ if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+ if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+ einfo "Updating metapost symlink"
+ eselect mpost update || die
+ fi
+ fi
+
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ if ! use vim-syntax ; then
+ sed -i 's/vim//' GNUmakefile.in || die
+ fi
+
+ # respect CFLAGS
+ sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+ for lang in ${LANGS}; do
+ use linguas_${lang} || rm po/${lang}.po || die
+ done
+
+ # respect AR
+ sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+
+ # remove bundled texinfo file (fixes bug #448560)
+ rm tex/texinfo.tex || die
+
+ eautoreconf
+
+ xdg_environment_reset #586592
+}
+
+src_configure() {
+ # documentation generation currently not supported since it requires a newer
+ # version of texi2html than is currently in the tree
+
+ local myeconfargs=(
+ --with-texgyre-dir=/usr/share/fonts/tex-gyre
+ --disable-documentation
+ --disable-optimising
+ --disable-pipe
+ $(use_enable debug debugging)
+ $(use_enable guile2)
+ $(use_enable profile profiling)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use emacs ; then
+ elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+ || die "elisp-compile failed"
+ fi
+}
+
+src_install () {
+ emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+ # remove elisp files since they are in the wrong directory
+ rm -r "${ED}"/usr/share/emacs || die
+
+ if use emacs ; then
+ elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+ || die "elisp-install failed"
+ elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+ fi
+
+ python_fix_shebang "${ED}"
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/media-sound/mikmod/mikmod-3.2.8.ebuild b/media-sound/mikmod/mikmod-3.2.8.ebuild
index a671f9c97b5a..3bac2834ab08 100644
--- a/media-sound/mikmod/mikmod-3.2.8.ebuild
+++ b/media-sound/mikmod/mikmod-3.2.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
IUSE=""
RDEPEND=">=media-libs/libmikmod-3.3
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch
new file mode 100644
index 000000000000..79859df0274f
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch
@@ -0,0 +1,92 @@
+Patches taken as references:
+https://github.com/mark4o/opus-tools/commit/8c412e619b83eb6dd32191909cf6672e93e5802e
+https://trac.xiph.org/attachment/ticket/2212/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch
+To fix bug report:
+http://www.openwall.com/lists/oss-security/2015/08/29/1
+ https://bugs.gentoo.org/show_bug.cgi?id=559170
+https://bugs.gentoo.org/show_bug.cgi?id=537422
+--- oggenc/audio.h
++++ oggenc/audio.h
+@@ -25,7 +25,7 @@
+
+ typedef struct {
+ short format;
+- short channels;
++ unsigned short channels;
+ int samplerate;
+ int bytespersec;
+ short align;
+@@ -44,7 +44,7 @@
+ } wavfile;
+
+ typedef struct {
+- short channels;
++ unsigned short channels;
+ int totalframes;
+ short samplesize;
+ int rate;
+--- oggenc/audio.c
++++ oggenc/audio.c
+@@ -245,8 +245,8 @@
+ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
+ {
+ int aifc; /* AIFC or AIFF? */
+- unsigned int len;
+- unsigned char *buffer;
++ unsigned int len,readlen;
++ unsigned char buffer[22];
+ unsigned char buf2[8];
+ aiff_fmt format;
+ aifffile *aiff = malloc(sizeof(aifffile));
+@@ -269,9 +269,9 @@
+ return 0; /* Weird common chunk */
+ }
+
+- buffer = alloca(len);
+-
+- if(fread(buffer,1,len,in) < len)
++ readlen = len < sizeof(buffer) ? len : sizeof(buffer);
++ if(fread(buffer,1,readlen,in) < readlen ||
++ (len > readlen && !seek_forward(in, len-readlen)))
+ {
+ fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
+ return 0;
+@@ -277,11 +277,18 @@
+ return 0;
+ }
+
+- format.channels = READ_U16_BE(buffer);
++ format.channels = (short)READ_U16_BE(buffer);
+ format.totalframes = READ_U32_BE(buffer+2);
+ format.samplesize = READ_U16_BE(buffer+6);
+ format.rate = (int)read_IEEE80(buffer+8);
+
++ if(format.channels <=0)
++ {
++ fprintf(stderr, _("ERROR: Invalid channel count in AIFF header\n"));
++ return 0;
++
++ }
++
+ aiff->bigendian = 1;
+
+ if(aifc)
+@@ -449,11 +449,17 @@
+ }
+
+ format.format = READ_U16_LE(buf);
+- format.channels = READ_U16_LE(buf+2);
++ format.channels = (short)READ_U16_LE(buf+2);
+ format.samplerate = READ_U32_LE(buf+4);
+ format.bytespersec = READ_U32_LE(buf+8);
+ format.align = READ_U16_LE(buf+12);
+ format.samplesize = READ_U16_LE(buf+14);
++
++ if(format.channels == 0)
++ {
++ fprintf(stderr, _("ERROR: Zero channels in WAV header\n"));
++ return 0;
++ }
+
+ if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */
+ {
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch
new file mode 100644
index 000000000000..51c23b062aff
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch
@@ -0,0 +1,24 @@
+Patch taken from:
+https://trac.xiph.org/changeset/19117
+To fix bug report:
+https://bugs.gentoo.org/show_bug.cgi?id=537422
+--- vorbis-tools-1.4.0/oggenc/oggenc.c
++++ vorbis-tools-1.4.0/oggenc/oggenc.c
+@@ -97,6 +97,8 @@
+ .3,-1,
+ 0,0,0.f,
+ 0, 0, 0, 0, 0};
++ input_format raw_format = {NULL, 0, raw_open, wav_close, "raw",
++ N_("RAW file reader")};
+
+ int i;
+
+@@ -239,8 +241,6 @@
+
+ if(opt.rawmode)
+ {
+- input_format raw_format = {NULL, 0, raw_open, wav_close, "raw",
+- N_("RAW file reader")};
+
+ enc_opts.rate=opt.raw_samplerate;
+ enc_opts.channels=opt.raw_channels;
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild
new file mode 100644
index 000000000000..7f85f35db517
--- /dev/null
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="tools for using the Ogg Vorbis sound file format"
+HOMEPAGE="http://www.vorbis.com"
+SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac kate nls +ogg123 speex"
+
+RDEPEND=">=media-libs/libvorbis-1.3.0
+ flac? ( media-libs/flac )
+ kate? ( media-libs/libkate )
+ ogg123? (
+ >=media-libs/libao-1.0.0
+ net-misc/curl
+ )
+ speex? ( media-libs/speex )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig"
+
+DOCS="AUTHORS CHANGES README"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-underlinking.patch
+ epatch "${FILESDIR}"/${P}-format-security.patch
+ epatch "${FILESDIR}"/${P}-CVE-2014-9640.patch
+ epatch "${FILESDIR}"/${P}-CVE-2014-9638.patch
+ sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #515220
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ $(use_enable ogg123) \
+ $(use_with flac) \
+ $(use_with speex) \
+ $(use_with kate)
+}
diff --git a/media-video/gpac/gpac-0.7.1.ebuild b/media-video/gpac/gpac-0.7.1.ebuild
index a17425b4c9f1..2e7046a175c5 100644
--- a/media-video/gpac/gpac-0.7.1.ebuild
+++ b/media-video/gpac/gpac-0.7.1.ebuild
@@ -17,7 +17,8 @@ DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratc
HOMEPAGE="https://gpac.wp.imt.fr/"
LICENSE="GPL-2"
-SLOT="0"
+# subslot == libgpac major
+SLOT="0/7"
IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
diff --git a/media-video/kino/metadata.xml b/media-video/kino/metadata.xml
index 3de8ecd02785..b66baaf03b71 100644
--- a/media-video/kino/metadata.xml
+++ b/media-video/kino/metadata.xml
@@ -1,10 +1,6 @@
-
- calchan@gentoo.org
- Denis Dupeyron
-
media-video@gentoo.org
Gentoo Video project
diff --git a/media-video/nvidia-video-codec/Manifest b/media-video/nvidia-video-codec/Manifest
index 5e15949be313..d42c14a8d93e 100644
--- a/media-video/nvidia-video-codec/Manifest
+++ b/media-video/nvidia-video-codec/Manifest
@@ -1,2 +1,3 @@
DIST nvidia-video-codec-7.0.1.tar.gz 44283 SHA256 c2e4c3404750ccdc9fedd050398e636f6016457adcc1280db8cc64f22cc8a9b9 SHA512 246e7fee4430f755ca93f1343d2628c5a6de8fdb5826694eabb777ec693f5fa944147a582a96fce38f318d1a9e60e94ca94ef4e27313e3b38970b750fa17d3b4 WHIRLPOOL cde180735508f2f61504ff9ec02a852e56e9888320b4846ea6de7fd2b3c23accc42734faa52a6dd65bbddd40d03d8bab0c6c0898078cdcafaa0dae44ef28f1e8
DIST nvidia-video-codec-7.1.9.tar.gz 44547 SHA256 91e5af19839b49a72bbb005ea5d2b08637419ff3aca1fc91565be21181055c02 SHA512 8890c668b1ee73de9c6447c0d2ae9ab857927694c7de038d6028ac5a5205c95c0c3629ad8a3950269c7693cd877cf9c9e24f5c4d332a46d27ac79747f2383685 WHIRLPOOL 9f5a31fd86ec6c40989227d01e83bab50b9ad8fce30f41442a75a98a8fca0d52f69fdb4f46837452526207792336148772b599d1b2b15badb6e0692a8ba73e85
+DIST nvidia-video-codec-8.0.14.tar.gz 47388 SHA256 4973e3205a2f4b6b7313521f6df6006f35c21bfc2a085b879b364b2760f5545d SHA512 08f8ff6b9c4a595716d423262f96e4647df1e2fa3d57a98ac2c26da031a15d61600aeb84c97c7d05fdfd42cfcf5800be58aff49ae1379f02c0b4408ddda2269c WHIRLPOOL 2ffa8273019cd4575578610898c9f1efead1f359ee9c233cc7acde50085d148a925605ce6c6a0030656b73a26b410c4ee6ee866a49eb90eef9a96396801d5fa9
diff --git a/media-video/nvidia-video-codec/nvidia-video-codec-8.0.14.ebuild b/media-video/nvidia-video-codec/nvidia-video-codec-8.0.14.ebuild
new file mode 100644
index 000000000000..e1e943fe0b47
--- /dev/null
+++ b/media-video/nvidia-video-codec/nvidia-video-codec-8.0.14.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Redistributable headers to build cuvid and nvenc"
+HOMEPAGE="https://github.com/lu-zero/nvidia-video-codec"
+SRC_URI="https://github.com/lu-zero/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-util/nvidia-cuda-toolkit-7.5
+ >=x11-drivers/nvidia-drivers-367.35"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ insinto /opt/${PN}/include
+ doins *.h
+ dodoc README.md
+}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
index 292bca0ee5b6..96667a601b46 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="ffmpegsource? ( ffmpeg )"
RDEPEND="ffmpeg? ( virtual/ffmpeg )
~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.5.2 )"
+ mp4? ( >=media-video/gpac-0.5.2:= )"
ASM_DEP=">=dev-lang/nasm-2.13"
DEPEND="${RDEPEND}
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 292bca0ee5b6..96667a601b46 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="ffmpegsource? ( ffmpeg )"
RDEPEND="ffmpeg? ( virtual/ffmpeg )
~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.5.2 )"
+ mp4? ( >=media-video/gpac-0.5.2:= )"
ASM_DEP=">=dev-lang/nasm-2.13"
DEPEND="${RDEPEND}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 530bea5839e0..c744bcb46aaf 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Jul 2017 07:09:15 +0000
+Sat, 29 Jul 2017 20:09:21 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 530bea5839e0..c744bcb46aaf 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Jul 2017 07:09:15 +0000
+Sat, 29 Jul 2017 20:09:21 +0000
diff --git a/metadata/md5-cache/app-admin/logstalgia-1.0.3-r1 b/metadata/md5-cache/app-admin/logstalgia-1.0.3-r1
deleted file mode 100644
index 1be8fdf12297..000000000000
--- a/metadata/md5-cache/app-admin/logstalgia-1.0.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Replays or streams an access_log as a retro arcade game-like simulation
-EAPI=5
-HOMEPAGE=http://logstalgia.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libpcre media-libs/libsdl[opengl] media-libs/libpng:0= media-libs/sdl-image media-libs/ftgl virtual/jpeg virtual/glu virtual/opengl
-SLOT=0
-SRC_URI=https://logstalgia.googlecode.com/files/logstalgia-1.0.3.tar.gz
-_md5_=533241b0df33aae9310cf36bd0be8e0f
diff --git a/metadata/md5-cache/app-admin/logstalgia-1.0.6 b/metadata/md5-cache/app-admin/logstalgia-1.0.6
deleted file mode 100644
index 03b759d848ae..000000000000
--- a/metadata/md5-cache/app-admin/logstalgia-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/boost media-libs/glm virtual/pkgconfig
-DESCRIPTION=Replays or streams an access_log as a retro arcade game-like simulation
-EAPI=5
-HOMEPAGE=http://logstalgia.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libpcre media-libs/freetype:2 media-libs/glew:0= media-libs/libsdl2[opengl,threads] media-libs/libpng:0= media-libs/sdl2-image[jpeg,png] virtual/glu virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/acaudwell/Logstalgia/releases/download/logstalgia-1.0.6/logstalgia-1.0.6.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=13b03e6b0e74ee24217894179c6c08be
diff --git a/metadata/md5-cache/app-admin/logstalgia-1.0.7 b/metadata/md5-cache/app-admin/logstalgia-1.0.7
new file mode 100644
index 000000000000..e4cce22aa792
--- /dev/null
+++ b/metadata/md5-cache/app-admin/logstalgia-1.0.7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=dev-libs/libpcre media-libs/freetype:2 media-libs/glew:0= media-libs/libsdl2[opengl,threads] media-libs/libpng:0= media-libs/sdl2-image[jpeg,png] virtual/glu virtual/opengl dev-libs/boost media-libs/glm virtual/pkgconfig
+DESCRIPTION=Replays or streams an access_log as a retro arcade game-like simulation
+EAPI=6
+HOMEPAGE=http://logstalgia.io/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libpcre media-libs/freetype:2 media-libs/glew:0= media-libs/libsdl2[opengl,threads] media-libs/libpng:0= media-libs/sdl2-image[jpeg,png] virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/acaudwell/Logstalgia/releases/download/logstalgia-1.0.7/logstalgia-1.0.7.tar.gz
+_md5_=ef26d854dce57a2262c938efdd114d19
diff --git a/metadata/md5-cache/app-admin/mcollective-2.10.1 b/metadata/md5-cache/app-admin/mcollective-2.10.1
deleted file mode 100644
index 4eb2fc02ae1d..000000000000
--- a/metadata/md5-cache/app-admin/mcollective-2.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Framework to build server orchestration or parallel job execution systems
-EAPI=5
-HOMEPAGE=http://marionette-collective.org/
-IUSE=doc +client elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-ruby/stomp ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.10.1.tar.gz -> mcollective-2.10.1.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b39929c9f653e12c3956aa1cf050b2a2
diff --git a/metadata/md5-cache/app-admin/mcollective-2.10.3 b/metadata/md5-cache/app-admin/mcollective-2.10.3
deleted file mode 100644
index 108bf8c9e50c..000000000000
--- a/metadata/md5-cache/app-admin/mcollective-2.10.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Framework to build server orchestration or parallel job execution systems
-EAPI=5
-HOMEPAGE=http://marionette-collective.org/
-IUSE=doc +client elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-ruby/stomp ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.10.3.tar.gz -> mcollective-2.10.3.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b39929c9f653e12c3956aa1cf050b2a2
diff --git a/metadata/md5-cache/app-admin/mcollective-2.10.5 b/metadata/md5-cache/app-admin/mcollective-2.10.5
index 454ad33e5f12..245409048cd7 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.10.5
+++ b/metadata/md5-cache/app-admin/mcollective-2.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=Framework to build server orchestration or parallel job execution sy
EAPI=5
HOMEPAGE=http://marionette-collective.org/
IUSE=doc +client elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=dev-ruby/stomp ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
SLOT=0
SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.10.5.tar.gz -> mcollective-2.10.5.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8e941b47d0d8f25219ebf3fc9475d26d
+_md5_=b39929c9f653e12c3956aa1cf050b2a2
diff --git a/metadata/md5-cache/app-admin/mcollective-2.11.0 b/metadata/md5-cache/app-admin/mcollective-2.11.0
deleted file mode 100644
index a139894a8cfc..000000000000
--- a/metadata/md5-cache/app-admin/mcollective-2.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Framework to build server orchestration or parallel job execution systems
-EAPI=5
-HOMEPAGE=http://marionette-collective.org/
-IUSE=doc +client elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-ruby/stomp ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.11.0.tar.gz -> mcollective-2.11.0.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0b5ce1cf023fc9cbd82cd350e99cca1f
diff --git a/metadata/md5-cache/app-admin/mcollective-2.11.1 b/metadata/md5-cache/app-admin/mcollective-2.11.1
index 30491001d75b..77346111ef87 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.11.1
+++ b/metadata/md5-cache/app-admin/mcollective-2.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Framework to build server orchestration or parallel job execution sy
EAPI=5
HOMEPAGE=http://marionette-collective.org/
IUSE=doc +client elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=dev-ruby/stomp ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
SLOT=0
SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.11.1.tar.gz -> mcollective-2.11.1.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8cf326a9bc06da25fac7c341880322bb
+_md5_=ef00ed8e299064f8e1950e45306af890
diff --git a/metadata/md5-cache/app-admin/mcollective-2.9.1 b/metadata/md5-cache/app-admin/mcollective-2.9.1
deleted file mode 100644
index ba0a38b213ba..000000000000
--- a/metadata/md5-cache/app-admin/mcollective-2.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Framework to build server orchestration or parallel job execution systems
-EAPI=5
-HOMEPAGE=http://marionette-collective.org/
-IUSE=doc +client elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-ruby/stomp ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.9.1.tar.gz -> mcollective-2.9.1.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3118ddc2d54a7d3b52c4987567bcc0d7
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.5 b/metadata/md5-cache/app-admin/puppet-4.10.5
new file mode 100644
index 000000000000..e885e29e9dd5
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-4.10.5
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=A system automation and configuration management software.
+EAPI=6
+HOMEPAGE=http://puppetlabs.com/
+IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
+RDEPEND=ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.5.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0 xemacs-elisp-common 5ad47e1940fe7ffbdeeb002a3912bf79
+_md5_=7883359baba0c9ea429e27e37d066baf
diff --git a/metadata/md5-cache/app-admin/puppet-5.0.1 b/metadata/md5-cache/app-admin/puppet-5.0.1
new file mode 100644
index 000000000000..c527eb4fd08b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-5.0.1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/hocon[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/mocha[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=A system automation and configuration management software.
+EAPI=5
+HOMEPAGE=http://puppetlabs.com/
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
+RDEPEND=ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/hocon[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/hocon[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.0.1.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f22e7039c9a3e1eab546210dfa716e05
diff --git a/metadata/md5-cache/app-admin/puppet-agent-1.10.5 b/metadata/md5-cache/app-admin/puppet-agent-1.10.5
new file mode 100644
index 000000000000..3e2abfe4ebff
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-agent-1.10.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup unpack
+DEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what virtual/pkgconfig
+DESCRIPTION=general puppet client utils along with mcollective hiera and facter
+EAPI=5
+HOMEPAGE=https://puppetlabs.com/
+IUSE=experimental puppetdb selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what app-portage/eix sys-apps/dmidecode sys-libs/glibc >=sys-libs/readline-6.0 =dev-ruby/puppetdb-termini-3.1.0 )
+RESTRICT=strip
+SLOT=0
+SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/xenial/PC1/p/puppet-agent/puppet-agent_1.10.5-1xenial_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/xenial/PC1/p/puppet-agent/puppet-agent_1.10.5-1xenial_i386.deb )
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 user e4b567c44272a719fabf53f0f885d3f7
+_md5_=b1905a5f2e68bcb2e481aa722c357268
diff --git a/metadata/md5-cache/app-admin/puppet-agent-5.0.1 b/metadata/md5-cache/app-admin/puppet-agent-5.0.1
new file mode 100644
index 000000000000..199379c840a0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-agent-5.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup unpack
+DEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what virtual/pkgconfig
+DESCRIPTION=general puppet client utils along with mcollective hiera and facter
+EAPI=5
+HOMEPAGE=https://puppetlabs.com/
+IUSE=puppetdb selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what app-portage/eix sys-apps/dmidecode sys-libs/glibc >=sys-libs/readline-6.0 =dev-ruby/puppetdb-termini-5.0.1 )
+RESTRICT=strip
+SLOT=0
+SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/xenial/puppet5/p/puppet-agent/puppet-agent_5.0.1-1xenial_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/xenial/puppet5/p/puppet-agent/puppet-agent_5.0.1-1xenial_i386.deb )
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 user e4b567c44272a719fabf53f0f885d3f7
+_md5_=b051e52503e9260b8ff277152acb5284
diff --git a/metadata/md5-cache/app-arch/mscompress-0.3-r1 b/metadata/md5-cache/app-arch/mscompress-0.3-r1
index c5a738be2213..77cbc33248f8 100644
--- a/metadata/md5-cache/app-arch/mscompress-0.3-r1
+++ b/metadata/md5-cache/app-arch/mscompress-0.3-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=Microsoft compress.exe/expand.exe compatible (de)compressor
EAPI=5
HOMEPAGE=http://gnuwin32.sourceforge.net/packages/mscompress.htm
-KEYWORDS=amd64 hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=ftp://ftp.penguin.cz/pub/users/mhi/mscompress/mscompress-0.3.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=f0c1ca776eb713f114e1262c0f545633
+_md5_=4f321701fd97420b6b2981c0169795da
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.13.1 b/metadata/md5-cache/app-backup/duplicity-0.7.13.1
new file mode 100644
index 000000000000..e28fb3cc722e
--- /dev/null
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.13.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Secure backup system using gnupg to encrypt data
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/duplicity/
+IUSE=s3 test python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] s3? ( dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.13.1/+download/duplicity-0.7.13.1.tar.gz
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=d784ea3468a378e4bb41f6cc8b9bd102
diff --git a/metadata/md5-cache/app-backup/spideroak-bin-6.1.3 b/metadata/md5-cache/app-backup/spideroak-bin-6.1.3
deleted file mode 100644
index ef06884e1ee0..000000000000
--- a/metadata/md5-cache/app-backup/spideroak-bin-6.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare unpack
-DEPEND=dev-util/patchelf
-DESCRIPTION=Secure free online backup, storage, and sharing system
-EAPI=5
-HOMEPAGE=https://spideroak.com
-IUSE=dbus X
-KEYWORDS=amd64 x86
-LICENSE=spideroak
-RDEPEND=app-crypt/mit-krb5[keyutils] dbus? ( sys-apps/dbus ) X? ( media-libs/fontconfig media-libs/freetype:2 dev-libs/glib:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXrender x11-libs/libXt )
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=x86? ( https://spideroak.com/getbuild?platform=ubuntu&arch=i386&version=6.1.3 -> spideroak-bin-6.1.3_x86.deb ) amd64? ( https://spideroak.com/getbuild?platform=ubuntu&arch=x86_64&version=6.1.3 -> spideroak-bin-6.1.3_amd64.deb )
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=21409c5418f8620e9caeee0000939ace
diff --git a/metadata/md5-cache/app-backup/spideroak-bin-6.1.5 b/metadata/md5-cache/app-backup/spideroak-bin-6.1.5
deleted file mode 100644
index 4a0b477aa58a..000000000000
--- a/metadata/md5-cache/app-backup/spideroak-bin-6.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare unpack
-DEPEND=dev-util/patchelf
-DESCRIPTION=Secure free online backup, storage, and sharing system
-EAPI=5
-HOMEPAGE=https://spideroak.com
-IUSE=dbus X
-KEYWORDS=~amd64 ~x86
-LICENSE=spideroak
-RDEPEND=app-crypt/mit-krb5[keyutils] dbus? ( sys-apps/dbus ) X? ( media-libs/fontconfig media-libs/freetype:2 dev-libs/glib:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXrender x11-libs/libXt )
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=x86? ( https://spideroak.com/getbuild?platform=ubuntu&arch=i386&version=6.1.5 -> spideroak-bin-6.1.5_x86.deb ) amd64? ( https://spideroak.com/getbuild?platform=ubuntu&arch=x86_64&version=6.1.5 -> spideroak-bin-6.1.5_amd64.deb )
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=bf9e9d7bcc8075b39ccf8e2477d83b9f
diff --git a/metadata/md5-cache/app-backup/spideroak-bin-6.3.0 b/metadata/md5-cache/app-backup/spideroak-bin-6.3.0-r1
similarity index 70%
rename from metadata/md5-cache/app-backup/spideroak-bin-6.3.0
rename to metadata/md5-cache/app-backup/spideroak-bin-6.3.0-r1
index b2597f2244c7..1e11c179f975 100644
--- a/metadata/md5-cache/app-backup/spideroak-bin-6.3.0
+++ b/metadata/md5-cache/app-backup/spideroak-bin-6.3.0-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=install postinst prepare unpack
DEPEND=dev-util/patchelf
DESCRIPTION=Secure free online backup, storage, and sharing system
-EAPI=5
+EAPI=6
HOMEPAGE=https://spideroak.com
IUSE=dbus X
KEYWORDS=amd64 x86
LICENSE=spideroak
-RDEPEND=app-crypt/mit-krb5[keyutils] dbus? ( sys-apps/dbus ) X? ( media-libs/fontconfig media-libs/freetype:2 dev-libs/glib:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXrender x11-libs/libXt )
+RDEPEND=app-crypt/mit-krb5[keyutils] media-libs/libpng:1.2 dbus? ( sys-apps/dbus ) X? ( media-libs/fontconfig media-libs/freetype:2 dev-libs/glib:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXrender x11-libs/libXt )
RESTRICT=mirror strip
SLOT=0
SRC_URI=x86? ( https://spideroak.com/release/spideroak/deb_x86 -> spideroak-bin-6.3.0_x86.deb ) amd64? ( https://spideroak.com/release/spideroak/deb_x64 -> spideroak-bin-6.3.0_amd64.deb )
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=813ae16355c6bde6ffc0439573001c7e
+_md5_=91461c4d25b9a2bc18c197f1180807e6
diff --git a/metadata/md5-cache/app-editors/focuswriter-1.6.3 b/metadata/md5-cache/app-editors/focuswriter-1.6.3
deleted file mode 100644
index 51d1fb873c47..000000000000
--- a/metadata/md5-cache/app-editors/focuswriter-1.6.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst
-DEPEND=app-text/hunspell:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtwidgets:5 sys-libs/zlib dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A fullscreen and distraction-free word processor
-EAPI=6
-HOMEPAGE=https://gottcode.org/focuswriter/
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3 GPL-3
-RDEPEND=app-text/hunspell:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtwidgets:5 sys-libs/zlib
-SLOT=0
-SRC_URI=https://gottcode.org/focuswriter/focuswriter-1.6.3-src.tar.bz2
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=07d9acc5b296cabcf77c827fe1033b21
diff --git a/metadata/md5-cache/app-editors/focuswriter-1.6.4 b/metadata/md5-cache/app-editors/focuswriter-1.6.4
deleted file mode 100644
index 867837723ffe..000000000000
--- a/metadata/md5-cache/app-editors/focuswriter-1.6.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst
-DEPEND=app-text/hunspell:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtwidgets:5 sys-libs/zlib dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A fullscreen and distraction-free word processor
-EAPI=6
-HOMEPAGE=https://gottcode.org/focuswriter/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3 GPL-3
-RDEPEND=app-text/hunspell:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtwidgets:5 sys-libs/zlib
-SLOT=0
-SRC_URI=https://gottcode.org/focuswriter/focuswriter-1.6.4-src.tar.bz2
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7f22137b0f0f12d540ca35419a3d6474
diff --git a/metadata/md5-cache/app-editors/focuswriter-1.6.5 b/metadata/md5-cache/app-editors/focuswriter-1.6.5
index fee1c42e4929..5ff710f06448 100644
--- a/metadata/md5-cache/app-editors/focuswriter-1.6.5
+++ b/metadata/md5-cache/app-editors/focuswriter-1.6.5
@@ -3,10 +3,10 @@ DEPEND=app-text/hunspell:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5
DESCRIPTION=A fullscreen and distraction-free word processor
EAPI=6
HOMEPAGE=https://gottcode.org/focuswriter/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=LGPL-3 GPL-3
RDEPEND=app-text/hunspell:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtwidgets:5 sys-libs/zlib
SLOT=0
SRC_URI=https://gottcode.org/focuswriter/focuswriter-1.6.5-src.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=892fab3ec37373e33aa670d4ede5471f
+_md5_=fbf5e29eefcfe6255ac8244439db9417
diff --git a/metadata/md5-cache/app-editors/tea-44.1.0 b/metadata/md5-cache/app-editors/tea-44.1.0
new file mode 100644
index 000000000000..5d7447b38481
--- /dev/null
+++ b/metadata/md5-cache/app-editors/tea-44.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sys-libs/zlib aspell? ( app-text/aspell ) djvu? ( app-text/djvu ) hunspell? ( app-text/hunspell:= ) pdf? ( app-text/poppler[qt5] ) hunspell? ( virtual/pkgconfig )
+DESCRIPTION=Small, lightweight Qt text editor
+EAPI=6
+HOMEPAGE=https://tea.ourproject.org/
+IUSE=aspell djvu hunspell pdf
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sys-libs/zlib aspell? ( app-text/aspell ) djvu? ( app-text/djvu ) hunspell? ( app-text/hunspell:= ) pdf? ( app-text/poppler[qt5] )
+SLOT=0
+SRC_URI=https://tea.ourproject.org/dloads/tea-44.1.0.tar.bz2
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=3a720b7eafb5f91a0f3f62f3df1df689
diff --git a/metadata/md5-cache/app-emulation/flannel-0.8.0 b/metadata/md5-cache/app-emulation/flannel-0.8.0
new file mode 100644
index 000000000000..90a73e577793
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/flannel-0.8.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.8 virtual/pkgconfig
+DESCRIPTION=An etcd backed network fabric for containers
+EAPI=6
+HOMEPAGE=https://github.com/coreos/flannel
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/coreos/flannel/archive/v0.8.0.tar.gz -> flannel-0.8.0.tar.gz
+_eclasses_=golang-base 51a1f13e065f1cff4507685d9cc268c7 golang-vcs-snapshot 7fb5d554a7e656be19ec465fa5bb66db multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7
+_md5_=13778155ef8b68332587aa1df81e5c62
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.0.32 b/metadata/md5-cache/app-emulation/virtualbox-5.0.32
deleted file mode 100644
index 1bfcf6fb7f88..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-5.0.32
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.0.32 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 opengl? ( dev-qt/qtopengl:4 ) x11-libs/libXinerama ) ) java? ( >=virtual/jre-1.6:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jre-1.6:= ) pam? ( sys-libs/pam ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=alsa debug doc headless java libressl lvm pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.0.32 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 opengl? ( dev-qt/qtopengl:4 ) x11-libs/libXinerama ) ) java? ( >=virtual/jre-1.6:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.0.32/VirtualBox-5.0.32.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.0.32-patches-01.tar.xz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d89f4acc9d7d919847bbfadd3dd50cad
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.0.40 b/metadata/md5-cache/app-emulation/virtualbox-5.0.40
index bda1ba69bb1b..ae90ab6ec4c7 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.0.40
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.0.40
@@ -4,11 +4,11 @@ DESCRIPTION=Family of powerful x86 virtualization products for enterprise and ho
EAPI=6
HOMEPAGE=http://www.virtualbox.org/
IUSE=alsa debug doc headless java libressl lvm pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.0.40 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 opengl? ( dev-qt/qtopengl:4 ) x11-libs/libXinerama ) ) java? ( >=virtual/jre-1.6:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
SLOT=0
SRC_URI=http://download.virtualbox.org/virtualbox/5.0.40/VirtualBox-5.0.40.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.0.32-patches-01.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c5e1d84a4907ab70f8756da400987dd3
+_md5_=d89f4acc9d7d919847bbfadd3dd50cad
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.1.24 b/metadata/md5-cache/app-emulation/virtualbox-5.1.24
index 96db66d87511..6f1391aefb50 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.1.24
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.1.24
@@ -11,4 +11,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_p
SLOT=0
SRC_URI=http://download.virtualbox.org/virtualbox/5.1.24/VirtualBox-5.1.24.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.24-patches-01.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0f6fc970eb59b40cdacfe3687c1dcf86
+_md5_=73121291696c83e3beca637c0b47a081
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.1.22-r1 b/metadata/md5-cache/app-emulation/virtualbox-5.1.26
similarity index 76%
rename from metadata/md5-cache/app-emulation/virtualbox-5.1.22-r1
rename to metadata/md5-cache/app-emulation/virtualbox-5.1.26
index 5a090677a177..c3b6c5a3dd98 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.1.22-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.1.26
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.22 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) java? ( >=virtual/jre-1.6:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998_pre20131130-r1 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jre-1.6:= ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.26 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) java? ( >=virtual/jre-1.6:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998_pre20131130-r1 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jre-1.6:= ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
EAPI=6
HOMEPAGE=http://www.virtualbox.org/
IUSE=alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.22 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) java? ( >=virtual/jre-1.6:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.26 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) java? ( >=virtual/jre-1.6:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.1.22/VirtualBox-5.1.22.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.18-patches-01.tar.xz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b59ba8c75d2cebcd44bf18135864993a
+SRC_URI=http://download.virtualbox.org/virtualbox/5.1.26/VirtualBox-5.1.26.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.24-patches-01.tar.xz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=95efcda3236b3eb657042780231505de
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.0.32 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.0.32
deleted file mode 100644
index 07a2905b5109..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.0.32
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
-RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.0.32/VBoxGuestAdditions_5.0.32.iso
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=67b4422105f55f4b42f6765161de6025
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.0.40 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.0.40
index a4950f9df139..f2b6932ab628 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.0.40
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-5.0.40
@@ -2,11 +2,11 @@ DEFINED_PHASES=install unpack
DESCRIPTION=CD image containing guest additions for VirtualBox
EAPI=6
HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
RESTRICT=mirror
SLOT=0
SRC_URI=http://download.virtualbox.org/virtualbox/5.0.40/VBoxGuestAdditions_5.0.40.iso
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=7e59213a487efc1038778b93cf66aa0f
+_md5_=67b4422105f55f4b42f6765161de6025
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.22 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.26
similarity index 87%
rename from metadata/md5-cache/app-emulation/virtualbox-additions-5.1.22
rename to metadata/md5-cache/app-emulation/virtualbox-additions-5.1.26
index a4a637eef455..f193461c4eca 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-5.1.26
@@ -7,6 +7,6 @@ LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
RESTRICT=mirror
SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.1.22/VBoxGuestAdditions_5.1.22.iso
+SRC_URI=http://download.virtualbox.org/virtualbox/5.1.26/VBoxGuestAdditions_5.1.26.iso
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
_md5_=7e59213a487efc1038778b93cf66aa0f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.0.32.112930 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.0.32.112930
deleted file mode 100644
index e350d0d84870..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.0.32.112930
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=5
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.0.32 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/5.0.32/VirtualBox-5.0.32-112930-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/5.0.32/VirtualBox-5.0.32-112930-Linux_x86.run ) http://download.virtualbox.org/virtualbox/5.0.32/Oracle_VM_VirtualBox_Extension_Pack-5.0.32-112930.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.0.32-112930.tar.gz sdk? ( http://download.virtualbox.org/virtualbox/5.0.32/VirtualBoxSDK-5.0.32-112930.zip )
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 64c50579ea42fbcc77a7e220a8ae8e94 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9df2027bbca38450a48a90096b9ce1ff
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.0.40.115130 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.0.40.115130
index 4e3a5250a61b..351de08eff7a 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.0.40.115130
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.0.40.115130
@@ -4,7 +4,7 @@ DESCRIPTION=Family of powerful x86 virtualization products for enterprise and ho
EAPI=5
HOMEPAGE=http://www.virtualbox.org/
IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2 PUEL
RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.0.40 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=mirror
SLOT=0
SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/5.0.40/VirtualBox-5.0.40-115130-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/5.0.40/VirtualBox-5.0.40-115130-Linux_x86.run ) http://download.virtualbox.org/virtualbox/5.0.40/Oracle_VM_VirtualBox_Extension_Pack-5.0.40-115130.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.0.40-115130.tar.gz sdk? ( http://download.virtualbox.org/virtualbox/5.0.40/VirtualBoxSDK-5.0.40-115130.zip )
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 64c50579ea42fbcc77a7e220a8ae8e94 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=32866160de868fafd050c01678ea4e24
+_md5_=9df2027bbca38450a48a90096b9ce1ff
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.22.115126 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.26.117224
similarity index 83%
rename from metadata/md5-cache/app-emulation/virtualbox-bin-5.1.22.115126
rename to metadata/md5-cache/app-emulation/virtualbox-bin-5.1.26.117224
index d24a03407888..6c3b2c7e27f8 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.22.115126
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.26.117224
@@ -6,10 +6,10 @@ HOMEPAGE=http://www.virtualbox.org/
IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.1.22 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.1.26 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
RESTRICT=mirror
SLOT=0
-SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/5.1.22/VirtualBox-5.1.22-115126-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/5.1.22/VirtualBox-5.1.22-115126-Linux_x86.run ) http://download.virtualbox.org/virtualbox/5.1.22/Oracle_VM_VirtualBox_Extension_Pack-5.1.22-115126.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.22-115126.tar.gz sdk? ( http://download.virtualbox.org/virtualbox/5.1.22/VirtualBoxSDK-5.1.22-115126.zip )
+SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/5.1.26/VirtualBox-5.1.26-117224-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/5.1.26/VirtualBox-5.1.26-117224-Linux_x86.run ) http://download.virtualbox.org/virtualbox/5.1.26/Oracle_VM_VirtualBox_Extension_Pack-5.1.26-117224.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.26-117224.tar.gz sdk? ( http://download.virtualbox.org/virtualbox/5.1.26/VirtualBoxSDK-5.1.26-117224.zip )
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 64c50579ea42fbcc77a7e220a8ae8e94 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
_md5_=7c162fdeceea3f02f792c3b48d8761f9
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.0.32.112930 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.0.32.112930
deleted file mode 100644
index 1eaf6651fb96..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.0.32.112930
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=amd64 x86
-LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-5.0.32
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.0.32/Oracle_VM_VirtualBox_Extension_Pack-5.0.32-112930.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.0.32-112930.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=60d24a07a5cbf8316bccbb188efa1c4d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.0.40.115130 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.0.40.115130
index ff9a4e962523..6fefaaaa6179 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.0.40.115130
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.0.40.115130
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
DESCRIPTION=PUEL extensions for VirtualBox
EAPI=6
HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=PUEL
RDEPEND=~app-emulation/virtualbox-5.0.40
RESTRICT=mirror strip
SLOT=0
SRC_URI=http://download.virtualbox.org/virtualbox/5.0.40/Oracle_VM_VirtualBox_Extension_Pack-5.0.40-115130.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.0.40-115130.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=39a814cbf6e7b4c0941e1122b7ef37ba
+_md5_=60d24a07a5cbf8316bccbb188efa1c4d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.22.115126 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.26.117224
similarity index 70%
rename from metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.22.115126
rename to metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.26.117224
index a3fcb303c8ee..4e7a6fc8741b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.22.115126
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.26.117224
@@ -4,9 +4,9 @@ EAPI=6
HOMEPAGE=http://www.virtualbox.org/
KEYWORDS=~amd64 ~x86
LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-5.1.22
+RDEPEND=~app-emulation/virtualbox-5.1.26
RESTRICT=mirror strip
SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.1.22/Oracle_VM_VirtualBox_Extension_Pack-5.1.22-115126.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.22-115126.tar.gz
+SRC_URI=http://download.virtualbox.org/virtualbox/5.1.26/Oracle_VM_VirtualBox_Extension_Pack-5.1.26-117224.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.26-117224.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=39a814cbf6e7b4c0941e1122b7ef37ba
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.0.32 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.0.32
deleted file mode 100644
index 77d4f6afe5e3..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.0.32
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=X kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-5.0.32 )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.0.32/VirtualBox-5.0.32.tar.bz2
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=47b7c312eb2b883323afcb51aee5711d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.0.40 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.0.40
index 5045a9e39a11..22afb25004b8 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.0.40
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.0.40
@@ -4,11 +4,11 @@ DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
EAPI=6
HOMEPAGE=http://www.virtualbox.org/
IUSE=X kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
PDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-5.0.40 )
RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
SLOT=0
SRC_URI=http://download.virtualbox.org/virtualbox/5.0.40/VirtualBox-5.0.40.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3f80b430dbb2e28a2fddc3db28fe16fe
+_md5_=47b7c312eb2b883323afcb51aee5711d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.22 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.26
similarity index 84%
rename from metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.22
rename to metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.26
index e740a07d562d..ccd6b1bef988 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.26
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.virtualbox.org/
IUSE=X kernel_linux
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-PDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-5.1.22 )
+PDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-5.1.26 )
RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.1.22/VirtualBox-5.1.22.tar.bz2
+SRC_URI=http://download.virtualbox.org/virtualbox/5.1.26/VirtualBox-5.1.26.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.24-patches-01.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3f80b430dbb2e28a2fddc3db28fe16fe
+_md5_=da408533f5c13d66f1019e681be8ed6e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.0.32 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.0.32
deleted file mode 100644
index 0ce32e33214f..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.0.32
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=pax_kernel kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.0.32.tar.xz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0212b6ec810e2b0abcdf18812441147e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.0.40 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.0.40
index 18eeebfa1794..ba32e4ac6ca7 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.0.40
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.0.40
@@ -4,10 +4,10 @@ DESCRIPTION=Kernel Modules for Virtualbox
EAPI=6
HOMEPAGE=http://www.virtualbox.org/
IUSE=pax_kernel kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
SLOT=0
SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.0.40.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=713b908ee8c917ab76e1b14a33b460fd
+_md5_=0212b6ec810e2b0abcdf18812441147e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.22 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.26
similarity index 96%
rename from metadata/md5-cache/app-emulation/virtualbox-modules-5.1.22
rename to metadata/md5-cache/app-emulation/virtualbox-modules-5.1.26
index bacb8f9892e4..f5b398a9969f 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.26
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.1.22.tar.xz
+SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.1.26.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=713b908ee8c917ab76e1b14a33b460fd
diff --git a/metadata/md5-cache/app-eselect/eselect-php-0.9.4 b/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r1
similarity index 94%
rename from metadata/md5-cache/app-eselect/eselect-php-0.9.4
rename to metadata/md5-cache/app-eselect/eselect-php-0.9.4-r1
index b131b74fe831..b8c49796bf3e 100644
--- a/metadata/md5-cache/app-eselect/eselect-php-0.9.4
+++ b/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r1
@@ -10,4 +10,4 @@ RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] ) f
SLOT=0
SRC_URI=https://dev.gentoo.org/~mjo/distfiles/eselect-php-0.9.4.tar.xz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=365b0c0920fc0eac1b7e4ea5d6ed9938
+_md5_=ae2e6fdf658aa288ce36453f78fd2026
diff --git a/metadata/md5-cache/app-eselect/eselect-php-9999 b/metadata/md5-cache/app-eselect/eselect-php-9999
index 23139f5c6949..8d2d693f59a0 100644
--- a/metadata/md5-cache/app-eselect/eselect-php-9999
+++ b/metadata/md5-cache/app-eselect/eselect-php-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] ) fpm? ( sys-apps/gentoo-functions )
SLOT=0
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 git-r3 cbafa3261c37c7e3af44bb16a34ea390 libtool e32ea84bf82cf8987965b574672dba93 multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=1070a802beb62e97d8f23a85fc4490f7
+_md5_=a46b14c4be8ff3dc604adccf2959b7fe
diff --git a/metadata/md5-cache/app-misc/sl-5.02 b/metadata/md5-cache/app-misc/sl-5.02
index 74ead285076a..cee32e915c7f 100644
--- a/metadata/md5-cache/app-misc/sl-5.02
+++ b/metadata/md5-cache/app-misc/sl-5.02
@@ -4,10 +4,10 @@ DESCRIPTION=sophisticated graphical program which corrects your miss typing
EAPI=6
HOMEPAGE=http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html https://github.com/mtoyoda/sl/
IUSE=l10n_ja
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=Toyoda
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=https://github.com/mtoyoda/sl/archive/5.02.tar.gz -> sl-5.02.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=2de2e68c9c26eabe4e721b9a14f48d08
+_md5_=b3b8f45bf76aee4a5e97f2228e67fc93
diff --git a/metadata/md5-cache/app-office/homebank-5.1.1 b/metadata/md5-cache/app-office/homebank-5.1.5
similarity index 63%
rename from metadata/md5-cache/app-office/homebank-5.1.1
rename to metadata/md5-cache/app-office/homebank-5.1.5
index b904ca82e1e5..0d874d065beb 100644
--- a/metadata/md5-cache/app-office/homebank-5.1.1
+++ b/metadata/md5-cache/app-office/homebank-5.1.5
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure postinst postrm preinst
+DEFINED_PHASES=configure postinst postrm preinst prepare
DEPEND=>=dev-libs/glib-2.39 >=net-libs/libsoup-2.26 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.12:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3 ) >=dev-lang/perl-5.8.1 dev-perl/XML-Parser >=dev-util/intltool-0.40.5 sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
DESCRIPTION=Free, easy, personal accounting for everyone
EAPI=6
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.39 >=net-libs/libsoup-2.26 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.12:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3 )
SLOT=0
-SRC_URI=http://homebank.free.fr/public/homebank-5.1.1.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=51b252add5942a12ea7bafdfa43dbe92
+SRC_URI=http://homebank.free.fr/public/homebank-5.1.5.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=19c8d5757401d94932c466cd1a856346
diff --git a/metadata/md5-cache/app-office/projectlibre-bin-1.6.2 b/metadata/md5-cache/app-office/projectlibre-bin-1.6.2
index d06fb6e483ce..7fa849d634f4 100644
--- a/metadata/md5-cache/app-office/projectlibre-bin-1.6.2
+++ b/metadata/md5-cache/app-office/projectlibre-bin-1.6.2
@@ -6,6 +6,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=CPAL-1.0
RDEPEND=>=virtual/jre-1.8
SLOT=0
-SRC_URI=mirror://sourceforge/projectlibre/projectlibre-1.6.2.tar.gz
+SRC_URI=mirror://sourceforge/projectlibre/projectlibre-1.6.2.tar.gz mirror://gentoo/projectlibre.png
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=f43bbc5649588240969fc392dc1315d9
+_md5_=7eb8cb88de71a8c34db6fb70a08e05b7
diff --git a/metadata/md5-cache/app-text/ansifilter-2.6 b/metadata/md5-cache/app-text/ansifilter-2.6
new file mode 100644
index 000000000000..8458e0f0ddb8
--- /dev/null
+++ b/metadata/md5-cache/app-text/ansifilter-2.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=Handles text files containing ANSI terminal escape codes
+EAPI=6
+HOMEPAGE=http://www.andre-simon.de/
+IUSE=qt5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+SLOT=0
+SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.6.tar.bz2
+_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=194fa3c2d60d907a7ce00f4e2a29c1c4
diff --git a/metadata/md5-cache/app-text/cb2bib-1.9.6 b/metadata/md5-cache/app-text/cb2bib-1.9.6
deleted file mode 100644
index f3d18dae4286..000000000000
--- a/metadata/md5-cache/app-text/cb2bib-1.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 lzo? ( dev-libs/lzo:2 ) webkit? ( dev-qt/qtwebkit:5 ) webengine? ( dev-qt/qtwebengine:5[widgets] )
-DESCRIPTION=Tool for extracting unformatted bibliographic references
-EAPI=6
-HOMEPAGE=http://www.molspaces.com/cb2bib/
-IUSE=+lzo webengine +webkit
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 lzo? ( dev-libs/lzo:2 ) webkit? ( dev-qt/qtwebkit:5 ) webengine? ( dev-qt/qtwebengine:5[widgets] )
-REQUIRED_USE=?? ( webkit webengine )
-SLOT=0
-SRC_URI=http://www.molspaces.com/dl/progs/cb2bib-1.9.6.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=f1e8640856b12a83378491a10dc1380a
diff --git a/metadata/md5-cache/app-text/cb2bib-1.9.7 b/metadata/md5-cache/app-text/cb2bib-1.9.7
index e87f0f4470cf..aebe3275c38a 100644
--- a/metadata/md5-cache/app-text/cb2bib-1.9.7
+++ b/metadata/md5-cache/app-text/cb2bib-1.9.7
@@ -4,11 +4,11 @@ DESCRIPTION=Tool for extracting unformatted bibliographic references
EAPI=6
HOMEPAGE=http://www.molspaces.com/cb2bib/
IUSE=+lzo webengine +webkit
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 lzo? ( dev-libs/lzo:2 ) webkit? ( dev-qt/qtwebkit:5 ) webengine? ( dev-qt/qtwebengine:5[widgets] )
REQUIRED_USE=?? ( webkit webengine )
SLOT=0
SRC_URI=http://www.molspaces.com/dl/progs/cb2bib-1.9.7.tar.gz
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=6ef4fc20b54e087ac51fdc5da8fbf152
+_md5_=f1e8640856b12a83378491a10dc1380a
diff --git a/metadata/md5-cache/app-text/dos2unix-7.3.5 b/metadata/md5-cache/app-text/dos2unix-7.3.5
index 57f000d5f9bd..77f6304120f9 100644
--- a/metadata/md5-cache/app-text/dos2unix-7.3.5
+++ b/metadata/md5-cache/app-text/dos2unix-7.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
EAPI=6
HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
IUSE=debug nls test linguas_da linguas_de linguas_eo linguas_es linguas_fr linguas_hu linguas_ja linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr linguas_sv linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
LICENSE=BSD-2
RDEPEND=!app-text/hd2u virtual/libintl
SLOT=0
SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.3.5.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.3.5.tar.gz
_eclasses_=l10n 2c2e15383ba891d642f51896a7f0ecfe multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=8365026eb236b1eaf12a154e06a2a3ec
+_md5_=86cc43083509070faffe0aff2cf1c995
diff --git a/metadata/md5-cache/app-text/libmwaw-0.3.10 b/metadata/md5-cache/app-text/libmwaw-0.3.10
deleted file mode 100644
index e11621a158a8..000000000000
--- a/metadata/md5-cache/app-text/libmwaw-0.3.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Library parsing many pre-OSX MAC text formats
-EAPI=6
-HOMEPAGE=https://sourceforge.net/p/libmwaw/wiki/Home/
-IUSE=doc static-libs tools
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://sourceforge/libmwaw/libmwaw-0.3.10.tar.xz
-_md5_=08034791469fe9f8b798e8d4b434ce9b
diff --git a/metadata/md5-cache/app-text/libmwaw-0.3.11 b/metadata/md5-cache/app-text/libmwaw-0.3.11
deleted file mode 100644
index c2cc750cfcd8..000000000000
--- a/metadata/md5-cache/app-text/libmwaw-0.3.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Library parsing many pre-OSX MAC text formats
-EAPI=6
-HOMEPAGE=https://sourceforge.net/p/libmwaw/wiki/Home/
-IUSE=doc static-libs tools
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://sourceforge/libmwaw/libmwaw-0.3.11.tar.xz
-_md5_=08034791469fe9f8b798e8d4b434ce9b
diff --git a/metadata/md5-cache/app-text/libmwaw-0.3.12 b/metadata/md5-cache/app-text/libmwaw-0.3.12
new file mode 100644
index 000000000000..ac4e3776d416
--- /dev/null
+++ b/metadata/md5-cache/app-text/libmwaw-0.3.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/librevenge sys-libs/zlib sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
+DESCRIPTION=Library parsing many pre-OSX MAC text formats
+EAPI=6
+HOMEPAGE=https://sourceforge.net/p/libmwaw/wiki/Home/
+IUSE=doc static-libs tools
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/librevenge sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://sourceforge/libmwaw/libmwaw-0.3.12.tar.xz
+_md5_=922445d3137fc0f753b83c7acbca3ed4
diff --git a/metadata/md5-cache/app-text/libstaroffice-0.0.4 b/metadata/md5-cache/app-text/libstaroffice-0.0.4
new file mode 100644
index 000000000000..fc2b7cff8520
--- /dev/null
+++ b/metadata/md5-cache/app-text/libstaroffice-0.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/librevenge zlib? ( sys-libs/zlib ) doc? ( app-doc/doxygen )
+DESCRIPTION=Import filter for old StarOffice documents
+EAPI=6
+HOMEPAGE=https://github.com/fosnola/libstaroffice
+IUSE=debug doc tools +zlib
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=|| ( LGPL-2.1+ MPL-2.0 )
+RDEPEND=dev-libs/librevenge zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=http://dev-www.libreoffice.org/src/libstaroffice-0.0.4.tar.xz
+_md5_=5da28aebb85fec6092a024f891f4b25a
diff --git a/metadata/md5-cache/app-text/libwps-0.4.7 b/metadata/md5-cache/app-text/libwps-0.4.7
new file mode 100644
index 000000000000..7e06ada05ce3
--- /dev/null
+++ b/metadata/md5-cache/app-text/libwps-0.4.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/librevenge virtual/pkgconfig doc? ( app-doc/doxygen )
+DESCRIPTION=Microsoft Works file word processor format import filter library
+EAPI=6
+HOMEPAGE=https://sourceforge.net/p/libwps/wiki/Home/
+IUSE=doc debug static-libs tools
+KEYWORDS=~alpha ~amd64 ~arm ~x86
+LICENSE=|| ( LGPL-2.1 MPL-2.0 )
+RDEPEND=dev-libs/librevenge
+SLOT=0
+SRC_URI=mirror://sourceforge/libwps/libwps-0.4.7.tar.xz
+_md5_=f94d5ab28f47e77e64e28ba42b9a3760
diff --git a/metadata/md5-cache/app-text/t1utils-1.40 b/metadata/md5-cache/app-text/t1utils-1.40
new file mode 100644
index 000000000000..df3b111ebaf2
--- /dev/null
+++ b/metadata/md5-cache/app-text/t1utils-1.40
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Type 1 Font utilities
+EAPI=0
+HOMEPAGE=http://www.lcdf.org/type/#t1utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=!=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Convert MS Office xlsx files to CSV
-EAPI=5
-HOMEPAGE=https://github.com/dilshod/xlsx2csv/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/x/xlsx2csv/xlsx2csv-0.6.tar.gz
-_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7db569c962a9cf20106ecc2455952228
diff --git a/metadata/md5-cache/app-text/xlsx2csv-0.7 b/metadata/md5-cache/app-text/xlsx2csv-0.7
deleted file mode 100644
index 5fbc5411ad65..000000000000
--- a/metadata/md5-cache/app-text/xlsx2csv-0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Convert MS Office xlsx files to CSV
-EAPI=5
-HOMEPAGE=https://github.com/dilshod/xlsx2csv/
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://github.com/dilshod/xlsx2csv/archive/release/0.7.tar.gz -> xlsx2csv-0.7.tar.gz
-_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=42b8f71f0962493f1513d82dce5c8cc9
diff --git a/metadata/md5-cache/app-text/xlsx2csv-0.7.3 b/metadata/md5-cache/app-text/xlsx2csv-0.7.3
new file mode 100644
index 000000000000..145539e519c5
--- /dev/null
+++ b/metadata/md5-cache/app-text/xlsx2csv-0.7.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Convert MS Office xlsx files to CSV
+EAPI=6
+HOMEPAGE=https://github.com/dilshod/xlsx2csv/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/x/xlsx2csv/xlsx2csv-0.7.3.tar.gz
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=cdd1f54366922f6475d55f9ff07eeeca
diff --git a/metadata/md5-cache/dev-db/etcd-3.2.4 b/metadata/md5-cache/dev-db/etcd-3.2.4
new file mode 100644
index 000000000000..79d3d1098299
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.6:= virtual/pkgconfig >=dev-lang/go-1.8
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=6
+HOMEPAGE=https://github.com/coreos/etcd
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!dev-db/etcdctl
+SLOT=0
+SRC_URI=https://github.com/coreos/etcd/archive/v3.2.4.tar.gz -> etcd-3.2.4.tar.gz
+_eclasses_=golang-base 51a1f13e065f1cff4507685d9cc268c7 golang-vcs-snapshot 7fb5d554a7e656be19ec465fa5bb66db multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7
+_md5_=2c5f2bedf4f275bda02faa1fa1559cf1
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.7-r1 b/metadata/md5-cache/dev-db/mariadb-10.2.7-r1
new file mode 100644
index 000000000000..1443e6554989
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.7-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
+DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-connector-c[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= virtual/pkgconfig jdbc? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=6
+HOMEPAGE=http://mariadb.org/
+IUSE=+backup bindist cracklib debug embedded extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-xtrabackup static static-libs systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1+
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=] server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
+RDEPEND=selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-connector-c[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
+RESTRICT=!bindist? ( bindist ) libressl? ( test )
+SLOT=0/18
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.7/source/mariadb-10.2.7.tar.gz mirror://gentoo/mysql-extras-20170729-0113Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170729-0113Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170729-0113Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170729-0113Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170729-0113Z.tar.bz2
+_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 prefix df8265631f8bf5f5df387e9b987121f9 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c177d9414227242a2e332d860ddf2f61
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.3-r1 b/metadata/md5-cache/dev-db/postgresql-9.6.3-r1
index 5de3abf31c38..a6acd95ba686 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.3-r1
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
EAPI=5
HOMEPAGE=http://www.postgresql.org/
IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
LICENSE=POSTGRESQL GPL-2
RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
SLOT=9.6
SRC_URI=mirror://postgresql/source/v9.6.3/postgresql-9.6.3.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 prefix df8265631f8bf5f5df387e9b987121f9 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b0b4f2fe1fabaf6856f440a3b7f3a681
+_md5_=f0090f3dd51262d23046e85e1750a3a1
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.141 b/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.144
similarity index 95%
rename from metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.141
rename to metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.144
index ed3f4a07e8d6..9c5735916d9c 100644
--- a/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.141
+++ b/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.144
@@ -7,6 +7,6 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=oracle-java-documentation-8
RESTRICT=fetch
SLOT=1.8
-SRC_URI=jdk-8u141-docs-all.zip
+SRC_URI=jdk-8u144-docs-all.zip
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=3b2283fc4a3c20e9ebac1bce45d6edc4
diff --git a/metadata/md5-cache/dev-lang/elixir-1.4.5 b/metadata/md5-cache/dev-lang/elixir-1.4.5
index d95bf1fb3fa0..fd2f68843ab1 100644
--- a/metadata/md5-cache/dev-lang/elixir-1.4.5
+++ b/metadata/md5-cache/dev-lang/elixir-1.4.5
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-18[ssl]
DESCRIPTION=Elixir programming language
EAPI=6
HOMEPAGE=https://elixir-lang.org
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
LICENSE=Apache-2.0 ErlPL-1.1
RDEPEND=>=dev-lang/erlang-18[ssl]
SLOT=0
SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.4.5.tar.gz -> elixir-1.4.5.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=30b836eff932128a319b610aa1b26b74
+_md5_=f25f35cd28199938186aab063b590f26
diff --git a/metadata/md5-cache/dev-lang/moarvm-2016.11-r1 b/metadata/md5-cache/dev-lang/moarvm-2016.11-r1
deleted file mode 100644
index 6945379af76f..000000000000
--- a/metadata/md5-cache/dev-lang/moarvm-2016.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-libs/libatomic_ops >=dev-libs/libtommath-1.0 dev-libs/libuv jit? ( dev-lang/lua:0[deprecated] dev-lua/LuaBitOp ) virtual/libffi clang? ( >=sys-devel/clang-3.1 ) dev-lang/perl
-DESCRIPTION=A 6model-based VM for NQP and Rakudo Perl 6
-EAPI=6
-HOMEPAGE=http://moarvm.org
-IUSE=asan clang debug doc +jit static-libs optimize ubsan
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=dev-libs/libatomic_ops >=dev-libs/libtommath-1.0 dev-libs/libuv jit? ( dev-lang/lua:0[deprecated] dev-lua/LuaBitOp ) virtual/libffi
-RESTRICT=test
-SLOT=0
-SRC_URI=http://moarvm.org/releases/MoarVM-2016.11.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=2dc9fac5ac7f35e7877afa1956e57550
diff --git a/metadata/md5-cache/dev-lang/moarvm-2016.12-r1 b/metadata/md5-cache/dev-lang/moarvm-2016.12-r1
deleted file mode 100644
index 258e244310ab..000000000000
--- a/metadata/md5-cache/dev-lang/moarvm-2016.12-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-libs/libatomic_ops >=dev-libs/libtommath-1.0 dev-libs/libuv jit? ( dev-lang/lua:0[deprecated] dev-lua/LuaBitOp ) virtual/libffi clang? ( >=sys-devel/clang-3.1 ) dev-lang/perl
-DESCRIPTION=A 6model-based VM for NQP and Rakudo Perl 6
-EAPI=6
-HOMEPAGE=http://moarvm.org
-IUSE=asan clang debug doc +jit static-libs optimize ubsan
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=dev-libs/libatomic_ops >=dev-libs/libtommath-1.0 dev-libs/libuv jit? ( dev-lang/lua:0[deprecated] dev-lua/LuaBitOp ) virtual/libffi
-RESTRICT=test
-SLOT=0
-SRC_URI=http://moarvm.org/releases/MoarVM-2016.12.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=2dc9fac5ac7f35e7877afa1956e57550
diff --git a/metadata/md5-cache/dev-lang/moarvm-2016.10-r1 b/metadata/md5-cache/dev-lang/moarvm-2017.07
similarity index 94%
rename from metadata/md5-cache/dev-lang/moarvm-2016.10-r1
rename to metadata/md5-cache/dev-lang/moarvm-2017.07
index 0d61e8de5454..6bb11b18754c 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2016.10-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2017.07
@@ -9,6 +9,6 @@ LICENSE=Artistic-2
RDEPEND=dev-libs/libatomic_ops >=dev-libs/libtommath-1.0 dev-libs/libuv jit? ( dev-lang/lua:0[deprecated] dev-lua/LuaBitOp ) virtual/libffi
RESTRICT=test
SLOT=0
-SRC_URI=http://moarvm.org/releases/MoarVM-2016.10.tar.gz
+SRC_URI=http://moarvm.org/releases/MoarVM-2017.07.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
_md5_=2dc9fac5ac7f35e7877afa1956e57550
diff --git a/metadata/md5-cache/dev-lang/nqp-2016.10 b/metadata/md5-cache/dev-lang/nqp-2016.10
deleted file mode 100644
index 03f64bf4683d..000000000000
--- a/metadata/md5-cache/dev-lang/nqp-2016.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
-DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2016.10[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
-EAPI=5
-HOMEPAGE=http://rakudo.org/
-IUSE=doc clang java +moar test elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2016.10[clang=] ) java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( java moar )
-SLOT=0
-SRC_URI=https://github.com/perl6/nqp/tarball/2016.10 -> nqp-2016.10.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 vcs-snapshot 03289f51c769cf409d200d2d628cdd6e versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e9f1098353fc7b453e7f74c723d9dbf4
diff --git a/metadata/md5-cache/dev-lang/nqp-2016.12 b/metadata/md5-cache/dev-lang/nqp-2016.12
deleted file mode 100644
index 58d88ce81a7b..000000000000
--- a/metadata/md5-cache/dev-lang/nqp-2016.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
-DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2016.12[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
-EAPI=5
-HOMEPAGE=http://rakudo.org/
-IUSE=doc clang java +moar test elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2016.12[clang=] ) java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( java moar )
-SLOT=0
-SRC_URI=https://github.com/perl6/nqp/tarball/2016.12 -> nqp-2016.12.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 vcs-snapshot 03289f51c769cf409d200d2d628cdd6e versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e9f1098353fc7b453e7f74c723d9dbf4
diff --git a/metadata/md5-cache/dev-lang/nqp-2016.11 b/metadata/md5-cache/dev-lang/nqp-2017.07
similarity index 81%
rename from metadata/md5-cache/dev-lang/nqp-2016.11
rename to metadata/md5-cache/dev-lang/nqp-2017.07
index 08caf8321458..a78b21d0bcea 100644
--- a/metadata/md5-cache/dev-lang/nqp-2016.11
+++ b/metadata/md5-cache/dev-lang/nqp-2017.07
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
-DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2016.11[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2017.07[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
EAPI=5
HOMEPAGE=http://rakudo.org/
IUSE=doc clang java +moar test elibc_FreeBSD java
KEYWORDS=~amd64 ~x86
LICENSE=Artistic-2
-RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2016.11[clang=] ) java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2017.07[clang=] ) java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( java moar )
SLOT=0
-SRC_URI=https://github.com/perl6/nqp/tarball/2016.11 -> nqp-2016.11.tar.gz
+SRC_URI=https://github.com/perl6/nqp/tarball/2017.07 -> nqp-2017.07.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 vcs-snapshot 03289f51c769cf409d200d2d628cdd6e versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e9f1098353fc7b453e7f74c723d9dbf4
+_md5_=e5bea272a3c3a888488c81cb22a9b736
diff --git a/metadata/md5-cache/dev-lang/rakudo-2016.10 b/metadata/md5-cache/dev-lang/rakudo-2016.10
deleted file mode 100644
index fc08268c8524..000000000000
--- a/metadata/md5-cache/dev-lang/rakudo-2016.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=~dev-lang/nqp-2016.10:0=[java?,moar?,clang=] clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) >=dev-lang/perl-5.10 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A compiler for the Perl 6 programming language
-EAPI=5
-HOMEPAGE=http://rakudo.org
-IUSE=clang java +moar test elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=~dev-lang/nqp-2016.10:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( java moar )
-SLOT=0
-SRC_URI=http://rakudo.org/downloads/rakudo/rakudo-2016.10.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7ac2e694bb5df028262b37d9e398ab81
diff --git a/metadata/md5-cache/dev-lang/rakudo-2016.12 b/metadata/md5-cache/dev-lang/rakudo-2016.12
deleted file mode 100644
index c066b0bf8c47..000000000000
--- a/metadata/md5-cache/dev-lang/rakudo-2016.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=~dev-lang/nqp-2016.12:0=[java?,moar?,clang=] clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) >=dev-lang/perl-5.10 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A compiler for the Perl 6 programming language
-EAPI=5
-HOMEPAGE=http://rakudo.org
-IUSE=clang java +moar test elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=~dev-lang/nqp-2016.12:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( java moar )
-SLOT=0
-SRC_URI=http://rakudo.org/downloads/rakudo/rakudo-2016.12.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7ac2e694bb5df028262b37d9e398ab81
diff --git a/metadata/md5-cache/dev-lang/rakudo-2016.11 b/metadata/md5-cache/dev-lang/rakudo-2017.07
similarity index 78%
rename from metadata/md5-cache/dev-lang/rakudo-2016.11
rename to metadata/md5-cache/dev-lang/rakudo-2017.07
index 8a1e06c95af4..21f5c79ecc5b 100644
--- a/metadata/md5-cache/dev-lang/rakudo-2016.11
+++ b/metadata/md5-cache/dev-lang/rakudo-2017.07
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=~dev-lang/nqp-2016.11:0=[java?,moar?,clang=] clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) >=dev-lang/perl-5.10 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=~dev-lang/nqp-2017.07:0=[java?,moar?,clang=] clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) >=dev-lang/perl-5.10 java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=A compiler for the Perl 6 programming language
EAPI=5
HOMEPAGE=http://rakudo.org
IUSE=clang java +moar test elibc_FreeBSD java
KEYWORDS=~amd64 ~x86
LICENSE=Artistic-2
-RDEPEND=~dev-lang/nqp-2016.11:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=~dev-lang/nqp-2017.07:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( java moar )
SLOT=0
-SRC_URI=http://rakudo.org/downloads/rakudo/rakudo-2016.11.tar.gz
+SRC_URI=https://rakudo.perl6.org/downloads/rakudo/rakudo-2017.07.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7ac2e694bb5df028262b37d9e398ab81
+_md5_=918d00cef4d28e7234e32c4771b17998
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.5.6 b/metadata/md5-cache/dev-lang/swi-prolog-7.5.6
new file mode 100644
index 000000000000..849d23ab9ad0
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.5.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.5:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=free, small, and standard compliant Prolog compiler
+EAPI=5
+HOMEPAGE=http://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc readline ssl static-libs test uuid zlib X elibc_FreeBSD java
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.5:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.5.6.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=84f5e20736806b7adcedcb033a8fecf1
diff --git a/metadata/md5-cache/dev-libs/appstream-0.10.6-r1 b/metadata/md5-cache/dev-libs/appstream-0.10.6-r1
index c0827faf47b0..172a542adc0c 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.10.6-r1
+++ b/metadata/md5-cache/dev-libs/appstream-0.10.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Cross-distro effort for providing metadata for software in the Linux
EAPI=6
HOMEPAGE=https://www.freedesktop.org/wiki/Distributions/AppStream/
IUSE=apt doc qt5 test
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=LGPL-2.1+ GPL-2+
RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer qt5? ( dev-qt/qtcore:5 )
SLOT=0/4
SRC_URI=https://github.com/ximion/appstream/archive/APPSTREAM_0_10_6.tar.gz -> appstream-0.10.6.tar.gz
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=63bff8cc5965dd56f747ec8cb1327a30
+_md5_=7cdb18d90a1175074e0c0d09d44e70f7
diff --git a/metadata/md5-cache/dev-libs/capstone-3.0.5_rc2-r1 b/metadata/md5-cache/dev-libs/capstone-3.0.5_rc2-r1
new file mode 100644
index 000000000000..e50afaa94a0b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/capstone-3.0.5_rc2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DESCRIPTION=disassembly/disassembler framework + bindings
+EAPI=6
+HOMEPAGE=http://www.capstone-engine.org/
+IUSE=python python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 ) )
+SLOT=0/3
+SRC_URI=https://github.com/aquynh/capstone/archive/3.0.5-rc2.tar.gz -> capstone-3.0.5_rc2.tar.gz
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=cf474a9f675a2a13cf3f433bba7fb90a
diff --git a/metadata/md5-cache/dev-libs/cudnn-6.0 b/metadata/md5-cache/dev-libs/cudnn-6.0
new file mode 100644
index 000000000000..d71e97eac1f3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cudnn-6.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=NVIDIA Accelerated Deep Learning on GPU library
+EAPI=6
+HOMEPAGE=https://developer.nvidia.com/cuDNN
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=NVIDIA-cuDNN
+RESTRICT=fetch
+SLOT=0/6
+SRC_URI=cudnn-8.0-linux-x64-v6.0.tgz
+_md5_=cbc2d8ac97f0edef801656603d8b19ae
diff --git a/metadata/md5-cache/dev-libs/dbus-glib-0.108 b/metadata/md5-cache/dev-libs/dbus-glib-0.108
index 3ad6cb55df60..0ce40032dec1 100644
--- a/metadata/md5-cache/dev-libs/dbus-glib-0.108
+++ b/metadata/md5-cache/dev-libs/dbus-glib-0.108
@@ -4,10 +4,10 @@ DESCRIPTION=D-Bus bindings for glib
EAPI=5
HOMEPAGE=https://dbus.freedesktop.org/
IUSE=debug static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-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 ~m68k-mint ~sparc-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 ~m68k-mint ~sparc-solaris ~x86-solaris
LICENSE=|| ( GPL-2 AFL-2.1 )
RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !=dev-util/cmake-3.7.2
+DESCRIPTION=Memory efficient serialization library
+EAPI=6
+HOMEPAGE=https://google.github.io/flatbuffers/
+IUSE=static-libs test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/google/flatbuffers/archive/v1.7.1.tar.gz -> flatbuffers-1.7.1.tar.gz
+_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8d789fa2e8a2b158d5032762b564e652
diff --git a/metadata/md5-cache/dev-libs/gjs-1.48.5 b/metadata/md5-cache/dev-libs/gjs-1.48.6
similarity index 96%
rename from metadata/md5-cache/dev-libs/gjs-1.48.5
rename to metadata/md5-cache/dev-libs/gjs-1.48.6
index 8dd359fcdfe4..1d2414e13fa8 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.48.5
+++ b/metadata/md5-cache/dev-libs/gjs-1.48.6
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
RDEPEND=>=dev-libs/glib-2.52.1 >=dev-libs/gobject-introspection-1.52.1:= sys-libs/readline:0 dev-lang/spidermonkey:38 virtual/libffi cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 )
SLOT=0
-SRC_URI=mirror://gnome/sources/gjs/1.48/gjs-1.48.5.tar.xz
+SRC_URI=mirror://gnome/sources/gjs/1.48/gjs-1.48.6.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 64c50579ea42fbcc77a7e220a8ae8e94 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
_md5_=2e66652ca824ca3790972a31a0176d04
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.0.0 b/metadata/md5-cache/dev-libs/leatherman-1.0.0
index d83976f23fb0..e2f189e6d7af 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.0.0
+++ b/metadata/md5-cache/dev-libs/leatherman-1.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=A C++ toolkit
EAPI=6
HOMEPAGE=https://github.com/puppetlabs/leatherman
IUSE=debug test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc x86
LICENSE=Apache-2.0
RDEPEND=net-misc/curl
SLOT=0
SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.0.0.tar.gz -> leatherman-1.0.0.tar.gz
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=412c3e17cfcc5a0e1b61b3d3ccc3f0d3
+_md5_=70112ae595b45e36260be8d4537589e9
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-1.3.0 b/metadata/md5-cache/dev-libs/libqtxdg-1.3.0
deleted file mode 100644
index 7929bf0170f8..000000000000
--- a/metadata/md5-cache/dev-libs/libqtxdg-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/pkgconfig test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A Qt implementation of XDG standards
-EAPI=5
-HOMEPAGE=http://lxqt.org/
-IUSE=test test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-misc/xdg-utils
-SLOT=0
-SRC_URI=http://downloads.lxqt.org/libqtxdg/1.3.0/libqtxdg-1.3.0.tar.xz
-_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066
-_md5_=6475c6b01754d2a51a7ddb6b858829c5
diff --git a/metadata/md5-cache/dev-libs/pkcs11-helper-1.21 b/metadata/md5-cache/dev-libs/pkcs11-helper-1.21-r1
similarity index 95%
rename from metadata/md5-cache/dev-libs/pkcs11-helper-1.21
rename to metadata/md5-cache/dev-libs/pkcs11-helper-1.21-r1
index f2bfec6d5bde..2119a42512d4 100644
--- a/metadata/md5-cache/dev-libs/pkcs11-helper-1.21
+++ b/metadata/md5-cache/dev-libs/pkcs11-helper-1.21-r1
@@ -10,4 +10,4 @@ RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.7:= ) libressl? ( dev-libs/libressl
SLOT=0
SRC_URI=https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-1.21/pkcs11-helper-1.21.tar.bz2
_eclasses_=ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=252eda5514407126d6a8e0d8665cd5ff
+_md5_=6b88ceebff847910b3937e7753b161f9
diff --git a/metadata/md5-cache/dev-libs/softhsm-2.3.0 b/metadata/md5-cache/dev-libs/softhsm-2.3.0
new file mode 100644
index 000000000000..8f68fa9ab8e7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/softhsm-2.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-devel/gcc:=[cxx] migration-tool? ( dev-db/sqlite:3 ) !libressl? ( dev-libs/openssl:=[bindist=] ) libressl? ( dev-libs/libressl ) !=dev-libs/softhsm-2.0.0:0 virtual/pkgconfig test? ( dev-util/cppunit )
+DESCRIPTION=A software PKCS#11 implementation
+EAPI=6
+HOMEPAGE=http://www.opendnssec.org/
+IUSE=bindist libressl migration-tool test
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=sys-devel/gcc:=[cxx] migration-tool? ( dev-db/sqlite:3 ) !libressl? ( dev-libs/openssl:=[bindist=] ) libressl? ( dev-libs/libressl ) !=dev-libs/softhsm-2.0.0:0
+SLOT=2
+SRC_URI=http://www.opendnssec.org/files/source/softhsm-2.3.0.tar.gz
+_eclasses_=ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=3b87707c84b60ccb11fbe22a286f45a6
diff --git a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r1 b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r1
index 123c37f0cd85..fa214fc4d33e 100644
--- a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r1
+++ b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Bit Operations Library for the Lua Programming Language
EAPI=5
HOMEPAGE=http://bitop.luajit.org
IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86
LICENSE=MIT
RDEPEND=>=dev-lang/lua-5.1.5-r2:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0
SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.2.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=d22468e306b31b47cc0b14bb38b684c5
+_md5_=b867f76a388f22900bd288c9a07df6e0
diff --git a/metadata/md5-cache/dev-lua/lpeg-1.0.1 b/metadata/md5-cache/dev-lua/lpeg-1.0.1
index 41810a1f6385..d41ed4d6b49f 100644
--- a/metadata/md5-cache/dev-lua/lpeg-1.0.1
+++ b/metadata/md5-cache/dev-lua/lpeg-1.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Parsing Expression Grammars for Lua
EAPI=6
HOMEPAGE=http://www.inf.puc-rio.br/~roberto/lpeg/
IUSE=debug doc luajit
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~x86
LICENSE=MIT
RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2= )
SLOT=0
SRC_URI=http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.1.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=8b1ddc91ed51ea6576dc82cd1a50f64a
+_md5_=8b56458d80ed9183600809da367ddeaf
diff --git a/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r1 b/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r1
index 2394c447b794..9b5142cdd1eb 100644
--- a/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r1
+++ b/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=LuaExpat is a SAX XML parser based on the Expat library
EAPI=5
HOMEPAGE=http://www.keplerproject.org/luaexpat/
IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm hppa ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 sparc x86
LICENSE=MIT
RDEPEND=>=dev-lang/lua-5.1.5-r2[deprecated,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0
SRC_URI=http://matthewwild.co.uk/projects/luaexpat/luaexpat-1.3.0.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=10e5002700c8eb67e97b7b82c90b8ec2
+_md5_=d1a3944b361ecd0a24e07defed941514
diff --git a/metadata/md5-cache/dev-lua/luajson-1.3.3 b/metadata/md5-cache/dev-lua/luajson-1.3.3
index d89e2e34d5d3..bcbce3eb4db6 100644
--- a/metadata/md5-cache/dev-lua/luajson-1.3.3
+++ b/metadata/md5-cache/dev-lua/luajson-1.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=JSON Parser/Constructor for Lua
EAPI=5
HOMEPAGE=https://www.eharning.us/wiki/luajson/
IUSE=test
-KEYWORDS=~amd64 ~arm ~hppa ~mips ppc ppc64 sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc ~x86
LICENSE=MIT
RDEPEND=|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 ) dev-lua/lpeg
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/harningt/luajson/archive/1.3.3.tar.gz -> luajson-1.3.3.tar.gz
-_md5_=9e1a06e224fb2c2a62f3b321c4b53384
+_md5_=2ca04c4591063c83db2f4cf14bfdc796
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r3 b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r3
index 1c386238b2e4..5472728c43e1 100644
--- a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r3
+++ b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Networking support library for the Lua language
EAPI=5
HOMEPAGE=http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86
LICENSE=MIT
RDEPEND=>=dev-lang/lua-5.1.5-r2[deprecated,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz -> luasocket-3.0_rc1.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=1e42cc785d9e594ba46a4bfc620bd23d
+_md5_=0567c9c5ac99fbe9ee25fb012b7be326
diff --git a/metadata/md5-cache/dev-ml/bin-prot-0.9.1 b/metadata/md5-cache/dev-ml/bin-prot-0.9.1
new file mode 100644
index 000000000000..bba9590d5efb
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/bin-prot-0.9.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install test
+DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
+DESCRIPTION=Binary protocol generator
+EAPI=6
+HOMEPAGE=https://github.com/janestreet/bin_prot
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:=
+SLOT=0/0.9.1
+SRC_URI=https://github.com/janestreet/bin_prot/archive/v0.9.1.tar.gz -> bin-prot-0.9.1.tar.gz
+_md5_=ca7055131f1fcafb82f0ccb0307cf5d6
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.9999
index 019499a8d42b..82b564129080 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-5.0.9999:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?] !sys-devel/llvm[ocaml(-)] dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-5.0.9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) !!=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-5.0.9999:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)] dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-5.0.9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) !!=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
DESCRIPTION=OCaml bindings for LLVM
EAPI=6
HOMEPAGE=https://llvm.org/
-IUSE=test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore
LICENSE=UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-5.0.9999:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?] !sys-devel/llvm[ocaml(-)]
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-5.0.9999:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)]
REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
SLOT=0/5.0.9999
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 llvm 2564476f64d2d9b62d757ff42101ff7b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cda3365a166cca6061febace04bdd0e0
+_md5_=7ac4277c8a703f5631a1d9b8f4a820af
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-9999
index 44cd67926931..853c4bca42d0 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9999:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?] !sys-devel/llvm[ocaml(-)] dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) !!=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9999:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)] dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) !!=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
DESCRIPTION=OCaml bindings for LLVM
EAPI=6
HOMEPAGE=https://llvm.org/
-IUSE=test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore
LICENSE=UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9999:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?] !sys-devel/llvm[ocaml(-)]
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9999:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)]
REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
SLOT=0/9999
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 llvm 2564476f64d2d9b62d757ff42101ff7b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e6f0c832e388e723e2a9c7e907905942
+_md5_=3aa7fc332ab159616c97ecd6d9ef32f0
diff --git a/metadata/md5-cache/dev-ml/merlin-3.0.1 b/metadata/md5-cache/dev-ml/merlin-3.0.1
new file mode 100644
index 000000000000..8e24f7912293
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/merlin-3.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=dev-lang/ocaml:= dev-ml/yojson:= >=dev-ml/findlib-1.0.4-r1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
+EAPI=6
+HOMEPAGE=https://github.com/ocaml/merlin
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-lang/ocaml:= dev-ml/yojson:= || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0/3.0.1
+SRC_URI=https://github.com/ocaml/merlin/archive/v3.0.1.tar.gz -> merlin-3.0.1.tar.gz
+_eclasses_=findlib 45d6030075064a68da8d7143726a1150 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 6f0171b0a2f2fce005c13b4c0685a0d8
+_md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0 b/metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0
new file mode 100644
index 000000000000..bcc8829058fe
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-ml/result:= dev-lang/ocaml:= dev-ml/jbuilder dev-ml/opam test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Path-based dispatching for client- and server-side applications
+EAPI=5
+HOMEPAGE=https://github.com/inhabitedtype/ocaml-dispatch
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ml/result:= dev-lang/ocaml:=
+SLOT=0/0.4.0
+SRC_URI=https://github.com/inhabitedtype/ocaml-dispatch/archive/0.4.0.tar.gz -> ocaml-dispatch-0.4.0.tar.gz
+_eclasses_=findlib 45d6030075064a68da8d7143726a1150
+_md5_=5ba3990520dbb30f7b5915532ee0a3cc
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.1 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.1
index 78b2556852cf..0bc33c43feda 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.1
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/ocaml:= dev-ml/result:= dev-ml/jbuilder dev-ml/opam >=dev-ml/fin
DESCRIPTION=Convert OCaml parsetrees between different major versions
EAPI=6
HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~arm64
LICENSE=LGPL-2.1
RDEPEND=dev-lang/ocaml:= dev-ml/result:=
SLOT=0/1.0.1
SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/1.0.1.tar.gz -> ocaml-migrate-parsetree-1.0.1.tar.gz
_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=5cdbc5e4d9e0b8181b33140a92d947c4
+_md5_=3585da9a39251936d7c51f19cf192ee8
diff --git a/metadata/md5-cache/dev-ml/ocaml-stdint-0.4.1 b/metadata/md5-cache/dev-ml/ocaml-stdint-0.4.1
new file mode 100644
index 000000000000..bf054a1737e6
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-stdint-0.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
+DESCRIPTION=Various signed and unsigned integers for OCaml
+EAPI=5
+HOMEPAGE=https://github.com/andrenth/ocaml-stdint
+IUSE=+ocamlopt debug doc
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/0.4.1
+SRC_URI=https://github.com/andrenth/ocaml-stdint/archive/0.4.1.tar.gz -> ocaml-stdint-0.4.1.tar.gz
+_eclasses_=base df2aa567b3f0595aae0d0923889f7631 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea findlib 45d6030075064a68da8d7143726a1150 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=ccd77af0377bf14d5a92355f941f44d9
diff --git a/metadata/md5-cache/dev-ml/ocaml-webmachine-0.4.0 b/metadata/md5-cache/dev-ml/ocaml-webmachine-0.4.0
index 6b0d453cfda5..03a579a345a5 100644
--- a/metadata/md5-cache/dev-ml/ocaml-webmachine-0.4.0
+++ b/metadata/md5-cache/dev-ml/ocaml-webmachine-0.4.0
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/calendar:= dev-ml/ocaml-cohttp:=[ocamlopt?] dev-ml/ocaml-dispatch:=[ocamlopt?] dev-ml/ocaml-re:=[ocamlopt?] dev-ml/ocaml-uri:=[ocamlopt(+)?] test? ( dev-ml/ounit[ocamlopt?] ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
+DEPEND=dev-ml/calendar:= dev-ml/ocaml-cohttp:=[ocamlopt?] dev-ml/ocaml-dispatch:=[ocamlopt(+)?] dev-ml/ocaml-re:=[ocamlopt?] dev-ml/ocaml-uri:=[ocamlopt(+)?] test? ( dev-ml/ounit[ocamlopt?] ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
DESCRIPTION=A REST toolkit for OCaml
EAPI=5
HOMEPAGE=https://github.com/inhabitedtype/ocaml-webmachine
IUSE=+ocamlopt debug doc test
KEYWORDS=~amd64
LICENSE=BSD
-RDEPEND=dev-ml/calendar:= dev-ml/ocaml-cohttp:=[ocamlopt?] dev-ml/ocaml-dispatch:=[ocamlopt?] dev-ml/ocaml-re:=[ocamlopt?] dev-ml/ocaml-uri:=[ocamlopt(+)?] >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RDEPEND=dev-ml/calendar:= dev-ml/ocaml-cohttp:=[ocamlopt?] dev-ml/ocaml-dispatch:=[ocamlopt(+)?] dev-ml/ocaml-re:=[ocamlopt?] dev-ml/ocaml-uri:=[ocamlopt(+)?] >=dev-lang/ocaml-3.12:=[ocamlopt?]
SLOT=0/0.4.0
SRC_URI=https://github.com/inhabitedtype/ocaml-webmachine/archive/0.4.0.tar.gz -> ocaml-webmachine-0.4.0.tar.gz
_eclasses_=base df2aa567b3f0595aae0d0923889f7631 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea findlib 45d6030075064a68da8d7143726a1150 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e oasis 9256ed89af74c3365ec888c00bfdfe43 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=488dafefb8249a901254d02ee6926a79
+_md5_=7076f45155bc05998df45b4bc4c07ccd
diff --git a/metadata/md5-cache/dev-ml/ppx_inline_test-0.9.2 b/metadata/md5-cache/dev-ml/ppx_inline_test-0.9.2
new file mode 100644
index 000000000000..8f83294cf653
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_inline_test-0.9.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_traverse_builtins:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
+DESCRIPTION=Syntax extension for writing in-line tests in ocaml code
+EAPI=6
+HOMEPAGE=https://github.com/janestreet/ppx_inline_test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_traverse_builtins:= dev-ml/ocaml-migrate-parsetree:=
+SLOT=0/0.9.2
+SRC_URI=https://github.com/janestreet/ppx_inline_test/archive/v0.9.2.tar.gz -> ppx_inline_test-0.9.2.tar.gz
+_md5_=095e3fa1d18d3cec382444df014dab11
diff --git a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0.1 b/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0.1
index 35318de822ee..1547f4d4587d 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0.1
+++ b/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0.1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/ocaml:= dev-ml/ocaml-migrate-parsetree:= >=dev-ml/findlib-1.0.4-
DESCRIPTION=Tools for authors of ppx rewriters
EAPI=6
HOMEPAGE=https://github.com/let-def/ppx_tools_versioned
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~arm64
LICENSE=MIT
RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-migrate-parsetree:=
SLOT=0/5.0.1
SRC_URI=https://github.com/let-def/ppx_tools_versioned/archive/5.0.1.tar.gz -> ppx_tools_versioned-5.0.1.tar.gz
_eclasses_=findlib 45d6030075064a68da8d7143726a1150
-_md5_=7f3291f361c004ea09a9654d6ddf3000
+_md5_=fb20eb3fa6028b51ccfc394634a56769
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.9.2 b/metadata/md5-cache/dev-ml/sexplib-0.9.2
new file mode 100644
index 000000000000..57ec97f40da8
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/sexplib-0.9.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install test
+DEPEND=dev-lang/ocaml:= dev-ml/opam dev-ml/jbuilder
+DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expressions
+EAPI=6
+HOMEPAGE=https://github.com/janestreet/sexplib
+KEYWORDS=~amd64 ~ppc
+LICENSE=Apache-2.0
+RDEPEND=dev-lang/ocaml:=
+SLOT=0/0.9.2
+SRC_URI=https://github.com/janestreet/sexplib/archive/v0.9.2.tar.gz -> sexplib-0.9.2.tar.gz
+_md5_=cff0e9f9c27764190ab2e7a1e9b15302
diff --git a/metadata/md5-cache/dev-php/cphplib-0.51 b/metadata/md5-cache/dev-php/cphplib-0.51-r1
similarity index 83%
rename from metadata/md5-cache/dev-php/cphplib-0.51
rename to metadata/md5-cache/dev-php/cphplib-0.51-r1
index 72a954f9d810..aafde351edfd 100644
--- a/metadata/md5-cache/dev-php/cphplib-0.51
+++ b/metadata/md5-cache/dev-php/cphplib-0.51-r1
@@ -1,11 +1,12 @@
DEFINED_PHASES=install
DEPEND=>=dev-php/PEAR-DB-1.7.6-r1
DESCRIPTION=Cute PHP Library (cphplib)
-EAPI=4
+EAPI=6
HOMEPAGE=http://cphplib.sourceforge.net/
+IUSE=doc
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
RDEPEND=>=dev-php/PEAR-DB-1.7.6-r1
SLOT=0
SRC_URI=mirror://sourceforge/cphplib/cphplib-0.51.tar.bz2
-_md5_=bace0a188d4ab3230db7d71531367440
+_md5_=f63358e171a88a8ba1425aa5e585ca03
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-0.13-r3 b/metadata/md5-cache/dev-php/pecl-ssh2-0.13-r3
index cb7cf0bbbe9c..40806abdb6ca 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-0.13-r3
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-0.13-r3
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-libs/libssh2 >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+DEPEND=net-libs/libssh2[-gcrypt] >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
DESCRIPTION=PHP bindings for the libssh2 library
EAPI=6
HOMEPAGE=http://pecl.php.net/ssh2
@@ -7,9 +7,9 @@ IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
KEYWORDS=~amd64 ~x86
LICENSE=PHP-3.01
PDEPEND=php_targets_php7-0? ( dev-php/pecl-ssh2:7 ) php_targets_php7-1? ( dev-php/pecl-ssh2:7 )
-RDEPEND=net-libs/libssh2 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+RDEPEND=net-libs/libssh2[-gcrypt] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
SLOT=0
SRC_URI=http://pecl.php.net/get/ssh2-0.13.tgz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool e32ea84bf82cf8987965b574672dba93 multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 f0b4914f85a3c676561454b15a910dc6 php-ext-source-r3 02131d21ec5edc689a1ef97096214131 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=d6c3d1cf6fd627e5eb4a65a2d7bdc43e
+_md5_=a818401ccb7f724d6954570cc2403095
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-1.1.1 b/metadata/md5-cache/dev-php/pecl-ssh2-1.1.1
index 0aa7a9ddc953..fd4229f61f4f 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-1.1.1
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-1.1.1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=net-libs/libssh2-1.2 >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+DEPEND=>=net-libs/libssh2-1.2[-gcrypt] >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
DESCRIPTION=PHP bindings for the libssh2 library
EAPI=6
HOMEPAGE=http://pecl.php.net/ssh2
IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
KEYWORDS=~amd64 ~x86
LICENSE=PHP-3.01
-RDEPEND=>=net-libs/libssh2-1.2 php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+RDEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
SLOT=7
SRC_URI=http://pecl.php.net/get/ssh2-1.1.1.tgz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool e32ea84bf82cf8987965b574672dba93 multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 f0b4914f85a3c676561454b15a910dc6 php-ext-source-r3 02131d21ec5edc689a1ef97096214131 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=8eb564b6a70ce1094bc3e82548a89239
+_md5_=40f063264cd963baa3dc6d3b3c2fad06
diff --git a/metadata/md5-cache/dev-python/dbus-python-1.2.4 b/metadata/md5-cache/dev-python/dbus-python-1.2.4
index db240b33ed09..4cfd1c8feb24 100644
--- a/metadata/md5-cache/dev-python/dbus-python-1.2.4
+++ b/metadata/md5-cache/dev-python/dbus-python-1.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the D-Bus messagebus
EAPI=6
HOMEPAGE=https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/
IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
LICENSE=MIT
RDEPEND=>=dev-libs/dbus-glib-0.100:= >=sys-apps/dbus-1.6:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) doc? ( python_targets_python2_7 )
SLOT=0
SRC_URI=https://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.4.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=fefe6cfa1f6ff3cf794f97b4d15fe034
+_md5_=1fd6b3bcd88be07ffe6aa3771d9148d7
diff --git a/metadata/md5-cache/dev-python/ipython-5.4.1 b/metadata/md5-cache/dev-python/ipython-5.4.1
index cbc3e4e7676e..1cc35fdc13e7 100644
--- a/metadata/md5-cache/dev-python/ipython-5.4.1
+++ b/metadata/md5-cache/dev-python/ipython-5.4.1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/typing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/typing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=Advanced interactive shell for Python
EAPI=6
HOMEPAGE=http://ipython.org/
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=mirror://pypi/i/ipython/ipython-5.4.1.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=28fbfacec888ab90a96ee09f951adee4
+_md5_=a8380156b6382a362d5938d4edf80961
diff --git a/metadata/md5-cache/dev-python/keyring-10.0.2-r1 b/metadata/md5-cache/dev-python/keyring-10.0.2-r1
deleted file mode 100644
index 5af9314ce7d3..000000000000
--- a/metadata/md5-cache/dev-python/keyring-10.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/secretstorage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Provides access to the system keyring service
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/keyring
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keyring/keyring-10.0.2.tar.gz
-_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=f9596216428f4e686b189032ab81d3c5
diff --git a/metadata/md5-cache/dev-python/keyring-10.1 b/metadata/md5-cache/dev-python/keyring-10.1
deleted file mode 100644
index e7d00687f5a2..000000000000
--- a/metadata/md5-cache/dev-python/keyring-10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/secretstorage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Provides access to the system keyring service
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/keyring
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keyring/keyring-10.1.tar.gz
-_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=00c10d063f1c4da6b4fe49febf7b9fbc
diff --git a/metadata/md5-cache/dev-python/keyring-10.1-r1 b/metadata/md5-cache/dev-python/keyring-10.1-r1
deleted file mode 100644
index 435a4509ef6e..000000000000
--- a/metadata/md5-cache/dev-python/keyring-10.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/secretstorage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Provides access to the system keyring service
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/keyring
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keyring/keyring-10.1.tar.gz
-_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=530bbd9399ab9f796a1decf3714e55fd
diff --git a/metadata/md5-cache/dev-python/keyring-10.2 b/metadata/md5-cache/dev-python/keyring-10.2
deleted file mode 100644
index 6ea29b8a9ed2..000000000000
--- a/metadata/md5-cache/dev-python/keyring-10.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/secretstorage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Provides access to the system keyring service
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/keyring
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keyring/keyring-10.2.tar.gz
-_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=8db119bb8e36171b7c379ae36cc68f61
diff --git a/metadata/md5-cache/dev-python/keyring-10.3.2 b/metadata/md5-cache/dev-python/keyring-10.3.2
deleted file mode 100644
index c5ba2916a7f7..000000000000
--- a/metadata/md5-cache/dev-python/keyring-10.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/secretstorage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Provides access to the system keyring service
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/keyring
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keyring/keyring-10.3.2.tar.gz
-_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=417c310c8954172330e527d0f687227a
diff --git a/metadata/md5-cache/dev-python/keyring-10.4.0 b/metadata/md5-cache/dev-python/keyring-10.4.0
index d04385fe3b65..8ff2a49e50f4 100644
--- a/metadata/md5-cache/dev-python/keyring-10.4.0
+++ b/metadata/md5-cache/dev-python/keyring-10.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Provides access to the system keyring service
EAPI=6
HOMEPAGE=https://github.com/jaraco/keyring
IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
LICENSE=PSF-2
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/k/keyring/keyring-10.4.0.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=2a5aa5f990174722ba0db288adbd64c3
+_md5_=aa399e392b4117fed3f42fe47f20e610
diff --git a/metadata/md5-cache/dev-python/keyring-9.3.1 b/metadata/md5-cache/dev-python/keyring-9.3.1
deleted file mode 100644
index 802fbaea9988..000000000000
--- a/metadata/md5-cache/dev-python/keyring-9.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest-runner[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Provides access to the system keyring service
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/keyring
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keyring/keyring-9.3.1.tar.gz
-_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=207452bd846d27f470bb66a0d2b134ff
diff --git a/metadata/md5-cache/dev-python/nltk-3.2.2 b/metadata/md5-cache/dev-python/nltk-3.2.2
index 9e698337bd02..e0f454c2b530 100644
--- a/metadata/md5-cache/dev-python/nltk-3.2.2
+++ b/metadata/md5-cache/dev-python/nltk-3.2.2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=numpy? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=numpy? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,tk?,xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite,tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
DESCRIPTION=Natural Language Toolkit
EAPI=6
HOMEPAGE=http://nltk.org/
IUSE=numpy tk python_targets_python2_7 python_targets_python3_4
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
LICENSE=Apache-2.0
-RDEPEND=numpy? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+RDEPEND=numpy? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,tk?,xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite,tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
SLOT=0
SRC_URI=mirror://pypi/n/nltk/nltk-3.2.2.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=81dc1e095c1e961c18cc3cf616801fee
+_md5_=07a08d822ce2c421bddd61e449b5fb61
diff --git a/metadata/md5-cache/dev-python/nltk-3.2.3 b/metadata/md5-cache/dev-python/nltk-3.2.3
index c638281e7102..8185d507f9de 100644
--- a/metadata/md5-cache/dev-python/nltk-3.2.3
+++ b/metadata/md5-cache/dev-python/nltk-3.2.3
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=numpy? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=numpy? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,tk?,xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite,tk?,xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite,tk?,xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=Natural Language Toolkit
EAPI=6
HOMEPAGE=http://nltk.org/
IUSE=numpy test tk python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
LICENSE=Apache-2.0
-RDEPEND=numpy? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=numpy? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,tk?,xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite,tk?,xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite,tk?,xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
RESTRICT=test
SLOT=0
SRC_URI=mirror://pypi/n/nltk/nltk-3.2.3.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e030ff4f1be892e58d47e3866d9a3602
+_md5_=16e3d722dc45642b25c12d0c40a07c7b
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.73-r1 b/metadata/md5-cache/dev-python/pycups-1.9.73-r1
index 69e25282e2af..a40c9a81231c 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.73-r1
+++ b/metadata/md5-cache/dev-python/pycups-1.9.73-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the CUPS API
EAPI=6
HOMEPAGE=http://cyberelk.net/tim/data/pycups/
IUSE=doc examples python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
LICENSE=GPL-2
RDEPEND=net-print/cups python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=mirror://pypi/p/pycups/pycups-1.9.73.tar.bz2
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=6e438a5cd1b4bceb9c5567fb2f877035
+_md5_=61a62d692ffc82a866cbe854309e30df
diff --git a/metadata/md5-cache/dev-python/pysnmp-4.3.3 b/metadata/md5-cache/dev-python/pysnmp-4.3.3
index ea4f15a51714..0d2b17e8426a 100644
--- a/metadata/md5-cache/dev-python/pysnmp-4.3.3
+++ b/metadata/md5-cache/dev-python/pysnmp-4.3.3
@@ -6,9 +6,9 @@ HOMEPAGE=http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp
IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
LICENSE=BSD
-RDEPEND=>=dev-python/pyasn1-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+RDEPEND=>=dev-python/pyasn1-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=mirror://pypi/p/pysnmp/pysnmp-4.3.3.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e3eb683ecd39a0a7366ca409496f9558
+_md5_=1a181e74413baaa67be6f72cb47d96a4
diff --git a/metadata/md5-cache/dev-python/pysnmp-4.3.7 b/metadata/md5-cache/dev-python/pysnmp-4.3.7
deleted file mode 100644
index 84883de9d75b..000000000000
--- a/metadata/md5-cache/dev-python/pysnmp-4.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python SNMP library
-EAPI=6
-HOMEPAGE=http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp
-IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pysnmp/pysnmp-4.3.7.tar.gz
-_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=acd6aca34add6b6063af66297ab331ce
diff --git a/metadata/md5-cache/dev-python/pysnmp-4.3.8 b/metadata/md5-cache/dev-python/pysnmp-4.3.8
index 322e65a24f5a..626e76f64bde 100644
--- a/metadata/md5-cache/dev-python/pysnmp-4.3.8
+++ b/metadata/md5-cache/dev-python/pysnmp-4.3.8
@@ -6,9 +6,9 @@ HOMEPAGE=http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp
IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=BSD
-RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=mirror://pypi/p/pysnmp/pysnmp-4.3.8.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=acd6aca34add6b6063af66297ab331ce
+_md5_=2ec356ef79f65b862cf5551f9ba8df05
diff --git a/metadata/md5-cache/dev-python/pysnmp-4.3.5 b/metadata/md5-cache/dev-python/pysnmp-4.3.9
similarity index 65%
rename from metadata/md5-cache/dev-python/pysnmp-4.3.5
rename to metadata/md5-cache/dev-python/pysnmp-4.3.9
index 00b11e3046e4..ec6f6f58caa7 100644
--- a/metadata/md5-cache/dev-python/pysnmp-4.3.5
+++ b/metadata/md5-cache/dev-python/pysnmp-4.3.9
@@ -6,9 +6,9 @@ HOMEPAGE=http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp
IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=BSD
-RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
-SRC_URI=mirror://pypi/p/pysnmp/pysnmp-4.3.5.tar.gz
+SRC_URI=mirror://pypi/p/pysnmp/pysnmp-4.3.9.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=acd6aca34add6b6063af66297ab331ce
+_md5_=2ec356ef79f65b862cf5551f9ba8df05
diff --git a/metadata/md5-cache/dev-python/sympy-1.1.1 b/metadata/md5-cache/dev-python/sympy-1.1.1
new file mode 100644
index 000000000000..e165c90dee0f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sympy-1.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) pyglet? ( dev-python/pyglet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) symengine? ( dev-python/symengine[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) texmacs? ( app-office/texmacs ) theano? ( dev-python/theano[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/docbook2X ) test? ( dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) pyglet? ( dev-python/pyglet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) symengine? ( dev-python/symengine[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) texmacs? ( app-office/texmacs ) theano? ( dev-python/theano[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Computer Algebra System in pure Python
+EAPI=6
+HOMEPAGE=http://sympy.org
+IUSE=doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) pyglet? ( dev-python/pyglet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) symengine? ( dev-python/symengine[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) texmacs? ( app-office/texmacs ) theano? ( dev-python/theano[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/sympy/sympy/releases/download/sympy-1.1.1/sympy-1.1.1.tar.gz
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=4b1902245646fb836daf9b00232c21d6
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2 b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
index 8b596a5a3114..beb11df0cf63 100644
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
+++ b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP proxying tools for WSGI apps
EAPI=5
HOMEPAGE=http://pythonpaste.org/wsgiproxy/
IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm hppa ia64 ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc64 ~s390 ~sh sparc x86
LICENSE=MIT
RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/webob[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/W/WSGIProxy2/WSGIProxy2-0.4.2.zip
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=77966271ef6e9fc5d41d0aa36d761bcf
+_md5_=23a8052515c5d5b259748809c8fe80c4
diff --git a/metadata/md5-cache/dev-python/xlwt-1.2.0 b/metadata/md5-cache/dev-python/xlwt-1.2.0
index 3278e802789d..36e664c63d5b 100644
--- a/metadata/md5-cache/dev-python/xlwt-1.2.0
+++ b/metadata/md5-cache/dev-python/xlwt-1.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python library to create spreadsheet files compatible with Excel
EAPI=6
HOMEPAGE=https://pypi.python.org/pypi/xlwt
IUSE=doc examples test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/x/xlwt/xlwt-1.2.0.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e20fe1be384f6f4d6c4e74d15fce53f2
+_md5_=9b63ad5176a111dbfdd8464b33aa24b2
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.8 b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.8
new file mode 100644
index 000000000000..310ebd3af998
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=GUI plugin for visualizing the ROS TF frame tree
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rqt_tf_tree
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_tf_tree/archive/0.5.8.tar.gz -> rqt_tf_tree-0.5.8.tar.gz
+_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d ros-catkin eff12e024f16913cfb3da0e96a045552 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6931a34e8a2e42dc4c86253278d4bf02
diff --git a/metadata/md5-cache/dev-ruby/facter-3.1.4-r1 b/metadata/md5-cache/dev-ruby/facter-3.1.4-r1
deleted file mode 100644
index d4e4040c10eb..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.1.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl !=dev-util/cmake-3.7.2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=5
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
-KEYWORDS=amd64 ~hppa ~ppc ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl !=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-libs/leatherman-0.9.3 >=dev-cpp/yaml-cpp-0.5.1 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl !=dev-util/cmake-3.7.2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=5
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ! facter-3.6.1.tar.gz
-_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9c42631105bdf73cbe865b597f038362
diff --git a/metadata/md5-cache/dev-ruby/facter-3.6.3-r1 b/metadata/md5-cache/dev-ruby/facter-3.6.3-r1
deleted file mode 100644
index 2d2ae9036d23..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.6.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-libs/leatherman-0.9.3 >=dev-cpp/yaml-cpp-0.5.1 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl !=dev-util/cmake-3.7.2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=5
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ! facter-3.6.3.tar.gz
-_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7a3c6a0a4c3eaca694df46e61b35cd98
diff --git a/metadata/md5-cache/dev-ruby/facter-3.7.0 b/metadata/md5-cache/dev-ruby/facter-3.7.0
deleted file mode 100644
index e8aa08e70252..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !=dev-util/cmake-3.7.2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=5
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 ! facter-3.7.0.tar.gz
-_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=396539a75d39aeb6c3735a4b27a44669
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.12.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.12.0
new file mode 100644
index 000000000000..cb0b262d3c86
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.12.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby21] =dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] =dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] =dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby23] ) ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] dev-ruby/webmock:0[ruby_targets_ruby21] dev-ruby/json:0[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby21] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] >=dev-ruby/hashie-1.2[ruby_targets_ruby21] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] >=dev-ruby/hashie-1.2[ruby_targets_ruby22] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/addressable[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/webmock:0[ruby_targets_ruby23] dev-ruby/json:0[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] >=dev-ruby/hashie-1.2[ruby_targets_ruby23] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Various middleware for Faraday
+EAPI=6
+HOMEPAGE=https://github.com/lostisland/faraday_middleware
+IUSE=+parsexml +oauth +mashify +rashify test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby21] =dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] =dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] =dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v0.12.0.tar.gz -> faraday_middleware-0.12.0.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=23151a9dedb3a29cd074161c255c3c1d
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4 b/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4
index b3eaacca0a62..84e7c9e7410b 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/thor-0.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/thor-0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/thor-0.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/thor-0.14[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/thor-0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
DESCRIPTION=jQuery! For Rails! So great
EAPI=5
HOMEPAGE=http://www.rubyonrails.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/thor-0.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/thor-0.14[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/thor-0.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/thor-0.14[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/thor-0.14[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
SLOT=3
SRC_URI=mirror://rubygems/jquery-rails-3.1.4.gem
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2a1c875016dac7f3203ab8b7550268ce
+_md5_=36735e9fa59a35edb97c9e821756c2b9
diff --git a/metadata/md5-cache/dev-ruby/lockfile-2.1.3 b/metadata/md5-cache/dev-ruby/lockfile-2.1.3
index 02a93db8a48d..d32b90038b46 100644
--- a/metadata/md5-cache/dev-ruby/lockfile-2.1.3
+++ b/metadata/md5-cache/dev-ruby/lockfile-2.1.3
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=A ruby library for creating NFS safe lockfiles
EAPI=5
HOMEPAGE=https://github.com/ahoward/lockfile
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
KEYWORDS=~amd64
LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://rubygems/lockfile-2.1.3.gem
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2af56df5bae9bb4123c769ce72cc0f50
+_md5_=8aeec88bebd6941325f0ae7335b2d5e5
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
index 2df7ce5a0937..75a36b5291d2 100644
--- a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Bonus assertions for minitest
EAPI=6
HOMEPAGE=https://github.com/halostatue/minitest-bonus-assertions
IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=2
SRC_URI=mirror://rubygems/minitest-bonus-assertions-3.0.gem
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b3e11dc514c8ed24e2152ab35185382a
+_md5_=3e2631038e55549cfe49ca443a20f271
diff --git a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1 b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
index 874cc94d5cc4..59fb0dd50b0e 100644
--- a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
+++ b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Pretty-print hashes and arrays before diffing them in MiniTest
EAPI=5
HOMEPAGE=https://github.com/adammck/minitest-pretty_diff
IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://rubygems/minitest-pretty_diff-0.1.gem
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2eec8639e5d86839e7befb831299d2e1
+_md5_=a10af6946b926559dfcb8f89e5e5f14c
diff --git a/metadata/md5-cache/dev-ruby/mixlib-shellout-2.3.2 b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.3.2
new file mode 100644
index 000000000000..4dcb84c5296e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Run external commands on Unix or Windows
+EAPI=6
+HOMEPAGE=https://github.com/opscode/mixlib-shellout
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/opscode/mixlib-shellout/archive/v2.3.2.tar.gz -> mixlib-shellout-2.3.2.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6f4f25f007bc1bf56609db00db514329
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0 b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0
index a39dffecd1c1..312722bc2de0 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/ox[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/ox[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ox[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/ox[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/ox[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ox[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/ox[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=A generic swappable back-end for XML parsing
EAPI=5
HOMEPAGE=http://rdoc.info/gems/multi_xml
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=https://github.com/sferik/multi_xml/archive/v0.6.0.tar.gz -> multi_xml-0.6.0.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6f15d0701faca07a21104f9d83c94c28
+_md5_=782f14d760587bd9e80719c6f3313c4f
diff --git a/metadata/md5-cache/dev-ruby/rash_alt-0.4.3 b/metadata/md5-cache/dev-ruby/rash_alt-0.4.3
new file mode 100644
index 000000000000..d665d117e2b9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rash_alt-0.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Rash alt version for Hashie's own Rash
+EAPI=6
+HOMEPAGE=https://github.com/shishi/rash_alt
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby24] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/rash_alt-0.4.3.gem
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ca52210389d866539d651f316c92a26f
diff --git a/metadata/md5-cache/dev-ruby/rex-arch-0.1.1 b/metadata/md5-cache/dev-ruby/rex-arch-0.1.1
deleted file mode 100644
index 82cfa3db4991..000000000000
--- a/metadata/md5-cache/dev-ruby/rex-arch-0.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=architecture specific information for Rex
-EAPI=5
-HOMEPAGE=https://rubygems.org/gems/rex-arch
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://rubygems/rex-arch-0.1.1.gem
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=42c578e112f416ae67f96ce2946a927e
diff --git a/metadata/md5-cache/dev-ruby/rex-arch-0.1.2 b/metadata/md5-cache/dev-ruby/rex-arch-0.1.2
deleted file mode 100644
index cdf8cbe9dd7f..000000000000
--- a/metadata/md5-cache/dev-ruby/rex-arch-0.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=architecture specific information for Rex
-EAPI=5
-HOMEPAGE=https://rubygems.org/gems/rex-arch
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://rubygems/rex-arch-0.1.2.gem
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=42c578e112f416ae67f96ce2946a927e
diff --git a/metadata/md5-cache/dev-ruby/rex-core-0.1.12 b/metadata/md5-cache/dev-ruby/rex-core-0.1.12
new file mode 100644
index 000000000000..c73125b22034
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rex-core-0.1.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Core libraries required for the Ruby Exploitation(Rex) Suite
+EAPI=6
+HOMEPAGE=https://rubygems.org/gems/rex-core
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/rex-core-0.1.12.gem
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f03423d06062a8f37e7d17efdaa68924
diff --git a/metadata/md5-cache/dev-ruby/rinku-2.0.2 b/metadata/md5-cache/dev-ruby/rinku-2.0.2
index 4777fba62678..19cad3d197a1 100644
--- a/metadata/md5-cache/dev-ruby/rinku-2.0.2
+++ b/metadata/md5-cache/dev-ruby/rinku-2.0.2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=A Ruby library that does autolinking
EAPI=5
HOMEPAGE=https://github.com/vmg/rinku
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
KEYWORDS=~amd64
LICENSE=ISC
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://rubygems/rinku-2.0.2.gem
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b7e0d3a5b24b414f3a1d2ffb50cfd03c
+_md5_=0518ff10404aa9c76b4c8b94b2b3bd69
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.2.1 b/metadata/md5-cache/dev-ruby/rubyzip-1.2.1
index b06afd7116fe..dbb94c08585a 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.2.1
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=A ruby library for reading and writing zip files
EAPI=5
HOMEPAGE=https://github.com/rubyzip/rubyzip
IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd
LICENSE=Ruby
RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=1
SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.2.1.tar.gz -> rubyzip-1.2.1-git.tgz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=90cd7351ba9974e8bf06507e3307cace
+_md5_=45cbccc0b2beea42e9812ff14ff04777
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.4 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.4
index 26cb5fb2ad55..7a865228d3ec 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.4
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=This gem provides Ruby bindings for WebDriver
EAPI=6
HOMEPAGE=https://github.com/seleniumhq/selenium
IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=Apache-2.0
RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=3
SRC_URI=mirror://rubygems/selenium-webdriver-3.4.4.gem
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng e52d9a73c7757cdc3b195bcd5cf9d389 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a61e305812a18100d8655c333afa376f
+_md5_=2acc02fc3b988258314b038148daf08f
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.8 b/metadata/md5-cache/dev-ruby/tilt-2.0.8
new file mode 100644
index 000000000000..304d748b639d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby21] dev-ruby/coffee-script[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] !!=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
+DESCRIPTION=HeVeA is a quite complete and fast LaTeX to HTML translator
+EAPI=5
+HOMEPAGE=http://hevea.inria.fr/
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=QPL
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-texlive/texlive-latexextra
+SLOT=0
+SRC_URI=http://hevea.inria.fr/distri/hevea-2.30.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=2ac09bba01dfa0430c9adc24276348ce
diff --git a/metadata/md5-cache/dev-util/clazy-1.2 b/metadata/md5-cache/dev-util/clazy-1.2
new file mode 100644
index 000000000000..725d06648c38
--- /dev/null
+++ b/metadata/md5-cache/dev-util/clazy-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-devel/llvm-3.8:0[clang] app-arch/unzip sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Compiler plugin which allows clang to understand Qt semantics
+EAPI=6
+HOMEPAGE=https://github.com/KDE/clazy/blob/master/README.md
+KEYWORDS=~amd64
+LICENSE=LGPL-2+
+RDEPEND=>=sys-devel/llvm-3.8:0[clang]
+SLOT=0
+SRC_URI=mirror://kde/stable/clazy/1.2/clazy_v1.2-src.zip
+_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=61b668739fe66a2640905a38dffbf9c8
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.91 b/metadata/md5-cache/dev-util/debootstrap-1.0.91
new file mode 100644
index 000000000000..39f4a4087221
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debootstrap-1.0.91
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Debian/Ubuntu bootstrap scripts
+EAPI=6
+HOMEPAGE=https://packages.qa.debian.org/d/debootstrap.html
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.91.tar.gz mirror://gentoo/devices.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=b33a94ad3674a670c2c04b1c4959baf0
diff --git a/metadata/md5-cache/dev-util/eric-17.07 b/metadata/md5-cache/dev-util/eric-17.07
new file mode 100644
index 000000000000..99ade76978e4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/eric-17.07
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/sip-4.14.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/PyQt5-5.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,gui,help,network,printsupport,sql,svg,webkit] >=dev-python/qscintilla-python-2.8[qt5,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
+DESCRIPTION=A full featured Python IDE using PyQt and QScintilla
+EAPI=6
+HOMEPAGE=http://eric-ide.python-projects.org/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/sip-4.14.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/PyQt5-5.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,gui,help,network,printsupport,sql,svg,webkit] >=dev-python/qscintilla-python-2.8[qt5,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/chardet-3.0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/coverage-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] !dev-util/eric:4 !dev-util/eric:5
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+SLOT=6
+SRC_URI=mirror://sourceforge/eric-ide/eric6/stable/17.07/eric6-17.07.tar.gz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=ccd59375be309a0c2cf781e27511b6dc
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-4.0-r1 b/metadata/md5-cache/dev-util/include-what-you-use-4.0-r1
new file mode 100644
index 000000000000..a61a487be04c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/include-what-you-use-4.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-devel/llvm:4 sys-devel/clang:4 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Find unused include directives in C/C++ programs
+EAPI=6
+HOMEPAGE=https://include-what-you-use.org/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-devel/llvm:4 sys-devel/clang:4 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_4.0.tar.gz -> include-what-you-use-4.0.src.tar.gz
+_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b llvm 2564476f64d2d9b62d757ff42101ff7b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7dc7d45d3dfeff2d0e6495050e0c86af
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.71 b/metadata/md5-cache/dev-util/jenkins-bin-2.71
new file mode 100644
index 000000000000..fe8ed3f1a08f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.71
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Extensible continuous integration server
+EAPI=6
+HOMEPAGE=http://jenkins-ci.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://mirrors.jenkins-ci.org/war/2.71/jenkins.war -> jenkins-bin-2.71.war
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7
+_md5_=62e8d5a174d9794790c833c251dc4e85
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.0.0-r1 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.0.0-r1
index b44e0176c901..1e1fc236eb4b 100644
--- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.0.0-r1
+++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.0.0-r1
@@ -8,6 +8,6 @@ KEYWORDS=amd64 x86
LICENSE=LGPL-2+ LGPL-2.1+
RDEPEND=!dev-util/kdevelop-pg-qt:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
SLOT=5
-SRC_URI=mirror://kde/stable//2.0.0/src/kdevelop-pg-qt-2.0.tar.xz
+SRC_URI=mirror://kde/stable/kdevelop-pg-qt/2.0.0/src/kdevelop-pg-qt-2.0.tar.xz
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 kde5 81f39ca48639c0c77f5e926b55e408f6 kde5-functions d43be96d96de526c203e6bd430b24bd0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=8009fac19aa17990da516a2a267dada2
+_md5_=9a2f4ba90507a51fc2da8e27c1b1c644
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0
new file mode 100644
index 000000000000..7c6bc964b1e2
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.34.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=LL(1) parser generator used mainly by KDevelop language plugins
+EAPI=6
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=!dev-util/kdevelop-pg-qt:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kdevelop-pg-qt/2.1.0/src/kdevelop-pg-qt-2.1.0.tar.xz
+_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 kde5 81f39ca48639c0c77f5e926b55e408f6 kde5-functions d43be96d96de526c203e6bd430b24bd0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=c919ca588ecc8225e7230c6ba80b8662
diff --git a/metadata/md5-cache/dev-util/meson-0.41.2 b/metadata/md5-cache/dev-util/meson-0.41.2
index 79538cec96aa..0eef8369a2d3 100644
--- a/metadata/md5-cache/dev-util/meson-0.41.2
+++ b/metadata/md5-cache/dev-util/meson-0.41.2
@@ -4,7 +4,7 @@ DESCRIPTION=Open source build system
EAPI=6
HOMEPAGE=http://mesonbuild.com/
IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~mips ~ppc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~x86
LICENSE=Apache-2.0
RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://pypi/m/meson/meson-0.41.2.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b9bbc83f3b50e2385eb192383fdcd38c
+_md5_=637870646ce7da5952f89994076cdb92
diff --git a/metadata/md5-cache/games-simulation/openrct2-9999 b/metadata/md5-cache/games-simulation/openrct2-9999
index bcdb21422348..bc1edbf4e7ba 100644
--- a/metadata/md5-cache/games-simulation/openrct2-9999
+++ b/metadata/md5-cache/games-simulation/openrct2-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=multiplayer? ( twitch )
SLOT=0
SRC_URI=https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.0/title-sequence-v0.1.0.zip -> openrct2-title-sequence-v0.1.0.zip
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c0cfe16c2a737eafdc322481ba7319bd
+_md5_=167b96dfa2feca1781d21a2c43865351
diff --git a/metadata/md5-cache/games-strategy/0ad-0.0.20_alpha b/metadata/md5-cache/games-strategy/0ad-0.0.22_alpha
similarity index 54%
rename from metadata/md5-cache/games-strategy/0ad-0.0.20_alpha
rename to metadata/md5-cache/games-strategy/0ad-0.0.22_alpha
index 0b66289ca819..2206560cc4f9 100644
--- a/metadata/md5-cache/games-strategy/0ad-0.0.20_alpha
+++ b/metadata/md5-cache/games-strategy/0ad-0.0.22_alpha
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.20_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:3.0[X,opengl] ) lobby? ( net-libs/gloox ) nvtt? ( media-gfx/nvidia-texture-tools ) sound? ( media-libs/libvorbis media-libs/openal ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl] ) virtual/pkgconfig test? ( dev-lang/perl ) >=sys-apps/sed-4
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.22_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:3.0[X,opengl] ) lobby? ( net-libs/gloox ) nvtt? ( media-gfx/nvidia-texture-tools ) sound? ( media-libs/libvorbis media-libs/openal ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl] ) virtual/pkgconfig test? ( dev-lang/perl ) >=sys-apps/sed-4
DESCRIPTION=A free, real-time strategy game
-EAPI=5
+EAPI=6
HOMEPAGE=https://play0ad.com/
IUSE=editor +lobby nvtt pch sound test
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB
-RDEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.20_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:3.0[X,opengl] ) lobby? ( net-libs/gloox ) nvtt? ( media-gfx/nvidia-texture-tools ) sound? ( media-libs/libvorbis media-libs/openal ) games-misc/games-envd
+RDEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.22_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:3.0[X,opengl] ) lobby? ( net-libs/gloox ) nvtt? ( media-gfx/nvidia-texture-tools ) sound? ( media-libs/libvorbis media-libs/openal )
RESTRICT=test
SLOT=0
-SRC_URI=mirror://sourceforge/zero-ad/0ad-0.0.20-alpha-unix-build.tar.xz
-_eclasses_=base df2aa567b3f0595aae0d0923889f7631 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 wxwidgets 04e063b0eff26daaea83d859dd9d6e05 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b025a3f70615780614a6d34ffda0aee0
+SRC_URI=http://releases.wildfiregames.com/0ad-0.0.22-alpha-unix-build.tar.xz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 wxwidgets 04e063b0eff26daaea83d859dd9d6e05 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=b56de6a2a214f752b21bb8f0108755aa
diff --git a/metadata/md5-cache/games-strategy/0ad-data-0.0.20_alpha b/metadata/md5-cache/games-strategy/0ad-data-0.0.20_alpha
deleted file mode 100644
index fc42757090c2..000000000000
--- a/metadata/md5-cache/games-strategy/0ad-data-0.0.20_alpha
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=Data files for 0ad
-EAPI=5
-HOMEPAGE=https://play0ad.com/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera
-RDEPEND=games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/zero-ad/0ad-0.0.20-alpha-unix-data.tar.xz
-_eclasses_=base df2aa567b3f0595aae0d0923889f7631 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea games 2bb3ede665927a68ffdb7c41eec7efde ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7
-_md5_=c146e513e4fec121ffecdab07c835ec7
diff --git a/metadata/md5-cache/games-strategy/0ad-data-0.0.22_alpha b/metadata/md5-cache/games-strategy/0ad-data-0.0.22_alpha
new file mode 100644
index 000000000000..dbdaa1d2196f
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/0ad-data-0.0.22_alpha
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Data files for 0ad
+EAPI=6
+HOMEPAGE=https://play0ad.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera
+SLOT=0
+SRC_URI=http://releases.wildfiregames.com/0ad-0.0.22-alpha-unix-data.tar.xz
+_md5_=a2954d2fcc40f833961132970d09815e
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-3.4.2 b/metadata/md5-cache/gnome-extra/cinnamon-3.4.2-r1
similarity index 97%
rename from metadata/md5-cache/gnome-extra/cinnamon-3.4.2
rename to metadata/md5-cache/gnome-extra/cinnamon-3.4.2-r1
index 52a56e8781e2..b85072bcd9cc 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-3.4.2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-3.4.2-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] >=gnome-extra/cinnamon-menus-3.0[introspection] >=gnome-extra/cjs-3.2.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.0.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) python_targets_python2_7? ( dev-python/polib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc >=dev-util/intltool-0.4 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] >=gnome-extra/cinnamon-menus-3.0[introspection] >=gnome-extra/cjs-3.2.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.2.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) python_targets_python2_7? ( dev-python/polib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc >=dev-util/intltool-0.4 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
EAPI=6
HOMEPAGE=http://developer.linuxmint.com/
IUSE=+nls +networkmanager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] >=gnome-extra/cinnamon-menus-3.0[introspection] >=gnome-extra/cjs-3.2.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.0.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) >=gnome-extra/cinnamon-session-2.4 >=gnome-extra/cinnamon-settings-daemon-2.4 >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-misc/xdg-utils x11-libs/xapps dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/gconf-python:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) x11-themes/gnome-themes-standard x11-themes/adwaita-icon-theme >=gnome-extra/nemo-2.4 >=gnome-extra/cinnamon-control-center-2.4 >=gnome-extra/cinnamon-screensaver-2.4 gnome-extra/polkit-gnome networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] >=gnome-extra/cinnamon-menus-3.0[introspection] >=gnome-extra/cjs-3.2.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.2.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) >=gnome-extra/cinnamon-session-2.4 >=gnome-extra/cinnamon-settings-daemon-2.4 >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-misc/xdg-utils x11-libs/xapps dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/gconf-python:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) x11-themes/gnome-themes-standard x11-themes/adwaita-icon-theme >=gnome-extra/nemo-2.4 >=gnome-extra/cinnamon-control-center-2.4 >=gnome-extra/cinnamon-screensaver-2.4 gnome-extra/polkit-gnome networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=gnome-extra/cinnamon-translations-2.4 )
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) || ( python_targets_python2_7 ) || ( python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=https://github.com/linuxmint/Cinnamon/archive/3.4.2.tar.gz -> cinnamon-3.4.2.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 64c50579ea42fbcc77a7e220a8ae8e94 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=5e1712376647ca86a61b6b66bfbf7a81
+_md5_=ac68f85fb14281072a5ca2b0291e8577
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.41-r1 b/metadata/md5-cache/gnome-extra/libgsf-1.14.41-r1
index 60de4214c8cd..8c274d1efcf6 100644
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.41-r1
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.41-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The GNOME Structured File Library
EAPI=6
HOMEPAGE=https://developer.gnome.org/gsf/
IUSE=bzip2 gtk +introspection
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2 LGPL-2.1
RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
SLOT=0/114
SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.41.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 64c50579ea42fbcc77a7e220a8ae8e94 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=8c4e830d3225cb28470f7063ae5cf277
+_md5_=c61fe0b623c8d40a82087bf359f29171
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.8.2 b/metadata/md5-cache/gnome-extra/nm-applet-1.8.2
index 876d60431319..f0f19cf0d564 100644
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.8.2
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.8.2
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME applet for NetworkManager
EAPI=6
HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
IUSE=+introspection gcr +modemmanager selinux teamd
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
LICENSE=GPL-2+
PDEPEND=virtual/notification-daemon
RDEPEND=app-crypt/libsecret >=dev-libs/glib-2.32:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.4:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:= ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.3 )
SLOT=0
SRC_URI=mirror://gnome/sources/network-manager-applet/1.8/network-manager-applet-1.8.2.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 64c50579ea42fbcc77a7e220a8ae8e94 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=87ac712dfb008df01a7b2ae629f38be2
+_md5_=4c60bc739b8e21ebd99913421ca489a1
diff --git a/metadata/md5-cache/kde-apps/libgravatar-17.04.3 b/metadata/md5-cache/kde-apps/libgravatar-17.04.3
index 33e50fce8cdd..a4989d393a55 100644
--- a/metadata/md5-cache/kde-apps/libgravatar-17.04.3
+++ b/metadata/md5-cache/kde-apps/libgravatar-17.04.3
@@ -10,4 +10,4 @@ RDEPEND=>=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-
SLOT=5
SRC_URI=mirror://kde/stable/applications/17.04.3/src/libgravatar-17.04.3.tar.xz
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 kde5 81f39ca48639c0c77f5e926b55e408f6 kde5-functions d43be96d96de526c203e6bd430b24bd0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d467f1ef80a7ff640c83550adafdd926
+_md5_=d6d8a39e6ab21e441faaa1a333697ce3
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.10.4-r1 b/metadata/md5-cache/kde-plasma/kwin-5.10.4-r1
new file mode 100644
index 000000000000..adbd24945fc5
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.10.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.34.0:5 >=kde-frameworks/kauth-5.34.0:5 >=kde-frameworks/kcmutils-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kdeclarative-5.34.0:5 >=kde-frameworks/kglobalaccel-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kidletime-5.34.0:5 >=kde-frameworks/kinit-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/knewstuff-5.34.0:5 >=kde-frameworks/knotifications-5.34.0:5 >=kde-frameworks/kpackage-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/kwayland-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kwindowsystem-5.34.0:5[X] >=kde-frameworks/kxmlgui-5.34.0:5 >=kde-frameworks/plasma-5.34.0:5 >=kde-plasma/breeze-5.10.4:5 >=kde-plasma/kdecoration-5.10.4:5 >=kde-plasma/kscreenlocker-5.10.4:5 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=dev-qt/designer-5.7.1:5 >=dev-qt/qtconcurrent-5.7.1:5 x11-proto/xproto test? ( x11-libs/xcb-util-wm ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.34.0:5 handbook? ( >=kde-frameworks/kdoctools-5.34.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE window manager
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=gles2 multimedia test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kactivities-5.34.0:5 >=kde-frameworks/kauth-5.34.0:5 >=kde-frameworks/kcmutils-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kdeclarative-5.34.0:5 >=kde-frameworks/kglobalaccel-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kidletime-5.34.0:5 >=kde-frameworks/kinit-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/knewstuff-5.34.0:5 >=kde-frameworks/knotifications-5.34.0:5 >=kde-frameworks/kpackage-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/kwayland-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kwindowsystem-5.34.0:5[X] >=kde-frameworks/kxmlgui-5.34.0:5 >=kde-frameworks/plasma-5.34.0:5 >=kde-plasma/breeze-5.10.4:5 >=kde-plasma/kdecoration-5.10.4:5 >=kde-plasma/kscreenlocker-5.10.4:5 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=kde-plasma/kde-cli-tools-5.10.4:5 multimedia? ( || ( >=dev-qt/qtmultimedia-5.7.1:5[gstreamer,qml] >=dev-qt/qtmultimedia-5.7.1:5[gstreamer010,qml] ) ) !=kde-frameworks/kf-env-4 !=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.10.4/kwin-5.10.4.tar.xz
+_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 kde5 81f39ca48639c0c77f5e926b55e408f6 kde5-functions d43be96d96de526c203e6bd430b24bd0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=7ce26082461a98e7d3547da5a4d56181
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.4 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.4
deleted file mode 100644
index 6922330a54ee..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.34.0:5 >=kde-frameworks/kauth-5.34.0:5 >=kde-frameworks/kbookmarks-5.34.0:5 >=kde-frameworks/kcmutils-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kdbusaddons-5.34.0:5 >=kde-frameworks/kdeclarative-5.34.0:5 >=kde-frameworks/kdelibs4support-5.34.0:5 >=kde-frameworks/kdesu-5.34.0:5 >=kde-frameworks/kglobalaccel-5.34.0:5 >=kde-frameworks/kguiaddons-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kidletime-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemmodels-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/kjobwidgets-5.34.0:5 >=kde-frameworks/kjs-5.34.0:5 >=kde-frameworks/kjsembed-5.34.0:5 >=kde-frameworks/knewstuff-5.34.0:5 >=kde-frameworks/knotifications-5.34.0:5 >=kde-frameworks/knotifyconfig-5.34.0:5 >=kde-frameworks/kpackage-5.34.0:5 >=kde-frameworks/krunner-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/ktexteditor-5.34.0:5 >=kde-frameworks/ktextwidgets-5.34.0:5 >=kde-frameworks/kwallet-5.34.0:5 >=kde-frameworks/kwayland-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kwindowsystem-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=kde-frameworks/kxmlrpcclient-5.34.0:5 >=kde-frameworks/plasma-5.34.0:5 >=kde-frameworks/solid-5.34.0:5 >=kde-plasma/kscreenlocker-5.10.4:5 >=kde-plasma/kwin-5.10.4:5 >=kde-plasma/libksysguard-5.10.4:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.34.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.34.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.34.0:5 ) x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.34.0:5 handbook? ( >=kde-frameworks/kdoctools-5.34.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma workspace
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+calendar geolocation gps prison qalculate +semantic-desktop test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.34.0:5 >=kde-frameworks/kauth-5.34.0:5 >=kde-frameworks/kbookmarks-5.34.0:5 >=kde-frameworks/kcmutils-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kdbusaddons-5.34.0:5 >=kde-frameworks/kdeclarative-5.34.0:5 >=kde-frameworks/kdelibs4support-5.34.0:5 >=kde-frameworks/kdesu-5.34.0:5 >=kde-frameworks/kglobalaccel-5.34.0:5 >=kde-frameworks/kguiaddons-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kidletime-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemmodels-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/kjobwidgets-5.34.0:5 >=kde-frameworks/kjs-5.34.0:5 >=kde-frameworks/kjsembed-5.34.0:5 >=kde-frameworks/knewstuff-5.34.0:5 >=kde-frameworks/knotifications-5.34.0:5 >=kde-frameworks/knotifyconfig-5.34.0:5 >=kde-frameworks/kpackage-5.34.0:5 >=kde-frameworks/krunner-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/ktexteditor-5.34.0:5 >=kde-frameworks/ktextwidgets-5.34.0:5 >=kde-frameworks/kwallet-5.34.0:5 >=kde-frameworks/kwayland-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kwindowsystem-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=kde-frameworks/kxmlrpcclient-5.34.0:5 >=kde-frameworks/plasma-5.34.0:5 >=kde-frameworks/solid-5.34.0:5 >=kde-plasma/kscreenlocker-5.10.4:5 >=kde-plasma/kwin-5.10.4:5 >=kde-plasma/libksysguard-5.10.4:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.34.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.34.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.34.0:5 ) >=kde-frameworks/kded-5.34.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.10.4:5 >=kde-plasma/ksysguard-5.10.4:5 >=kde-plasma/milou-5.10.4:5 >=kde-plasma/plasma-integration-5.10.4:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 !=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.10.4/plasma-workspace-5.10.4.tar.xz
-_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 kde5 81f39ca48639c0c77f5e926b55e408f6 kde5-functions d43be96d96de526c203e6bd430b24bd0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=64ab9e09bf7ce97ff34a76fb3e38119a
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.4-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.4-r1
new file mode 100644
index 000000000000..5f94a539d9e5
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.4-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.34.0:5 >=kde-frameworks/kauth-5.34.0:5 >=kde-frameworks/kbookmarks-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kdbusaddons-5.34.0:5 >=kde-frameworks/kdeclarative-5.34.0:5 >=kde-frameworks/kdelibs4support-5.34.0:5 >=kde-frameworks/kglobalaccel-5.34.0:5 >=kde-frameworks/kguiaddons-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kidletime-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemmodels-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/kjobwidgets-5.34.0:5 >=kde-frameworks/kjs-5.34.0:5 >=kde-frameworks/kjsembed-5.34.0:5 >=kde-frameworks/knewstuff-5.34.0:5 >=kde-frameworks/knotifications-5.34.0:5 >=kde-frameworks/knotifyconfig-5.34.0:5 >=kde-frameworks/kpackage-5.34.0:5 >=kde-frameworks/krunner-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/ktexteditor-5.34.0:5 >=kde-frameworks/ktextwidgets-5.34.0:5 >=kde-frameworks/kwallet-5.34.0:5 >=kde-frameworks/kwayland-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kwindowsystem-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=kde-frameworks/kxmlrpcclient-5.34.0:5 >=kde-frameworks/plasma-5.34.0:5 >=kde-frameworks/solid-5.34.0:5 >=kde-plasma/kscreenlocker-5.10.4:5 >=kde-plasma/kwin-5.10.4:5 >=kde-plasma/libksysguard-5.10.4:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.34.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.34.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.34.0:5 ) >=dev-qt/qtconcurrent-5.7.1:5 x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.34.0:5 handbook? ( >=kde-frameworks/kdoctools-5.34.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma workspace
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+calendar geolocation gps prison qalculate +semantic-desktop test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.34.0:5 >=kde-frameworks/kauth-5.34.0:5 >=kde-frameworks/kbookmarks-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kdbusaddons-5.34.0:5 >=kde-frameworks/kdeclarative-5.34.0:5 >=kde-frameworks/kdelibs4support-5.34.0:5 >=kde-frameworks/kglobalaccel-5.34.0:5 >=kde-frameworks/kguiaddons-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kidletime-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemmodels-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/kjobwidgets-5.34.0:5 >=kde-frameworks/kjs-5.34.0:5 >=kde-frameworks/kjsembed-5.34.0:5 >=kde-frameworks/knewstuff-5.34.0:5 >=kde-frameworks/knotifications-5.34.0:5 >=kde-frameworks/knotifyconfig-5.34.0:5 >=kde-frameworks/kpackage-5.34.0:5 >=kde-frameworks/krunner-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/ktexteditor-5.34.0:5 >=kde-frameworks/ktextwidgets-5.34.0:5 >=kde-frameworks/kwallet-5.34.0:5 >=kde-frameworks/kwayland-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kwindowsystem-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=kde-frameworks/kxmlrpcclient-5.34.0:5 >=kde-frameworks/plasma-5.34.0:5 >=kde-frameworks/solid-5.34.0:5 >=kde-plasma/kscreenlocker-5.10.4:5 >=kde-plasma/kwin-5.10.4:5 >=kde-plasma/libksysguard-5.10.4:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.34.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.34.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.34.0:5 ) >=kde-frameworks/kded-5.34.0:5 >=kde-frameworks/kdesu-5.34.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.10.4:5 >=kde-plasma/ksysguard-5.10.4:5 >=kde-plasma/milou-5.10.4:5 >=kde-plasma/plasma-integration-5.10.4:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 !=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=gps? ( geolocation )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.10.4/plasma-workspace-5.10.4.tar.xz
+_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 kde5 81f39ca48639c0c77f5e926b55e408f6 kde5-functions d43be96d96de526c203e6bd430b24bd0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=5a361db76f8f9ff0ddb06ad88c52edf7
diff --git a/metadata/md5-cache/media-gfx/feh-2.19.1 b/metadata/md5-cache/media-gfx/feh-2.19.1
new file mode 100644
index 000000000000..110bc44d5637
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/feh-2.19.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install setup
+DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-libs/libXt x11-proto/xproto test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command )
+DESCRIPTION=A fast, lightweight imageviewer using imlib2
+EAPI=6
+HOMEPAGE=http://feh.finalrewind.org/
+IUSE=debug curl exif test xinerama
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+LICENSE=feh
+RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
+SLOT=0
+SRC_URI=http://feh.finalrewind.org/feh-2.19.1.tar.bz2
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=de0583b14b08d63415fd80efdff35eda
diff --git a/metadata/md5-cache/media-libs/exempi-2.4.2 b/metadata/md5-cache/media-libs/exempi-2.4.2
index e08fbddbeb73..e4c1ee357a37 100644
--- a/metadata/md5-cache/media-libs/exempi-2.4.2
+++ b/metadata/md5-cache/media-libs/exempi-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Exempi is a port of the Adobe XMP SDK to work on UNIX
EAPI=6
HOMEPAGE=https://libopenraw.freedesktop.org/wiki/Exempi
IUSE=examples static-libs test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
LICENSE=BSD
RDEPEND=>=dev-libs/expat-2:= virtual/libiconv sys-libs/zlib:=
SLOT=2/3
SRC_URI=https://libopenraw.freedesktop.org/download/exempi-2.4.2.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=75f27652fc7022b3f19e49bafa2aac6c
+_md5_=e671318925034502dde39947b1e54bce
diff --git a/metadata/md5-cache/media-libs/exiftool-10.59 b/metadata/md5-cache/media-libs/exiftool-10.59
index d23ab79e5527..22b48bec4b0e 100644
--- a/metadata/md5-cache/media-libs/exiftool-10.59
+++ b/metadata/md5-cache/media-libs/exiftool-10.59
@@ -4,10 +4,10 @@ DESCRIPTION=Read and write meta information in image, audio and video files
EAPI=6
HOMEPAGE=http://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
IUSE=doc
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 ppc ppc64 x86 ~x64-macos
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-lang/perl:=
SLOT=0
SRC_URI=http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.59.tar.gz
_eclasses_=multiprocessing 284a473719153462f3e974d86c8cb81c perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
-_md5_=fb338cf167975131487f302e50360ea7
+_md5_=c5cf7f55c771359407019e2589c892a8
diff --git a/metadata/md5-cache/media-libs/exiftool-10.55 b/metadata/md5-cache/media-libs/exiftool-10.60
similarity index 84%
rename from metadata/md5-cache/media-libs/exiftool-10.55
rename to metadata/md5-cache/media-libs/exiftool-10.60
index ac05bb9350e0..d7587c86e0a8 100644
--- a/metadata/md5-cache/media-libs/exiftool-10.55
+++ b/metadata/md5-cache/media-libs/exiftool-10.60
@@ -4,10 +4,10 @@ DESCRIPTION=Read and write meta information in image, audio and video files
EAPI=6
HOMEPAGE=http://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
IUSE=doc
-KEYWORDS=amd64 ppc ppc64 x86 ~x64-macos
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-lang/perl:=
SLOT=0
-SRC_URI=http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.55.tar.gz
+SRC_URI=http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.60.tar.gz
_eclasses_=multiprocessing 284a473719153462f3e974d86c8cb81c perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
-_md5_=c5cf7f55c771359407019e2589c892a8
+_md5_=fb338cf167975131487f302e50360ea7
diff --git a/metadata/md5-cache/media-libs/gupnp-dlna-0.10.5 b/metadata/md5-cache/media-libs/gupnp-dlna-0.10.5
index 2fc850dfd3f8..87e1493686c9 100644
--- a/metadata/md5-cache/media-libs/gupnp-dlna-0.10.5
+++ b/metadata/md5-cache/media-libs/gupnp-dlna-0.10.5
@@ -4,10 +4,10 @@ DESCRIPTION=Library providing DLNA-related functionality for MediaServers
EAPI=6
HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=LGPL-2
RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.5:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
SLOT=2.0
SRC_URI=mirror://gnome/sources/gupnp-dlna/0.10/gupnp-dlna-0.10.5.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 64c50579ea42fbcc77a7e220a8ae8e94 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 vala f86cd45e9ae738c40c92f990266f39a7 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=5d266e66a2b1526a2afd1840ce1233f4
+_md5_=0056a14ae10585cc8370a796d1046f9f
diff --git a/metadata/md5-cache/media-libs/libcue-1.4.0 b/metadata/md5-cache/media-libs/libcue-1.4.0
index 00092e10cbab..a62c5f46a635 100644
--- a/metadata/md5-cache/media-libs/libcue-1.4.0
+++ b/metadata/md5-cache/media-libs/libcue-1.4.0
@@ -4,8 +4,8 @@ DESCRIPTION=CUE Sheet Parser Library
EAPI=4
HOMEPAGE=http://libcue.sourceforge.net
IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/libcue/libcue-1.4.0.tar.bz2
-_md5_=e99edf021815b001ac06a02deb781df5
+_md5_=dc9bd455d3483cb591439e07eb1f76f5
diff --git a/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1 b/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
index c9e296af2797..ebd2db6989c0 100644
--- a/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
+++ b/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=library for manipulating the International Press Telecommunications
EAPI=5
HOMEPAGE=http://libiptcdata.sourceforge.net
IUSE=doc examples nls python python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86
LICENSE=LGPL-2
RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) nls? ( virtual/libintl )
REQUIRED_USE=python? ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://sourceforge/libiptcdata/libiptcdata-1.0.4.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=ac808979bba4ea1eb7c0a9c33bc73f76
+_md5_=eea8198ef4075551586c1ad0bd864cdb
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.31 b/metadata/md5-cache/media-libs/libpng-1.6.31
new file mode 100644
index 000000000000..2ad6db3429a5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libpng-1.6.31
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils >=app-portage/elt-patches-20170317
+DESCRIPTION=Portable Network Graphics library
+EAPI=6
+HOMEPAGE=http://www.libpng.org/
+IUSE=apng cpu_flags_x86_sse neon static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=libpng
+RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+SLOT=0/16
+SRC_URI=mirror://sourceforge/libpng/libpng-1.6.31.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.31-apng.patch.gz )
+_eclasses_=libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=9d0a7539ce2e00ba0928c75458e027de
diff --git a/metadata/md5-cache/media-libs/libquvi-0.9.4-r1 b/metadata/md5-cache/media-libs/libquvi-0.9.4-r1
index 510b4f567185..4aaf9dbd4aba 100644
--- a/metadata/md5-cache/media-libs/libquvi-0.9.4-r1
+++ b/metadata/md5-cache/media-libs/libquvi-0.9.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for parsing video download links
EAPI=5
HOMEPAGE=http://quvi.sourceforge.net/
IUSE=examples nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm hppa ppc ppc64 sparc x86
+KEYWORDS=amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86
LICENSE=AGPL-3
RDEPEND=!=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libquvi-scripts-0.9.20130903[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libproxy-0.4.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.36.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-lang/lua-5.1.5-r3[deprecated,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0/8
SRC_URI=mirror://sourceforge/quvi/0.9/libquvi-0.9.4.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 autotools-utils 5a4611dfba155b1659528663fad4cd5e epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=f1209a9f149ea0786d798119f104c9d7
+_md5_=c5dc0972c83056ecfccc37f8b736fff7
diff --git a/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r1 b/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r1
index 717188e576da..f78c4f5de78d 100644
--- a/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r1
+++ b/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Embedded lua scripts for libquvi
EAPI=5
HOMEPAGE=http://quvi.sourceforge.net/
IUSE=offensive abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 sparc x86
+KEYWORDS=amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86
LICENSE=AGPL-3
RDEPEND=>=dev-lua/LuaBitOp-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-lua/luaexpat-1.3.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-lua/luajson-1.1.1 >=dev-lua/luasocket-3.0_rc1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/quvi/libquvi-scripts-0.9.20131130.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=adca84b0888a6c7dc2e0ddd308208a57
+_md5_=68e06b5afccc86e1c39f11613d74d784
diff --git a/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r1 b/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r1
index ab60145f3d3b..9ba89896c82d 100644
--- a/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r1
+++ b/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Helper library for S3TC texture (de)compression
EAPI=5
HOMEPAGE=https://cgit.freedesktop.org/~mareko/libtxc_dxtn/
IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
LICENSE=MIT
RDEPEND=media-libs/mesa
RESTRICT=bindist
SLOT=0
SRC_URI=https://people.freedesktop.org/~cbrill/libtxc_dxtn/libtxc_dxtn-1.0.1.tar.bz2
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=9641914082000f96a064ca581a0e922a
+_md5_=39655b0b1a24791fb7d50c0d62ebcc01
diff --git a/metadata/md5-cache/media-libs/opencv-3.2.0-r1 b/metadata/md5-cache/media-libs/opencv-3.2.0-r2
similarity index 99%
rename from metadata/md5-cache/media-libs/opencv-3.2.0-r1
rename to metadata/md5-cache/media-libs/opencv-3.2.0-r2
index afa832afdab0..647e7ca62834 100644
--- a/metadata/md5-cache/media-libs/opencv-3.2.0-r1
+++ b/metadata/md5-cache/media-libs/opencv-3.2.0-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) gflags? ( contrib ) glog? ( contrib
SLOT=0/3.2
SRC_URI=https://github.com/opencv/opencv/archive/3.2.0.tar.gz -> opencv-3.2.0.tar.gz contrib? ( https://github.com/opencv/opencv_contrib/archive/3.2.0.tar.gz -> opencv-3.2.0_contrib.tar.gz contrib_xfeatures2d? ( http://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-ant-2 4e2b30d918dda38a51839a4d45282b62 java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=be4cf6fb4b9ed102ff729d2e297b09ca
+_md5_=f54637e69844a9a2a6811f0ab42a9687
diff --git a/metadata/md5-cache/media-libs/openh264-1.7.0 b/metadata/md5-cache/media-libs/openh264-1.7.0
index 1ae2a6761ced..25d56284cbe6 100644
--- a/metadata/md5-cache/media-libs/openh264-1.7.0
+++ b/metadata/md5-cache/media-libs/openh264-1.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages
EAPI=5
HOMEPAGE=http://www.openh264.org/
IUSE=+plugin utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86
LICENSE=BSD
RDEPEND=! openh264-1.7.0.tar.gz https://github.com/mozilla/gmp-api/archive/Firefox39.tar.gz -> gmp-api-Firefox39.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e mozextension e5d920147bfccf4930062e462e2a417d multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 nsplugins 2049586e425364a1c5bdb004205d1758 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1d9415e314bd945f07351e0156b611bb
+_md5_=ca52ce54388574e05ba7892651d77d5f
diff --git a/metadata/md5-cache/media-sound/csound-6.09.1 b/metadata/md5-cache/media-sound/csound-6.09.1
new file mode 100644
index 000000000000..ba951548b78e
--- /dev/null
+++ b/metadata/md5-cache/media-sound/csound-6.09.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
+DEPEND=>=media-libs/libsndfile-1.0.16 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-cpp/eigen:3 dev-libs/boost:= ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng:0= ) jack? ( media-sound/jack-audio-connection-kit ) java? ( virtual/jdk:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) stk? ( media-libs/stk ) tcl? ( >=dev-lang/tcl-8.5:0= >=dev-lang/tk-8.5:0= ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets ) sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) csoundac? ( dev-lang/swig ) nls? ( sys-devel/gettext ) test? ( dev-util/cunit python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) doc? ( app-arch/unzip !app-doc/csound-manual ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A sound design and signal processing system for composition and performance
+EAPI=6
+HOMEPAGE=http://csound.github.io/
+IUSE=+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio python samples score static-libs stk tcl test +threads +utils vim-syntax websocket linguas_de linguas_en_US linguas_es linguas_es_CO linguas_fr linguas_it linguas_ro linguas_ru elibc_FreeBSD java python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 doc? ( FDL-1.2+ )
+RDEPEND=>=media-libs/libsndfile-1.0.16 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-cpp/eigen:3 dev-libs/boost:= ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng:0= ) jack? ( media-sound/jack-audio-connection-kit ) java? ( virtual/jdk:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) stk? ( media-libs/stk ) tcl? ( >=dev-lang/tcl-8.5:0= >=dev-lang/tk-8.5:0= ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=csoundac? ( || ( lua python ) ) java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( python_targets_python2_7 cxx )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/csound/csound/archive/6.09.1.tar.gz -> csound-6.09.1.tar.gz doc? ( https://github.com/csound/csound/releases/download/6.09.1/Csound6.09.1_manual_pdf.zip https://github.com/csound/csound/releases/download/6.09.1/Csound6.09.1_manual_html.zip )
+_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3eed2ba767e5064eb7a5d790bf4b9efd
diff --git a/metadata/md5-cache/media-sound/csound-9999 b/metadata/md5-cache/media-sound/csound-9999
index d31e4c6d0c53..8ff3b72b235a 100644
--- a/metadata/md5-cache/media-sound/csound-9999
+++ b/metadata/md5-cache/media-sound/csound-9999
@@ -3,11 +3,11 @@ DEPEND=>=media-libs/libsndfile-1.0.16 media-libs/libsamplerate alsa? ( media-lib
DESCRIPTION=A sound design and signal processing system for composition and performance
EAPI=6
HOMEPAGE=http://csound.github.io/
-IUSE=+alsa beats chua csoundac curl +cxx debug double-precision dssi examples fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio python samples score static-libs stk tcl test +threads +utils vim-syntax websocket linguas_de linguas_en_US linguas_es_CO linguas_fr linguas_it linguas_ro linguas_ru elibc_FreeBSD java python_targets_python2_7
-LICENSE=LGPL-2.1
+IUSE=+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio python samples score static-libs stk tcl test +threads +utils vim-syntax websocket linguas_de linguas_en_US linguas_es linguas_es_CO linguas_fr linguas_it linguas_ro linguas_ru elibc_FreeBSD java python_targets_python2_7
+LICENSE=LGPL-2.1 doc? ( FDL-1.2+ )
RDEPEND=>=media-libs/libsndfile-1.0.16 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-cpp/eigen:3 dev-libs/boost:= ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng:0= ) jack? ( media-sound/jack-audio-connection-kit ) java? ( virtual/jdk:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) stk? ( media-libs/stk ) tcl? ( >=dev-lang/tcl-8.5:0= >=dev-lang/tk-8.5:0= ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=csoundac? ( || ( lua python ) ) java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( python_targets_python2_7 cxx )
RESTRICT=test
SLOT=0
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d4312032238f7d766196d6d3fc594568
+_md5_=542de06bc8b7bae046b4771c3f1a3779
diff --git a/metadata/md5-cache/media-sound/lilypond-2.19.64 b/metadata/md5-cache/media-sound/lilypond-2.19.64
new file mode 100644
index 000000000000..d96b5377bda9
--- /dev/null
+++ b/metadata/md5-cache/media-sound/lilypond-2.19.64
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) guile2? ( >=dev-scheme/guile-2:12 ) !guile2? ( >=dev-scheme/guile-1.8.2:12[deprecated,regex] =dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/t1utils dev-lang/perl dev-libs/kpathsea >=dev-texlive/texlive-metapost-2013 || ( >=app-text/texlive-core-2013 >=dev-tex/metapost-1.803 ) virtual/pkgconfig media-gfx/fontforge[png] >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=GNU Music Typesetter
+EAPI=6
+HOMEPAGE=http://lilypond.org/
+IUSE=debug emacs guile2 profile vim-syntax linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_fi linguas_fr linguas_it linguas_ja linguas_nl linguas_ru linguas_sv linguas_tr linguas_uk linguas_vi linguas_zh_TW python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~x86
+LICENSE=GPL-3 FDL-1.3
+RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) guile2? ( >=dev-scheme/guile-2:12 ) !guile2? ( >=dev-scheme/guile-1.8.2:12[deprecated,regex] =dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.19/lilypond-2.19.64.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 elisp-common 19ff54b35acd0bf2a14831a308a57753 libtool e32ea84bf82cf8987965b574672dba93 multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=24b0e33c632d2a2d4054f5bf907267ed
diff --git a/metadata/md5-cache/media-sound/mikmod-3.2.8 b/metadata/md5-cache/media-sound/mikmod-3.2.8
index a430a8a53cb4..422ce602bfa4 100644
--- a/metadata/md5-cache/media-sound/mikmod-3.2.8
+++ b/metadata/md5-cache/media-sound/mikmod-3.2.8
@@ -3,9 +3,9 @@ DEPEND=>=media-libs/libmikmod-3.3 >=sys-libs/ncurses-5.7-r7:0=
DESCRIPTION=A console MOD-Player based on libmikmod
EAPI=5
HOMEPAGE=http://mikmod.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86
LICENSE=GPL-2
RDEPEND=>=media-libs/libmikmod-3.3 >=sys-libs/ncurses-5.7-r7:0=
SLOT=0
SRC_URI=mirror://sourceforge/mikmod/mikmod-3.2.8.tar.gz
-_md5_=ba2121ee885ea369ae3618b25757f497
+_md5_=5598c34323b58f9f2f39f5185787fb4a
diff --git a/metadata/md5-cache/media-sound/vorbis-tools-1.4.0-r4 b/metadata/md5-cache/media-sound/vorbis-tools-1.4.0-r4
new file mode 100644
index 000000000000..bd17611a1cbb
--- /dev/null
+++ b/metadata/md5-cache/media-sound/vorbis-tools-1.4.0-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=media-libs/libvorbis-1.3.0 flac? ( media-libs/flac ) kate? ( media-libs/libkate ) ogg123? ( >=media-libs/libao-1.0.0 net-misc/curl ) speex? ( media-libs/speex ) nls? ( sys-devel/gettext ) virtual/pkgconfig >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=tools for using the Ogg Vorbis sound file format
+EAPI=5
+HOMEPAGE=http://www.vorbis.com
+IUSE=flac kate nls +ogg123 speex
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libvorbis-1.3.0 flac? ( media-libs/flac ) kate? ( media-libs/libkate ) ogg123? ( >=media-libs/libao-1.0.0 net-misc/curl ) speex? ( media-libs/speex )
+SLOT=0
+SRC_URI=http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=78f87ca1f7907995d3b9b63f0024efa9
diff --git a/metadata/md5-cache/media-video/gpac-0.7.1 b/metadata/md5-cache/media-video/gpac-0.7.1
index f4a9c89b7e58..18dae078ef5e 100644
--- a/metadata/md5-cache/media-video/gpac-0.7.1
+++ b/metadata/md5-cache/media-video/gpac-0.7.1
@@ -7,7 +7,7 @@ IUSE=a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad open
KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
LICENSE=GPL-2
RDEPEND=a52? ( media-libs/a52dec ) aac? ( >=media-libs/faad2-2.0 ) alsa? ( media-libs/alsa-lib ) dvb? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) mad? ( >=media-libs/libmad-0.15.1b ) opengl? ( virtual/opengl media-libs/freeglut virtual/glu ) >=media-libs/libogg-1.1 png? ( >=media-libs/libpng-1.4:0= ) vorbis? ( >=media-libs/libvorbis-1.1 ) theora? ( media-libs/libtheora ) truetype? ( >=media-libs/freetype-2.1.4:2 ) xml? ( >=dev-libs/libxml2-2.6.0:2 ) xvid? ( >=media-libs/xvid-1.0.1 ) sdl? ( media-libs/libsdl ) jpeg2k? ( media-libs/openjpeg:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pulseaudio? ( media-sound/pulseaudio ) X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXv x11-libs/libXext )
-SLOT=0
+SLOT=0/7
SRC_URI=https://github.com/gpac/gpac/archive/v0.7.1.tar.gz -> gpac-0.7.1.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=37b68a5468322597a4d414d50483b1f6
+_md5_=d23fe0a0d5176b2045e00eaa5f2e0936
diff --git a/metadata/md5-cache/media-video/nvidia-video-codec-8.0.14 b/metadata/md5-cache/media-video/nvidia-video-codec-8.0.14
new file mode 100644
index 000000000000..5390f3bf29d3
--- /dev/null
+++ b/metadata/md5-cache/media-video/nvidia-video-codec-8.0.14
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-util/nvidia-cuda-toolkit-7.5 >=x11-drivers/nvidia-drivers-367.35
+DESCRIPTION=Redistributable headers to build cuvid and nvenc
+EAPI=6
+HOMEPAGE=https://github.com/lu-zero/nvidia-video-codec
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-util/nvidia-cuda-toolkit-7.5 >=x11-drivers/nvidia-drivers-367.35
+SLOT=0
+SRC_URI=https://github.com/lu-zero/nvidia-video-codec/archive/8.0.14.tar.gz -> nvidia-video-codec-8.0.14.tar.gz
+_md5_=9deb1949f00845d9857c86f0d4734b7c
diff --git a/metadata/md5-cache/media-video/x264-encoder-0.0.20170701 b/metadata/md5-cache/media-video/x264-encoder-0.0.20170701
index 1b768883d54a..4151aab0b85a 100644
--- a/metadata/md5-cache/media-video/x264-encoder-0.0.20170701
+++ b/metadata/md5-cache/media-video/x264-encoder-0.0.20170701
@@ -1,14 +1,14 @@
DEFINED_PHASES=configure prepare
-DEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-0.0.20170701[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2 ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) x86-fbsd? ( >=dev-lang/nasm-2.13 ) virtual/pkgconfig
+DEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-0.0.20170701[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2:= ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) x86-fbsd? ( >=dev-lang/nasm-2.13 ) virtual/pkgconfig
DESCRIPTION=A free commandline encoder for X264/AVC streams
EAPI=5
HOMEPAGE=http://www.videolan.org/developers/x264.html
IUSE=10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads
KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
LICENSE=GPL-2
-RDEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-0.0.20170701[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2 )
+RDEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-0.0.20170701[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2:= )
REQUIRED_USE=ffmpegsource? ( ffmpeg )
SLOT=0
SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20170701-2245.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d4182678b8a45314da1ecda6ecf83df1
+_md5_=51fecc41af5cd3f1d7484c5b2e9f5ca4
diff --git a/metadata/md5-cache/media-video/x264-encoder-9999 b/metadata/md5-cache/media-video/x264-encoder-9999
index eff6b5afa431..2d3bcf970c42 100644
--- a/metadata/md5-cache/media-video/x264-encoder-9999
+++ b/metadata/md5-cache/media-video/x264-encoder-9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=configure prepare unpack
-DEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-9999[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2 ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) x86-fbsd? ( >=dev-lang/nasm-2.13 ) virtual/pkgconfig dev-vcs/git
+DEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-9999[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2:= ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) x86-fbsd? ( >=dev-lang/nasm-2.13 ) virtual/pkgconfig dev-vcs/git
DESCRIPTION=A free commandline encoder for X264/AVC streams
EAPI=5
HOMEPAGE=http://www.videolan.org/developers/x264.html
IUSE=10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads
LICENSE=GPL-2
-RDEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-9999[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2 )
+RDEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-9999[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2:= )
REQUIRED_USE=ffmpegsource? ( ffmpeg )
SLOT=0
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-2 195a672bfaf52d868442171c9469bbb6 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=d4182678b8a45314da1ecda6ecf83df1
+_md5_=51fecc41af5cd3f1d7484c5b2e9f5ca4
diff --git a/metadata/md5-cache/net-analyzer/cacti-1.1.13 b/metadata/md5-cache/net-analyzer/cacti-1.1.15
similarity index 92%
rename from metadata/md5-cache/net-analyzer/cacti-1.1.13
rename to metadata/md5-cache/net-analyzer/cacti-1.1.15
index 682df8f3cd0c..a4e57345ecd3 100644
--- a/metadata/md5-cache/net-analyzer/cacti-1.1.13
+++ b/metadata/md5-cache/net-analyzer/cacti-1.1.15
@@ -7,7 +7,7 @@ IUSE=snmp doc vhosts
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=dev-lang/php[cli,mysql,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron virtual/mysql snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15
-SLOT=1.1.13
-SRC_URI=http://www.cacti.net/downloads/cacti-1.1.13.tar.gz
+SLOT=1.1.15
+SRC_URI=http://www.cacti.net/downloads/cacti-1.1.15.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 webapp a76ebd3cb5649737496e8238992dd7ca
_md5_=2acfa1d35dcd70461180fab0a3ce4f78
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.1.13 b/metadata/md5-cache/net-analyzer/cacti-spine-1.1.15
similarity index 93%
rename from metadata/md5-cache/net-analyzer/cacti-spine-1.1.13
rename to metadata/md5-cache/net-analyzer/cacti-spine-1.1.15
index 66fcedb792ae..e038c94692c4 100644
--- a/metadata/md5-cache/net-analyzer/cacti-spine-1.1.13
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-1.1.15
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
LICENSE=LGPL-2.1
RDEPEND=dev-libs/openssl:* net-analyzer/net-snmp virtual/mysql >net-analyzer/cacti-0.8.8
SLOT=0
-SRC_URI=http://www.cacti.net/downloads/spine/cacti-spine-1.1.13.tar.gz
+SRC_URI=http://www.cacti.net/downloads/spine/cacti-spine-1.1.15.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
_md5_=4795be59dcdf41f9bf072ff15e657343
diff --git a/metadata/md5-cache/net-analyzer/hydra-8.4 b/metadata/md5-cache/net-analyzer/hydra-8.6
similarity index 91%
rename from metadata/md5-cache/net-analyzer/hydra-8.4
rename to metadata/md5-cache/net-analyzer/hydra-8.6
index 73ff6f30cf11..fd23d9d655cb 100644
--- a/metadata/md5-cache/net-analyzer/hydra-8.4
+++ b/metadata/md5-cache/net-analyzer/hydra-8.6
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-3
RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/ncurses:= firebird? ( dev-db/firebird ) gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) mysql? ( virtual/mysql ) ncp? ( net-fs/ncpfs ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) ssl? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion )
SLOT=0
-SRC_URI=https://www.thc.org/releases/hydra-8.4.tar.gz
+SRC_URI=https://github.com/vanhauser-thc/thc-hydra/archive/8.6.tar.gz -> hydra-8.6.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=ed66913b50ece483ae42bed2a444df8c
+_md5_=b80d29695215c4ca4e0df64719cb0b11
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.33-r1 b/metadata/md5-cache/net-analyzer/munin-2.0.33-r1
index 8cb4e1703c10..851f59262f4f 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.33-r1
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.33-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
-DEPEND=dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DEPEND=dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
DESCRIPTION=Munin Server Monitoring Tool
EAPI=6
HOMEPAGE=http://munin-monitoring.org/
-IUSE=asterisk irc java memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 elibc_FreeBSD java
+IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 elibc_FreeBSD java
KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86
LICENSE=GPL-2
-RDEPEND=dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) !=dev-java/java-config-2.2.0-r3 )
+RDEPEND=dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) !=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
SLOT=0
SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.33.tar.gz -> munin-2.0.33.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.33-gentoo-2.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ae6c7ec7f16ed5ed0441aa4651a5bc3c
+_md5_=48a68c6a9c09c0afb42cba0e4eac7511
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.19 b/metadata/md5-cache/net-analyzer/zabbix-2.2.19
new file mode 100644
index 000000000000..ae1fd1541bf6
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.2.19
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=http://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.2.19.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0 webapp a76ebd3cb5649737496e8238992dd7ca
+_md5_=453a840d5cd15ab363fc7b23a1eb55d2
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.10 b/metadata/md5-cache/net-analyzer/zabbix-3.0.10
new file mode 100644
index 000000000000..38086e2053af
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-3.0.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=http://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.0.10.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0 webapp a76ebd3cb5649737496e8238992dd7ca
+_md5_=942912d5cfbdf82ce0c1888e08ca5273
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.2.7 b/metadata/md5-cache/net-analyzer/zabbix-3.2.7
new file mode 100644
index 000000000000..e9d2453e2c52
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-3.2.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=http://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.2.7.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0 webapp a76ebd3cb5649737496e8238992dd7ca
+_md5_=b025fae63f1944bf4d9b59c6c3153918
diff --git a/metadata/md5-cache/net-dns/libidn2-2.0.2 b/metadata/md5-cache/net-dns/libidn2-2.0.2
index a637f7a4edbf..b8bf42493fd1 100644
--- a/metadata/md5-cache/net-dns/libidn2-2.0.2
+++ b/metadata/md5-cache/net-dns/libidn2-2.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5
EAPI=6
HOMEPAGE=https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2
IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2+ LGPL-3+
RDEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0
SRC_URI=mirror://gnu/libidn/libidn2-2.0.2.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=2747e84e31004f8495c27891a833ca2b
+_md5_=81849ff1916ed7cd3c9a6c18cbf6363c
diff --git a/metadata/md5-cache/net-libs/libgrss-0.7.0 b/metadata/md5-cache/net-libs/libgrss-0.7.0
index c6d90a75e14a..bb63c6e24ce3 100644
--- a/metadata/md5-cache/net-libs/libgrss-0.7.0
+++ b/metadata/md5-cache/net-libs/libgrss-0.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=LibGRSS is a library for easy management of RSS/Atom/Pie feeds
EAPI=5
HOMEPAGE=https://live.gnome.org/Libgrss
IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=LGPL-3
RDEPEND=>=dev-libs/glib-2.42.1:2 >=dev-libs/libxml2-2.9.2:2 >=net-libs/libsoup-2.48:2.4 introspection? ( >=dev-libs/gobject-introspection-1.42 )
SLOT=0
SRC_URI=mirror://gnome/sources/libgrss/0.7/libgrss-0.7.0.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 64c50579ea42fbcc77a7e220a8ae8e94 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=13e51d8e5f8371138b82160fe9417530
+_md5_=20c740c2c89658f24416c9e49bfb7b87
diff --git a/metadata/md5-cache/net-libs/wvstreams-4.6.1-r5 b/metadata/md5-cache/net-libs/wvstreams-4.6.1-r5
new file mode 100644
index 000000000000..6cf7f73d0bc2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/wvstreams-4.6.1-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==sys-apps/dbus-1.4.20 ) pam? ( virtual/pam ) virtual/pkgconfig doc? ( app-doc/doxygen ) boost? ( >=dev-libs/boost-1.34.1:= ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A network programming library in C++
+EAPI=6
+HOMEPAGE=http://alumnit.ca/wiki/?WvStreams
+IUSE=pam doc +ssl +dbus debug boost
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND==sys-apps/dbus-1.4.20 ) pam? ( virtual/pam )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://wvstreams.googlecode.com/files/wvstreams-4.6.1.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a104c222acecf4b6b02c37aabb852d83
diff --git a/metadata/md5-cache/net-misc/chrony-3.2_pre1 b/metadata/md5-cache/net-misc/chrony-3.2_pre1
new file mode 100644
index 000000000000..0883159ed597
--- /dev/null
+++ b/metadata/md5-cache/net-misc/chrony-3.2_pre1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) seccomp? ( sys-libs/libseccomp ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools ) virtual/pkgconfig
+DESCRIPTION=NTP client and server programs
+EAPI=6
+HOMEPAGE=https://chrony.tuxfamily.org/
+IUSE=caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc seccomp selinux +adns
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64
+LICENSE=GPL-2
+RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-chronyd )
+REQUIRED_USE=?? ( libedit readline )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.tuxfamily.org/chrony/chrony-3.2-pre1.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=ca943399cfc10d5c3a3060cd1798dd8f
diff --git a/metadata/md5-cache/net-misc/chrony-9999 b/metadata/md5-cache/net-misc/chrony-9999
index a9b3330f1137..6fe2ccaff906 100644
--- a/metadata/md5-cache/net-misc/chrony-9999
+++ b/metadata/md5-cache/net-misc/chrony-9999
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) dev-ruby/asciidoctor pps? ( net-misc/pps-tools ) >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
+DEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) seccomp? ( sys-libs/libseccomp ) dev-ruby/asciidoctor pps? ( net-misc/pps-tools ) >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
DESCRIPTION=NTP client and server programs
EAPI=6
-HOMEPAGE=http://chrony.tuxfamily.org/
-IUSE=caps +cmdmon ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns
+HOMEPAGE=https://chrony.tuxfamily.org/
+IUSE=caps +cmdmon ipv6 libedit +ntp +phc pps readline +refclock +rtc seccomp selinux +adns
LICENSE=GPL-2
-RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) selinux? ( sec-policy/selinux-chronyd )
+RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-chronyd )
REQUIRED_USE=?? ( libedit readline )
RESTRICT=test
SLOT=0
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea git-r3 cbafa3261c37c7e3af44bb16a34ea390 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=45a20d0f538b93b1cdfca5ae88b8e241
+_md5_=315906538b239e4ab9d59875c53c7abd
diff --git a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc0 b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc0
new file mode 100644
index 000000000000..ed1c57e0126d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile ) virtual/pkgconfig client? ( X? ( doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) ) ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Free implementation of the Remote Desktop Protocol
+EAPI=6
+HOMEPAGE=http://www.freerdp.com/
+IUSE=alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav libressl neon pulseaudio server smartcard systemd test usb wayland X xinerama xv
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
+SLOT=0/2
+SRC_URI=https://github.com/FreeRDP/FreeRDP/archive/2.0.0-rc0.tar.gz -> FreeRDP-2.0.0-rc0.tar.gz
+_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4497410fc0697d9a7a4bd636d184e947
diff --git a/metadata/md5-cache/net-misc/freerdp-9999 b/metadata/md5-cache/net-misc/freerdp-9999
index 85974a3f39b1..a876b082bfc7 100644
--- a/metadata/md5-cache/net-misc/freerdp-9999
+++ b/metadata/md5-cache/net-misc/freerdp-9999
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
SLOT=0/2
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=515f9007a8d940dbbcbcdc5c0cd4f3bc
+_md5_=4b301500342b2ef10b8dde5ff7542013
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.39 b/metadata/md5-cache/net-misc/memcached-1.4.39
index 540063b48d23..60cf7142e637 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.39
+++ b/metadata/md5-cache/net-misc/memcached-1.4.39
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, distributed memory object caching system
EAPI=5
HOMEPAGE=http://memcached.org/
IUSE=test slabs-reassign debug sasl selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=BSD
RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached )
SLOT=0
SRC_URI=https://www.memcached.org/files/memcached-1.4.39.tar.gz https://www.memcached.org/files/old/memcached-1.4.39.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7
-_md5_=dbd2ff6f55660ada9d838c995469d421
+_md5_=dcd8d142eb5b5e39747a065397bc928e
diff --git a/metadata/md5-cache/net-misc/mosh-1.3.2 b/metadata/md5-cache/net-misc/mosh-1.3.2
new file mode 100644
index 000000000000..18b42035a929
--- /dev/null
+++ b/metadata/md5-cache/net-misc/mosh-1.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
+EAPI=6
+HOMEPAGE=http://mosh.org
+IUSE=+client examples +mosh-hardening +server ufw +utempter
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
+REQUIRED_USE=|| ( client server ) examples? ( client )
+SLOT=0
+SRC_URI=http://mosh.org/mosh-1.3.2.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 vcs-snapshot 03289f51c769cf409d200d2d628cdd6e
+_md5_=f6194f0fd371844286791aa83975e825
diff --git a/metadata/md5-cache/net-misc/whois-5.2.15 b/metadata/md5-cache/net-misc/whois-5.2.17
similarity index 59%
rename from metadata/md5-cache/net-misc/whois-5.2.15
rename to metadata/md5-cache/net-misc/whois-5.2.17
index 62d19dad1bf5..afa40d6f858c 100644
--- a/metadata/md5-cache/net-misc/whois-5.2.15
+++ b/metadata/md5-cache/net-misc/whois-5.2.17
@@ -1,7 +1,7 @@
DEFINED_PHASES=compile configure install prepare
DEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl ) app-arch/xz-utils >=dev-lang/perl-5 nls? ( sys-devel/gettext )
DESCRIPTION=improved Whois Client
-EAPI=5
+EAPI=6
HOMEPAGE=http://www.linux.it/~md/software/
IUSE=iconv idn nls
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
@@ -9,6 +9,6 @@ LICENSE=GPL-2
RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl )
RESTRICT=test
SLOT=0
-SRC_URI=mirror://debian/pool/main/w/whois/whois_5.2.15.tar.xz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=f3c1294e4675565afa0229e8256c9907
+SRC_URI=mirror://debian/pool/main/w/whois/whois_5.2.17.tar.xz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=80451e39f9fdd3596272e1dff7b10915
diff --git a/metadata/md5-cache/net-news/quiterss-0.18.6 b/metadata/md5-cache/net-news/quiterss-0.18.6
new file mode 100644
index 000000000000..d4e066ba53fb
--- /dev/null
+++ b/metadata/md5-cache/net-news/quiterss-0.18.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-db/sqlite-3.11.1:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[X,qt5(-)] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A Qt-based RSS/Atom feed reader
+EAPI=6
+HOMEPAGE=https://quiterss.org
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=>=dev-db/sqlite-3.11.1:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[X,qt5(-)] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
+SLOT=0
+SRC_URI=https://github.com/QuiteRSS/quiterss/archive/0.18.6.tar.gz -> quiterss-0.18.6.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=ae263e8b54393372c5b66470d485f99b
diff --git a/metadata/md5-cache/net-p2p/retroshare-0.5.5c b/metadata/md5-cache/net-p2p/retroshare-0.5.5c
deleted file mode 100644
index dc8faf1f06c1..000000000000
--- a/metadata/md5-cache/net-p2p/retroshare-0.5.5c
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-arch/bzip2 dev-libs/openssl:0 gnome-base/libgnome-keyring net-libs/libupnp:0 sys-libs/zlib cli? ( dev-libs/protobuf net-libs/libssh[server] ) feedreader? ( dev-libs/libxml2 dev-libs/libxslt net-misc/curl ) qt4? ( x11-libs/libX11 x11-libs/libXScrnSaver dev-qt/qtcore:4 dev-qt/qtgui:4 ) voip? ( media-libs/speex dev-qt/qt-mobility[multimedia] dev-qt/qtmultimedia:4 ) app-arch/unzip dev-qt/qtcore:4 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=P2P private sharing application
-EAPI=5
-HOMEPAGE=http://retroshare.sourceforge.net
-IUSE=cli feedreader links-cloud qt4 voip
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 GPL-3 Apache-2.0 LGPL-2.1
-RDEPEND=app-arch/bzip2 dev-libs/openssl:0 gnome-base/libgnome-keyring net-libs/libupnp:0 sys-libs/zlib cli? ( dev-libs/protobuf net-libs/libssh[server] ) feedreader? ( dev-libs/libxml2 dev-libs/libxslt net-misc/curl ) qt4? ( x11-libs/libX11 x11-libs/libXScrnSaver dev-qt/qtcore:4 dev-qt/qtgui:4 ) voip? ( media-libs/speex dev-qt/qt-mobility[multimedia] dev-qt/qtmultimedia:4 )
-REQUIRED_USE=|| ( cli qt4 ) feedreader? ( qt4 ) links-cloud? ( qt4 ) voip? ( qt4 )
-SLOT=0
-SRC_URI=mirror://sourceforge/retroshare/retroshare_0.5.5-0.7068.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=090118dcd0db2d2c3d6c041b7c1f127c
diff --git a/metadata/md5-cache/net-p2p/retroshare-0.6.2 b/metadata/md5-cache/net-p2p/retroshare-0.6.2
index 459635cf65b9..4d6e45cd426a 100644
--- a/metadata/md5-cache/net-p2p/retroshare-0.6.2
+++ b/metadata/md5-cache/net-p2p/retroshare-0.6.2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-arch/bzip2 dev-db/sqlcipher dev-libs/openssl:0 gnome-base/libgnome-keyring net-libs/libmicrohttpd net-libs/libupnp:0 sys-libs/zlib feedreader? ( dev-libs/libxml2 dev-libs/libxslt net-misc/curl ) qt4? ( gui? ( dev-qt/designer:4 dev-qt/qtgui:4 x11-libs/libX11 x11-libs/libXScrnSaver ) dev-qt/qtcore:4 ) qt5? ( gui? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver ) dev-qt/qtcore:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtxml:5 ) voip? ( qt5? ( media-libs/opencv[-qt4(-)] ) qt4? ( media-libs/opencv dev-qt/qt-mobility[multimedia] ) media-libs/speex virtual/ffmpeg[encode] ) virtual/pkgconfig >=sys-apps/sed-4
+DEPEND=app-arch/bzip2 dev-db/sqlcipher dev-libs/openssl:0 dev-qt/qtcore:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtxml:5 gnome-base/libgnome-keyring net-libs/libmicrohttpd net-libs/libupnp:0 sys-libs/zlib feedreader? ( dev-libs/libxml2 dev-libs/libxslt net-misc/curl ) gui? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver ) voip? ( media-libs/opencv[-qt4(-)] media-libs/speex virtual/ffmpeg[encode] ) virtual/pkgconfig >=sys-apps/sed-4
DESCRIPTION=P2P private sharing application
EAPI=6
HOMEPAGE=http://retroshare.net
-IUSE=cli feedreader +gui qt4 +qt5 voip
+IUSE=cli feedreader +gui voip
KEYWORDS=amd64 x86
LICENSE=GPL-2 GPL-3 Apache-2.0 LGPL-2.1
-RDEPEND=app-arch/bzip2 dev-db/sqlcipher dev-libs/openssl:0 gnome-base/libgnome-keyring net-libs/libmicrohttpd net-libs/libupnp:0 sys-libs/zlib feedreader? ( dev-libs/libxml2 dev-libs/libxslt net-misc/curl ) qt4? ( gui? ( dev-qt/designer:4 dev-qt/qtgui:4 x11-libs/libX11 x11-libs/libXScrnSaver ) dev-qt/qtcore:4 ) qt5? ( gui? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver ) dev-qt/qtcore:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtxml:5 ) voip? ( qt5? ( media-libs/opencv[-qt4(-)] ) qt4? ( media-libs/opencv dev-qt/qt-mobility[multimedia] ) media-libs/speex virtual/ffmpeg[encode] )
-REQUIRED_USE=|| ( cli gui ) gui? ( ^^ ( qt4 qt5 ) ) cli? ( ^^ ( qt4 qt5 ) ) feedreader? ( gui ) voip? ( gui )
+RDEPEND=app-arch/bzip2 dev-db/sqlcipher dev-libs/openssl:0 dev-qt/qtcore:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtxml:5 gnome-base/libgnome-keyring net-libs/libmicrohttpd net-libs/libupnp:0 sys-libs/zlib feedreader? ( dev-libs/libxml2 dev-libs/libxslt net-misc/curl ) gui? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver ) voip? ( media-libs/opencv[-qt4(-)] media-libs/speex virtual/ffmpeg[encode] )
+REQUIRED_USE=|| ( cli gui ) feedreader? ( gui ) voip? ( gui )
SLOT=0
SRC_URI=https://github.com/RetroShare/RetroShare/archive/v0.6.2.tar.gz -> retroshare-0.6.2.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=6573ccd6e54245596df7b9dcdaa8d0f1
+_md5_=53d4460c49bb26431a9d09944a6f627c
diff --git a/metadata/md5-cache/net-print/cndrvcups-common-lb-3.40 b/metadata/md5-cache/net-print/cndrvcups-common-lb-3.40
new file mode 100644
index 000000000000..449a34dad74f
--- /dev/null
+++ b/metadata/md5-cache/net-print/cndrvcups-common-lb-3.40
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=>=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Common files for Canon drivers
+EAPI=6
+HOMEPAGE=https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers&language=EN&os=LINUX
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Canon-UFR-II GPL-2 MIT
+RDEPEND=dev-libs/libxml2 gnome-base/libglade net-print/cups x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://gdlp01.c-wss.com/gds/8/0100007658/04/linux-UFRII-drv-v340-uken.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=555bdac5ae8304c7512daa6a62383bdf
diff --git a/metadata/md5-cache/net-print/cndrvcups-lb-3.40 b/metadata/md5-cache/net-print/cndrvcups-lb-3.40
new file mode 100644
index 000000000000..3f842048ab41
--- /dev/null
+++ b/metadata/md5-cache/net-print/cndrvcups-lb-3.40
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare setup unpack
+DEPEND=>=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Canon UFR II / LIPSLX Printer Driver for Linux
+EAPI=6
+HOMEPAGE=https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers&language=EN&os=LINUX
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Canon-UFR-II
+RDEPEND=gnome-base/libglade net-print/cups ~net-print/cndrvcups-common-lb-3.40 x11-libs/gtk+:2 >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)]
+SLOT=0
+SRC_URI=http://gdlp01.c-wss.com/gds/8/0100007658/04/linux-UFRII-drv-v340-uken.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3d3125e1ccdfd01874842cbd6d10a252
diff --git a/metadata/md5-cache/net-print/cups-filters-1.16.0 b/metadata/md5-cache/net-print/cups-filters-1.16.0
new file mode 100644
index 000000000000..a58adeeb1a7e
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-filters-1.16.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] ) dev-util/gdbus-codegen virtual/pkgconfig
+DESCRIPTION=Cups PDF filters
+EAPI=6
+HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_job_format
+IUSE=dbus +foomatic ipp_autosetup jpeg ldap pdf perl png +postscript static-libs tiff zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint
+LICENSE=MIT GPL-2
+RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
+SLOT=0
+SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.16.0.tar.xz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=e2ace5028064f769ac19d33cfe7b6138
diff --git a/metadata/md5-cache/net-proxy/sshuttle-0.78.3 b/metadata/md5-cache/net-proxy/sshuttle-0.78.3
new file mode 100644
index 000000000000..41eb34a8107e
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/sshuttle-0.78.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Transparent proxy server that works as a poor man's VPN using ssh
+EAPI=6
+HOMEPAGE=https://github.com/sshuttle/sshuttle https://pypi.python.org/pypi/sshuttle
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-firewall/iptables python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/s/sshuttle/sshuttle-0.78.3.tar.gz
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=b42f7c037838345a02b9202981b1238b
diff --git a/metadata/md5-cache/sci-libs/ccfits-2.5 b/metadata/md5-cache/sci-libs/ccfits-2.5
new file mode 100644
index 000000000000..11f38b06333e
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/ccfits-2.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sci-libs/cfitsio-3.080 >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=C++ interface for cfitsio
+EAPI=6
+HOMEPAGE=http://heasarc.gsfc.nasa.gov/fitsio/CCfits/
+IUSE=doc static-libs
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=sci-libs/cfitsio-3.080
+SLOT=0
+SRC_URI=http://heasarc.gsfc.nasa.gov/fitsio/CCfits//CCfits-2.5.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=0f92a0f8e306531bd1392cfdcfc97801
diff --git a/metadata/md5-cache/sci-libs/dlib-18.15 b/metadata/md5-cache/sci-libs/dlib-18.15
deleted file mode 100644
index 998f8a1e16ae..000000000000
--- a/metadata/md5-cache/sci-libs/dlib-18.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( blas? ( virtual/blas ) jpeg? ( virtual/jpeg:0= ) lapack? ( virtual/lapack ) png? ( media-libs/libpng:0= ) X? ( x11-libs/libX11 ) )
-DESCRIPTION=Numerical and networking C++ library
-EAPI=5
-HOMEPAGE=http://dlib.net/
-IUSE=blas doc examples jpeg lapack png test X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Boost-1.0
-RDEPEND=blas? ( virtual/blas ) jpeg? ( virtual/jpeg:0= ) lapack? ( virtual/lapack ) png? ( media-libs/libpng:0= ) X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=mirror://sourceforge/dclib/dlib-18.15.tar.bz2
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=743e9b91c6855c9977aba73e35b327ba
diff --git a/metadata/md5-cache/sci-libs/dlib-18.7 b/metadata/md5-cache/sci-libs/dlib-18.7
deleted file mode 100644
index 14992d111137..000000000000
--- a/metadata/md5-cache/sci-libs/dlib-18.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( blas? ( virtual/blas ) jpeg? ( virtual/jpeg:0= ) lapack? ( virtual/lapack ) png? ( media-libs/libpng:0= ) X? ( x11-libs/libX11 ) )
-DESCRIPTION=Numerical and networking C++ library
-EAPI=5
-HOMEPAGE=http://dlib.net/
-IUSE=blas doc examples jpeg lapack png test X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Boost-1.0
-RDEPEND=blas? ( virtual/blas ) jpeg? ( virtual/jpeg:0= ) lapack? ( virtual/lapack ) png? ( media-libs/libpng:0= ) X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=mirror://sourceforge/dclib/dlib-18.7.tar.bz2
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=361fe05fb009de3d210e1ef294bb1aa7
diff --git a/metadata/md5-cache/sci-libs/dlib-19.4 b/metadata/md5-cache/sci-libs/dlib-19.4
new file mode 100644
index 000000000000..1f1b83930ec3
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/dlib-19.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( cblas? ( virtual/cblas:= ) cuda? ( dev-libs/cudnn:= ) jpeg? ( virtual/jpeg:0= ) lapack? ( virtual/lapack:= ) mkl? ( sci-libs/mkl:= ) png? ( media-libs/libpng:0= ) sqlite? ( dev-db/sqlite:3= ) X? ( x11-libs/libX11:= ) ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Numerical and networking C++ library
+EAPI=6
+HOMEPAGE=http://dlib.net/
+IUSE=cblas debug cuda examples gif jpeg lapack mkl png sqlite static-libs test X
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Boost-1.0
+RDEPEND=cblas? ( virtual/cblas:= ) cuda? ( dev-libs/cudnn:= ) jpeg? ( virtual/jpeg:0= ) lapack? ( virtual/lapack:= ) mkl? ( sci-libs/mkl:= ) png? ( media-libs/libpng:0= ) sqlite? ( dev-db/sqlite:3= ) X? ( x11-libs/libX11:= )
+SLOT=0/19.4
+SRC_URI=https://github.com/davisking/dlib/archive/v19.4.tar.gz -> dlib-19.4.tar.gz
+_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 cuda 626969678b9c5735753d8a380c6f295b epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3e606c9386cb2c6afc31f4f1517370d3
diff --git a/metadata/md5-cache/sci-libs/htslib-1.5 b/metadata/md5-cache/sci-libs/htslib-1.5
new file mode 100644
index 000000000000..9741a7e21786
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/htslib-1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=bzip2? ( app-arch/bzip2 ) curl? ( net-misc/curl ) lzma? ( app-arch/xz-utils )
+DESCRIPTION=C library for high-throughput sequencing data formats
+EAPI=6
+HOMEPAGE=http://www.htslib.org/
+IUSE=+bzip2 curl +lzma static-libs
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=bzip2? ( app-arch/bzip2 ) curl? ( net-misc/curl ) lzma? ( app-arch/xz-utils )
+SLOT=0/2
+SRC_URI=mirror://sourceforge/samtools/1.5/htslib-1.5.tar.bz2
+_md5_=5551d2f635ec198f8e168e2993504739
diff --git a/metadata/md5-cache/sci-libs/silo-4.10.2 b/metadata/md5-cache/sci-libs/silo-4.10.2
index f7f4b05bfc81..41b8ae2b968b 100644
--- a/metadata/md5-cache/sci-libs/silo-4.10.2
+++ b/metadata/md5-cache/sci-libs/silo-4.10.2
@@ -11,4 +11,4 @@ REQUIRED_USE=silex? ( qt4 )
SLOT=0
SRC_URI=https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/silo/silo-4.10.2/silo-4.10.2.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fortran-2 9e7f20c99213f0627ff7f873d4aaa25d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=d091670a1b21d79ec4f5ab663cb3ccbb
+_md5_=178e9530a27cfaf0100ebbcafa6c6bb3
diff --git a/metadata/md5-cache/sci-mathematics/arb-2.11.1 b/metadata/md5-cache/sci-mathematics/arb-2.11.1-r1
similarity index 95%
rename from metadata/md5-cache/sci-mathematics/arb-2.11.1
rename to metadata/md5-cache/sci-mathematics/arb-2.11.1-r1
index df5a40a9e2c7..f151a4bb7ca1 100644
--- a/metadata/md5-cache/sci-mathematics/arb-2.11.1
+++ b/metadata/md5-cache/sci-mathematics/arb-2.11.1-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=sci-mathematics/flint-2.5.0:=
SLOT=0/2
SRC_URI=https://github.com/fredrik-johansson/arb/archive/2.11.1.tar.gz -> arb-2.11.1.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=70d4b9f4b1e3baf825ddcd27b741c229
+_md5_=81a6e94cbcb7509e7d060e29b4ef5ae8
diff --git a/metadata/md5-cache/sci-mathematics/glpk-4.63 b/metadata/md5-cache/sci-mathematics/glpk-4.63
new file mode 100644
index 000000000000..9e735a8e4752
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/glpk-4.63
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sci-libs/amd:0= sci-libs/colamd:= sys-libs/zlib:0= gmp? ( dev-libs/gmp:0= ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) ) virtual/pkgconfig >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=GNU Linear Programming Kit
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/glpk/
+IUSE=doc examples gmp odbc mysql static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-3
+RDEPEND=sci-libs/amd:0= sci-libs/colamd:= sys-libs/zlib:0= gmp? ( dev-libs/gmp:0= ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )
+SLOT=0/40
+SRC_URI=mirror://gnu/glpk/glpk-4.63.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=2c1919adf7d73d606f22b333cd5966ae
diff --git a/metadata/md5-cache/sci-mathematics/relational-2.4 b/metadata/md5-cache/sci-mathematics/relational-2.4
deleted file mode 100644
index c1b48e49661d..000000000000
--- a/metadata/md5-cache/sci-mathematics/relational-2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/PyQt5[gui,webkit,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
-DESCRIPTION=Educational tool for relational algebra
-EAPI=6
-HOMEPAGE=http://ltworf.github.io/relational/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/PyQt5[gui,webkit,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/ltworf/relational/releases/download/2.4/relational_2.4.orig.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=323537cf2a66a0b99793a7698e354491
diff --git a/metadata/md5-cache/sys-apps/dbus-1.10.22 b/metadata/md5-cache/sys-apps/dbus-1.10.22
new file mode 100644
index 000000000000..95c62c6677ad
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/dbus-1.10.22
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/expat-2 selinux? ( sys-libs/libselinux ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) app-text/xmlto app-text/docbook-xml-dtd:4.4 virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( >=dev-libs/glib-2.36:2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A message bus system, a simple way for applications to talk to each other
+EAPI=6
+HOMEPAGE=https://dbus.freedesktop.org/
+IUSE=debug doc elogind selinux static-libs systemd test user-session X test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=|| ( AFL-2.1 GPL-2 )
+RDEPEND=>=dev-libs/expat-2 selinux? ( sys-libs/libselinux ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sec-policy/selinux-dbus )
+REQUIRED_USE=?? ( elogind systemd )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.10.22.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066
+_md5_=e440dde28f0f1f9c5cc54ed2df1468e5
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.3 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.3
new file mode 100644
index 000000000000..6e5775304c85
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/gptfdisk-1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) ) virtual/pkgconfig
+DESCRIPTION=GPT partition table manipulator for Linux
+EAPI=6
+HOMEPAGE=http://www.rodsbooks.com/gdisk/
+IUSE=kernel_linux ncurses static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) kernel_linux? ( sys-apps/util-linux ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk-1.0.3.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=13d3e9ba5f5ddff56f700e866656ddd1
diff --git a/metadata/md5-cache/sys-apps/idle3-tools-0.9.1 b/metadata/md5-cache/sys-apps/idle3-tools-0.9.1
index 62eaa84fb754..ba7b440f60a1 100644
--- a/metadata/md5-cache/sys-apps/idle3-tools-0.9.1
+++ b/metadata/md5-cache/sys-apps/idle3-tools-0.9.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare unpack
DESCRIPTION=Read, Set or disable the idle3 timer of Western Digital drives
EAPI=4
HOMEPAGE=http://idle3-tools.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-3
SLOT=0
SRC_URI=mirror://sourceforge/idle3-tools/idle3-tools-0.9.1.tgz
_eclasses_=base df2aa567b3f0595aae0d0923889f7631 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=fedd71ff86fd257a274957639eda101c
+_md5_=4194e0518973dd91745cd63be373220d
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.8 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.8
index bb0039206e08..f5f51ae00e89 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.8
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.8
@@ -4,11 +4,11 @@ DESCRIPTION=NSS module for name lookups using LDAP
EAPI=5
HOMEPAGE=http://arthurdejong.org/nss-pam-ldapd/
IUSE=debug kerberos +pam sasl test +utils python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=LGPL-2.1
RDEPEND=net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sasl? ( dev-libs/cyrus-sasl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] utils? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !sys-auth/nss_ldap !sys-auth/pam_ldap
REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
SLOT=0
SRC_URI=http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.8.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 prefix df8265631f8bf5f5df387e9b987121f9 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d s6 9fd5ce6a54658cb380091f4c3acc544e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7
-_md5_=07076ff45292b170d85ccc99611f7da6
+_md5_=25baec86cd3e8b89f7410b14c10c9392
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.67 b/metadata/md5-cache/sys-block/tgt-1.0.67
deleted file mode 100644
index 344d0bb2df19..000000000000
--- a/metadata/md5-cache/sys-block/tgt-1.0.67
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets
-DESCRIPTION=Linux SCSI target framework (tgt)
-EAPI=5
-HOMEPAGE=http://stgt.sourceforge.net
-IUSE=fcoe fcp ibmvio infiniband rbd
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets dev-libs/libaio sys-apps/sg3_utils
-SLOT=0
-SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.67 -> tgt-1.0.67.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=b8cafc05eb865f46d21d966e231a430d
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.68 b/metadata/md5-cache/sys-block/tgt-1.0.68
deleted file mode 100644
index a4df54aad677..000000000000
--- a/metadata/md5-cache/sys-block/tgt-1.0.68
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets
-DESCRIPTION=Linux SCSI target framework (tgt)
-EAPI=5
-HOMEPAGE=http://stgt.sourceforge.net
-IUSE=fcoe fcp ibmvio infiniband rbd
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets dev-libs/libaio sys-apps/sg3_utils
-SLOT=0
-SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.68 -> tgt-1.0.68.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=652428d8ab3d1148562d9aef0e4be868
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.69 b/metadata/md5-cache/sys-block/tgt-1.0.69
deleted file mode 100644
index 0f5921cb954b..000000000000
--- a/metadata/md5-cache/sys-block/tgt-1.0.69
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets
-DESCRIPTION=Linux SCSI target framework (tgt)
-EAPI=5
-HOMEPAGE=http://stgt.sourceforge.net
-IUSE=fcoe fcp ibmvio infiniband rbd
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets dev-libs/libaio sys-apps/sg3_utils
-SLOT=0
-SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.69 -> tgt-1.0.69.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=a8323c173518b49c32d28810ddeb626e
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.71 b/metadata/md5-cache/sys-block/tgt-1.0.71
index dedb0f5a90ee..d163b40d7410 100644
--- a/metadata/md5-cache/sys-block/tgt-1.0.71
+++ b/metadata/md5-cache/sys-block/tgt-1.0.71
@@ -4,10 +4,10 @@ DESCRIPTION=Linux SCSI target framework (tgt)
EAPI=5
HOMEPAGE=http://stgt.sourceforge.net
IUSE=fcoe fcp ibmvio infiniband rbd
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
LICENSE=GPL-2
RDEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets dev-libs/libaio sys-apps/sg3_utils
SLOT=0
SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.71 -> tgt-1.0.71.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=ca6ffa45e4fa7383086e4384b3d252e8
+_md5_=b38f1382ab889c45f9786010b27898d6
diff --git a/metadata/md5-cache/sys-cluster/ceph-0.94.9 b/metadata/md5-cache/sys-cluster/ceph-0.94.9
index 6e9a1e43c910..2abee50fa094 100644
--- a/metadata/md5-cache/sys-cluster/ceph-0.94.9
+++ b/metadata/md5-cache/sys-cluster/ceph-0.94.9
@@ -1,14 +1,14 @@
DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=app-arch/snappy dev-libs/boost:=[threads] dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] virtual/pkgconfig >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEPEND=app-arch/snappy dev-libs/boost:=[threads] dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0 ) libatomic? ( dev-libs/libatomic_ops ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] virtual/pkgconfig >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=Ceph distributed filesystem
EAPI=5
HOMEPAGE=http://ceph.com/
IUSE=babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs jemalloc python tcmalloc xfs zfs python_targets_python2_7
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
LICENSE=LGPL-2.1
-RDEPEND=app-arch/snappy dev-libs/boost:=[threads] dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sys-apps/hdparm dev-python/flask[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+RDEPEND=app-arch/snappy dev-libs/boost:=[threads] dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0 ) libatomic? ( dev-libs/libatomic_ops ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sys-apps/hdparm dev-python/flask[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
REQUIRED_USE=python_targets_python2_7 ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc )
SLOT=0
SRC_URI=http://ceph.com/download/ceph-0.94.9.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182
-_md5_=fd4a3bb2b3319d231eb8c4385ab82d48
+_md5_=97b1e51bd32a73f9a13e2d7c4f78daf2
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.3-r2 b/metadata/md5-cache/sys-cluster/ceph-10.2.3-r2
index dd07b43c09b0..e19f19f65468 100644
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.3-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.3-r2
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/cpio sys-apps/lsb-release virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0 ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/cpio sys-apps/lsb-release virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=Ceph distributed filesystem
EAPI=6
HOMEPAGE=http://ceph.com/
IUSE=babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
LICENSE=LGPL-2.1
-RDEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+RDEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0 ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc ) radosgw
RESTRICT=test? ( userpriv ) test
SLOT=0
SRC_URI=http://ceph.com/download/ceph-10.2.3.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2ddfe6c0cd25c7a77fa23dd9b375d107
+_md5_=f70ac064b619912f5a75322abb0df2e4
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.5-r1 b/metadata/md5-cache/sys-cluster/ceph-10.2.5-r1
deleted file mode 100644
index 3e6c3095fe45..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/cpio sys-apps/lsb-release virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Ceph distributed filesystem
-EAPI=6
-HOMEPAGE=http://ceph.com/
-IUSE=babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc ) radosgw
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=http://ceph.com/download/ceph-10.2.5.tar.gz
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fd987d678e16010ef24cb53206974f5d
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.5-r3 b/metadata/md5-cache/sys-cluster/ceph-10.2.5-r3
deleted file mode 100644
index 7c33d4161eaf..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.5-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/cpio sys-apps/lsb-release virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Ceph distributed filesystem
-EAPI=6
-HOMEPAGE=http://ceph.com/
-IUSE=babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc ) radosgw
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=http://ceph.com/download/ceph-10.2.5.tar.gz
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f62e5672fc5715b57562552c8b39e0a3
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.5-r4 b/metadata/md5-cache/sys-cluster/ceph-10.2.5-r4
deleted file mode 100644
index 834f2d4179b3..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.5-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/cpio sys-apps/lsb-release virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Ceph distributed filesystem
-EAPI=6
-HOMEPAGE=http://ceph.com/
-IUSE=babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc ) radosgw
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=http://ceph.com/download/ceph-10.2.5.tar.gz
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=185122f1f12ca1c1f5dc38cd552b916d
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.5-r5 b/metadata/md5-cache/sys-cluster/ceph-10.2.5-r5
deleted file mode 100644
index dac6f37029eb..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.5-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/cpio sys-apps/lsb-release virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Ceph distributed filesystem
-EAPI=6
-HOMEPAGE=http://ceph.com/
-IUSE=babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc ) radosgw
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=http://ceph.com/download/ceph-10.2.5.tar.gz
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6d444c033f2722bbe24dfafbc05a9c11
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.6 b/metadata/md5-cache/sys-cluster/ceph-10.2.6
deleted file mode 100644
index 8741fedad9e4..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/cpio virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Ceph distributed filesystem
-EAPI=6
-HOMEPAGE=http://ceph.com/
-IUSE=babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc ) radosgw
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=http://download.ceph.com/tarballs/ceph-10.2.6.tar.gz
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3146c6dc4ff447c7255dbb830e73b909
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.6-r1 b/metadata/md5-cache/sys-cluster/ceph-10.2.6-r1
deleted file mode 100644
index ed58b9c487ec..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/cpio virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Ceph distributed filesystem
-EAPI=6
-HOMEPAGE=http://ceph.com/
-IUSE=babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc ) radosgw
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=http://download.ceph.com/tarballs/ceph-10.2.6.tar.gz
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ab18f435d081c7bf9725d067e55d8cf5
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.7 b/metadata/md5-cache/sys-cluster/ceph-10.2.7
deleted file mode 100644
index 4324996a5bd5..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/cpio virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Ceph distributed filesystem
-EAPI=6
-HOMEPAGE=http://ceph.com/
-IUSE=babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc ) radosgw
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.ceph.com/tarballs/ceph-10.2.7.tar.gz
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e26543fa999d99ed605f13d41e90ad40
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.7-r1 b/metadata/md5-cache/sys-cluster/ceph-10.2.7-r1
index c205af56f820..015eb16327ee 100644
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.7-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.7-r1
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=app-arch/snappy:= sys-libs/zlib:= app-arch/lz4:= app-arch/bzip2:= app-arch/zstd:= dev-libs/boost:=[threads] dev-libs/libaio:= dev-libs/leveldb:=[snappy] nss? ( dev-libs/nss:= ) libatomic? ( dev-libs/libatomic_ops:= ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2:= radosgw? ( dev-libs/fcgi:= ) ldap? ( net-nds/openldap:= ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) gtk? ( x11-libs/gtk+:2= dev-cpp/gtkmm:2.4 gnome-base/librsvg:= ) radosgw? ( dev-libs/fcgi:= dev-libs/expat:= net-misc/curl:= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust:= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/cpio virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEPEND=app-arch/snappy:= sys-libs/zlib:= app-arch/lz4:= app-arch/bzip2:= app-arch/zstd:= dev-libs/boost:=[threads] dev-libs/libaio:= dev-libs/leveldb:=[snappy] nss? ( dev-libs/nss:= ) libatomic? ( dev-libs/libatomic_ops:= ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2:= radosgw? ( dev-libs/fcgi:= ) ldap? ( net-nds/openldap:= ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) gtk? ( x11-libs/gtk+:2= dev-cpp/gtkmm:2.4 gnome-base/librsvg:= ) radosgw? ( dev-libs/fcgi:= dev-libs/expat:= net-misc/curl:= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust:= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/cpio virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=Ceph distributed filesystem
EAPI=6
HOMEPAGE=http://ceph.com/
IUSE=babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=LGPL-2.1
-RDEPEND=app-arch/snappy:= sys-libs/zlib:= app-arch/lz4:= app-arch/bzip2:= app-arch/zstd:= dev-libs/boost:=[threads] dev-libs/libaio:= dev-libs/leveldb:=[snappy] nss? ( dev-libs/nss:= ) libatomic? ( dev-libs/libatomic_ops:= ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2:= radosgw? ( dev-libs/fcgi:= ) ldap? ( net-nds/openldap:= ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) gtk? ( x11-libs/gtk+:2= dev-cpp/gtkmm:2.4 gnome-base/librsvg:= ) radosgw? ( dev-libs/fcgi:= dev-libs/expat:= net-misc/curl:= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust:= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=app-arch/snappy:= sys-libs/zlib:= app-arch/lz4:= app-arch/bzip2:= app-arch/zstd:= dev-libs/boost:=[threads] dev-libs/libaio:= dev-libs/leveldb:=[snappy] nss? ( dev-libs/nss:= ) libatomic? ( dev-libs/libatomic_ops:= ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2:= radosgw? ( dev-libs/fcgi:= ) ldap? ( net-nds/openldap:= ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) gtk? ( x11-libs/gtk+:2= dev-cpp/gtkmm:2.4 gnome-base/librsvg:= ) radosgw? ( dev-libs/fcgi:= dev-libs/expat:= net-misc/curl:= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust:= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc ) radosgw
RESTRICT=test
SLOT=0
SRC_URI=http://download.ceph.com/tarballs/ceph-10.2.7.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e9ce66ef1b4e44b4da2c6974fdfb551c
+_md5_=11db9820ba165bac32c38077b8913171
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.8 b/metadata/md5-cache/sys-cluster/ceph-10.2.8
index 6f5bf513b6b5..07ae3b9e5c08 100644
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.8
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.8
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=app-arch/snappy:= sys-libs/zlib:= app-arch/lz4:= app-arch/bzip2:= app-arch/zstd:= dev-libs/boost:=[threads] dev-libs/libaio:= dev-libs/leveldb:=[snappy] nss? ( dev-libs/nss:= ) libatomic? ( dev-libs/libatomic_ops:= ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2:= radosgw? ( dev-libs/fcgi:= ) ldap? ( net-nds/openldap:= ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) gtk? ( x11-libs/gtk+:2= dev-cpp/gtkmm:2.4 gnome-base/librsvg:= ) radosgw? ( dev-libs/fcgi:= dev-libs/expat:= net-misc/curl:= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust:= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/cpio virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEPEND=app-arch/snappy:= sys-libs/zlib:= app-arch/lz4:= app-arch/bzip2:= app-arch/zstd:= dev-libs/boost:=[threads] dev-libs/libaio:= dev-libs/leveldb:=[snappy] nss? ( dev-libs/nss:= ) libatomic? ( dev-libs/libatomic_ops:= ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2:= radosgw? ( dev-libs/fcgi:= ) ldap? ( net-nds/openldap:= ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) gtk? ( x11-libs/gtk+:2= dev-cpp/gtkmm:2.4 gnome-base/librsvg:= ) radosgw? ( dev-libs/fcgi:= dev-libs/expat:= net-misc/curl:= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust:= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/cpio virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=Ceph distributed filesystem
EAPI=6
HOMEPAGE=http://ceph.com/
IUSE=babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=LGPL-2.1
-RDEPEND=app-arch/snappy:= sys-libs/zlib:= app-arch/lz4:= app-arch/bzip2:= app-arch/zstd:= dev-libs/boost:=[threads] dev-libs/libaio:= dev-libs/leveldb:=[snappy] nss? ( dev-libs/nss:= ) libatomic? ( dev-libs/libatomic_ops:= ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2:= radosgw? ( dev-libs/fcgi:= ) ldap? ( net-nds/openldap:= ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) gtk? ( x11-libs/gtk+:2= dev-cpp/gtkmm:2.4 gnome-base/librsvg:= ) radosgw? ( dev-libs/fcgi:= dev-libs/expat:= net-misc/curl:= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust:= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=app-arch/snappy:= sys-libs/zlib:= app-arch/lz4:= app-arch/bzip2:= app-arch/zstd:= dev-libs/boost:=[threads] dev-libs/libaio:= dev-libs/leveldb:=[snappy] nss? ( dev-libs/nss:= ) libatomic? ( dev-libs/libatomic_ops:= ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2:= radosgw? ( dev-libs/fcgi:= ) ldap? ( net-nds/openldap:= ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) gtk? ( x11-libs/gtk+:2= dev-cpp/gtkmm:2.4 gnome-base/librsvg:= ) radosgw? ( dev-libs/fcgi:= dev-libs/expat:= net-misc/curl:= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust:= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc ) radosgw
RESTRICT=test
SLOT=0
SRC_URI=http://download.ceph.com/tarballs/ceph-10.2.8.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=32d9e6e93103552bd4fa23aabc8781d6
+_md5_=15c8f8cb7320fd3e18a828846e525ff2
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.9 b/metadata/md5-cache/sys-cluster/ceph-10.2.9
new file mode 100644
index 000000000000..b9983a55d02b
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=app-arch/snappy:= sys-libs/zlib:= app-arch/lz4:= app-arch/bzip2:= app-arch/zstd:= dev-libs/boost:=[threads] dev-libs/libaio:= dev-libs/leveldb:=[snappy] nss? ( dev-libs/nss:= ) libatomic? ( dev-libs/libatomic_ops:= ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2:= radosgw? ( dev-libs/fcgi:= ) ldap? ( net-nds/openldap:= ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) gtk? ( x11-libs/gtk+:2= dev-cpp/gtkmm:2.4 gnome-base/librsvg:= ) radosgw? ( dev-libs/fcgi:= dev-libs/expat:= net-misc/curl:= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust:= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/cpio virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Ceph distributed filesystem
+EAPI=6
+HOMEPAGE=http://ceph.com/
+IUSE=babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-arch/snappy:= sys-libs/zlib:= app-arch/lz4:= app-arch/bzip2:= app-arch/zstd:= dev-libs/boost:=[threads] dev-libs/libaio:= dev-libs/leveldb:=[snappy] nss? ( dev-libs/nss:= ) libatomic? ( dev-libs/libatomic_ops:= ) cryptopp? ( dev-libs/crypto++:= ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2:= radosgw? ( dev-libs/fcgi:= ) ldap? ( net-nds/openldap:= ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) gtk? ( x11-libs/gtk+:2= dev-cpp/gtkmm:2.4 gnome-base/librsvg:= ) radosgw? ( dev-libs/fcgi:= dev-libs/expat:= net-misc/curl:= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust:= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc ) radosgw
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.ceph.com/tarballs/ceph-10.2.9.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=15c8f8cb7320fd3e18a828846e525ff2
diff --git a/metadata/md5-cache/sys-cluster/ceph-9.2.1-r2 b/metadata/md5-cache/sys-cluster/ceph-9.2.1-r2
index b0116d3453f9..a13501950ccc 100644
--- a/metadata/md5-cache/sys-cluster/ceph-9.2.1-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-9.2.1-r2
@@ -1,14 +1,14 @@
DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=app-arch/snappy dev-libs/boost:=[threads] dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] virtual/pkgconfig >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEPEND=app-arch/snappy dev-libs/boost:=[threads] dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0 ) libatomic? ( dev-libs/libatomic_ops ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] virtual/pkgconfig >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=Ceph distributed filesystem
EAPI=5
HOMEPAGE=http://ceph.com/
IUSE=babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs jemalloc tcmalloc xfs zfs python_targets_python2_7
KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
LICENSE=LGPL-2.1
-RDEPEND=app-arch/snappy dev-libs/boost:=[threads] dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sys-apps/hdparm dev-python/flask[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+RDEPEND=app-arch/snappy dev-libs/boost:=[threads] dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0 ) libatomic? ( dev-libs/libatomic_ops ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sys-apps/hdparm dev-python/flask[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
REQUIRED_USE=python_targets_python2_7 ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc )
SLOT=0
SRC_URI=http://ceph.com/download/ceph-9.2.1.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo 589f4c6d735919e293942dd66311dc40 systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=277e81072eefaaa1c2469bbb9095eadb
+_md5_=194383cf7966e212c2642f586d11312e
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.7.2 b/metadata/md5-cache/sys-cluster/kubectl-1.7.2
new file mode 100644
index 000000000000..f8dfad75e28e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.7.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.7.2.tar.gz -> kubernetes-1.7.2.tar.gz
+_eclasses_=golang-base 51a1f13e065f1cff4507685d9cc268c7 golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 7fb5d554a7e656be19ec465fa5bb66db
+_md5_=67652c99ac21a34f7a6b891b750872c7
diff --git a/metadata/md5-cache/sys-fs/zfs-0.7.0 b/metadata/md5-cache/sys-fs/zfs-0.7.0
new file mode 100644
index 000000000000..7082ba511a01
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-0.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig >=app-portage/elt-patches-20170317 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Userland utilities for ZFS Linux kernel module
+EAPI=5
+HOMEPAGE=http://zfsonlinux.org/
+IUSE=custom-cflags debug kernel-builtin +rootfs test-suite static-libs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=BSD-2 CDDL MIT
+RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.7.0* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils !=app-portage/elt-patches-20170317
+DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
+EAPI=5
+HOMEPAGE=http://zfsonlinux.org/
+IUSE=custom-cflags debug +rootfs kernel_linux
+KEYWORDS=~amd64
+LICENSE=CDDL debug? ( GPL-2+ )
+RDEPEND==sys-kernel/spl-0.7.0* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
+RESTRICT=debug? ( strip ) test
+SLOT=0
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.0/zfs-0.7.0.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 autotools-utils 5a4611dfba155b1659528663fad4cd5e epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fced9534692984a7e2cbf61eef004b6e
diff --git a/metadata/md5-cache/sys-kernel/bliss-initramfs-6.8.3-r2 b/metadata/md5-cache/sys-kernel/bliss-initramfs-6.8.3-r2
index df7129f2b395..083d89293a19 100644
--- a/metadata/md5-cache/sys-kernel/bliss-initramfs-6.8.3-r2
+++ b/metadata/md5-cache/sys-kernel/bliss-initramfs-6.8.3-r2
@@ -2,13 +2,13 @@ DEFINED_PHASES=install setup
DESCRIPTION=Boot your system's rootfs from ZFS, LVM, RAID, or a variety of other configs.
EAPI=6
HOMEPAGE=https://github.com/fearedbliss/bliss-initramfs
-IUSE=python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
KEYWORDS=-* amd64
LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/cpio virtual/udev
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/cpio virtual/udev
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
RESTRICT=strip
SLOT=0
SRC_URI=https://github.com/fearedbliss/bliss-initramfs/archive/6.8.3.tar.gz -> bliss-initramfs-6.8.3.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=63b3c9fda12dbe7e2056df2e04c9cdd8
+_md5_=5c90d95697a99879bcb5903657bdc1e0
diff --git a/metadata/md5-cache/sys-kernel/bliss-initramfs-7.0.2-r1 b/metadata/md5-cache/sys-kernel/bliss-initramfs-7.0.2-r1
index 36b02fdd4115..1d1870e8b507 100644
--- a/metadata/md5-cache/sys-kernel/bliss-initramfs-7.0.2-r1
+++ b/metadata/md5-cache/sys-kernel/bliss-initramfs-7.0.2-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=install setup
DESCRIPTION=Boot your system's rootfs from ZFS, LVM, RAID, or a variety of other configs.
EAPI=6
HOMEPAGE=https://github.com/fearedbliss/bliss-initramfs
-IUSE=python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
KEYWORDS=-* amd64
LICENSE=BSD-2
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/cpio virtual/udev
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/cpio virtual/udev
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
RESTRICT=strip
SLOT=0
SRC_URI=https://github.com/fearedbliss/bliss-initramfs/archive/7.0.2.tar.gz -> bliss-initramfs-7.0.2.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=b05caac9d5b11bb2a78022d741460988
+_md5_=f4e78a90fc1652acb954541ad22d1cd6
diff --git a/metadata/md5-cache/sys-kernel/bliss-initramfs-7.1.0 b/metadata/md5-cache/sys-kernel/bliss-initramfs-7.1.0
index 453f352673d4..b13b4187a127 100644
--- a/metadata/md5-cache/sys-kernel/bliss-initramfs-7.1.0
+++ b/metadata/md5-cache/sys-kernel/bliss-initramfs-7.1.0
@@ -2,13 +2,13 @@ DEFINED_PHASES=install setup
DESCRIPTION=Boot your system's rootfs from ZFS, LVM, RAID, or a variety of other configs.
EAPI=6
HOMEPAGE=https://github.com/fearedbliss/bliss-initramfs
-IUSE=python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
KEYWORDS=-* ~amd64
LICENSE=BSD-2
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/cpio virtual/udev
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/cpio virtual/udev
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
RESTRICT=strip
SLOT=0
SRC_URI=https://github.com/fearedbliss/bliss-initramfs/archive/7.1.0.tar.gz -> bliss-initramfs-7.1.0.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=f058269ac9b3d48d056d7ab36a07f850
+_md5_=e373ed186d591a8a581c07e838aecedf
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.12.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.12.4
new file mode 100644
index 000000000000..597b45fe9fc6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.12 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.12.4
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.12.tar.xz mirror://gentoo/genpatches-4.12-5.base.tar.xz mirror://gentoo/genpatches-4.12-5.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.12-5.experimental.tar.xz )
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea kernel-2 1241c87493492a950598df999f91e603 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6f6edd8cc5c0447befb62da833918fc5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.79 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.79
new file mode 100644
index 000000000000..3a1ff7718385
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.79
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.79
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-82.base.tar.xz mirror://gentoo/genpatches-4.4-82.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-82.experimental.tar.xz )
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea kernel-2 1241c87493492a950598df999f91e603 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5ff44342a97a3b7f09ae7b71429398f5
diff --git a/metadata/md5-cache/sys-kernel/spl-0.7.0 b/metadata/md5-cache/sys-kernel/spl-0.7.0
new file mode 100644
index 000000000000..0be01a922413
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/spl-0.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) >=app-portage/elt-patches-20170317
+DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
+EAPI=5
+HOMEPAGE=http://zfsonlinux.org/
+IUSE=custom-cflags debug kernel_linux
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
+RESTRICT=debug? ( strip ) test
+SLOT=0
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.0/spl-0.7.0.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 autotools-utils 5a4611dfba155b1659528663fad4cd5e epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3e40d5246fa63555b9a4405fe1871e7c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.12.3 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.12.4
similarity index 92%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.12.3
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.12.4
index 41f2a06a651e..8b2568c5550e 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.12.3
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.12.4
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=GPL-2 freedist
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
RESTRICT=binchecks strip
-SLOT=4.12.3
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.12.3.xz mirror://kernel/linux/kernel/v4.x/linux-4.12.tar.xz
+SLOT=4.12.4
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.12.4.xz mirror://kernel/linux/kernel/v4.x/linux-4.12.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea kernel-2 1241c87493492a950598df999f91e603 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.79 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.79
new file mode 100644
index 000000000000..586b3771fee9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.79
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.79
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.79.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea kernel-2 1241c87493492a950598df999f91e603 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.39 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.40
similarity index 92%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.9.39
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.9.40
index 456046f66470..bf896b161ebf 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.39
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.40
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=GPL-2 freedist
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
RESTRICT=binchecks strip
-SLOT=4.9.39
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.39.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+SLOT=4.9.40
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.40.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea kernel-2 1241c87493492a950598df999f91e603 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/sys-process/acct-6.6.4 b/metadata/md5-cache/sys-process/acct-6.6.4
new file mode 100644
index 000000000000..e05c840333d0
--- /dev/null
+++ b/metadata/md5-cache/sys-process/acct-6.6.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=GNU system accounting utilities
+EAPI=6
+HOMEPAGE=https://savannah.gnu.org/projects/acct/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://gnu/acct/acct-6.6.4.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool e32ea84bf82cf8987965b574672dba93 multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=1e0c32d4f823c6a5299cacfdccc5bbaa
diff --git a/metadata/md5-cache/virtual/freedesktop-icon-theme-0-r1 b/metadata/md5-cache/virtual/freedesktop-icon-theme-0-r2
similarity index 81%
rename from metadata/md5-cache/virtual/freedesktop-icon-theme-0-r1
rename to metadata/md5-cache/virtual/freedesktop-icon-theme-0-r2
index eff57ed2e758..956409b23ff3 100644
--- a/metadata/md5-cache/virtual/freedesktop-icon-theme-0-r1
+++ b/metadata/md5-cache/virtual/freedesktop-icon-theme-0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=A virtual to choose between different icon themes
EAPI=6
KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-RDEPEND=|| ( x11-themes/adwaita-icon-theme x11-themes/gnome-icon-theme x11-themes/faenza-icon-theme lxde-base/lxde-icon-theme x11-themes/tango-icon-theme kde-frameworks/oxygen-icons x11-themes/mate-icon-theme )
+RDEPEND=|| ( x11-themes/adwaita-icon-theme x11-themes/gnome-icon-theme x11-themes/faenza-icon-theme lxde-base/lxde-icon-theme x11-themes/tango-icon-theme kde-frameworks/oxygen-icons x11-themes/mate-icon-theme x11-themes/elementary-xfce-icon-theme )
SLOT=0
-_md5_=271a36fc7ec22ffeb941e4d2db07dd8e
+_md5_=28d4b99aa3bc54369aef7b454f96e664
diff --git a/metadata/md5-cache/www-client/chromium-60.0.3112.78 b/metadata/md5-cache/www-client/chromium-60.0.3112.78
index 7ff3f86ad885..f5a6268d66be 100644
--- a/metadata/md5-cache/www-client/chromium-60.0.3112.78
+++ b/metadata/md5-cache/www-client/chromium-60.0.3112.78
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 =dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= media-libs/opus:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 dev-util/ninja net-libs/nodejs sys-apps/hwids[usb(+)] tcmalloc? ( !=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 =dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 dev-util/ninja net-libs/nodejs sys-apps/hwids[usb(+)] tcmalloc? ( !=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Open-source version of Google Chrome web browser
EAPI=6
HOMEPAGE=http://chromium.org/
-IUSE=component-build cups gnome-keyring +gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW test
+IUSE=component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW test
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 =dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= media-libs/opus:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 =dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 dev-libs/icu:= dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= media-libs/opus:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 dev-util/ninja net-libs/nodejs sys-apps/hwids[usb(+)] tcmalloc? ( !=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=6
-HOMEPAGE=http://chromium.org/
-IUSE=component-build cups gnome-keyring +gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 dev-libs/icu:= dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= media-libs/opus:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( =dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= media-libs/opus:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 dev-util/ninja net-libs/nodejs sys-apps/hwids[usb(+)] tcmalloc? ( !=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( =dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= media-libs/opus:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 dev-util/ninja net-libs/nodejs sys-apps/hwids[usb(+)] tcmalloc? ( !=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Open-source version of Google Chrome web browser
EAPI=6
HOMEPAGE=http://chromium.org/
-IUSE=component-build cups gnome-keyring +gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW test
+IUSE=component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW test
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( =dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= media-libs/opus:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( =dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= media-libs/opus:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( =dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 dev-util/ninja net-libs/nodejs sys-apps/hwids[usb(+)] tcmalloc? ( !=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=6
+HOMEPAGE=http://chromium.org/
+IUSE=component-build cups gnome-keyring +gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( =dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !=dev-libs/nss-3.28.1 >=dev-libs/nspr-4.13 crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt5] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) x11-plugins/enigmail ) jack? ( virtual/jack ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.2.0/source/thunderbird-52.2.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/seamonkey-2.49-l10n-sources-20170724.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.2-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.2-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.2-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
+SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.2.0/source/thunderbird-52.2.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/seamonkey-2.49-l10n-sources-20170727.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.2-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.2-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.2-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e mozconfig-v6.52 0c29133650826a0ead684f84f2efe90f mozcoreconf-v5 aa19131a5fb2f1d108a2c0a1453e2458 mozextension e5d920147bfccf4930062e462e2a417d mozlinguas-v2 e3c0b93bb284269205def793bf37bef5 multilib 97f470f374f2e94ccab04a2fb21d811e nsplugins 2049586e425364a1c5bdb004205d1758 pax-utils 4f95120230a315c8caaabeb2307b7eee python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ab37cf5a2b77be0f2b872cd6174f810a
+_md5_=75b979993b9e9d40b9aedd65e9a4ea3f
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-384.47 b/metadata/md5-cache/x11-drivers/nvidia-drivers-384.47
deleted file mode 100644
index 21931b742258..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-384.47
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=6
-HOMEPAGE=http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx
-IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=tools? ( X ) static-libs? ( tools )
-RESTRICT=bindist mirror
-SLOT=0/384
-SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/384.47/NVIDIA-FreeBSD-x86_64-384.47.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/384.47/NVIDIA-Linux-x86_64-384.47.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-32bit-ARM/384.47/NVIDIA-Linux-armv7l-gnueabihf-384.47.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/384.47/NVIDIA-FreeBSD-x86-384.47.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/384.47/NVIDIA-Linux-x86-384.47.run ) tools? ( https://github.com/NVIDIA/nvidia-settings/archive/384.47.tar.gz -> nvidia-settings-384.47.tar.gz )
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 nvidia-driver d49d68d8038f17c82f74beb68a753b74 portability 2b88d3ecc35035a3b8ab628b49cafb0e readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 udev d91cac2c73b94629cad2daea66e0d182 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ab3aca8bf814bcc3f6333236df1d03b1
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.0.32 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.0.32
deleted file mode 100644
index 3c7bac852fa2..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.0.32
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND==dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-lang/yasm-0.6.2 >=dev-util/kbuild-0.1.9998_pre20131130 >=sys-devel/gcc-4.9.0 sys-power/iasl x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/resourceproto x11-proto/scrnsaverproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext dri? ( x11-proto/xf86driproto >=x11-libs/libdrm-2.4.5 )
-DESCRIPTION=VirtualBox X11 video driver for Gentoo guest
-EAPI=6
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=dri python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=dri? ( ~app-emulation/virtualbox-guest-additions-5.0.32 )
-RDEPEND==dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.0.32/VirtualBox-5.0.32.tar.bz2
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ec936c4271808d74d9af226ab818c7dc
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.0.40 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.0.40
index 5c652ec08428..8d1b32a4c16b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.0.40
+++ b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.0.40
@@ -4,7 +4,7 @@ DESCRIPTION=VirtualBox X11 video driver for Gentoo guest
EAPI=6
HOMEPAGE=http://www.virtualbox.org/
IUSE=dri python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
PDEPEND=dri? ( ~app-emulation/virtualbox-guest-additions-5.0.40 )
RDEPEND==dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
@@ -12,4 +12,4 @@ REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=http://download.virtualbox.org/virtualbox/5.0.40/VirtualBox-5.0.40.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2a2a33123a1344e589943bca496df84b
+_md5_=ec936c4271808d74d9af226ab818c7dc
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.22 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.26
similarity index 91%
rename from metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.22
rename to metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.26
index f37e6a8eab6b..29dd21990cc3 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.22
+++ b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.26
@@ -6,10 +6,10 @@ HOMEPAGE=http://www.virtualbox.org/
IUSE=dri python_targets_python2_7
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-PDEPEND=dri? ( ~app-emulation/virtualbox-guest-additions-5.1.22 )
+PDEPEND=dri? ( ~app-emulation/virtualbox-guest-additions-5.1.26 )
RDEPEND=>=x11-base/xorg-server-1.7:=[-minimal] x11-libs/libXcomposite python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
REQUIRED_USE=python_targets_python2_7
SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/5.1.22/VirtualBox-5.1.22.tar.bz2
+SRC_URI=http://download.virtualbox.org/virtualbox/5.1.26/VirtualBox-5.1.26.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d53dc25bb681cb3a96263c8c5a8f8a38
+_md5_=0bfb5cdd1418ec896c3a9d9494fe575c
diff --git a/metadata/md5-cache/x11-libs/colord-gtk-0.1.26 b/metadata/md5-cache/x11-libs/colord-gtk-0.1.26
index 7ea537aa5c41..5cdb113dcf19 100644
--- a/metadata/md5-cache/x11-libs/colord-gtk-0.1.26
+++ b/metadata/md5-cache/x11-libs/colord-gtk-0.1.26
@@ -4,7 +4,7 @@ DESCRIPTION=GTK support library for colord
EAPI=5
HOMEPAGE=https://www.freedesktop.org/software/colord/
IUSE=doc +introspection vala
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
LICENSE=LGPL-3+
RDEPEND=>=dev-libs/glib-2.28:2 >=media-libs/lcms-2.2:2= x11-libs/gdk-pixbuf:2[introspection?] x11-libs/gtk+:3[X(+),introspection?] x11-misc/colord:=[introspection?,vala?] introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) !=dev-libs/glib-2.25.6:2 >=sys-apps/dbus-0.30 x11-libs/cairo x11-libs/libX11 x11-libs/pango x11-libs/libXxf86vm consolekit? ( sys-auth/consolekit ) dpms? ( x11-libs/libXext ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( x11-libs/gtk+:3 ) screensaver? ( x11-libs/libXScrnSaver ) systemd? ( sys-apps/systemd ) upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) dev-lang/perl dev-perl/XML-Parser dev-util/intltool sys-devel/gettext >=app-portage/elt-patches-20170317 >=sys-apps/sed-4
+DESCRIPTION=A simple locker using lightdm
+EAPI=5
+HOMEPAGE=https://github.com/the-cavalry/light-locker
+IUSE=+consolekit +dpms gtk3 +screensaver -systemd +upower
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.25.6:2 >=sys-apps/dbus-0.30 x11-libs/cairo x11-libs/libX11 x11-libs/pango x11-libs/libXxf86vm consolekit? ( sys-auth/consolekit ) dpms? ( x11-libs/libXext ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( x11-libs/gtk+:3 ) screensaver? ( x11-libs/libXScrnSaver ) systemd? ( sys-apps/systemd ) upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) x11-misc/lightdm
+SLOT=0
+SRC_URI=https://github.com/the-cavalry/light-locker/releases/download/v1.8.0/light-locker-1.8.0.tar.bz2
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 autotools-utils 5a4611dfba155b1659528663fad4cd5e epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=04ee03dcfc4624e23263d2031484f6c2
diff --git a/metadata/md5-cache/x11-misc/sxhkd-0.5.8 b/metadata/md5-cache/x11-misc/sxhkd-0.5.8
new file mode 100644
index 000000000000..f7652a1db7c7
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/sxhkd-0.5.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms x11-libs/xcb-util virtual/pkgconfig
+DESCRIPTION=Simple X hotkey daemon
+EAPI=6
+HOMEPAGE=https://github.com/baskerville/sxhkd/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms
+SLOT=0
+SRC_URI=https://github.com/baskerville/sxhkd/archive/0.5.8.tar.gz -> sxhkd-0.5.8.tar.gz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=478e305f4b2fdf3dc6a8897e79c68312
diff --git a/metadata/md5-cache/x11-plugins/enigmail-1.9.8.1 b/metadata/md5-cache/x11-plugins/enigmail-1.9.8.1
new file mode 100644
index 000000000000..77c2542f9289
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/enigmail-1.9.8.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
+DESCRIPTION=Mozilla extension to provide GPG support in mail clients
+EAPI=6
+HOMEPAGE=http://www.enigmail.net/
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-3
+RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* )
+SLOT=0
+SRC_URI=http://www.enigmail.net/download/source/enigmail-1.9.8.1.tar.gz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
+_md5_=c35d41cf77ca00d7a1f41481e570b664
diff --git a/metadata/md5-cache/x11-terms/st-9999 b/metadata/md5-cache/x11-terms/st-9999
index abd812cea4f4..ee21ba7d42cb 100644
--- a/metadata/md5-cache/x11-terms/st-9999
+++ b/metadata/md5-cache/x11-terms/st-9999
@@ -8,4 +8,4 @@ LICENSE=MIT-with-advertising
RDEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXext x11-libs/libXft
SLOT=0
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea git-r3 cbafa3261c37c7e3af44bb16a34ea390 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=b2581f499bfa925ccafbe23cefdad99b
+_md5_=2e5956f7f86cf0fbf4fc2b719ed9dd57
diff --git a/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.8_p20170710 b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.8_p20170710
new file mode 100644
index 000000000000..213c66c25216
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.8_p20170710
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Elementary icons forked from upstream, extended and maintained for Xfce
+EAPI=6
+HOMEPAGE=https://github.com/shimmerproject/elementary-xfce
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain GPL-1 GPL-2 GPL-3
+SLOT=0
+SRC_URI=https://github.com/shimmerproject/elementary-xfce/archive/7d3a76510d38ad650854382d2dcc502beb91642a.tar.gz -> elementary-xfce-icon-theme-0.8_p20170710.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=b75e34b04e706b4b10b6337f8ba3231f
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-experience-0.10.4 b/metadata/md5-cache/x11-themes/gtk-engines-experience-0.10.4
deleted file mode 100644
index 5c30f4cc5833..000000000000
--- a/metadata/md5-cache/x11-themes/gtk-engines-experience-0.10.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/gtk+-2.6:2 virtual/pkgconfig >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GTK+ Experience Theme Engine
-EAPI=3
-HOMEPAGE=http://benjamin.sipsolutions.net/Projects/eXperience
-KEYWORDS=amd64 ~ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2
-RDEPEND=>=x11-libs/gtk+-2.6:2
-SLOT=2
-SRC_URI=http://benjamin.sipsolutions.net/experience/experience-0.10.4.tar.bz2
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool e32ea84bf82cf8987965b574672dba93 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=080dee3be3d6520e162ec16589d86ead
diff --git a/metadata/md5-cache/x11-themes/laughlin-backgrounds-14.1.0.3-r1 b/metadata/md5-cache/x11-themes/laughlin-backgrounds-14.1.0.3-r1
new file mode 100644
index 000000000000..07e1ea3529cf
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/laughlin-backgrounds-14.1.0.3-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Fedora official background artwork
+EAPI=6
+HOMEPAGE=https://fedoraproject.org/wiki/F14_Artwork
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-SA-2.0
+SLOT=0
+SRC_URI=mirror://fedora-dev/development/15/source/SRPMS/laughlin-backgrounds-14.1.0-3.fc15.src.rpm
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e rpm f52cfa3a435468d86d3b49c357b9cb35 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5c89661c7cd30236d6a8ee800a61b111
diff --git a/metadata/md5-cache/x11-themes/lovelock-backgrounds-14.91.1.1-r1 b/metadata/md5-cache/x11-themes/lovelock-backgrounds-14.91.1.1-r1
new file mode 100644
index 000000000000..158549406290
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/lovelock-backgrounds-14.91.1.1-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Fedora official background artwork
+EAPI=6
+HOMEPAGE=https://fedoraproject.org/wiki/F15_Artwork
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-SA-3.0
+SLOT=0
+SRC_URI=mirror://fedora-dev/releases/15/Fedora/source/SRPMS/lovelock-backgrounds-14.91.1-1.fc15.src.rpm
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e rpm f52cfa3a435468d86d3b49c357b9cb35 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=926944e2c7e3bdfbdf13cfc787f277e9
diff --git a/metadata/md5-cache/x11-themes/obsidian-xcursors-1.0 b/metadata/md5-cache/x11-themes/obsidian-xcursors-1.0
index 8253f3a73033..49c3bf8b8fe5 100644
--- a/metadata/md5-cache/x11-themes/obsidian-xcursors-1.0
+++ b/metadata/md5-cache/x11-themes/obsidian-xcursors-1.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install postinst
DESCRIPTION=A shiny and clean xcursor theme
EAPI=0
HOMEPAGE=http://www.kde-look.org/content/show.php/Obsidian+Cursors?content=73135
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.kde-look.org/CONTENT/content-files/73135-Obsidian.tar.bz2
-_md5_=33d56af85a09ee5a13e84c7f737c9786
+_md5_=c2f1ff5334f05eeaebbb6e53a3e634bb
diff --git a/metadata/md5-cache/x11-themes/verne-backgrounds-15.91.0.1-r1 b/metadata/md5-cache/x11-themes/verne-backgrounds-15.91.0.1-r1
new file mode 100644
index 000000000000..f25039356a69
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/verne-backgrounds-15.91.0.1-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Fedora official background artwork
+EAPI=6
+HOMEPAGE=https://fedoraproject.org/wiki/F16_Artwork
+KEYWORDS=~amd64
+LICENSE=CC-BY-SA-3.0
+SLOT=0
+SRC_URI=mirror://fedora-dev/development/16/source/SRPMS/verne-backgrounds-15.91.0-1.fc16.src.rpm
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e rpm f52cfa3a435468d86d3b49c357b9cb35 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b9af0cdea6dd856ef4b8583e04094506
diff --git a/metadata/md5-cache/x11-wm/bspwm-0.8.8-r1 b/metadata/md5-cache/x11-wm/bspwm-0.8.8-r1
deleted file mode 100644
index 2a9ea86d1547..000000000000
--- a/metadata/md5-cache/x11-wm/bspwm-0.8.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libxcb x11-libs/xcb-util-wm
-DESCRIPTION=Tiling window manager based on binary space partitioning
-EAPI=5
-HOMEPAGE=https://github.com/baskerville/bspwm/
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=x11-libs/libxcb x11-libs/xcb-util-wm x11-misc/sxhkd
-SLOT=0
-SRC_URI=https://github.com/baskerville/bspwm/archive/0.8.8.tar.gz -> bspwm-0.8.8.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=fc96c0866485429f5edc8b39294debe4
diff --git a/metadata/md5-cache/x11-wm/bspwm-0.8.9 b/metadata/md5-cache/x11-wm/bspwm-0.8.9
deleted file mode 100644
index 86b93c0ac6a7..000000000000
--- a/metadata/md5-cache/x11-wm/bspwm-0.8.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libxcb x11-libs/xcb-util-wm
-DESCRIPTION=Tiling window manager based on binary space partitioning
-EAPI=5
-HOMEPAGE=https://github.com/baskerville/bspwm/
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=x11-libs/libxcb x11-libs/xcb-util-wm x11-misc/sxhkd
-SLOT=0
-SRC_URI=https://github.com/baskerville/bspwm/archive/0.8.9.tar.gz -> bspwm-0.8.9.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=0cd1a079f51739cb159a2ca392e778cc
diff --git a/metadata/md5-cache/x11-wm/bspwm-0.9 b/metadata/md5-cache/x11-wm/bspwm-0.9
deleted file mode 100644
index 7f0c056d39bb..000000000000
--- a/metadata/md5-cache/x11-wm/bspwm-0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libxcb x11-libs/xcb-util-wm
-DESCRIPTION=Tiling window manager based on binary space partitioning
-EAPI=5
-HOMEPAGE=https://github.com/baskerville/bspwm/
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=x11-libs/libxcb x11-libs/xcb-util-wm x11-misc/sxhkd
-SLOT=0
-SRC_URI=https://github.com/baskerville/bspwm/archive/0.9.tar.gz -> bspwm-0.9.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=7c9455e4f70d586fec403f4f17f05cc9
diff --git a/metadata/md5-cache/x11-wm/bspwm-0.9.1 b/metadata/md5-cache/x11-wm/bspwm-0.9.3
similarity index 76%
rename from metadata/md5-cache/x11-wm/bspwm-0.9.1
rename to metadata/md5-cache/x11-wm/bspwm-0.9.3
index 4d54bf069856..2ea4798bdfab 100644
--- a/metadata/md5-cache/x11-wm/bspwm-0.9.1
+++ b/metadata/md5-cache/x11-wm/bspwm-0.9.3
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile install
DEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm
DESCRIPTION=Tiling window manager based on binary space partitioning
-EAPI=5
+EAPI=6
HOMEPAGE=https://github.com/baskerville/bspwm/
IUSE=examples
KEYWORDS=~amd64 ~x86
LICENSE=BSD-2
RDEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm x11-misc/sxhkd
SLOT=0
-SRC_URI=https://github.com/baskerville/bspwm/archive/0.9.1.tar.gz -> bspwm-0.9.1.tar.gz
+SRC_URI=https://github.com/baskerville/bspwm/archive/0.9.3.tar.gz -> bspwm-0.9.3.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=dffdf13d923e24e86b0f985d7d075b18
+_md5_=57c1679c08109ff79d453e39410993c4
diff --git a/metadata/md5-cache/x11-wm/i3-4.13-r1 b/metadata/md5-cache/x11-wm/i3-4.13-r1
index 333fccfd921a..bbd2c4b078aa 100644
--- a/metadata/md5-cache/x11-wm/i3-4.13-r1
+++ b/metadata/md5-cache/x11-wm/i3-4.13-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libev dev-libs/libpcre >=dev-libs/yajl-2.0.3 x11-libs/libxcb[xk
SLOT=0
SRC_URI=http://i3wm.org/downloads/i3-4.13.tar.bz2
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool e32ea84bf82cf8987965b574672dba93 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=db6e874e8e8c655c40a21edc56bf26f3
+_md5_=bcb794451b98c1bff7c3bb89f6b7d2e2
diff --git a/metadata/md5-cache/x11-wm/i3-9999 b/metadata/md5-cache/x11-wm/i3-9999
index e8edf0e5f707..df0cb6fbd84d 100644
--- a/metadata/md5-cache/x11-wm/i3-9999
+++ b/metadata/md5-cache/x11-wm/i3-9999
@@ -8,4 +8,4 @@ LICENSE=BSD
RDEPEND=dev-libs/libev dev-libs/libpcre >=dev-libs/yajl-2.0.3 x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm >=x11-libs/cairo-1.14.4[X,xcb] >=x11-libs/pango-1.30.0[X] dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
SLOT=0
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 git-r3 cbafa3261c37c7e3af44bb16a34ea390 libtool e32ea84bf82cf8987965b574672dba93 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=ad6de1e85bf924f381ad9736069079a0
+_md5_=807559c9bedfeeae83439a9e2a74cb78
diff --git a/metadata/md5-cache/x11-wm/lumina-1.2.0 b/metadata/md5-cache/x11-wm/lumina-1.2.0
deleted file mode 100644
index a5c5b9b477e1..000000000000
--- a/metadata/md5-cache/x11-wm/lumina-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtsvg:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtgui:5 dev-qt/qtdeclarative:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm dev-qt/linguist-tools:5
-DESCRIPTION=Lumina desktop environment
-EAPI=6
-HOMEPAGE=http://lumina-desktop.org/
-KEYWORDS=amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtsvg:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtgui:5 dev-qt/qtdeclarative:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm || ( virtual/freedesktop-icon-theme x11-themes/hicolor-icon-theme ) sys-fs/inotify-tools x11-misc/numlockx x11-wm/fluxbox x11-apps/xbacklight media-sound/alsa-utils sys-power/acpi app-admin/sysstat
-SLOT=0
-SRC_URI=https://github.com/trueos/lumina/archive/v1.2.0.tar.gz -> lumina-1.2.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=29ca5e31d8b643f2eaa45d964c6fd60c
diff --git a/metadata/md5-cache/x11-wm/lumina-1.3.0_p1 b/metadata/md5-cache/x11-wm/lumina-1.3.0_p1
index e27bbcc9d043..b525e0307fee 100644
--- a/metadata/md5-cache/x11-wm/lumina-1.3.0_p1
+++ b/metadata/md5-cache/x11-wm/lumina-1.3.0_p1
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5[widgets] dev
SLOT=0
SRC_URI=https://github.com/trueos/lumina/archive/v1.3.0-p1.tar.gz -> lumina-1.3.0_p1.tar.gz
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=7afe1302ec897b8ccf4b1856d21f30f8
+_md5_=70d2c659d1ad3809ed1e962a003940d7
diff --git a/metadata/md5-cache/x11-wm/lumina-9999 b/metadata/md5-cache/x11-wm/lumina-9999
index afd59055c5a1..b99c8d0dc0ee 100644
--- a/metadata/md5-cache/x11-wm/lumina-9999
+++ b/metadata/md5-cache/x11-wm/lumina-9999
@@ -8,4 +8,4 @@ LICENSE=BSD
RDEPEND=dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtsvg:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtgui:5 dev-qt/qtdeclarative:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm sys-fs/inotify-tools x11-misc/numlockx x11-wm/fluxbox || ( x11-apps/xbacklight sys-power/acpilight ) media-sound/alsa-utils sys-power/acpi app-admin/sysstat
SLOT=0
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 cbafa3261c37c7e3af44bb16a34ea390 multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
-_md5_=c3e7393302bc586791ffbdefa826239b
+_md5_=ce3e667faa02cb5eb5901dd9927d5c17
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 530bea5839e0..c744bcb46aaf 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Jul 2017 07:09:15 +0000
+Sat, 29 Jul 2017 20:09:21 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 38af7d6be0d9..329f71ab312d 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -2043,10 +2043,10 @@
-
+
pchrist@gentoo.org
Panagiotis Christopoulos
- Lead (General maintainer)
+ Developer (General maintainer)
@@ -2917,6 +2917,11 @@ developers and volunteer mentors.
Amy Liffey
Member
+
+ asturm@gentoo.org
+ Andreas Sturmlechner
+ Member
+
dlan@gentoo.org
Yixun Lan
@@ -3012,7 +3017,7 @@ developers and volunteer mentors.
pr@gentoo.org
Public Relations
https://wiki.gentoo.org/wiki/Project:Public_Relations
- The Public Relations team improves Gentoo's visibility towards the rest of the world. We maintain presence on various social media sites such as Facebook, Google Plus, and Twitter. Below you will find those responsible on a per-site basis.
+ The Public Relations team improves Gentoo's visibility towards the rest of the world. We maintain presence on various web silos such as Facebook, Google+, and Twitter. Below you will find those responsible on a per-site basis.
@@ -3039,7 +3044,7 @@ developers and volunteer mentors.
k_f@gentoo.org
Kristian Fiskerstrand
-
+
maffblaster@gentoo.org
Matthew Marchese
Facebook (editor), G+, Twitter, Telegram (admin), Slack (admin)
diff --git a/metadata/timestamp b/metadata/timestamp
index e60983a68af0..4904fa0fdb57 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jul 27 07:09:15 UTC 2017
+Sat Jul 29 20:09:21 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 38dbad4f7338..9da0f3c5e073 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Jul 2017 07:30:01 +0000
+Sat, 29 Jul 2017 20:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f5a36ed1b4cf..12b2f9ca74e8 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-e5e61cadb1ede0e58f05ef755ca60a6dcf52983b 1501129001 2017-07-27T04:16:41+00:00
+04fdaf991c63615917d5fe066bae398616bb9189 1501356758 2017-07-29T19:32:38+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 284c7c0ee604..4f1fc87021d0 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1501139101 Thu 27 Jul 2017 07:05:01 AM UTC
+1501358701 Sat 29 Jul 2017 08:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 530bea5839e0..c744bcb46aaf 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Jul 2017 07:09:15 +0000
+Sat, 29 Jul 2017 20:09:21 +0000
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 9d66e0efe5e5..1e0d1554b731 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,2 +1,2 @@
DIST cacti-spine-0.8.8h.tar.gz 804951 SHA256 a693136839bd7d03cae5b3ff4614a4d21a2153ffb14d09fc061b843ab0b2bb30 SHA512 6a7147ab645be44de0d330c7801e569705817da10bf6cedba82c712e1701ada8aa8924a6b3b063ea680e6af24f815d6767e8773ad7b8da212abfa082b4211bd4 WHIRLPOOL 36daed4986ca84883e51ab6b02ebb2ade00205c30705cfc94e73835bc2fc427a60a2dba9c7ca3665d0c0b2fca21afab77d94cde63b740f3734f9279c929cccaf
-DIST cacti-spine-1.1.13.tar.gz 801645 SHA256 900c5dd402b42042d960cc277d4bb5edc55e93b34e37ae79dac8cef2d8685641 SHA512 6ec5e629818ad274ee3864cbd1bfa70e35e6509e1dd0eb231da9889b3844e7e75d269c9d16d57796e75f36dfd204172c9d7e6843e0b06e3ac20bbf4f781b1b8c WHIRLPOOL 4d5875d4dedebcbd72d99ab06499411e398ed33a8ec7cae45b5528a1f234852897c4d761d58b76dbca19969f2aa051618cb07cec93e225620530aa2bf6bfeb19
+DIST cacti-spine-1.1.15.tar.gz 801706 SHA256 91de11faaa882cf8743defd252251b43bf8afad7680bae80e50290573547fd8c SHA512 2ea955748afa78e7e7802960ad5d888720838e3464df937cd1a258c191198a68b16fe58e56e2985855f3157fe4fdd2c1792ccc9d8e970419ec94c453588baf13 WHIRLPOOL 5c3d0fc8959d21482b28ed8c2258240e2cc7724927344900cadf70e701b8a335ab32ddc1d0728d0f20e9b7b83aff03c3d634e7001c21ec428c36144eb494aa4f
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.13.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.15.ebuild
similarity index 100%
rename from net-analyzer/cacti-spine/cacti-spine-1.1.13.ebuild
rename to net-analyzer/cacti-spine/cacti-spine-1.1.15.ebuild
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index b92016955f5d..45ba2c19fcf5 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,2 +1,2 @@
DIST cacti-0.8.8h.tar.gz 2585226 SHA256 0673bd9513dad381c8bbb9133c721a32bc6422dc91c5a81de16e3cd32e4d0600 SHA512 11bb0682a7220af5581f42579cf9c38d94aae202425ce15b824849684b1a6778d6f14e6a62ec94c608b7ba06562a825be7fd6d812d0800daa5eb56e640ac1c5f WHIRLPOOL 250ee38d969c9a7d9a71b15a25e48c2b9b22412c6c2394798d178172d9a1be056b009b328594559524adbd47ad05032992b13cb5a632af1a23f947fb55342402
-DIST cacti-1.1.13.tar.gz 8891748 SHA256 ea935e1e9b89c57ad9e6335acaca3b525611eaff19c17516440df5028b63e387 SHA512 3f18ee1c940392c235e6e4648297e015e3bee2ae028e14348c1679af580d102c1ba8ea0ca08935c9f7608c691329125093fad0af8feb8b7cfbe066b975589a3a WHIRLPOOL 0991ab0abd2bbabf10f23043945edb61ab4ca63966017d110cc0c7337226de4063c56a98d6779a0c6a6a43e426a7ce697eb4051ffc0f7955ef283d918f88eaf7
+DIST cacti-1.1.15.tar.gz 8892187 SHA256 5f0c5a1b7afd0d62fbc4f36f0017d485b8eb71d49b712d01c1ba2999ca7af9ac SHA512 4614d1a517ba55ca33771bfc0b0b60f19e7da27d7720d789c84655f01e6dcf03e44662461c8362265759d5169679f44ee86d89678ebbaf49e7301fdcbf5beb45 WHIRLPOOL 9d1cd7cbf627bf8aad7fd4e98e8f6d578e5a8d33f02becddf457348ff5862c3102f43fd423db5c220e328e179c1e42ee0b8d666791f93c7a0a67f80dd24e10bd
diff --git a/net-analyzer/cacti/cacti-1.1.13.ebuild b/net-analyzer/cacti/cacti-1.1.15.ebuild
similarity index 100%
rename from net-analyzer/cacti/cacti-1.1.13.ebuild
rename to net-analyzer/cacti/cacti-1.1.15.ebuild
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index f65cb39c9ab7..ab97565c5dd6 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,3 +1,3 @@
DIST hydra-8.1.tar.gz 559031 SHA256 e4bc2fd11f97a8d985a38a31785c86d38cc60383e47a8f4a5c436351e5135f19 SHA512 7608dd365865e5976bea446faedaad9f0334e7572fd0ee47a601c471471fc7c8a922c7114f4df08705b34b29144d3a6552e66148adf6b0f92c67301119c94959 WHIRLPOOL b1555fe1a8257c88f8f5c110fce1d06834eb6dadad394b61e2a90c3289b8fdd117944da160871003b1583aefb81a02d5c49a653e8de7d3adcd07917ae760c83c
-DIST hydra-8.4.tar.gz 1205609 SHA256 482846580888f54e000bb125e263a65c32fa28ba86c9d4012371cf55c3bdc140 SHA512 62c53f1725eb5b965d16d293cd90ab5e74779eba8fe2e2ab9094f51851fa24acfd74574f509a7914af8254e43197d803cca6b41eace3557d9599d79d695f6a48 WHIRLPOOL aecc31645e7775662e32b766baa942e92e31143e5b6fbe64620ee85179288dc60f3ada477b4605444769c9e76c17d94835db5f3651af409d5562a2e8971279ef
DIST hydra-8.5.tar.gz 1193694 SHA256 69b69d16ce9499f3a941836b4d8a1c8a3ff9b905c921cc8c588a3af7f65a3b4b SHA512 67fd92bd5983a94314334471c526b71ca77dec6e359e55f4fb2fc78160e2065957b6c9af1ff694bcc5334893a8b5e0fe1b39d984248bde4e55dc2a9f9a8b1271 WHIRLPOOL a71e1cb94986ead4eb114f19738cc1e3ed7288220a79d67ef4e6d93bc5c59910ecee1207fd7a10da9300cba9c3b92d5c6f4cdc3bb1a30bde8db523d7d4cce998
+DIST hydra-8.6.tar.gz 1200238 SHA256 05a87eb018507b24afca970081f067e64441460319fb75ca1e64c4a1f322b80b SHA512 d5d70b5df54fbc556c6db9e9e44b869f29e54aca03dc3cc9e1777d310fcf604b9602ba08250c5bb0d009963dc0ca5c169e61d3f64d7ec2383760fc819d6b6c61 WHIRLPOOL 898f605d556dcb6efe4f4c4b3114c4a2c53dd6baef4956cbf413ef98074ce30b4153f05ff4f69103407fd1a753b2530074293f03d13e83e93c88891821b06ee2
diff --git a/net-analyzer/hydra/hydra-8.4.ebuild b/net-analyzer/hydra/hydra-8.6.ebuild
similarity index 95%
rename from net-analyzer/hydra/hydra-8.4.ebuild
rename to net-analyzer/hydra/hydra-8.6.ebuild
index ce796181b202..bed5fc36e987 100644
--- a/net-analyzer/hydra/hydra-8.4.ebuild
+++ b/net-analyzer/hydra/hydra-8.6.ebuild
@@ -6,7 +6,9 @@ inherit eutils toolchain-funcs
DESCRIPTION="Advanced parallized login hacker"
HOMEPAGE="https://www.thc.org/thc-hydra/"
-SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
+SRC_URI="
+ https://github.com/vanhauser-thc/thc-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
LICENSE="GPL-3"
SLOT="0"
@@ -40,9 +42,11 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-8.4-configure.patch
)
+S=${WORKDIR}/thc-${P}
src_prepare() {
default
+
# None of the settings in Makefile.unix are useful to us
: > Makefile.unix
diff --git a/net-analyzer/munin/munin-2.0.33-r1.ebuild b/net-analyzer/munin/munin-2.0.33-r1.ebuild
index 6ab07a42f8a1..0dcf612bd59b 100644
--- a/net-analyzer/munin/munin-2.0.33-r1.ebuild
+++ b/net-analyzer/munin/munin-2.0.33-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="asterisk irc java memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
# Upstream's listing of required modules is NOT correct!
@@ -57,6 +57,7 @@ DEPEND_COM="
doc? ( dev-python/sphinx )
http? ( dev-perl/libwww-perl )
irc? ( dev-perl/Net-IRC )
+ ldap? ( dev-perl/perl-ldap )
kernel_linux? ( sys-process/procps )
memcached? ( dev-perl/Cache-Memcached )
mysql? (
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 99b9de8af370..42bfcf22ad23 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,6 +1,8 @@
DIST zabbix-2.2.16.tar.gz 15498413 SHA256 3cfcd8c7c11a2e18298e93f33701210b963a7c0e61d8c14fccfd9a8beef08041 SHA512 5d92c17e86608359fff220416d5eed2d4ac10edfe56f4162f4b7660c472cf6f609ba01034d76e5b7164c22d55a1fc5be753f5d0e0ce7ac71d00a6f68dca14afd WHIRLPOOL 2b219d17624ef40a8844193a3d836326160249549775db31c7c68597d17d9fa3d71ddbc9aa30e73c2255606957d0d2f5f562fbf2b0c0654d794c8e61e96e7ead
DIST zabbix-2.2.17.tar.gz 15494053 SHA256 cf42c5db31c27466a9ec33b6bf22289bbc43ee4e5711e6d323d71644b743e535 SHA512 1abd60d05443cdb7b7ecdeca4d0b97414b249fe8be8c3ceaca137722af93e77101151bde59faaac4a3b61b8256bab68b0d1416192d8f72480703575794068a1f WHIRLPOOL 0ab0df7723ac6403fb26d53369fbc1d207b08343bd24f27832b2a2c7a1f043e6fe95ae99d79210f5baa5e5bd9ed9dd89acb74ce66114dfe4702d7913a26a4bb9
DIST zabbix-2.2.18.tar.gz 15495920 SHA256 b87e7dadec65d04711fcd66dba398b213452453c5f0c3fc5490d1ab68a41abde SHA512 3e24827b2739aefa12e3d189b856d836b85a1fa45928343c08620ce1ef16c664a8ad806d051f5cffed10837a326245dd5617034f83cdd00432b81eb05be40491 WHIRLPOOL 7936219b6ea6b0db4251db494731b0cbd40a5b774467314a6011434b2c11111e21998217efb3a6925a7d4067da6fc04a4aea9d271f0568101f1ebe660244e378
+DIST zabbix-2.2.19.tar.gz 15497840 SHA256 311d70a1d0868eeda752b3e9555afbbdf3f37b380e79b0b0ee138e4be488873c SHA512 f9a35093cd63fe433ae67a01d526e65387455cc0c82b33d4015ad428991289f711857e089c169fc46fad51697e3a07a2b310026789099e6f42fa88f2f573c560 WHIRLPOOL b8ed5c92b88c3799cdd37b1e878b5db82e9147e9b603b99655cb4820a38caaeb6280733b3c4c5af57957e2dbf050f31cccad1c494cc4f46c7fcd95f5b1652d50
+DIST zabbix-3.0.10.tar.gz 15573988 SHA256 49ab7a69352fc07c88e08f10e20ef714adde6d08e44df8af81edb82e26c7c772 SHA512 cb5602a6fdb78f4f5e3b6b0193e707497e8c04a7558da8345e2e9130f3058be670a48d501b36bca87d10a1964188ae81eb6cd83a573499086ce1f2152dfa9936 WHIRLPOOL d8da9e2eeaf1a7ded198f25198742a53b97762000b2f84add25fcbc05ff2c5be48193072338e6131e0d905d8429d581802125806512d7705e5f1aa50211fb385
DIST zabbix-3.0.6.tar.gz 15513412 SHA256 4fe972b061cae8cc91bf2870f2caabc967096f31def5a3f53e8789154b05a97b SHA512 ccffc58f3555bea62011bad272e8a3085d1723d8cb200e00a3e657696104c3fd055b8b963a26d9c726ef45a5381c7f9625498e99b756a3dd97b147d8b7884d1f WHIRLPOOL 137eb724b5205e5d38d00f96c62da5f96ef91c57b01280489bafb67c54d10e7c40304b4674fcefedda9381dfe6d2721b81dbcda1822f56f6d538e067c2588fea
DIST zabbix-3.0.8.tar.gz 15514547 SHA256 1df3e106427ed21547b8119049a161092f597d04507f9eb535951a9ee887a476 SHA512 9f5fec7f3888f34ad9659a5d34d5fc089efc86a5fcf78f8cabf6704fbf95fd52a8caaab6f4291cb76d15cc2d69c986c95346fbe4fdfdc407c5506f3b8946aa1a WHIRLPOOL 83a391ee2d60e974fa4e569050b62af69df192d24ad8dd151d39b668a170980f4dc448e3564a823662aecf5a2f03adca9e32c37b4949c95cab71425e786ab0bb
DIST zabbix-3.0.9.tar.gz 15516440 SHA256 4445f26c025009681c29c9b350aa6c4ee7b124ddcaf1609ae36c55997bcb8cf2 SHA512 f34d0fde48e64dfb6bea152ab6c63eb28be66e3647cc781d430b56b13bc91ac9f194ac80d264b2e837f8fceb929e0ebeda0221bf8363eb0a66e53461088a4ef9 WHIRLPOOL dae1417efa8df60633a950473af7cf9b533dc63abfdd95b2f2edb30fc07d074fa8ef626927e578911eead45461cdc4918f92be17c21d494d6f198519c117a74d
@@ -9,3 +11,4 @@ DIST zabbix-3.2.3.tar.gz 15922416 SHA256 e6dba74039d8d6efff86ec3da99909f4daeaeb6
DIST zabbix-3.2.4.tar.gz 15924840 SHA256 22cf19ef5a9478df2281bf518e8be38adc7dbc508bf63111e02388ca7aabeef4 SHA512 62e532bcf6a5ab82b1f943e28d46d1e64782758a405680d2c1a54e9c1092a340a50987045acbbad2b57439e3c2640d8a11fe1a29a234764859befa6a7fd779d1 WHIRLPOOL 8cac552472bb186a1e16bc809d68a7dd7a63eaec7503f204bec58cd03ce9f813247d47e95b6a17baa3765dca9a51835c2dc4d6efbc69bcf03ff64cb976ac716f
DIST zabbix-3.2.5.tar.gz 15931390 SHA256 2f25d4622f85f9faa9626c9d5b3dbd9bf098f494fae007fecd52c8dc5545504e SHA512 313eda7d26d4fe443440ff20f355a51ee0a14d7dbce2aef7ce21f95543588eb69f111dc4b19e17024f82e629bcb8fdf5739dace6f05517aee744f4e68518ea37 WHIRLPOOL 1bdb93ba3f82cda5389e68f8e9468836e2e111133f3ccb983095ab45b866d1cb483cf05522c8bb13524d77ae8f09f753158af73ba73f3f8b6c1b098e28c6bebe
DIST zabbix-3.2.6.tar.gz 16008047 SHA256 98f025b39515b196552b8a23e2fe20a8180b5e99e613ce7378725a46ed8b62d6 SHA512 48e70a7e33ec8c29967f099d27f240b2e8b02554b43a47387d02b5450367efcb0d2f1c60557194f6b1d4a9755d2c9c69a478627e57624521152b1c1ea0264844 WHIRLPOOL 19cccff8e71ea6bf18fc71ccc770ae863ef6ed63f56b068f0b8741d39fc9c0dab3f63129f74c057e5f34f64adcd584b478f5214214ff3d2deaf54e53a2b24574
+DIST zabbix-3.2.7.tar.gz 16016367 SHA256 3ea0c299bd69bc728177128740f0476bc1a2c1de438330df5bbd8f5fc6090712 SHA512 f60c82829c076a7f8b9d2f0c7dc91f7b65594ac4dcfaa08b19a61b730d8d21afc161636f793416613a47220535334fb675bb105738b130677c729fc0e31cd3e3 WHIRLPOOL 5956e6a5116a70f9feb00ffbb7547243f2de6a6c26188008bea31b4fb4d6fa31a099b11f9535f8409f7a66d6ab682837f27497b881b263f253192034250669fb
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index aec9f833cb0c..0a5802a41df4 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -14,7 +14,7 @@ ZABBIX is software for monitoring of your applications, network and servers.
ZABBIX supports both polling and trapping techniques to collect data from
monitored hosts. A flexible notification mechanism allows easy and quickly
configure different types of notifications for pre-defined events.
-
+
diff --git a/net-p2p/retroshare/retroshare-0.5.5c.ebuild b/net-p2p/retroshare/retroshare-0.5.5c.ebuild
deleted file mode 100644
index 3f6da59fe350..000000000000
--- a/net-p2p/retroshare/retroshare-0.5.5c.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib gnome2-utils qmake-utils
-
-MY_PN="RetroShare"
-MY_P="${MY_PN}-v${PV}"
-
-DESCRIPTION="P2P private sharing application"
-HOMEPAGE="http://retroshare.sourceforge.net"
-SRC_URI="mirror://sourceforge/retroshare/retroshare_0.5.5-0.7068.tar.gz"
-
-# pegmarkdown can also be used with MIT
-LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli feedreader links-cloud qt4 voip"
-REQUIRED_USE="|| ( cli qt4 )
- feedreader? ( qt4 )
- links-cloud? ( qt4 )
- voip? ( qt4 )"
-
-RDEPEND="
- app-arch/bzip2
- dev-libs/openssl:0
- gnome-base/libgnome-keyring
- net-libs/libupnp:0
- sys-libs/zlib
- cli? (
- dev-libs/protobuf
- net-libs/libssh[server]
- )
- feedreader? (
- dev-libs/libxml2
- dev-libs/libxslt
- net-misc/curl
- )
- qt4? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- voip? (
- media-libs/speex
- dev-qt/qt-mobility[multimedia]
- dev-qt/qtmultimedia:4
- )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- dev-qt/qtcore:4
- virtual/pkgconfig"
-
-S="${WORKDIR}/retroshare-0.5.5/src"
-
-src_prepare() {
- local dir
-
- sed -i \
- -e "s|/usr/lib/retroshare/extensions/|/usr/$(get_libdir)/${PN}/extensions/|" \
- libretroshare/src/rsserver/rsinit.cc \
- || die "sed failed"
-
- rs_src_dirs="libbitdht/src openpgpsdk/src libretroshare/src supportlibs/pegmarkdown"
- use cli && rs_src_dirs="${rs_src_dirs} retroshare-nogui/src"
- use qt4 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
- use links-cloud && rs_src_dirs="${rs_src_dirs} plugins/LinksCloud"
- use feedreader && rs_src_dirs="${rs_src_dirs} plugins/FeedReader"
-
- if use voip ; then
- rs_src_dirs="${rs_src_dirs} plugins/VOIP"
- echo "QT += multimedia" >> "plugins/VOIP/VOIP.pro" || die
- echo "CONFIG += mobility" >> "plugins/VOIP/VOIP.pro" || die
- fi
-}
-
-src_configure() {
- for dir in ${rs_src_dirs} ; do
- cd "${S}"/${dir} || die
- eqmake4
- done
-}
-
-src_compile() {
- local dir
-
- for dir in ${rs_src_dirs} ; do
- emake -C ${dir}
- done
-
- unset rs_src_dirs
-}
-
-src_install() {
- local i
- local extension_dir="/usr/$(get_libdir)/${PN}/extensions/"
-
- use cli && dobin retroshare-nogui/src/retroshare-nogui
- use qt4 && dobin retroshare-gui/src/RetroShare
-
- exeinto "${extension_dir}"
- use feedreader && doexe plugins/FeedReader/*.so*
- use links-cloud && doexe plugins/LinksCloud/*.so*
- use voip && doexe plugins/VOIP/*.so*
-
- insinto /usr/share/RetroShare
- doins libbitdht/src/bitdht/bdboot.txt
-
- dodoc README.txt
- make_desktop_entry RetroShare
- for i in 24 48 64 ; do
- doicon -s ${i} build_scripts/Ubuntu_src/data/${i}x${i}/${PN}.png
- done
- doicon -s 128 build_scripts/Ubuntu_src/data/${PN}.png
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/net-p2p/retroshare/retroshare-0.6.2.ebuild b/net-p2p/retroshare/retroshare-0.6.2.ebuild
index 0e416e880aae..9bbc687a0fbb 100644
--- a/net-p2p/retroshare/retroshare-0.6.2.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.2.ebuild
@@ -14,11 +14,9 @@ LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="cli feedreader +gui qt4 +qt5 voip"
+IUSE="cli feedreader +gui voip"
REQUIRED_USE="
|| ( cli gui )
- gui? ( ^^ ( qt4 qt5 ) )
- cli? ( ^^ ( qt4 qt5 ) )
feedreader? ( gui )
voip? ( gui )"
@@ -26,6 +24,12 @@ RDEPEND="
app-arch/bzip2
dev-db/sqlcipher
dev-libs/openssl:0
+ dev-qt/qtcore:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtscript:5
+ dev-qt/qtxml:5
gnome-base/libgnome-keyring
net-libs/libmicrohttpd
net-libs/libupnp:0
@@ -35,39 +39,16 @@ RDEPEND="
dev-libs/libxslt
net-misc/curl
)
- qt4? (
- gui? (
- dev-qt/designer:4
- dev-qt/qtgui:4
- x11-libs/libX11
- x11-libs/libXScrnSaver
- )
- dev-qt/qtcore:4
- )
- qt5? (
- gui? (
- dev-qt/designer:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- x11-libs/libX11
- x11-libs/libXScrnSaver
- )
- dev-qt/qtcore:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtxml:5
+ gui? (
+ dev-qt/designer:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
)
voip? (
- qt5? (
- media-libs/opencv[-qt4(-)]
- )
- qt4? (
- media-libs/opencv
- dev-qt/qt-mobility[multimedia]
- )
+ media-libs/opencv[-qt4(-)]
media-libs/speex
virtual/ffmpeg[encode]
)"
@@ -106,8 +87,7 @@ src_prepare() {
src_configure() {
for dir in ${rs_src_dirs} ; do
pushd "${S}/${dir}" >/dev/null || die
- use qt4 && eqmake4
- use qt5 && eqmake5
+ eqmake5
popd >/dev/null || die
done
}
diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest
index 9834de0cb886..6c2ff20adfdd 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,2 +1,3 @@
DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 109548632 SHA256 b28bc2b460aeddcb7800983d2fad8c29ea6efcc95ad767a78fe6c25d0956f242 SHA512 fc35670a07f067b6ccdebf5b96590eafac2ed984faaa8a90ce44dd44396d6de0964f6352cae0fdf8ce1f6127ebf3ea9f6610b56ba7dd9a7f382bd1c6d588a801 WHIRLPOOL 661f8d6863bd1694efcc168615d9a7107e4a7aa09f5934a33b0f201b6d327038320cf87201bf4220ec876e1cca550169c91925d9f58fa3dae8dd4ea99de1ad1e
+DIST linux-UFRII-drv-v340-uken.tar.gz 117746329 SHA256 fb3701f564f987126a9a3d03a163951f3182d6f7d626530a6767cb1f996fa203 SHA512 05f12d2cac5ae9987fe389be1a15b11d280734f6d47b86f04fa2fcb61bf94175b7afdba4cc1cf5ecf2c1ef5a8e2c14eda5d72f7671618d7c94581c620fea4494 WHIRLPOOL d17dacb98b6ea39d62822a4dd379fb6f8abc900243476893869e0d3a3d1ce1504cb5866d16f775bc006e94a3aeb726912a4c58faa50bf9f390e270482f20512e
DIST o1581en_linux_UFRII_v300.zip 94262679 SHA256 1ec1b162411642dc1814608ec71a3b94d6e22ede234f6b750bbdfd3820d5ac46 SHA512 e31415f2e9256c5dc98e27afe3bdc2f75b852d0a99721f8f2ac78225bac497e84c6ce94e8447f3aed6bb6c94975c7625f0dbb2647be44f90c144a46e9af89b81 WHIRLPOOL f419d6130ce9cfd87caebc9678991bbd46e2db5f8bb5a39fb8202a7532de33e969f4f907f2f1404859f987c57f49f562defcec42380ea1b4f284b8d4c6cae3e6
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild
new file mode 100644
index 000000000000..0a35d997b50e
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools versionator
+
+MY_PV="$(delete_all_version_separators)"
+SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
+
+DESCRIPTION="Common files for Canon drivers"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers&language=EN&os=LINUX"
+SRC_URI="http://gdlp01.c-wss.com/gds/8/0100007658/04/${SOURCES_NAME}.tar.gz"
+
+# GPL-2 License inside LICENSE-EN.txt files
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/libxml2
+ gnome-base/libglade
+ net-print/cups
+ x11-libs/gtk+:2
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-3.80}"
+
+pkg_setup() {
+ # Don't raise a fuss over pre-built binaries
+ QA_PREBUILT="
+ /usr/libexec/cups/filter/c3pldrv
+ /usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
+ /usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0
+ /usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
+ /usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
+ /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+ /usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
+ /usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
+ /usr/$(get_libdir)/libcanonc3pl.so.1.0.0
+ "
+ QA_SONAME="
+ /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+ "
+}
+
+src_unpack() {
+ unpack ${A}
+ cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+ unpack ./${P/-lb-${PV}/-3.80}-1.tar.gz
+}
+
+change_dir() {
+ for i in cngplp buftool backend; do
+ cd "${i}" || die
+ "${@}"
+ cd "${S}" || die
+ done
+}
+
+src_prepare() {
+ default
+ sed -i -e \
+ "s:backenddir = \$(libdir)/cups/backend:backenddir = `cups-config --serverbin`/backend:" \
+ backend/Makefile.am || die
+
+ export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+ change_dir eautoreconf
+}
+
+src_configure() {
+ change_dir econf
+}
+
+src_compile() {
+ change_dir emake
+
+ # Cannot be moved to 'change_dir' as it doesn't need eautoreconf
+ ( cd "${S}/c3plmod_ipc" && emake ) || die
+}
+
+src_install() {
+ MAKEOPTS+=" -j1" default
+
+ einstalldocs
+
+ cd "${S}/c3plmod_ipc" || die
+ dolib.so libcanonc3pl.so.1.0.0
+ dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
+ dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
+
+ cd "${S}/data" || die
+ insinto /usr/share/caepcm
+ doins *
+
+ ABI=x86
+ cd "${S}/libs" || die
+ exeinto $(cups-config --serverbin)/filter
+ doexe c3pldrv
+ dolib.so libcaepcm.so.1.0
+ dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so.1"
+ dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so"
+ for lib in *.so.?.?.?; do
+ dolib.so "${lib}"
+ dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
+ dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
+ done
+
+ # c3pldrv dlopens the absolute path /usr/lib/libc3pl.so :(
+ if [[ "$(get_libdir)" != lib ]]; then
+ dosym "../$(get_libdir)/libc3pl.so" /usr/lib/libc3pl.so
+ fi
+}
diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 9834de0cb886..6c2ff20adfdd 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -1,2 +1,3 @@
DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 109548632 SHA256 b28bc2b460aeddcb7800983d2fad8c29ea6efcc95ad767a78fe6c25d0956f242 SHA512 fc35670a07f067b6ccdebf5b96590eafac2ed984faaa8a90ce44dd44396d6de0964f6352cae0fdf8ce1f6127ebf3ea9f6610b56ba7dd9a7f382bd1c6d588a801 WHIRLPOOL 661f8d6863bd1694efcc168615d9a7107e4a7aa09f5934a33b0f201b6d327038320cf87201bf4220ec876e1cca550169c91925d9f58fa3dae8dd4ea99de1ad1e
+DIST linux-UFRII-drv-v340-uken.tar.gz 117746329 SHA256 fb3701f564f987126a9a3d03a163951f3182d6f7d626530a6767cb1f996fa203 SHA512 05f12d2cac5ae9987fe389be1a15b11d280734f6d47b86f04fa2fcb61bf94175b7afdba4cc1cf5ecf2c1ef5a8e2c14eda5d72f7671618d7c94581c620fea4494 WHIRLPOOL d17dacb98b6ea39d62822a4dd379fb6f8abc900243476893869e0d3a3d1ce1504cb5866d16f775bc006e94a3aeb726912a4c58faa50bf9f390e270482f20512e
DIST o1581en_linux_UFRII_v300.zip 94262679 SHA256 1ec1b162411642dc1814608ec71a3b94d6e22ede234f6b750bbdfd3820d5ac46 SHA512 e31415f2e9256c5dc98e27afe3bdc2f75b852d0a99721f8f2ac78225bac497e84c6ce94e8447f3aed6bb6c94975c7625f0dbb2647be44f90c144a46e9af89b81 WHIRLPOOL f419d6130ce9cfd87caebc9678991bbd46e2db5f8bb5a39fb8202a7532de33e969f4f907f2f1404859f987c57f49f562defcec42380ea1b4f284b8d4c6cae3e6
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild
new file mode 100644
index 000000000000..89b9326dd8fe
--- /dev/null
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools ltprune versionator
+
+MY_PV="$(delete_all_version_separators)"
+SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
+
+DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers&language=EN&os=LINUX"
+SRC_URI="http://gdlp01.c-wss.com/gds/8/0100007658/04/${SOURCES_NAME}.tar.gz"
+
+LICENSE="Canon-UFR-II"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ gnome-base/libglade
+ net-print/cups
+ ~net-print/cndrvcups-common-lb-${PV}
+ x11-libs/gtk+:2
+ >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+ virtual/jpeg:62[abi_x86_32(-)]
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+ # Don't raise a fuss over pre-built binaries
+ QA_PREBUILT="
+ /usr/bin/cnpkbidi
+ /usr/bin/cnpkmoduleufr2
+ /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
+ /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
+ /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
+ /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
+ /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
+ /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
+ "
+ QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
+}
+
+src_unpack() {
+ unpack ${A}
+ cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+ unpack ./${P}-1.tar.gz
+}
+
+change_dir() {
+ for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do
+ cd "${i}" || die
+ "${@}"
+ cd "${S}" || die
+ done
+}
+
+src_prepare() {
+ default
+ sed -i -e \
+ "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config --serverbin`/filter:" \
+ pstoufr2cpca/filter/Makefile.am || die
+
+ export "LIBS=-lgmodule-2.0"
+ change_dir eautoreconf
+}
+
+src_configure() {
+ change_dir econf
+}
+
+src_install() {
+ default
+
+ einstalldocs
+
+ prune_libtool_files
+
+ cd "${S}/data" || die
+ insinto /usr/share/caepcm
+ doins *
+
+ cd "${S}/libs" || die
+ insinto /usr/share/cnpkbidi
+ doins cnpkbidi_info*
+
+ insinto /usr/share/ufr2filter
+ doins ThLB*
+
+ ABI=x86
+ dobin cnpkbidi cnpkmoduleufr2
+ dolib.so libcnlbcm.so.1.0
+ dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
+ dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so"
+ for lib in *.so.?.?.?; do
+ dolib.so "${lib}"
+ dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
+ dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
+ done
+
+ # c3pldrv dlopens the absolute path /usr/lib/libcnlbcm.so :(
+ if [[ "$(get_libdir)" != lib ]]; then
+ dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so
+ fi
+}
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 0250a8618523..998265ed2f83 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,4 +1,5 @@
DIST cups-filters-1.13.5.tar.xz 1424764 SHA256 35db1c5821c9ff0e0fedcf87b3ae68a424ad951bd8af421a2a1aac5613e17b8d SHA512 1870b16ad64bc46068c8a74be7a112790a6ffc0be0e14cd858d83013b12e1c51efd905fbc4e189a42558814694348a9ef533b6fe504ef7bce3b4da149e0b3ea6 WHIRLPOOL bcf3cf952d531bce5d7092a74dd9db819a13374155bc306eb88fdc2a22e78fa4918c70159f447f8b2b48eda6da713ab85936474fca63f8eb7c2e4318bb2a5386
DIST cups-filters-1.14.1.tar.xz 1426140 SHA256 f1393731df54ffdd947621c302a66afa17cd3d6c7e107ee05cc77a7d3194e504 SHA512 fcc5ad217fe4c0d2f9377b065fe007589d605f9358ad274881df25176cc9548aa233ee6b6efad544f2b0ea4687b09c4270c5c9ac5014c5bcacc4bd9807b6be4e WHIRLPOOL 1dc45519d22248f5f4710e3692f84168c37cf33aa69d3ab23db8ea6939ffeeade5d0bd6e28674ad7b02017f761b6a691ac1f4515bda829acbbaae0dbfbb5d70d
DIST cups-filters-1.15.0.tar.xz 1433652 SHA256 a3bd793c55636904f8c3756f8fb64866ec4bb533f933250d6e04ebfdfeaad23c SHA512 4a26e8757949ccf71a0be9223a1e6eb4084142efb84bddccc9fb60ce0fbbfb209638338ad7ac0868d937df612828ecc856ecfa1aeb0c8ce8f1ad582d472e6eef WHIRLPOOL 0aac733eac086b3bdf2a306df06de75ddd8cff24fbc9801d50f30137cd0fe95f07b217e70d4a784b0499e8077576ed226e673ccfcbfd33d91f528d2f5c9f9737
+DIST cups-filters-1.16.0.tar.xz 1433588 SHA256 b37c6a4e8806035ce229c055ec66a4258f3b3c5346f1f0ad535db1b5ee6f96cd SHA512 f62f8c42f130f715df4a1f98a4366781791a88096213f5f54d34d7142ffc07d046b4b16b5f579b9f6ac96880b2cce24531aed3e3a47372747353da980e9f21ea WHIRLPOOL 38355450dfdd6a54cbe229a9859a40ad28473fc618be156f5a429aa17805e0978de8ddb41be88d0b6d0303eefe0058e6f6952c43a997c83f27cfdad77b1308fe
DIST cups-filters-1.5.0.tar.xz 1375588 SHA256 f22a8864e8d5b693795605a31345c08cc68f85120ebde9a0aa7bc27639815932 SHA512 81574f8368aaef61aeee4369caa394f2c8cdc717b03687d8a17c7927892f07cff68f1efb8d674757cb97001b55fd58fa5c14784a510ce9d31e385b1a73cd18c7 WHIRLPOOL 4201d08a2bb76d349a6b9f7220eb48dea86bb81c0cedbe8dcb8796c49ce26f67f6a7c49677b4fc7b6f865eb20e3c806746f565668e9f9e1e3935630621d032cd
diff --git a/net-print/cups-filters/cups-filters-1.16.0.ebuild b/net-print/cups-filters/cups-filters-1.16.0.ebuild
new file mode 100644
index 000000000000..99e00cdae7d8
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.16.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit perl-module systemd
+
+if [[ "${PV}" == "9999" ]] ; then
+ inherit bzr autotools
+ EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+else
+ SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+fi
+DESCRIPTION="Cups PDF filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_job_format"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic ipp_autosetup jpeg ldap pdf perl png +postscript static-libs tiff zeroconf"
+
+RDEPEND="
+ >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+ >=app-text/qpdf-3.0.2:=
+ dev-libs/glib:2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/lcms:2
+ >=net-print/cups-1.7.3
+ !<=net-print/cups-1.5.9999
+ sys-devel/bc
+ sys-libs/zlib
+ dbus? ( sys-apps/dbus )
+ foomatic? ( !net-print/foomatic-filters )
+ jpeg? ( virtual/jpeg:0 )
+ ldap? ( net-nds/openldap )
+ pdf? ( app-text/mupdf )
+ perl? ( dev-lang/perl:= )
+ png? ( media-libs/libpng:0= )
+ postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+ tiff? ( media-libs/tiff:0 )
+ zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
+ dev-util/gdbus-codegen
+"
+
+src_prepare() {
+ default
+ [[ "${PV}" == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --docdir="${EPREFIX}/usr/share/doc/${PF}"
+ --enable-imagefilters
+ --localstatedir="${EPREFIX}"/var
+ --with-browseremoteprotocols=DNSSD,CUPS
+ --with-cups-rundir="${EPREFIX}"/run/cups
+ --with-fontdir="fonts/conf.avail"
+ --with-pdftops=pdftops
+ --with-rcdir=no
+ --without-php
+ $(use_enable dbus)
+ $(use_enable foomatic)
+ $(use_enable ipp_autosetup auto-setup-driverless)
+ $(use_enable ldap)
+ $(use_enable pdf mutool)
+ $(use_enable postscript ghostscript)
+ $(use_enable postscript ijs)
+ $(use_enable static-libs static)
+ $(use_enable zeroconf avahi)
+ $(use_with jpeg)
+ $(use_with png)
+ $(use_with tiff)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use perl; then
+ pushd "${S}/scripting/perl" > /dev/null
+ perl-module_src_configure
+ perl-module_src_compile
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+ default
+
+ if use perl; then
+ pushd "${S}/scripting/perl" > /dev/null
+ perl-module_src_install
+ perl_delete_localpod
+ popd > /dev/null
+ fi
+
+ if use postscript; then
+ # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+ dosym gstoraster /usr/libexec/cups/filter/pstoraster
+ dosym gstopxl /usr/libexec/cups/filter/pstopxl
+ fi
+
+ find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+ cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+
+ if ! use zeroconf ; then
+ sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+ sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+ fi
+
+ doinitd "${T}"/cups-browsed
+ systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+src_test() {
+ emake check
+}
+
+pkg_postinst() {
+ if ! use foomatic ; then
+ ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+ ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+ fi
+}
diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index d8cd79c2f66e..37a630dd96f8 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -1 +1,2 @@
DIST sshuttle-0.78.1.tar.gz 67173 SHA256 03a71648ce476de06a075bd9a972492d494b414ae51304bf535b80ff22be2d3c SHA512 506b01f20d152e97a41c93299f47d6bba4d7f9fda11e066aca3d79426be68790ff30a3a081ea05ca538aba921ed69e711b672fcfd9084aba6bdae6498beb7e8d WHIRLPOOL d356bf17ba5f6f01351dc316745af3fd07237160340f675e1ecef52d73cb15caf4c5eee65d1ed56ea4008081623362688957f268da30d487d5aa6be02632ddda
+DIST sshuttle-0.78.3.tar.gz 69460 SHA256 8aa31a645e6532d381d0298071960845fbdfa5c7683649a765a7ac7360c1be8b SHA512 581955d9868bdd369a37386b273d53448944b1fb5458a25d5930b348630521cadcaea8cf45371942f96c789889d2a405e8bbe824af3d0c6def73f017f1149a1e WHIRLPOOL 33e1f57ecefcce46240569554e623ae0865cc034232735b4361baf6e43f027b2b2be6ef54120944d3eb7281baecc376cd2a4cbede3b51d2bb8340eeb5e40a89c
diff --git a/net-proxy/sshuttle/sshuttle-0.78.3.ebuild b/net-proxy/sshuttle/sshuttle-0.78.3.ebuild
new file mode 100644
index 000000000000..7afb04c1fa06
--- /dev/null
+++ b/net-proxy/sshuttle/sshuttle-0.78.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit linux-info distutils-r1
+
+DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh"
+HOMEPAGE="https://github.com/sshuttle/sshuttle https://pypi.python.org/pypi/sshuttle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ net-firewall/iptables
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~IP_NF_MATCH_TTL ~NF_NAT"
+
+python_prepare_all() {
+ # don't run tests via setup.py pytest
+ sed -i "/setup_requires=/s/'pytest-runner'//" setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ py.test || die "Tests fail under ${EPYTHON}"
+}
diff --git a/net-vpn/openvpn/metadata.xml b/net-vpn/openvpn/metadata.xml
index 7638a471b111..ca1e9a1139e7 100644
--- a/net-vpn/openvpn/metadata.xml
+++ b/net-vpn/openvpn/metadata.xml
@@ -9,6 +9,10 @@
chutzpah@gentoo.org
Patrick McLean
+
+ williamh@gentoo.org
+ William Hubbs
+
OpenVPN is an easy-to-use, robust and highly
configurable VPN daemon which can be used to securely link two or more
networks using an encrypted tunnel.
diff --git a/profiles/base/package.use b/profiles/base/package.use
index b21593100fb3..9590bcc54846 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -1,6 +1,11 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# Ilya Tumaykin (22 Jul 2017)
+# Override default +gdbm setting, which enables minor server-only
+# feature, but enforces server USE to all users via REQUIRED_USE.
+net-firewall/fwknop -gdbm
+
# David Seifert (17 Apr 2017)
# Only python 3.5 supported
kde-apps/kajongg:5 python_single_target_python3_5 python_targets_python3_5
diff --git a/profiles/hardened/linux/package.use b/profiles/hardened/linux/package.use
new file mode 100644
index 000000000000..edd0e13e5410
--- /dev/null
+++ b/profiles/hardened/linux/package.use
@@ -0,0 +1,7 @@
+# Copyright 2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Ilya Tumaykin (22 Jul 2017)
+# Override default +gdbm setting, which enables minor server-only
+# feature, but enforces server USE to all users via REQUIRED_USE.
+net-firewall/fwknop -gdbm
diff --git a/profiles/package.mask b/profiles/package.mask
index 5f9e9b5affa2..be5bc8802220 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -177,7 +177,8 @@ app-mobilephone/esms
sci-chemistry/icm
# Pacho Ramos (14 Jul 2017)
-# Doesn't work with >=openvpn-2.3, removal in a month (#470696).
+# Doesn't work with >=openvpn-2.3, bug 470696
+# Fix is work in progress, see above bug. dilfridge@g.o
net-vpn/kvpnc
# Pacho Ramos (14 Jul 2017)
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0b017cb325ce..a2f164a8c444 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6666,7 +6666,6 @@ net-p2p/qbittorrent:webui - Enable the Web UI
net-p2p/retroshare:cli - Enables the CLI version of RetroShare
net-p2p/retroshare:feedreader - Enables the Feedreader plugin
net-p2p/retroshare:gui - Enables the GUI version of RetroShare
-net-p2p/retroshare:links-cloud - Enables LinkClouds plugin
net-p2p/retroshare:voip - Enables VOIP plugin
net-p2p/rtorrent:daemon - Uses app-misc/screen to daemonize this application
net-p2p/syncthing:tools - Install stdiscosrv, strelaysrv and other tools to /usr/libexec/syncthing/.
@@ -7113,6 +7112,9 @@ sci-libs/coinor-clp:sparse - Enable support for sparse matrix with sci-libs/chol
sci-libs/coinor-osi:glpk - Enable GNU Linear Programming Kit sci-mathematics/glpk support
sci-libs/coinor-symphony:glpk - Enable GNU Linear Programming Kit sci-mathematics/glpk support
sci-libs/coinor-utils:glpk - Enable GNU Linear Programming Kit sci-mathematics/glpk support
+sci-libs/dlib:cblas - Build with CBLAS virtual/cblas
+sci-libs/dlib:cuda - Enable support for CUDA for Deep Neural Networks (cuDNN) on GPU (experimental)
+sci-libs/dlib:mkl - Enable support for Intel FFT sci-libs/mkl
sci-libs/dmlc-core:s3 - Support for the Amazon Simple Storage Service
sci-libs/fftw:float - Link default library to single precision instead of double (symlinks only and fftw-2.1)
sci-libs/fftw:quad - Build quadruple precision lib
diff --git a/sci-libs/ccfits/Manifest b/sci-libs/ccfits/Manifest
index 13e11de12311..f218546a2560 100644
--- a/sci-libs/ccfits/Manifest
+++ b/sci-libs/ccfits/Manifest
@@ -1 +1,2 @@
DIST CCfits-2.4.tar.gz 1792643 SHA256 ba6c5012b260adf7633f92581279ea582e331343d8c973981aa7de07242bd7f8 SHA512 b12d455bb6dd631056e02a12e996d3bf0b6169f8922011e4b64f979b08d2ab8f405e14947c6f5d26ad18bf2f5764854a84987ae105944515f533fe6b0b4ef7be WHIRLPOOL 7f0ca6f0e684f7d66d7272a89dbeb8fa95e3907f358ec624f5f817311288fdfb6467ec915d0ab9f2eee753fcaee3f4b68f497c2dffcf7a38bdce9a7f97681e2a
+DIST CCfits-2.5.tar.gz 1416358 SHA256 938ecd25239e65f519b8d2b50702416edc723de5f0a5387cceea8c4004a44740 SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5 WHIRLPOOL 2bd2834d9c113b0dd3cceba381ad186bd13ccfa7184a8b4a314f4b5a8034121481e8ed68fe50dd25484ddce0f0391f884cde6783db72bf9cc61044e540c9d4be
diff --git a/sci-libs/ccfits/ccfits-2.5.ebuild b/sci-libs/ccfits/ccfits-2.5.ebuild
new file mode 100644
index 000000000000..9530618f2c8c
--- /dev/null
+++ b/sci-libs/ccfits/ccfits-2.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+MYPN=CCfits
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="C++ interface for cfitsio"
+HOMEPAGE="http://heasarc.gsfc.nasa.gov/fitsio/CCfits/"
+SRC_URI="${HOMEPAGE}/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+RDEPEND=">=sci-libs/cfitsio-3.080"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MYPN}"
+
+DOCS=( CHANGES README.INSTALL )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2-makefile.patch # avoid building cookbook by default and no rpath
+)
+
+src_prepare() {
+ default
+ mv configure.{in,ac} || die
+ AT_M4DIR=config/m4 eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install () {
+ if use doc; then
+ DOCS+=( *.pdf )
+ HTML_DOCS=( html/. )
+ fi
+ default
+ use static-libs || prune_libtool_files --all
+}
diff --git a/sci-libs/ccfits/metadata.xml b/sci-libs/ccfits/metadata.xml
index a328d442c418..e4f684da7916 100644
--- a/sci-libs/ccfits/metadata.xml
+++ b/sci-libs/ccfits/metadata.xml
@@ -1,15 +1,15 @@
-
- sci@gentoo.org
- Gentoo Science Project
-
-
- CCfits is an object oriented interface to the cfitsio library. It is
- designed to make the capabilities of cfitsio available to
- programmers working in C++. It is written in ANSI C++ and
- implemented using the C++ Standard Library with namespaces,
- exception handling, and member template functions.
-
+
+ sci-astronomy@gentoo.org
+ Gentoo Astronomy Project
+
+
+ CCfits is an object oriented interface to the cfitsio library. It is
+ designed to make the capabilities of cfitsio available to
+ programmers working in C++. It is written in ANSI C++ and
+ implemented using the C++ Standard Library with namespaces,
+ exception handling, and member template functions.
+
diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index a3a80ea6ce46..3754a6afb311 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,2 +1 @@
-DIST dlib-18.15.tar.bz2 7088379 SHA256 e2b790222d625c863d43b3b7dec86a826b504fc10b4b69b242f59a82e9dda16c SHA512 16f42fcdc63214b72328204fca2f7e3d36e18a67fd0f4b97acd9fa5046d7bf41f56ab4209a7a92c54896746b72f6f925ae07ca57ea89982c7e26c0a4ee4b693c WHIRLPOOL a15e181de3e43b800932ce338312ed875788c561bb7ed0ad689882b892f72da891b2a8547763472101e835b652322ab6ab301c6cbf117e2442156320f8603716
-DIST dlib-18.7.tar.bz2 5676950 SHA256 e3d801905288683eee245ff205081343eb79d31d5bb50e42f0293fe5b4a3697e SHA512 20f746a430bd3327f6329d9b198da67d66880f63185b5cd000bcd61a203fad6d775b77c923c92186c122ecd4d4e84f5463e4f81da86b4158d9cc24697cb54365 WHIRLPOOL f7c11fd295f791ce9e2b40c5121a20b3d14ced4d574dc1401a3eb4b2e646fae0f5b01b5a4b4ed6532dea9bcf1c0657147ae32f1e4e9c367fe357ec28287cbec3
+DIST dlib-19.4.tar.gz 7226923 SHA256 2bed9669f1a5c436579498d0806b27a9b60c42a975a9b6e67b594b40f58b1a88 SHA512 23bf80353f9b6ce07b6a3a7df05016705645c18bcf2b3ead567935008ea12c9f6dc0722d9bbacc009bd26f78eb43c1cbecf776bfed5a3445c1f2e8e208f201e2 WHIRLPOOL 300670d12b306e224fce6d7f22d79690f543876f78d30064ab2f9782a3a79a031a6b048863a5a2b21f27eb2538b9ab42f9d00dc88f144129fa591b4b1387c367
diff --git a/sci-libs/dlib/dlib-18.15.ebuild b/sci-libs/dlib/dlib-18.15.ebuild
deleted file mode 100644
index 23ef281fa00c..000000000000
--- a/sci-libs/dlib/dlib-18.15.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Numerical and networking C++ library"
-HOMEPAGE="http://dlib.net/"
-SRC_URI="mirror://sourceforge/dclib/${P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="blas doc examples jpeg lapack png test X"
-
-RDEPEND="
- blas? ( virtual/blas )
- jpeg? ( virtual/jpeg:0= )
- lapack? ( virtual/lapack )
- png? ( media-libs/libpng:0= )
- X? ( x11-libs/libX11 )"
-DEPEND="test? ( ${RDEPEND} )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-17.48-makefile-test.patch
-}
-
-src_test() {
- cd dlib/test || die
- emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}"
- ./dtest --runall || die
-}
-
-src_install() {
- dodoc dlib/README.txt
- rm -r dlib/{README,LICENSE}.txt dlib/test || die
- doheader -r dlib
- use doc && dohtml -r docs/*
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/sci-libs/dlib/dlib-18.7.ebuild b/sci-libs/dlib/dlib-18.7.ebuild
deleted file mode 100644
index 2e1697899c57..000000000000
--- a/sci-libs/dlib/dlib-18.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Numerical and networking C++ library"
-HOMEPAGE="http://dlib.net/"
-SRC_URI="mirror://sourceforge/dclib/${P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="blas doc examples jpeg lapack png test X"
-
-RDEPEND="
- blas? ( virtual/blas )
- jpeg? ( virtual/jpeg:0= )
- lapack? ( virtual/lapack )
- png? ( media-libs/libpng:0= )
- X? ( x11-libs/libX11 )"
-DEPEND="test? ( ${RDEPEND} )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-17.48-makefile-test.patch
-}
-
-src_test() {
- cd dlib/test || die
- emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}"
- ./test --runall || die
-}
-
-src_install() {
- dodoc dlib/README.txt
- rm -r dlib/{README,LICENSE}.txt dlib/test || die
- doheader -r dlib
- use doc && dohtml -r docs/*
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/sci-libs/dlib/dlib-19.4.ebuild b/sci-libs/dlib/dlib-19.4.ebuild
new file mode 100644
index 000000000000..c6116343a93b
--- /dev/null
+++ b/sci-libs/dlib/dlib-19.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils cuda
+
+DESCRIPTION="Numerical and networking C++ library"
+HOMEPAGE="http://dlib.net/"
+SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cblas debug cuda examples gif jpeg lapack mkl png
+ sqlite static-libs test X"
+
+# doc needs a bunch of deps not in portage
+
+RDEPEND="
+ cblas? ( virtual/cblas:= )
+ cuda? ( dev-libs/cudnn:= )
+ jpeg? ( virtual/jpeg:0= )
+ lapack? ( virtual/lapack:= )
+ mkl? ( sci-libs/mkl:= )
+ png? ( media-libs/libpng:0= )
+ sqlite? ( dev-db/sqlite:3= )
+ X? ( x11-libs/libX11:= )
+"
+DEPEND="test? ( ${RDEPEND} )"
+
+src_prepare() {
+ use cuda && cuda_src_prepare
+ cmake-utils_src_prepare
+ sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ -DDLIB_ENABLE_ASSERTS="$(usex debug)"
+ -DDLIB_ENABLE_STACK_TRACE="$(usex debug)"
+ -DDLIB_GIF_SUPPORT="$(usex gif)"
+ -DDLIB_JPEG_SUPPORT="$(usex jpeg)"
+ -DDLIB_PNG_SUPPORT="$(usex png)"
+ -DDLIB_LINK_WITH_SQLITE3="$(usex sqlite)"
+ -DDLIB_NO_GUI_SUPPORT="$(usex X OFF ON)"
+ -DDLIB_USE_BLAS="$(usex cblas)"
+ -DDLIB_USE_CUDA="$(usex cuda)"
+ -DDLIB_USE_LAPACK="$(usex lapack)"
+ )
+ cmake-utils_src_configure
+}
+
+src_test() {
+ mkdir "${BUILD_DIR}"/dlib/test || die
+ pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
+ cmake "${S}"/dlib/test && emake
+ ./dtest --runall || die
+ popd > /dev/null || die
+}
+
+src_install() {
+ cmake-utils_src_install
+ dodoc docs/README.txt
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}
+ fi
+}
diff --git a/sci-libs/dlib/files/dlib-17.48-makefile-test.patch b/sci-libs/dlib/files/dlib-17.48-makefile-test.patch
deleted file mode 100644
index 81aed4431954..000000000000
--- a/sci-libs/dlib/files/dlib-17.48-makefile-test.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- dlib/test/makefile.orig 2012-12-10 23:56:00.000000000 +0000
-+++ dlib/test/makefile 2012-12-10 23:59:07.000000000 +0000
-@@ -5,14 +5,15 @@
- TARGET = test
-
- # these are the compile time flags passed to gcc
--CFLAGS = -ggdb -DDEBUG -DDLIB_NO_GUI_SUPPORT -I ../.. -Wall
-+CPPFLAGS := -DDEBUG -DDLIB_NO_GUI_SUPPORT -I../..
-+CXXFLAGS := -ggdb -Wall
-
- # These are the link time flags passed to gcc
- LFLAGS = -lpthread -lnsl
-
- # The name of the compiler. If you only have one version of
- # gcc installed then you probably want to change this to just g++
--CC = nice g++
-+CXX := nice g++
-
- ####################################################
- ####################################################
-@@ -146,13 +147,9 @@
-
- $(TARGET): $(OBJ)
- @echo Linking $@
-- @$(CC) $(OBJ) $(LFLAGS) -o $@
-+ @$(CXX) $(LDFLAGS) $(OBJ) $(LFLAGS) -o $@
- @echo Build Complete
-
--.cpp.o: $<
-- @echo Compiling $<
-- @$(CC) -c $(CFLAGS) $< -o $@
--
- clean:
- @rm -f $(OBJ) $(TARGET)
- @echo All object files and binaries removed
diff --git a/sci-libs/dlib/metadata.xml b/sci-libs/dlib/metadata.xml
index 0ac2080f0f17..422f29c52e5a 100644
--- a/sci-libs/dlib/metadata.xml
+++ b/sci-libs/dlib/metadata.xml
@@ -10,8 +10,13 @@
networking, threads, graphical interfaces, data structures, linear
algebra, machine learning, XML and text parsing, numerical
optimization, Bayesian nets, and numerous other tasks.
-
+
+
- dclib
+ davisking/dlib
diff --git a/sci-libs/htslib/Manifest b/sci-libs/htslib/Manifest
index 79fe19162ed5..728098018cc5 100644
--- a/sci-libs/htslib/Manifest
+++ b/sci-libs/htslib/Manifest
@@ -3,3 +3,4 @@ DIST htslib-1.1.tar.bz2 844870 SHA256 204e894074d9a864d27b607fda19f6240c5da351bb
DIST htslib-1.2.1.tar.bz2 911326 SHA256 bddb1372b9215b32e0f21d8394bab859c57cb00324a8dc06775cdac5b4d662b0 SHA512 23db1861cd08b503223f14dcbbdf9c6ae24dec648c987816abc47cc85fa7287c2405be72193cf492fff4f5991ff7b1f55dc386004588971a0e43a2f1c7355199 WHIRLPOOL d81f1cc74bb7e70d538f3e616f290a50017c56c517d9986f84c897b75524848135dd1788f92ff983c701ab7d5e84163123c570a200b83bea6a7922f4c1293107
DIST htslib-1.3.1.tar.bz2 983165 SHA256 49d53a2395b8cef7d1d11270a09de888df8ba06f70fe68282e8235ee04124ae6 SHA512 cdc34166d36a3bf4479d020a2352fe6e8fb7ad92c3205b3fbde3e83b0916cffcfdcf2f28a68a4937e58b903ea8913558ae3a90c2445212da1f25a3b30c43d786 WHIRLPOOL 474de4015cf4f8c2b469f45693ba3e677be246b946a8ba70205219dd25f16ce85def7c062c4073326aa0a795a732e84664ab7df2c002cca6e47abce7777b145c
DIST htslib-1.3.tar.bz2 952864 SHA256 f203af750ccc80fd421c70a04d90a03097d2ef2abe0e6d8f0ae6435d6c11aeab SHA512 1a96fd22632b4a593596645b3a40aa59aaaaa9f342f97ec8c1807fe4058576420ba2c6279594d00bfc67db93aa858bd63bf3e2cf1a63e79605791c6f8aef097c WHIRLPOOL 49140830c525cea21533cc9924a5f0a5e6aecef24cf7ac58ddc959faac205b1bcc2d6f423daab6d6ff8cb5c9ad5b750cfef9e7181a68485ab35e10b7932ab4a6
+DIST htslib-1.5.tar.bz2 1051132 SHA256 a02b515ea51d86352b089c63d778fb5e8b9d784937cf157e587189cb97ad922d SHA512 fd58552ddbd178f9797123fdaf47914ccd0e2aefd055fc6557ac8f479c600775616107cfa871c3acd93079f45974a19f443941a79f2acfd2a8c2983ef35b8917 WHIRLPOOL fb7026c26816db6746006d1b5ade235ce10181a633c9bab8ed3d9f72aaa152d0b68fd69d8988d69fef2bd2d57f9676de0761b2577ef0dd1d334da5d028cb64ee
diff --git a/sci-libs/htslib/htslib-1.5.ebuild b/sci-libs/htslib/htslib-1.5.ebuild
new file mode 100644
index 000000000000..d9957ce3a171
--- /dev/null
+++ b/sci-libs/htslib/htslib-1.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="C library for high-throughput sequencing data formats"
+HOMEPAGE="http://www.htslib.org/"
+SRC_URI="mirror://sourceforge/samtools/${PV}/${P}.tar.bz2"
+
+SLOT="0/2"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+bzip2 curl +lzma static-libs"
+
+RDEPEND="
+ bzip2? ( app-arch/bzip2 )
+ curl? ( net-misc/curl )
+ lzma? ( app-arch/xz-utils )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ econf \
+ --disable-gcs \
+ --disable-plugins \
+ --disable-s3 \
+ $(use_enable bzip2 bz2) \
+ $(use_enable curl libcurl) \
+ $(use_enable lzma)
+}
+
+src_install() {
+ default
+
+ if ! use static-libs; then
+ find "${D}" -name '*.a' -delete || die
+ fi
+}
diff --git a/sci-libs/silo/files/silo-4.10.2-mpiposix.patch b/sci-libs/silo/files/silo-4.10.2-mpiposix.patch
new file mode 100644
index 000000000000..30a3f910b196
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.10.2-mpiposix.patch
@@ -0,0 +1,53 @@
+--- src/hdf5_drv/silo_hdf5.c.orig 2017-07-28 08:52:09.026638768 +0200
++++ src/hdf5_drv/silo_hdf5.c 2017-07-28 09:00:12.306635882 +0200
+@@ -4752,18 +4752,19 @@
+ }
+
+ /* default HDF5 mpi drivers */
+- case DB_FILE_OPTS_H5_DEFAULT_MPIP:
+- {
+-#ifdef H5_HAVE_PARALLEL
+- h5status |= H5Pset_fapl_mpiposix(retval, MPI_COMM_SELF, TRUE);
+-#else
+- H5Pclose(retval);
+- return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);
+-#endif
+- break;
+- }
++// case DB_FILE_OPTS_H5_DEFAULT_MPIP:
++// {
++//#ifdef H5_HAVE_PARALLEL
++// h5status |= H5Pset_fapl_mpiposix(retval, MPI_COMM_SELF, TRUE);
++//#else
++// H5Pclose(retval);
++// return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);
++//#endif
++// break;
++// }
+
+ case DB_FILE_OPTS_H5_DEFAULT_MPIO:
++ case DB_FILE_OPTS_H5_DEFAULT_MPIP:
+ {
+ #ifdef H5_HAVE_PARALLEL
+ MPI_Info info;
+@@ -5069,15 +5070,15 @@
+ if ((p = DBGetOption(opts, DBOPT_H5_MPIP_NO_GPFS_HINTS)))
+ use_gpfs_hints = FALSE;
+
+- if (vfd == DB_H5VFD_MPIO)
++// if (vfd == DB_H5VFD_MPIO)
+ {
+ h5status |= H5Pset_fapl_mpio(retval, mpi_comm, mpi_info);
+ if (created_info) MPI_Info_free(&mpi_info);
+ }
+- else
+- {
+- h5status |= H5Pset_fapl_mpiposix(retval, mpi_comm, use_gpfs_hints);
+- }
++// else
++// {
++// h5status |= H5Pset_fapl_mpiposix(retval, mpi_comm, use_gpfs_hints);
++// }
+ #else
+ H5Pclose(retval);
+ return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);
diff --git a/sci-libs/silo/silo-4.10.2.ebuild b/sci-libs/silo/silo-4.10.2.ebuild
index e222f939d516..0c77dba873a7 100644
--- a/sci-libs/silo/silo-4.10.2.ebuild
+++ b/sci-libs/silo/silo-4.10.2.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
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}"
src_prepare() {
epatch "${FILESDIR}/${P}-qtlibs.patch"
epatch "${FILESDIR}/${P}-tests.patch"
+ epatch "${FILESDIR}/${P}-mpiposix.patch"
}
src_configure() {
diff --git a/sci-mathematics/arb/arb-2.11.1.ebuild b/sci-mathematics/arb/arb-2.11.1-r1.ebuild
similarity index 92%
rename from sci-mathematics/arb/arb-2.11.1.ebuild
rename to sci-mathematics/arb/arb-2.11.1-r1.ebuild
index bea3d8d89ece..88e262a3d9fd 100644
--- a/sci-mathematics/arb/arb-2.11.1.ebuild
+++ b/sci-mathematics/arb/arb-2.11.1-r1.ebuild
@@ -21,6 +21,8 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-pie-ftbs.patch )
+
src_configure() {
# Not an autoconf configure script.
# Note that it appears to have been cloned from the flint configure script
@@ -31,7 +33,8 @@ src_configure() {
--with-flint="${EPREFIX}/usr" \
--with-gmp="${EPREFIX}/usr" \
--with-mpfr="${EPREFIX}/usr" \
- $(use_enable static-libs static) || die
+ $(use_enable static-libs static) \
+ CFLAGS="${CPPFLAGS} ${CFLAGS}" || die
}
src_compile() {
diff --git a/sci-mathematics/arb/files/arb-2.11.1-pie-ftbs.patch b/sci-mathematics/arb/files/arb-2.11.1-pie-ftbs.patch
new file mode 100644
index 000000000000..b2db6b2a294c
--- /dev/null
+++ b/sci-mathematics/arb/files/arb-2.11.1-pie-ftbs.patch
@@ -0,0 +1,17 @@
+Description: Use -r instead of -Wl,-r to fix FTBFS with PIE enabled
+Author: Logan Rosen
+Forwarded: yes
+
+diff --git a/Makefile.subdirs b/Makefile.subdirs
+index 3dc757d..f0ec923 100644
+--- a/Makefile.subdirs
++++ b/Makefile.subdirs
+@@ -52,7 +52,7 @@ $(BUILD_DIR)/$(MOD_DIR)_%.o: %.c
+ $(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@"
+
+ $(MOD_LOBJ): $(LOBJS)
+- $(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
++ $(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
+
+ -include $(LOBJS:.lo=.d)
+
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 4cd6181920ba..871b1b8e1ea6 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -5,3 +5,4 @@ DIST glpk-4.55.tar.gz 3424345 SHA256 37090d7f16796ec1034496e182a39d5cc8bb7c9fb5d
DIST glpk-4.57.tar.gz 3782998 SHA256 7323b2a7cc1f13e45fc845f0fdca74f4daea2af716f5ad2d4d55b41e8394275c SHA512 1979e59b96ce359168a81b720207045916f66c5755023b02c2e197e5a713d456165d94f1e40830547dc072de865f94e3b3a4d8e66d5d15aeb93f304f1893fe48 WHIRLPOOL 225760810ae9efbff31d0238dff08d966db5167e9b61a79f960d03b6d6bdaa2ed7d9b1e7608a99418d5346d3e8ddbe8b58f0d561aaacb292decf235b821fbc62
DIST glpk-4.60.tar.gz 4160915 SHA256 1356620cb0a0d33ac3411dd49d9fd40d53ece73eaec8f6b8d19a77887ff5e297 SHA512 521bc48c588318fe6075eb66b1c43465200039f64b105b4a24f9f6eb9bb4742c7ebc96750ce999f64c60d6531486476386467dd41e949f1a00cba0cf00fbe20a WHIRLPOOL dfde976f9a32ba1751d1a0748c21023e0df802a1f22501c70091cbfb273bde8b73951eceb2a0768bc5634d6786c1cdb109e36af78e72ac7825fa9743737721f4
DIST glpk-4.61.tar.gz 4116291 SHA256 9866de41777782d4ce21da11b88573b66bb7858574f89c28be6967ac22dfaba9 SHA512 0bcf89b62a2b3f565356b7ae538c5af6f3b4283234827c4212284d4924ce93980f6971f51313f1c08790e23e860771545dc58fdb8b35405d37404589683f40a1 WHIRLPOOL 01228c555ba7d17668a35a80bdf37dba00a1a105291288aa5ebef43c3ea3999e81042e0f98b5bfbfd7d44804a79014281120aaf10ca181be1b0615b97925407c
+DIST glpk-4.63.tar.gz 4131787 SHA256 914d27f1a51c2bf4a51f1bd4a507f875fcca99db7b219380b836a25b29b3e7f6 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c WHIRLPOOL 30facc4776e3db4232ff2924452ee0601bda78b3888f162a12e84af2f2232fbcbd986a9e849a6ce38fa19688c45eb6c6852ca76cc277ea5324e8a55fe899088e
diff --git a/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch
new file mode 100644
index 000000000000..e836219d0add
--- /dev/null
+++ b/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch
@@ -0,0 +1,94 @@
+Remove suitesparse (camd,colamd) and zlib bundles
+bicatali - apr 2014
+Updated for 4.57 by soap (Jan 2016)
+Updated for 4.60 by bicatali (Dec 2016)
+Updated for 4.63 by bicatali (Jul 2017)
+
+diff -Nuar --exclude '*.orig' --exclude '*.rej' --exclude '*~' glpk-4.63.orig/configure.ac glpk-4.63/configure.ac
+--- glpk-4.63.orig/configure.ac 2017-07-25 00:00:00.000000000 -0700
++++ glpk-4.63/configure.ac 2017-07-27 14:10:47.986520907 -0700
+@@ -69,6 +69,11 @@
+ dnl Check for math library
+ AC_CHECK_LIB([m], [exp])
+
++AC_CHECK_LIB([amd], [amd_1])
++AC_CHECK_LIB([colamd], [colamd])
++AC_CHECK_HEADER([amd.h])
++AC_CHECK_LIB([z], [gzopen])
++
+ dnl Check for header
+ AC_CHECK_HEADER([sys/time.h],
+ AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A]))
+diff -Nuar --exclude '*.orig' --exclude '*.rej' --exclude '*~' glpk-4.63.orig/src/Makefile.am glpk-4.63/src/Makefile.am
+--- glpk-4.63.orig/src/Makefile.am 2017-07-25 00:00:00.000000000 -0700
++++ glpk-4.63/src/Makefile.am 2017-07-27 14:11:30.841536062 -0700
+@@ -6,18 +6,15 @@
+
+ libglpk_la_CPPFLAGS = \
+ -I$(srcdir) \
+--I$(srcdir)/amd \
+ -I$(srcdir)/api \
+ -I$(srcdir)/bflib \
+ -I$(srcdir)/cglib \
+--I$(srcdir)/colamd \
+ -I$(srcdir)/env \
+ -I$(srcdir)/minisat \
+ -I$(srcdir)/misc \
+ -I$(srcdir)/mpl \
+ -I$(srcdir)/proxy \
+--I$(srcdir)/simplex \
+--I$(srcdir)/zlib
++-I$(srcdir)/simplex
+
+ libglpk_la_LDFLAGS = \
+ -version-info 42:2:2 \
+@@ -57,18 +54,6 @@
+ glpssx01.c \
+ glpssx02.c \
+ lux.c \
+-amd/amd_1.c \
+-amd/amd_2.c \
+-amd/amd_aat.c \
+-amd/amd_control.c \
+-amd/amd_defaults.c \
+-amd/amd_dump.c \
+-amd/amd_info.c \
+-amd/amd_order.c \
+-amd/amd_post_tree.c \
+-amd/amd_postorder.c \
+-amd/amd_preprocess.c \
+-amd/amd_valid.c \
+ api/advbas.c \
+ api/asnhall.c \
+ api/asnlp.c \
+@@ -142,7 +127,6 @@
+ cglib/gmigen.c \
+ cglib/mirgen.c \
+ cglib/spv.c \
+-colamd/colamd.c \
+ env/alloc.c \
+ env/dlsup.c \
+ env/env.c \
+@@ -196,21 +180,6 @@
+ simplex/spxprob.c \
+ simplex/spychuzc.c \
+ simplex/spychuzr.c \
+-simplex/spydual.c \
+-zlib/adler32.c \
+-zlib/compress.c \
+-zlib/crc32.c \
+-zlib/deflate.c \
+-zlib/gzclose.c \
+-zlib/gzlib.c \
+-zlib/gzread.c \
+-zlib/gzwrite.c \
+-zlib/inffast.c \
+-zlib/inflate.c \
+-zlib/inftrees.c \
+-zlib/trees.c \
+-zlib/uncompr.c \
+-zlib/zio.c \
+-zlib/zutil.c
++simplex/spydual.c
+
+ ## eof ##
diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild
new file mode 100644
index 000000000000..9c15f085e03e
--- /dev/null
+++ b/sci-mathematics/glpk/glpk-4.63.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="GNU Linear Programming Kit"
+LICENSE="GPL-3"
+HOMEPAGE="https://www.gnu.org/software/glpk/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/40"
+IUSE="doc examples gmp odbc mysql static-libs"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+RDEPEND="
+ sci-libs/amd:0=
+ sci-libs/colamd:=
+ sys-libs/zlib:0=
+ gmp? ( dev-libs/gmp:0= )
+ mysql? ( virtual/mysql )
+ odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.63-debundle-system-libs.patch
+)
+
+src_prepare() {
+ use odbc && [[ -z $(type -P odbc_config) ]] && \
+ append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+ if use mysql || use odbc; then
+ myconf="--enable-dl"
+ else
+ myconf="--disable-dl"
+ fi
+
+ econf ${myconf} \
+ $(use_enable mysql) \
+ $(use_enable odbc) \
+ $(use_enable static-libs static) \
+ $(use_with gmp)
+}
+
+src_install() {
+ default
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+ use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
+}
diff --git a/sci-mathematics/relational/Manifest b/sci-mathematics/relational/Manifest
index 30246943cdfb..94dcc18ec975 100644
--- a/sci-mathematics/relational/Manifest
+++ b/sci-mathematics/relational/Manifest
@@ -1,2 +1 @@
-DIST relational_2.4.orig.tar.gz 113606 SHA256 6e322ae4face623e91fb775171eb3758bcb9a253f2967c9e303208e9f32e5dee SHA512 c7cb6bf5c97df57e84f746d0adccbc3285ea863d692c2b999600ec70f8512e1a3f28a4414d2d34fa956ec6d7955ff290f638d048ada6b685d031823b46d368ff WHIRLPOOL 069c0f69237060fe1741c233678400abce7148ef865c6fa61847cc9395289f6f27b2b6456f632ded421ea3e9c0f4f3f8bb8d13713f72e950ad3608d7c4478052
DIST relational_2.5.orig.tar.gz 118776 SHA256 511330beda30b7acea6a1122bbdf39b1ee8b8f026e41d2bab8aed8b8d52f89b7 SHA512 588e35a57cf915e544d62749b76ed81927ac06fd88271f0d4d88ee5f221928c2c24e2a88165aae63c1b9b120ddaa20e15e21fe9c207eac3150b744274ae45a8a WHIRLPOOL 1fd04109e1ed9ca89fa6c8464f7de71677d8642d9dd1060beca142f276a7df2d7f6a8a9baa620c0e19308b76bd2ff1cb683139adad3a0850856be3e64e7c0ca2
diff --git a/sci-mathematics/relational/relational-2.4.ebuild b/sci-mathematics/relational/relational-2.4.ebuild
deleted file mode 100644
index 8eb43f5b775f..000000000000
--- a/sci-mathematics/relational/relational-2.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit python-single-r1
-
-DESCRIPTION="Educational tool for relational algebra"
-HOMEPAGE="http://ltworf.github.io/relational/"
-SRC_URI="https://github.com/ltworf/${PN}/releases/download/${PV}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- ${PYTHON_DEPS}
- dev-python/PyQt5[gui,webkit,widgets,${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- default
-
- sed -i -e '/^Terminal=/ s/0/false/' \
- -e '/^Keywords=/ s/$/;/' \
- relational.desktop || die
-}
-
-src_install() {
- emake -j1 DESTDIR="${ED}" install-{relational-cli,python3-relational,relational}
- python_optimize
-
- dodoc CHANGELOG complexity CREDITS README.md
-}
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 34a0411b6463..79abdba0e4c0 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,2 +1,3 @@
DIST dbus-1.10.18.tar.gz 1986589 SHA256 6049ddd5f3f3e2618f615f1faeda0a115104423a7996b7aa73e2f36e38cc514a SHA512 726f97d0a2016f4f0625ba332e93e2d33bb16857cd35cb6c79da0f44fff297df948c3df62c31ffbec34713a7b85b3ff5b65f31517fe3511ddbd3bf18bd4748ed WHIRLPOOL ee164e1f6de80595fbfbcbad65d78dab4b91b5ec4e1ce88e1c4015f1c1b531f09796d54db163b2c2eceb3b92261f8a57852d2e0b29f71d9c65f9b91684433d9e
DIST dbus-1.10.20.tar.gz 1989628 SHA256 e574b9780b5425fde4d973bb596e7ea0f09e00fe2edd662da9016e976c460b48 SHA512 0e43866b56d6ae4a5d885044793573908ce95b4dd84822292efa87f5eb0dec3d09adf58af0574ca41259b16c3d70476ef956b6c8aa3bf9ca7461e6196be71daf WHIRLPOOL 08c7b4d77cd40a8b8369f5272669cc981ec64af2f4f1233b450005e44c1db0e602aa720064dcc709e298cb4bf54db0210f9c3d93674ca2f176f47d55d6ae116d
+DIST dbus-1.10.22.tar.gz 1989350 SHA256 e2b1401e3eedc7b5c9a2034d31254c886e1fcbc7858006e0a1c59158fe4b7b97 SHA512 c5c0040717ecef66b788c5bcda94463c079502b5004639b3c1e93bb92b4de5d9be8b3fe43e18843f1d9e50411f742ba8a869375b57d479882f8aee46b613c545 WHIRLPOOL efc4a6efc78ac5ce3ba34b512ef4d74fb5f3cda563b4dcead1baf4f2d77d578fb54e8f9e69c1aa6ddf5f776bc050be69f1086428f293c0032f47acbaf66669eb
diff --git a/sys-apps/dbus/dbus-1.10.22.ebuild b/sys-apps/dbus/dbus-1.10.22.ebuild
new file mode 100644
index 000000000000..b166421a7116
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.10.22.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools ltprune linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="https://dbus.freedesktop.org/"
+SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
+
+LICENSE="|| ( AFL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="debug doc elogind selinux static-libs systemd test user-session X"
+
+RESTRICT="test"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+CDEPEND="
+ >=dev-libs/expat-2
+ selinux? ( sys-libs/libselinux )
+ elogind? ( sys-auth/elogind )
+ systemd? ( sys-apps/systemd:0= )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXt
+ )
+"
+DEPEND="${CDEPEND}
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.4
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ test? (
+ >=dev-libs/glib-2.36:2
+ ${PYTHON_DEPS}
+ )
+"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-dbus )
+"
+
+DOC_CONTENTS="
+ Some applications require a session bus in addition to the system
+ bus. Please see \`man dbus-launch\` for more information.
+"
+
+# out of sources build dir for make check
+TBD="${WORKDIR}/${P}-tests-build"
+
+pkg_setup() {
+ enewgroup messagebus
+ enewuser messagebus -1 -1 -1 messagebus
+
+ use test && python-any-r1_pkg_setup
+
+ if use kernel_linux; then
+ CONFIG_CHECK="~EPOLL"
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # Tests were restricted because of this
+ sed -i \
+ -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
+ -e '/"dispatch"/d' \
+ bus/test-main.c || die
+
+ eapply "${FILESDIR}/${PN}-enable-elogind.patch"
+
+ eapply_user
+
+ # required for bug 263909, cross-compile so don't remove eautoreconf
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local docconf myconf
+
+ # so we can get backtraces from apps
+ case ${CHOST} in
+ *-mingw*)
+ # error: unrecognized command line option '-rdynamic' wrt #488036
+ ;;
+ *)
+ append-flags -rdynamic
+ ;;
+ esac
+
+ # libaudit is *only* used in DBus wrt SELinux support, so disable it, if
+ # not on an SELinux profile.
+ myconf=(
+ --localstatedir="${EPREFIX}/var"
+ --docdir="${EPREFIX}/usr/share/doc/${PF}"
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+ $(use_enable static-libs static)
+ $(use_enable debug verbose-mode)
+ --disable-asserts
+ --disable-checks
+ $(use_enable selinux)
+ $(use_enable selinux libaudit)
+ --disable-apparmor
+ $(use_enable kernel_linux inotify)
+ $(use_enable kernel_FreeBSD kqueue)
+ $(use_enable elogind)
+ $(use_enable systemd)
+ $(use_enable user-session)
+ --disable-embedded-tests
+ --disable-modular-tests
+ $(use_enable debug stats)
+ --with-session-socket-dir="${EPREFIX}"/tmp
+ --with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
+ --with-system-socket="${EPREFIX}"/var/run/dbus/system_bus_socket
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ --with-dbus-user=messagebus
+ $(use_with X x)
+ )
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ myconf+=(
+ --enable-launchd
+ --with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
+ )
+ fi
+
+ if multilib_is_native_abi; then
+ docconf=(
+ --enable-xml-docs
+ $(use_enable doc doxygen-docs)
+ )
+ else
+ docconf=(
+ --disable-xml-docs
+ --disable-doxygen-docs
+ )
+ myconf+=(
+ --disable-selinux
+ --disable-libaudit
+ --disable-elogind
+ --disable-systemd
+ --without-x
+
+ # expat is used for the daemon only
+ # fake the check for multilib library build
+ ac_cv_lib_expat_XML_ParserCreate_MM=yes
+ )
+ fi
+
+ einfo "Running configure in ${BUILD_DIR}"
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
+
+ if multilib_is_native_abi && use test; then
+ mkdir "${TBD}" || die
+ cd "${TBD}" || die
+ einfo "Running configure in ${TBD}"
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" \
+ $(use_enable test asserts) \
+ $(use_enable test checks) \
+ $(use_enable test embedded-tests) \
+ $(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+ fi
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ # after the compile, it uses a selinuxfs interface to
+ # check if the SELinux policy has the right support
+ use selinux && addwrite /selinux/access
+
+ einfo "Running make in ${BUILD_DIR}"
+ emake
+
+ if use test; then
+ einfo "Running make in ${TBD}"
+ emake -C "${TBD}"
+ fi
+ else
+ emake -C dbus libdbus-1.la
+ fi
+}
+
+src_test() {
+ DBUS_VERBOSE=1 Xemake -j1 -C "${TBD}" check
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake DESTDIR="${D}" install
+ else
+ emake DESTDIR="${D}" install-pkgconfigDATA
+ emake DESTDIR="${D}" -C dbus \
+ install-libLTLIBRARIES install-dbusincludeHEADERS \
+ install-nodist_dbusarchincludeHEADERS
+ fi
+}
+
+multilib_src_install_all() {
+ newinitd "${FILESDIR}"/dbus.initd-r1 dbus
+
+ if use X; then
+ # dbus X session script (#77504)
+ # turns out to only work for GDM (and startx). has been merged into
+ # other desktop (kdm and such scripts)
+ exeinto /etc/X11/xinit/xinitrc.d
+ doexe "${FILESDIR}"/80-dbus
+ fi
+
+ # needs to exist for dbus sessions to launch
+ keepdir /usr/share/dbus-1/services
+ keepdir /etc/dbus-1/{session,system}.d
+ # machine-id symlink from pkg_postinst()
+ keepdir /var/lib/dbus
+ # let the init script create the /var/run/dbus directory
+ rm -rf "${ED}"/var/run
+
+ dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
+ readme.gentoo_create_doc
+
+ prune_libtool_files --all
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ # Ensure unique id is generated and put it in /etc wrt #370451 but symlink
+ # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
+ # dependencies with hardcoded paths (although the known ones got fixed already)
+ dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
+ ln -sf "${EPREFIX%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ local plist="org.freedesktop.dbus-session.plist"
+ elog
+ elog
+ elog "For MacOS/Darwin we now ship launchd support for dbus."
+ elog "This enables autolaunch of dbus at session login and makes"
+ elog "dbus usable under MacOS/Darwin."
+ elog
+ elog "The launchd plist file ${plist} has been"
+ elog "installed in ${EPREFIX}/Library/LaunchAgents."
+ elog "For it to be used, you will have to do all of the following:"
+ elog " + cd ~/Library/LaunchAgents"
+ elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
+ elog " + logout and log back in"
+ elog
+ elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
+ elog "specified and refused to start otherwise, then export the"
+ elog "the following to your environment:"
+ elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
+ fi
+
+ if use user-session; then
+ ewarn "You have enabled user-session. Please note this can cause"
+ ewarn "bogus behaviors in several dbus consumers that are not prepared"
+ ewarn "for this dbus activation method yet."
+ ewarn
+ ewarn "See the following link for background on this change:"
+ ewarn "https://lists.freedesktop.org/archives/systemd-devel/2015-January/027711.html"
+ ewarn
+ ewarn "Known issues are tracked here:"
+ ewarn "https://bugs.gentoo.org/show_bug.cgi?id=576028"
+ fi
+}
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 02da14f3cd7e..c90c4b13587c 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1 +1,2 @@
DIST gptfdisk-1.0.1.tar.gz 195378 SHA256 864c8aee2efdda50346804d7e6230407d5f42a8ae754df70404dd8b2fdfaeac7 SHA512 6aa2ed6213183ea38ce7dd6e7f4f23b88cc56bed5a4d078f563b9e0a3c276eacf869e28a27ccb4e473753f7bced7ecb5de4535626f9ed22b7a59a39906d0419c WHIRLPOOL b520ec11cf62d0d2a1b66af1d4acfbd24c2df4dad2c00562900d4f90fb67ee76b6fa2aefc5d730b6ce30551baafddd9d3e2631ad2022b067bed3cdc943fadb5c
+DIST gptfdisk-1.0.3.tar.gz 199924 SHA256 89fd5aec35c409d610a36cb49c65b442058565ed84042f767bba614b8fc91b5c SHA512 80d437bfa2365abfffbd4812ea928fcebd52c5421de321cf190d395549e32c5ebdbb2d060cc4b95f77fe13cdd719f4d2bb3d0ed5d97792b100325f92d7c852d7 WHIRLPOOL 9de244cd4c1a3fe9672d2e50b46f3f690ddfaff306046b610351a1f75697199e6392e7048f12edbe82285b5eb773c1802417329feb610ed609049a5318525b99
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
new file mode 100644
index 000000000000..e9731e664817
--- /dev/null
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GPT partition table manipulator for Linux"
+HOMEPAGE="http://www.rodsbooks.com/gdisk/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="kernel_linux ncurses static"
+
+# libuuid from util-linux is required.
+LIB_DEPEND="
+ dev-libs/popt[static-libs(+)]
+ ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[static-libs(+)] )
+ kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="
+ ${RDEPEND}
+ static? ( ${LIB_DEPEND} )
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+
+ tc-export CXX PKG_CONFIG
+
+ if ! use ncurses ; then
+ sed -i \
+ -e '/^all:/s:cgdisk::' \
+ Makefile || die
+ fi
+
+ sed \
+ -e '/g++/s:=:?=:g' \
+ -e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
+ -i Makefile || die
+
+ use static && append-ldflags -static
+}
+
+src_install() {
+ dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
+ doman *.8
+ dodoc NEWS README
+}
diff --git a/sys-apps/idle3-tools/idle3-tools-0.9.1.ebuild b/sys-apps/idle3-tools/idle3-tools-0.9.1.ebuild
index 7a39dbbdbece..d00992cea605 100644
--- a/sys-apps/idle3-tools/idle3-tools-0.9.1.ebuild
+++ b/sys-apps/idle3-tools/idle3-tools-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
DEPEND=""
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild
index a81e8746561a..760ed21c4fe6 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://arthurdejong.org/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug kerberos +pam sasl test +utils"
COMMON_DEP="
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index d70a9fec0845..971f074d6787 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -1,5 +1,2 @@
-DIST tgt-1.0.67.tar.gz 296092 SHA256 bf3f68d9314583459328d060942308a909b795146187ab4d4231ac03481fe6c8 SHA512 8ea1096cdf83a31d3b5c10916d8e3c1d90c23b3072a0cc9e8214bb4c230ac08b37264f1460099069d5ff6e56d31fcb2f6cf7291a2305ed685d106ed1898c50bb WHIRLPOOL d51b14dd146045f49d994f0ce8b8a88e23813c76d98f36709f4b125e8f7cc81a9204a0140c7e8fa88db694c974da56af18bdd495da66232217ca07397003d172
-DIST tgt-1.0.68.tar.gz 296862 SHA256 ff9000ccd07c648c57c65ef73c5a694f5e3045be69162bfe33e67028f2f5b7bd SHA512 652182aece13dae91c5193b9084c201ca2dd34331917c56e5ab2b7a8fc0653cb843cf67fe9d95bdb01b52f285e395b28323f0eb834a5de80a58876777902d28e WHIRLPOOL eff054e1684f59d831ee32b4158859a885c68c9f080284e3bbf31d8fed21b86e4972a077620ef5276e9e8c4fead264b281f1124f157d45c2fcf9097dbb71b143
-DIST tgt-1.0.69.tar.gz 296481 SHA256 07bc89fdbd3e49490ca42047b38c1249610f2be5ee69aa4c12e5dcd3bc63d0fe SHA512 36964b4a95704b3239f5fefaef1b62ceed72569ea8483e8a23a1a6be4f526a9a9a62ea332ca6ccc2728607936ad8ef547d6e6becb9b240e1704fd7e7d8b4cfbf WHIRLPOOL fcb2ce5498a46c590ca1222cf552090b59b99af588d5e768b94280e87ab5c5f56417e17c6d3ea716ed314725ffb5ca2d47acf014a6619fb376fa6b60b8c5e141
DIST tgt-1.0.70.tar.gz 296474 SHA256 632ed2f064652be7533e928834b55b403927ad381456b8089d903fd92a1f8e3d SHA512 fac7acde7cbd12156ea472d1bed20646dfdd5cfe607503bd1437eaeef816ba8114fe2ebd79e33cb083f8e64fee07bfbf66bcfc6b427c21de814e293e9edaeaad WHIRLPOOL b8b60f2c69e6f9199ba93eae98ca96ea2407ef1d3c26567925a9996d6430cd3f8c204630b046b74487b872ccf02729f89d046b263385e32d14b78fcd336d5e4c
DIST tgt-1.0.71.tar.gz 296540 SHA256 3f0b898ae341f5d8c84c83f9951dd7ef182eaf449dd7008e55747f144303e10b SHA512 db74deb199ef341577ab505b7202651e6c28aa9d62d37d3492b1775a2944284e1d3bb7c99b6d8bedd3456807641952876719ecd66553bd8c8dabbee5669f9428 WHIRLPOOL d19c2c5614d7b406d785cbe5b954a0aa2494b8a5b43a33e05b3f6876750039590524607b28c491cd00a60dd7a1bc57e327099fe36711a8c53798a4ec1300e295
diff --git a/sys-block/tgt/tgt-1.0.67.ebuild b/sys-block/tgt/tgt-1.0.67.ebuild
deleted file mode 100644
index 8c831f7d3ef6..000000000000
--- a/sys-block/tgt/tgt-1.0.67.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs
-
-MY_TREE="cb7971c"
-
-DESCRIPTION="Linux SCSI target framework (tgt)"
-HOMEPAGE="http://stgt.sourceforge.net"
-SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="fcoe fcp ibmvio infiniband rbd"
-
-CDEPEND="dev-perl/Config-General
- dev-libs/libxslt
- rbd? ( sys-cluster/ceph )
- infiniband? (
- sys-fabric/libibverbs:=
- sys-fabric/librdmacm:=
- )"
-DEPEND="${CDEPEND}
- app-text/docbook-xsl-stylesheets"
-RDEPEND="${DEPEND}
- dev-libs/libaio
- sys-apps/sg3_utils"
-
-S=${WORKDIR}/fujita-tgt-${MY_TREE}
-
-pkg_setup() {
- tc-export CC
-}
-
-src_prepare() {
- sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
-
- # make sure xml docs are generated before trying to install them
- sed -i -e "s@install: @& all @g" doc/Makefile || die
-}
-
-src_compile() {
- local myconf
- use ibmvio && myconf="${myconf} IBMVIO=1"
- use infiniband && myconf="${myconf} ISCSI_RDMA=1"
- use fcp && myconf="${myconf} FCP=1"
- use fcoe && myconf="${myconf} FCOE=1"
- use rbd && myconf="${myconf} CEPH_RBD=1"
-
- emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
- emake -C doc
-}
-
-src_install() {
- emake install-programs install-scripts install-doc DESTDIR="${D}" docdir=/usr/share/doc/${PF}
- newinitd "${FILESDIR}"/tgtd.initd tgtd
- newconfd "${FILESDIR}"/tgtd.confd tgtd
- dodir /etc/tgt
- keepdir /etc/tgt
-}
diff --git a/sys-block/tgt/tgt-1.0.68.ebuild b/sys-block/tgt/tgt-1.0.68.ebuild
deleted file mode 100644
index 27ab0bb71c26..000000000000
--- a/sys-block/tgt/tgt-1.0.68.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs
-
-MY_TREE="7c3e84b"
-
-DESCRIPTION="Linux SCSI target framework (tgt)"
-HOMEPAGE="http://stgt.sourceforge.net"
-SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="fcoe fcp ibmvio infiniband rbd"
-
-CDEPEND="dev-perl/Config-General
- dev-libs/libxslt
- rbd? ( sys-cluster/ceph )
- infiniband? (
- sys-fabric/libibverbs:=
- sys-fabric/librdmacm:=
- )"
-DEPEND="${CDEPEND}
- app-text/docbook-xsl-stylesheets"
-RDEPEND="${DEPEND}
- dev-libs/libaio
- sys-apps/sg3_utils"
-
-S=${WORKDIR}/fujita-tgt-${MY_TREE}
-
-pkg_setup() {
- tc-export CC
-}
-
-src_prepare() {
- sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
-
- # make sure xml docs are generated before trying to install them
- sed -i -e "s@install: @& all @g" doc/Makefile || die
-}
-
-src_compile() {
- local myconf
- use ibmvio && myconf="${myconf} IBMVIO=1"
- use infiniband && myconf="${myconf} ISCSI_RDMA=1"
- use fcp && myconf="${myconf} FCP=1"
- use fcoe && myconf="${myconf} FCOE=1"
- use rbd && myconf="${myconf} CEPH_RBD=1"
-
- emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
- emake -C doc
-}
-
-src_install() {
- emake install-programs install-scripts install-doc DESTDIR="${D}" docdir=/usr/share/doc/${PF}
- newinitd "${FILESDIR}"/tgtd.initd tgtd
- newconfd "${FILESDIR}"/tgtd.confd tgtd
- dodir /etc/tgt
- keepdir /etc/tgt
-}
diff --git a/sys-block/tgt/tgt-1.0.69.ebuild b/sys-block/tgt/tgt-1.0.69.ebuild
deleted file mode 100644
index f4477d6f4e55..000000000000
--- a/sys-block/tgt/tgt-1.0.69.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs
-
-MY_TREE="77b802c"
-
-DESCRIPTION="Linux SCSI target framework (tgt)"
-HOMEPAGE="http://stgt.sourceforge.net"
-SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="fcoe fcp ibmvio infiniband rbd"
-
-CDEPEND="dev-perl/Config-General
- dev-libs/libxslt
- rbd? ( sys-cluster/ceph )
- infiniband? (
- sys-fabric/libibverbs:=
- sys-fabric/librdmacm:=
- )"
-DEPEND="${CDEPEND}
- app-text/docbook-xsl-stylesheets"
-RDEPEND="${DEPEND}
- dev-libs/libaio
- sys-apps/sg3_utils"
-
-S=${WORKDIR}/fujita-tgt-${MY_TREE}
-
-pkg_setup() {
- tc-export CC
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-sysmacros.patch #580594
-
- sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
-
- # make sure xml docs are generated before trying to install them
- sed -i -e "s@install: @& all @g" doc/Makefile || die
-}
-
-src_compile() {
- local myconf
- use ibmvio && myconf="${myconf} IBMVIO=1"
- use infiniband && myconf="${myconf} ISCSI_RDMA=1"
- use fcp && myconf="${myconf} FCP=1"
- use fcoe && myconf="${myconf} FCOE=1"
- use rbd && myconf="${myconf} CEPH_RBD=1"
-
- emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
- emake -C doc
-}
-
-src_install() {
- emake install-programs install-scripts install-doc DESTDIR="${D}" docdir=/usr/share/doc/${PF}
- newinitd "${FILESDIR}"/tgtd.initd tgtd
- newconfd "${FILESDIR}"/tgtd.confd tgtd
- dodir /etc/tgt
- keepdir /etc/tgt
-}
diff --git a/sys-block/tgt/tgt-1.0.71.ebuild b/sys-block/tgt/tgt-1.0.71.ebuild
index ac5501248651..ccb001c49fcd 100644
--- a/sys-block/tgt/tgt-1.0.71.ebuild
+++ b/sys-block/tgt/tgt-1.0.71.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="fcoe fcp ibmvio infiniband rbd"
CDEPEND="dev-perl/Config-General
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 797645c3fe5b..5f0cc0c66766 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,7 +1,6 @@
DIST ceph-0.94.9.tar.gz 9044702 SHA256 d5bc07e7aef75f74d75f0356e5dd2a17956cbad6bb552a1e96a0fabd80924050 SHA512 ef4bbcc4429e22a2d924fd52dc42f522d5327f67ee8c1781d7cf602c2932a485cb48db21bdc33e7c7fbc968eec59c17882ebb18e6405599e11a3abc248f1d376 WHIRLPOOL f348159e8d7dd5e1ac3810a51846f50f6cefdbc5fa4cd15c3127b1136eb960baca8ad8db33c78a5d6435720cf1e2c277e068d09f9b9dbcf0f8ad56d7ddd914dc
DIST ceph-10.2.3.tar.gz 11596171 SHA256 dca933aa14db67b404d836ef510bd418091978edc2f0c74dfc530ba0aa5e8994 SHA512 9de1e6851fc343d2c52c72cec3f7887d998d5b588f1251ee3a1fda14427badfa10408e6691fb03a374a10f4ec9844868423fee70fbbe2c0d962af98481412f19 WHIRLPOOL 981ebca66113a07a5cc6e5934272a72b29a2c19e03398f7b622c11df6ea0a05339558dfc2f11504403cbbd0efe0b090ad59f4b86206b46db57587744091aa26a
-DIST ceph-10.2.5.tar.gz 14020700 SHA256 82dd4271f18eb7b84ff16f273a5250a4a9e809bfaccce5a1cca493416332d5f4 SHA512 4889aff38c8af781c2e3dce8f4ee51864db0a27c6294774345d2c1b047588ec31354ad41f799e2f0d0a966dc372d76c9bdbfb93f30a0718ea9d7c2b7a645d0f8 WHIRLPOOL 986a6ac35612a732d2a9a73277525679f9da729601c7e3f82b83e7e8ee2eb4245c98cdf5c4462ae1c789cb3d120a2c4a7eb9a3958b072db5e743b2c015269dfc
-DIST ceph-10.2.6.tar.gz 14500365 SHA256 ad32c549d0ce6de581b5e1c6c7eba38e0f6658aaf8a91990e602f7c64c5e48c7 SHA512 c4321e27a6f8983f69435316c35858ab2b8b620cd80663a5471447c7489d867aef30b22541ca9648a7dcf9d931d04055e29d87dea3a6e94963fb360d06713dee WHIRLPOOL bd886105b47b6cfaeeff882f1d21d710442880c31a1943298db0904a453d67da71519c8fe5e1dd0377480b5413c90bf8ae4bed6bd99bfc53e4696f8b8031c23a
DIST ceph-10.2.7.tar.gz 14518491 SHA256 2cdfeaa9a08e94c2d35f540b450bbf64b2a694bd537679834185e98fc59d8ba2 SHA512 7e0686e9efa4ddd9d548f4145b448f8232f1ca29b08428daa5cd60a74ce26f1176a1f2ebbf2ac1761d9e6c1d364a5ffa194d2b3a18a8111f59b7c27f7a1d7734 WHIRLPOOL b6b6902230401b5f4c6f27801f315678bdc7b99aab4e50b54d941fc3a425b4f0fa9390484f2e12d6b4f962253fb8772fb706dad35d490b4542b06db166fab59b
DIST ceph-10.2.8.tar.gz 14548472 SHA256 f284743b007cbb61fc9849dc2249942886116c2cb2abcd346d2304d52b16eaaa SHA512 1f3bf81bf6745033e034c3c4e4f05db5c39b2e8435da20fc130971559e8fde0d640bf00bfaafb374d24c45f873e7d768ae9d7d8cd3388347f5804c4bfc303f09 WHIRLPOOL a8bf29ff913c08d423beb0fefa792c06a653d8ac00bd698b7f77bbaf4657f0530ad5a43043dabb24308ed5a4e569fec53130a78d78d8eddf16026a942de8cc40
+DIST ceph-10.2.9.tar.gz 14550219 SHA256 3d93f4fc4a66b1d9f9ce43f65868dc18287cea32fbb2c7421faca6aed2b52a80 SHA512 1d59146614aa87ca551b05b795a684071a3cfb4ce6013e978ba650403c6732b2aa13f3c3cc191e6a1ea34b4631c82e97700593c24e200c41ec2f2b43b3ef5547 WHIRLPOOL 42215d33c4f617087e1b0ef81cd41b42330c3605acf625b0668d44eba9e982239683b466a1cc1a6f926fc1d439dfd6be4ce220f783da7d2214d36a2a6cc9181f
DIST ceph-9.2.1.tar.gz 9933444 SHA256 1918dfc3df80df5986c5b7ff6bc6c78064eef0f6c5e8269dba30e08c703a7c2f SHA512 1e84c1e2d64f4156a523658ed11552b045f75986922b7b7dbaf4719e73a0a6aadc71eb2b94ae363526f729534a592921a437468a41a3cea88c1b84e09de8505a WHIRLPOOL 3a0eb6712e5b0235707e86129e1d66f1184f50cd4980c30f6d8cc0e7dfd96d30b91177ed16dd7abf2ad4983c6a543eb91915f74f661f7d3e3c810b5b1d656aca
diff --git a/sys-cluster/ceph/ceph-0.94.9.ebuild b/sys-cluster/ceph/ceph-0.94.9.ebuild
index 01fbc561d1f0..8ee34507772e 100644
--- a/sys-cluster/ceph/ceph-0.94.9.ebuild
+++ b/sys-cluster/ceph/ceph-0.94.9.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
@@ -41,7 +41,7 @@ COMMON_DEPEND="
sys-apps/util-linux
dev-libs/libxml2
babeltrace? ( dev-util/babeltrace )
- fuse? ( sys-fs/fuse )
+ fuse? ( sys-fs/fuse:0 )
libatomic? ( dev-libs/libatomic_ops )
xfs? ( sys-fs/xfsprogs )
zfs? ( sys-fs/zfs )
@@ -157,7 +157,6 @@ src_install() {
systemd_newunit "${FILESDIR}/ceph-osd_at.service" "ceph-osd@.service"
systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
systemd_newunit "${FILESDIR}/ceph-mon_at.service" "ceph-mon@.service"
- systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
python_fix_shebang \
"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
diff --git a/sys-cluster/ceph/ceph-10.2.3-r2.ebuild b/sys-cluster/ceph/ceph-10.2.3-r2.ebuild
index 9985ce305658..48ba0a48e0d2 100644
--- a/sys-cluster/ceph/ceph-10.2.3-r2.ebuild
+++ b/sys-cluster/ceph/ceph-10.2.3-r2.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=6
@@ -46,7 +46,7 @@ COMMON_DEPEND="
radosgw? ( dev-libs/fcgi )
ldap? ( net-nds/openldap )
babeltrace? ( dev-util/babeltrace )
- fuse? ( sys-fs/fuse )
+ fuse? ( sys-fs/fuse:0 )
xfs? ( sys-fs/xfsprogs )
zfs? ( sys-fs/zfs )
gtk? (
@@ -248,7 +248,6 @@ src_install() {
systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
- systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
udev_dorules udev/*.rules
diff --git a/sys-cluster/ceph/ceph-10.2.5-r1.ebuild b/sys-cluster/ceph/ceph-10.2.5-r1.ebuild
deleted file mode 100644
index 6d87b25f3629..000000000000
--- a/sys-cluster/ceph/ceph-10.2.5-r1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# 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,5}} )
-
-inherit check-reqs autotools eutils python-r1 udev user \
- readme.gentoo-r1 systemd versionator flag-o-matic
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="
- git://github.com/ceph/ceph.git
- https://github.com/ceph/ceph.git"
- SRC_URI=""
-else
- SRC_URI="http://ceph.com/download/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio"
-IUSE+=" libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
- app-arch/snappy
- app-arch/lz4:=
- app-arch/bzip2
- dev-libs/boost:=[threads]
- dev-libs/libaio
- dev-libs/leveldb[snappy]
- nss? ( dev-libs/nss )
- libatomic? ( dev-libs/libatomic_ops )
- cryptopp? ( dev-libs/crypto++:= )
- sys-apps/keyutils
- sys-apps/util-linux
- dev-libs/libxml2
- radosgw? ( dev-libs/fcgi )
- ldap? ( net-nds/openldap )
- babeltrace? ( dev-util/babeltrace )
- fuse? ( sys-fs/fuse )
- xfs? ( sys-fs/xfsprogs )
- zfs? ( sys-fs/zfs )
- gtk? (
- x11-libs/gtk+:2
- dev-cpp/gtkmm:2.4
- gnome-base/librsvg
- )
- radosgw? (
- dev-libs/fcgi
- dev-libs/expat
- net-misc/curl
- )
- jemalloc? ( dev-libs/jemalloc )
- !jemalloc? ( dev-util/google-perftools )
- lttng? ( dev-util/lttng-ust )
- ${PYTHON_DEPS}
- "
-DEPEND="${COMMON_DEPEND}
- dev-python/cython[${PYTHON_USEDEP}]
- app-arch/cpio
- sys-apps/lsb-release
- virtual/pkgconfig
- dev-python/sphinx
- test? (
- sys-fs/btrfs-progs
- sys-apps/grep[pcre]
- dev-python/tox[${PYTHON_USEDEP}]
- dev-python/virtualenv[${PYTHON_USEDEP}]
- )"
-RDEPEND="${COMMON_DEPEND}
- sys-apps/hdparm
- sys-block/parted
- sys-fs/cryptsetup
- sys-apps/gptfdisk
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- "
-REQUIRED_USE="
- $(python_gen_useflags 'python2*')
- ${PYTHON_REQUIRED_USE}
- ^^ ( nss cryptopp )
- ?? ( jemalloc tcmalloc )
- "
-
-# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup')
-REQUIRED_USE+=" radosgw"
-
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
- src/erasure-code/jerasure/jerasure
- src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
- "${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch"
- #"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch"
- "${FILESDIR}/${PN}-10.2.1-libzfs.patch"
- "${FILESDIR}/${PN}-10.2.3-build-without-openldap.patch"
-)
-
-check-reqs_export_vars() {
- if use debug; then
- CHECKREQS_DISK_BUILD="23G"
- CHECKREQS_DISK_USR="7G"
- elif use amd64; then
- CHECKREQS_DISK_BUILD="12G"
- CHECKREQS_DISK_USR="450M"
- else
- CHECKREQS_DISK_BUILD="1400M"
- CHECKREQS_DISK_USR="450M"
- fi
-
- export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
- enewgroup ceph ${CEPH_GID}
- enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-emake_python_bindings() {
- local action="${1}" params binding
- shift
- params=("${@}")
-
- __emake_python_bindings_do_impl() {
- emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}"
-
- # these don't work and aren't needed on python3
- if [[ ${EBUILD_PHASE} == install ]] && python_is_python3; then
- rm -f "${ED}/$(python_get_sitedir)"/ceph_{argparse,volume_client}.py
- fi
- }
-
- pushd "${S}/src"
- for binding in rados rbd $(use cephfs && echo cephfs); do
- python_foreach_impl __emake_python_bindings_do_impl
- done
- popd
-
- unset __emake_python_bindings_do_impl
-}
-
-pkg_pretend() {
- check-reqs_export_vars
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- python_setup
- check-reqs_export_vars
- check-reqs_pkg_setup
- user_setup
-}
-
-src_prepare() {
- default
-
- # remove tests that need root access
- rm src/test/cli/ceph-authtool/cap*.t
-
- #rm -rf "${UNBUNDLE_LIBS[@]}"
-
- append-flags -fPIC
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --without-hadoop
- --includedir=/usr/include
- $(use_with cephfs)
- $(use_with debug)
- $(use_with fuse)
- $(use_with libaio)
- $(use_with libatomic libatomic-ops)
- $(use_with nss)
- $(use_with cryptopp)
- $(use_with radosgw)
- $(use_with gtk gtk2)
- $(use_enable static-libs static)
- $(use_with jemalloc)
- $(use_with xfs libxfs)
- $(use_with zfs libzfs)
- $(use_with lttng )
- $(use_with babeltrace)
- $(use_with ldap openldap)
- $(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal")
- --with-mon
- --with-eventfd
- --with-cython
- --without-kinetic
- --without-librocksdb
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- # we can only use python2.7 for building at the moment
- python_setup 'python2*'
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake
- emake_python_bindings all
-
- use test && emake check-local
-}
-
-src_test() {
- make check || die "make check failed"
-}
-
-src_install() {
- default
- emake_python_bindings install-exec "DESTDIR=\"${D}\""
-
- prune_libtool_files --all
-
- exeinto /usr/$(get_libdir)/ceph
- newexe src/init-ceph ceph_init.sh
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}"/ceph.logrotate ${PN}
-
- keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
- fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
- newinitd "${FILESDIR}/rbdmap.initd" rbdmap
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-
- systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
- systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
- systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
-
- udev_dorules udev/*.rules
-
- readme.gentoo_create_doc
-
- python_setup 'python2*'
- python_fix_shebang "${ED}"/usr/{,s}bin/
-
- # python_fix_shebang apparently is not idempotent
- sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
- "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-10.2.5-r3.ebuild b/sys-cluster/ceph/ceph-10.2.5-r3.ebuild
deleted file mode 100644
index b64ba9f1485c..000000000000
--- a/sys-cluster/ceph/ceph-10.2.5-r3.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# 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,5,6}} )
-
-inherit check-reqs autotools eutils python-r1 udev user \
- readme.gentoo-r1 systemd versionator flag-o-matic
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="
- git://github.com/ceph/ceph.git
- https://github.com/ceph/ceph.git"
- SRC_URI=""
-else
- SRC_URI="http://ceph.com/download/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio"
-IUSE+=" libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
- app-arch/snappy
- app-arch/lz4:=
- app-arch/bzip2
- dev-libs/boost:=[threads]
- dev-libs/libaio
- dev-libs/leveldb[snappy]
- nss? ( dev-libs/nss )
- libatomic? ( dev-libs/libatomic_ops )
- cryptopp? ( dev-libs/crypto++:= )
- sys-apps/keyutils
- sys-apps/util-linux
- dev-libs/libxml2
- radosgw? ( dev-libs/fcgi )
- ldap? ( net-nds/openldap )
- babeltrace? ( dev-util/babeltrace )
- fuse? ( sys-fs/fuse )
- xfs? ( sys-fs/xfsprogs )
- zfs? ( sys-fs/zfs )
- gtk? (
- x11-libs/gtk+:2
- dev-cpp/gtkmm:2.4
- gnome-base/librsvg
- )
- radosgw? (
- dev-libs/fcgi
- dev-libs/expat
- net-misc/curl
- )
- jemalloc? ( dev-libs/jemalloc )
- !jemalloc? ( dev-util/google-perftools )
- lttng? ( dev-util/lttng-ust )
- ${PYTHON_DEPS}
- "
-DEPEND="${COMMON_DEPEND}
- dev-python/cython[${PYTHON_USEDEP}]
- app-arch/cpio
- sys-apps/lsb-release
- virtual/pkgconfig
- dev-python/sphinx
- test? (
- sys-fs/btrfs-progs
- sys-apps/grep[pcre]
- dev-python/tox[${PYTHON_USEDEP}]
- dev-python/virtualenv[${PYTHON_USEDEP}]
- )"
-RDEPEND="${COMMON_DEPEND}
- sys-apps/hdparm
- sys-block/parted
- sys-fs/cryptsetup
- sys-apps/gptfdisk
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- "
-REQUIRED_USE="
- $(python_gen_useflags 'python2*')
- ${PYTHON_REQUIRED_USE}
- ^^ ( nss cryptopp )
- ?? ( jemalloc tcmalloc )
- "
-
-# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup')
-REQUIRED_USE+=" radosgw"
-
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
- src/erasure-code/jerasure/jerasure
- src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
- "${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch"
- #"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch"
- "${FILESDIR}/${PN}-10.2.1-libzfs.patch"
- "${FILESDIR}/${PN}-10.2.3-build-without-openldap.patch"
-)
-
-check-reqs_export_vars() {
- if use debug; then
- CHECKREQS_DISK_BUILD="23G"
- CHECKREQS_DISK_USR="7G"
- elif use amd64; then
- CHECKREQS_DISK_BUILD="12G"
- CHECKREQS_DISK_USR="450M"
- else
- CHECKREQS_DISK_BUILD="1400M"
- CHECKREQS_DISK_USR="450M"
- fi
-
- export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
- enewgroup ceph ${CEPH_GID}
- enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-emake_python_bindings() {
- local action="${1}" params binding module
- shift
- params=("${@}")
-
- __emake_python_bindings_do_impl() {
- ceph_run_econf "${EPYTHON}"
- emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}"
-
- # these don't work and aren't needed on python3
- if [[ ${EBUILD_PHASE} == install ]]; then
- for module in "${S}"/src/pybind/*.py; do
- module_basename="$(basename "${module}")"
- if [[ ${module_basename} == ceph_volume_client.py ]] && ! use cephfs; then
- continue
- elif [[ ! -e "${ED}/$(python_get_sitedir)/${module_basename}" ]]; then
- python_domodule ${module}
- fi
- done
- fi
- }
-
- pushd "${S}/src"
- for binding in rados rbd $(use cephfs && echo cephfs); do
- python_foreach_impl __emake_python_bindings_do_impl
- done
- popd
-
- unset __emake_python_bindings_do_impl
-}
-
-pkg_pretend() {
- check-reqs_export_vars
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- python_setup
- check-reqs_export_vars
- check-reqs_pkg_setup
- user_setup
-}
-
-src_prepare() {
- default
-
- # remove tests that need root access
- rm src/test/cli/ceph-authtool/cap*.t
-
- #rm -rf "${UNBUNDLE_LIBS[@]}"
-
- append-flags -fPIC
- eautoreconf
-}
-
-src_configure() {
- ECONFARGS=(
- --without-hadoop
- --includedir=/usr/include
- $(use_with cephfs)
- $(use_with debug)
- $(use_with fuse)
- $(use_with libaio)
- $(use_with libatomic libatomic-ops)
- $(use_with nss)
- $(use_with cryptopp)
- $(use_with radosgw)
- $(use_with gtk gtk2)
- $(use_enable static-libs static)
- $(use_with jemalloc)
- $(use_with xfs libxfs)
- $(use_with zfs libzfs)
- $(use_with lttng )
- $(use_with babeltrace)
- $(use_with ldap openldap)
- $(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal")
- --with-mon
- --with-eventfd
- --with-cython
- --without-kinetic
- --without-librocksdb
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- # we can only use python2.7 for building at the moment
- ceph_run_econf "python2*"
-}
-
-ceph_run_econf() {
- [[ -z ${ECONFARGS} ]] && die "called ${FUNCNAME[0]} with ECONFARGS unset"
- [[ -z ${1} ]] && die "called ${FUNCNAME[0]} without passing python implementation"
-
- pushd "${S}" >/dev/null || die
- #
- # This generates a QA warning about running econf in src_compile
- # and src_install. Unfortunately the only other way to do this would
- # involve building all of for each python implementation times, which
- # wastes a _lot_ of CPU time and disk space. This hack will no longer
- # be needed with >=ceph-11.2.
- #
- python_setup "${1}"
- econf "${ECONFARGS[@]}"
-
- popd >/dev/null || die
-}
-
-src_compile() {
- emake
- emake_python_bindings all
-
- use test && emake check-local
-}
-
-src_test() {
- make check || die "make check failed"
-}
-
-src_install() {
- default
- emake_python_bindings install-exec "DESTDIR=\"${D}\""
-
- prune_libtool_files --all
-
- exeinto /usr/$(get_libdir)/ceph
- newexe src/init-ceph ceph_init.sh
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}"/ceph.logrotate ${PN}
-
- keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
- fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
- newinitd "${FILESDIR}/rbdmap.initd" rbdmap
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-
- systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
- systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
- systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
-
- udev_dorules udev/*.rules
-
- readme.gentoo_create_doc
-
- python_setup 'python2*'
- python_fix_shebang "${ED}"/usr/{,s}bin/
-
- # python_fix_shebang apparently is not idempotent
- sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
- "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-10.2.5-r4.ebuild b/sys-cluster/ceph/ceph-10.2.5-r4.ebuild
deleted file mode 100644
index 2cac94d409d1..000000000000
--- a/sys-cluster/ceph/ceph-10.2.5-r4.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# 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,5,6}} )
-
-inherit check-reqs autotools eutils python-r1 udev user \
- readme.gentoo-r1 systemd versionator flag-o-matic
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="
- git://github.com/ceph/ceph.git
- https://github.com/ceph/ceph.git"
- SRC_URI=""
-else
- SRC_URI="http://ceph.com/download/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio"
-IUSE+=" libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
- app-arch/snappy
- app-arch/lz4:=
- app-arch/bzip2
- dev-libs/boost:=[threads]
- dev-libs/libaio
- dev-libs/leveldb[snappy]
- nss? ( dev-libs/nss )
- libatomic? ( dev-libs/libatomic_ops )
- cryptopp? ( dev-libs/crypto++:= )
- sys-apps/keyutils
- sys-apps/util-linux
- dev-libs/libxml2
- radosgw? ( dev-libs/fcgi )
- ldap? ( net-nds/openldap )
- babeltrace? ( dev-util/babeltrace )
- fuse? ( sys-fs/fuse )
- xfs? ( sys-fs/xfsprogs )
- zfs? ( sys-fs/zfs )
- gtk? (
- x11-libs/gtk+:2
- dev-cpp/gtkmm:2.4
- gnome-base/librsvg
- )
- radosgw? (
- dev-libs/fcgi
- dev-libs/expat
- net-misc/curl
- )
- jemalloc? ( dev-libs/jemalloc )
- !jemalloc? ( dev-util/google-perftools )
- lttng? ( dev-util/lttng-ust )
- ${PYTHON_DEPS}
- "
-DEPEND="${COMMON_DEPEND}
- dev-python/cython[${PYTHON_USEDEP}]
- app-arch/cpio
- sys-apps/lsb-release
- virtual/pkgconfig
- dev-python/sphinx
- test? (
- sys-fs/btrfs-progs
- sys-apps/grep[pcre]
- dev-python/tox[${PYTHON_USEDEP}]
- dev-python/virtualenv[${PYTHON_USEDEP}]
- )"
-RDEPEND="${COMMON_DEPEND}
- sys-apps/hdparm
- sys-block/parted
- sys-fs/cryptsetup
- sys-apps/gptfdisk
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- "
-REQUIRED_USE="
- $(python_gen_useflags 'python2*')
- ${PYTHON_REQUIRED_USE}
- ^^ ( nss cryptopp )
- ?? ( jemalloc tcmalloc )
- "
-
-# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup')
-REQUIRED_USE+=" radosgw"
-
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
- src/erasure-code/jerasure/jerasure
- src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
- "${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch"
- #"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch"
- "${FILESDIR}/${PN}-10.2.1-libzfs.patch"
- "${FILESDIR}/${PN}-10.2.3-build-without-openldap.patch"
- "${FILESDIR}/${PN}-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch"
- "${FILESDIR}/${PN}-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch"
-)
-
-check-reqs_export_vars() {
- if use debug; then
- CHECKREQS_DISK_BUILD="23G"
- CHECKREQS_DISK_USR="7G"
- elif use amd64; then
- CHECKREQS_DISK_BUILD="12G"
- CHECKREQS_DISK_USR="450M"
- else
- CHECKREQS_DISK_BUILD="1400M"
- CHECKREQS_DISK_USR="450M"
- fi
-
- export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
- enewgroup ceph ${CEPH_GID}
- enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-emake_python_bindings() {
- local action="${1}" params binding module
- shift
- params=("${@}")
-
- __emake_python_bindings_do_impl() {
- ceph_run_econf "${EPYTHON}"
- emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}"
-
- # these don't work and aren't needed on python3
- if [[ ${EBUILD_PHASE} == install ]]; then
- for module in "${S}"/src/pybind/*.py; do
- module_basename="$(basename "${module}")"
- if [[ ${module_basename} == ceph_volume_client.py ]] && ! use cephfs; then
- continue
- elif [[ ! -e "${ED}/$(python_get_sitedir)/${module_basename}" ]]; then
- python_domodule ${module}
- fi
- done
- fi
- }
-
- pushd "${S}/src"
- for binding in rados rbd $(use cephfs && echo cephfs); do
- python_foreach_impl __emake_python_bindings_do_impl
- done
- popd
-
- unset __emake_python_bindings_do_impl
-}
-
-pkg_pretend() {
- check-reqs_export_vars
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- python_setup
- check-reqs_export_vars
- check-reqs_pkg_setup
- user_setup
-}
-
-src_prepare() {
- default
-
- # remove tests that need root access
- rm src/test/cli/ceph-authtool/cap*.t
-
- #rm -rf "${UNBUNDLE_LIBS[@]}"
-
- append-flags -fPIC
- eautoreconf
-}
-
-src_configure() {
- ECONFARGS=(
- --without-hadoop
- --includedir=/usr/include
- $(use_with cephfs)
- $(use_with debug)
- $(use_with fuse)
- $(use_with libaio)
- $(use_with libatomic libatomic-ops)
- $(use_with nss)
- $(use_with cryptopp)
- $(use_with radosgw)
- $(use_with gtk gtk2)
- $(use_enable static-libs static)
- $(use_with jemalloc)
- $(use_with xfs libxfs)
- $(use_with zfs libzfs)
- $(use_with lttng )
- $(use_with babeltrace)
- $(use_with ldap openldap)
- $(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal")
- --with-mon
- --with-eventfd
- --with-cython
- --without-kinetic
- --without-librocksdb
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- # we can only use python2.7 for building at the moment
- ceph_run_econf "python2*"
-}
-
-ceph_run_econf() {
- [[ -z ${ECONFARGS} ]] && die "called ${FUNCNAME[0]} with ECONFARGS unset"
- [[ -z ${1} ]] && die "called ${FUNCNAME[0]} without passing python implementation"
-
- pushd "${S}" >/dev/null || die
- #
- # This generates a QA warning about running econf in src_compile
- # and src_install. Unfortunately the only other way to do this would
- # involve building all of for each python implementation times, which
- # wastes a _lot_ of CPU time and disk space. This hack will no longer
- # be needed with >=ceph-11.2.
- #
- python_setup "${1}"
- econf "${ECONFARGS[@]}"
-
- popd >/dev/null || die
-}
-
-src_compile() {
- emake
- emake_python_bindings all
-
- use test && emake check-local
-}
-
-src_test() {
- make check || die "make check failed"
-}
-
-src_install() {
- default
- emake_python_bindings install-exec "DESTDIR=\"${D}\""
-
- prune_libtool_files --all
-
- exeinto /usr/$(get_libdir)/ceph
- newexe src/init-ceph ceph_init.sh
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}"/ceph.logrotate ${PN}
-
- keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
- fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
- newinitd "${FILESDIR}/rbdmap.initd" rbdmap
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-
- systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
- systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
- systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
-
- udev_dorules udev/*.rules
-
- readme.gentoo_create_doc
-
- python_setup 'python2*'
- python_fix_shebang "${ED}"/usr/{,s}bin/
-
- # python_fix_shebang apparently is not idempotent
- sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
- "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-10.2.5-r5.ebuild b/sys-cluster/ceph/ceph-10.2.5-r5.ebuild
deleted file mode 100644
index 6a70d39196b7..000000000000
--- a/sys-cluster/ceph/ceph-10.2.5-r5.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# 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,5,6}} )
-
-inherit check-reqs autotools eutils python-r1 udev user \
- readme.gentoo-r1 systemd versionator flag-o-matic
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="
- git://github.com/ceph/ceph.git
- https://github.com/ceph/ceph.git"
- SRC_URI=""
-else
- SRC_URI="http://ceph.com/download/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio"
-IUSE+=" libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
- app-arch/snappy
- app-arch/lz4:=
- app-arch/bzip2
- dev-libs/boost:=[threads]
- dev-libs/libaio
- dev-libs/leveldb[snappy]
- nss? ( dev-libs/nss )
- libatomic? ( dev-libs/libatomic_ops )
- cryptopp? ( dev-libs/crypto++:= )
- sys-apps/keyutils
- sys-apps/util-linux
- dev-libs/libxml2
- radosgw? ( dev-libs/fcgi )
- ldap? ( net-nds/openldap )
- babeltrace? ( dev-util/babeltrace )
- fuse? ( sys-fs/fuse )
- xfs? ( sys-fs/xfsprogs )
- zfs? ( sys-fs/zfs )
- gtk? (
- x11-libs/gtk+:2
- dev-cpp/gtkmm:2.4
- gnome-base/librsvg
- )
- radosgw? (
- dev-libs/fcgi
- dev-libs/expat
- net-misc/curl
- )
- jemalloc? ( dev-libs/jemalloc )
- !jemalloc? ( dev-util/google-perftools )
- lttng? ( dev-util/lttng-ust )
- ${PYTHON_DEPS}
- "
-DEPEND="${COMMON_DEPEND}
- dev-python/cython[${PYTHON_USEDEP}]
- app-arch/cpio
- sys-apps/lsb-release
- virtual/pkgconfig
- dev-python/sphinx
- test? (
- sys-fs/btrfs-progs
- sys-apps/grep[pcre]
- dev-python/tox[${PYTHON_USEDEP}]
- dev-python/virtualenv[${PYTHON_USEDEP}]
- )"
-RDEPEND="${COMMON_DEPEND}
- sys-apps/hdparm
- sys-block/parted
- sys-fs/cryptsetup
- sys-apps/gptfdisk
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- "
-REQUIRED_USE="
- $(python_gen_useflags 'python2*')
- ${PYTHON_REQUIRED_USE}
- ^^ ( nss cryptopp )
- ?? ( jemalloc tcmalloc )
- "
-
-# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup')
-REQUIRED_USE+=" radosgw"
-
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
- src/erasure-code/jerasure/jerasure
- src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
- "${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch"
- #"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch"
- "${FILESDIR}/${PN}-10.2.1-libzfs.patch"
- "${FILESDIR}/${PN}-10.2.3-build-without-openldap.patch"
- "${FILESDIR}/${PN}-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch"
- "${FILESDIR}/${PN}-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch"
-)
-
-check-reqs_export_vars() {
- if use debug; then
- CHECKREQS_DISK_BUILD="23G"
- CHECKREQS_DISK_USR="7G"
- elif use amd64; then
- CHECKREQS_DISK_BUILD="12G"
- CHECKREQS_DISK_USR="450M"
- else
- CHECKREQS_DISK_BUILD="1400M"
- CHECKREQS_DISK_USR="450M"
- fi
-
- export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
- enewgroup ceph ${CEPH_GID}
- enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-emake_python_bindings() {
- local action="${1}" params binding module
- shift
- params=("${@}")
-
- __emake_python_bindings_do_impl() {
- ceph_run_econf "${EPYTHON}"
- emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}"
-
- # these don't work and aren't needed on python3
- if [[ ${EBUILD_PHASE} == install ]]; then
- for module in "${S}"/src/pybind/*.py; do
- module_basename="$(basename "${module}")"
- if [[ ${module_basename} == ceph_volume_client.py ]] && ! use cephfs; then
- continue
- elif [[ ! -e "${ED}/$(python_get_sitedir)/${module_basename}" ]]; then
- python_domodule ${module}
- fi
- done
- fi
- }
-
- pushd "${S}/src"
- for binding in rados rbd $(use cephfs && echo cephfs); do
- python_foreach_impl __emake_python_bindings_do_impl
- done
- popd
-
- unset __emake_python_bindings_do_impl
-}
-
-pkg_pretend() {
- check-reqs_export_vars
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- python_setup
- check-reqs_export_vars
- check-reqs_pkg_setup
- user_setup
-}
-
-src_prepare() {
- default
-
- # remove tests that need root access
- rm src/test/cli/ceph-authtool/cap*.t
-
- #rm -rf "${UNBUNDLE_LIBS[@]}"
-
- append-flags -fPIC
- eautoreconf
-}
-
-src_configure() {
- ECONFARGS=(
- --without-hadoop
- --includedir=/usr/include
- $(use_with cephfs)
- $(use_with debug)
- $(use_with fuse)
- $(use_with libaio)
- $(use_with libatomic libatomic-ops)
- $(use_with nss)
- $(use_with cryptopp)
- $(use_with radosgw)
- $(use_with gtk gtk2)
- $(use_enable static-libs static)
- $(use_with jemalloc)
- $(use_with xfs libxfs)
- $(use_with zfs libzfs)
- $(use_with lttng )
- $(use_with babeltrace)
- $(use_with ldap openldap)
- $(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal")
- --with-mon
- --with-eventfd
- --with-cython
- --without-kinetic
- --without-librocksdb
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- # we can only use python2.7 for building at the moment
- ceph_run_econf "python2*"
-}
-
-ceph_run_econf() {
- [[ -z ${ECONFARGS} ]] && die "called ${FUNCNAME[0]} with ECONFARGS unset"
- [[ -z ${1} ]] && die "called ${FUNCNAME[0]} without passing python implementation"
-
- pushd "${S}" >/dev/null || die
- #
- # This generates a QA warning about running econf in src_compile
- # and src_install. Unfortunately the only other way to do this would
- # involve building all of for each python implementation times, which
- # wastes a _lot_ of CPU time and disk space. This hack will no longer
- # be needed with >=ceph-11.2.
- #
- python_setup "${1}"
- econf "${ECONFARGS[@]}"
-
- popd >/dev/null || die
-}
-
-src_compile() {
- emake
- emake_python_bindings all
-
- use test && emake check-local
-}
-
-src_test() {
- make check || die "make check failed"
-}
-
-src_install() {
- default
- emake_python_bindings install-exec "DESTDIR=\"${D}\""
-
- prune_libtool_files --all
-
- exeinto /usr/$(get_libdir)/ceph
- newexe src/init-ceph ceph_init.sh
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}"/ceph.logrotate ${PN}
-
- keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
- fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
- newinitd "${FILESDIR}/rbdmap.initd" rbdmap
- newinitd "${FILESDIR}/${PN}.initd-r4" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
-
- systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
- systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
- systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
-
- udev_dorules udev/*.rules
-
- readme.gentoo_create_doc
-
- python_setup 'python2*'
- python_fix_shebang "${ED}"/usr/{,s}bin/
-
- # python_fix_shebang apparently is not idempotent
- sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
- "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-10.2.6-r1.ebuild b/sys-cluster/ceph/ceph-10.2.6-r1.ebuild
deleted file mode 100644
index a0c131b17835..000000000000
--- a/sys-cluster/ceph/ceph-10.2.6-r1.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# 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,5,6}} )
-
-inherit check-reqs autotools eutils python-r1 udev user \
- readme.gentoo-r1 systemd versionator flag-o-matic
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="
- git://github.com/ceph/ceph.git
- https://github.com/ceph/ceph.git"
- SRC_URI=""
-else
- SRC_URI="http://download.ceph.com/tarballs/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio"
-IUSE+=" libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
- app-arch/snappy
- app-arch/lz4:=
- app-arch/bzip2
- dev-libs/boost:=[threads]
- dev-libs/libaio
- dev-libs/leveldb[snappy]
- nss? ( dev-libs/nss )
- libatomic? ( dev-libs/libatomic_ops )
- cryptopp? ( dev-libs/crypto++:= )
- sys-apps/keyutils
- sys-apps/util-linux
- dev-libs/libxml2
- radosgw? ( dev-libs/fcgi )
- ldap? ( net-nds/openldap )
- babeltrace? ( dev-util/babeltrace )
- fuse? ( sys-fs/fuse )
- xfs? ( sys-fs/xfsprogs )
- zfs? ( sys-fs/zfs )
- gtk? (
- x11-libs/gtk+:2
- dev-cpp/gtkmm:2.4
- gnome-base/librsvg
- )
- radosgw? (
- dev-libs/fcgi
- dev-libs/expat
- net-misc/curl
- )
- jemalloc? ( dev-libs/jemalloc )
- !jemalloc? ( dev-util/google-perftools )
- lttng? ( dev-util/lttng-ust )
- ${PYTHON_DEPS}
- "
-DEPEND="${COMMON_DEPEND}
- dev-python/cython[${PYTHON_USEDEP}]
- app-arch/cpio
- virtual/pkgconfig
- dev-python/sphinx
- test? (
- sys-fs/btrfs-progs
- sys-apps/grep[pcre]
- dev-python/tox[${PYTHON_USEDEP}]
- dev-python/virtualenv[${PYTHON_USEDEP}]
- )"
-RDEPEND="${COMMON_DEPEND}
- sys-apps/hdparm
- sys-block/parted
- sys-fs/cryptsetup
- sys-apps/gptfdisk
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- "
-REQUIRED_USE="
- $(python_gen_useflags 'python2*')
- ${PYTHON_REQUIRED_USE}
- ^^ ( nss cryptopp )
- ?? ( jemalloc tcmalloc )
- "
-
-# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup')
-REQUIRED_USE+=" radosgw"
-
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
- src/erasure-code/jerasure/jerasure
- src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
- "${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch"
- #"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch"
- "${FILESDIR}/${PN}-10.2.1-libzfs.patch"
- "${FILESDIR}/${PN}-10.2.3-build-without-openldap.patch"
- "${FILESDIR}/${PN}-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch"
- "${FILESDIR}/${PN}-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch"
- "${FILESDIR}/${PN}-10.2.6-radosgw-swift-clean-up-flush-newline-behavior.patch"
-)
-
-check-reqs_export_vars() {
- if use debug; then
- CHECKREQS_DISK_BUILD="23G"
- CHECKREQS_DISK_USR="7G"
- elif use amd64; then
- CHECKREQS_DISK_BUILD="12G"
- CHECKREQS_DISK_USR="450M"
- else
- CHECKREQS_DISK_BUILD="1400M"
- CHECKREQS_DISK_USR="450M"
- fi
-
- export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
- enewgroup ceph ${CEPH_GID}
- enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-emake_python_bindings() {
- local action="${1}" params binding module
- shift
- params=("${@}")
-
- __emake_python_bindings_do_impl() {
- ceph_run_econf "${EPYTHON}"
- emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}"
-
- # these don't work and aren't needed on python3
- if [[ ${EBUILD_PHASE} == install ]]; then
- for module in "${S}"/src/pybind/*.py; do
- module_basename="$(basename "${module}")"
- if [[ ${module_basename} == ceph_volume_client.py ]] && ! use cephfs; then
- continue
- elif [[ ! -e "${ED}/$(python_get_sitedir)/${module_basename}" ]]; then
- python_domodule ${module}
- fi
- done
- fi
- }
-
- pushd "${S}/src"
- for binding in rados rbd $(use cephfs && echo cephfs); do
- python_foreach_impl __emake_python_bindings_do_impl
- done
- popd
-
- unset __emake_python_bindings_do_impl
-}
-
-pkg_pretend() {
- check-reqs_export_vars
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- python_setup
- check-reqs_export_vars
- check-reqs_pkg_setup
- user_setup
-}
-
-src_prepare() {
- default
-
- # remove tests that need root access
- rm src/test/cli/ceph-authtool/cap*.t
-
- #rm -rf "${UNBUNDLE_LIBS[@]}"
-
- append-flags -fPIC
- eautoreconf
-}
-
-src_configure() {
- ECONFARGS=(
- --without-hadoop
- --includedir=/usr/include
- $(use_with cephfs)
- $(use_with debug)
- $(use_with fuse)
- $(use_with libaio)
- $(use_with libatomic libatomic-ops)
- $(use_with nss)
- $(use_with cryptopp)
- $(use_with radosgw)
- $(use_with gtk gtk2)
- $(use_enable static-libs static)
- $(use_with jemalloc)
- $(use_with xfs libxfs)
- $(use_with zfs libzfs)
- $(use_with lttng )
- $(use_with babeltrace)
- $(use_with ldap openldap)
- $(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal")
- --with-mon
- --with-eventfd
- --with-cython
- --without-kinetic
- --without-librocksdb
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- # we can only use python2.7 for building at the moment
- ceph_run_econf "python2*"
-}
-
-ceph_run_econf() {
- [[ -z ${ECONFARGS} ]] && die "called ${FUNCNAME[0]} with ECONFARGS unset"
- [[ -z ${1} ]] && die "called ${FUNCNAME[0]} without passing python implementation"
-
- pushd "${S}" >/dev/null || die
- #
- # This generates a QA warning about running econf in src_compile
- # and src_install. Unfortunately the only other way to do this would
- # involve building all of for each python implementation times, which
- # wastes a _lot_ of CPU time and disk space. This hack will no longer
- # be needed with >=ceph-11.2.
- #
- python_setup "${1}"
- econf "${ECONFARGS[@]}"
-
- popd >/dev/null || die
-}
-
-src_compile() {
- emake
- emake_python_bindings all
-
- use test && emake check-local
-}
-
-src_test() {
- make check || die "make check failed"
-}
-
-src_install() {
- default
- emake_python_bindings install-exec "DESTDIR=\"${D}\""
-
- prune_libtool_files --all
-
- exeinto /usr/$(get_libdir)/ceph
- newexe src/init-ceph ceph_init.sh
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}"/ceph.logrotate ${PN}
-
- keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
- fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
- newinitd "${FILESDIR}/rbdmap.initd" rbdmap
- newinitd "${FILESDIR}/${PN}.initd-r4" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
-
- systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
- systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
- systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
-
- udev_dorules udev/*.rules
-
- readme.gentoo_create_doc
-
- python_setup 'python2*'
- python_fix_shebang "${ED}"/usr/{,s}bin/
-
- # python_fix_shebang apparently is not idempotent
- sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
- "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-10.2.6.ebuild b/sys-cluster/ceph/ceph-10.2.6.ebuild
deleted file mode 100644
index ac3fbe53c5a9..000000000000
--- a/sys-cluster/ceph/ceph-10.2.6.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# 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,5,6}} )
-
-inherit check-reqs autotools eutils python-r1 udev user \
- readme.gentoo-r1 systemd versionator flag-o-matic
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="
- git://github.com/ceph/ceph.git
- https://github.com/ceph/ceph.git"
- SRC_URI=""
-else
- SRC_URI="http://download.ceph.com/tarballs/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio"
-IUSE+=" libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
- app-arch/snappy
- app-arch/lz4:=
- app-arch/bzip2
- dev-libs/boost:=[threads]
- dev-libs/libaio
- dev-libs/leveldb[snappy]
- nss? ( dev-libs/nss )
- libatomic? ( dev-libs/libatomic_ops )
- cryptopp? ( dev-libs/crypto++:= )
- sys-apps/keyutils
- sys-apps/util-linux
- dev-libs/libxml2
- radosgw? ( dev-libs/fcgi )
- ldap? ( net-nds/openldap )
- babeltrace? ( dev-util/babeltrace )
- fuse? ( sys-fs/fuse )
- xfs? ( sys-fs/xfsprogs )
- zfs? ( sys-fs/zfs )
- gtk? (
- x11-libs/gtk+:2
- dev-cpp/gtkmm:2.4
- gnome-base/librsvg
- )
- radosgw? (
- dev-libs/fcgi
- dev-libs/expat
- net-misc/curl
- )
- jemalloc? ( dev-libs/jemalloc )
- !jemalloc? ( dev-util/google-perftools )
- lttng? ( dev-util/lttng-ust )
- ${PYTHON_DEPS}
- "
-DEPEND="${COMMON_DEPEND}
- dev-python/cython[${PYTHON_USEDEP}]
- app-arch/cpio
- virtual/pkgconfig
- dev-python/sphinx
- test? (
- sys-fs/btrfs-progs
- sys-apps/grep[pcre]
- dev-python/tox[${PYTHON_USEDEP}]
- dev-python/virtualenv[${PYTHON_USEDEP}]
- )"
-RDEPEND="${COMMON_DEPEND}
- sys-apps/hdparm
- sys-block/parted
- sys-fs/cryptsetup
- sys-apps/gptfdisk
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- "
-REQUIRED_USE="
- $(python_gen_useflags 'python2*')
- ${PYTHON_REQUIRED_USE}
- ^^ ( nss cryptopp )
- ?? ( jemalloc tcmalloc )
- "
-
-# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup')
-REQUIRED_USE+=" radosgw"
-
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
- src/erasure-code/jerasure/jerasure
- src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
- "${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch"
- #"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch"
- "${FILESDIR}/${PN}-10.2.1-libzfs.patch"
- "${FILESDIR}/${PN}-10.2.3-build-without-openldap.patch"
- "${FILESDIR}/${PN}-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch"
- "${FILESDIR}/${PN}-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch"
- "${FILESDIR}/${PN}-10.2.6-radosgw-swift-clean-up-flush-newline-behavior.patch"
-)
-
-check-reqs_export_vars() {
- if use debug; then
- CHECKREQS_DISK_BUILD="23G"
- CHECKREQS_DISK_USR="7G"
- elif use amd64; then
- CHECKREQS_DISK_BUILD="12G"
- CHECKREQS_DISK_USR="450M"
- else
- CHECKREQS_DISK_BUILD="1400M"
- CHECKREQS_DISK_USR="450M"
- fi
-
- export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
- enewgroup ceph ${CEPH_GID}
- enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-emake_python_bindings() {
- local action="${1}" params binding module
- shift
- params=("${@}")
-
- __emake_python_bindings_do_impl() {
- ceph_run_econf "${EPYTHON}"
- emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}"
-
- # these don't work and aren't needed on python3
- if [[ ${EBUILD_PHASE} == install ]]; then
- for module in "${S}"/src/pybind/*.py; do
- module_basename="$(basename "${module}")"
- if [[ ${module_basename} == ceph_volume_client.py ]] && ! use cephfs; then
- continue
- elif [[ ! -e "${ED}/$(python_get_sitedir)/${module_basename}" ]]; then
- python_domodule ${module}
- fi
- done
- fi
- }
-
- pushd "${S}/src"
- for binding in rados rbd $(use cephfs && echo cephfs); do
- python_foreach_impl __emake_python_bindings_do_impl
- done
- popd
-
- unset __emake_python_bindings_do_impl
-}
-
-pkg_pretend() {
- check-reqs_export_vars
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- python_setup
- check-reqs_export_vars
- check-reqs_pkg_setup
- user_setup
-}
-
-src_prepare() {
- default
-
- # remove tests that need root access
- rm src/test/cli/ceph-authtool/cap*.t
-
- #rm -rf "${UNBUNDLE_LIBS[@]}"
-
- append-flags -fPIC
- eautoreconf
-}
-
-src_configure() {
- ECONFARGS=(
- --without-hadoop
- --includedir=/usr/include
- $(use_with cephfs)
- $(use_with debug)
- $(use_with fuse)
- $(use_with libaio)
- $(use_with libatomic libatomic-ops)
- $(use_with nss)
- $(use_with cryptopp)
- $(use_with radosgw)
- $(use_with gtk gtk2)
- $(use_enable static-libs static)
- $(use_with jemalloc)
- $(use_with xfs libxfs)
- $(use_with zfs libzfs)
- $(use_with lttng )
- $(use_with babeltrace)
- $(use_with ldap openldap)
- $(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal")
- --with-mon
- --with-eventfd
- --with-cython
- --without-kinetic
- --without-librocksdb
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- # we can only use python2.7 for building at the moment
- ceph_run_econf "python2*"
-}
-
-ceph_run_econf() {
- [[ -z ${ECONFARGS} ]] && die "called ${FUNCNAME[0]} with ECONFARGS unset"
- [[ -z ${1} ]] && die "called ${FUNCNAME[0]} without passing python implementation"
-
- pushd "${S}" >/dev/null || die
- #
- # This generates a QA warning about running econf in src_compile
- # and src_install. Unfortunately the only other way to do this would
- # involve building all of for each python implementation times, which
- # wastes a _lot_ of CPU time and disk space. This hack will no longer
- # be needed with >=ceph-11.2.
- #
- python_setup "${1}"
- econf "${ECONFARGS[@]}"
-
- popd >/dev/null || die
-}
-
-src_compile() {
- emake
- emake_python_bindings all
-
- use test && emake check-local
-}
-
-src_test() {
- make check || die "make check failed"
-}
-
-src_install() {
- default
- emake_python_bindings install-exec "DESTDIR=\"${D}\""
-
- prune_libtool_files --all
-
- exeinto /usr/$(get_libdir)/ceph
- newexe src/init-ceph ceph_init.sh
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}"/ceph.logrotate ${PN}
-
- keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
- fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
- newinitd "${FILESDIR}/rbdmap.initd" rbdmap
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-
- systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
- systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
- systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
-
- udev_dorules udev/*.rules
-
- readme.gentoo_create_doc
-
- python_setup 'python2*'
- python_fix_shebang "${ED}"/usr/{,s}bin/
-
- # python_fix_shebang apparently is not idempotent
- sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
- "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-10.2.7-r1.ebuild b/sys-cluster/ceph/ceph-10.2.7-r1.ebuild
index 49d487487729..089ebfd6a983 100644
--- a/sys-cluster/ceph/ceph-10.2.7-r1.ebuild
+++ b/sys-cluster/ceph/ceph-10.2.7-r1.ebuild
@@ -48,7 +48,7 @@ COMMON_DEPEND="
radosgw? ( dev-libs/fcgi:= )
ldap? ( net-nds/openldap:= )
babeltrace? ( dev-util/babeltrace )
- fuse? ( sys-fs/fuse:= )
+ fuse? ( sys-fs/fuse:0= )
xfs? ( sys-fs/xfsprogs:= )
zfs? ( sys-fs/zfs:= )
gtk? (
@@ -276,7 +276,6 @@ src_install() {
systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
- systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
udev_dorules udev/*.rules
diff --git a/sys-cluster/ceph/ceph-10.2.8.ebuild b/sys-cluster/ceph/ceph-10.2.8.ebuild
index c4e36e3930a7..1dff5e6b0d14 100644
--- a/sys-cluster/ceph/ceph-10.2.8.ebuild
+++ b/sys-cluster/ceph/ceph-10.2.8.ebuild
@@ -48,7 +48,7 @@ COMMON_DEPEND="
radosgw? ( dev-libs/fcgi:= )
ldap? ( net-nds/openldap:= )
babeltrace? ( dev-util/babeltrace )
- fuse? ( sys-fs/fuse:= )
+ fuse? ( sys-fs/fuse:0= )
xfs? ( sys-fs/xfsprogs:= )
zfs? ( sys-fs/zfs:= )
gtk? (
@@ -276,7 +276,6 @@ src_install() {
systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
- systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
udev_dorules udev/*.rules
diff --git a/sys-cluster/ceph/ceph-10.2.7.ebuild b/sys-cluster/ceph/ceph-10.2.9.ebuild
similarity index 90%
rename from sys-cluster/ceph/ceph-10.2.7.ebuild
rename to sys-cluster/ceph/ceph-10.2.9.ebuild
index 35d1dad1bc95..1dff5e6b0d14 100644
--- a/sys-cluster/ceph/ceph-10.2.7.ebuild
+++ b/sys-cluster/ceph/ceph-10.2.9.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
SRC_URI=""
else
SRC_URI="http://download.ceph.com/tarballs/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
DESCRIPTION="Ceph distributed filesystem"
@@ -31,37 +31,39 @@ IUSE+=" libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs"
#>=dev-libs/jerasure-2.0.0-r1
#>=dev-libs/gf-complete-2.0.0
COMMON_DEPEND="
- app-arch/snappy
+ app-arch/snappy:=
+ sys-libs/zlib:=
app-arch/lz4:=
- app-arch/bzip2
+ app-arch/bzip2:=
+ app-arch/zstd:=
dev-libs/boost:=[threads]
- dev-libs/libaio
- dev-libs/leveldb[snappy]
- nss? ( dev-libs/nss )
- libatomic? ( dev-libs/libatomic_ops )
+ dev-libs/libaio:=
+ dev-libs/leveldb:=[snappy]
+ nss? ( dev-libs/nss:= )
+ libatomic? ( dev-libs/libatomic_ops:= )
cryptopp? ( dev-libs/crypto++:= )
sys-apps/keyutils
sys-apps/util-linux
- dev-libs/libxml2
- radosgw? ( dev-libs/fcgi )
- ldap? ( net-nds/openldap )
+ dev-libs/libxml2:=
+ radosgw? ( dev-libs/fcgi:= )
+ ldap? ( net-nds/openldap:= )
babeltrace? ( dev-util/babeltrace )
- fuse? ( sys-fs/fuse )
- xfs? ( sys-fs/xfsprogs )
- zfs? ( sys-fs/zfs )
+ fuse? ( sys-fs/fuse:0= )
+ xfs? ( sys-fs/xfsprogs:= )
+ zfs? ( sys-fs/zfs:= )
gtk? (
- x11-libs/gtk+:2
+ x11-libs/gtk+:2=
dev-cpp/gtkmm:2.4
- gnome-base/librsvg
+ gnome-base/librsvg:=
)
radosgw? (
- dev-libs/fcgi
- dev-libs/expat
- net-misc/curl
+ dev-libs/fcgi:=
+ dev-libs/expat:=
+ net-misc/curl:=
)
- jemalloc? ( dev-libs/jemalloc )
+ jemalloc? ( dev-libs/jemalloc:= )
!jemalloc? ( dev-util/google-perftools )
- lttng? ( dev-util/lttng-ust )
+ lttng? ( dev-util/lttng-ust:= )
${PYTHON_DEPS}
"
DEPEND="${COMMON_DEPEND}
@@ -112,6 +114,7 @@ PATCHES=(
"${FILESDIR}/${PN}-10.2.3-build-without-openldap.patch"
"${FILESDIR}/${PN}-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch"
"${FILESDIR}/${PN}-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch"
+ "${FILESDIR}/${PN}-10.2.7-fix-compilation-with-zstd.patch"
)
check-reqs_export_vars() {
@@ -268,12 +271,11 @@ src_install() {
fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
newinitd "${FILESDIR}/rbdmap.initd" rbdmap
- newinitd "${FILESDIR}/${PN}.initd-r4" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd-r5" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
- systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
udev_dorules udev/*.rules
diff --git a/sys-cluster/ceph/ceph-9.2.1-r2.ebuild b/sys-cluster/ceph/ceph-9.2.1-r2.ebuild
index e4512579227e..a77b780b22c4 100644
--- a/sys-cluster/ceph/ceph-9.2.1-r2.ebuild
+++ b/sys-cluster/ceph/ceph-9.2.1-r2.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
@@ -37,7 +37,7 @@ COMMON_DEPEND="
sys-apps/util-linux
dev-libs/libxml2
babeltrace? ( dev-util/babeltrace )
- fuse? ( sys-fs/fuse )
+ fuse? ( sys-fs/fuse:0 )
libatomic? ( dev-libs/libatomic_ops )
xfs? ( sys-fs/xfsprogs )
zfs? ( sys-fs/zfs )
@@ -174,7 +174,6 @@ src_install() {
systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
- systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
python_fix_shebang \
"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
diff --git a/sys-cluster/ceph/files/ceph-mon_at.service.conf b/sys-cluster/ceph/files/ceph-mon_at.service.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/sys-cluster/ceph/files/ceph.initd-r1 b/sys-cluster/ceph/files/ceph.initd-r1
deleted file mode 100644
index 3fac993b473c..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r1
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-type=${RC_SVCNAME:5:3}
-id=${RC_SVCNAME:9}
-id=${id:-"0"}
-command="/usr/bin/ceph-${type}"
-pidfile="/run/ceph/${type}.${id}.pid"
-command_args="-i ${id} --pid-file ${pidfile} -c ${ceph_conf}"
-
-depend() {
- after net ntpd ntp-client chronyd
- before netmount
-}
-
-is_type_valid() {
- case ${type} in
- mon|mds|osd) return 0;;
- *) return 1;;
- esac
-}
-
-start_pre() {
- checkpath -d -q -o ceph $(dirname ${pidfile})
-}
-
-start() {
- ebegin "Starting Ceph ${type}.${id}"
- if ! is_type_valid ;then
- eerror "Please give valid Ceph Server Type: mds, mon, osd"
- return 1
- fi
- start-stop-daemon --start -exec ${command} --user ceph --group ceph -- ${command_args}
- eend $?
-}
-
-stop() {
- ebegin "Stopping Ceph ${type}.${id}"
- start-stop-daemon --stop --user ceph --group ceph --pidfile ${pidfile}
- eend $?
-}
-
-reload() {
- ebegin "Reloading Ceph ${type}.${id}"
- start-stop-daemon --signal 1 --user ceph --group ceph --pidfile ${pidfile}
- eend $?
-}
diff --git a/sys-cluster/ceph/files/ceph.initd-r3 b/sys-cluster/ceph/files/ceph.initd-r3
deleted file mode 100644
index 9476aa9191ab..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r3
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-command="/usr/bin/ceph-${daemon_type}"
-pidfile="/run/ceph/${daemon_type}.${daemon_id}.pid"
-command_args="-i ${daemon_id} --pid-file ${pidfile} -c ${ceph_conf}"
-start_stop_daemon_args="--user ceph --group ceph"
-
-depend() {
- after net ntpd ntp-client chronyd
- before netmount
-}
-
-is_type_valid() {
- case ${daemon_type} in
- mon|mds|osd) return 0;;
- *) return 1;;
- esac
-}
-
-start_pre() {
- checkpath -d -q -o ceph "$(dirname "${pidfile}")"
- if ! is_type_valid ;then
- eerror "Please give valid Ceph Server Type: mds, mon, osd"
- return 1
- fi
-}
-
-reload() {
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
- start-stop-daemon --signal 1 ${start_stop_daemon_args} --pidfile "${pidfile}"
- eend $?
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 2eb6b90bfd07..f9893ac2854f 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,3 +1,4 @@
DIST kubernetes-1.6.6.tar.gz 22000184 SHA256 13e9cd0753fd8227e1a8588af984005499bedb3916a594eab8d4e873387c464c SHA512 ecd069fc08b0e17a5f7df3f2daf8c14e784f364b89adbd357cb1007bcce81907085f05fd5f7b502e225ad2507b5002d52cf67bd55bed1275c719057e75ada558 WHIRLPOOL fb360828bb0f6f18573bcc236da087d335561133ac2bdf80eae44d7b9d21fa4be56f9620904af78167d31a3e94670184c35626c876fdac2e5cf5e0c8f8ea5030
DIST kubernetes-1.7.0.tar.gz 21930564 SHA256 0fe34180a4bb61384894616b1d348cc6350d1ebcbc071c67748864ffd2deb026 SHA512 cdea8e9758498749a4bd07013e4b1501e88d60d0a59971d0401e334ba7b2b245010e8255130971d43633c6fdb6ba49239a01c2754247bb7e0347653caa00ca36 WHIRLPOOL de7e1784d3b5960e03ad04f614f054f0d218055d3b4e1e0885fffb8fa8e6e9ba67ee80b323b32e5353ec55014b5fb55fbf7dc99216604a7ce3303569561f628c
DIST kubernetes-1.7.1.tar.gz 21933985 SHA256 8420f316e3954e27d14bd31cd885bea85765a6822f7dbdd025b3d27563914bb4 SHA512 95fedccb3de9b32194c015c929d7f25a0ca51ff0f3aef0d278acb5924b91c397f719426855413000427e01131867ba571894692902d55e7536584c19d6e1aa7c WHIRLPOOL 0b36d39c75c692a09d0b68c427bce175b49c39e44e56999cd31dfe07eb7afa8b9ca24528444f1fca13254fb39414f0a9b377ccfa8bb612ca0b7980ad09cbe381
+DIST kubernetes-1.7.2.tar.gz 22003395 SHA256 a283ff30b243b94474d07ec0ed52c4d42a2ca427610a58f1a6dffe456fbb3b6a SHA512 38de356e95198cc7db077e994b6369e807ad65b507f14d342e82e1d08dcf03797771afe45bf043d9d40b7f49e73c3e310117eef98c32eeb4a682eb3d6b670216 WHIRLPOOL bb237497f49277784ff1d1b02225d9fb6bf7f33a92e59e38f9a673fcdb84062f36271239330d633f96a38809a02e447d82266f5c24a8cb404ecd25c452d5b6f1
diff --git a/sys-cluster/kubectl/kubectl-1.7.2.ebuild b/sys-cluster/kubectl/kubectl-1.7.2.ebuild
new file mode 100644
index 000000000000..4866ab70285e
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.7.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+ sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+ LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN}
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ dobin _output/bin/${PN}
+ popd || die
+}
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 2c8435555569..b71bcdb02dad 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -17,4 +17,5 @@ DIST zfs-0.6.5.7.tar.gz 2537816 SHA256 4a9e271bb9a6af8d564e4d5800e4fff36224f1697
DIST zfs-0.6.5.8.tar.gz 2521921 SHA256 d77f43f7dc38381773e2c34531954c52f3de80361b7bb10c933a7482f89cfe84 SHA512 e5b53a9531b865e7c650892c0deb1ee81db086a33538cd667a087a8a8d33a0ad93a30ae5e800096abfc4dc8ed00843da924230082e204fb7543dd401ef41fcde WHIRLPOOL 623bf8ee51d59dcd1842bf41ccf19c2eb6813fb1e88dea1ea1c6f1388c11484b798546bdcb94500735a0e9e5f9099a4df43308760b353b5b62ff56af035f88bd
DIST zfs-0.6.5.9.tar.gz 2610650 SHA256 b724b57dbddae59246fdc15f88f1224061c712945bb36412a2087e0c7760d77f SHA512 6e175f32421cf0f9e13429f12f0fac0564dc7059ab076831d0ebc4f6a17412160ca3526ebdf894bc7666e82580355b08701dd01c411d3177f82e7330b4529a37 WHIRLPOOL 149d730a26363b50691363b314669756d218c4a16e6d06e319c2b0866c5f8ed6e2da2396a516297c127d3343d51d78072d8b7371e3f4d327d30fa43c90be5cd3
DIST zfs-0.6.5.tar.gz 1816180 SHA256 542121940122c922c9d21a2bb39bca4e4a9db2f6bbfd2e576630840e256d4c82 SHA512 58480ee9b0780f1f21d12504abc226be3e6df1939214f6a8f245315d1fa0b9da56b3a744df26426ee78f13684a4ca288df6dddc50f8f91d9d0b4c542980a9c53 WHIRLPOOL fdb5580ec8d4abe57069ce453c1d91225019758ecf5d31856a7897ac7e4b51c6a8ae3258e822f684fbd70a0a7d7410c65c37a569f37d132767522118c587cc24
+DIST zfs-0.7.0.tar.gz 6714094 SHA256 6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2 SHA512 6e6cbf54399fc85b74b76a6ceb3f30e94903f755fe6386fccc56b5e6d307a907759e4b62acec5d32e8383ef1083423eaff8dee2b0ef01a99459171a42b47d217 WHIRLPOOL 74687be4220bab51f18fdd3c047400c4261acf16f38086c2485f5cb9d79af87f5adfafced92860b021814aece7446cb18e9ca310a363b90c6bac39343b72a4b6
DIST zfs-kmod-0.6.2-p2.tar.xz 28636 SHA256 12882463a38a5a57cf2bb3c14c5783f9511f6dc7b163a47575f2f3dcc24f26f6 SHA512 5792660ae8f5013d12e70d608e9cffa92a8c4089a88a5e78728ee88204b3f970d452d5b0b3874e02be49ebbc139e07139be7b5a86ca40bc8b23cb11a7198a9a8 WHIRLPOOL 0e4c57b363cdd3d736efbd1355567b18e22439bd3b20ef40b27f6b97ad4570c7cc99a11b196ac25359d1966c1a70e178f4fd1687b60450f148ccda47b07282a9
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.0.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.0.ebuild
new file mode 100644
index 000000000000..ddbb09881e76
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+if [ ${PV} == "9999" ]; then
+ AUTOTOOLS_AUTORECONF="1"
+ EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
+ S="${WORKDIR}/zfs-${PV}"
+ KEYWORDS=" ~amd64"
+fi
+
+inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="CDDL debug? ( GPL-2+ )"
+SLOT="0"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="debug? ( strip ) test"
+
+DEPEND="
+ =sys-kernel/spl-${PV}*
+ dev-lang/perl
+ virtual/awk
+"
+
+RDEPEND="${DEPEND}
+ !sys-fs/zfs-fuse
+"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
+
+pkg_setup() {
+ linux-info_pkg_setup
+ CONFIG_CHECK="!DEBUG_LOCK_ALLOC
+ EFI_PARTITION
+ IOSCHED_NOOP
+ MODULES
+ !PAX_KERNEXEC_PLUGIN_METHOD_OR
+ ZLIB_DEFLATE
+ ZLIB_INFLATE
+ "
+
+ use debug && CONFIG_CHECK="${CONFIG_CHECK}
+ FRAME_POINTER
+ DEBUG_INFO
+ !DEBUG_INFO_REDUCED
+ "
+
+ use rootfs && \
+ CONFIG_CHECK="${CONFIG_CHECK}
+ BLK_DEV_INITRD
+ DEVTMPFS
+ "
+
+ kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+
+ [ ${PV} != "9999" ] && \
+ { kernel_is le 4 12 || die "Linux 4.12 is the latest supported version."; }
+
+ check_extra_config
+}
+
+src_prepare() {
+ # Remove GPLv2-licensed ZPIOS unless we are debugging
+ use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
+ # Set module revision number
+ [ ${PV} != "9999" ] && \
+ { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
+ use custom-cflags || strip-flags
+ filter-ldflags -Wl,*
+
+ set_arch_to_kernel
+ local myeconfargs=(${myeconfargs}
+ --bindir="${EPREFIX}/bin"
+ --sbindir="${EPREFIX}/sbin"
+ --with-config=kernel
+ --with-linux="${KV_DIR}"
+ --with-linux-obj="${KV_OUT_DIR}"
+ --with-spl="${EROOT}usr/src/${SPL_PATH}"
+ --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
+ $(use_enable debug)
+ )
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+}
+
+pkg_postinst() {
+ linux-mod_pkg_postinst
+
+ # Remove old modules
+ if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
+ then
+ ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
+ ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
+ ewarn "Automatically removing old modules to avoid problems."
+ rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
+ rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
+ fi
+
+ if use x86 || use arm
+ then
+ ewarn "32-bit kernels will likely require increasing vmalloc to"
+ ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+ fi
+
+ ewarn "This version of ZFSOnLinux includes support for new feature flags"
+ ewarn "that are incompatible with previous versions. GRUB2 support for"
+ ewarn "/boot with the new feature flags is not yet available."
+ ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+ ewarn "Any new pools will be created with the new feature flags by default"
+ ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
+ ewarn "create a newpool that is backward compatible wih GRUB2, use "
+ ewarn
+ ewarn "zpool create -d -o feature@async_destroy=enabled "
+ ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
+ ewarn " -o feature@spacemap_histogram=enabled"
+ ewarn " -o feature@enabled_txg=enabled "
+ ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
+ ewarn " ..."
+ ewarn
+ ewarn "GRUB2 support will be updated as soon as either the GRUB2"
+ ewarn "developers do a tag or the Gentoo developers find time to backport"
+ ewarn "support from GRUB2 HEAD."
+}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 0fb5b610bb58..38d65b65c321 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -20,4 +20,5 @@ DIST zfs-0.6.5.6.tar.gz 2561093 SHA256 c349d46d86b4f61cd53a0891acad916cfc3f0d675
DIST zfs-0.6.5.7.tar.gz 2537816 SHA256 4a9e271bb9a6af8d564e4d5800e4fff36224f1697b923a7253659bdda80dc590 SHA512 559b826ae1a176217b92d8407729e2c5feeffb117dc9affaa8c9c2134d996b6c3cbe095f7a0c4666c9b131742491f1304eeb292e13e0df0b6d001fa620568af2 WHIRLPOOL bf2e0865de35496cc995738ddde34df797b0c5047c0dd17e5b755803ef16e7c16f8ba89927106a1f6131c2f75a6749c31a72dff95fc0fee186b308c50ce0b4f4
DIST zfs-0.6.5.8.tar.gz 2521921 SHA256 d77f43f7dc38381773e2c34531954c52f3de80361b7bb10c933a7482f89cfe84 SHA512 e5b53a9531b865e7c650892c0deb1ee81db086a33538cd667a087a8a8d33a0ad93a30ae5e800096abfc4dc8ed00843da924230082e204fb7543dd401ef41fcde WHIRLPOOL 623bf8ee51d59dcd1842bf41ccf19c2eb6813fb1e88dea1ea1c6f1388c11484b798546bdcb94500735a0e9e5f9099a4df43308760b353b5b62ff56af035f88bd
DIST zfs-0.6.5.9.tar.gz 2610650 SHA256 b724b57dbddae59246fdc15f88f1224061c712945bb36412a2087e0c7760d77f SHA512 6e175f32421cf0f9e13429f12f0fac0564dc7059ab076831d0ebc4f6a17412160ca3526ebdf894bc7666e82580355b08701dd01c411d3177f82e7330b4529a37 WHIRLPOOL 149d730a26363b50691363b314669756d218c4a16e6d06e319c2b0866c5f8ed6e2da2396a516297c127d3343d51d78072d8b7371e3f4d327d30fa43c90be5cd3
+DIST zfs-0.7.0.tar.gz 6714094 SHA256 6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2 SHA512 6e6cbf54399fc85b74b76a6ceb3f30e94903f755fe6386fccc56b5e6d307a907759e4b62acec5d32e8383ef1083423eaff8dee2b0ef01a99459171a42b47d217 WHIRLPOOL 74687be4220bab51f18fdd3c047400c4261acf16f38086c2485f5cb9d79af87f5adfafced92860b021814aece7446cb18e9ca310a363b90c6bac39343b72a4b6
DIST zfs-kmod-0.6.2-p4.tar.xz 63984 SHA256 9167edc4be86e3fcda6b3c198e51f92ab0c95ac5baca11666c28029a628cdac9 SHA512 13e4ec415c35d2f268d89565745f5898c0943423577a2ba6714b3a069c5a80f244cd06dff91464f38dd4ed60673d1145ead080bb03a56d4be33e328f948ffa64 WHIRLPOOL 8c399ec67119ed4fbebb5599d00f888918678bc4e4ea369b4bdc5c75bfc90fc76396087624c8011de370a54ff103bccaa8922d05ac7ccebb2b3481bbbcf44b19
diff --git a/sys-fs/zfs/zfs-0.7.0.ebuild b/sys-fs/zfs/zfs-0.7.0.ebuild
new file mode 100644
index 000000000000..7512d7282ca6
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.7.0.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+if [ ${PV} == "9999" ] ; then
+ inherit git-r3 linux-mod
+ AUTOTOOLS_AUTORECONF="1"
+ EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
+else
+ SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
+ KEYWORDS=" ~amd64"
+fi
+
+inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
+RESTRICT="test"
+
+COMMON_DEPEND="
+ sys-apps/util-linux[static-libs?]
+ sys-libs/zlib[static-libs(+)?]
+ virtual/awk
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !=sys-apps/grep-2.13*
+ !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
+ !sys-fs/zfs-fuse
+ !prefix? ( virtual/udev )
+ test-suite? (
+ sys-apps/util-linux
+ sys-devel/bc
+ sys-block/parted
+ sys-fs/lsscsi
+ sys-fs/mdadm
+ sys-process/procps
+ virtual/modutils
+ )
+ rootfs? (
+ app-arch/cpio
+ app-misc/pax-utils
+ !"
+ eerror " Block devices --->"
+ eerror " [ ] Loopback device support"
+ fi
+ fi
+ fi
+ fi
+
+}
+
+src_prepare() {
+ # Update paths
+ sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+ -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+ -e "s|/sbin/parted|/usr/sbin/parted|" \
+ -i scripts/common.sh.in
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ use custom-cflags || strip-flags
+ local myeconfargs=(
+ --bindir="${EPREFIX}/bin"
+ --sbindir="${EPREFIX}/sbin"
+ --with-config=user
+ --with-dracutdir="/usr/$(get_libdir)/dracut"
+ --with-linux="${KV_DIR}"
+ --with-linux-obj="${KV_OUT_DIR}"
+ --with-udevdir="$(get_udevdir)"
+ --with-blkid
+ $(use_enable debug)
+ )
+ autotools-utils_src_configure
+
+ # prepare systemd unit and helper script
+ cat "${FILESDIR}/zfs.service.in" | \
+ sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+ -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+ > "${T}/zfs.service" || die
+ cat "${FILESDIR}/zfs-init.sh.in" | \
+ sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+ -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+ > "${T}/zfs-init.sh" || die
+}
+
+src_install() {
+ autotools-utils_src_install
+ gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+ use test-suite || rm -rf "${ED}usr/share/zfs"
+
+ newbashcomp "${FILESDIR}/bash-completion-r1" zfs
+ bashcomp_alias zfs zpool
+
+ exeinto /usr/libexec
+ doexe "${T}/zfs-init.sh"
+ systemd_dounit "${T}/zfs.service"
+}
+
+pkg_postinst() {
+ if ! use kernel-builtin && [ ${PV} = "9999" ]
+ then
+ einfo "Adding ${P} to the module database to ensure that the"
+ einfo "kernel modules and userland utilities stay in sync."
+ update_moduledb
+ fi
+
+ if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
+ then
+ einfo 'The zfs boot script has been split into the zfs-import,'
+ einfo 'zfs-mount and zfs-share scripts.'
+ einfo
+ einfo 'You had the zfs script in your boot runlevel. For your'
+ einfo 'convenience, it has been automatically removed and the three'
+ einfo 'scripts that replace it have been configured to start.'
+ einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
+ einfo 'runlevel while the zfs-share script is in the default runlevel.'
+
+ rm "${EROOT}etc/runlevels/boot/zfs"
+ ln -snf "${EROOT}etc/init.d/zfs-import" \
+ "${EROOT}etc/runlevels/boot/zfs-import"
+ ln -snf "${EROOT}etc/init.d/zfs-mount" \
+ "${EROOT}etc/runlevels/boot/zfs-mount"
+ ln -snf "${EROOT}etc/init.d/zfs-share" \
+ "${EROOT}etc/runlevels/default/zfs-share"
+ else
+ [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
+ einfo "You should add zfs-import to the boot runlevel."
+ [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
+ einfo "You should add zfs-mount to the boot runlevel."
+ [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
+ einfo "You should add zfs-share to the default runlevel."
+ fi
+
+ if [ -e "${EROOT}etc/runlevels/default/zed" ]
+ then
+ einfo 'The downstream OpenRC zed script has replaced by the upstream'
+ einfo 'OpenRC zfs-zed script.'
+ einfo
+ einfo 'You had the zed script in your default runlevel. For your'
+ einfo 'convenience, it has been automatically removed and the zfs-zed'
+ einfo 'script that replaced it has been configured to start.'
+
+ rm "${EROOT}etc/runlevels/boot/zed"
+ ln -snf "${EROOT}etc/init.d/zfs-sed" \
+ "${EROOT}etc/runlevels/default/zfs-zed"
+ else
+ [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
+ einfo "You should add zfs-zed to the default runlevel."
+ fi
+
+ if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
+ then
+ einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+ rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
+ fi
+
+}
+
+pkg_postrm() {
+ if ! use kernel-builtin && [ ${PV} = "9999" ]
+ then
+ remove_moduledb
+ fi
+}
diff --git a/sys-kernel/bliss-initramfs/bliss-initramfs-6.8.3-r2.ebuild b/sys-kernel/bliss-initramfs/bliss-initramfs-6.8.3-r2.ebuild
index c9ed50e0f0ae..bab2dbc53147 100644
--- a/sys-kernel/bliss-initramfs/bliss-initramfs-6.8.3-r2.ebuild
+++ b/sys-kernel/bliss-initramfs/bliss-initramfs-6.8.3-r2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
inherit python-single-r1
GITHUB_USER="fearedbliss"
diff --git a/sys-kernel/bliss-initramfs/bliss-initramfs-7.0.2-r1.ebuild b/sys-kernel/bliss-initramfs/bliss-initramfs-7.0.2-r1.ebuild
index 85ee0333fe73..b1a9302c6c6b 100644
--- a/sys-kernel/bliss-initramfs/bliss-initramfs-7.0.2-r1.ebuild
+++ b/sys-kernel/bliss-initramfs/bliss-initramfs-7.0.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
inherit python-single-r1
GITHUB_USER="fearedbliss"
diff --git a/sys-kernel/bliss-initramfs/bliss-initramfs-7.1.0.ebuild b/sys-kernel/bliss-initramfs/bliss-initramfs-7.1.0.ebuild
index c772363314bc..67e08c2aa0ae 100644
--- a/sys-kernel/bliss-initramfs/bliss-initramfs-7.1.0.ebuild
+++ b/sys-kernel/bliss-initramfs/bliss-initramfs-7.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
inherit python-single-r1
GITHUB_USER="fearedbliss"
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 8e1a2b950a49..79dac80b2d5e 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -80,6 +80,9 @@ DIST genpatches-4.12-3.extras.tar.xz 17356 SHA256 938a52c1ad10c6ad4d8d18394ba0b0
DIST genpatches-4.12-4.base.tar.xz 44464 SHA256 05a8fea7a0ee2d628b7b2ff747b86cdc903ba5a027e074c602abb8b0ea25aff0 SHA512 68814861b24be651e5c0fd61885b8b86f73a575036875843690cb89e0d7d02a183e6cdbb143974bbed2a7c04e9aeaf3ac5783df227bed748d64dc9bcada1a451 WHIRLPOOL 8456fd2ede0d4208f286c7c6bd124a903a6b8844119d89d866774bd5af0a4917ba76e9b748fcf8972afc47e8b234522bf916100086713eaf82029b759971fe7f
DIST genpatches-4.12-4.experimental.tar.xz 5188 SHA256 b9cc57a8a8ddd0841789038fae143c1305d33330b67bda2a8bf4a2f44e7e081d SHA512 3593bbf9b07ecfaa0e2c049d325f9ee6575972ba6d6f5ba74a0319f3ed3bf95ab33056d22c9b048a6151ab0a40f4d8dd7d1c97753a2d621e2a9adfae7f585730 WHIRLPOOL 1c5f14e7a21ba4b228ffbc04a436716346ee8f9c64859c4ecb4859bc51b213003c67b8c65b778e855ee0a1200b21a8c4436007ab856406558858f6a8d6dcd548
DIST genpatches-4.12-4.extras.tar.xz 17360 SHA256 b9b6164eff5dbe458ee05f856770f545a28764d17d2216afd16940513053e16f SHA512 968906db8bb837f79478d8912220b4691de8231b06bf479b224a60b001831d1ea3824b4a47ae66894a3b7c2aefffbf0523570888ebe7e81f7c321c184e51a611 WHIRLPOOL d4ebfdd022a6ffa74a1a3f6f4d93366156c43ab9c3f9ba4d2d4b5395fba0a6cfb5800c9d9b2333de90d965eb66117e226647330213a566d3960e6d071b7c7acb
+DIST genpatches-4.12-5.base.tar.xz 104316 SHA256 c6cc91885a5e05d24acfd0f0afc6a7a68b5e488de04d345b6603b1b55e720f5e SHA512 17c5114cb160b374c1b2cddbbec7f7be6a7f9d74d242403de74afd9b5e2d9ffa9f38bc6961dba5c472ce7807220829651643fe545c935141bab60823935f3092 WHIRLPOOL 734503b3ac113065daac87469882f5b0bd1831ccc66a4b8f6d3e3ed66e0f29fcdb3970457bdb2e801762afcd130df19487a8b970dd0df43f5e96ea97cf323542
+DIST genpatches-4.12-5.experimental.tar.xz 5188 SHA256 510048afbc461552033afaabe38b305dd23d3fd4969ccf881b65081e12b54921 SHA512 fa6b686c75f1e043a354fdf9b1240ac67026544bb5aa73772bc33cce69cf4c844fdae9509176721c76b50ff2adf9931f5bd84583c05f23bd2c88fe620d6b5b6f WHIRLPOOL 47444af58191246bb286f8a702d6b172f31468d46ae9a02bc0a538d16ae0b817254a740b57be3f102ad784366b0711c50ec6523de074a2e1433cc60b0ad7ebb9
+DIST genpatches-4.12-5.extras.tar.xz 17344 SHA256 537eefd09acccd35100c67e21f40c51536afb22815bfa1b403bb07bbdd904eb6 SHA512 8da0bab6f2685051eb155570ab6ce98b0e9988884d973cef2de8058027a1508419c56c596672dcb888db93b7ca5e35532107277eaddfa09da26b9b771ff55bac WHIRLPOOL abb9089d30d57baee59059f939d518b9df9436fea3b333f2945c77bf1a5b8befa36bd74d2e77494f1b18225e7c5ef2831c3dfe61489fd792a7f8f8ef43d94a58
DIST genpatches-4.4-56.base.tar.xz 1021856 SHA256 a3118b9cb3204ac85b69c3676550f60859ee68707f0c5816120a2565cd7ab317 SHA512 eeed7dc7358bc0151db89cb292e8b30a7498ac8c9c72fd301d9e08343977806e19a91a4958dda2643a418b50ca5ff7f2a27c871c53d1e9d3f0930e27c6ab11ba WHIRLPOOL 10b4e757bd6b4e611d4828b7ea45b4d4f704dbec76a32c5294a8489ecd85103dc472c7b144588cbe1b07c3f507c076b8b2f9555b88542120a53d165c68a592f4
DIST genpatches-4.4-56.experimental.tar.xz 87752 SHA256 6324d9c2e58f33bf39ec7834d3ab6c6ed9eb6d53ffbd4d55aba0879903a503e2 SHA512 d77dd2a45117afe1913dbf7163de8a9b0acfe28fc0afe18e3b1cd2d5d2e785fe374f7018e085a0d2bf8dc052273f1781e2c2094359c4a8a771b9f14443273be5 WHIRLPOOL 2f67af9640ab8d917617bc2bf8ee0d518dd5bdc343abff965bd2f8a8b35eae23b2ce9fd99aeb4497a7ac9293ec1005640c096e72b816143680ddfb6d60158598
DIST genpatches-4.4-56.extras.tar.xz 16408 SHA256 74babcf456aed9c7c406a0feb37b5fbe51db461a67b5fd9c07a252398a15b41f SHA512 661cb1c58b38c24283a9465f596045669f2d686b7418e9586ca6ce48b56bd9cfce52705502f876e68006c4ff1624847cd1e18e3aec37d60f64e6f7788d5facee WHIRLPOOL 11dd648ebf88f43d0c1e1543e5a68c93a1a31b5c1f2d287add703e20979820ecadf003b051e787d6089c346e4a13485326d9c05b5968bd9cb3ca21a755d95a54
@@ -95,6 +98,9 @@ DIST genpatches-4.4-80.extras.tar.xz 16468 SHA256 85ae2def7fb42f6ca09fdba5034a8d
DIST genpatches-4.4-81.base.tar.xz 1350780 SHA256 c05e09c25bc769f3b1da7b628e238f9491e11ee712d6cf20f44c8b70935d727e SHA512 b867441557ce0c479108356836b4b963f98117d1a23f999f778a8392c86554ebc05f59284009480a4ab961cada2aee235e59c19636a52354b0a11d5d319d0d6b WHIRLPOOL b2314fd517e0d5b2d79adc8e3c7461239d75d6553d00f7ebc7019e756f2f8690d773faa6a1496518afd6f103c8e74dbdded0baeda76cc59717355c03610f3c51
DIST genpatches-4.4-81.experimental.tar.xz 87784 SHA256 34d8f91738db80f2ef714286af05b53a25ce16c5b62eac1688e212d95c24b21c SHA512 87ae1857981b1828e6b8cff222827c8ffd949a0428fe052b31a4216462420b7a8a6522c93c8fc2f3f87be8d9503dbd2a04c5f95e9f707ddd6cbf8a27d0e54034 WHIRLPOOL 1ed05c51c5621009109341391e60577120b10d8313fb3ba9ac0f1d5c766249208912dd102bc512c0e3a8b3b68b2ed379cfa492e295e86076b485d1802132d7d1
DIST genpatches-4.4-81.extras.tar.xz 16460 SHA256 30c7c4a997241f47911bc3d02cc0bcf02b89b9289db751bf20a9f34434fb7796 SHA512 7c89f223b784bc534fa0bb3216083a5df81abc477543f044e746bfd87421fb41219243796fe7153923f655755c8866cf86cf3aefbab71274f6059e67d2d8926d WHIRLPOOL 647f3fbbdbe4ea4817372cb6ecdc0a0c8ebfcdd2c7e11a2cefec815390887105862ae9289a6a68942499d550127aac0d6fee9963557aba3393c3b66ac6d4f73f
+DIST genpatches-4.4-82.base.tar.xz 1367268 SHA256 b2957fcf3b4e9016d4775770de7797c1f3fda6dc8fd9b4c55b2c8b8f91ffdf62 SHA512 f24cf8dd5849e7455c499d394ef8af780fa77219695cc39d128353e49d8b7fcbe0b1e5b93940e27e83d4eeaf702545aa0f71eb9927390c1a99fb185e022463c5 WHIRLPOOL 895c7036e9d908c85ace9e2ffe07502c3374fb2936aa979df325c8dc1c49df04a288df0f6f6e63ceb6eb44f8ae2be568ad5a7bb503f4335f634dd966707668e2
+DIST genpatches-4.4-82.experimental.tar.xz 87756 SHA256 c6be5fcb42650f8c4bd5b6db3120ddb272e0bf6436889d1e4842009ed1dc24c5 SHA512 eba32a0e3b797b6ebafebccc2d0b8e0db10015963a25f01fecf1f023353cb8c6ac644152d721217893bd4346e54fc802af4740806ed2f50e4ac4441dd37ee29b WHIRLPOOL 54311f616027cb34293c860ad49aba9c33788a511c119d974db2ed09c5f4271b3d5a7e2c935ce5c24afec65fc39070a1c930b0e7c992aa861177e2a56a731090
+DIST genpatches-4.4-82.extras.tar.xz 16468 SHA256 042a73b7d2beea1fb95cd8bff6b9f5f9002e65c3b9ae66c181f7d3d2d029f89c SHA512 3538e629d96aa5c5712993576fb51f9f754d1b5c515f02468c603e90d15fe23c8523ba8df3c75cfa85fb1f93831fa9ff596ddd23577f39a0ef8def71fc2a5b48 WHIRLPOOL e6ffa054e352f242f2eef255bc70386283c7318fdc23553d2d78eb4c5bce06e5f95bcfcd81f305ef9e2f427069f8b5f8f6433f544ec5a495d52dc15c9c91afd0
DIST genpatches-4.9-18.base.tar.xz 385508 SHA256 d29fc16842e846c2c6487e9c1543e6fe43429d34882ac9c6ca070c1fe3564605 SHA512 c1d08b3d66df74efe610cbf586921f7caa57bb8337848380fdc8e2034883180a60a26dab9ded50974fb468d35dc923912ead08cb0f751a515cef85efb31955d9 WHIRLPOOL e1ef981b945718eab2e96470f96a033cc2b1ede6c706d6cd3e32f4f1c4e066766135141d55a5ccee06d9fb84bc66df389cdb2d095ad569bd565afc600b3b4095
DIST genpatches-4.9-18.experimental.tar.xz 105616 SHA256 209be56c1efb0ba3fbee17f2437bd00b36caecc6c44db2b4e1a0e46ae17640b0 SHA512 37d6983f46ed4031f11f91ffcdacb510b40cab682d71ac471ab3c2ae78598ee9826068afb8b1388d96133635ba2680cc106624e0d79c341d2610b4f74330b773 WHIRLPOOL 5af9422c0526c5e23977f2d25ea683ed1ecf6f9e14a6daf52490bd808e9790cf6f6d9ef96353bda3474197eb954159575a4f0e6a768a86777d9b8a61828d0a0e
DIST genpatches-4.9-18.extras.tar.xz 17348 SHA256 64167f17f122f969476bf68a3e0493a77d7ae9e78087c2748cdfdc6e6186af2a SHA512 dcbdea379a0e28e9b8ed08b32ee71a36ce9ccc817e5b79f38759031e3324441f3e91e6b7e2802d1a694574bb4ce9e8f441d88ccbbd9280b3a4456eadab7d5fec WHIRLPOOL 1d3ba61d03d17a707a65423e85f7f3a235a9d39fb26e4602b5cf663e097dc9e8618380d7a54db60705e6b38e9c0674330df57a6e243c7215411275a489ab8b42
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.12.4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.12.4.ebuild
new file mode 100644
index 000000000000..dadeb72356d1
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.12.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="5"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.79.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.79.ebuild
new file mode 100644
index 000000000000..4ec60d80472b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.79.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="82"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index 200314d79451..cd5740f99383 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -17,3 +17,4 @@ DIST spl-0.6.5.6.tar.gz 559142 SHA256 167595fe76eb5497c3a1ffe396b6300155d0cbe46d
DIST spl-0.6.5.7.tar.gz 558570 SHA256 dc8690e407183eeb7a6af0e7692d6e0a1cd323d51dd1aa492522c421b1924ea0 SHA512 d84d7b088af44c231e7d3f9dfc613acbd55c4c98e8cd8fc04f56194481c46dfd61d49f2f18f4152ce86202e4c4f96de823535754b5412ddd67eef9a403790764 WHIRLPOOL 0591ac89b14096fd5cdcbff2be5fbfd5bdd63fc8313dff182a7dd5d8c4d7ac6be066b68a791812eb2098a48510bc9f322d94c6dbc2a2e5f764cfa264ec206676
DIST spl-0.6.5.8.tar.gz 553270 SHA256 2d22117106782222d2b7da88cc657b7b9c44d281b1cc74d60761e52d33ab1155 SHA512 4078bcc96c112f12129918583400d927d7dd56686c470dd9cb8fc6ba641dcb5afb044c95de02ac397909bb90f4c50d0aada91177ffed810883b5889610d8b0b4 WHIRLPOOL 57b42a93d74348352e367f7d0e08189cd1d443e74c711d8147c35e1bc4264df1a742e231b381ffcc32aaa755cb732c7e062653145fb929872b6835caa2afda27
DIST spl-0.6.5.9.tar.gz 594271 SHA256 d9ccd24786bb5a8616748a93a3c0b1270aa891175e2f5d726195b416f5c03b9c SHA512 356db95fcc93eb4ee298efc1ac25d38743572c539fc10b2d1533af861b4fd60804e61c3fb9f9bbad3d7a51cf123113b5b0bcbd49eba1bad7b1d8823d206022e8 WHIRLPOOL 6565a4939efaeba0cff75496ce9e8ea84b55da97fe47457ca33bcaf07aaa93a27dd410a9264b29539e65475029c0f0c612bc93b9fee4f97c7d6db9c92aab6a34
+DIST spl-0.7.0.tar.gz 608150 SHA256 567f461435f99f862efb1b740ed0876b52a2a539aafad6e5372a84a06a5da4d3 SHA512 a01798fad4f46788cf91d97699837526d5a33e35dcd46247a9e00747d3d439b949113eb42c8d9fe9cbc4a7b1ee645a5ac09eb764db82a2a07eaddbbb9605d11c WHIRLPOOL 7087089423c3515945af9de27879b8f009cf39ee3840400bde2aebd967bfe2be41d513ca6368774ad06d1871c81c3abd50f442d5ea9602da456cbe6a3e8cecd4
diff --git a/sys-kernel/spl/spl-0.7.0.ebuild b/sys-kernel/spl/spl-0.7.0.ebuild
new file mode 100644
index 000000000000..1a3984b06ec7
--- /dev/null
+++ b/sys-kernel/spl/spl-0.7.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+if [[ ${PV} == "9999" ]] ; then
+ AUTOTOOLS_AUTORECONF="1"
+ EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
+ KEYWORDS=" ~amd64"
+fi
+
+inherit flag-o-matic linux-info linux-mod autotools-utils
+
+DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug"
+RESTRICT="debug? ( strip ) test"
+
+COMMON_DEPEND="dev-lang/perl
+ virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+ !sys-devel/spl"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+DOCS=( AUTHORS DISCLAIMER )
+
+pkg_setup() {
+ linux-info_pkg_setup
+ CONFIG_CHECK="
+ !DEBUG_LOCK_ALLOC
+ MODULES
+ KALLSYMS
+ !PAX_KERNEXEC_PLUGIN_METHOD_OR
+ !PAX_SIZE_OVERFLOW
+ ZLIB_DEFLATE
+ ZLIB_INFLATE
+ "
+
+ use debug && CONFIG_CHECK="${CONFIG_CHECK}
+ FRAME_POINTER
+ DEBUG_INFO
+ !DEBUG_INFO_REDUCED
+ "
+
+ kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+
+ [ ${PV} != "9999" ] && \
+ { kernel_is le 4 12 || die "Linux 4.12 is the latest supported version."; }
+
+ check_extra_config
+}
+
+src_prepare() {
+ # Workaround for hard coded path
+ sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
+ die "Cannot patch check.sh"
+
+ # splat is unnecessary unless we are debugging
+ use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
+
+ # Set module revision number
+ [ ${PV} != "9999" ] && \
+ { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ use custom-cflags || strip-flags
+ filter-ldflags -Wl,*
+
+ set_arch_to_kernel
+ local myeconfargs=(
+ --bindir="${EPREFIX}/bin"
+ --sbindir="${EPREFIX}/sbin"
+ --with-config=all
+ --with-linux="${KV_DIR}"
+ --with-linux-obj="${KV_OUT_DIR}"
+ $(use_enable debug)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+}
+
+pkg_postinst() {
+ linux-mod_pkg_postinst
+
+ # Remove old modules
+ if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
+ then
+ ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
+ ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
+ ewarn "Automatically removing old modules to avoid problems."
+ rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
+ rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
+ fi
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 6a9ed7f7e489..1ae9f2c57320 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -17,6 +17,7 @@ DIST patch-3.4.113.xz 1362096 SHA256 d5492eeaadcf12aaad471011066e447907999035c26
DIST patch-4.1.42.xz 1109816 SHA256 da32978d452526c91bf71aceac83bc33b1ba5aff30d00603dfb6529f014521fd SHA512 a3b4e29e7cb613a72b8176edfe2cb5da0aa4e6064bb717c1bd5caa9463563cdb66a4bebe6256a8eddd58f32ae6f658fdbb66a3e4337a91def9d08b7c0e23fb2d WHIRLPOOL e461b48ca523a9f4718286648b1544374b0a6c2470ccecdb735849ae0e02241c6a63e06cf342130824e42e68ebe1526249e4736c8ebca3d4ec44e42397476c80
DIST patch-4.10.17.xz 347932 SHA256 5d6b91751fb0ec2b0fd8c30ceb792f0f90ea665fe5967345aeaa64c8bfeb19ba SHA512 98700d32b4787eae26bdece45563c171b6b8af43a1a15cf5674530fa5cd1dd47fced054b740b568a4a7a1fdbe1b10cdb8126ef43dc92551e06dc4d3245b2fb56 WHIRLPOOL 1c7e2a3ac4b96672a1983ba6b5c4ab200fad173ac9e111ffe6151bcaec2e0f3cf5fc84b59606d247b4774f918014d6de8c41d21624c99af952a8c7f913f0c748
DIST patch-4.11.11.xz 276752 SHA256 c3dee1a267b364e9e6be09c7ee129b98bb096cb099ba8b42962b054a97d7210d SHA512 63b7ce0446de9b4651d795e172dc3aa07189b6bc888c25767e313a6f4aa5459a09985e65f06a6c795230899d6aa64e905249775b45261823a1907e3fa18a3974 WHIRLPOOL cfe6c31e06241f300ea379278a0b98b230f3a3cc6e9bc725ac749034df3365551d5ac14ff9b649672455a4af8599fe30bdb7950327e03d9ebc6e5559010cf4f8
-DIST patch-4.12.3.xz 39028 SHA256 13ad942e5144acafb849942c320aa6ab887cd2ffbba033c622f7a88eb2c32143 SHA512 a6ace68b6387665a1f77420b415a72032465fae6d99ec409487765ecf7cfb8a8458fe09f844662249f14e5739db3f82b28cdac705b0d54d4c6e268719d350c0d WHIRLPOOL 22f55a9609c444f5ef287076122075ea47a5382f30cb080146198430c98d9216d5ff5ddb4d2002988a00a832870e0fe961b38cc24034e984b031ce2064cfdf95
+DIST patch-4.12.4.xz 98592 SHA256 7cabddeaba0f9bd85278254ddd6e8af883539df70ec0ed1bda18ce83f57b304a SHA512 8a6b72524050733c166524230d85f808275a65c28f06444350ebb8c64dd4cab666f8629ef1d1d2b6c25c1f36820a1fd114510af5a38509df55f9c3071543e647 WHIRLPOOL 46d6e9dd62209fd8b1a3b1dfa9d97f15598e88f4ff4ce3126252fe2e8b108061a50772a9deb752cf06d839eeca4b089a893d666f9ef3e2f576b2f1b795af6656
DIST patch-4.4.77.xz 1242156 SHA256 fa90b1e831787841956fc9c17c56a7ad1c0fd428bff03d4d4818fcebea765ee4 SHA512 4547fd112af56bf01be738361c95b9ffdc5c85dda664b1adf04972f3f12e71e1c755184d6d332d5a836ba159df10771d7de0a4700bcac13e367da66444e16eb6 WHIRLPOOL f050066560fe526b25b7a201ce933b912a1330c190f787de7aabf29a20fef2320f8f4c258f2b25b3cc3829d7e80ace0b983246892afd49a514502350780fb308
-DIST patch-4.9.39.xz 830056 SHA256 f6008aa6170908707237917743bb12b528addee466c335116ed9c9cf43e912ac SHA512 1ea5d00c58e60c8125e9ba13ae0b68392a1d7c608023d95292abec550900398a029494d7fcdcf304de12294d5f55da50a31fc9d8d4c28c0962a28cbdd88028c3 WHIRLPOOL ee61416710d2c4cef7cb1dff157c89ea6333f2a58a20bb8226928dee4ee4dc870a04e883d5ccb11055ed933a0941c3b9327483b1e8ccfe67a7b83f64fc18c944
+DIST patch-4.4.79.xz 1274180 SHA256 2ccbfef63ccdf75c859c2ced2e15bc2ad363ce5dc1591ea61d7de0d49c26e1b6 SHA512 a69f937a3a80949db1cf16b547d162b9c83d55f79f3119e59973a94d7e7b914555833beeae5cd165ea1e9ebb6a896352b38fc9ed0675a364dbc32fa165a62026 WHIRLPOOL 8fefb7325e5e892d473e7f1dddd9fc895b739bdc49819ef7dfae421b93c07143d31c4ea8637859b91788c93b07696999d46aaed2ad96fff20bd4df2bd35c2ecb
+DIST patch-4.9.40.xz 855780 SHA256 8e85a7e9de8fcc2f06f8539b743de30e2ba1f5b9e6784da0701c3ab2b896f019 SHA512 ab9c26493069f87a9d8c6c97db1a84f03a1b1221f47facc68e65d79ef75d9c7bd93c1f39eee334e4f45381b2c84ff3acb8870478c61c4d8a648984db55be5ad3 WHIRLPOOL af5c9e1eff3f3e58848c1af5177d9f5d9abdf0ca5af78518ec4173ad6459a93e417bbde52c395c69d03d217de2fd98ae96eb1966d4002beb33ea56a11f4f95c2
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.39.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.12.4.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.9.39.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.12.4.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.12.3.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.79.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.12.3.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.4.79.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.40.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.40.ebuild
new file mode 100644
index 000000000000..20e2c109b44b
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.40.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest
index 81a3d0153a76..1b984e9bdceb 100644
--- a/sys-process/acct/Manifest
+++ b/sys-process/acct/Manifest
@@ -1,3 +1,4 @@
DIST acct-6.5.5.tar.gz 747225 SHA256 4163c87b9e92a73a65eaeadc6c41caa4626da782ff26d6e7a945edcc140a6fd5 SHA512 6a36548cfe0e68829c94780aac4053f8a5840c5a704b88a9562758408dc64b4e26965743aec51ef02f7780efcfbf42d20805fecb12a68e7e1f279a1259151fb0 WHIRLPOOL 30c431dfe3af181770e261470090528fd21d41b45a234181ef0f1a62226979d4de38f851b1d5e200feba5b08acf30d2fe18a517f6096f3fcbc8e32dca9630be4
DIST acct-6.6.1.tar.gz 2869677 SHA256 554515611ef9299012b7510050868a48fc178ce1544947123ab46ec50230ffcb SHA512 4bc3d6b41aeafcf8acfdd020057f1b6f15eea3589981387bca7e57aa8fe71d058e8def97f139dd2c11a1ac39f2d8b95bd103d31caff042cf716dd961b9588f5d WHIRLPOOL 097b7c5f55aac40dd5d63b6ce80a1c2809241f3999c15d5c2c3d8f418f1e51b90ed3c5937655dafd9d702fc72b1d1a6faae870e0c2722c3716e097d5d3b98cd1
DIST acct-6.6.2.tar.gz 852375 SHA256 8ed47b2f893b08f0d67720880adbb48b835a826c314fa52fd52af1cee6870101 SHA512 5942aa3d1faebb29bd6d6ff97c2ba8525dc5a9c85522c3f549ce0772042d3736e19126ddd7e10fe0681a6ac496b8d3aafda0894577a3b64c59f3b78fc222d2b3 WHIRLPOOL 135be28fb3b99ae5c4fb03d21d73a2bb2659d4e209a1444bb4741ae95761191ac74874f0476d3413c4221e2b321de2adf45240b2335b5cac92083d32ab547ebe
+DIST acct-6.6.4.tar.gz 853273 SHA256 4c15bf2b58b16378bcc83f70e77d4d40ab0b194acf2ebeefdb507f151faa663f SHA512 413aa446caece8fd773c92e2995bbaa034f63dd0ced521815a676c49f118e02982862b9c0ab7e60be5212c87d1e82ba6325bda212cf4857392a068d359a1e2c2 WHIRLPOOL 28c5405da1e19aa0690fef35e11bbae906e1b9f66724584edbc0b444fb138c71a1d0c9cc5738c249061e32ff0c84053168a0ffe743a0bf583395d4b47b4ae89f
diff --git a/sys-process/acct/acct-6.6.4.ebuild b/sys-process/acct/acct-6.6.4.ebuild
new file mode 100644
index 000000000000..46888474a25d
--- /dev/null
+++ b/sys-process/acct/acct-6.6.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools systemd
+
+DESCRIPTION="GNU system accounting utilities"
+HOMEPAGE="https://savannah.gnu.org/projects/acct/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.6.4-cross-compile.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf --enable-linux-multiformat
+}
+
+src_install() {
+ default
+ keepdir /var/account
+ newinitd "${FILESDIR}"/acct.initd-r2 acct
+ newconfd "${FILESDIR}"/acct.confd-r1 acct
+ systemd_dounit "${FILESDIR}"/acct.service
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/acct.logrotate-r1 acct
+
+ # sys-apps/sysvinit already provides this
+ rm "${ED}"/usr/bin/last "${ED}"/usr/share/man/man1/last.1 || die
+
+ # accton in / is only a temp workaround for #239748
+ dodir /sbin
+ mv "${ED}"/usr/sbin/accton "${ED}"/sbin/ || die
+}
diff --git a/sys-process/acct/files/acct-6.6.4-cross-compile.patch b/sys-process/acct/files/acct-6.6.4-cross-compile.patch
new file mode 100644
index 000000000000..c4938d956dd3
--- /dev/null
+++ b/sys-process/acct/files/acct-6.6.4-cross-compile.patch
@@ -0,0 +1,220 @@
+Don't generate files.h at build-time using an execution test.
+
+The *_LOC variables are never used in the build itself, but only in the
+built code; this means that they don't need to be known to ./configure at
+all.
+
+Since the previous method made acct not cross-compilable at all, this is
+much preferred.
+
+Author: Diego Elio Pettenò
+Upstream: https://savannah.gnu.org/patch/?7473
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -69,11 +69,6 @@ SYS_LASTCOMM = @SYS_LASTCOMM@
+ SYS_AC = @SYS_AC@
+ SYS_SA = @SYS_SA@
+
+-WTMP_FILE_LOC = @WTMP_FILE_LOC@
+-ACCT_FILE_LOC = @ACCT_FILE_LOC@
+-SAVACCT_FILE_LOC = @SAVACCT_FILE_LOC@
+-USRACCT_FILE_LOC = @USRACCT_FILE_LOC@
+-
+ compare-ac: ac
+ @echo
+ @echo "Running tests for ac"
+--- a/configure.ac
++++ b/configure.ac
+@@ -229,97 +229,6 @@ AC_CHECK_HEADER(sys/acct.h,
+ AC_EGREP_HEADER([comp_t],[sys/acct.h],[AC_DEFINE(HAVE_COMP_T, 1, Define if uses the COMP_T type.)])
+ ) ]
+ )
+-dnl
+-dnl find out where utmp/pacct are stored
+-dnl
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+-#include
+-#include
+-#include
+-#include /* GNU/kFreeBSD */
+-#include
+-#include
+-
+-#ifndef WTMP_FILE
+-# if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) \
+- || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
+-# define WTMP_FILE "/var/log/account/wtmp"
+-# else
+-# if defined(sun) || defined(AMIX)
+-# define WTMP_FILE "/var/adm/wtmp"
+-# else
+-# if defined(sgi) || defined(SVR4)
+-# define WTMP_FILE "/usr/adm/wtmp"
+-# else
+-# define WTMP_FILE "/usr/adm/wtmp"
+-# endif
+-# endif
+-# endif
+-#endif
+-
+-#ifndef ACCT_FILE
+-# if defined(__FreeBSD__) || defined(__linux__) \
+- || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
+-# define ACCT_FILE "/var/log/account/pacct"
+-# else
+-# if defined(__NetBSD__)
+-# define ACCT_FILE "/var/log/account/acct"
+-# else
+-# if defined(sun) || defined(AMIX)
+-# define ACCT_FILE "/var/adm/pacct"
+-# else
+-# if defined(sgi) || defined(SVR4) || defined(M_XENIX)
+-# define ACCT_FILE "/usr/adm/pacct"
+-# else
+-# define ACCT_FILE "/usr/adm/acct"
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
+-
+-#ifndef SAVACCT_FILE
+-# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
+- || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
+-# define SAVACCT_FILE "/var/log/account/savacct"
+-# else
+-# if defined(sun) || defined(AMIX)
+-# define SAVACCT_FILE "/var/adm/savacct"
+-# else
+-# if defined(sgi) || defined(SVR4)
+-# define SAVACCT_FILE "/usr/adm/savacct"
+-# else
+-# define SAVACCT_FILE "/usr/adm/savacct"
+-# endif
+-# endif
+-# endif
+-#endif
+-
+-#ifndef USRACCT_FILE
+-# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
+- || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
+-# define USRACCT_FILE "/var/log/account/usracct"
+-# else
+-# if defined(sun) || defined(AMIX)
+-# define USRACCT_FILE "/var/adm/usracct"
+-# else
+-# if defined(sgi) || defined(SVR4)
+-# define USRACCT_FILE "/usr/adm/usracct"
+-# else
+-# define USRACCT_FILE "/usr/adm/usracct"
+-# endif
+-# endif
+-# endif
+-#endif
+-]], [[
+- FILE *fp;
+- fp = fopen ("locs", "w");
+- fprintf (fp, "WTMP_FILE_LOC=%s\n", WTMP_FILE);
+- fprintf (fp, "ACCT_FILE_LOC=%s\n", ACCT_FILE);
+- fprintf (fp, "SAVACCT_FILE_LOC=%s\n", SAVACCT_FILE);
+- fprintf (fp, "USRACCT_FILE_LOC=%s\n", USRACCT_FILE);
+- fclose (fp);
+-]])],[. ./locs; rm locs],[echo "Error -- could not locate your wtmp and acct files."; exit 1],[echo "Sorry -- you cannot cross-compile this package (FIXME)."; exit 1 ])
+
+ dnl types
+ AC_TYPE_PID_T dnl for sys/acct.h
+@@ -363,12 +272,6 @@ AC_SUBST(ACCTON_MAN)
+ AC_SUBST(LASTCOMM_MAN)
+ AC_SUBST(SA_MAN)
+
+-dnl Substitutions for file locations
+-AC_SUBST(WTMP_FILE_LOC)
+-AC_SUBST(ACCT_FILE_LOC)
+-AC_SUBST(SAVACCT_FILE_LOC)
+-AC_SUBST(USRACCT_FILE_LOC)
+-
+ dnl Dump the makefiles and etc.
+ AC_CONFIG_FILES([Makefile lib/Makefile files.h version.h])
+ AC_OUTPUT
+--- a/files.h.in
++++ b/files.h.in
+@@ -30,6 +30,78 @@
+
+ #include
+
++#ifndef WTMP_FILE
++# if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) \
++ || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
++# define WTMP_FILE "/var/log/account/wtmp"
++# else
++# if defined(sun) || defined(AMIX)
++# define WTMP_FILE "/var/adm/wtmp"
++# else
++# if defined(sgi) || defined(SVR4)
++# define WTMP_FILE "/usr/adm/wtmp"
++# else
++# define WTMP_FILE "/usr/adm/wtmp"
++# endif
++# endif
++# endif
++#endif
++
++#ifndef ACCT_FILE
++# if defined(__FreeBSD__) || defined(__linux__) \
++ || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
++# define ACCT_FILE "/var/log/account/pacct"
++# else
++# if defined(__NetBSD__)
++# define ACCT_FILE "/var/log/account/acct"
++# else
++# if defined(sun) || defined(AMIX)
++# define ACCT_FILE "/var/adm/pacct"
++# else
++# if defined(sgi) || defined(SVR4) || defined(M_XENIX)
++# define ACCT_FILE "/usr/adm/pacct"
++# else
++# define ACCT_FILE "/usr/adm/acct"
++# endif
++# endif
++# endif
++# endif
++#endif
++
++#ifndef SAVACCT_FILE
++# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
++ || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
++# define SAVACCT_FILE "/var/log/account/savacct"
++# else
++# if defined(sun) || defined(AMIX)
++# define SAVACCT_FILE "/var/adm/savacct"
++# else
++# if defined(sgi) || defined(SVR4)
++# define SAVACCT_FILE "/usr/adm/savacct"
++# else
++# define SAVACCT_FILE "/usr/adm/savacct"
++# endif
++# endif
++# endif
++#endif
++
++#ifndef USRACCT_FILE
++# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
++ || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
++# define USRACCT_FILE "/var/log/account/usracct"
++# else
++# if defined(sun) || defined(AMIX)
++# define USRACCT_FILE "/var/adm/usracct"
++# else
++# if defined(sgi) || defined(SVR4)
++# define USRACCT_FILE "/usr/adm/usracct"
++# else
++# define USRACCT_FILE "/usr/adm/usracct"
++# endif
++# endif
++# endif
++#endif
++
+ #define WTMP_FILE_LOC "@WTMP_FILE_LOC@"
+ #define ACCT_FILE_LOC "@ACCT_FILE_LOC@"
+ #define SAVACCT_FILE_LOC "@SAVACCT_FILE_LOC@"
diff --git a/sys-process/acct/files/acct.confd-r1 b/sys-process/acct/files/acct.confd-r1
new file mode 100644
index 000000000000..4a05da34bcc5
--- /dev/null
+++ b/sys-process/acct/files/acct.confd-r1
@@ -0,0 +1,11 @@
+# /etc/conf.d/acct
+
+# ACCT_LOG specifies the accounting logging file.
+# Remember to create it manually if it doesn't yet exist.
+#ACCT_LOG="/var/account/pacct"
+
+# REPORT_OPTS contains arguments for the "sa" command,
+# used for console-reporting.
+# Please run "sa --help" or "man sa" to get a description
+# of available options.
+#REPORT_OPTS="--sort-real-time --list-all-names --percentage"
diff --git a/sys-process/acct/files/acct.initd-r2 b/sys-process/acct/files/acct.initd-r2
new file mode 100644
index 000000000000..4b3a5f3a50b6
--- /dev/null
+++ b/sys-process/acct/files/acct.initd-r2
@@ -0,0 +1,65 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+ : ${ACCT_LOG:=/var/account/pacct}
+ : ${REPORT_OPTS:="--sort-real-time --list-all-names --percentage"}
+
+extra_started_commands="report"
+
+depend() {
+ need localmount
+}
+
+_checkconfig() {
+ if [ -z "${ACCT_LOG}" ]; then
+ eerror "No accounting file specified!"
+ return 1
+ fi
+
+ checkpath -f -m 600 "${ACCT_LOG}"
+}
+
+_get_service_value() {
+ local _name=$1
+
+ local _default_value=
+ if [ -n "${2}" ]; then
+ _default_value=$2
+ fi
+
+ local _service_value=$(service_get_value ${_name})
+ if [ -n "${_service_value}" ]; then
+ echo "${_service_value}"
+ else
+ echo "${_default_value}"
+ fi
+
+ return 0
+}
+
+ACCT_LOG=$(_get_service_value ACCT_LOG "${ACCT_LOG}")
+
+start_pre() {
+ _checkconfig || return 1
+}
+
+start() {
+ ebegin "Starting accounting"
+ accton "${ACCT_LOG}" >/dev/null
+ eend $?
+}
+
+start_post() {
+ service_set_value ACCT_LOG "${ACCT_LOG}"
+}
+
+stop() {
+ ebegin "Stopping accounting"
+ accton off >/dev/null
+ eend $?
+}
+
+report() {
+ sa ${REPORT_OPTS} "${ACCT_LOG}"
+}
diff --git a/sys-process/acct/files/acct.logrotate-r1 b/sys-process/acct/files/acct.logrotate-r1
new file mode 100644
index 000000000000..07696f7329dc
--- /dev/null
+++ b/sys-process/acct/files/acct.logrotate-r1
@@ -0,0 +1,18 @@
+# Logrotate file for acct
+
+/var/account/pacct {
+ compress
+ delaycompress
+ notifempty
+ daily
+ rotate 31
+ create 0600 root root
+ missingok
+ postrotate
+ if test -d /run/systemd/system ; then
+ systemctl try-restart acct 1>/dev/null
+ else
+ /etc/init.d/acct --quiet --ifstarted restart
+ fi
+ endscript
+}
diff --git a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r1.ebuild b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r2.ebuild
similarity index 93%
rename from virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r1.ebuild
rename to virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r2.ebuild
index c43ea00e9135..76e524ef9fae 100644
--- a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r1.ebuild
+++ b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r2.ebuild
@@ -15,5 +15,6 @@ RDEPEND="|| (
x11-themes/tango-icon-theme
kde-frameworks/oxygen-icons
x11-themes/mate-icon-theme
+ x11-themes/elementary-xfce-icon-theme
)
"
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index b21160d27542..b5f7c5a4a6d7 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
DIST chromium-59.0.3071.104.tar.xz 531895868 SHA256 a949fa166cdcdbd8419fbdb4583804613d9845130f0c851e4c647d79a4c300d0 SHA512 419cf5bafa80f190cd301c2933502351929c1ef1d5cfedc720ce6762674a0e6af3b4246a8f92e0c29743420338b056061d4e7f9f4a4066a5bdd4d2ee8db3ddbf WHIRLPOOL ab2fbd1beeb485a5c07743a5a84c850b5ad8178a1f97421a0aa0573817b474e633a6ac65ad43f7db67d35d257183ea4eceacd12b4cad63f88cd9777cfa498e68
DIST chromium-60.0.3112.40.tar.xz 537575476 SHA256 4fdc590fc6ef4af16cc72d790b9eaa50829cd8193893a9ec0719481b03f328d3 SHA512 0e121887f7158d47a9fdb7c0be43a0b1cb32d19a893f99cfc13e2ce146e553e6428fdd82815180bacb430eace42f8bf83595073cf449f49e963633e8414b07ef WHIRLPOOL b7b2b62f61c18ed77890383ba1ac2d25094e14c12042fa1b1af50fa1f8d69807673a036fdb54078622e92b32eb7211040fda3513cb079598e3caf1219c594631
DIST chromium-60.0.3112.78.tar.xz 537669428 SHA256 a82db2aa1b9348b619c01894db565eba686780de0e6fa9e83a8f406d06ce03ea SHA512 d6cccf2537233c12d7b0254b45adbf0abdf9ca43688ceed28b3d915290478563be30d30879018fd4d6f2acc9654d9911c0c6bbebba0cdeacd16d748e18296c41 WHIRLPOOL b7acf6a57bced89f1e81e389f72ef80cb4a24f9beed45c737bd511d8e5f64236c5b9888910ee58b746a6cdbbcc58cc1d665e8730e33471ee50782ef4ce883e8c
-DIST chromium-61.0.3153.4.tar.xz 545739052 SHA256 ef48c114fed9a9977b731296cf099e62f1b50df07835709b41868c44363c6ec1 SHA512 693f8f31fb97eb57277a23c2b2f88d055d9f06ed89004874449332186e8e2e7ed63af6566e884ee52c963e8cda0a2b95caae9ebba486b279daca3c9355cda711 WHIRLPOOL be65fe3342a761cc0150d3d42708b9055442e2f5f8619a7d956be173b1abef0cb7b4a0bc4f0e55be0990461665fc2ba1e3b899bdffe328b8d3adc1624b15ea03
DIST chromium-61.0.3159.5.tar.xz 546362372 SHA256 34e0e62f5c30df110bd8d5f872021a8a0ee21fc4b6c2d4efcb8a2232612f6e0a SHA512 325312223a1486fef1ca9d19c215147bdb37d7ab83437a6e38a076099bf450b79fbfba4060234307cba6385f9d82bf9d66c7a178f3ca33eeb0be1acee71e03f0 WHIRLPOOL cecab851eb6b247e7e381cfcac94d43d2b30d38631160ba1393920e241803e3b54402f719677b608ac15734c21ad6e762925e18f92b1b3e40f3aea93886aa721
+DIST chromium-61.0.3163.13.tar.xz 552794140 SHA256 b140c1405345a13ef8490efde64cfce413267f42baf107f83e81ba6f6dff0b2d SHA512 3c251239d22e4b8e97d9f96868289fa6e12be2167704bcf88dfa8ccf01806f713557f98b8b48d7752ebda24eb8c290ff94e0f279cf4507f7ea14664f1719763a WHIRLPOOL 51fb1214b29e6d462980b7f3238142f43f54b4fdd5c9d5cd3507c57bb168ef00676d10b6dc09ea1c722d4d17f144a31b873f8570892b4682888b581d04a97983
diff --git a/www-client/chromium/chromium-60.0.3112.78.ebuild b/www-client/chromium/chromium-60.0.3112.78.ebuild
index a89dd6df1ae3..41b2bf0fc8dd 100644
--- a/www-client/chromium/chromium-60.0.3112.78.ebuild
+++ b/www-client/chromium/chromium-60.0.3112.78.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="component-build cups gnome-keyring +gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-libvpx +tcmalloc widevine"
+IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-libvpx +tcmalloc widevine"
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
# Native Client binaries are compiled with different set of flags, bug #452066.
@@ -46,14 +46,14 @@ COMMON_DEPEND="
media-libs/libpng:=
system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
>=media-libs/openh264-1.6.0:=
- media-libs/opus:=
pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( >=media-video/ffmpeg-3:= )
+ system-ffmpeg? ( >=media-video/ffmpeg-3:= media-libs/opus:= )
sys-apps/dbus:=
sys-apps/pciutils:=
virtual/udev
x11-libs/cairo:=
x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
x11-libs/libX11:=
x11-libs/libXcomposite:=
x11-libs/libXcursor:=
@@ -79,8 +79,6 @@ RDEPEND="${COMMON_DEPEND}
x11-misc/xdg-utils
virtual/opengl
virtual/ttf-fonts
- !gtk3? ( x11-libs/gtk+:2 )
- gtk3? ( x11-libs/gtk+:3 )
selinux? ( sec-policy/selinux-chromium )
tcmalloc? ( !=media-libs/openh264-1.6.0:=
- media-libs/opus:=
pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( >=media-video/ffmpeg-3:= )
+ system-ffmpeg? ( >=media-video/ffmpeg-3:= media-libs/opus:= )
sys-apps/dbus:=
sys-apps/pciutils:=
virtual/udev
@@ -142,6 +141,14 @@ theme that covers the appropriate MIME types, and configure this as your
GTK+ icon theme.
"
+PATCHES=(
+ "${FILESDIR}/${PN}-widevine-r1.patch"
+ "${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch"
+ "${FILESDIR}/${PN}-gcc-r1.patch"
+ "${FILESDIR}/${PN}-gn-bootstrap-r14.patch"
+ "${FILESDIR}/${PN}-atk-r1.patch"
+)
+
pre_build_checks() {
if [[ ${MERGE_TYPE} != binary ]]; then
local -x CPP="$(tc-getCXX) -E"
@@ -183,12 +190,6 @@ pkg_setup() {
}
src_prepare() {
- local PATCHES=(
- "${FILESDIR}/${PN}-widevine-r1.patch"
- "${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch"
- "${FILESDIR}/${PN}-gn-bootstrap-r12.patch"
- )
-
default
mkdir -p third_party/node/linux/node-linux-x64/bin || die
@@ -319,7 +320,10 @@ src_prepare() {
third_party/yasm/run_yasm.py
)
if ! use system-ffmpeg; then
- keeplibs+=( third_party/ffmpeg )
+ keeplibs+=( third_party/ffmpeg third_party/opus )
+ fi
+ if ! use system-icu; then
+ keeplibs+=( third_party/icu )
fi
if ! use system-libvpx; then
keeplibs+=( third_party/libvpx )
@@ -377,21 +381,22 @@ src_configure() {
local gn_system_libraries=(
flac
harfbuzz-ng
- icu
libdrm
libjpeg
libpng
libwebp
libxslt
openh264
- opus
re2
snappy
yasm
zlib
)
if use system-ffmpeg; then
- gn_system_libraries+=( ffmpeg )
+ gn_system_libraries+=( ffmpeg opus )
+ fi
+ if use system-icu; then
+ gn_system_libraries+=( icu )
fi
if use system-libvpx; then
gn_system_libraries+=( libvpx )
@@ -599,8 +604,9 @@ src_install() {
doins out/Release/*.pak
doins out/Release/*.so
- # Needed by bundled icu
- # doins out/Release/icudtl.dat
+ if ! use system-icu; then
+ doins out/Release/icudtl.dat
+ fi
doins -r out/Release/locales
doins -r out/Release/resources
diff --git a/www-client/chromium/files/chromium-atk-r1.patch b/www-client/chromium/files/chromium-atk-r1.patch
new file mode 100644
index 000000000000..32fa29975b3e
--- /dev/null
+++ b/www-client/chromium/files/chromium-atk-r1.patch
@@ -0,0 +1,11 @@
+--- a/content/browser/accessibility/browser_accessibility_auralinux.cc.orig 2017-07-27 06:28:01.090257874 +0000
++++ b/content/browser/accessibility/browser_accessibility_auralinux.cc 2017-07-27 06:28:21.174653680 +0000
+@@ -571,7 +571,7 @@
+ // it's best to leave this out rather than break people's builds:
+ #if defined(ATK_CHECK_VERSION)
+ #if ATK_CHECK_VERSION(2, 16, 0)
+- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY);
++ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY);
+ #endif
+ #endif
+ break;
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r14.patch b/www-client/chromium/files/chromium-gn-bootstrap-r14.patch
new file mode 100644
index 000000000000..3c44c858f78d
--- /dev/null
+++ b/www-client/chromium/files/chromium-gn-bootstrap-r14.patch
@@ -0,0 +1,27 @@
+commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685
+Author: Pawel Hajdan, Jr
+Date: Wed Jul 26 21:51:54 2017 +0000
+
+ wip
+
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index 1390560f8e37..ff2ae57c46b0 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/metrics/histogram_base.cc',
+ 'base/metrics/histogram_functions.cc',
+ 'base/metrics/histogram_samples.cc',
++ 'base/metrics/histogram_snapshot_manager.cc',
+ 'base/metrics/metrics_hashes.cc',
+ 'base/metrics/persistent_histogram_allocator.cc',
+ 'base/metrics/persistent_memory_allocator.cc',
+@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/trace_event/heap_profiler_allocation_context_tracker.cc',
+ 'base/trace_event/heap_profiler_allocation_register.cc',
+ 'base/trace_event/heap_profiler_event_filter.cc',
+- 'base/trace_event/heap_profiler_event_writer.cc',
++ 'base/trace_event/heap_profiler_heap_dump_writer.cc',
+ 'base/trace_event/heap_profiler_serialization_state.cc',
+ 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
+ 'base/trace_event/heap_profiler_type_name_deduplicator.cc',
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index cef95b2349e2..66d6753cfaa0 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,2 +1,2 @@
-DIST opera-beta_47.0.2631.23_amd64.deb 50133844 SHA256 0962aa4a3ff949fc8d86ba3f4038e4614ce2c5b575e261f057844a8e556ad0d7 SHA512 83bd2cdc7fad0c82e7fad61983c4e4463ba81e1b4dc5d6c3eef773691e587b18e58736cfa46b66ba2e1a8892a9e1143244aac697a3e35a832068123868afe91a WHIRLPOOL 45bbae479174593a13146dcb3fced9e299e09939fc22498ed31da9ae92664a24b6f680a0ff4b3896820704c7684d0661ddef8a2adfdb86c281bbe0907a082387
DIST opera-beta_47.0.2631.28_amd64.deb 50158230 SHA256 a372a490539b0a19ea791b6692492832939b8322350d726418c0e56658ee55de SHA512 b645a624403f64d4cd463701958296c81d2ac73e4311ffd1294ac89056a6dbd0195e9439dee1db2ef929917e4c4026f55fbfafe124fc96b09981acdb479cbf1e WHIRLPOOL 61074e13eb99ce98f0192559305a91ce10ea7bcc407191ccd9a5fa0f9d34f11e36f7a724df883396b10e874f6eb1ac3eedeac8c93cabc1f8bea25db1cdf917c8
+DIST opera-beta_47.0.2631.31_amd64.deb 50394902 SHA256 99af3c05e340cc270f7ede2f6a56e46d057389e6c18952bb9a6a16793eee3647 SHA512 d01f822d9b3c9da8bba8518b315db47e64229c18240fbb5d57c0856238391e0ff3a8a2b392071879af5fd079985d881548d51dbd940e2a192b3d5fbb7e18b4c5 WHIRLPOOL c99b87d80f204bde4e8b3876b7df7067433fa623bcb06d0d8af8834f7a27c0d878d31458f9378a6f3e58f486281d4188f945dc1f1ef1232f3a75cc032fe73413
diff --git a/www-client/opera-beta/opera-beta-47.0.2631.23.ebuild b/www-client/opera-beta/opera-beta-47.0.2631.31.ebuild
similarity index 100%
rename from www-client/opera-beta/opera-beta-47.0.2631.23.ebuild
rename to www-client/opera-beta/opera-beta-47.0.2631.31.ebuild
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 6332b6c3f12a..2dfcfb63178e 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -52,5 +52,5 @@ DIST seamonkey-2.48-sv-SE.xpi 930510 SHA256 831a4b42faa31f4006984269e2d6d3472a0f
DIST seamonkey-2.48-zh-CN.xpi 934871 SHA256 991629043056dd722202116ef026aeb86a8615539aabf41a28b6a78da63eab7b SHA512 18485d34b90f3f619dde55c1772c5f4873a4efd5b828755eec28b20aa74d98050ccd206b19fa409ab6bea7f0053a94f2d684b54e19f763004fb752ad8e002d2c WHIRLPOOL cb8f4f34abd0eddd3f815c0b6d5efb30aa9cf7b29a2c1e948cd429befe732e6143bfb15b723cfab1c18eac7f18538ab33ee3ca4ba9c9eeae5ca8cd590cb78877
DIST seamonkey-2.48-zh-TW.xpi 991735 SHA256 bb41ee50948baca9e78ae1ba0174046bde21d7bb823c6b365e32d7a8c6a9c50f SHA512 d14be0b9da910e3c7014c4ac9e6fc8270eb43176623280c55eec9e63c5fd0ce9b83db781cdbcd1eae67281fd09ad6dc2218df479e66076878c6bda12c2f2eeb3 WHIRLPOOL cc9bda10829ad4149e28b82f59580bc5d2a8d91c00c0e153bdb130be60e57f155df72929029f92c61ef444b5cea48bb47e10aa48615af4686e2dfc8370565c09
DIST seamonkey-2.48.source.tar.xz 220412744 SHA256 6f9a07c86ba6474b44e5083f9d1315d01778c097937f7da4c5701debffab2631 SHA512 b1992a1dbaeb045aea10ff02aa214ec0c1725e3ad0844d2dffd1c0d0c26754fbd98b5fb5df25a2a490ebcb7a47037c61599b0a2e9240338b4e769e529faa33cf WHIRLPOOL ab0a2ee21efb8d446283ae1df6b2af8fe318fe5dbb41563c140f13f59780c8f252028019d9c181e0b0369201808dfe306058ac6fb5d7207cfbc241ba098ab7a6
-DIST seamonkey-2.49-l10n-sources-20170724.tar.xz 13871296 SHA256 7393d6ab237340704d3dd32d5dc3f98f4e15c2d41a48995c3d7944f37ffa6303 SHA512 a752d98ed280490caa26bd39e8c44608ea82078a9be17eb9ef51b00fd51aeade34305b206bea1f073a3114843a92f491a39a67320ca618f394ed1b5f22be8350 WHIRLPOOL 7963758ab0c62a5065dd90563fffbfced0d5b525e521a054f637eb34dd37c482794040cc43dd6197511d1127b23035a57365c80f154dc1e0ac883f3ef0f999c8
+DIST seamonkey-2.49-l10n-sources-20170727.tar.xz 13871252 SHA256 73ad2bb8f1a48d9250d5825c318672e380f534672a9ae42dd7e4ea0506aff0e6 SHA512 6d5938ad16db53629a2e46a81a67827fafd33a00ff71ff6aaeb3151c2c29ae0e59b2f5e35f7d54b1a23882b7b85467202f62653510405fa1dac2ea4180130721 WHIRLPOOL 4e6960b0d065b60142baab1af37b5baed5bc3cddef79b12c689fe735bc4dea969e09756c09da22520600835a42df9f04f45fc8dfac7b92cc04251d403392b54a
DIST thunderbird-52.2.0.source.tar.xz 228453944 SHA256 c65c66244ac113996002bcfa9e387f14291163cfb7009a9126e3a8d4a970e72d SHA512 e5c2ad5f7bbea4fb9abca94db6c149ee459c1c35b756b7840ee87b5fb631ccbcd323c743a12cddf8d504e0175bb93378beb7fe100b185ea6ab03a4968859ea89 WHIRLPOOL 54fb8bb90613a8debe3d5710e4d62acac20ed64c430de28b2910629d81dad1cfe894e6768065bf4a10e321ed2ab8d31fa7bcba775512414b2bb50c4939c304c6
diff --git a/www-client/seamonkey/seamonkey-2.49.2.0_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.2.0_p0.ebuild
index 8bcdf00b3dc3..b91c4f780adb 100644
--- a/www-client/seamonkey/seamonkey-2.49.2.0_p0.ebuild
+++ b/www-client/seamonkey/seamonkey-2.49.2.0_p0.ebuild
@@ -45,7 +45,7 @@ elif [[ ${PV} == *_p[0-9] ]]; then
INSPECTOR_VER="DOMI_2_0_17"
SRC_URI="${SRC_URI}
${MOZ_HTTP_URI}/source/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}.source.tar.xz
- https://dev.gentoo.org/~axs/distfiles/${PN}-${SMPV}-l10n-sources-20170724.tar.xz
+ https://dev.gentoo.org/~axs/distfiles/${PN}-${SMPV}-l10n-sources-20170727.tar.xz
https://hg.mozilla.org/chatzilla/archive/${CHATZILLA_VER}.tar.bz2 -> chatzilla-${CHATZILLA_VER}.tar.bz2
https://hg.mozilla.org/dom-inspector/archive/${INSPECTOR_VER}.tar.bz2 -> dom-inspector-${INSPECTOR_VER}.tar.bz2
"
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 1b58c638fc82..8e2637aed7bd 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -5,7 +5,6 @@ DIST NVIDIA-FreeBSD-x86-375.39.tar.gz 59111267 SHA256 ca39ab55716516bbca62fc888e
DIST NVIDIA-FreeBSD-x86-375.66.tar.gz 59154988 SHA256 b664c4796626213e7bee4cace75bf576ffa2943ca26a0414bcf598c8e6ff5614 SHA512 b034d8bb569d7b4f277aabef9d82c7928c345c27fd25b77d5d843f0e587c9e3f641e1860f4459a06ab3e1e68460743d04553ce919b4c8ecd2a3b624875c78c52 WHIRLPOOL 9385aca80b3cf3d00a1b7686a43edcc5c9d7fb20a7223c0642676cb1d084a1cfc19b1e32babfb72b397e651cf3a0ef1adf71f45fc4a8f826476b68407c00497d
DIST NVIDIA-FreeBSD-x86-378.13.tar.gz 59610253 SHA256 aca461f050950f1a3a81137ec8adf2057deaa20ad166bdd4ce8f3e34616e7a98 SHA512 a0101201089df2bbf5bdc4ded2228dd989da6a47da31c3ec8d55916b1ff3457924555f82c7381934745fdc1b1f8f78e3fc10e5089279eb13423628dbfe560c6b WHIRLPOOL ac67d07d3ffb0959f685b7d59de152ba8fc97e11c30ed3f1a200511bcaf3de1cd1879147f37fde66a1c8d13dd327aac8a9ac78d42cc9656ef79e3180897aaef1
DIST NVIDIA-FreeBSD-x86-381.22.tar.gz 60112159 SHA256 f309408941c7d393fe51b2356bd424791558b70f8f17f8856fbbefb1bcf74138 SHA512 ffe5882051fad081854e7b7fefe86a4da55b263b2ca217664991a7e0d84ff2f22d62a37c89afd578f3c99c12be897e5db7a3d1c71c747df655af8e220eb983fa WHIRLPOOL 42bd9205e28d067b1f7417607da21cd66411cefbd1cec74807bbdcee2255e758df2eb15f79a0c3fe1dde7d9f010cfcf648bb6a5890b4637ea7f799cc0810340d
-DIST NVIDIA-FreeBSD-x86-384.47.tar.gz 63215105 SHA256 c9841ec87c1c73c773ca174a7067786c3e4d45fd2a3d86da8ce3c84e9554830c SHA512 7dd0a596b6a4421cb7903facecf2453327aef4ce0a030fd3c37629e7a9b0e6f68ff10697fa5e2066055bddb5fc64b6c4a2a08cfcb7fdc0caa82be97de5b684f3 WHIRLPOOL 19a6d2c3f28b3dce2ba7c79a370c6d7529dc0f9cf1829d68771e9d5695f1a3d919ee292964c4476b97d10e52d4b3072c9e5eca77568926fa2d1066ab54cf83eb
DIST NVIDIA-FreeBSD-x86-384.59.tar.gz 63257550 SHA256 0ae4aeb3beab6be586cd76f193d03ee7aa7397c66bfcdc84ab6629f808543bb0 SHA512 00598c3fe0d2361e0a8cf945fee19edb884c3bba059000d5103ea45c1f36a06238017752130ac7d8cdca0a7be87109dbb76b5cd318a5263495cbf0b91fc45fb9 WHIRLPOOL 12a9d4d5fbe5af9370e40ecea9fff7b9ffd868da988dd69bc9ad9b27529401a7f910f7013cb1a3765b5edd175c9c97eab0ecdce858c44adf5d8e6450ddcb38ee
DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
DIST NVIDIA-FreeBSD-x86_64-304.135.tar.gz 36144428 SHA256 0e415045b96bb272150d35d72c4a17c3d8e7b593dc7ffc577f6f25cc04f9de95 SHA512 8939f0153e7dc98ed147c79a042731461f87582ef46c4762afadf6a5e1cd0ca32ca99415a3819f7e5abefb2df5c59731454e80873d3d622b73f27e75518c8793 WHIRLPOOL e8689e07f12e169f9abad243111bcddee7796826f0028d29bb5eb340649696a3688a74068f07f52d6764fba9924ddd1dba18e8ae442654fffa9b902ccbde2c7f
@@ -14,13 +13,11 @@ DIST NVIDIA-FreeBSD-x86_64-375.39.tar.gz 58308585 SHA256 0d58c450b3391cf28655f15
DIST NVIDIA-FreeBSD-x86_64-375.66.tar.gz 58343065 SHA256 f6977d58d57818c27989d0c87dff0bdcb348a57ac18e0607ba03fa7489caa089 SHA512 7a222192c04c6cc3fb7818caebb45b4f4e3c9f702bcc14400cc9a7d3d83daae40ff254b70b3845a44fa120b702734b4619f5d4c5a8d25300becfc5f73710f3e9 WHIRLPOOL c77b5457bf4c053baefe1cf676baf47b318cfbfb8c323a8f6d270a36d8119d7843d5e28313c0b011feb9f19aea430d3f37e5b7798304ec174b996871876445e1
DIST NVIDIA-FreeBSD-x86_64-378.13.tar.gz 58779963 SHA256 451b9e4b2da86609c760a9a133efa8d37d844ad036299689f007c90463a7ca39 SHA512 34cfc383ba196ecec2cd27fc12bf30dd58f8782b73414e7b4c182e832ae0dce1f8c017afbb2101d7525d4e321f80cac49d3b578a8fc0cf88be9310f4deb77057 WHIRLPOOL 23929abd50467f267cf6b7d58a49fc6f667036b7e92363cc05b021790d0d5ebc61e181c3b2e7c32a6338328cfcc05311d74112b005d638c0295b2c6189dfa3b8
DIST NVIDIA-FreeBSD-x86_64-381.22.tar.gz 59284579 SHA256 f63001f380055da84eec7aaeddc13442a004ca6979adbfec46d3efac4bad7116 SHA512 51c5a87fabe87ec7f2589ed97d97447b127ecb5fe501c60bc7c9fce74141c127f4f9bb820d2a9b34fb56db436476d0cb18a73845ab4e7ec2315d4975c8ce4e32 WHIRLPOOL 40e1c62b9c8b1d5b20eaa1737285e1ce01e912b013c1aae7c9167e6d240cce5a461fd955e5583065a206abf6d6b195c8916464ce1dd4a53bb5ee94de3679373e
-DIST NVIDIA-FreeBSD-x86_64-384.47.tar.gz 62415203 SHA256 c7d37b51c62b2a280b0ba19c5d9e8739a6823bf403012225d06743d4e53fa60d SHA512 7a23953f1d6a5538f1522d9a06f573ae9bfa395e47be22e8ea6c74bc58d5081e62e3c48c2058462af22180adf417796e8cec2cf94c4d65f3a4aca459f14cf481 WHIRLPOOL e1bdd9d6d31dd19c3a6b55b82102d4e3295ccec1fb2022d9062751509a2c8da7f6de0d92a9b11f696ab386a21e676617714d1648cfb22d615a4acc1d5751006a
DIST NVIDIA-FreeBSD-x86_64-384.59.tar.gz 62465295 SHA256 325612d3fa039b34f6f6e817eccfa03ef0b45346acf14e5d6daf01a6d4f4241b SHA512 ac2dac82e24e192812dd2f0c3c33d5ae06e41ec8f8f23c26a4d617e92494cb5509c9499c934355823261daa1ab9e98f68b804efadff86e99cf7d093b8125875c WHIRLPOOL a4bf1c3980699ab355788063ba184ab142ba8f0efd2398c38f9e1def875558bb67fb8d92df761da56ff84464d5b38eef7962f36219b7c311ad05d9d3dbe56fe8
DIST NVIDIA-Linux-armv7l-gnueabihf-375.39.run 25350238 SHA256 52f512bbb3e2d5747df9b294667df9975564408c5ce4f3124aca7dba4355a3a9 SHA512 d888ab0c81c53138eec06e25be683798b5459a6862affa92429feb1e63fcd4cd7ac76bd78eff8c1bef245a25a6a7eb77994ad99c15ed65e8be1a64b3e4c45030 WHIRLPOOL 5714fdcd9e226a336e0abd46bd8a91eef486fc14de543a98d284b3ae3955e924dbde10a08144309b6c0b4e19fcb011bffb8c046a05cbe05f6123b22d270e2939
DIST NVIDIA-Linux-armv7l-gnueabihf-375.66.run 26668661 SHA256 eb9ac4a3e7dad9f1a149eb04a4d6668b73b75b0e12cca41f12ac52db3e39981b SHA512 fa60b385f7ae79de28e6cb452c249c26a6dbec72f0ab1f31fa89fbea937e5bb13303b32e275384d834b524e58d47fb18497e0920657307a89f9cebe8aef96909 WHIRLPOOL c34e92a43601240dca0dfd2d14f75ce828b12c2da80dbafaf67c6437ba54dc214ca69ce0d0f1a8bef883539ec8430761055b0cf60d9a4502544b39d98bae9648
DIST NVIDIA-Linux-armv7l-gnueabihf-378.13.run 26514235 SHA256 399abf527d84e4b4d01ea66e0de4a1f9b1b39871b180ef3bf99c4718ebe3db91 SHA512 253786a821df85fa926ae842114321b3c70502f887ea7c2b6790dfe3836039ee5d390e6722ca8785904ec6487e465916923d3042dc6191b3b4522c3161b80cb0 WHIRLPOOL 154b13ecb368716980ab779894942831c13e4b2d47c1d5765ab14590663b34be1571df7934e1277c9a29cdfe93e209a04e2a9fed2830c407a42547433fd9e721
DIST NVIDIA-Linux-armv7l-gnueabihf-381.22.run 26815484 SHA256 246272d7da8f60564f4a0776fb3af82652add9e0ced8f856dc6530f97e97a748 SHA512 934cda37c7aed26243b5b661122e1c060de5b4df890aaf2295b6650dddea37cb4f0e3f0bebddb00b5d687b66ab5e028a203195c4d4ad3379593babda42febe77 WHIRLPOOL 33f5f0b0a9463419a2dcc6b2d6026607e28b13982fd0e26ffa797d9ba3ea6aab045b52523a653aea8378d31cd787628db1707c33df61c5d9b9943c07dde209aa
-DIST NVIDIA-Linux-armv7l-gnueabihf-384.47.run 28611505 SHA256 9e78263c3bd55fdf6de58c3e5f4b2ea3a29588587d3746251fc1dffd5f26f300 SHA512 a4d73bbcae086c1cb6e38be53d00940bff4abeb0a71c025c0aadaccab19dd30a674b7749fbf71a423797fdfa5d9a1c0a6f3e8a326e19f7e80a7b1b86f8f58cec WHIRLPOOL 00d2fdca01e0aa9f2d885e968bb6591fabd97c575c83a03d3cb1dd8e396b85631a45abf997001eae827b2a0b2253bcc2e6788365647b3115644fc78b78ebe76c
DIST NVIDIA-Linux-armv7l-gnueabihf-384.59.run 28594162 SHA256 d77e90d34f1110208716c9cb1a208cc066ac5beb6055c5c9ffed538a534b34c2 SHA512 7ac7f42d5e203e22603682660e0e641f08aa9321ff7be0421d23a19af0b9d8d9efe53d4194ff65467fbb419910d64fe711d5b2a1583de987f3e73c1827bea2fe WHIRLPOOL b703954018f3139f2c92d72cc6f04a5a676fe7f75fb38c6b4782adb673f84f1df4ad73360a635df121ba9f7d0e364b79c018271909af286b5c7a042e2205749f
DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
DIST NVIDIA-Linux-x86-304.135.run 41202842 SHA256 5cb0a191ddca7b4c72b3c26cd57b7d719878ce628d24b5b026a0e5c8d3a00d93 SHA512 c2645cc9a6f23641d8b6da51e72e203980068c05e365fcc73b32322a6875ce95e81f4e0d893276e14e84e93464488539c16db6b3be04f5324cf7d7a12bb557f8 WHIRLPOOL 79d0d0badd36c94f3d48eef2c40184ee876bf78e153b18e73521fbe756cd78248da38405e7c08abbfa400ee8cd8150d81987bd7f45501937a77c39f7fc9a0ee6
@@ -29,7 +26,6 @@ DIST NVIDIA-Linux-x86-375.39.run 44434734 SHA256 7f33f6572c5c5c57df71531749c7339
DIST NVIDIA-Linux-x86-375.66.run 44495924 SHA256 29220e249a308f89c2a6fa48be6a0009d58f082d07d3fedfbf4ab0015559f14c SHA512 9f890529cba18197dfb340cefdbb058fd7d4edae39c1ef19a398aaba782e66993257a9f3e93b3f43eb51463492644c0cdf2c5a4af612d6401ebc5427783ef94a WHIRLPOOL bc323f86c99c83f2e3ad3b28f47adfb483988dbcc8e828aedf0e57d1a98a0b7aaf93055076abe2c92f614744309ff47a76edbeb38567cf1daa04c85094abe3dd
DIST NVIDIA-Linux-x86-378.13.run 44397547 SHA256 05e62a6098aac7373438ee381072253a861d56522f74948c2b714e20e69a46b1 SHA512 b96d2558a1003a3c66cade3a1e16abd34d855c0e27cdebacdc0495e0ba3cd5c68bb84cc5f81bff1b9ddce36ac52e0dc125c56d868b77d7c8e2f606d559b13b4a WHIRLPOOL e8231978664cec766813821c0f363ef437ba627debc2d2664164fe44c344c480c50799710dbeeee782fdacdb66b16317d69a9dec4f21d347dc40e471201b3ed1
DIST NVIDIA-Linux-x86-381.22.run 42931990 SHA256 7b7dd6ee1c871dc5367fc207bba65077c3820a683decbfe6126fc70c0d1b9d08 SHA512 15723bfa25b0f39224ad5098c784a292abe4bf1daafaeb2f1df910bbab466e666b848b12e50b0bdd45f83e2d81957425a63501550b3dc5eb8fe3e576a8a10d22 WHIRLPOOL c01bec46411e3fc7f29cb38c6a16c8d50a3979cac1ce6a9e58feeb5878f6388f955cb95e0ecf71482c0fe9c1f57c989ecee6825bf921a0cf95c242f0a1ed3c23
-DIST NVIDIA-Linux-x86-384.47.run 46257041 SHA256 433917c5feca240abd936eecfbbd020b3773afead083802afee3b56d8a5bc256 SHA512 3e4e6e6f154d15e0569b156babcf4ae95d37f2a1080baa6f7c7afbe4581f1a2976a3adda721391159dfdb76c78f81757aadd55d172b5986ed167f8ae61eda60d WHIRLPOOL 45f23943a57119340a56068ef6371db7abf4a0eb1a4ad67760850882d52fef4e9f9b4e562e4fcb315ddeda8caff88b2ebf38766de7a9717221e2695ba6c7775e
DIST NVIDIA-Linux-x86-384.59.run 47228533 SHA256 0c17658a4f874df43c02b521cd0a1357dfe2ea0b553be6b47ebae2e45323916c SHA512 09ceccb8c5bc136bb8ba75b8a15fc0cc08eb3680b6c5233b3dca4a1c55d14461d9adee2c686baff4173c8947c0bbc6dd52fcff5c1715a157015ecf4e802b214b WHIRLPOOL 72c05dfd9524a6551cf36fb2d1a8314414d756ee78735882aafee3c9f22ce906afacdcd0c38d781ff7056e330b14f71e5419fabdfa2811bd9cf7035e40ed0127
DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
@@ -39,7 +35,6 @@ DIST NVIDIA-Linux-x86_64-375.39.run 77264092 SHA256 91be5a20841678d671f32074e290
DIST NVIDIA-Linux-x86_64-375.66.run 75096990 SHA256 59e37f570ba5f3d7148028e96684d77f347d49a54e3722189782fc9b17d201c0 SHA512 518534816da3e20e9b539e19b0e93340b6141aebe76989139aa130883106a68da74f9ef3692419e0b3c111a7c50ceb20e45ecdde53af78c7c709b4d51acb5164 WHIRLPOOL b09f2f0b32735e761e7508091d3e83c3b6f3224213a0cf7d83df914d581ef390a110cd2015dbec8cfb5f87ff1e0924d2d93335f8f9862ed65f6da867c236bd25
DIST NVIDIA-Linux-x86_64-378.13.run 76239469 SHA256 3de379249ef25a8c10a24be2718bf1cb2e338da204e37874c4a0c66dbcdf42ee SHA512 2f6789aa0a400c035c0a074631dc5c26abb4f8a62efe928ca3a2865b89d29acfc09c27f23a664e438275e4bfd25c261745d4d495f9aca5f54ee6c53a389059d2 WHIRLPOOL 6e8dcc7be0981591f377babbd9e1430fddeac9a42291f36a95243d418882bc8b38a1e692e2fd62d4b785feca93165e54a64c015bd99193c699831465f512b180
DIST NVIDIA-Linux-x86_64-381.22.run 76581130 SHA256 1a3ea8a19fbf650774e5ecd86caa5ef950971958226ed04020b0e6e29b4dd28d SHA512 669a3dd0896d68ba8eef4689b01971b92ec1c54e6cf2a9ff8d3f281ae9f2fe402f079e76109b65e698d76798bcc7a9bb43da9d128fec59ac1fafafd1c4a1e42c WHIRLPOOL 6e80c1fa813bf2930c3d47198e0e382c96ed5c5bc7ba9713e55e61e3fe2ab12c7b28526b4940b15b74e19169c1579151272bdc4033641158012c8f6a56736c3b
-DIST NVIDIA-Linux-x86_64-384.47.run 80461528 SHA256 4a79109c5d29e51f8733ee899cefacd30dc184a963712905eb7ccda4e5781566 SHA512 3dec8099408bd98ad7c327edadf4028cc24f6123250836d9883ba5fc333bc5b8a3083794c582e6115d91b57d22a43e7d700a501fd61e95753937702e9d3627f4 WHIRLPOOL 9509f87a354754cb6490bc0aa29d7eae75d8a882abf93c618ef41bce819b19aa56d4ec0b5b2287c96ce26da78f38185764a7504730393d98f5fbaf80a8bad2c9
DIST NVIDIA-Linux-x86_64-384.59.run 81794848 SHA256 7b53bdee6e396cb271b57f77455fe5c561e655ca3fbba015dae0de3d6c11542b SHA512 e31c8e08b43131f6ed6c092a7e9086a1fc029ae06b3ec3cd059e939e890b177fc782414114dc432142354c96d1fddf43d90b20da03308fa7a96dc2830fade786 WHIRLPOOL 5816ccc8e6e7b1d0f7f3c8404e917fc5a6d6488e0a69a6b00e5b965926ba236dc770364528007e2af190d2a5f586d3a60328871e76291e4eee83a04bedda46f8
DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
DIST nvidia-settings-304.135.tar.bz2 1480857 SHA256 f5431a6547d7727506b72616156c18f927a89c0702e7f939b5043fdb66e4faf8 SHA512 ce77819c223d02bc5330a57047b45cf9022159b0d03b3fb1572a64aebbcb5872312acef3f56e2574acc4c2c92eae9ac6e602327fd2658c47f2b97c69cf61ebfb WHIRLPOOL 5fc6c4ada22d8a1b0cade4049691c013a5dfa0a7777d7789f310d363c9c4ed5cb724acc153ec562fcc2266228325096e3f733e8f1517a74c047388a4361d25d8
@@ -48,5 +43,4 @@ DIST nvidia-settings-375.39.tar.gz 2112268 SHA256 71b651872f2f56dcb6f2c0498543da
DIST nvidia-settings-375.66.tar.gz 2114252 SHA256 3a93d845be4a94f03e9768ee78d9f24ef8bd302e30b66e81a5a784356dcc36e9 SHA512 93933a86faa3525d99176e08a8dd943b06b7c4236e85636a765e2a1476d3f22afbfc1066208987542fc5dd26c9bb3239a75838add8c64f6abc4cdea5c02338e5 WHIRLPOOL d1c36169edf682c2a2872122a9d42654cd88f36048cdaf9b6ab6c13276301eb545f04092bc39d52c35890d11ad4acd3eb48f013b16ccfa8f3d5ce32f251b690b
DIST nvidia-settings-378.13.tar.gz 2112676 SHA256 a446ec3553f3fd16f60a0cf42cf9cf078cb3911595bb518649c489334422e85a SHA512 6f5fda9c54b067e21f2c869bcfb7c799c99f584d769020cb15e8764f59183e6a6469919ec48bce47be2144910d0004a9ca221df4a9e4fa9ab9f18710b36fa420 WHIRLPOOL 2eb475a8808bdc8380eb92c4189f2ca5aabc839d466efaaaeef6737aa8a75014e3252fd3d4a1344cede268c3bafa52ddb07057aa500ac6f626382e220326474b
DIST nvidia-settings-381.22.tar.gz 2127491 SHA256 83cade551b43055bf93d7ca7e5911a4c61a9e7bea7d88b4c57aa885e82165e29 SHA512 79cd41b9c0e63b69574caddb62437132810ecb4cd07b90899976ae8535948f28d72021fc9a6969559909cf0f7a5d411b0202782970d64a82c636e7738c9d5681 WHIRLPOOL dfd0a4c568aa6ff1946fbe7c68f0c8cf8721c46bbe5dc82987ed900ca4b275781e7d1784e3094472ad9748c4008b5639791dcf51993b73aaeb03ce9a8e3a524c
-DIST nvidia-settings-384.47.tar.gz 2133544 SHA256 7af45ebcba94cd8e924d4b90e19043eeff9315550da3323f2b4baca1dbf52fa9 SHA512 249dfaf864dc5923a1f3249b750410f128bcf209050501cd75d0c35f615aea42920c88f0387bddf30d6cce34320888f177caf1cc91c5b5215b36c9b244ebf7e4 WHIRLPOOL 3d5580199e18c2dc33cbba7416f640b229bad2fde236c31aae72687ee70a4a433acfe7ffb0f5763bd4847513d9c8080bce0903465da35b1905da8da7ec551de1
DIST nvidia-settings-384.59.tar.gz 2133723 SHA256 2ba5d254b2cbc35aca7862f6d7cbac8b6aabd9c082f7feaff7fba7b3a6a32caf SHA512 5556858f02f5d2b7a5b2fb6073902e98dc7d39267186cc47b810f07463e8507162bdffdf20f15e569766f05b411376a9002796979fc35a01b30aed821f0c3c47 WHIRLPOOL fcfd47ef9b5c3b9b40d62f3f7ec801d65c4efb99756dc727d5c050b1ae12a6fface409188b041c97b6e2d6daa3011d6e0b09cea6b1d7bee48907df38ce02101b
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-384.47.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-384.47.ebuild
deleted file mode 100644
index 601c57bc203e..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-384.47.ebuild
+++ /dev/null
@@ -1,570 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
- portability toolchain-funcs unpacker user udev
-
-NV_URI="http://http.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
-SRC_URI="
- amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
- amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
- arm? ( ${NV_URI}Linux-32bit-ARM/${PV}/${ARM_NV_PACKAGE}.run )
- x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
- x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
- tools? (
- https://github.com/NVIDIA/nvidia-settings/archive/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz
- )
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-RESTRICT="bindist mirror"
-EMULTILIB_PKG="true"
-
-IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X"
-REQUIRED_USE="
- tools? ( X )
- static-libs? ( tools )
-"
-
-COMMON="
- app-eselect/eselect-opencl
- kernel_linux? ( >=sys-libs/glibc-2.6.1 )
- tools? (
- dev-libs/atk
- dev-libs/glib:2
- dev-libs/jansson
- gtk3? (
- x11-libs/gtk+:3
- )
- x11-libs/cairo
- x11-libs/gdk-pixbuf[X]
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- x11-libs/libXv
- x11-libs/libXxf86vm
- x11-libs/pango[X]
- )
- X? (
- >=app-eselect/eselect-opengl-1.0.9
- app-misc/pax-utils
- )
-"
-DEPEND="
- ${COMMON}
- kernel_linux? ( virtual/linux-sources )
- tools? ( sys-apps/dbus )
-"
-RDEPEND="
- ${COMMON}
- acpi? ( sys-power/acpid )
- tools? ( !media-video/nvidia-settings )
- wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
- X? (
- =x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- )
-"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-nvidia_drivers_versions_check() {
- if use amd64 && has_multilib_profile && \
- [ "${DEFAULT_ABI}" != "amd64" ]; then
- eerror "This ebuild doesn't currently support changing your default ABI"
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
- fi
-
- if use kernel_linux && kernel_is ge 4 13; then
- ewarn "Gentoo supports kernels which are supported by NVIDIA"
- ewarn "which are limited to the following kernels:"
- ewarn " userspace driver config lib
- donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-
- # NVIDIA framebuffer capture library
- donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-
- # NVIDIA video encode/decode <-> CUDA
- if use kernel_linux; then
- donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
- donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
- fi
-
- if use X; then
- # Xorg DDX driver
- insinto /usr/$(get_libdir)/xorg/modules/drivers
- doins ${NV_X11}/nvidia_drv.so
-
- # Xorg GLX driver
- donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
- /usr/$(get_libdir)/opengl/nvidia/extensions
-
- # Xorg nvidia.conf
- if has_version '>=x11-base/xorg-server-1.16'; then
- insinto /usr/share/X11/xorg.conf.d
- newins {,50-}nvidia-drm-outputclass.conf
- fi
-
- insinto /usr/share/glvnd/egl_vendor.d
- doins ${NV_X11}/10_nvidia.json
- fi
-
- if use wayland; then
- insinto /usr/share/egl/egl_external_platform.d
- doins ${NV_X11}/10_nvidia_wayland.json
- fi
-
- # OpenCL ICD for NVIDIA
- if use kernel_linux; then
- insinto /etc/OpenCL/vendors
- doins ${NV_OBJ}/nvidia.icd
- fi
-
- # Documentation
- if use kernel_FreeBSD; then
- dodoc "${NV_DOC}/README"
- use X && doman "${NV_MAN}"/nvidia-xconfig.1
- use tools && doman "${NV_MAN}"/nvidia-settings.1
- else
- # Docs
- newdoc "${NV_DOC}/README.txt" README
- dodoc "${NV_DOC}/NVIDIA_Changelog"
- doman "${NV_MAN}"/nvidia-smi.1
- use X && doman "${NV_MAN}"/nvidia-xconfig.1
- use tools && doman "${NV_MAN}"/nvidia-settings.1
- doman "${NV_MAN}"/nvidia-cuda-mps-control.1
- fi
-
- docinto html
- dodoc -r ${NV_DOC}/html/*
-
- # Helper Apps
- exeinto /opt/bin/
-
- if use X; then
- doexe ${NV_OBJ}/nvidia-xconfig
- fi
-
- if use kernel_linux; then
- doexe ${NV_OBJ}/nvidia-cuda-mps-control
- doexe ${NV_OBJ}/nvidia-cuda-mps-server
- doexe ${NV_OBJ}/nvidia-debugdump
- doexe ${NV_OBJ}/nvidia-persistenced
- doexe ${NV_OBJ}/nvidia-smi
-
- # install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
- doexe ${NV_OBJ}/nvidia-modprobe
- fowners root:video /opt/bin/nvidia-modprobe
- fperms 4710 /opt/bin/nvidia-modprobe
- dosym /{opt,usr}/bin/nvidia-modprobe
-
- doman nvidia-cuda-mps-control.1
- doman nvidia-modprobe.1
- doman nvidia-persistenced.1
- newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
- newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
- newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
- fi
-
- if use tools; then
- emake -C "${S}"/nvidia-settings-${PV}/src/ \
- DESTDIR="${D}" \
- GTK3_AVAILABLE=$(usex gtk3 1 0) \
- LIBDIR="${D}/usr/$(get_libdir)" \
- NV_USE_BUNDLED_LIBJANSSON=0 \
- NV_VERBOSE=1 \
- PREFIX=/usr \
- DO_STRIP= \
- install
-
- if use static-libs; then
- dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
- insinto /usr/include/NVCtrl
- doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
- fi
-
- insinto /usr/share/nvidia/
- doins nvidia-application-profiles-${PV}-key-documentation
-
- insinto /etc/nvidia
- newins \
- nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-
- # There is no icon in the FreeBSD tarball.
- use kernel_FreeBSD || \
- doicon ${NV_OBJ}/nvidia-settings.png
-
- domenu "${FILESDIR}"/nvidia-settings.desktop
-
- exeinto /etc/X11/xinit/xinitrc.d
- newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
- fi
-
- dobin ${NV_OBJ}/nvidia-bug-report.sh
-
- if has_multilib_profile && use multilib; then
- local OABI=${ABI}
- for ABI in $(get_install_abis); do
- src_install-libs
- done
- ABI=${OABI}
- unset OABI
- else
- src_install-libs
- fi
-
- is_final_abi || die "failed to iterate through all ABIs"
-
- readme.gentoo_create_doc
-}
-
-src_install-libs() {
- local inslibdir=$(get_libdir)
- local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
- local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
- local nv_libdir="${NV_OBJ}"
-
- if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
- nv_libdir="${NV_OBJ}"/32
- fi
-
- if use X; then
- NV_GLX_LIBRARIES=(
- "libEGL.so.$(usex compat ${NV_SOVER} 1) ${GL_ROOT}"
- "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
- "libGL.so.$(usex compat ${NV_SOVER} 1.0.0) ${GL_ROOT}"
- "libGLESv1_CM.so.1 ${GL_ROOT}"
- "libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
- "libGLESv2.so.2 ${GL_ROOT}"
- "libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
- "libGLX.so.0 ${GL_ROOT}"
- "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
- "libGLdispatch.so.0 ${GL_ROOT}"
- "libOpenCL.so.1.0.0 ${CL_ROOT}"
- "libOpenGL.so.0 ${GL_ROOT}"
- "libcuda.so.${NV_SOVER}"
- "libnvcuvid.so.${NV_SOVER}"
- "libnvidia-compiler.so.${NV_SOVER}"
- "libnvidia-eglcore.so.${NV_SOVER}"
- "libnvidia-encode.so.${NV_SOVER}"
- "libnvidia-fatbinaryloader.so.${NV_SOVER}"
- "libnvidia-fbc.so.${NV_SOVER}"
- "libnvidia-glcore.so.${NV_SOVER}"
- "libnvidia-glsi.so.${NV_SOVER}"
- "libnvidia-ifr.so.${NV_SOVER}"
- "libnvidia-opencl.so.${NV_SOVER}"
- "libnvidia-ptxjitcompiler.so.${NV_SOVER}"
- "libvdpau_nvidia.so.${NV_SOVER}"
- )
-
- if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
- then
- NV_GLX_LIBRARIES+=(
- "libnvidia-egl-wayland.so.1.0.1"
- )
- fi
-
- if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
- then
- NV_GLX_LIBRARIES+=(
- "libnvidia-wfb.so.${NV_SOVER}"
- )
- fi
-
- if use kernel_FreeBSD; then
- NV_GLX_LIBRARIES+=(
- "libnvidia-tls.so.${NV_SOVER}"
- )
- fi
-
- if use kernel_linux; then
- NV_GLX_LIBRARIES+=(
- "libnvidia-ml.so.${NV_SOVER}"
- "tls/libnvidia-tls.so.${NV_SOVER}"
- )
- fi
-
- for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
- donvidia "${nv_libdir}"/${NV_LIB}
- done
- fi
-}
-
-pkg_preinst() {
- if use driver && use kernel_linux; then
- linux-mod_pkg_preinst
-
- local videogroup="$(egetent group video | cut -d ':' -f 3)"
- if [ -z "${videogroup}" ]; then
- eerror "Failed to determine the video group gid"
- die "Failed to determine the video group gid"
- else
- sed -i \
- -e "s:PACKAGE:${PF}:g" \
- -e "s:VIDEOGID:${videogroup}:" \
- "${D}"/etc/modprobe.d/nvidia.conf || die
- fi
- fi
-
- # Clean the dynamic libGL stuff's home to ensure
- # we dont have stale libs floating around
- if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
- rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
- fi
- # Make sure we nuke the old nvidia-glx's env.d file
- if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
- rm -f "${ROOT}"/etc/env.d/09nvidia
- fi
-}
-
-pkg_postinst() {
- use driver && use kernel_linux && linux-mod_pkg_postinst
-
- # Switch to the nvidia implementation
- use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
- "${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
- readme.gentoo_print_elog
-
- if ! use X; then
- elog "You have elected to not install the X.org driver. Along with"
- elog "this the OpenGL libraries and VDPAU libraries were not"
- elog "installed. Additionally, once the driver is loaded your card"
- elog "and fan will run at max speed which may not be desirable."
- elog "Use the 'nvidia-smi' init script to have your card and fan"
- elog "speed scale appropriately."
- elog
- fi
- if ! use tools; then
- elog "USE=tools controls whether the nvidia-settings application"
- elog "is installed. If you would like to use it, enable that"
- elog "flag and re-emerge this ebuild. Optionally you can install"
- elog "media-video/nvidia-settings"
- elog
- fi
-}
-
-pkg_prerm() {
- use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
- use driver && use kernel_linux && linux-mod_pkg_postrm
- use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 37199d7b483e..425b0f69b9f9 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -1,5 +1,4 @@
DIST VirtualBox-5.0.16.tar.bz2 111062984 SHA256 f5a44d33a1db911f445b2eb2d22d9293a96a535cba488b5a235577ef868fa63c SHA512 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074 WHIRLPOOL ea709057c588f28820790c2b193decba9ee0c57e0f82aa4361ca87aef661315182e18b5ee29558e47ed92f6037eb91befa5390680661a7b9f2248c7819b4a85c
-DIST VirtualBox-5.0.32.tar.bz2 111684963 SHA256 4a48d4a8b6ca68353bd39f2c9d2896e1659818959f858e8326ef649481d15550 SHA512 77e479e43a08bd9656792cc8e58bbb4e57e1290803bc100a00b9595f2dfdf580607c9a1d38f72aebf638cf6ba3f63bef79913301c8b2a135b5cfcf35a44707e4 WHIRLPOOL 1b03a9368259e1704981dcd64f773f8097d03c582e8c18a012c55463d5bbb15b2521e83f51fe3cf4fe30822db26726c9ff145d711cb97ae2287368068338a9a4
DIST VirtualBox-5.0.40.tar.bz2 112997095 SHA256 e4275b7ada40b358e6e3bd1231b3a320aa06c72ae301283cac5adb42eaa8e4b5 SHA512 70cd4355591c5aed82148954bf55637a5dcdd1a5177dba78192e7c6eadfbf3f7023f352ba8f89d9eb3c3fc55b049f7c76af6bc94e04d1766d7fbe39e51a1393c WHIRLPOOL 9f471e63814c9d48063857f3b95410f5acdd4a3bd2716c525f2449f1eae95d0e91dbe5422374a49f31f8219daa155f716455f0259d131d93afb5cd9e13a7d467
-DIST VirtualBox-5.1.22.tar.bz2 115838360 SHA256 fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899 SHA512 e48457371c9139fc04477c82fbd18974378fde08af2a6f9058a0eafa6e522987bd129b8d87c9f381789c4e817aded752fde6ea7fcb2ade471997373802e09348 WHIRLPOOL c6034aad69c8a25eaf5909b6889f04f8090ace562e18a76bc55ad4d3e8347844fa1ab466d32e92b09180dff71e0f928826db0994d34b03f44b11bdb03ccc40d2
DIST VirtualBox-5.1.24.tar.bz2 116135442 SHA256 ee2db169a322bf0db3c3b6d8b84aa39236f36cbf37d0a4c10ab65902a396bb60 SHA512 3c9ad230a53f9159e648ae1f342bdb220ffd85f2ddd45ae4c61d6606f358e9343a4968b2a91784893fb1284288ad41c538b1ab299b3a49e7739bfc8c4fdea910 WHIRLPOOL aad73184e2d36928449e688fd86c6f42c061f77e86c7e6119a205154b307846ed25175f49e3f8e451844b48c0e71e9531902753f1fd917123c401ffbf7744a2d
+DIST VirtualBox-5.1.26.tar.bz2 115915813 SHA256 b5715035e681a11ef1475f83f9503d34a00f0276b89c572eebec363dda80c8a9 SHA512 680e9646a51a0a5923b3ded10007ee1c1e2a41c6d8a961d2b2540db6578bed2847154f4cac87e3cfe1118a62595b47c7df99da854f6c340e173b9eb8cacf2add WHIRLPOOL 9d7950ec3ec2cd9b8aaa0ea319f9f5089eed7d2cd2879d313426b448a27570b5582235aa46c5ad5a0fd4d0b967f8d58a963f001549232136d6a8609262af71d0
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.32.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.32.ebuild
deleted file mode 100644
index b8937614e94c..000000000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.32.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib python-single-r1 versionator toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox X11 video driver for Gentoo guest"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dri"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- /dev/null || die
- MAKE="kmk" \
- emake TOOL_YASM_AS=yasm \
- VBOX_USE_SYSTEM_XORG_HEADERS=1 \
- KBUILD_PATH="${S}/kBuild" \
- KBUILD_VERBOSE=2
- popd &>/dev/null || die
- done
-
- if use dri; then
- local objdir="out/linux.${ARCH}/release/obj/vboxvideo_drm"
- # We need a Makefile, so use Makefile.module.kms
- ln -s Makefile.module.kms "${MODULES_SRC_DIR}"/Makefile || die
- # All of these are expected to be in $(KBUILD_EXTMOD)/ so symlink them into place
- targets=(
- include
- src/VBox/Runtime/r0drv
- src/VBox/Installer/linux/Makefile.include.{head,foot}er
- out/linux.${ARCH}/release/{product,version,revision}-generated.h
- )
- for each in ${targets[@]} ; do
- ln -s "${S}"/${each} \
- "${MODULES_SRC_DIR}"/${each##*/} || die
- done
- # see the vboxvideo_drm_SOURCES list in Makefile.kmk for the below,
- # and replace '..' with 'dt'
- targets=(
- dt/dt/common/VBoxVideo/HGSMIBase.o
- dt/dt/common/VBoxVideo/Modesetting.o
- dt/dt/common/VBoxVideo/VBVABase.o
- dt/dt/dt/GuestHost/HGSMI/HGSMICommon.o
- dt/dt/dt/GuestHost/HGSMI/HGSMIMemAlloc.o
- dt/dt/dt/Runtime/common/alloc/heapoffset.o
- )
- for each in ${targets[@]} ; do
- ln -s "${S}"/${objdir}/${each} \
- "${MODULES_SRC_DIR}" || die
- ln -s "${S}"/${objdir}/${each}.dep \
- "${MODULES_SRC_DIR}" || die
- done
- fi
-}
-
-src_install() {
- cd "${S}/out/linux.${ARCH}/release/bin/additions" || die
- insinto /usr/$(get_libdir)/xorg/modules/drivers
- newins vboxvideo_drv_system.so vboxvideo_drv.so
-
- # Guest OpenGL driver
- insinto /usr/$(get_libdir)
- doins -r VBoxOGL*
-
- if use dri ; then
- dosym /usr/$(get_libdir)/VBoxOGL.so \
- /usr/$(get_libdir)/dri/vboxvideo_dri.so
- fi
-}
-
-pkg_postinst() {
- elog "You need to edit the file /etc/X11/xorg.conf and set:"
- elog ""
- elog " Driver \"vboxvideo\""
- elog ""
- elog "in the Graphics device section (Section \"Device\")"
-}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.40.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.40.ebuild
index 72ca3255cc41..b8937614e94c 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.40.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.40.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="dri"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.22.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.26.ebuild
similarity index 98%
rename from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.22.ebuild
rename to x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.26.ebuild
index 31448eb0c1aa..3eb7cfa80d31 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.22.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.26.ebuild
@@ -75,7 +75,7 @@ pkg_setup() {
src_prepare() {
# Prepare the vboxvideo_drm Makefiles and build dir
- eapply "${FILESDIR}"/${PN}-5.1.4-Makefile.module.kms.patch
+ eapply "${FILESDIR}"/${PN}-5.1.24-Makefile.module.kms.patch
# Remove shipped binaries (kBuild,yasm), see bug #232775
rm -r kBuild/bin tools || die
diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
index 2ed2fed3d724..ea830dad04d5 100644
--- a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
+++ b/x11-libs/colord-gtk/colord-gtk-0.1.26.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"
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
LICENSE="LGPL-3+"
SLOT="0/1" # subslot = libcolord-gtk soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
# We still need to build gtk-doc, https://bugs.freedesktop.org/show_bug.cgi?id=69107
IUSE="doc +introspection vala"
diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest
index d201a48e9a63..a980c0ad8a72 100644
--- a/x11-misc/light-locker/Manifest
+++ b/x11-misc/light-locker/Manifest
@@ -1 +1,2 @@
DIST light-locker-1.7.0.tar.bz2 530315 SHA256 938baae14576e91b1fa0af963941bae6ef8d141bd83b513ff02256d8b6e79e29 SHA512 dcd524ed5bf8475743585ee5a6b35dfe396d17f307418e208450ccabc12ab6b3835818fdf11324b8c7dc63332b9faacea184409b7c9c0a242fbb9d6402a2d079 WHIRLPOOL 05d9d0762da2ddbfb6a33209b65289c26ef01cd14fbe9cab0c15718ce915e18f48e3d288b58dfddfc1de28ce821e3fa93559f52a3d7eec539f5d544ae5713a40
+DIST light-locker-1.8.0.tar.bz2 449898 SHA256 3c76106f40a8efe67b462061e4c798e3e501b54356c8cdc1b67a3022d9d7dba1 SHA512 bbad73c0b82a50ddca240d5e1bd325a99d0c60364d136fe6d9d52f196319953373c9d03cf38ebd75d4498d080e96702e09fc97c35b4b69cbe963f065719549d5 WHIRLPOOL 4d120bb94c5aba679a5d48cc65d23ba39284d4e929c01cf6b4a013d96f917e3e6938c3074c3934df0f50b6d159ae3e84582ea62cfd49967a7ea611007d2255b8
diff --git a/x11-misc/light-locker/light-locker-1.8.0.ebuild b/x11-misc/light-locker/light-locker-1.8.0.ebuild
new file mode 100644
index 000000000000..bb354a057397
--- /dev/null
+++ b/x11-misc/light-locker/light-locker-1.8.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils gnome2-utils
+
+DESCRIPTION="A simple locker using lightdm"
+HOMEPAGE="https://github.com/the-cavalry/light-locker"
+SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+consolekit +dpms gtk3 +screensaver -systemd +upower"
+
+RDEPEND="dev-libs/dbus-glib
+ >=dev-libs/glib-2.25.6:2
+ >=sys-apps/dbus-0.30
+ x11-libs/cairo
+ x11-libs/libX11
+ x11-libs/pango
+ x11-libs/libXxf86vm
+ consolekit? ( sys-auth/consolekit )
+ dpms? ( x11-libs/libXext )
+ !gtk3? ( >=x11-libs/gtk+-2.24:2 )
+ gtk3? ( x11-libs/gtk+:3 )
+ screensaver? ( x11-libs/libXScrnSaver )
+ systemd? ( sys-apps/systemd )
+ upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-perl/XML-Parser
+ dev-util/intltool
+ sys-devel/gettext"
+RDEPEND="${RDEPEND}
+ x11-misc/lightdm"
+
+DOCS=( AUTHORS HACKING NEWS README )
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with consolekit console-kit)
+ $(use_with dpms dpms-ext)
+ $(use_with !gtk3 gtk2)
+ $(use_with screensaver x)
+ $(use_with screensaver mit-ext)
+ $(use_with systemd)
+ $(use_with upower)
+ )
+ autotools-utils_src_configure
+}
+
+pkg_preinst() {
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+}
diff --git a/x11-misc/sxhkd/Manifest b/x11-misc/sxhkd/Manifest
index be8edf170433..f3645fcebb9c 100644
--- a/x11-misc/sxhkd/Manifest
+++ b/x11-misc/sxhkd/Manifest
@@ -1 +1,2 @@
DIST sxhkd-0.5.7.tar.gz 34472 SHA256 21b8bfea2a83f019062dfea53051e2bc61896595fc788c6c7b5e3fd9354b279f SHA512 b977c79f2f8ef311b1bbe5bab21ae60c5689d1069552368573bc9aad55e58df4abff51ccdcf74b5e7c72cdee6077da67636f45a390f0fffb1a5e34b478579a18 WHIRLPOOL 7197c38b10d969739672da3771b513bd2f82591068970f407068f3470a31dc98d09b3c8663ce788bf90dcf3b5992be61019c3aac14281bf16a8ec42ad36120aa
+DIST sxhkd-0.5.8.tar.gz 34566 SHA256 d7df48d7d301d1cf06f45172bcfe712510e98dcdbdb896af662cf979f9666855 SHA512 59b38a77e7fd4b23cb109a1365514f39d23ae5bd1b467355ad894d3a861627fd0fc5c5fb556176161c6580c719a4032cf516f60eb3023dc30bf09ae362e4e094 WHIRLPOOL d0c1d7a90829217080f1e60f1921ccf30c34a43196ee1bfd937157be67de7d2ab424f930ec27a309ccb277e8658236d890ba9c415750a92211702c0431a30e80
diff --git a/x11-misc/sxhkd/sxhkd-0.5.8.ebuild b/x11-misc/sxhkd/sxhkd-0.5.8.ebuild
new file mode 100644
index 000000000000..2583e00848e7
--- /dev/null
+++ b/x11-misc/sxhkd/sxhkd-0.5.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs systemd
+
+DESCRIPTION="Simple X hotkey daemon"
+HOMEPAGE="https://github.com/baskerville/sxhkd/"
+SRC_URI="https://github.com/baskerville/sxhkd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libxcb
+ x11-libs/xcb-util-keysyms"
+DEPEND="${RDEPEND}
+ x11-libs/xcb-util"
+
+src_compile() {
+ emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+ emake PREFIX=/usr DESTDIR="${D}" install
+ systemd_dounit contrib/systemd/${PN}.service
+}
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 98f91534ea8f..2f5963ebfb7a 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,2 +1,3 @@
DIST enigmail-1.9.6.1.tar.gz 1745021 SHA256 3874331e981aed864443d3c965d856e003fd84f73e5a89fd5004ced9dc29b96f SHA512 e6ab69734a39a4953e0167e07b06f0d5c83fb42956515392319a1cd9d665ca274f6a12b4141e2dfa373ef074f0526f3d7330a48d29d600fc38f724d26518ff84 WHIRLPOOL e89b0e5857564cc2f7ebf3ab46b110c6bbb1b16e7c0e045750119fd02e693b9bd9667c2932e7a65f9c8fb2c7c835ed048f6df2613d12b25d961894f47f67cf48
DIST enigmail-1.9.7.tar.gz 1745184 SHA256 176adbafee2f84ef6cd1cdbf53131a2a6a23d0cb26550357617c24a8ae5bd934 SHA512 f6f96f6267f1c9df0ca86fefcf7e0e2b10076f1cdb7d446b2a53710b780c14097ef05ba7f35b83e33aca9f2fca1ca4398c7524c1f5ce6cba39b6733db33eed31 WHIRLPOOL 8816b3404e6b6b3fa4ba3d01f97ba9841b3eb7b1d46d09570b756431b2810f35be26a54ab98769ec051cc0859c761090004ed10886150ec98082db10ba4642f5
+DIST enigmail-1.9.8.1.tar.gz 1776673 SHA256 4bcf2da00d96a67921b24dbec9f43930cba41112a2cd241b0952eb573c648a4d SHA512 af280040e96eb69529e723e52e65621e42743c974b0ed42598e73458004f0a59688da7257d2b556e95a56c4cad3ac48f527d4d9a7a54c9c92eaff132257e0cfd WHIRLPOOL 077c61b996c2ec45ecc3a037b61d167acda2ebdbde6536e2f2f2e180a064c9e540e09b48417454aa48f02af5f4c58c88f4ba456e6c5f113cfe474f2b82798ac0
diff --git a/x11-plugins/enigmail/enigmail-1.9.8.1.ebuild b/x11-plugins/enigmail/enigmail-1.9.8.1.ebuild
new file mode 100644
index 000000000000..ff5e7f5079a3
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-1.9.8.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
+HOMEPAGE="http://www.enigmail.net/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-3"
+IUSE=""
+SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
+
+RDEPEND="|| (
+ ( >=app-crypt/gnupg-2.0
+ || (
+ app-crypt/pinentry[gtk(-)]
+ app-crypt/pinentry[qt4(-)]
+ app-crypt/pinentry[qt5(-)]
+ )
+ )
+ =app-crypt/gnupg-1.4*
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ app-arch/zip
+ dev-lang/perl
+ "
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+ emake ipc public ui package lang
+ emake xpi
+
+}
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins -r build/dist/{chrome,components,defaults,modules,wrappers,chrome.manifest,install.rdf}
+}
+
+pkg_postinst() {
+ local peimpl=$(eselect --brief --colour=no pinentry show)
+ case "${peimpl}" in
+ *gtk*|*qt*) ;;
+ *) ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+ ewarn "You may be prompted for your password in an inaccessible shell!!"
+ ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+ ;;
+ esac
+}
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index c57b598bd329..0d9226203262 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.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=6
@@ -27,20 +27,22 @@ DEPEND="
"
src_prepare() {
- eapply_user
+ default
- sed -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \
+ sed -i \
+ -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \
-e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \
-e '/^LDFLAGS/{s:[[:space:]]-s[[:space:]]: :}' \
-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
- -i config.mk || die
- sed -e '/@echo/!s:@::' \
+ config.mk || die
+ sed -i \
-e '/tic/d' \
- -i Makefile || die
- tc-export CC
+ Makefile || die
restore_config config.h
+
+ tc-export CC
}
src_install() {
diff --git a/x11-themes/elementary-xfce-icon-theme/Manifest b/x11-themes/elementary-xfce-icon-theme/Manifest
index c150650482d5..ca2115df024b 100644
--- a/x11-themes/elementary-xfce-icon-theme/Manifest
+++ b/x11-themes/elementary-xfce-icon-theme/Manifest
@@ -1 +1,2 @@
DIST elementary-xfce-icon-theme-0.8.tar.gz 7517799 SHA256 15f08395b89e955f479faf9bc9eaab7bc56f4d4f7d365a38b4b282a443a79c1a SHA512 6abf95e6b4aa41722848ac818f482eec3de012f69ed76db4396d9e572d6032d2ba32a6ed399b9446fb872c1d2f54baf862a0a55fc49ea15ba781ad54b91cd8f5 WHIRLPOOL 35d83601f6fd3a09de5c271140e55395e07c18c30b568ea7c7d8fb7da7bdc6aa994d3b73b4ac92f800e16b34846b6100c8771706cd7c8f50e2bd135476e7a842
+DIST elementary-xfce-icon-theme-0.8_p20170710.tar.gz 7720603 SHA256 e0a4994b6041c68613f8f22c7aedac68a84cc1b4d21acf82053d0db2dabfddfa SHA512 e92808b65975aacefbb0996b48a3e5ed59ae3ce1af48aa2c4aa8451997ba60cf8badafcbe875adc587b4ca5471aef945123beb4f5335ae257bc9dfaf5c6db854 WHIRLPOOL fd11d2fb959af8a8f7932feba3cc690391ce178e7cc9232b1c83eb7bcae14655526a95de2ebf27608dd77b91767b49656b787da88f9a7936b5176d88c1b09eba
diff --git a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.8_p20170710.ebuild b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.8_p20170710.ebuild
new file mode 100644
index 000000000000..ce3a5677baf3
--- /dev/null
+++ b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.8_p20170710.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils
+
+COMMIT=7d3a76510d38ad650854382d2dcc502beb91642a
+
+DESCRIPTION="Elementary icons forked from upstream, extended and maintained for Xfce"
+HOMEPAGE="https://github.com/shimmerproject/elementary-xfce"
+SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="public-domain GPL-1 GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S=${WORKDIR}/elementary-xfce-${COMMIT}
+
+src_install() {
+ insinto /usr/share/icons/
+ dodoc README
+ for shade in elementary-xfce*; do
+ for doc in {AUTHORS,CONTRIBUTORS,LICENSE}; do
+ if [[ -f ${shade}/${doc} ]]; then
+ newdoc ${shade}/${doc} ${shade}-${doc}
+ rm -f ${shade}/${doc} || die
+ elif [[ -L ${shade}/${doc} ]]; then
+ unlink ${shade}/${doc} || die
+ fi
+ done
+ doins -r ${shade}
+ done
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/gtk-engines-experience/Manifest b/x11-themes/gtk-engines-experience/Manifest
index fb5450ba314c..53d181f2800b 100644
--- a/x11-themes/gtk-engines-experience/Manifest
+++ b/x11-themes/gtk-engines-experience/Manifest
@@ -1,2 +1 @@
-DIST experience-0.10.4.tar.bz2 280629 SHA256 1b6eccd1298855f3950957d73e3c50ccd5f7b8e7eaa4320c6e8cd7a3dcab4f75 SHA512 c2636202020eb117ca4e6cf400205d58a3b0611361661d9d8b99996abae91cdb1487867ba55fa9063b36e12ba1b2574effb77651c52b5a13847b1de9ffb024b7 WHIRLPOOL 5b8cf4274605128594d11758233cb3bc04be67968bf61f8b2c23530d820efcd07c16db7126a4bdee30afe43b1ddfc1cb4b4976dbf68fbc01645f2e689b19df30
DIST gtk-engine-experience-0.10.5.tar.bz2 266776 SHA256 12022638abe46ab25c9c2de8b94a697e7b45b963c3c452ec5165e943d0b31c3e SHA512 c783b5bb19cbdda202cdc5294b27fad5b9854bdebb2ffce28ba675d743ab385dc82fa63dcfc1818207847de4be37daea9177affa179339edcfe622c9fd2a6604 WHIRLPOOL 90dae635527b5731daf3c14d21e8c25a85a257de4e16e72936de21d2471501661e8f14ce8f3576b5a2d1bb50112c740569d70aa55e806ec83dafd8715a476f23
diff --git a/x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.4.ebuild b/x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.4.ebuild
deleted file mode 100644
index 97173bb4da85..000000000000
--- a/x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit autotools
-
-MY_PN=experience
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="GTK+ Experience Theme Engine"
-HOMEPAGE="http://benjamin.sipsolutions.net/Projects/eXperience"
-SRC_URI="http://benjamin.sipsolutions.net/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="amd64 ~ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.6:2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${P/engines/engine}
-
-src_prepare() {
- eautoreconf # need new libtool for interix
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/x11-themes/laughlin-backgrounds/laughlin-backgrounds-14.1.0.3-r1.ebuild b/x11-themes/laughlin-backgrounds/laughlin-backgrounds-14.1.0.3-r1.ebuild
new file mode 100644
index 000000000000..c8339b631c36
--- /dev/null
+++ b/x11-themes/laughlin-backgrounds/laughlin-backgrounds-14.1.0.3-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator rpm
+
+SRC_PATH=development/15/source/SRPMS
+FEDORA=15
+
+MY_P="${PN}-$(get_version_component_range 1-3)"
+
+DESCRIPTION="Fedora official background artwork"
+HOMEPAGE="https://fedoraproject.org/wiki/F14_Artwork"
+
+SRC_URI="mirror://fedora-dev/${SRC_PATH}/${PN}-$(replace_version_separator 3 -).fc${FEDORA}.src.rpm"
+
+LICENSE="CC-BY-SA-2.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+SLOT=0
+
+src_unpack() {
+ rpm_src_unpack
+
+ # as of 2017-07-28 rpm.eclass does not unpack the further lzma
+ # file automatically.
+ unpack ./${MY_P}.tar.lzma
+}
+
+src_compile() { :; }
+src_test() { :; }
+
+src_install() {
+ # The install targets are serial anyway.
+ emake -j1 DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/x11-themes/lovelock-backgrounds/lovelock-backgrounds-14.91.1.1-r1.ebuild b/x11-themes/lovelock-backgrounds/lovelock-backgrounds-14.91.1.1-r1.ebuild
new file mode 100644
index 000000000000..763d2429f78c
--- /dev/null
+++ b/x11-themes/lovelock-backgrounds/lovelock-backgrounds-14.91.1.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator rpm
+
+SRC_PATH=releases/15/Fedora/source/SRPMS
+FEDORA=15
+
+MY_P="${PN}-$(get_version_component_range 1-3)"
+
+DESCRIPTION="Fedora official background artwork"
+HOMEPAGE="https://fedoraproject.org/wiki/F15_Artwork"
+
+SRC_URI="mirror://fedora-dev/${SRC_PATH}/${PN}-$(replace_version_separator 3 -).fc${FEDORA}.src.rpm"
+
+LICENSE="CC-BY-SA-3.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+SLOT=0
+
+src_compile() { :; }
+src_test() { :; }
+
+src_install() {
+ # The install targets are serial anyway.
+ emake -j1 DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/x11-themes/obsidian-xcursors/obsidian-xcursors-1.0.ebuild b/x11-themes/obsidian-xcursors/obsidian-xcursors-1.0.ebuild
index 70d248b403a7..baf46172c1e6 100644
--- a/x11-themes/obsidian-xcursors/obsidian-xcursors-1.0.ebuild
+++ b/x11-themes/obsidian-xcursors/obsidian-xcursors-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
MY_PN="Obsidian"
@@ -8,7 +8,7 @@ SRC_URI="http://www.kde-look.org/CONTENT/content-files/73135-${MY_PN}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND=""
diff --git a/x11-themes/verne-backgrounds/verne-backgrounds-15.91.0.1-r1.ebuild b/x11-themes/verne-backgrounds/verne-backgrounds-15.91.0.1-r1.ebuild
new file mode 100644
index 000000000000..c8a18fcbafe0
--- /dev/null
+++ b/x11-themes/verne-backgrounds/verne-backgrounds-15.91.0.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator rpm
+
+SRC_PATH=development/16/source/SRPMS
+FEDORA=16
+
+MY_P="${PN}-$(get_version_component_range 1-3)"
+
+DESCRIPTION="Fedora official background artwork"
+HOMEPAGE="https://fedoraproject.org/wiki/F16_Artwork"
+
+SRC_URI="mirror://fedora-dev/${SRC_PATH}/${PN}-$(replace_version_separator 3 -).fc${FEDORA}.src.rpm"
+
+LICENSE="CC-BY-SA-3.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+SLOT=0
+
+src_compile() { :; }
+src_test() { :; }
+
+src_install() {
+ # The install targets are serial anyway.
+ emake -j1 DESTDIR="${D}" install
+
+ dodoc Attribution
+}
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
index f6d89e3b57f0..6f7c9fc1288c 100644
--- a/x11-wm/bspwm/Manifest
+++ b/x11-wm/bspwm/Manifest
@@ -1,5 +1,2 @@
-DIST bspwm-0.8.8.tar.gz 66159 SHA256 378c5e42e9058a22e519a8f727e7d078eb5945915adb6edb17e2471310e73790 SHA512 09614549410d2f6bd58d1190e8008256077433481bb4f91426fbf14ef74c3bff92f3b2d2c72476b6439ad83807c7368591af46a0c34ec658bcc5b9c6f940ca55 WHIRLPOOL 331d089c7545a5fe6325e42aa9603f9dcb81d28fd9182329dbc50a0828fafa661ce12885894d728ad99f0d04ca5a2773de257b91f62e1be3f272e0ee8a7b5674
-DIST bspwm-0.8.9.tar.gz 65604 SHA256 750c76132914661d8d5edf7809e9b601977215d31e747dd780c60fd562913d55 SHA512 77dd3d10278519bdcba02ab3309617d078428953d2944a1a5013b7ac87ae9b9c3e405760edfc78a6d740c383c8bf083598885448219f3a60e6f912389343b4f7 WHIRLPOOL dc3153b082616b44d71348b604e5f923a603b4ea75e9665c6a7ad384bafdd33da2f83da3275af671dbac614aefd953e990355cb0713504037ef57003cc46261b
-DIST bspwm-0.9.1.tar.gz 82335 SHA256 02bb58a307acdec242eb4b8a62764ed53d01c30474dfb1bc09812d943773bb85 SHA512 0940e4e024326a903189e6f46fb713eec202f718a02cece56476e6cda147aec6f8c6d6d646879b297b56a385c3b1714069ad204cf5ec0a5d7a0faf40cc45f74b WHIRLPOOL babbb2bc63844b6e778723e9899f78175b967a6ebfb99468f0ad97a792ffab059fe1c83bbc08bc7eb9245bf83b9b5622b7ac7e3c1fb3849e333cd71eb1ffb23d
DIST bspwm-0.9.2.tar.gz 92558 SHA256 33689d138d50f42444820b3a76b84fee7fa3af58e33ad589319c84e51fefdcf0 SHA512 fe46d74ecc1ab29caa038d8bb54e13cde8a40e28a014f8b313222db6e8a3323d3ec2103f4ff78008bb0252fa2d560424788ea3be66faaf38a2b8aa3b46b09e2c WHIRLPOOL 70b6f9572225e60e78fd6188644355dde6aca2702d723b1fb9930f9395480833593c38b9f48c7b2d25fa68f0619a68a0de2ac4634c10136f7d9ebfb2a4334f50
-DIST bspwm-0.9.tar.gz 62798 SHA256 1efb2db7b8a251bcc006d66a050cf66e9d311761c94890bebf91a32905042fde SHA512 09c4a52dc9f2635973d3b31d507373c27e17a8fb172b2783422049cfc4fa8416bb87a29dea74c2e0e71febdfa53f86a9c09004aa7328b6a08490537329c48370 WHIRLPOOL c96d6966a0385513b7ad25ce84fec4e959b65076209112f7f15f6e33cfc676994103fbee00d28d1809c74f506feaeddedf91b72006fc72a8099a59e5f549e727
+DIST bspwm-0.9.3.tar.gz 95779 SHA256 b356e3ff5754c63c94b36d904274c0ba16f9a8494e78a1c93bb23113f891bc9d SHA512 015ed79af4b31c5fbd10bdf3d6945e3e2575ef3d1ab48dc7ddeb52e99cd6e121991a320515ad05b42b001b524c7ebe38b5d2b2aae0078c6601a36653718ab508 WHIRLPOOL d7ad190008a34e38ac9dee1e264b15613dfea72775c4d3ad0de0c6a3651820e71497d435da5306151b5b0f59e7571a7487eabefcb16d78b27fc222438cebc13e
diff --git a/x11-wm/bspwm/bspwm-0.8.8-r1.ebuild b/x11-wm/bspwm/bspwm-0.8.8-r1.ebuild
deleted file mode 100644
index d432c1f00da1..000000000000
--- a/x11-wm/bspwm/bspwm-0.8.8-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tiling window manager based on binary space partitioning"
-HOMEPAGE="https://github.com/baskerville/bspwm/"
-SRC_URI="https://github.com/baskerville/bspwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="
- x11-libs/libxcb
- x11-libs/xcb-util-wm
-"
-RDEPEND="${DEPEND}
- x11-misc/sxhkd
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-flags.patch
- epatch "${FILESDIR}"/${P}-desktop.patch
-}
-
-src_compile() {
- emake PREFIX=/usr CC="$(tc-getCC)"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX=/usr install
- dodoc doc/{CONTRIBUTING,MISC,TODO}.md
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN}
-
- insinto /usr/share/xsessions
- doins contrib/lightdm/bspwm.desktop
-
- insinto /etc/xdg/sxhkd
- doins examples/sxhkdrc
-
- if use examples ; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/x11-wm/bspwm/bspwm-0.8.9.ebuild b/x11-wm/bspwm/bspwm-0.8.9.ebuild
deleted file mode 100644
index f1dc7c797b89..000000000000
--- a/x11-wm/bspwm/bspwm-0.8.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tiling window manager based on binary space partitioning"
-HOMEPAGE="https://github.com/baskerville/bspwm/"
-SRC_URI="https://github.com/baskerville/bspwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="
- x11-libs/libxcb
- x11-libs/xcb-util-wm
-"
-RDEPEND="${DEPEND}
- x11-misc/sxhkd
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.8.8-flags.patch
- epatch "${FILESDIR}"/${PN}-0.8.8-desktop.patch
-}
-
-src_compile() {
- emake PREFIX=/usr CC="$(tc-getCC)"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX=/usr install
- dodoc doc/{CONTRIBUTING,MISC,TODO}.md
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN}
-
- insinto /usr/share/xsessions
- doins contrib/lightdm/bspwm.desktop
-
- insinto /etc/xdg/sxhkd
- doins examples/sxhkdrc
-
- if use examples ; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/x11-wm/bspwm/bspwm-0.9.1.ebuild b/x11-wm/bspwm/bspwm-0.9.3.ebuild
similarity index 99%
rename from x11-wm/bspwm/bspwm-0.9.1.ebuild
rename to x11-wm/bspwm/bspwm-0.9.3.ebuild
index 5d40c6322e25..c8ded088233e 100644
--- a/x11-wm/bspwm/bspwm-0.9.1.ebuild
+++ b/x11-wm/bspwm/bspwm-0.9.3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit toolchain-funcs
DESCRIPTION="Tiling window manager based on binary space partitioning"
diff --git a/x11-wm/bspwm/bspwm-0.9.ebuild b/x11-wm/bspwm/bspwm-0.9.ebuild
deleted file mode 100644
index 9c9894f53cf8..000000000000
--- a/x11-wm/bspwm/bspwm-0.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tiling window manager based on binary space partitioning"
-HOMEPAGE="https://github.com/baskerville/bspwm/"
-SRC_URI="https://github.com/baskerville/bspwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="
- x11-libs/libxcb
- x11-libs/xcb-util-wm
-"
-RDEPEND="${DEPEND}
- x11-misc/sxhkd
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.8.8-flags.patch
- epatch "${FILESDIR}"/${P}-desktop.patch
-}
-
-src_compile() {
- emake PREFIX=/usr CC="$(tc-getCC)"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX=/usr install
- dodoc doc/{CONTRIBUTING,MISC,TODO}.md
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN}
-
- insinto /usr/share/xsessions
- doins contrib/freedesktop/bspwm.desktop
-
- insinto /etc/xdg/sxhkd
- doins examples/sxhkdrc
-
- if use examples ; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/x11-wm/bspwm/files/bspwm-0.8.8-desktop.patch b/x11-wm/bspwm/files/bspwm-0.8.8-desktop.patch
deleted file mode 100644
index 589a5abed893..000000000000
--- a/x11-wm/bspwm/files/bspwm-0.8.8-desktop.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- bspwm-0.8.8/contrib/lightdm/bspwm.desktop
-+++ bspwm-0.8.8/contrib/lightdm/bspwm.desktop
-@@ -2,5 +2,5 @@
- Encoding=UTF-8
- Name=bspwm
- Comment=Launch a bspwm session
--Exec=/usr/bin/bspwm-session
-+Exec=/etc/X11/Sessions/bspwm
- Type=XSession
diff --git a/x11-wm/bspwm/files/bspwm-0.8.8-flags.patch b/x11-wm/bspwm/files/bspwm-0.8.8-flags.patch
deleted file mode 100644
index b0dcacac4dba..000000000000
--- a/x11-wm/bspwm/files/bspwm-0.8.8-flags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- bspwm-0.8.8/Makefile
-+++ bspwm-0.8.8/Makefile
-@@ -18,11 +18,9 @@
- CL_SRC = bspc.c helpers.c
- CL_OBJ = $(CL_SRC:.c=.o)
-
--all: CFLAGS += -Os
--all: LDFLAGS += -s
- all: bspwm bspc
-
--debug: CFLAGS += -O0 -g -DDEBUG
-+debug: CFLAGS += -DDEBUG
- debug: bspwm bspc
-
- include Sourcedeps
diff --git a/x11-wm/bspwm/files/bspwm-0.9-desktop.patch b/x11-wm/bspwm/files/bspwm-0.9-desktop.patch
deleted file mode 100644
index a8f3524b500c..000000000000
--- a/x11-wm/bspwm/files/bspwm-0.9-desktop.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- bspwm-0.9/contrib/freedesktop/bspwm.desktop
-+++ bspwm-0.9/contrib/freedesktop/bspwm.desktop
-@@ -2,5 +2,5 @@
- Encoding=UTF-8
- Name=bspwm
- Comment=Launch a bspwm session
--Exec=/usr/bin/bspwm-session
-+Exec=/etc/X11/Sessions/bspwm
- Type=XSession
diff --git a/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch b/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
new file mode 100644
index 000000000000..d241a748186e
--- /dev/null
+++ b/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
@@ -0,0 +1,86 @@
+From: Natanael Copa
+Patch-Source: https://git.alpinelinux.org/cgit/aports/tree/community/i3wm/musl.patch
+Project-Bug-URL: https://github.com/i3/i3/issues/1859
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=609306
+
+Musl doesn't implement GLOB_TILDE, which is used by i3 when expanding paths.
+
+This patch replaces usage of GLOB_TILDE in glob() by replacing tilde
+with the content of $HOME - if set - manually.
+
+As mentioned in the i3 bugtracker this is an issue that should be solved by musl.
+
+A patch has been sent to musl upstream, but it hasn't been merged yet:
+http://www.openwall.com/lists/musl/2017/01/17/1
+---
+--- i3-4.11/i3bar/src/main.c
++++ i3-4.11/i3bar/src/main.c
+@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
+ *
+ */
+ char *expand_path(char *path) {
+- static glob_t globbuf;
+- if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
+- ELOG("glob() failed\n");
+- exit(EXIT_FAILURE);
++ char *home, *expanded;
++
++ if (strncmp(path, "~/", 2) == 0) {
++ home = getenv("HOME");
++ if (home != NULL) {
++ /* new length: sum - 1 (omit '~') + 1 (for '\0') */
++ expanded = scalloc(strlen(home)+strlen(path), 1);
++ strcpy(expanded, home);
++ strcat(expanded, path+1);
++ return expanded;
++ }
+ }
+- char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+- globfree(&globbuf);
+- return result;
++
++ return sstrdup(path);
+ }
+
+ void print_usage(char *elf_name) {
+--- i3-4.11/libi3/resolve_tilde.c
++++ i3-4.11/libi3/resolve_tilde.c
+@@ -19,27 +19,18 @@
+ *
+ */
+ char *resolve_tilde(const char *path) {
+- static glob_t globbuf;
+- char *head, *tail, *result;
++ char *home, *expanded;
+
+- tail = strchr(path, '/');
+- head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
+-
+- int res = glob(head, GLOB_TILDE, NULL, &globbuf);
+- free(head);
+- /* no match, or many wildcard matches are bad */
+- if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
+- result = sstrdup(path);
+- else if (res != 0) {
+- err(EXIT_FAILURE, "glob() failed");
+- } else {
+- head = globbuf.gl_pathv[0];
+- result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
+- strncpy(result, head, strlen(head));
+- if (tail)
+- strncat(result, tail, strlen(tail));
++ if (strncmp(path, "~/", 2) == 0) {
++ home = getenv("HOME");
++ if (home != NULL) {
++ /* new length: sum - 1 (omit '~') + 1 (for '\0') */
++ expanded = scalloc(strlen(home)+strlen(path), 1);
++ strcpy(expanded, home);
++ strcat(expanded, path+1);
++ return expanded;
++ }
+ }
+- globfree(&globbuf);
+
+- return result;
++ return sstrdup(path);
+ }
diff --git a/x11-wm/i3/i3-4.13-r1.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
index 2311d42860af..047df54a6e2d 100644
--- a/x11-wm/i3/i3-4.13-r1.ebuild
+++ b/x11-wm/i3/i3-4.13-r1.ebuild
@@ -38,6 +38,7 @@ RDEPEND="${CDEPEND}
DOCS=( RELEASE-NOTES-${PV} )
PATCHES=(
"${FILESDIR}/${P}-remove-git-polling.patch"
+ "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
)
src_prepare() {
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index 1e6ce9e0da24..09c27735f9e1 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.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=6
@@ -37,6 +37,10 @@ RDEPEND="${CDEPEND}
dev-perl/AnyEvent-I3
dev-perl/JSON-XS"
+PATCHES=(
+ "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
+)
+
src_prepare() {
default
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index cf8cb9637267..1b2ad87c4fc3 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1,3 +1,2 @@
-DIST lumina-1.2.0.tar.gz 56031811 SHA256 fe7bc2a38ed8397194e6fdf95397e0d38b6fd6416d96240dfd348cd3a36b7336 SHA512 c0843b638999efeebca3b7bc8bdf3187b1606909554fdca1e9158e49ff93cc13a2061bd2697add589d33eefe2bb3a662c5938161622d7fc796f693a61ec9bd40 WHIRLPOOL 7c3e8255db4e1ef349943e9dacb2ac7f6f63156342f204a549e56634c4d87359bbbc8ce60234b08cba43cb0cc5aaebfcce3bc90447cf9f37ead68ff48f9e3f7d
DIST lumina-1.2.0_p1.tar.gz 56032695 SHA256 f8366212fe3f29039c5febef5b4de97a92eb72483e2d97f5c086edf8fc65bd49 SHA512 8490e2b0f2fa08b2d63ec688f9993771ea935129a2947ef7bfa1874424cbede6d8877083ce90658c283858e67397383b5bab536388e9222b440015ebdf8b2919 WHIRLPOOL 6a7fc95022c4f9cc372c4fafc87cbda70a5f3ebcb52dc1f96516460df928e6e2f02ea380104bd7df9f7df33b1d098b24d8e73ec7ffe77e82a633c920634f9c70
DIST lumina-1.3.0_p1.tar.gz 86451718 SHA256 76f2b6d45d37d154426cb100d46e3ca4e5e7eca51a7f9f9e442261bfe61b1c31 SHA512 93fb195f26984a2ba6e62dbe1ea619e4ab8e936d1cf1d335db8a7e51058c9be8d3e389146259f8229fb5dc6477610dcc2e1278c4e2a348f27904a318ba095707 WHIRLPOOL 6f3af86b66adc66a1b76732e23189946ad35e4897e4bd00912742e3d972bcf0d816b60055098c8ac1104e7e20ce938e7e4727c7501b5e7c92dcb49794c1bb38e
diff --git a/x11-wm/lumina/files/1.3.0-OS-detect.patch b/x11-wm/lumina/files/1.3.0-OS-detect.patch
index e1b71b2a789a..48a2076f3aaf 100644
--- a/x11-wm/lumina/files/1.3.0-OS-detect.patch
+++ b/x11-wm/lumina/files/1.3.0-OS-detect.patch
@@ -1,11 +1,14 @@
--- ./src-qt5/OS-detect.pri
+++ ./src-qt5/OS-detect.pri
-@@ -94,7 +94,7 @@
- isEmpty(L_SHAREDIR){ L_SHAREDIR = $${PREFIX}/share }
- isEmpty(L_INCLUDEDIR){ L_INCLUDEDIR = $${PREFIX}/include }
- isEmpty(L_SESSDIR){ L_SESSDIR = $${L_SHAREDIR}/xsessions }
-- isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/man }
-+ isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man }
- isEmpty(LRELEASE){ LRELEASE = $$[QT_INSTALL_BINS]/lrelease }
- isEmpty(MAN_ZIP){ MAN_ZIP = "gzip -c" }
- !exists(LRELEASE){ NO_I18N=true } #translations unavailable
+@@ -76,6 +76,11 @@
+ equals(LINUX_DISTRO,"Fedora"){
+ isEmpty(L_ETCDIR){ L_ETCDIR=/etc }
+ }
++ equals(LINUX_DISTRO,"Gentoo"){
++ isEmpty(L_BINDIR){ L_BINDIR = $${PREFIX}/bin }
++ isEmpty(L_ETCDIR){ L_ETCDIR = $${PREFIX}/../etc }
++ isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man }
++ }
+ }else{
+ OS="Unknown";
+ }
diff --git a/x11-wm/lumina/lumina-1.2.0.ebuild b/x11-wm/lumina/lumina-1.2.0.ebuild
deleted file mode 100644
index 6e231a1cd52a..000000000000
--- a/x11-wm/lumina/lumina-1.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-DESCRIPTION="Lumina desktop environment"
-HOMEPAGE="http://lumina-desktop.org/"
-I18N="161211"
-SRC_URI="https://github.com/trueos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEPEND="dev-qt/qtcore:5
- dev-qt/qtconcurrent:5
- dev-qt/qtmultimedia:5[widgets]
- dev-qt/qtsvg:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- dev-qt/qtgui:5
- dev-qt/qtdeclarative:5
- x11-libs/libxcb:0
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- x11-libs/xcb-util-wm"
-
-DEPEND="$COMMON_DEPEND
- dev-qt/linguist-tools:5"
-
-RDEPEND="$COMMON_DEPEND
- || ( virtual/freedesktop-icon-theme
- x11-themes/hicolor-icon-theme )
- sys-fs/inotify-tools
- x11-misc/numlockx
- x11-wm/fluxbox
- x11-apps/xbacklight
- media-sound/alsa-utils
- sys-power/acpi
- app-admin/sysstat"
-
-src_prepare(){
- default
-
- rm -rf src-qt5/desktop-utils || die
-
- sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
-}
-
-src_configure(){
- eqmake5 PREFIX="${EPREFIX}/usr" L_BINDIR="${EPREFIX}/usr/bin" \
- L_ETCDIR="${EPREFIX}/etc" L_LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" CONFIG+=WITH_I18N
-}
-
-src_install(){
- default
- mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
- rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die
-}
diff --git a/x11-wm/lumina/lumina-1.3.0_p1.ebuild b/x11-wm/lumina/lumina-1.3.0_p1.ebuild
index deae92b25005..794daf6eea80 100644
--- a/x11-wm/lumina/lumina-1.3.0_p1.ebuild
+++ b/x11-wm/lumina/lumina-1.3.0_p1.ebuild
@@ -57,9 +57,8 @@ src_prepare(){
}
src_configure(){
- eqmake5 PREFIX="${EPREFIX}/usr" L_BINDIR="${EPREFIX}/usr/bin" \
- L_ETCDIR="${EPREFIX}/etc" L_LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+ eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
+ DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
}
src_install(){
diff --git a/x11-wm/lumina/lumina-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild
index 63c5176b1f2b..11c8d155760b 100644
--- a/x11-wm/lumina/lumina-9999.ebuild
+++ b/x11-wm/lumina/lumina-9999.ebuild
@@ -44,7 +44,6 @@ S="${WORKDIR}/${P/_/-}"
PATCHES=(
"${FILESDIR}/1.2.0-desktop-files.patch"
- "${FILESDIR}/1.3.0-OS-detect.patch"
)
src_prepare(){
@@ -57,9 +56,8 @@ src_prepare(){
}
src_configure(){
- eqmake5 PREFIX="${EPREFIX}/usr" L_BINDIR="${EPREFIX}/usr/bin" \
- L_ETCDIR="${EPREFIX}/etc" L_LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+ eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
+ DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
}
src_install(){