diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 78263115beaf..2f9963872f28 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1,3 @@
DIST keepassxc-2.1.4.tar.gz 3345520 SHA256 40a990dbcf442eb3cad99452b58ffd36e5855b39e78f213ea20e99fbc7876701 SHA512 48030eb6df595c73644f43d6222654c5f76962ae5aa2f44ca4dc9c8e45726380c6be4300af7a8279b07c06b70912da444f2b17c5b6c37a91cb239d695e7518d8 WHIRLPOOL da2bdac3e334b48903c6b20532ea4a0af0fe057e10e702ba6a4221e828b8f416d666ff67407b434d38b4cbbe5119d3c8a49927e4d5092f4f62ab49e30981017c
DIST keepassxc-2.2.0.tar.gz 3814252 SHA256 9d9d39b9c056955fe5d7a5212efe1703be02fa4731c36e2b1e06a78174b0a7b8 SHA512 e23968c259afade81c8dcf0786ed68ca77ca8e9726dffb12e1017f2f60afb29b60ec1b71450ce7e284d543bcaa72bbc79bec917dea852d5bb923dff7fc6edcb5 WHIRLPOOL a993068922d8fd0bd1b06d434fff7340160c30992a166f15d9692d83e4a985939b88d20fce2b0425d3bab00de0e2ffce6fd2d34ff0bd92d08d95747ae03c9df9
+DIST keepassxc-2.2.1.tar.gz 3880551 SHA256 184663e8b08e081dedf4c9dbdd68bf86ed0f5e32388b4781b7afcf89ef5c8e4d SHA512 bce2a0d6d3ad32bb507afac22670b34c37f5e36de6a30bb7c9b5a523c12bad59d95a414b90608451660fb9ce224279c7658e1892f2b99c673908449cc86e5595 WHIRLPOOL 32a0ede5c150bc4fc54c1b0a8f3c46110a19349d732913bdc9f3bc6492c1998569b2cd7a178ec9bb11e5b8dc9698138d8a7f26000211377a0c90f505605fe54c
diff --git a/app-admin/keepassxc/keepassxc-2.2.1.ebuild b/app-admin/keepassxc/keepassxc-2.2.1.ebuild
new file mode 100644
index 000000000000..00fb3e294475
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.2.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" == 9999 ]] && SCM="git-r3"
+inherit cmake-utils ${SCM}
+unset SCM
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://github.com/keepassxreboot/keepassxc"
+
+if [[ "${PV}" != 9999 ]] ; then
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+else
+ EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype debug http test yubikey"
+
+RDEPEND="
+ dev-libs/libgcrypt:=
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ sys-libs/zlib
+ autotype? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXtst
+ )
+ yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-qt/linguist-tools:5
+ dev-qt/qtconcurrent:5
+ test? ( dev-qt/qttest:5 )
+"
+
+src_prepare() {
+ use test || \
+ sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_GUI_TESTS=OFF
+ -DWITH_TESTS="$(usex test)"
+ -DWITH_XC_AUTOTYPE="$(usex autotype)"
+ -DWITH_XC_HTTP="$(usex http)"
+ -DWITH_XC_YUBIKEY="$(usex yubikey)"
+ )
+ cmake-utils_src_configure
+}
diff --git a/app-admin/monit/monit-5.23.0.ebuild b/app-admin/monit/monit-5.23.0.ebuild
index 0cbe43595233..17d2826d6bc8 100644
--- a/app-admin/monit/monit-5.23.0.ebuild
+++ b/app-admin/monit/monit-5.23.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-linux"
IUSE="libressl pam ssl"
RDEPEND="
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index 3a9d997ee0ab..04e2f4c277df 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -1,4 +1,3 @@
-DIST restic-0.4.0.tar.gz 22926188 SHA256 746dbc7b73f5a542be57b71714b243266a011f1d750f56f5100c08a59df1aeac SHA512 ccd15f010f8da3bae3d33698e70ff1d9565f52fb56991b78d35f95493417a4ab050021153d81c424947233255d9553d050f7a66e1c709843fe3b2d323a81f85b WHIRLPOOL 94e6b9ed777a86cb6e46cf734b9280e68cc2ce1ea061c8a94409dca594add1ec24fb736a56e35571302ff5043a60bef7f60ff3b39b038ee128bc815f7d3d48cd
-DIST restic-0.5.0.tar.gz 22937327 SHA256 a8e99087478a076b8a9c7c74d37cd23a56224d8c9b242c171756784ade024fda SHA512 571e4b0aa92a6cd9320f48c46a4b2190576d9328169d54762747dfa024ab280fb41ee377b59f0114d89ebd50bc54488a8cb5e2b36c57959202e848394107bb3c WHIRLPOOL 19fef25a6e2dff3145a6700abb581e7cae3abe5522ee0197f56a572d499824e84ba25a3111c5e71856ffac18d75622766c74c585a44b6db489468050e1c8d59a
DIST restic-0.6.1.tar.gz 25231223 SHA256 7cd709c592a5978723673397d7d13c37c0977e20c43db253d0c274b53a55654a SHA512 8c899ca8b6e3dfa399fe5c4306f72a1bcfa869dd667d27f3f88efa26aaa1000959bf91b515911b2ef7b2d4c5bb3e2ed4f202c87add7766d2147b7d40f0757a9a WHIRLPOOL 39225876fd6ce9e4ddac765688238ab5ea430272aacc6e96d54c359de939d2e69cdc45a5571cb63777c258a74b5a9bfbd6114d2463004b242b009856d87b6e2e
DIST restic-0.7.1.tar.gz 25438170 SHA256 81efde662c34225b5705f3d72daa1f6278455c2b8f786224d7a1ecca0b14efca SHA512 3b887149c801fe81f9bf65e0ae4a17ba97f66c0133f45b3f5526d79d580f072e0e5fd89cd78a5018992dc42e6dafb9385139f4336fe6f06d57d8abe7a9e323b1 WHIRLPOOL bbdeafadd7b329147b7ea30b13d806d20de76e8efcc1ace4eea74420aa39f6d7a8f5eb186169d2a053988d07d44063ca71c54287aa07c4cd4cdc906a07b80dc7
+DIST restic-0.7.3.tar.gz 37062625 SHA256 6d795a5f052b3a8cb8e7571629da14f00e92035b7174eb20e32fd1440f68aaff SHA512 2d44b4fc363c7f6389c1f06469cf30ebeff4d6ade0bd4fcae1d7d9def3922936b45043b04f4072284b773df2c6487c58db6aea41c7de5c8184ca33ca3c44d44a WHIRLPOOL dde430e4d718928b01da0f1558fd8a7bf65a0d9e3a4a620cc7557e6afd4760a8dc6c1a9d7c744649cb817b99fb22ee2e2f893d5fd49fa961d5ab6b8bb02941b0
diff --git a/app-backup/restic/restic-0.4.0.ebuild b/app-backup/restic/restic-0.4.0.ebuild
deleted file mode 100644
index f8b97883a8ac..000000000000
--- a/app-backup/restic/restic-0.4.0.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
-
-DESCRIPTION="restic is a backup program that is fast, efficient and secure"
-HOMEPAGE="https://restic.github.io/"
-SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DOCS=( README.md CONTRIBUTING.md doc/Design.md doc/FAQ.md doc/index.md doc/Manual.md doc/REST_backend.md )
-
-DEPEND="dev-lang/go
- test? ( sys-fs/fuse:0 )"
-
-RDEPEND="sys-fs/fuse:0"
-
-src_compile() {
- local mygoargs=(
- -v
- -work
- -x
- -tags release
- -ldflags "-w -X main.version=${PV}"
- -o "${S}"/restic cmds/restic
- )
-
- GOPATH="${S}:${S}/vendor" go build "${mygoargs[@]}" || die
-}
-
-src_test() {
- GOPATH="${S}:${S}/vendor" go test -v -work -x restic/... cmds/... || die
-}
-
-src_install() {
- dobin restic
- einstalldocs
-}
diff --git a/app-backup/restic/restic-0.5.0.ebuild b/app-backup/restic/restic-0.5.0.ebuild
deleted file mode 100644
index 7780342a0c84..000000000000
--- a/app-backup/restic/restic-0.5.0.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
-
-DESCRIPTION="restic is a backup program that is fast, efficient and secure"
-HOMEPAGE="https://restic.github.io/"
-SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DOCS=( README.md CONTRIBUTING.md doc/Design.md doc/FAQ.md doc/index.md doc/Manual.md doc/REST_backend.md )
-
-DEPEND="dev-lang/go
- test? ( sys-fs/fuse )"
-
-RDEPEND="sys-fs/fuse:0"
-
-src_compile() {
- local mygoargs=(
- -v
- -work
- -x
- -tags release
- -ldflags "-w -X main.version=${PV}"
- -o "${S}"/restic cmds/restic
- )
-
- GOPATH="${S}:${S}/vendor" go build "${mygoargs[@]}" || die
-}
-
-src_test() {
- GOPATH="${S}:${S}/vendor" go test -v -work -x restic/... cmds/... || die
-}
-
-src_install() {
- dobin restic
- einstalldocs
-}
diff --git a/app-backup/restic/restic-0.7.3.ebuild b/app-backup/restic/restic-0.7.3.ebuild
new file mode 100644
index 000000000000..8d2fe07c31c1
--- /dev/null
+++ b/app-backup/restic/restic-0.7.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+DESCRIPTION="A backup program that is fast, efficient and secure"
+HOMEPAGE="https://restic.github.io/"
+SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGO_PN="github.com/restic/restic"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+DOCS=(
+ README.rst CONTRIBUTING.md doc/design.rst
+ doc/faq.rst doc/index.rst doc/manual.rst
+ doc/rest_backend.rst doc/development.rst
+ doc/talks.rst doc/tutorial_aws_s3.rst doc/installation.rst
+)
+
+DEPEND="
+ dev-lang/go
+ test? ( sys-fs/fuse:0 )"
+
+RDEPEND="sys-fs/fuse:0"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+ local mygoargs=(
+ -v
+ -work
+ -x
+ -tags release
+ -ldflags "-s -w -X main.version=${PV}"
+ -asmflags "-trimpath=${S}"
+ -gcflags "-trimpath=${S}"
+ -o restic ${EGO_PN}/cmd/restic
+ )
+
+ GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+ go build "${mygoargs[@]}" || die
+}
+
+src_test() {
+ GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+ go test -timeout 30m -v -work -x ${EGO_PN}/cmd/... ${EGO_PN}/internal/... || die
+}
+
+src_install() {
+ dobin restic
+ einstalldocs
+
+ local i
+ for i in doc/man/*; do
+ doman "$i"
+ done
+}
diff --git a/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
index fb5729d600b3..e53e5581d7d0 100644
--- a/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86"
IUSE="debug"
S="${WORKDIR}/${P}"
diff --git a/app-benchmarks/jmeter/Manifest b/app-benchmarks/jmeter/Manifest
deleted file mode 100644
index 474fbe032585..000000000000
--- a/app-benchmarks/jmeter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jakarta-jmeter-2.0.1_src.tgz 5368483 SHA256 8dc7b0ff680af721adeeab198f7dc99f5e376df04c2504291564cfaccdcf5f36 SHA512 221a9d1ed19407ab0b863443827f8b6d7f179ef27227defc3c71ab4ccb5981bbb82f239206993590500a9adf2444cdcefb219dcb28afe6488659a2be19374b08 WHIRLPOOL 07a980e7f46da636d760a0c62ba42de653fda3417cc2442fc34d5e13b46291b3a3f0c49fd05a93bdebb7d8968c5a77e643a59094fdf619d0dc24e048a9e5f762
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r4.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r4.ebuild
deleted file mode 100644
index b943e3afd8f9..000000000000
--- a/app-benchmarks/jmeter/jmeter-2.0.1-r4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Load test and measure performance on HTTP/FTP services and databases"
-HOMEPAGE="http://jmeter.apache.org/"
-SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}_src.tgz"
-COMMON_DEP="
- beanshell? ( dev-java/bsh )
- >=dev-java/bsf-2.3
- =dev-java/junit-3.8*
- java-virtuals/javamail"
-DEPEND=">=virtual/jdk-1.4
- doc? ( >=dev-java/velocity-1.4 )
- dev-java/ant-nodeps
- sys-apps/sed
- ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="beanshell doc"
-
-S=${WORKDIR}/jakarta-${P}
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- sed -i -e 's/%//g' bin/jmeter || die "Unable to sed."
- cd "${S}/lib"
- # FIXME replace all bundled jars bug #63309
- # then rm -f *.jar
- use beanshell && java-pkg_jar-from bsh
- java-pkg_jar-from bsf-2.3
- java-pkg_jar-from junit
- java-pkg_jar-from --virtual javamail
- java-pkg_filter-compiler jikes
-}
-
-src_compile() {
- local tasks="ant-nodeps"
- use doc && tasks="${tasks} velocity"
- ANT_TASKS="${tasks}" eant package $(use_doc docs-all) || die "compile problem"
-}
-
-src_install() {
- diropts --mode=0775
- dodir /opt/${PN}
- local dest="${D}/opt/${PN}/"
- cp -pPR bin/ lib/ printable_docs/ "${dest}"
- if use doc; then
- cp -pPR printable_docs "${dest}" || die "Failed to install docs"
- fi
- dodoc README || die
- use doc && dohtml -r docs/*
-}
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r5.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r5.ebuild
deleted file mode 100644
index 5047d9fcdbc0..000000000000
--- a/app-benchmarks/jmeter/jmeter-2.0.1-r5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Load test and measure performance on HTTP/FTP services and databases"
-HOMEPAGE="http://jmeter.apache.org/"
-SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}_src.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="beanshell"
-
-COMMON_DEP="
- beanshell? ( dev-java/bsh )
- >=dev-java/bsf-2.3
- =dev-java/junit-3.8*
- java-virtuals/javamail"
-DEPEND=">=virtual/jdk-1.4
- doc? ( >=dev-java/velocity-1.4 )
- dev-java/ant-nodeps
- sys-apps/sed
- ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-
-S=${WORKDIR}/jakarta-${P}
-
-java_prepare() {
- sed -i -e 's/%//g' bin/jmeter || die "Unable to sed."
- cd "${S}/lib" || die
- # FIXME replace all bundled jars bug #63309
- # then rm -f *.jar
- use beanshell && java-pkg_jar-from bsh
- java-pkg_jar-from bsf-2.3
- java-pkg_jar-from junit
- java-pkg_jar-from --virtual javamail
- java-pkg_filter-compiler jikes
-
- find "${S}"/src -name "*.java" | xargs sed -i -e 's:\benum\b:enumx:g' || die # fix for bug #514662
-}
-
-src_compile() {
- local tasks="ant-nodeps"
- use doc && tasks="${tasks} velocity"
- ANT_TASKS="${tasks}" eant package $(use_doc docs-all) || die "compile problem"
-}
-
-src_install() {
- diropts --mode=0775
- dodir /opt/${PN}
- local dest="${D}/opt/${PN}/"
- cp -pPR bin/ lib/ "${dest}" || die
- if use doc; then
- cp -pPR printable_docs "${dest}" || die "Failed to install docs"
- fi
- dodoc README
-
- echo "PATH=\"/opt/${PN}/bin\"" > "${T}/90${PN}" || die
- doenvd "${T}/90${PN}" || die "failed to install env.d file"
-
- use doc && dohtml -r docs/*
- use source && java-pkg_dosrc src/*
- use examples && java-pkg_doexamples xdocs/demos/*
-}
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r6.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r6.ebuild
deleted file mode 100644
index d68977f85f3b..000000000000
--- a/app-benchmarks/jmeter/jmeter-2.0.1-r6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Load test and measure performance on HTTP/FTP services and databases"
-HOMEPAGE="http://jmeter.apache.org/"
-SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}_src.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="beanshell"
-
-CDEPEND="
- beanshell? (
- dev-java/bsh:0
- )
- dev-java/bsf:2.3
- dev-java/junit:0
- dev-java/oracle-javamail:0"
-DEPEND="virtual/jdk:1.7
- doc? (
- dev-java/velocity:0
- )
- dev-java/ant-nodeps
- sys-apps/sed
- ${CDEPEND}"
-RDEPEND="virtual/jre:1.7
- ${CDEPEND}"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-S=${WORKDIR}/jakarta-${P}
-
-java_prepare() {
- sed -i -e 's/%//g' bin/jmeter || die "Unable to sed."
- cd "${S}/lib" || die
- # FIXME replace all bundled jars bug #63309
- # then rm -f *.jar
- use beanshell && java-pkg_jar-from bsh
- java-pkg_jar-from bsf-2.3
- java-pkg_jar-from junit
- java-pkg_jar-from oracle-javamail
- java-pkg_filter-compiler jikes
-
- find "${S}"/src -name "*.java" | xargs sed -i -e 's:\benum\b:enumx:g' || die # fix for bug #514662
-}
-
-src_compile() {
- local tasks="ant-nodeps"
- use doc && tasks="${tasks} velocity"
- ANT_TASKS="${tasks}" eant package $(use_doc docs-all) || die "compile problem"
-}
-
-src_install() {
- diropts --mode=0775
- dodir /opt/${PN}
- local dest="${D}/opt/${PN}/"
- cp -pPR bin/ lib/ "${dest}" || die
- if use doc; then
- cp -pPR printable_docs "${dest}" || die "Failed to install docs"
- fi
- dodoc README
-
- echo "PATH=\"/opt/${PN}/bin\"" > "${T}/90${PN}" || die
- doenvd "${T}/90${PN}" || die "failed to install env.d file"
-
- use doc && dohtml -r docs/*
- use source && java-pkg_dosrc src/*
- use examples && java-pkg_doexamples xdocs/demos/*
-}
diff --git a/app-benchmarks/jmeter/metadata.xml b/app-benchmarks/jmeter/metadata.xml
deleted file mode 100644
index 0e34f6bf758b..000000000000
--- a/app-benchmarks/jmeter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- java@gentoo.org
- Java
-
-
-
diff --git a/app-emacs/basic-toolkit/basic-toolkit-0.3.ebuild b/app-emacs/basic-toolkit/basic-toolkit-0.3.ebuild
index c7d3ee4df3ac..bf652da1d2f0 100644
--- a/app-emacs/basic-toolkit/basic-toolkit-0.3.ebuild
+++ b/app-emacs/basic-toolkit/basic-toolkit-0.3.ebuild
@@ -8,7 +8,7 @@ inherit elisp
DESCRIPTION="Basic edit toolkit"
HOMEPAGE="https://www.emacswiki.org/emacs/basic-toolkit.el"
# taken from https://www.emacswiki.org/emacs/download/basic-toolkit.el
-SRC_URI="https://enise.org/users/victor/share/distfiles/${P}.el.xz"
+SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
LICENSE="GPL-3+"
SLOT="0"
diff --git a/app-emacs/buffer-extension/buffer-extension-0.1.ebuild b/app-emacs/buffer-extension/buffer-extension-0.1.ebuild
index a31d168a8b47..681419847dfe 100644
--- a/app-emacs/buffer-extension/buffer-extension-0.1.ebuild
+++ b/app-emacs/buffer-extension/buffer-extension-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
@@ -8,7 +8,7 @@ inherit elisp
DESCRIPTION="Some enhanced functions for buffer manipulate"
HOMEPAGE="http://www.emacswiki.org/emacs/buffer-extension.el"
# taken from https://www.emacswiki.org/emacs/download/buffer-extension.el
-SRC_URI="https://enise.org/users/victor/share/distfiles/${P}.el.xz"
+SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
LICENSE="GPL-3+"
SLOT="0"
diff --git a/app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild b/app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild
index 460e670ef3b7..c832d4dfef1f 100644
--- a/app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild
+++ b/app-emacs/cycle-buffer/cycle-buffer-2.16.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
@@ -8,7 +8,7 @@ inherit elisp
DESCRIPTION="Select buffer by cycling through"
HOMEPAGE="http://www.emacswiki.org/emacs/cycle-buffer.el"
# taken from https://www.emacswiki.org/emacs/download/cycle-buffer.el
-SRC_URI="https://enise.org/users/victor/share/distfiles/${P}.el.xz"
+SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
LICENSE="public-domain"
SLOT="0"
diff --git a/app-emacs/revive/revive-2.23.ebuild b/app-emacs/revive/revive-2.23.ebuild
index bfe2bc7fe32c..056dfc59711b 100644
--- a/app-emacs/revive/revive-2.23.ebuild
+++ b/app-emacs/revive/revive-2.23.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
@@ -8,7 +8,7 @@ inherit elisp
DESCRIPTION="Resume Emacs"
HOMEPAGE="http://www.gentei.org/~yuuji/software/"
# taken from http://www.gentei.org/~yuuji/software/euc/revive.el
-SRC_URI="https://enise.org/users/victor/share/distfiles/${P}.el.xz"
+SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
LICENSE="yuuji"
SLOT="0"
diff --git a/app-emacs/windows/windows-2.49.ebuild b/app-emacs/windows/windows-2.49.ebuild
index 29f1ef3878a0..75cecc5d2318 100644
--- a/app-emacs/windows/windows-2.49.ebuild
+++ b/app-emacs/windows/windows-2.49.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
@@ -8,7 +8,7 @@ inherit elisp
DESCRIPTION="Window manager for GNU Emacs"
HOMEPAGE="http://www.gentei.org/~yuuji/software/"
# taken from http://www.gentei.org/~yuuji/software/euc/windows.el
-SRC_URI="https://enise.org/users/victor/share/distfiles/${P}.el.xz"
+SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
LICENSE="yuuji"
SLOT="0"
diff --git a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.7.0-fix-boot-p2m.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.7.0-fix-boot-p2m.patch
deleted file mode 100644
index e9c80400bdc1..000000000000
--- a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.7.0-fix-boot-p2m.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9714f6b87e19b32d3a6663a20df6610265c4bfe5 Mon Sep 17 00:00:00 2001
-From: Juergen Gross
-Date: Wed, 28 Sep 2016 06:02:44 +0200
-Subject: [PATCH] pvgrub: fix crash when booting kernel with p2m list outside
- kernel mapping
-
-When trying to boot a kernel with the p2m list not mapped by the
-initial kernel mapping it can happen that pvgrub is failing as it is
-keeping some page tables mapped.
-
-Unmap the additional page tables created for the special p2m mapping
-will avoid this failure.
-
-Reported-by: Sven Koehler
-Signed-off-by: Juergen Gross
-Acked-by: Wei Liu
----
- stubdom/grub/kexec.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/stubdom/grub/kexec.c b/stubdom/grub/kexec.c
-index 8fd9ff9..71c2f3f 100644
---- a/stubdom/grub/kexec.c
-+++ b/stubdom/grub/kexec.c
-@@ -347,6 +347,8 @@ void kexec(void *kernel, long kernel_size, void *module, long module_size, char
- /* Unmap libxc's projection of the boot page table */
- seg = xc_dom_seg_to_ptr(dom, &dom->pgtables_seg);
- munmap(seg, dom->pgtables_seg.vend - dom->pgtables_seg.vstart);
-+ seg = xc_dom_seg_to_ptr(dom, &dom->p2m_seg);
-+ munmap(seg, dom->p2m_seg.vend - dom->p2m_seg.vstart);
-
- /* Unmap day0 pages to avoid having a r/w mapping of the future page table */
- for (pfn = 0; pfn < allocated; pfn++)
---
-2.10.0
-
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
index d794eb5d66d2..c57e4b545664 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
LICENSE="LGPL-2.1 CDDL"
SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
IUSE=""
RDEPEND="dev-db/sqlite:3"
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 0534b5d37376..3594090c9e94 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,8 +1,7 @@
-DIST khal-0.8.1.tar.gz 125681 SHA256 9d352e4aa6256e493d5aea69540f642158bdcab75d2383e1e43506bf89982094 SHA512 01b24b7fb041a78443eb1ede80797ca689c2141bf6bb6b171f49931de7440055c38efc4611c483fe85da90794d074e4d08224ce633878ca2f7b8d66799391033 WHIRLPOOL cbcff5dec339ea97ee7bc83860b4f0c0f75801553e191d5856d30758c95936b2a156cea09ae9bd5a2ea96a3914b454f84ce0123970d1d74693be75caa23cbd27
-DIST khal-0.8.3.tar.gz 126656 SHA256 1ec6940a9fbd207c41428b103bac1d1555129b9b4eca2b843c544bd48ac63ee3 SHA512 f49e57a6cc9abfcf8dbc5811c2fe00661fd09a8a6d1a64bae4df5ce9c1d01c6f325adeef68a7b45eed3a34bd797b801c00fcd8fa4fdf378335d5273629f0a165 WHIRLPOOL 20963f12d9419f2421680548a6de22261e4d9c4482f6a28937b4339335b5a4965178bae0624cc5172da98c534603d3cd0ed5337e03c04190195a478b34b4a34f
DIST khal-0.8.4.tar.gz 129251 SHA256 2e5c41eadf83c8f175dc05816571e747da921b025e4acc6b287c109b6e237e0f SHA512 8a1066f137db1b3a9c2cc246ea17baf6745efd3db9dadacb76b287546137da363bcd78a4ac2acd2c659fbf25f16b155cc993099067a736ef3b68b2e8512d7b83 WHIRLPOOL 094c9ec2a0343d557ba70956239d5fa719d9fd08c7038d542b173f18ebce30b11761ac2e09780381fb55a9942cb885fd63b46d6c32573c94ed52990f34841e7b
DIST khal-0.9.0.tar.gz 158220 SHA256 b9aa992a8ed1a5d816eeeff79256ad7edea591acdf16ae30e65bfdc3adef0f8d SHA512 f457d6cbd323f65c2185776b8c8ed67268820ee4c06c845f3640dfc085a5528b19c855ada670d397a74d6c0785b7abeb90247528cbc826b39b51284917577acd WHIRLPOOL 4f003e39735917a7dec13f4aaffb851755e0d1f2c2d007111a4766622dfc900cece0c0dd38d5735d145ba36855639c08d1db3c3a7e5e9da5d428e23c469fc600
DIST khal-0.9.3.tar.gz 165182 SHA256 d4d748ae09fd0069124bf28ca61db1b1fbc3e8e95e2f23e597e28e2e38336ac7 SHA512 38f9c059eb8ebaacd40d4d5e276f8e42ea0bcc5237b46647974601458fc8576ec8920873cc90c002a8e101b2383028d60a2e74dbfb601acd9c0770ada2c63b65 WHIRLPOOL 8461b39508fb3b5bd2a0532dd71507334852b71492688f0dabcf76b9d70cf8f29e831a36d38028340c1fa1853dda4c1eda706559e8ee6dfb9ecdc112363b5002
DIST khal-0.9.4.tar.gz 169530 SHA256 21aa1ac464383a515be9f18d6b06413d17116ef9353d5349211c540c4bd7996e SHA512 a17643dc998b3414bb62d2fd2fd42a364dd5344eeb54be9cb310df8da952e06add41669d65d61b550385bc94bccff4382fca78e4cdcf71a202b8abe5c394d394 WHIRLPOOL 4ca55e0b5cdde8cde0b85d45b1b3936bd3f0b39bce127d9d59e2c442b37d93a520b83b523506579f4ebbccacd6bc26698ab4cd2de9330e872ed01c006f54d47a
DIST khal-0.9.5.tar.gz 170011 SHA256 b945894cb4ededa6711989814bd4866815f322aa25dff581d808a7eae5047b3b SHA512 8dae0989a7351a4148e9f6e52e8b69d1b46c7e5465233d5e389db5a20c9da6349da11f0119df7536b01c620a30cb43805cfcedaa32d563a592a337b0faf56946 WHIRLPOOL c98a2a7e7c03654c3b2bac0ba80104b61b8ef1ae8db6e41c8662a75470b7044d9ccfe6a01c702e65b79db645583793deed4fa4f6e65297f0b9079477159d6eb8
DIST khal-0.9.6.tar.gz 169539 SHA256 6ec7ce0202764839521f47805e10ac1f54e9adfae3f82e7c1e67ad88eefd6772 SHA512 3d8299d714fcf64d4790d270238acfc9250bfabce2182f49922e51004bce33509853ed6889e9eb694ee2f8f3357b1a175b2cec29ec135cf7fc8bacf237bbcc11 WHIRLPOOL 0bce1dca6f0a7fab0cd0399a9bbd020d8c77d30991181ba6856a46905295e6d68889149c171bfebd7c119a490a7154a3bc13820e072d754b7e0f65c83c523f75
+DIST khal-0.9.7.tar.gz 173401 SHA256 bbdacd99e725a21e35c5baf335261bf40528735bda6499c509ebbde39c303774 SHA512 24fd1ee472971f029f998b061da719a0dfe4ee9584a5ea237b6cf0c886b5c45d7a7ee4bf9c23c41eb0dd0c5eba0bcabed7a5f05ae486a890150429031e215180 WHIRLPOOL 7fa7125c169bc45ea4a9d638fd916698c9f4a7b792c8695020e7b82c593b8af3583546c11fb519cd3cd470caeaf21bda59ee9782e7d4bbb74e6710a7b0e63009
diff --git a/app-misc/khal/khal-0.8.1.ebuild b/app-misc/khal/khal-0.8.1.ebuild
deleted file mode 100644
index 6fa2eea34214..000000000000
--- a/app-misc/khal/khal-0.8.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="http://lostpackets.de/khal/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="zsh-completion"
-
-RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
- dev-python/icalendar[${PYTHON_USEDEP}]
- dev-python/urwid[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- >=dev-python/vdirsyncer-0.5.2[${PYTHON_USEDEP}]
- dev-python/pkginfo[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/configobj[${PYTHON_USEDEP}]
- dev-python/tzlocal[${PYTHON_USEDEP}]
- dev-python/setproctitle[${PYTHON_USEDEP}]
- zsh-completion? ( app-shells/zsh )"
-
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.txt README.rst khal.conf.sample )
-
-src_install() {
- distutils-r1_src_install
- if use zsh-completion; then
- insinto /usr/share/zsh/site-functions
- doins misc/__khal
- fi
-}
diff --git a/app-misc/khal/khal-0.8.3.ebuild b/app-misc/khal/khal-0.9.7.ebuild
similarity index 73%
rename from app-misc/khal/khal-0.8.3.ebuild
rename to app-misc/khal/khal-0.9.7.ebuild
index 48d27253bc4b..794c616f1a86 100644
--- a/app-misc/khal/khal-0.8.3.ebuild
+++ b/app-misc/khal/khal-0.9.7.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"
-PYTHON_COMPAT=( python3_4 )
+PYTHON_COMPAT=( python3_{4,5,6} )
PYTHON_REQ_USE="sqlite"
inherit distutils-r1
@@ -18,21 +18,22 @@ SLOT="0"
IUSE="zsh-completion"
RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
+ >=dev-python/click-log-0.1.3[${PYTHON_USEDEP}]
dev-python/icalendar[${PYTHON_USEDEP}]
dev-python/urwid[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/vdirsyncer[${PYTHON_USEDEP}]
- dev-python/pkginfo[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
+ >=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
dev-python/setproctitle[${PYTHON_USEDEP}]
zsh-completion? ( app-shells/zsh )"
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
+ dev-python/freezegun"
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.txt README.rst khal.conf.sample )
+DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
src_install() {
distutils-r1_src_install
diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index b7f9ea4de116..5f466f0e3b23 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,2 +1,3 @@
DIST pdfpc-3.1.1.tgz 199004 SHA256 ec5ffb9c2b55d1bac76172a6a13ed527ceed8cf0d659aca5e302f6a7185f00f2 SHA512 554203094b18fe11fd085414961de6644df3c258ad52d46ad171cfd6c2199028bcbaa9560bdaba63d83f858b467407cc276972b34f341cc25260db1d1358e88d WHIRLPOOL bddcba6a4285ea2b58dd01f76b7b050db630eaa97de5bba32a66f7f85563e6a99763a52e82286297f605dfa59d9ff918007baab297e587968ac1c83e3d69e8a8
DIST pdfpc-4.0.7.tar.gz 83626 SHA256 25d5aa2cce344f1554f1f45a7c1f636576587cfd553d75d704e0c95ae3b2a503 SHA512 557e2a24e7aa4b0a7bc413517d6b274c7bad91f5e9d24ec139d0e62c490712081344448bfbedc82a90d28cd9b5910a6f51863aa44dc1c7a61ada6d154780444c WHIRLPOOL f5018d7ba64bea17923c9e3f2e5b6e7e3bc950ffea02a53c93d63057590f1538371fe6b11383d6fbfb4c32d04887f75d1e01f6b24c4b9fc43ac1aacf9be075cd
+DIST pdfpc-4.0.8.tar.gz 91138 SHA256 c04539398176b0911ec7216c48a04d90d7c893aa5b16cfdef8ea861885991066 SHA512 f077f08f2ee997d55b4e4ced31ec6f21791353871104fff9ece264455a18e30ba365933b15b6b596817f3e6f3f0a181f4fecf19180b8a4337f3752d3aebec7d7 WHIRLPOOL 901f46b831162c88d510754288feb7851e5b3f31af618b7e0b91f884b980bb72ac1de897878bc07db72b6b5d6fa15f108404e835778a0c3615e06a94451567b5
diff --git a/app-misc/pdfpc/pdfpc-4.0.8.ebuild b/app-misc/pdfpc/pdfpc-4.0.8.ebuild
new file mode 100644
index 000000000000..f0b2e1fa3cc0
--- /dev/null
+++ b/app-misc/pdfpc/pdfpc-4.0.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VALA_MIN_API_VERSION="0.26"
+VALA_MAX_API_VERSION="0.36" # fix sed line if you increase this
+
+inherit vala cmake-utils
+
+DESCRIPTION="Presenter console with multi-monitor support for PDF files"
+HOMEPAGE="http://pdfpc.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gstreamer"
+
+RDEPEND="app-text/poppler:=[cairo]
+ dev-libs/glib:2
+ dev-libs/libgee:0.8
+ gnome-base/librsvg
+ gstreamer? ( media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0 )
+ sys-apps/dbus
+ x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+ $(vala_depend)"
+
+src_prepare() {
+ default
+ sed -i -e "s/valac-0.20/valac-0.36 valac-0.34 valac-0.32 valac-0.30 valac-0.28 valac-0.26/" cmake/vala/FindVala.cmake || die
+ vala_src_prepare
+}
+
+src_configure(){
+ local mycmakeargs=(
+ -DSYSCONFDIR="${EPREFIX}/etc"
+ -DMOVIES=$(usex gstreamer on off)
+ )
+ cmake-utils_src_configure
+}
diff --git a/app-portage/eix/eix-0.32.9.ebuild b/app-portage/eix/eix-0.32.9.ebuild
index 2026b44a4b15..2b4cdd441e81 100644
--- a/app-portage/eix/eix-0.32.9.ebuild
+++ b/app-portage/eix/eix-0.32.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc nls sqlite"
BOTHDEPEND="nls? ( virtual/libintl )
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
index 0388977b4d9e..7219527ce8ae 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
RDEPEND="
dev-util/dialog
diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.9.1-r3.ebuild
index 0bd2caa8f989..1928dd762ef8 100644
--- a/app-shells/dash/dash-0.5.9.1-r3.ebuild
+++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild
@@ -19,7 +19,7 @@ fi
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libedit static vanilla"
RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
diff --git a/app-shells/fish/fish-2.6.0.ebuild b/app-shells/fish/fish-2.6.0.ebuild
index 28ec96ac5a5e..fdb99dc66952 100644
--- a/app-shells/fish/fish-2.6.0.ebuild
+++ b/app-shells/fish/fish-2.6.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${PV}/${P}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="nls"
RDEPEND="
diff --git a/app-shells/push/push-2.0-r1.ebuild b/app-shells/push/push-2.0-r1.ebuild
index a3689d1b11f5..514aea5e319f 100644
--- a/app-shells/push/push-2.0-r1.ebuild
+++ b/app-shells/push/push-2.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE=""
src_install() {
diff --git a/app-shells/quoter/quoter-3.0_p2-r1.ebuild b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
index 0a36376619cb..1474b6e1c8ed 100644
--- a/app-shells/quoter/quoter-3.0_p2-r1.ebuild
+++ b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE=""
src_install() {
diff --git a/app-text/adiff/Manifest b/app-text/adiff/Manifest
deleted file mode 100644
index 6a54ac3926c4..000000000000
--- a/app-text/adiff/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST adiff-1.4 10902 SHA256 c4e56a2a2288e4dc53a824e603d942c59caaebf9b72f01e332a9d98ebfa6df72 SHA512 edbb4d6a8ce8f636a874d22d1e44bc04b860ab31f1e825ce3e865ee3f6bf07fb6a7b9dd44e5429aad21a475d82b34f176d76f8466e58aeca74717740f7054219 WHIRLPOOL 1099775af9d2c5908d8a26cf4277b24ed3ab41b583f83c4bf263f09b190a8c8b68cf6c431219156346fad0848fd40670a93c8cf3c476333e0ec823f319b6b3bc
diff --git a/app-text/adiff/adiff-1.4-r1.ebuild b/app-text/adiff/adiff-1.4-r1.ebuild
deleted file mode 100644
index 1cb9bebd4b79..000000000000
--- a/app-text/adiff/adiff-1.4-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Wordise diff"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
- dev-lang/perl
- !app-arch/atool"
-
-RDEPEND="
- ${DEPEND}
- sys-apps/diffutils"
-
-S="${WORKDIR}"
-
-src_unpack() {
- :; # Nothing to unpack.
-}
-
-src_compile() {
- local _p2m=(
- --release=${PV}
- --center="${HOMEPAGE}"
- --date="2007-12-11"
- "${DISTDIR}"/${P}
- ${PN}.1
- )
-
- pod2man "${_p2m[@]}" || die
-}
-
-src_install() {
- newbin "${DISTDIR}/${P}" "${PN}"
- doman "${PN}.1"
-}
diff --git a/app-text/adiff/adiff-1.4.ebuild b/app-text/adiff/adiff-1.4.ebuild
deleted file mode 100644
index de8f46e522c1..000000000000
--- a/app-text/adiff/adiff-1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="wordwise diff"
-HOMEPAGE="http://agriffis.n01se.net/adiff/"
-SRC_URI="${HOMEPAGE}/${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="dev-lang/perl
- !app-arch/atool"
-RDEPEND="${DEPEND}
- sys-apps/diffutils"
-
-S=${WORKDIR}
-
-src_unpack() {
- # Nothing to unpack
- :
-}
-
-src_compile() {
- pod2man --release=${PV} --center="${HOMEPAGE}" \
- --date="2007-12-11" "${DISTDIR}"/${P} ${PN}.1 || die
-}
-
-src_install() {
- newbin "${DISTDIR}"/${P} ${PN}
- doman ${PN}.1
-}
diff --git a/app-text/adiff/metadata.xml b/app-text/adiff/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-text/adiff/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/app-text/aspell/aspell-0.60.7_rc1.ebuild b/app-text/aspell/aspell-0.60.7_rc1.ebuild
index 5bbd533caac7..574323a3d2db 100644
--- a/app-text/aspell/aspell-0.60.7_rc1.ebuild
+++ b/app-text/aspell/aspell-0.60.7_rc1.ebuild
@@ -71,6 +71,11 @@ src_prepare() {
# This has to be after automake has run so that we don't clobber
# the default target that automake creates for us.
echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
+
+ # unicode patch breaks on Darwin, NCURSES_WIDECHAR won't get set
+ # any more. Fix this.
+ [[ ${CHOST} == *-darwin* ]] && use unicode && \
+ append-cppflags -DNCURSES_WIDECHAR=1
}
src_configure() {
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
index a13f502767ae..96684b339410 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="AGPL-3 CPL-1.0"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
COMMON_DEPEND="
diff --git a/app-text/poppler/poppler-0.57.0.ebuild b/app-text/poppler/poppler-0.57.0.ebuild
index 2631263e7046..4f93e5af5dab 100644
--- a/app-text/poppler/poppler-0.57.0.ebuild
+++ b/app-text/poppler/poppler-0.57.0.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
SLOT="0/9999"
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/68" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
diff --git a/dev-db/postgresql/postgresql-9.2.22.ebuild b/dev-db/postgresql/postgresql-9.2.22.ebuild
index c291222959b1..6da7c31e6c4e 100644
--- a/dev-db/postgresql/postgresql-9.2.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.22.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 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~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-db/postgresql/postgresql-9.3.18.ebuild b/dev-db/postgresql/postgresql-9.3.18.ebuild
index 6595087c2598..37b53c36ff12 100644
--- a/dev-db/postgresql/postgresql-9.3.18.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.18.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 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~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-db/postgresql/postgresql-9.4.13.ebuild b/dev-db/postgresql/postgresql-9.4.13.ebuild
index ee4b2cdfe71f..f17788a2300c 100644
--- a/dev-db/postgresql/postgresql-9.4.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.13.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 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~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-db/postgresql/postgresql-9.5.8.ebuild b/dev-db/postgresql/postgresql-9.5.8.ebuild
index 60b2059a56df..0e5a7b5009f5 100644
--- a/dev-db/postgresql/postgresql-9.5.8.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.8.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-db/postgresql/postgresql-9.6.4.ebuild b/dev-db/postgresql/postgresql-9.6.4.ebuild
index 16f60a44b649..98b451d44981 100644
--- a/dev-db/postgresql/postgresql-9.6.4.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.4.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-games/aseprite/files/aseprite-0.9.5-as-needed.patch b/dev-games/aseprite/files/aseprite-0.9.5-as-needed.patch
deleted file mode 100644
index 9f50c25979ba..000000000000
--- a/dev-games/aseprite/files/aseprite-0.9.5-as-needed.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: fix FTBFS with --as-needed linker option
- Libraries must be placed after object files in command line.
-Author: Ilya Barygin
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -135,6 +135,10 @@
- # All libraries for .exe files
- set(all_libs ${aseprite_libraries} ${libs3rdparty} ${sys_libs})
-
-+if(LIBALLEGRO4_LINK_FLAGS)
-+ set(all_libs ${all_libs} ${LIBALLEGRO4_LINK_FLAGS})
-+endif()
-+
- ######################################################################
- # ASEPRITE libraries
-
-@@ -405,10 +409,6 @@
-
- add_executable(aseprite WIN32 main.cpp ${win32_resources} ${x11_resources})
- target_link_libraries(aseprite ${all_libs})
--if(LIBALLEGRO4_LINK_FLAGS)
-- set_target_properties(aseprite
-- PROPERTIES LINK_FLAGS ${LIBALLEGRO4_LINK_FLAGS})
--endif()
-
- install(TARGETS aseprite
- RUNTIME DESTINATION bin)
-@@ -450,8 +450,7 @@
- endif()
-
- if(LIBALLEGRO4_LINK_FLAGS)
-- set_target_properties(${testname}
-- PROPERTIES LINK_FLAGS ${LIBALLEGRO4_LINK_FLAGS})
-+ target_link_libraries(${testname} ${LIBALLEGRO4_LINK_FLAGS})
- endif()
-
- if(extra_definitions)
diff --git a/dev-games/aseprite/files/aseprite-0.9.5-underlinking.patch b/dev-games/aseprite/files/aseprite-0.9.5-underlinking.patch
deleted file mode 100644
index 8f3027d4baf7..000000000000
--- a/dev-games/aseprite/files/aseprite-0.9.5-underlinking.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 169edeaa69cce2670213c39232a249a487670883 Mon Sep 17 00:00:00 2001
-From: hasufell
-Date: Sun, 2 Nov 2014 16:58:33 +0100
-Subject: [PATCH] Fix underlinking with USE_SHARED_ALLEGRO4=ON
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 21c3352..0ce11d2 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -58,6 +58,7 @@ if(USE_SHARED_ALLEGRO4)
- OUTPUT_VARIABLE LIBALLEGRO4_LINK_FLAGS
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-+ set(LIBALLEGRO4_LINK_FLAGS ${LIBALLEGRO4_LINK_FLAGS} ${PLATFORM_LIBS})
- include_directories(${LIBALLEGRO4_INCLUDE_DIR})
- else()
- add_definitions(-DALLEGRO4_WITH_RESIZE_PATCH)
diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest
index bdb7b23eccf6..54d5e5756f6a 100644
--- a/dev-games/physfs/Manifest
+++ b/dev-games/physfs/Manifest
@@ -1 +1,2 @@
DIST physfs-2.0.3.tar.bz2 560628 SHA256 ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69 SHA512 47eff0c81b8dc3bb526766b0a8ad2437d2951867880116d6e6e8f2ec1490e263541fb741867fed6517cc3fa8a9c5651b36e3e02a499f19cfdc5c7261c9707e80 WHIRLPOOL 30362f92d5702842142c08c3183a384876a03e9e3e400364b0fa59c99ffee994667c1ad08fe633ef146e98301789a980a3419f60a18b24b9c341bb74144ccc73
+DIST physfs-3.0.0.tar.bz2 194277 SHA256 f2617d6855ea97ea42e4a8ebcad404354be99dfd8a274eacea92091b27fd7324 SHA512 4293dc72a5b2e41fbd02c4426da7bfc1e94a013d8a332b3124798a91ef27b4a57adef303f23d5e03150855de69cf22fc8bb29e6395725a18e3a12f6c74b4111f WHIRLPOOL e0010e15b2449565939dd5e9d65fb63cbbb78069a0390fc0ba95c7671a484db7470ec300cfd8aaa5810aff7fd14bbc669f8e902a9469ba7d51ebeed6c94b15f4
diff --git a/dev-games/physfs/physfs-3.0.0.ebuild b/dev-games/physfs/physfs-3.0.0.ebuild
new file mode 100644
index 000000000000..6c6a34f418d9
--- /dev/null
+++ b/dev-games/physfs/physfs-3.0.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 cmake-multilib
+
+DESCRIPTION="Abstraction layer for filesystem and archive access"
+HOMEPAGE="http://icculus.org/physfs/"
+SRC_URI="http://icculus.org/physfs/downloads/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~x86-fbsd"
+IUSE="grp hog mvl qpak static-libs wad +zip"
+
+RDEPEND=""
+DEPEND=""
+
+DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt )
+
+src_prepare() {
+ default
+ sed -i -e 's:-Werror::' CMakeLists.txt || die
+ # make sure these libs aren't used
+ rm -rf lzma zlib*
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DPHYSFS_ARCHIVE_7Z=OFF
+ -DPHYSFS_BUILD_SHARED=ON
+ -DPHYSFS_BUILD_TEST=OFF
+ -DPHYSFS_BUILD_WX_TEST=OFF
+ -DPHYSFS_INTERNAL_ZLIB=OFF
+ -DPHYSFS_BUILD_STATIC="$(usex static-libs)"
+ -DPHYSFS_ARCHIVE_GRP="$(usex grp)"
+ -DPHYSFS_ARCHIVE_HOG="$(usex hog)"
+ -DPHYSFS_ARCHIVE_MVL="$(usex mvl)"
+ -DPHYSFS_ARCHIVE_WAD="$(usex wad)"
+ -DPHYSFS_ARCHIVE_QPAK="$(usex qpak)"
+ -DPHYSFS_ARCHIVE_ZIP="$(usex zip)"
+ )
+
+ cmake-multilib_src_configure
+}
diff --git a/dev-games/physfs/physfs-9999.ebuild b/dev-games/physfs/physfs-9999.ebuild
index 174aa4f1c98e..27e3aeb6c956 100644
--- a/dev-games/physfs/physfs-9999.ebuild
+++ b/dev-games/physfs/physfs-9999.ebuild
@@ -16,10 +16,12 @@ fi
LICENSE="ZLIB"
SLOT="0"
-IUSE="doc grp hog mvl qpak static-libs wad +zip"
+IUSE="grp hog mvl qpak static-libs wad +zip"
RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
+DEPEND=""
+
+DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt )
src_prepare() {
default
@@ -46,18 +48,3 @@ src_configure() {
cmake-multilib_src_configure
}
-
-src_compile() {
- cmake-multilib_src_compile
-
- if multilib_is_native_abi && use doc ; then
- doxygen || die "doxygen failed"
- fi
-}
-
-src_install() {
- local DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt )
- local HTML_DOCS=$(usex doc 'docs/html/*' '')
-
- cmake-multilib_src_install
-}
diff --git a/dev-java/gnu-classpath-inetlib/Manifest b/dev-java/gnu-classpath-inetlib/Manifest
deleted file mode 100644
index 8f66244d852a..000000000000
--- a/dev-java/gnu-classpath-inetlib/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST inetlib-1.0.tar.gz 151002 SHA256 f59a46051b01dd01f04d0cc677d95a6c02b3389787d59a63b0f74bef20f887f8 SHA512 f3efa679d4f09d65025b3a903bb94eeced6470fff4414a1a1dc00985f644855bef9aaf5015c24c4321a6088e5ca48ced2177548f11dc84c07b4e5281b9709ede WHIRLPOOL 8f79486a4c11926ab9063a25efe411c39adebe377c93a8bc2484fc09907ed97455f231778d462aaae5fb8830da1d39d9a00cdbdc50e83905df4e9bc1491399d8
-DIST inetlib-1.1.tar.gz 177251 SHA256 2b30cad60f3136b04f9ae4a906da8ac964654dacd3281097ec3558e67c9a51a0 SHA512 0ebc112bc8758ca8da23797d71d91d386896be6105cc1a40448445e59a6cdc43dc5dcd84f8b69332d7b7eaf11efd474588cadcb68f7356f2aa40657aaf62147b WHIRLPOOL 48bc55ac1b102c81f3de0d1e943ff51731e963b5cd9ac080a91a99f3da7ed48966deb034f4c863d722aef0461ff96f153dccb62c1edced5ac7c8c1897bb0b5d6
diff --git a/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.0-jdk15.patch b/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.0-jdk15.patch
deleted file mode 100644
index c6db3e2f6956..000000000000
--- a/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.0-jdk15.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -uNr inetlib-1.0.orig/source/gnu/inet/imap/IMAPConnection.java inetlib-1.0/source/gnu/inet/imap/IMAPConnection.java
---- inetlib-1.0.orig/source/gnu/inet/imap/IMAPConnection.java 2006-09-19 13:18:21.512067374 +0200
-+++ inetlib-1.0/source/gnu/inet/imap/IMAPConnection.java 2006-09-19 13:19:07.024373510 +0200
-@@ -45,7 +45,6 @@
- import java.util.Iterator;
- import java.util.List;
- import java.util.Map;
--import java.util.Properties;
-
- import javax.net.ssl.SSLContext;
- import javax.net.ssl.SSLSocket;
-@@ -555,7 +554,7 @@
- String[] m = new String[] { mechanism };
- CallbackHandler ch = new SaslCallbackHandler(username, password);
- // Avoid lengthy callback procedure for GNU Crypto
-- Properties p = new Properties();
-+ HashMap p = new HashMap();
- p.put("gnu.crypto.sasl.username", username);
- p.put("gnu.crypto.sasl.password", password);
- SaslClient sasl = Sasl.createSaslClient(m, null, "smtp",
-diff -uNr inetlib-1.0.orig/source/gnu/inet/pop3/POP3Connection.java inetlib-1.0/source/gnu/inet/pop3/POP3Connection.java
---- inetlib-1.0.orig/source/gnu/inet/pop3/POP3Connection.java 2006-09-19 13:18:21.531064997 +0200
-+++ inetlib-1.0/source/gnu/inet/pop3/POP3Connection.java 2006-09-19 13:20:28.841137790 +0200
-@@ -39,8 +39,8 @@
- import java.security.MessageDigest;
- import java.security.NoSuchAlgorithmException;
- import java.util.ArrayList;
-+import java.util.HashMap;
- import java.util.List;
--import java.util.Properties;
-
- import javax.net.ssl.SSLContext;
- import javax.net.ssl.SSLSocket;
-@@ -220,7 +220,7 @@
- String[] m = new String[] { mechanism };
- CallbackHandler ch = new SaslCallbackHandler (username, password);
- // Avoid lengthy callback procedure for GNU Crypto
-- Properties p = new Properties ();
-+ HashMap p = new HashMap();
- p.put ("gnu.crypto.sasl.username", username);
- p.put ("gnu.crypto.sasl.password", password);
- SaslClient sasl =
-diff -uNr inetlib-1.0.orig/source/gnu/inet/smtp/SMTPConnection.java inetlib-1.0/source/gnu/inet/smtp/SMTPConnection.java
---- inetlib-1.0.orig/source/gnu/inet/smtp/SMTPConnection.java 2006-09-19 13:18:21.533064747 +0200
-+++ inetlib-1.0/source/gnu/inet/smtp/SMTPConnection.java 2006-09-19 13:21:16.996113371 +0200
-@@ -37,8 +37,8 @@
- import java.security.GeneralSecurityException;
- import java.util.ArrayList;
- import java.util.Collections;
-+import java.util.HashMap;
- import java.util.List;
--import java.util.Properties;
-
- import javax.net.ssl.SSLContext;
- import javax.net.ssl.SSLSocket;
-@@ -567,7 +567,7 @@
- String[] m = new String[] { mechanism };
- CallbackHandler ch = new SaslCallbackHandler (username, password);
- // Avoid lengthy callback procedure for GNU Crypto
-- Properties p = new Properties ();
-+ HashMap p = new HashMap();
- p.put ("gnu.crypto.sasl.username", username);
- p.put ("gnu.crypto.sasl.password", password);
- SaslClient sasl =
diff --git a/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.1-jdk15.patch b/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.1-jdk15.patch
deleted file mode 100644
index e717fd4e52c1..000000000000
--- a/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.1-jdk15.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -uNr inetlib.orig/source/gnu/inet/imap/IMAPConnection.java inetlib/source/gnu/inet/imap/IMAPConnection.java
---- inetlib.orig/source/gnu/inet/imap/IMAPConnection.java 2006-09-19 10:25:48.402313856 +0200
-+++ inetlib/source/gnu/inet/imap/IMAPConnection.java 2006-09-19 10:27:02.775026067 +0200
-@@ -46,7 +46,6 @@
- import java.util.Iterator;
- import java.util.List;
- import java.util.Map;
--import java.util.Properties;
-
- import javax.net.ssl.SSLContext;
- import javax.net.ssl.SSLSocket;
-@@ -653,7 +652,7 @@
- String[] m = new String[] { mechanism };
- CallbackHandler ch = new SaslCallbackHandler (username, password);
- // Avoid lengthy callback procedure for GNU Crypto
-- Properties p = new Properties ();
-+ HashMap p = new HashMap();
- p.put ("gnu.crypto.sasl.username", username);
- p.put ("gnu.crypto.sasl.password", password);
- SaslClient sasl = Sasl.createSaslClient (m, null, "smtp",
-diff -uNr inetlib.orig/source/gnu/inet/nntp/NNTPConnection.java inetlib/source/gnu/inet/nntp/NNTPConnection.java
---- inetlib.orig/source/gnu/inet/nntp/NNTPConnection.java 2006-09-19 10:25:48.420311609 +0200
-+++ inetlib/source/gnu/inet/nntp/NNTPConnection.java 2006-09-19 10:29:02.781039000 +0200
-@@ -42,7 +42,7 @@
- import java.util.Calendar;
- import java.util.Date;
- import java.util.GregorianCalendar;
--import java.util.Properties;
-+import java.util.HashMap;
- import java.util.TimeZone;
-
- import javax.security.auth.callback.CallbackHandler;
-@@ -1140,7 +1140,7 @@
- String[] m = new String[] { mechanism };
- CallbackHandler ch = new SaslCallbackHandler (username, password);
- // Avoid lengthy callback procedure for GNU Crypto
-- Properties p = new Properties ();
-+ HashMap p = new HashMap();
- p.put ("gnu.crypto.sasl.username", username);
- p.put ("gnu.crypto.sasl.password", password);
- SaslClient sasl =
-diff -uNr inetlib.orig/source/gnu/inet/pop3/POP3Connection.java inetlib/source/gnu/inet/pop3/POP3Connection.java
---- inetlib.orig/source/gnu/inet/pop3/POP3Connection.java 2006-09-19 10:25:48.426310859 +0200
-+++ inetlib/source/gnu/inet/pop3/POP3Connection.java 2006-09-19 10:27:59.374957608 +0200
-@@ -41,10 +41,10 @@
- import java.security.NoSuchAlgorithmException;
- import java.util.ArrayList;
- import java.util.Collections;
-+import java.util.HashMap;
- import java.util.LinkedHashMap;
- import java.util.List;
- import java.util.Map;
--import java.util.Properties;
-
- import javax.net.ssl.SSLContext;
- import javax.net.ssl.SSLSocket;
-@@ -232,7 +232,7 @@
- String[] m = new String[] { mechanism };
- CallbackHandler ch = new SaslCallbackHandler (username, password);
- // Avoid lengthy callback procedure for GNU Crypto
-- Properties p = new Properties ();
-+ HashMap p = new HashMap();
- p.put ("gnu.crypto.sasl.username", username);
- p.put ("gnu.crypto.sasl.password", password);
- SaslClient sasl =
-diff -uNr inetlib.orig/source/gnu/inet/smtp/SMTPConnection.java inetlib/source/gnu/inet/smtp/SMTPConnection.java
---- inetlib.orig/source/gnu/inet/smtp/SMTPConnection.java 2006-09-19 10:25:48.428310610 +0200
-+++ inetlib/source/gnu/inet/smtp/SMTPConnection.java 2006-09-19 10:26:34.107606132 +0200
-@@ -38,8 +38,8 @@
- import java.security.GeneralSecurityException;
- import java.util.ArrayList;
- import java.util.Collections;
-+import java.util.HashMap;
- import java.util.List;
--import java.util.Properties;
-
- import javax.net.ssl.SSLContext;
- import javax.net.ssl.SSLSocket;
-@@ -598,7 +598,7 @@
- String[] m = new String[] { mechanism };
- CallbackHandler ch = new SaslCallbackHandler (username, password);
- // Avoid lengthy callback procedure for GNU Crypto
-- Properties p = new Properties ();
-+ HashMap p = new HashMap();
- p.put ("gnu.crypto.sasl.username", username);
- p.put ("gnu.crypto.sasl.password", password);
- SaslClient sasl =
diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild
deleted file mode 100644
index 9406f606ba30..000000000000
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit java-pkg-2
-
-MY_PN="inetlib"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Network extensions library for GNU classpath and classpathx"
-HOMEPAGE="https://www.gnu.org/software/classpath/"
-SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
-LICENSE="GPL-2-with-linking-exception"
-SLOT="1.0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-RDEPEND=">=virtual/jre-1.3
- >=dev-java/gnu-crypto-2.0.1"
-DEPEND=">=virtual/jdk-1.3
- ${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-# TODO we could give configure the lib dir on the live filesystem
-# instead of populating ${S}/ext with the jars we need -nichoj
-# TODO fix jikes support. Related to bug #89711
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-jdk15.patch"
-
- mkdir ext && cd ext
- java-pkg_jar-from gnu-crypto javax-security.jar javax-security-auth-callback.jar
- java-pkg_jar-from gnu-crypto javax-security.jar javax-security-sasl.jar
- # fake jar to shut build system up, jsse is part of JDK's classpath already
- ln -s javax-security-sasl.jar jsse.jar
-}
-
-src_compile() {
- econf \
- --enable-smtp \
- --enable-imap \
- --enable-pop3 \
- --enable-nntp \
- --enable-ftp \
- --enable-gopher \
- --with-jsse-jar="${S}"/ext \
- --with-javax-security-auth-callback-jar="${S}"/ext \
- --with-javax-security-sasl-jar="${S}"/ext \
- || die "econf failed"
- # https://bugs.gentoo.org/show_bug.cgi?id=179897
- emake JAVACFLAGS="${JAVACFLAGS}" -j1 || die "emake failed"
- if use doc ; then
- emake -j1 javadoc || die "emake javadoc failed"
- fi
-}
-
-src_install() {
- einstall || die
- rm -rf "${D}"/usr/share/java
- java-pkg_dojar ${MY_PN}.jar
- use doc && java-pkg_dojavadoc docs
- dodoc AUTHORS NEWS README || die
-}
diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild
deleted file mode 100644
index 3110cb5125f8..000000000000
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="inetlib"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Network extensions library for GNU classpath and classpathx"
-HOMEPAGE="https://www.gnu.org/software/classpath/"
-SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
-LICENSE="GPL-2-with-linking-exception"
-SLOT="1.1"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-RDEPEND=">=virtual/jre-1.3
- >=dev-java/gnu-crypto-2.0.1"
-DEPEND=">=virtual/jdk-1.3
- ${RDEPEND}"
-S="${WORKDIR}/${MY_PN}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-jdk15.patch"
-
- mkdir ext && cd ext
- java-pkg_jar-from gnu-crypto
- # fake jar to shut build system up, jsse is part of JDK's classpath already
- ln -s javax-security.jar jsse.jar
-}
-
-src_compile() {
- econf \
- --enable-smtp \
- --enable-imap \
- --enable-pop3 \
- --enable-nntp \
- --enable-ftp \
- --enable-gopher \
- --with-jsse-jar="${S}"/ext \
- --with-javax-security-jar="${S}"/ext \
- || die
- # https://bugs.gentoo.org/show_bug.cgi?id=179897
- emake JAVACFLAGS="${JAVACFLAGS}" -j1 || die
- if use doc ; then
- emake -j1 javadoc || die
- fi
-}
-
-src_install() {
- einstall || die
- rm -rf "${D}"/usr/share/java
- java-pkg_dojar inetlib.jar
- use doc && java-pkg_dojavadoc docs
- dodoc AUTHORS NEWS README || die
-}
diff --git a/dev-java/gnu-classpath-inetlib/metadata.xml b/dev-java/gnu-classpath-inetlib/metadata.xml
deleted file mode 100644
index eda7f5994ec6..000000000000
--- a/dev-java/gnu-classpath-inetlib/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- java@gentoo.org
- Java
-
-
-
-GNU Classpath inetlib is an extension library to provide extra network
-protocol support for GNU Classpath and ClasspathX project, but it can
-also used standalone to make adding http, imap, pop3 and smtp client
-support to applictions.
-
-
diff --git a/dev-java/gnu-javamail/Manifest b/dev-java/gnu-javamail/Manifest
deleted file mode 100644
index 03c01800bac3..000000000000
--- a/dev-java/gnu-javamail/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mail-1.0.tar.gz 707084 SHA256 0dcbf6b24ea1f0a47a4aff15060dda19349d8bea7025a6e7d2249969afb7099e SHA512 14513b577a312c4c3ba994db02ca561614f64d532baf07a3f58d97d8a8e129d83ed29a835b079131c1789c584b851188ae1450a531b6e5a544513c219bc37f09 WHIRLPOOL 6001858a0bb73bbb5ea855fc781ee09ed3773c7de67fc4cfed7fd6b34ea3bced42c78900de022996a2ae34651aa7884cb2e6a69d25e5fb2ade7415707a51913b
diff --git a/dev-java/gnu-javamail/gnu-javamail-1.0-r2.ebuild b/dev-java/gnu-javamail/gnu-javamail-1.0-r2.ebuild
deleted file mode 100644
index f456c17836b1..000000000000
--- a/dev-java/gnu-javamail/gnu-javamail-1.0-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit java-pkg-2
-
-MY_PN="mail"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="GNU implementation of the Javamail API"
-HOMEPAGE="https://www.gnu.org/software/classpathx/javamail/"
-SRC_URI="mirror://gnu/classpathx/${MY_P}.tar.gz"
-LICENSE="GPL-2-with-linking-exception"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-RDEPEND=">=virtual/jre-1.4
- =dev-java/gnu-jaf-1*
- =dev-java/gnu-classpath-inetlib-1.0*
- !<=dev-java/mx4j-3.0.1
- !<=dev-java/mx4j-3.0.1-r2"
-DEPEND=">=virtual/jdk-1.4
- ${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-# TODO: Re-enable jikes support (see bug #89711)
-
-src_compile() {
- local activation=$(dirname $(java-pkg_getjar gnu-jaf-1 activation.jar))
- local inetlib=$(dirname $(java-pkg_getjar gnu-classpath-inetlib-1.0 inetlib.jar))
-
- econf \
- --with-activation-jar=${activation} \
- --with-inetlib-jar=${inetlib} \
- --enable-smtp \
- --enable-imap \
- --enable-pop3 \
- --enable-nntp \
- --enable-mbox \
- --enable-maildir \
- || die "failed to configure"
-
- emake JAVACFLAGS="${JAVACFLAGS}" || die "failed to compile"
-
- if use doc; then
- emake javadoc || die "failed to generate javadoc"
- fi
-}
-
-src_install() {
- java-pkg_dojar gnumail-providers.jar
- java-pkg_newjar gnumail.jar mail.jar
- dodoc AUTHORS ChangeLog NEWS README README.*
- use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/gnu-javamail/metadata.xml b/dev-java/gnu-javamail/metadata.xml
deleted file mode 100644
index fd39539ff169..000000000000
--- a/dev-java/gnu-javamail/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
- java@gentoo.org
- Java
-
-
-
-GNU JavaMail is a free implementation of the JavaMail API specification,
-version 1.3. All the code has been written from scratch without
-reference to Sun's code, which allows GNU JavaMail to be used on a
-completely free operating system such as GNU/Linux or the Hurd. The code
-is optimized to work with free Java implementations, nothing prevents it
-from being used with any compliant JVM.
-
-GNU JavaMail provides a protocol-independent framework for building mail
-client applications in Java. The API itself provides a complete MIME
-implementation, and drivers for individual messaging protocols, known as
-providers, can be plugged into the JavaMail framework dynamically.
-Several providers, implementing Internet standard protocols, are
-included with GNU JavaMail. These include:
-
-* SMTP, IMAP, POP3
-* NNTP including posting to news servers
-* The UNIX mbox format
-* Dan Bernstein's Maildir format
-
-
diff --git a/dev-java/javax-mail/Manifest b/dev-java/javax-mail/Manifest
deleted file mode 100644
index 15192924854e..000000000000
--- a/dev-java/javax-mail/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mail-1.4-sources.jar 465692 SHA256 a20f7b4b98307424cb065ed4478dbce0a5831dfa48e1dea08d3d775632a9e1a6 SHA512 a4be6983d77a4baababcdb20d8586da7dc2f6a75419a02a1c8d72456023d4043b1aae6981321092a54e9f8dd0dc0ec7ab7d1080ab10fd9d84827e6c7a1d4c31c WHIRLPOOL 2885f46cd8780e708236ce0a336e12dfe373208638e0a2c9203452ca212deb44a55331620e2a25274889e9d9b9463bd4848541809fabc1cf4ff24722057c6561
diff --git a/dev-java/javax-mail/javax-mail-1.4.ebuild b/dev-java/javax-mail/javax-mail-1.4.ebuild
deleted file mode 100644
index 8af492da6127..000000000000
--- a/dev-java/javax-mail/javax-mail-1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Provides a platform/protocol-independent framework for mail and messaging apps"
-HOMEPAGE="https://javamail.java.net/"
-SRC_URI="http://repo1.maven.org/maven2/javax/mail/mail/${PV}/mail-${PV}-sources.jar"
-
-LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE=""
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
- app-arch/unzip"
diff --git a/dev-java/javax-mail/metadata.xml b/dev-java/javax-mail/metadata.xml
deleted file mode 100644
index 37998bf40746..000000000000
--- a/dev-java/javax-mail/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- java@gentoo.org
- Java
-
-
diff --git a/dev-java/sun-javamail/Manifest b/dev-java/sun-javamail/Manifest
deleted file mode 100644
index b2a1102a1904..000000000000
--- a/dev-java/sun-javamail/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sun-javamail-1.4.3.zip 1174915 SHA256 5204fd4e38b4f2a43fb727c861d7d1f69933d489706de100189970032582becd SHA512 092b44857ed8a7fee25e9dd5085144b9b04aaec2e294ac7271accda8d0f8ea71792671079c2e377dadce02282446f176abbd3f78f55a8342930667a985080210 WHIRLPOOL f0440fd2bd7f3a8db357e9824a81aaa68b08688aab0b77c08dcd8e136a8b5856678fc5e50c5799234e59df4df516c06ac3c78c0f699d757cbfbb06f54296372e
diff --git a/dev-java/sun-javamail/metadata.xml b/dev-java/sun-javamail/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/sun-javamail/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- java@gentoo.org
- Java
-
-
diff --git a/dev-java/sun-javamail/sun-javamail-1.4.3-r1.ebuild b/dev-java/sun-javamail/sun-javamail-1.4.3-r1.ebuild
deleted file mode 100644
index 5d800becc1d7..000000000000
--- a/dev-java/sun-javamail/sun-javamail-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications"
-HOMEPAGE="http://java.sun.com/products/javamail/index.html"
-SRC_URI="mirror://gentoo/javamail-${PV}-src.zip -> ${P}.zip"
-
-LICENSE="|| ( CDDL GPL-2 BSD )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="mail"
-
-HTML_DOCS=( doc/release )
-
-src_prepare() {
- default
- rm -rv mail/src/test || die
-}
-
-src_install() {
- java-pkg-simple_src_install
- einstalldocs
-}
diff --git a/dev-lang/execline/Manifest b/dev-lang/execline/Manifest
index 9fb996ec96c7..09ba9109b126 100644
--- a/dev-lang/execline/Manifest
+++ b/dev-lang/execline/Manifest
@@ -4,3 +4,4 @@ DIST execline-2.1.5.0.tar.gz 80932 SHA256 8a3605a6db73183baa376bf2130e8b7eb75a5b
DIST execline-2.2.0.0.tar.gz 82860 SHA256 93bd744f2e3ad204cb89f147efdc6ca4e622f9c6bfc9895e0b2cb8b0480029de SHA512 0174bd46c231684f78b7ea2f6f85776b9edf780d1ae928fcaf0eda3ade46fa60666c17af4480fd37179461b622a069221386f229c777fd214b5abe70e7f58a19 WHIRLPOOL 6e39ceca7a867e5fc6d7fee16e78df2a5602b15924c411766089719afd81b198c7e816b54634dd2f322048c0230f9009392f01264eacba96924fe1af8888625f
DIST execline-2.3.0.0.tar.gz 81704 SHA256 a0ec43b8feba299cc1e5c65b1978ed76571afa595bc53165373e29a57468f425 SHA512 d8bd3420366d2e81e8bcbd644f235fc50e32a83d8e25989cf12f4b4c03bf553e0c356311ef185f98e03887ad65fd75a12ec4746ac832e72aeb023016d91f36c1 WHIRLPOOL b1b278c5623bae97a9e232bbdee2ff21a5cfb8dbd33bc53547620d876a4e0649543bee3de1e0c33b20442f26faeb2089e5325d0b7891e7d568a2ccff7629eb38
DIST execline-2.3.0.1.tar.gz 82620 SHA256 2bf65aaaf808718952e05c2221b4e9472271e53ebd915c8d1d49a3e992583bf4 SHA512 be72bff29055655275e2da0ed831034158300ff39184822966e35ff9a6c2dea4f7e5fc5e79bda40be91a791cb99ee9accc7cbdeccef3c4489bf2253e0a107365 WHIRLPOOL 52d57761012f90408a0cbb55168b0971941a2727dd40c0c41df0ca1066c15683e246172e2c608f880eaf6c7ba4b2802eaee2f103f3dc2eca5a9d8612bb24f87c
+DIST execline-2.3.0.2.tar.gz 82378 SHA256 c11650651a7230bd5687945a7698b2da3fe13c3c0eb15e296bb91769d4775f45 SHA512 0ec20bd0695bbf1aef9db6725c7d58ca95044401412ba85a22274d21aa37a5f51455739d403f929870dfcd4b59dcea474e0290a42e6a7dfe4136ef066b36e208 WHIRLPOOL 89c4cb3f258bb32c86b266dc7102e1992d80152f5a47382b218f2cd316815c6aaddebd9e716f884c13e6b83430145212aa39224b59768ac3e385402f008ccbb4
diff --git a/dev-lang/execline/execline-2.3.0.2.ebuild b/dev-lang/execline/execline-2.3.0.2.ebuild
new file mode 100644
index 000000000000..5cb4ef2598ae
--- /dev/null
+++ b/dev-lang/execline/execline-2.3.0.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="a non-interactive scripting language"
+HOMEPAGE="https://www.skarnet.org/software/execline/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+ static? (
+ >=dev-libs/skalibs-2.6.0.0[static-libs]
+ )
+ !static? (
+ >=dev-libs/skalibs-2.6.0.0
+ )
+"
+RDEPEND="
+ !static? (
+ >=dev-libs/skalibs-2.6.0.0:=
+ )
+"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+ default
+
+ # Remove QA warning about LDFLAGS addition
+ sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+ # configure overrides gentoo's -fstack-protector default
+ sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+ econf \
+ --bindir=/bin \
+ --dynlibdir=/$(get_libdir) \
+ --libdir=/usr/$(get_libdir)/${PN} \
+ --with-dynlib=/$(get_libdir) \
+ --with-lib=/usr/$(get_libdir)/skalibs \
+ --with-sysdeps=/usr/$(get_libdir)/skalibs \
+ $(use_enable !static shared) \
+ $(use_enable static allstatic) \
+ $(use_enable static static-libc) \
+ $(use_enable static-libs static)
+}
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2017-gentoo.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2017-gentoo.patch
index e3a68c8f5096..442e1ad76577 100644
--- a/dev-lang/gnat-gpl/files/gnat-gpl-2017-gentoo.patch
+++ b/dev-lang/gnat-gpl/files/gnat-gpl-2017-gentoo.patch
@@ -12,3 +12,21 @@
--- a/gcc/params.def 2016-03-30 09:47:40.000000000 +0200
+++ b/gcc/params.def 2016-09-19 12:56:58.443179039 +0200
@@ -673,7 +673,7 @@ DEFPARAM (PARAM_INTEGER_SHARE_LIMIT,
+--- gcc-6-gpl-2017-src/gcc/ada/osint.adb.old 2017-03-10 21:58:02.600710156 +0100
++++ gcc-6-gpl-2017-src/gcc/ada/osint.adb 2017-03-10 21:59:38.033983293 +0100
+@@ -2229,14 +2229,11 @@
+ for J in Start_Of_Prefix .. Name_Len - Prog'Length + 1 loop
+ if Name_Buffer (J .. J + Prog'Length - 1) = Prog then
+ End_Of_Prefix := J - 1;
++ Start_Of_Suffix := J + Prog'Length;
+ exit;
+ end if;
+ end loop;
+
+- if End_Of_Prefix > 1 then
+- Start_Of_Suffix := End_Of_Prefix + Prog'Length + 1;
+- end if;
+-
+ -- Create the new program name
+
+ return new String'
diff --git a/dev-lang/lazarus/lazarus-1.0.12.ebuild b/dev-lang/lazarus/lazarus-1.0.12.ebuild
index ef9e3f0eca6c..a085f4b3cce5 100644
--- a/dev-lang/lazarus/lazarus-1.0.12.ebuild
+++ b/dev-lang/lazarus/lazarus-1.0.12.ebuild
@@ -13,7 +13,7 @@ SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
KEYWORDS="amd64 ppc x86"
DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus.freepascal.org/"
+HOMEPAGE="https://www.lazarus-ide.org/"
IUSE="minimal"
SRC_URI="https://downloads.sourceforge.net/project/${PN}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${PN}-${PV}-0.tar.gz"
diff --git a/dev-lang/lazarus/lazarus-1.6.2.ebuild b/dev-lang/lazarus/lazarus-1.6.2.ebuild
index df2a3abc3a60..790c466f17c9 100644
--- a/dev-lang/lazarus/lazarus-1.6.2.ebuild
+++ b/dev-lang/lazarus/lazarus-1.6.2.ebuild
@@ -7,7 +7,7 @@ inherit eutils
FPCVER="3.0.0"
DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus.freepascal.org/"
+HOMEPAGE="https://www.lazarus-ide.org/"
SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%201.6.2/${P}-0.tar.gz"
LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
diff --git a/dev-lang/lazarus/lazarus-1.6.4.ebuild b/dev-lang/lazarus/lazarus-1.6.4.ebuild
index 43510d230888..efe6c7dbbbf6 100644
--- a/dev-lang/lazarus/lazarus-1.6.4.ebuild
+++ b/dev-lang/lazarus/lazarus-1.6.4.ebuild
@@ -7,7 +7,7 @@ inherit eutils
FPCVER="3.0.0"
DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus.freepascal.org/"
+HOMEPAGE="https://www.lazarus-ide.org/"
SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${P}-0.tar.gz"
LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 5fd59601771b..5fc8ae3dca39 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,7 @@
DIST php-5.6.31.tar.xz 12461268 SHA256 c464af61240a9b7729fabe0314cdbdd5a000a4f0c9bd201f89f8628732fe4ae4 SHA512 b5d3bc306167c851460036aa21194a2f74a50a26aa5c46159394bddbff94e4a418b557d68d5e1315672b3571b13a231ef7810d5346f57c0094acfe29c2e70495 WHIRLPOOL 2cd74a9cfe82b9363b4fbad37b13a8f7cc9571d2493a95b52cdaeeafe2d04255a29b31792dce2db0c41696539ed6b203446a2a6a8ea0319d82066fe9622bfcb9
DIST php-7.0.23.tar.xz 11953100 SHA256 8e526e3551a58e00c8055fa4a72804aa1bd3ee1c0411b25bf1504cc4992609df SHA512 62201592fca88fb1c302badf7e73e5d417e9a062300e0d32fdfcb346d300cd86bf957b880a73795037a332fe148b64589bb15204bdd6b0ddcbbddc5a12e6d042 WHIRLPOOL 5d6131b5d7701b01c1aa849c6b5e3b133b4276999354eccecf847675552eb0be79a68cd0a10595c64bda2594489d3699868b4ed9a1fe3c5cdcc4fda45be32493
+DIST php-7.0.24.tar.xz 11959232 SHA256 4dba7aa365193c9229f89f1975fad4c01135d29922a338ffb4a27e840d6f1c98 SHA512 7ae7795ff89924adc5f989bcf438a372684c7fc041ec10db96369f12faaeb90a23e7a7b5253f2a1022059f7464e6c11ee46a164a7f873b0b44a5317c3a3a49e7 WHIRLPOOL c5d8cdc684738610f520df0f46042625cfa0a5530e84e4c813493f755f03656f8ba71de630769f6381b9b729feb161b06eae7d44dcf21f79bec67fd5b9c23c26
+DIST php-7.1.10.tar.xz 12166036 SHA256 2b8efa771a2ead0bb3ae67b530ca505b5b286adc873cca9ce97a6e1d6815c50b SHA512 64f03d7a8928283e2f4f0958168610780553765ac20cf558cd6452ba4474461e74366c41b9bfdaf08b25195ca9c0059a94b77f06d8de3512d251cb2a84113d30 WHIRLPOOL 9ec9b6a93e95f23b15c8816de0384b62297ae06cec9b4c8cabeef8ecbefcd7c14b751c7310fa13a1326028a61c4f7206b5c0ce3388e0b40e44fffa0de6129721
DIST php-7.1.9.tar.xz 12157172 SHA256 ec9ca348dd51f19a84dc5d33acfff1fba1f977300604bdac08ed46ae2c281e8c SHA512 feefaae7edda115c9c10d6a07a9d897343ca972e4e5ec327f383cb28f204ac10956653fc120f0474901e59f32f105dc1a7afe64d49a3ea8bf486377837618013 WHIRLPOOL 5179ca1adddb099a3d8dccc009a96202f6d69edeea3126a5f861498475f36413f0a17a6a501b1b0eadba3acfb4ff262a8a5a7ee324043f03d74e857d1dc7c6a8
DIST php-7.2.0RC2.tar.xz 12051048 SHA256 0406366fcd5be4ee5e76e3c6a4279e04f93a1827a44d27c4f57fbed9e01cd281 SHA512 aa7e3632381677db995a72dcf0276a3be0d40c32138743a225d8e41e791a6fe00859e27ed7699be90e3843d3eb4da90af6a31aab65dc790c402863d09f409a48 WHIRLPOOL fc8c39b8b4a6184fa8e460dd91b0afbb62c5321effd5c5227eb276adb46857acf05e0fa5749279b0f26fe2c08d9f8001f0132507ab778dd1f7df7237da74b623
+DIST php-7.2.0RC3.tar.xz 11973876 SHA256 abe0a237f94837854f2cfd9c7dc99fbca2c817ae1d6194a514f29b463db36853 SHA512 a33e72e458e7e9fef59db5c147da9efdbd6d2987610216d99fd6c8bb25927153573614bdf3ca3b4e3278c5e6657fbd30665e3a895448afb0d6951af65e8e5b55 WHIRLPOOL 128ff4e663dfca3ad60c7ba2fa789a394a607ae6e93bb1e2b371972179c5fcecf13504cab0f6ec20bbf08c4040a6bfba8388bed9f60ddbc226dd9b9c241e555f
diff --git a/dev-lang/php/php-7.0.24.ebuild b/dev-lang/php/php-7.0.24.ebuild
new file mode 100644
index 000000000000..8201c7b7d40c
--- /dev/null
+++ b/dev-lang/php/php-7.0.24.ebuild
@@ -0,0 +1,739 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic versionator systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="http://php.net/"
+SRC_URI="http://php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+ BSD
+ Zend-2.0
+ bcmath? ( LGPL-2.1+ )
+ fpm? ( BSD-2 )
+ gd? ( gd )
+ unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(get_version_component_range 1-2)"
+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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+ coverage crypt +ctype curl debug
+ enchant exif +fileinfo +filter firebird
+ flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+ intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+ mhash mssql mysql mysqli nls
+ oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+ readline recode selinux +session sharedmem
+ +simplexml snmp soap sockets spell sqlite ssl
+ sysvipc systemd tidy +tokenizer truetype unicode wddx webp
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+ >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+ >=dev-libs/libpcre-8.32[unicode]
+ acl? ( sys-apps/acl )
+ apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+ =dev-libs/libmcrypt-2.4 )
+ curl? ( >=net-misc/curl-7.10.5 )
+ enchant? ( app-text/enchant )
+ exif? ( !gd? (
+ virtual/jpeg:0
+ media-libs/libpng:0=
+ sys-libs/zlib
+ ) )
+ firebird? ( dev-db/firebird )
+ gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+ gdbm? ( >=sys-libs/gdbm-1.8.0 )
+ gmp? ( dev-libs/gmp:0 )
+ iconv? ( virtual/libiconv )
+ imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+ intl? ( dev-libs/icu:= )
+ iodbc? ( dev-db/libiodbc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+ libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+ mssql? ( dev-db/freetds[mssql] )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+ odbc? ( >=dev-db/unixODBC-1.8.13 )
+ postgres? ( dev-db/postgresql:* )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline:0= )
+ recode? ( app-text/recode )
+ sharedmem? ( dev-libs/mm )
+ simplexml? ( >=dev-libs/libxml2-2.6.8 )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ soap? ( >=dev-libs/libxml2-2.6.8 )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ tidy? ( app-text/htmltidy )
+ truetype? (
+ =media-libs/freetype-2*
+ !gd? (
+ virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+ )
+ unicode? ( dev-libs/oniguruma:= )
+ wddx? ( >=dev-libs/libxml2-2.6.8 )
+ webp? ( media-libs/libwebp )
+ xml? ( >=dev-libs/libxml2-2.6.8 )
+ xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+ xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+ xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+ xpm? (
+ x11-libs/libXpm
+ virtual/jpeg:0
+ media-libs/libpng:0= sys-libs/zlib
+ )
+ xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+ zip? ( sys-libs/zlib )
+ zlib? ( sys-libs/zlib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/mta
+ fpm? (
+ selinux? ( sec-policy/selinux-phpfpm )
+ systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ >=sys-devel/bison-3.0.1
+ sys-devel/flex
+ >=sys-devel/m4-1.4.3
+ >=sys-devel/libtool-1.5.18"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
+ cli? ( ^^ ( readline libedit ) )
+ truetype? ( gd )
+ webp? ( gd )
+ cjk? ( gd )
+ exif? ( gd )
+ xpm? ( gd )
+ gd? ( zlib )
+ simplexml? ( xml )
+ soap? ( xml )
+ wddx? ( xml )
+ xmlrpc? ( || ( xml iconv ) )
+ xmlreader? ( xml )
+ xslt? ( xml )
+ ldap-sasl? ( ldap )
+ mhash? ( hash )
+ phar? ( hash )
+ qdbm? ( !gdbm )
+ readline? ( !libedit )
+ recode? ( !imap !mysqli !mysql )
+ sharedmem? ( !threads )
+ mysql? ( || ( mysqli pdo ) )
+"
+
+PHP_MV="$(get_major_version)"
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ # Always install the production INI file, bug 611214.
+ local phpinisrc="php.ini-production-${phpsapi}"
+ cp php.ini-production "${phpinisrc}" || die
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+ -i "${phpinisrc}" || die
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+ dodir "${PHP_INI_DIR#${EPREFIX}}"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" php.ini
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ if use opcache; then
+ elog "Adding opcache to $PHP_EXT_INI_DIR"
+ echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+ "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+ dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+ "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+ fi
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "fpm" ]] ; then
+ einfo "Installing FPM config files php-fpm.conf and www.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ doins sapi/fpm/php-fpm.conf
+ insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+ doins sapi/fpm/www.conf
+ fi
+
+ dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ default
+
+ # In php-7.x, the FPM pool configuration files have been split off
+ # of the main config. By default the pool config files go in
+ # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+ # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+ # we'll install the pool configuration file "www.conf" there.
+ php_set_ini_dir fpm
+ sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+ sapi/fpm/php-fpm.conf.in \
+ || die 'failed to move the include directory in php-fpm.conf'
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/mib_indexes
+
+ PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+ # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+ # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+ local our_conf=(
+ --prefix="${PHP_DESTDIR}"
+ --mandir="${PHP_DESTDIR}/man"
+ --infodir="${PHP_DESTDIR}/info"
+ --libdir="${PHP_DESTDIR}/lib"
+ --with-libdir="$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-pear
+ $(use_enable threads maintainer-zts)
+ )
+
+ our_conf+=(
+ $(use_with acl fpm-acl)
+ $(use_enable bcmath bcmath)
+ $(use_with bzip2 bz2 "${EPREFIX}/usr")
+ $(use_enable calendar calendar)
+ $(use_enable coverage gcov)
+ $(use_enable ctype ctype)
+ $(use_with curl curl "${EPREFIX}/usr")
+ $(use_enable xml dom)
+ $(use_with enchant enchant "${EPREFIX}/usr")
+ $(use_enable exif exif)
+ $(use_enable fileinfo fileinfo)
+ $(use_enable filter filter)
+ $(use_enable ftp ftp)
+ $(use_with nls gettext "${EPREFIX}/usr")
+ $(use_with gmp gmp "${EPREFIX}/usr")
+ $(use_enable hash hash)
+ $(use_with mhash mhash "${EPREFIX}/usr")
+ $(use_with iconv iconv \
+ $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+ $(use_enable intl intl)
+ $(use_enable ipv6 ipv6)
+ $(use_enable json json)
+ $(use_with kerberos kerberos "${EPREFIX}/usr")
+ $(use_enable xml libxml)
+ $(use_with xml libxml-dir "${EPREFIX}/usr")
+ $(use_enable unicode mbstring)
+ $(use_with crypt mcrypt "${EPREFIX}/usr")
+ $(use_with unicode onig "${EPREFIX}/usr")
+ $(use_with ssl openssl "${EPREFIX}/usr")
+ $(use_with ssl openssl-dir "${EPREFIX}/usr")
+ $(use_enable pcntl pcntl)
+ $(use_enable phar phar)
+ $(use_enable pdo pdo)
+ $(use_enable opcache opcache)
+ $(use_with postgres pgsql "${EPREFIX}/usr")
+ $(use_enable posix posix)
+ $(use_with spell pspell "${EPREFIX}/usr")
+ $(use_with recode recode "${EPREFIX}/usr")
+ $(use_enable simplexml simplexml)
+ $(use_enable sharedmem shmop)
+ $(use_with snmp snmp "${EPREFIX}/usr")
+ $(use_enable soap soap)
+ $(use_enable sockets sockets)
+ $(use_with sqlite sqlite3 "${EPREFIX}/usr")
+ $(use_enable sysvipc sysvmsg)
+ $(use_enable sysvipc sysvsem)
+ $(use_enable sysvipc sysvshm)
+ $(use_with systemd fpm-systemd)
+ $(use_with tidy tidy "${EPREFIX}/usr")
+ $(use_enable tokenizer tokenizer)
+ $(use_enable wddx wddx)
+ $(use_enable xml xml)
+ $(use_enable xmlreader xmlreader)
+ $(use_enable xmlwriter xmlwriter)
+ $(use_with xmlrpc xmlrpc)
+ $(use_with xslt xsl "${EPREFIX}/usr")
+ $(use_enable zip zip)
+ $(use_with zlib zlib "${EPREFIX}/usr")
+ $(use_enable debug debug)
+ )
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm ; then
+ our_conf+=( "--enable-dba${shared}" )
+ fi
+
+ # DBA drivers support
+ our_conf+=(
+ $(use_with cdb cdb)
+ $(use_with berkdb db4 "${EPREFIX}/usr")
+ $(use_enable flatfile flatfile)
+ $(use_with gdbm gdbm "${EPREFIX}/usr")
+ $(use_enable inifile inifile)
+ $(use_with qdbm qdbm "${EPREFIX}/usr")
+ )
+
+ # Support for the GD graphics library
+ our_conf+=(
+ $(use_with truetype freetype-dir "${EPREFIX}/usr")
+ $(use_enable cjk gd-jis-conv)
+ $(use_with gd jpeg-dir "${EPREFIX}/usr")
+ $(use_with gd png-dir "${EPREFIX}/usr")
+ $(use_with xpm xpm-dir "${EPREFIX}/usr")
+ )
+ if use webp; then
+ our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+ fi
+ # enable gd last, so configure can pick up the previous settings
+ our_conf+=( $(use_with gd gd) )
+
+ # IMAP support
+ if use imap ; then
+ our_conf+=(
+ $(use_with imap imap "${EPREFIX}/usr")
+ $(use_with ssl imap-ssl "${EPREFIX}/usr")
+ )
+ fi
+
+ # Interbase/firebird support
+ our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+ # LDAP support
+ if use ldap ; then
+ our_conf+=(
+ $(use_with ldap ldap "${EPREFIX}/usr")
+ $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+ )
+ fi
+
+ # MySQL support
+ local mysqllib="mysqlnd"
+ local mysqlilib="mysqlnd"
+
+ our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+ local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ if use mysql || use mysqli ; then
+ our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+ fi
+
+ # ODBC support
+ our_conf+=(
+ $(use_with odbc unixODBC "${EPREFIX}/usr")
+ $(use_with iodbc iodbc "${EPREFIX}/usr")
+ )
+
+ # Oracle support
+ our_conf+=( $(use_with oci8-instant-client oci8) )
+
+ # PDO support
+ if use pdo ; then
+ our_conf+=(
+ $(use_with mssql pdo-dblib "${EPREFIX}/usr")
+ $(use_with mysql pdo-mysql "${mysqllib}")
+ $(use_with postgres pdo-pgsql)
+ $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+ $(use_with firebird pdo-firebird "${EPREFIX}/usr")
+ $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+ $(use_with oci8-instant-client pdo-oci)
+ )
+ fi
+
+ # readline/libedit support
+ our_conf+=(
+ $(use_with readline readline "${EPREFIX}/usr")
+ $(use_with libedit libedit "${EPREFIX}/usr")
+ )
+
+ # Session support
+ if use session ; then
+ our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+ else
+ our_conf+=( $(use_enable session session) )
+ fi
+
+ # Use pic for shared modules such as apache2's mod_php
+ our_conf+=( --with-pic )
+
+ # we use the system copy of pcre
+ # --with-pcre-regex affects ext/pcre
+ # --with-pcre-dir affects ext/filter and ext/zip
+ our_conf+=(
+ --with-pcre-regex="${EPREFIX}/usr"
+ --with-pcre-dir="${EPREFIX}/usr"
+ )
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Cache the ./configure test results between SAPIs.
+ our_conf+=( --cache-file="${T}/config.cache" )
+
+ # Support user-passed configuration parameters
+ our_conf+=( ${EXTRA_ECONF:-} )
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ mkdir -p "${WORKDIR}/sapis-build" || die
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ # The BUILD_DIR variable is used to determine where to output
+ # the files that autotools creates. This was all originally
+ # based on the autotools-utils eclass.
+ BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+ cp -a "${S}" "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ local sapi_conf=(
+ --with-config-file-path="${PHP_INI_DIR}"
+ --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+ )
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm|phpdbg)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( "--enable-${sapi}" )
+ else
+ sapi_conf+=( "--disable-${sapi}" )
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+ else
+ sapi_conf+=( --without-apxs2 )
+ fi
+ ;;
+ esac
+ done
+
+ # Construct the $myeconfargs array by concatenating $our_conf
+ # (the common args) and $sapi_conf (the SAPI-specific args).
+ local myeconfargs=( "${our_conf[@]}" )
+ myeconfargs+=( "${sapi_conf[@]}" )
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+ econf "${myeconfargs[@]}"
+ popd > /dev/null || die
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/mib_indexes
+
+ for sapi in ${SAPIS} ; do
+ if use "${sapi}"; then
+ cd "${WORKDIR}/sapis-build/$sapi" || \
+ die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+ emake
+ fi
+ done
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi" || die
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir "/usr/share/php${PHP_MV}"
+
+ local sapi="", file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp${PHP_MV}$(get_libname)" \
+ "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ local dest="${PHP_DESTDIR#${EPREFIX}}"
+ into "${dest}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}$(get_libname)"
+ ;;
+ phpdbg)
+ source="sapi/phpdbg/phpdbg"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}"
+ else
+ dobin "${source}"
+ local name="$(basename ${source})"
+ dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Installing opcache module
+ if use opcache ; then
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ dolib.so "modules/opcache$(get_libname)"
+ fi
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+ sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+ if use fpm ; then
+ if use systemd; then
+ systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+ "php-fpm@${SLOT}.service"
+ else
+ systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+ "php-fpm@${SLOT}.service"
+ fi
+ fi
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+ export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
+ "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+ "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ elog
+ elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+ elog "your apache2 command. OpenRC users can append that string to"
+ elog "APACHE2_OPTS in /etc/conf.d/apache2."
+ elog
+ elog "The apache module configuration file 70_mod_php.conf is"
+ elog "provided (and maintained) by eselect-php."
+ elog
+ fi
+
+ # Create the symlinks for php
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT} || die
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ # Remove dead symlinks for SAPIs that were just disabled. For
+ # example, if the user has the cgi SAPI enabled, then he has an
+ # eselect-php symlink for it. If he later reinstalls PHP with
+ # USE="-cgi", that symlink will break. This call to eselect is
+ # supposed to remove that dead link per bug 572436.
+ eselect php cleanup || die
+
+ if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+ elog "To build extensions for this version of PHP, you will need to"
+ elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+ elog
+ fi
+
+ # Warn about the removal of PHP_INI_VERSION if the user has it set.
+ if [[ -n "${PHP_INI_VERSION}" ]]; then
+ ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+ ewarn 'remove it from your configuration at your convenience. See'
+ ewarn
+ ewarn ' https://bugs.gentoo.org/611214'
+ ewarn
+ ewarn 'for more information.'
+ fi
+
+ elog "For details on how version slotting works, please see"
+ elog "the wiki:"
+ elog
+ elog " https://wiki.gentoo.org/wiki/PHP"
+ elog
+}
+
+pkg_postrm() {
+ # This serves two purposes. First, if we have just removed the last
+ # installed version of PHP, then this will remove any dead symlinks
+ # belonging to eselect-php. Second, if a user upgrades slots from
+ # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+ # his existing symlinks to point to the new 7.0 installation. The
+ # latter is bug 432962.
+ #
+ # Note: the eselect-php package may not be installed at this point,
+ # so we can't die() if this command fails.
+ eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.1.10.ebuild b/dev-lang/php/php-7.1.10.ebuild
new file mode 100644
index 000000000000..054f5bdb63e5
--- /dev/null
+++ b/dev-lang/php/php-7.1.10.ebuild
@@ -0,0 +1,721 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic versionator systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="http://php.net/"
+SRC_URI="http://php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+ BSD
+ Zend-2.0
+ bcmath? ( LGPL-2.1+ )
+ fpm? ( BSD-2 )
+ gd? ( gd )
+ unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(get_version_component_range 1-2)"
+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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+ coverage crypt +ctype curl debug
+ enchant exif +fileinfo +filter firebird
+ flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+ intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+ mhash mssql mysql mysqli nls
+ oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+ readline recode selinux +session sharedmem
+ +simplexml snmp soap sockets spell sqlite ssl
+ sysvipc systemd test tidy +tokenizer truetype unicode wddx webp
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+ >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+ >=dev-libs/libpcre-8.32[unicode]
+ acl? ( sys-apps/acl )
+ apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+ =dev-libs/libmcrypt-2.4 )
+ curl? ( >=net-misc/curl-7.10.5 )
+ enchant? ( app-text/enchant )
+ firebird? ( dev-db/firebird )
+ gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+ gdbm? ( >=sys-libs/gdbm-1.8.0 )
+ gmp? ( dev-libs/gmp:0 )
+ iconv? ( virtual/libiconv )
+ imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+ intl? ( dev-libs/icu:= )
+ iodbc? ( dev-db/libiodbc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+ libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+ mssql? ( dev-db/freetds[mssql] )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+ odbc? ( >=dev-db/unixODBC-1.8.13 )
+ postgres? ( dev-db/postgresql:* )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline:0= )
+ recode? ( app-text/recode )
+ sharedmem? ( dev-libs/mm )
+ simplexml? ( >=dev-libs/libxml2-2.6.8 )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ soap? ( >=dev-libs/libxml2-2.6.8 )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+ truetype? ( =media-libs/freetype-2* )
+ unicode? ( dev-libs/oniguruma:= )
+ wddx? ( >=dev-libs/libxml2-2.6.8 )
+ webp? ( media-libs/libwebp )
+ xml? ( >=dev-libs/libxml2-2.6.8 )
+ xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+ xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+ xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+ xpm? ( x11-libs/libXpm )
+ xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+ zip? ( sys-libs/zlib )
+ zlib? ( sys-libs/zlib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/mta
+ fpm? (
+ selinux? ( sec-policy/selinux-phpfpm )
+ systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ >=sys-devel/bison-3.0.1"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
+ cli? ( ^^ ( readline libedit ) )
+ truetype? ( gd )
+ webp? ( gd )
+ cjk? ( gd )
+ exif? ( gd )
+ xpm? ( gd )
+ gd? ( zlib )
+ simplexml? ( xml )
+ soap? ( xml )
+ wddx? ( xml )
+ xmlrpc? ( || ( xml iconv ) )
+ xmlreader? ( xml )
+ xslt? ( xml )
+ ldap-sasl? ( ldap )
+ mhash? ( hash )
+ phar? ( hash )
+ qdbm? ( !gdbm )
+ readline? ( !libedit )
+ recode? ( !imap !mysqli !mysql )
+ sharedmem? ( !threads )
+ mysql? ( || ( mysqli pdo ) )
+"
+
+PHP_MV="$(get_major_version)"
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ # Always install the production INI file, bug 611214.
+ local phpinisrc="php.ini-production-${phpsapi}"
+ cp php.ini-production "${phpinisrc}" || die
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+ -i "${phpinisrc}" || die
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+ dodir "${PHP_INI_DIR#${EPREFIX}}"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" php.ini
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ if use opcache; then
+ elog "Adding opcache to $PHP_EXT_INI_DIR"
+ echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+ "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+ dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+ "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+ fi
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "fpm" ]] ; then
+ einfo "Installing FPM config files php-fpm.conf and www.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ doins sapi/fpm/php-fpm.conf
+ insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+ doins sapi/fpm/www.conf
+ fi
+
+ dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ default
+
+ # In php-7.x, the FPM pool configuration files have been split off
+ # of the main config. By default the pool config files go in
+ # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+ # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+ # we'll install the pool configuration file "www.conf" there.
+ php_set_ini_dir fpm
+ sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+ sapi/fpm/php-fpm.conf.in \
+ || die 'failed to move the include directory in php-fpm.conf'
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/mib_indexes
+
+ PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+ # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+ # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+ local our_conf=(
+ --prefix="${PHP_DESTDIR}"
+ --mandir="${PHP_DESTDIR}/man"
+ --infodir="${PHP_DESTDIR}/info"
+ --libdir="${PHP_DESTDIR}/lib"
+ --with-libdir="$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-pear
+ $(use_enable threads maintainer-zts)
+ )
+
+ our_conf+=(
+ $(use_with acl fpm-acl)
+ $(use_enable bcmath bcmath)
+ $(use_with bzip2 bz2 "${EPREFIX}/usr")
+ $(use_enable calendar calendar)
+ $(use_enable coverage gcov)
+ $(use_enable ctype ctype)
+ $(use_with curl curl "${EPREFIX}/usr")
+ $(use_enable xml dom)
+ $(use_with enchant enchant "${EPREFIX}/usr")
+ $(use_enable exif exif)
+ $(use_enable fileinfo fileinfo)
+ $(use_enable filter filter)
+ $(use_enable ftp ftp)
+ $(use_with nls gettext "${EPREFIX}/usr")
+ $(use_with gmp gmp "${EPREFIX}/usr")
+ $(use_enable hash hash)
+ $(use_with mhash mhash "${EPREFIX}/usr")
+ $(use_with iconv iconv \
+ $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+ $(use_enable intl intl)
+ $(use_enable ipv6 ipv6)
+ $(use_enable json json)
+ $(use_with kerberos kerberos "${EPREFIX}/usr")
+ $(use_enable xml libxml)
+ $(use_with xml libxml-dir "${EPREFIX}/usr")
+ $(use_enable unicode mbstring)
+ $(use_with crypt mcrypt "${EPREFIX}/usr")
+ $(use_with unicode onig "${EPREFIX}/usr")
+ $(use_with ssl openssl "${EPREFIX}/usr")
+ $(use_with ssl openssl-dir "${EPREFIX}/usr")
+ $(use_enable pcntl pcntl)
+ $(use_enable phar phar)
+ $(use_enable pdo pdo)
+ $(use_enable opcache opcache)
+ $(use_with postgres pgsql "${EPREFIX}/usr")
+ $(use_enable posix posix)
+ $(use_with spell pspell "${EPREFIX}/usr")
+ $(use_with recode recode "${EPREFIX}/usr")
+ $(use_enable simplexml simplexml)
+ $(use_enable sharedmem shmop)
+ $(use_with snmp snmp "${EPREFIX}/usr")
+ $(use_enable soap soap)
+ $(use_enable sockets sockets)
+ $(use_with sqlite sqlite3 "${EPREFIX}/usr")
+ $(use_enable sysvipc sysvmsg)
+ $(use_enable sysvipc sysvsem)
+ $(use_enable sysvipc sysvshm)
+ $(use_with systemd fpm-systemd)
+ $(use_with tidy tidy "${EPREFIX}/usr")
+ $(use_enable tokenizer tokenizer)
+ $(use_enable wddx wddx)
+ $(use_enable xml xml)
+ $(use_enable xmlreader xmlreader)
+ $(use_enable xmlwriter xmlwriter)
+ $(use_with xmlrpc xmlrpc)
+ $(use_with xslt xsl "${EPREFIX}/usr")
+ $(use_enable zip zip)
+ $(use_with zlib zlib "${EPREFIX}/usr")
+ $(use_enable debug debug)
+ )
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm ; then
+ our_conf+=( "--enable-dba${shared}" )
+ fi
+
+ # DBA drivers support
+ our_conf+=(
+ $(use_with cdb cdb)
+ $(use_with berkdb db4 "${EPREFIX}/usr")
+ $(use_enable flatfile flatfile)
+ $(use_with gdbm gdbm "${EPREFIX}/usr")
+ $(use_enable inifile inifile)
+ $(use_with qdbm qdbm "${EPREFIX}/usr")
+ )
+
+ # Support for the GD graphics library
+ our_conf+=(
+ $(use_with truetype freetype-dir "${EPREFIX}/usr")
+ $(use_enable cjk gd-jis-conv)
+ $(use_with gd jpeg-dir "${EPREFIX}/usr")
+ $(use_with gd png-dir "${EPREFIX}/usr")
+ $(use_with xpm xpm-dir "${EPREFIX}/usr")
+ )
+ if use webp; then
+ our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+ fi
+ # enable gd last, so configure can pick up the previous settings
+ our_conf+=( $(use_with gd gd) )
+
+ # IMAP support
+ if use imap ; then
+ our_conf+=(
+ $(use_with imap imap "${EPREFIX}/usr")
+ $(use_with ssl imap-ssl "${EPREFIX}/usr")
+ )
+ fi
+
+ # Interbase/firebird support
+ our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+ # LDAP support
+ if use ldap ; then
+ our_conf+=(
+ $(use_with ldap ldap "${EPREFIX}/usr")
+ $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+ )
+ fi
+
+ # MySQL support
+ local mysqllib="mysqlnd"
+ local mysqlilib="mysqlnd"
+
+ our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+ local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ if use mysql || use mysqli ; then
+ our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+ fi
+
+ # ODBC support
+ our_conf+=(
+ $(use_with odbc unixODBC "${EPREFIX}/usr")
+ $(use_with iodbc iodbc "${EPREFIX}/usr")
+ )
+
+ # Oracle support
+ our_conf+=( $(use_with oci8-instant-client oci8) )
+
+ # PDO support
+ if use pdo ; then
+ our_conf+=(
+ $(use_with mssql pdo-dblib "${EPREFIX}/usr")
+ $(use_with mysql pdo-mysql "${mysqllib}")
+ $(use_with postgres pdo-pgsql)
+ $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+ $(use_with firebird pdo-firebird "${EPREFIX}/usr")
+ $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+ $(use_with oci8-instant-client pdo-oci)
+ )
+ fi
+
+ # readline/libedit support
+ our_conf+=(
+ $(use_with readline readline "${EPREFIX}/usr")
+ $(use_with libedit libedit "${EPREFIX}/usr")
+ )
+
+ # Session support
+ if use session ; then
+ our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+ else
+ our_conf+=( $(use_enable session session) )
+ fi
+
+ # Use pic for shared modules such as apache2's mod_php
+ our_conf+=( --with-pic )
+
+ # we use the system copy of pcre
+ # --with-pcre-regex affects ext/pcre
+ # --with-pcre-dir affects ext/filter and ext/zip
+ our_conf+=(
+ --with-pcre-regex="${EPREFIX}/usr"
+ --with-pcre-dir="${EPREFIX}/usr"
+ )
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Cache the ./configure test results between SAPIs.
+ our_conf+=( --cache-file="${T}/config.cache" )
+
+ # Support user-passed configuration parameters
+ our_conf+=( ${EXTRA_ECONF:-} )
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ mkdir -p "${WORKDIR}/sapis-build" || die
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ # The BUILD_DIR variable is used to determine where to output
+ # the files that autotools creates. This was all originally
+ # based on the autotools-utils eclass.
+ BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+ cp -a "${S}" "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ local sapi_conf=(
+ --with-config-file-path="${PHP_INI_DIR}"
+ --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+ )
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm|phpdbg)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( "--enable-${sapi}" )
+ else
+ sapi_conf+=( "--disable-${sapi}" )
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+ else
+ sapi_conf+=( --without-apxs2 )
+ fi
+ ;;
+ esac
+ done
+
+ # Construct the $myeconfargs array by concatenating $our_conf
+ # (the common args) and $sapi_conf (the SAPI-specific args).
+ local myeconfargs=( "${our_conf[@]}" )
+ myeconfargs+=( "${sapi_conf[@]}" )
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+ econf "${myeconfargs[@]}"
+ popd > /dev/null || die
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/mib_indexes
+
+ for sapi in ${SAPIS} ; do
+ if use "${sapi}"; then
+ cd "${WORKDIR}/sapis-build/$sapi" || \
+ die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+ emake
+ fi
+ done
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi" || die
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir "/usr/share/php${PHP_MV}"
+
+ local sapi="", file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp${PHP_MV}$(get_libname)" \
+ "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ local dest="${PHP_DESTDIR#${EPREFIX}}"
+ into "${dest}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}$(get_libname)"
+ ;;
+ phpdbg)
+ source="sapi/phpdbg/phpdbg"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}"
+ else
+ dobin "${source}"
+ local name="$(basename ${source})"
+ dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Installing opcache module
+ if use opcache ; then
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ dolib.so "modules/opcache$(get_libname)"
+ fi
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+ sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+ if use fpm ; then
+ if use systemd; then
+ systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+ "php-fpm@${SLOT}.service"
+ else
+ systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+ "php-fpm@${SLOT}.service"
+ fi
+ fi
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+ export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
+ "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+ "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ elog
+ elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+ elog "your apache2 command. OpenRC users can append that string to"
+ elog "APACHE2_OPTS in /etc/conf.d/apache2."
+ elog
+ elog "The apache module configuration file 70_mod_php.conf is"
+ elog "provided (and maintained) by eselect-php."
+ elog
+ fi
+
+ # Create the symlinks for php
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT} || die
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ # Remove dead symlinks for SAPIs that were just disabled. For
+ # example, if the user has the cgi SAPI enabled, then he has an
+ # eselect-php symlink for it. If he later reinstalls PHP with
+ # USE="-cgi", that symlink will break. This call to eselect is
+ # supposed to remove that dead link per bug 572436.
+ eselect php cleanup || die
+
+ if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+ elog "To build extensions for this version of PHP, you will need to"
+ elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+ elog
+ fi
+
+ # Warn about the removal of PHP_INI_VERSION if the user has it set.
+ if [[ -n "${PHP_INI_VERSION}" ]]; then
+ ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+ ewarn 'remove it from your configuration at your convenience. See'
+ ewarn
+ ewarn ' https://bugs.gentoo.org/611214'
+ ewarn
+ ewarn 'for more information.'
+ fi
+
+ elog "For details on how version slotting works, please see"
+ elog "the wiki:"
+ elog
+ elog " https://wiki.gentoo.org/wiki/PHP"
+ elog
+}
+
+pkg_postrm() {
+ # This serves two purposes. First, if we have just removed the last
+ # installed version of PHP, then this will remove any dead symlinks
+ # belonging to eselect-php. Second, if a user upgrades slots from
+ # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+ # his existing symlinks to point to the new 7.0 installation. The
+ # latter is bug 432962.
+ #
+ # Note: the eselect-php package may not be installed at this point,
+ # so we can't die() if this command fails.
+ eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.2.0_rc3.ebuild b/dev-lang/php/php-7.2.0_rc3.ebuild
new file mode 100644
index 000000000000..6df349856b30
--- /dev/null
+++ b/dev-lang/php/php-7.2.0_rc3.ebuild
@@ -0,0 +1,734 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic versionator systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="http://php.net/"
+SRC_URI="https://downloads.php.net/~remi/php-7.2.0RC3.tar.xz"
+
+LICENSE="PHP-3.01
+ BSD
+ Zend-2.0
+ bcmath? ( LGPL-2.1+ )
+ fpm? ( BSD-2 )
+ gd? ( gd )
+ unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(get_version_component_range 1-2)"
+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"
+
+S="${WORKDIR}/php-7.2.0RC3"
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+ coverage +ctype curl debug
+ enchant exif +fileinfo +filter firebird
+ flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+ intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+ mhash mssql mysql mysqli nls
+ oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+ readline recode selinux +session sharedmem
+ +simplexml snmp soap sockets sodium spell sqlite ssl
+ sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+ >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+ >=dev-libs/libpcre-8.32[unicode]
+ acl? ( sys-apps/acl )
+ apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+ =net-misc/curl-7.10.5 )
+ enchant? ( app-text/enchant )
+ firebird? ( dev-db/firebird )
+ gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+ gdbm? ( >=sys-libs/gdbm-1.8.0 )
+ gmp? ( dev-libs/gmp:0 )
+ iconv? ( virtual/libiconv )
+ imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+ intl? ( dev-libs/icu:= )
+ iodbc? ( dev-db/libiodbc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+ libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+ lmdb? ( dev-db/lmdb:= )
+ mssql? ( dev-db/freetds[mssql] )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+ odbc? ( >=dev-db/unixODBC-1.8.13 )
+ postgres? ( dev-db/postgresql:* )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline:0= )
+ recode? ( app-text/recode )
+ sharedmem? ( dev-libs/mm )
+ simplexml? ( >=dev-libs/libxml2-2.6.8 )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ soap? ( >=dev-libs/libxml2-2.6.8 )
+ sodium? ( dev-libs/libsodium:= )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ truetype? ( =media-libs/freetype-2* )
+ unicode? ( dev-libs/oniguruma:= )
+ wddx? ( >=dev-libs/libxml2-2.6.8 )
+ webp? ( media-libs/libwebp )
+ xml? ( >=dev-libs/libxml2-2.6.8 )
+ xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+ xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+ xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+ xpm? ( x11-libs/libXpm )
+ xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+ zip? ( sys-libs/zlib )
+ zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+ zlib? ( sys-libs/zlib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/mta
+ fpm? (
+ selinux? ( sec-policy/selinux-phpfpm )
+ systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ >=sys-devel/bison-3.0.1"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
+ cli? ( ^^ ( readline libedit ) )
+ truetype? ( gd )
+ webp? ( gd )
+ cjk? ( gd )
+ exif? ( gd )
+ xpm? ( gd )
+ gd? ( zlib )
+ simplexml? ( xml )
+ soap? ( xml )
+ wddx? ( xml )
+ xmlrpc? ( || ( xml iconv ) )
+ xmlreader? ( xml )
+ xslt? ( xml )
+ ldap-sasl? ( ldap )
+ mhash? ( hash )
+ phar? ( hash )
+ qdbm? ( !gdbm )
+ readline? ( !libedit )
+ recode? ( !imap !mysqli !mysql )
+ sharedmem? ( !threads )
+ mysql? ( || ( mysqli pdo ) )
+ zip-encryption? ( zip )
+"
+
+PHP_MV="$(get_major_version)"
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ # Always install the production INI file, bug 611214.
+ local phpinisrc="php.ini-production-${phpsapi}"
+ cp php.ini-production "${phpinisrc}" || die
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+ -i "${phpinisrc}" || die
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+ dodir "${PHP_INI_DIR#${EPREFIX}}"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" php.ini
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ if use opcache; then
+ elog "Adding opcache to $PHP_EXT_INI_DIR"
+ echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+ "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+ dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+ "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+ fi
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "fpm" ]] ; then
+ einfo "Installing FPM config files php-fpm.conf and www.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ doins sapi/fpm/php-fpm.conf
+ insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+ doins sapi/fpm/www.conf
+ fi
+
+ dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ default
+
+ # In php-7.x, the FPM pool configuration files have been split off
+ # of the main config. By default the pool config files go in
+ # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+ # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+ # we'll install the pool configuration file "www.conf" there.
+ php_set_ini_dir fpm
+ sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+ sapi/fpm/php-fpm.conf.in \
+ || die 'failed to move the include directory in php-fpm.conf'
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/mib_indexes
+
+ PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+ # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+ # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+ local our_conf=(
+ --prefix="${PHP_DESTDIR}"
+ --mandir="${PHP_DESTDIR}/man"
+ --infodir="${PHP_DESTDIR}/info"
+ --libdir="${PHP_DESTDIR}/lib"
+ --with-libdir="$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-pear
+ $(use_enable threads maintainer-zts)
+ )
+
+ our_conf+=(
+ $(use_with acl fpm-acl)
+ $(use_with argon2 password-argon2 "${EPREFIX}/usr")
+ $(use_enable bcmath bcmath)
+ $(use_with bzip2 bz2 "${EPREFIX}/usr")
+ $(use_enable calendar calendar)
+ $(use_enable coverage gcov)
+ $(use_enable ctype ctype)
+ $(use_with curl curl "${EPREFIX}/usr")
+ $(use_enable xml dom)
+ $(use_with enchant enchant "${EPREFIX}/usr")
+ $(use_enable exif exif)
+ $(use_enable fileinfo fileinfo)
+ $(use_enable filter filter)
+ $(use_enable ftp ftp)
+ $(use_with nls gettext "${EPREFIX}/usr")
+ $(use_with gmp gmp "${EPREFIX}/usr")
+ $(use_enable hash hash)
+ $(use_with mhash mhash "${EPREFIX}/usr")
+ $(use_with iconv iconv \
+ $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+ $(use_enable intl intl)
+ $(use_enable ipv6 ipv6)
+ $(use_enable json json)
+ $(use_with kerberos kerberos "${EPREFIX}/usr")
+ $(use_enable xml libxml)
+ $(use_with xml libxml-dir "${EPREFIX}/usr")
+ $(use_enable unicode mbstring)
+ $(use_with unicode onig "${EPREFIX}/usr")
+ $(use_with ssl openssl "${EPREFIX}/usr")
+ $(use_with ssl openssl-dir "${EPREFIX}/usr")
+ $(use_enable pcntl pcntl)
+ $(use_enable phar phar)
+ $(use_enable pdo pdo)
+ $(use_enable opcache opcache)
+ $(use_with postgres pgsql "${EPREFIX}/usr")
+ $(use_enable posix posix)
+ $(use_with spell pspell "${EPREFIX}/usr")
+ $(use_with recode recode "${EPREFIX}/usr")
+ $(use_enable simplexml simplexml)
+ $(use_enable sharedmem shmop)
+ $(use_with snmp snmp "${EPREFIX}/usr")
+ $(use_enable soap soap)
+ $(use_enable sockets sockets)
+ $(use_with sodium sodium "${EPREFIX}/usr")
+ $(use_with sqlite sqlite3 "${EPREFIX}/usr")
+ $(use_enable sysvipc sysvmsg)
+ $(use_enable sysvipc sysvsem)
+ $(use_enable sysvipc sysvshm)
+ $(use_with systemd fpm-systemd)
+ $(use_with tidy tidy "${EPREFIX}/usr")
+ $(use_enable tokenizer tokenizer)
+ $(use_enable wddx wddx)
+ $(use_enable xml xml)
+ $(use_enable xmlreader xmlreader)
+ $(use_enable xmlwriter xmlwriter)
+ $(use_with xmlrpc xmlrpc)
+ $(use_with xslt xsl "${EPREFIX}/usr")
+ $(use_enable zip zip)
+ $(use_with zip-encryption libzip "${EPREFIX}/usr")
+ $(use_with zlib zlib "${EPREFIX}/usr")
+ $(use_enable debug debug)
+ )
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm || use lmdb || use tokyocabinet ; then
+ our_conf+=( "--enable-dba${shared}" )
+ fi
+
+ # DBA drivers support
+ our_conf+=(
+ $(use_with cdb cdb)
+ $(use_with berkdb db4 "${EPREFIX}/usr")
+ $(use_enable flatfile flatfile)
+ $(use_with gdbm gdbm "${EPREFIX}/usr")
+ $(use_enable inifile inifile)
+ $(use_with qdbm qdbm "${EPREFIX}/usr")
+ $(use_with lmdb lmdb "${EPREFIX}/usr")
+ )
+
+ # Support for the GD graphics library
+ our_conf+=(
+ $(use_with truetype freetype-dir "${EPREFIX}/usr")
+ $(use_enable cjk gd-jis-conv)
+ $(use_with gd jpeg-dir "${EPREFIX}/usr")
+ $(use_with gd png-dir "${EPREFIX}/usr")
+ $(use_with xpm xpm-dir "${EPREFIX}/usr")
+ )
+ if use webp; then
+ our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+ fi
+ # enable gd last, so configure can pick up the previous settings
+ our_conf+=( $(use_with gd gd) )
+
+ # IMAP support
+ if use imap ; then
+ our_conf+=(
+ $(use_with imap imap "${EPREFIX}/usr")
+ $(use_with ssl imap-ssl "${EPREFIX}/usr")
+ )
+ fi
+
+ # Interbase/firebird support
+ our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+ # LDAP support
+ if use ldap ; then
+ our_conf+=(
+ $(use_with ldap ldap "${EPREFIX}/usr")
+ $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+ )
+ fi
+
+ # MySQL support
+ local mysqllib="mysqlnd"
+ local mysqlilib="mysqlnd"
+
+ our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+ local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ if use mysql || use mysqli ; then
+ our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+ fi
+
+ # ODBC support
+ our_conf+=(
+ $(use_with odbc unixODBC "${EPREFIX}/usr")
+ $(use_with iodbc iodbc "${EPREFIX}/usr")
+ )
+
+ # Oracle support
+ our_conf+=( $(use_with oci8-instant-client oci8) )
+
+ # PDO support
+ if use pdo ; then
+ our_conf+=(
+ $(use_with mssql pdo-dblib "${EPREFIX}/usr")
+ $(use_with mysql pdo-mysql "${mysqllib}")
+ $(use_with postgres pdo-pgsql)
+ $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+ $(use_with firebird pdo-firebird "${EPREFIX}/usr")
+ $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+ $(use_with oci8-instant-client pdo-oci)
+ )
+ fi
+
+ # readline/libedit support
+ our_conf+=(
+ $(use_with readline readline "${EPREFIX}/usr")
+ $(use_with libedit libedit "${EPREFIX}/usr")
+ )
+
+ # Session support
+ if use session ; then
+ our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+ else
+ our_conf+=( $(use_enable session session) )
+ fi
+
+ # Use pic for shared modules such as apache2's mod_php
+ our_conf+=( --with-pic )
+
+ # we use the system copy of pcre
+ # --with-pcre-regex affects ext/pcre
+ # --with-pcre-dir affects ext/filter and ext/zip
+ # --with-pcre-valgrind cannot be enabled with system pcre
+ # Many arches don't support pcre-jit
+ our_conf+=(
+ --with-pcre-regex="${EPREFIX}/usr"
+ --with-pcre-dir="${EPREFIX}/usr"
+ --without-pcre-valgrind
+ --without-pcre-jit
+ )
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Cache the ./configure test results between SAPIs.
+ our_conf+=( --cache-file="${T}/config.cache" )
+
+ # Support user-passed configuration parameters
+ our_conf+=( ${EXTRA_ECONF:-} )
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ mkdir -p "${WORKDIR}/sapis-build" || die
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ # The BUILD_DIR variable is used to determine where to output
+ # the files that autotools creates. This was all originally
+ # based on the autotools-utils eclass.
+ BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+ cp -a "${S}" "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ local sapi_conf=(
+ --with-config-file-path="${PHP_INI_DIR}"
+ --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+ )
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm|phpdbg)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( "--enable-${sapi}" )
+ else
+ sapi_conf+=( "--disable-${sapi}" )
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+ else
+ sapi_conf+=( --without-apxs2 )
+ fi
+ ;;
+ esac
+ done
+
+ # Construct the $myeconfargs array by concatenating $our_conf
+ # (the common args) and $sapi_conf (the SAPI-specific args).
+ local myeconfargs=( "${our_conf[@]}" )
+ myeconfargs+=( "${sapi_conf[@]}" )
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+ econf "${myeconfargs[@]}"
+ popd > /dev/null || die
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/mib_indexes
+
+ for sapi in ${SAPIS} ; do
+ if use "${sapi}"; then
+ cd "${WORKDIR}/sapis-build/$sapi" || \
+ die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+ emake
+ fi
+ done
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi" || die
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir "/usr/share/php${PHP_MV}"
+
+ local sapi="", file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp${PHP_MV}$(get_libname)" \
+ "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ local dest="${PHP_DESTDIR#${EPREFIX}}"
+ into "${dest}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}$(get_libname)"
+ ;;
+ phpdbg)
+ source="sapi/phpdbg/phpdbg"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}"
+ else
+ dobin "${source}"
+ local name="$(basename ${source})"
+ dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Installing opcache module
+ if use opcache ; then
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ dolib.so "modules/opcache$(get_libname)"
+ fi
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+ sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+ if use fpm ; then
+ if use systemd; then
+ systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+ "php-fpm@${SLOT}.service"
+ else
+ systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+ "php-fpm@${SLOT}.service"
+ fi
+ fi
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+ export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
+ "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+ "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ elog
+ elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+ elog "your apache2 command. OpenRC users can append that string to"
+ elog "APACHE2_OPTS in /etc/conf.d/apache2."
+ elog
+ elog "The apache module configuration file 70_mod_php.conf is"
+ elog "provided (and maintained) by eselect-php."
+ elog
+ fi
+
+ # Create the symlinks for php
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT} || die
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ # Remove dead symlinks for SAPIs that were just disabled. For
+ # example, if the user has the cgi SAPI enabled, then he has an
+ # eselect-php symlink for it. If he later reinstalls PHP with
+ # USE="-cgi", that symlink will break. This call to eselect is
+ # supposed to remove that dead link per bug 572436.
+ eselect php cleanup || die
+
+ if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+ elog "To build extensions for this version of PHP, you will need to"
+ elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+ elog
+ fi
+
+ # Warn about the removal of PHP_INI_VERSION if the user has it set.
+ if [[ -n "${PHP_INI_VERSION}" ]]; then
+ ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+ ewarn 'remove it from your configuration at your convenience. See'
+ ewarn
+ ewarn ' https://bugs.gentoo.org/611214'
+ ewarn
+ ewarn 'for more information.'
+ fi
+
+ elog "For details on how version slotting works, please see"
+ elog "the wiki:"
+ elog
+ elog " https://wiki.gentoo.org/wiki/PHP"
+ elog
+}
+
+pkg_postrm() {
+ # This serves two purposes. First, if we have just removed the last
+ # installed version of PHP, then this will remove any dead symlinks
+ # belonging to eselect-php. Second, if a user upgrades slots from
+ # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+ # his existing symlinks to point to the new 7.0 installation. The
+ # latter is bug 432962.
+ #
+ # Note: the eselect-php package may not be installed at this point,
+ # so we can't die() if this command fails.
+ eselect php cleanup
+}
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index ca086236892e..90f32c765e6f 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,17 +1,6 @@
-DIST ruby-2.2.6.tar.xz 10487776 SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 SHA512 a2cfde1c6df4df6b996f8d86c52b255fd43b469f8b9f0d7a81ce5f4de949a67025d8bead4ce61f03263eb6a8378b156b843f97b429208afaa1d3bfd0a7af4ef4 WHIRLPOOL 77b01fbd54f77196bca93d0120474436dcdc2e8d437cf70ca1382ed38c58cf05c27e9896cb4b2afd61ea2862ce6b864d707cd4682e17dfc7912d4a74da2b741e
-DIST ruby-2.2.7.tar.xz 10507528 SHA256 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53 SHA512 21bebec6d0972f4e6f2988f471c58520e32096e43a61d627eb2210df283a6fd6d0fc49da9063f2d086f3d489f13e948462a6f084f9e931b4fde6102f490cc225 WHIRLPOOL 35e1470b7d5de25efd213b70befa7b0ce599f3e2ef73aacdf343d7ed3fe14836ab0899124cce8670c00470af9428a81a7f693cb5897448c2d2e824d5b8a1819b
DIST ruby-2.2.8.tar.xz 10520648 SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 SHA512 e21004bee537f0c706f4ac9526507b414ddb6a8d721e8fad8d7fe88992a4f048eb5eb79f8d8b8af2a8b331dcfa74b560490218a1acb3532c2cdb4fb4909da3c9 WHIRLPOOL a5b2f7a6c5131376980cf4d2a5f2d7a8a440effed588214c295fb4b83483d84310ba6bfbb96ee904384831eda47f0b1c0263d5190ca41db95df272428144cad1
-DIST ruby-2.3.4.tar.xz 11450108 SHA256 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c SHA512 9e3adc2de6703e50e75db37db2981006d4c69759929d61db6a0d63627cfe5977d0ad66d2c69d7161cfc0c0d1c2cb38e5181a06ccd2790df2f72ec25c2ad01e02 WHIRLPOOL 1e9d4112134910ebf1bd241b5031551fdfa882405ca850d9b11af9dc79251379971e18666600d88ef2054c4794a98142df150f83cb06f1dff616faee45ffe1cc
DIST ruby-2.3.5.tar.xz 11437868 SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda SHA512 c55e3b71241f505b6bbad78b3bd40235064faae3443ca14b77b6356556caed6a0d055dc2e2cd7ebdb5290ab908e06d2b7d68f72469af5017eda4b29664b0d889 WHIRLPOOL 2f7d0d7fbf12441e8d312c6c34cb06bf663a975ab3602fa385d44fb42c9b68ddfe8518ad28aead7f164afc9d6c0b825ade16c9205625bb46a738103b744b1f48
-DIST ruby-2.4.1.tar.xz 9939188 SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 SHA512 e6fd290b6edd166348b70f0f1c56f7ed9d956c4c1eb91d97d0548041ca4196b9b75ec1ad35c745bdbfd4de195899093e7205d7f02b014ecf1c48e6f31cf25903 WHIRLPOOL b45a6e3bd70e6ef802d084ad87ad0eddd85932e07939bd6ed6a2e6944aa289f231971fedd7d1eece792becb08312f37b80073a2a9df070f61f32747c0708523e
DIST ruby-2.4.2.tar.xz 10046412 SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 SHA512 c1d42272fb0d94b693452e703b0ea4942bf59cbd4b08ba83bf039f54be97ebc88511632413da0164970b4cf97bc302bccb88aab48edfa8fa147498e7ee741595 WHIRLPOOL 4117f18e7901700d2cf603ed60cbe9b59ca65359ec359a7616b2cf90c76c25117afe864a8a7b55e7dc52c93377c541a8b497f1b281cdccade97aafa5ca363a5b
-DIST ruby-patches-2.2.6.tar.bz2 2272 SHA256 f54373704ce8df732490e8d1e7e35188503faacc5278fe0ab0d8c07bdc762fed SHA512 ed8bff8f730ccb114e62784d29541f276b2821d9eb121a9772dc4aabc139b688f2b14f5f27710098a8cd751c62d31b46170b427ad54dc4f6490c003450ae1583 WHIRLPOOL 8598c9284252c1e7cc9f9019c5f468ce5ab8b4ae013e71c631cd00cc8bfde068b041f1bc6851bb2962982a1e46cbde0ddc51c186ea41638a7881c587c658e603
-DIST ruby-patches-2.2.7-r3.tar.bz2 5757 SHA256 3470915805a6264ad74a9c7cb7280c4be3585b4dc255685e53205eb4c90536f9 SHA512 9766a44633ddc33e575e2f82d0954ea54620ce7ff7f73d58e76dc3c8ab1cb664c02bc3dac5ca5834d955d5cdfc8d3b647f91c19160e3a9f62c9a69839705702e WHIRLPOOL 6476c46449424a73b75ce4605b2501240b20972960064f0c6380afba67c5472563292dd7d1965400c641b746715c3ff547566d674244b127699196043ab87d18
-DIST ruby-patches-2.2.7-r4.tar.bz2 6460 SHA256 2f7c0414d65870bf89539d6e737e9c9e5b78188d3305a5d001d562619375ee04 SHA512 a5891c893b9f5219a6b17e0628678f1714a0c04d8699a272e91aa2ecf1068677b78da60475c32ddcea5a988d1d0d2469fada58da56ef5821f03f47b30855f2ee WHIRLPOOL 4521ea39407f396db2ef646162f7cc093e3137733ad20bff2761763fd8f3161d604f2a594cb41f5f494fffeb221b8d70cefe74020ae7dcbe3ce99083237cf68e
DIST ruby-patches-2.2.8.tar.bz2 5764 SHA256 5c44fc38cb25d7dbdd8bef0fae49b5fc2f4f42da4e5b4b871655fd5e68faddbe SHA512 296387ec7f2ff82ad55f147d8f9568de544403d286ad24bb60aca916215d7ff6e1d6aca5a31c00a1999504989cda2bbd3260cae96c18ba73f9ffdcfd6b2695bd WHIRLPOOL 28889531d98b1bb96ceaa059f7fc641cc3db16eda0e3ad4cea031127c71897613d73cc3c8926dfd9ec978be79ca1201e7c90056ddcbec58d3e842c8af9a52389
-DIST ruby-patches-2.3.4-r3.tar.bz2 4698 SHA256 196bbafe0c43718b4e2120e2e4d681befe9ccba1d2607fb9459d670c74d5bd38 SHA512 f2867c3460e3a276849b09bd367949024aa8c0e4631fef6bd46e1ef44d56dfe2a7baa88ea640b8953252e566d7927178da50195b6382d8fd8e1b9ef7d9ceb2fc WHIRLPOOL 9ba584dcc0055f4401f4345da7b161d08b4a4651ea669b7a26c7504d3aeb650051080d089652c2ae39e0163609cbef1f480a46555a4f3af8297180215929d472
-DIST ruby-patches-2.3.4-r4.tar.bz2 5483 SHA256 47470aac5d2e941c3781ebd820a725dcf11da1688f8299d0408bcc9540295647 SHA512 d5dbfbbd3b2bfc43d2e7a34c4de7203470f6050875a85fc313505e224c0089fdc44045130ef6dd791d50e1f4c22afc369d3549c7860a9694d182334ce6e3687e WHIRLPOOL c6049425955a05fdcbdd859782aa6c9c372cedfbe4962c1a48c7be4e1c9d29db3010444ac68882491fc35a1f53df7d5096dc3593e4bc67c4afb40aa16609a1b3
DIST ruby-patches-2.3.5.tar.bz2 3593 SHA256 0bdc378a9e3ea6ec1579cc99a3c8b983b492e49b9fc1e9432595d66d3a8013ae SHA512 eacb7f6787b36c7d848453b29152190a164ebc6882ab509eeb6584e49af4b66a665c4baff4ecf75e5831ae54d47dbc651d6f048918f3327500c429f1f419ed94 WHIRLPOOL 7f236988663c1082a988b836bf558b5c042c09257cdbad6931474ece7f19be2d37dfe559292182dfc6a9966f6aa3fd2bbbf0f3630bd792f84f61fd135cf7bcbe
-DIST ruby-patches-2.4.1-r3.tar.bz2 4589 SHA256 6a096f444d1281ac1ce8fd391d085741d3f41527ed0f9b893d7276c17e7b9bdd SHA512 8507189b192fd9f7f2591a2e417526e7f8baf9d2330669b13f79759c06f7729684772e74fee88c78b0ae5b266ad08c5694fcd173f4fb44c34f4cb4d1042cd773 WHIRLPOOL 81c992c4bf5bdc8a9091c68a31ffea1e52cb024388be193173bc6ad254b005bed0d3fec2a50bf4fd6e07044e386ab41f5e5b102ed27742cb53f1d381cf0a3d4a
-DIST ruby-patches-2.4.1-r4.tar.bz2 5381 SHA256 39d2f61c76b6d2c8d0524167f5355a166e7ae3eb128447517b308d5b927ff44e SHA512 168d1353f22df8884ce6dbb2ee7fb81573b9997e480f57d7da4e9504ab5b2ce7bbccad237276c71775d0730c1a6a8920978e3b26eaa06fe3c94495272af77b74 WHIRLPOOL d4d3c715715886149ea91bcc7a2da0298e88434db570eee07241eb3c74cc1d9984342212290c9b0d6adcf9e79e4c08af7b179d9be2dd45b334ae386eb23fa157
DIST ruby-patches-2.4.2.tar.bz2 3443 SHA256 621e92c4c14cec458100adf74e122df76663be4f75fc4ea86423a9ac6755ea3e SHA512 fb8349c67c72caf10ec12c4b5410194b4df24345446c2e3b6c6176d00727bfe803f4a905ef094a2d52315b6f4c3ce74fb8fbaa2fdf5efe46e6ccb24bf8418b17 WHIRLPOOL 306a16b49037a669398fb9c1b7c2b5484860d8749bf4c12d0e5eec02e3a7f7760b48b4a3cd709e0fa2b54f3d8dddff36d7eeb8d53d2d647d59e099b0299b8ed1
diff --git a/dev-lang/ruby/ruby-2.2.6.ebuild b/dev-lang/ruby/ruby-2.2.6.ebuild
deleted file mode 100644
index 619ea157591a..000000000000
--- a/dev-lang/ruby/ruby-2.2.6.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.2.0
-
-if [[ -n ${PATCHSET} ]]; then
- if [[ ${PVR} == ${PV} ]]; then
- PATCHSET="${PV}-r0.${PATCHSET}"
- else
- PATCHSET="${PVR}.${PATCHSET}"
- fi
-else
- PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
- https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
-
-RDEPEND="
- berkdb? ( sys-libs/db:= )
- gdbm? ( sys-libs/gdbm )
- jemalloc? ( dev-libs/jemalloc )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )
- socks5? ( >=net-proxy/dante-1.1.13 )
- tk? (
- dev-lang/tcl:0=[threads]
- dev-lang/tk:0=[threads]
- )
- ncurses? ( sys-libs/ncurses:0= )
- readline? ( sys-libs/readline:0= )
- dev-libs/libyaml
- virtual/libffi
- sys-libs/zlib
- >=app-eselect/eselect-ruby-20141227
- !=dev-ruby/minitest-5.4.3[ruby_targets_ruby22]
- >=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22]
- >=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22]
-"
-
-PDEPEND="
- ${BUNDLED_GEMS}
- virtual/rubygems[ruby_targets_ruby22]
- >=dev-ruby/json-1.8.1[ruby_targets_ruby22]
- >=dev-ruby/rake-0.9.6[ruby_targets_ruby22]
- rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] )
- xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/patches"
-
- # We can no longer unbundle all of rake because rubygems now depends
- # on this. We leave the actual rake code around to bootstrap
- # rubygems, but remove the bits that would cause a file collision.
- einfo "Unbundling gems..."
- cd "$S"
- rm -rf \
- {bin,lib}/rake lib/rake.rb man/rake.1 \
- bin/gem || die "removal failed"
- # Remove bundled gems that we will install via PDEPEND, bug
- # 539700. Use explicit version numbers to ensure rm fails when they
- # change so we can update dependencies accordingly.
- rm gems/{minitest-5.4.3,power_assert-0.2.2,test-unit-3.0.8}.gem || die
-
- # Fix a hardcoded lib path in configure script
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
- configure.in || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- local modules= myconf=
-
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
- # SuperH needs this
- use sh && append-flags -mieee
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- # ipv6 hack, bug 168939. Needs --enable-ipv6.
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
- # Determine which modules *not* to build depending in the USE flags.
- if ! use readline ; then
- modules="${modules},readline"
- fi
- if ! use berkdb ; then
- modules="${modules},dbm"
- fi
- if ! use gdbm ; then
- modules="${modules},gdbm"
- fi
- if ! use ssl ; then
- modules="${modules},openssl"
- fi
- if ! use ncurses ; then
- modules="${modules},curses"
- fi
- if ! use tk ; then
- modules="${modules},tk"
- fi
-
- # Provide an empty LIBPATHENV because we disable rpath but we do not
- # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
- # #564272
- INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
- --program-suffix=${MY_SUFFIX} \
- --with-soname=ruby${MY_SUFFIX} \
- --docdir=${EPREFIX}/usr/share/doc/${P} \
- --enable-shared \
- --enable-pthread \
- --disable-rpath \
- --with-out-ext="${modules}" \
- $(use_enable jemalloc jemalloc) \
- $(use_enable socks5 socks) \
- $(use_enable doc install-doc) \
- --enable-ipv6 \
- $(use_enable debug) \
- ${myconf} \
- --enable-option-checking=no \
- || die "econf failed"
-}
-
-src_compile() {
- emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
- emake -j1 V=1 test || die "make test failed"
-
- elog "Ruby's make test has been run. Ruby also ships with a make check"
- elog "that cannot be run until after ruby has been installed."
- elog
- if use rubytests; then
- elog "You have enabled rubytests, so they will be installed to"
- elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
- elog "than root, and you must place them into a writeable directory."
- elog "Then call: "
- elog
- elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
- else
- elog "Enable the rubytests USE flag to install the make check tests"
- fi
-}
-
-src_install() {
- # Remove the remaining bundled gems. We do this late in the process
- # since they are used during the build to e.g. create the
- # documentation.
- rm -rf ext/json || die
-
- # Ruby is involved in the install process, we don't want interference here.
- unset RUBYOPT
-
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
- LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
- for d in $(find "${S}/ext" -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- emake V=1 DESTDIR="${D}" install || die "make install failed"
-
- # Remove installed rubygems copy
- rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
- rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
- rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
- if use doc; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed"
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r sample
- fi
-
- dodoc ChangeLog NEWS doc/NEWS* README* || die
-
- if use rubytests; then
- pushd test
- insinto /usr/share/${PN}-${SLOT}/test
- doins -r .
- popd
- fi
-}
-
-pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
- eselect ruby set ruby${MY_SUFFIX}
- fi
-
- elog
- elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(19|20|...)"
- elog
-}
-
-pkg_postrm() {
- eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.2.7-r3.ebuild b/dev-lang/ruby/ruby-2.2.7-r3.ebuild
deleted file mode 100644
index 4e3737e56afa..000000000000
--- a/dev-lang/ruby/ruby-2.2.7-r3.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.2.0
-
-if [[ -n ${PATCHSET} ]]; then
- if [[ ${PVR} == ${PV} ]]; then
- PATCHSET="${PV}-r0.${PATCHSET}"
- else
- PATCHSET="${PVR}.${PATCHSET}"
- fi
-else
- PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
- https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
-
-RDEPEND="
- berkdb? ( sys-libs/db:= )
- gdbm? ( sys-libs/gdbm )
- jemalloc? ( dev-libs/jemalloc )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )
- socks5? ( >=net-proxy/dante-1.1.13 )
- tk? (
- dev-lang/tcl:0=[threads]
- dev-lang/tk:0=[threads]
- )
- ncurses? ( sys-libs/ncurses:0= )
- readline? ( sys-libs/readline:0= )
- dev-libs/libyaml
- virtual/libffi
- sys-libs/zlib
- >=app-eselect/eselect-ruby-20141227
- !=dev-ruby/minitest-5.4.3[ruby_targets_ruby22]
- >=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22]
- >=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22]
-"
-
-PDEPEND="
- ${BUNDLED_GEMS}
- virtual/rubygems[ruby_targets_ruby22]
- >=dev-ruby/json-1.8.1[ruby_targets_ruby22]
- >=dev-ruby/rake-0.9.6[ruby_targets_ruby22]
- rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] )
- xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/patches"
-
- # We can no longer unbundle all of rake because rubygems now depends
- # on this. We leave the actual rake code around to bootstrap
- # rubygems, but remove the bits that would cause a file collision.
- einfo "Unbundling gems..."
- cd "$S"
- rm -rf \
- {bin,lib}/rake lib/rake.rb man/rake.1 \
- bin/gem || die "removal failed"
- # Remove bundled gems that we will install via PDEPEND, bug
- # 539700. Use explicit version numbers to ensure rm fails when they
- # change so we can update dependencies accordingly.
- rm gems/{minitest-5.4.3,power_assert-0.2.2,test-unit-3.0.8}.gem || die
-
- # Fix a hardcoded lib path in configure script
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
- configure.in || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- local modules= myconf=
-
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
- # SuperH needs this
- use sh && append-flags -mieee
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- # ipv6 hack, bug 168939. Needs --enable-ipv6.
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
- # Determine which modules *not* to build depending in the USE flags.
- if ! use readline ; then
- modules="${modules},readline"
- fi
- if ! use berkdb ; then
- modules="${modules},dbm"
- fi
- if ! use gdbm ; then
- modules="${modules},gdbm"
- fi
- if ! use ssl ; then
- modules="${modules},openssl"
- fi
- if ! use ncurses ; then
- modules="${modules},curses"
- fi
- if ! use tk ; then
- modules="${modules},tk"
- fi
-
- # Provide an empty LIBPATHENV because we disable rpath but we do not
- # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
- # #564272
- INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
- --program-suffix=${MY_SUFFIX} \
- --with-soname=ruby${MY_SUFFIX} \
- --docdir=${EPREFIX}/usr/share/doc/${P} \
- --enable-shared \
- --enable-pthread \
- --disable-rpath \
- --with-out-ext="${modules}" \
- $(use_with jemalloc jemalloc) \
- $(use_enable socks5 socks) \
- $(use_enable doc install-doc) \
- --enable-ipv6 \
- $(use_enable debug) \
- ${myconf} \
- --enable-option-checking=no \
- || die "econf failed"
-}
-
-src_compile() {
- emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
- emake -j1 V=1 test || die "make test failed"
-
- elog "Ruby's make test has been run. Ruby also ships with a make check"
- elog "that cannot be run until after ruby has been installed."
- elog
- if use rubytests; then
- elog "You have enabled rubytests, so they will be installed to"
- elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
- elog "than root, and you must place them into a writeable directory."
- elog "Then call: "
- elog
- elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
- else
- elog "Enable the rubytests USE flag to install the make check tests"
- fi
-}
-
-src_install() {
- # Remove the remaining bundled gems. We do this late in the process
- # since they are used during the build to e.g. create the
- # documentation.
- rm -rf ext/json || die
-
- # Ruby is involved in the install process, we don't want interference here.
- unset RUBYOPT
-
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
- LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
- for d in $(find "${S}/ext" -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- emake V=1 DESTDIR="${D}" install || die "make install failed"
-
- # Remove installed rubygems copy
- rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
- rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
- rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
- if use doc; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed"
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r sample
- fi
-
- dodoc ChangeLog NEWS doc/NEWS* README* || die
-
- if use rubytests; then
- pushd test
- insinto /usr/share/${PN}-${SLOT}/test
- doins -r .
- popd
- fi
-}
-
-pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
- eselect ruby set ruby${MY_SUFFIX}
- fi
-
- elog
- elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(19|20|...)"
- elog
-}
-
-pkg_postrm() {
- eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.2.7-r4.ebuild b/dev-lang/ruby/ruby-2.2.7-r4.ebuild
deleted file mode 100644
index d388c657fc2d..000000000000
--- a/dev-lang/ruby/ruby-2.2.7-r4.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.2.0
-
-if [[ -n ${PATCHSET} ]]; then
- if [[ ${PVR} == ${PV} ]]; then
- PATCHSET="${PV}-r0.${PATCHSET}"
- else
- PATCHSET="${PVR}.${PATCHSET}"
- fi
-else
- PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
- https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
-
-RDEPEND="
- berkdb? ( sys-libs/db:= )
- gdbm? ( sys-libs/gdbm )
- jemalloc? ( dev-libs/jemalloc )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )
- socks5? ( >=net-proxy/dante-1.1.13 )
- tk? (
- dev-lang/tcl:0=[threads]
- dev-lang/tk:0=[threads]
- )
- ncurses? ( sys-libs/ncurses:0= )
- readline? ( sys-libs/readline:0= )
- dev-libs/libyaml
- virtual/libffi
- sys-libs/zlib
- >=app-eselect/eselect-ruby-20141227
- !=dev-ruby/minitest-5.4.3[ruby_targets_ruby22]
- >=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22]
- >=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22]
-"
-
-PDEPEND="
- ${BUNDLED_GEMS}
- virtual/rubygems[ruby_targets_ruby22]
- >=dev-ruby/json-1.8.1[ruby_targets_ruby22]
- >=dev-ruby/rake-0.9.6[ruby_targets_ruby22]
- rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] )
- xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/patches"
-
- # We can no longer unbundle all of rake because rubygems now depends
- # on this. We leave the actual rake code around to bootstrap
- # rubygems, but remove the bits that would cause a file collision.
- einfo "Unbundling gems..."
- cd "$S"
- rm -rf \
- {bin,lib}/rake lib/rake.rb man/rake.1 \
- bin/gem || die "removal failed"
- # Remove bundled gems that we will install via PDEPEND, bug
- # 539700. Use explicit version numbers to ensure rm fails when they
- # change so we can update dependencies accordingly.
- rm gems/{minitest-5.4.3,power_assert-0.2.2,test-unit-3.0.8}.gem || die
-
- # Fix a hardcoded lib path in configure script
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
- configure.in || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- local modules= myconf=
-
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
- # SuperH needs this
- use sh && append-flags -mieee
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- # ipv6 hack, bug 168939. Needs --enable-ipv6.
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
- # Determine which modules *not* to build depending in the USE flags.
- if ! use readline ; then
- modules="${modules},readline"
- fi
- if ! use berkdb ; then
- modules="${modules},dbm"
- fi
- if ! use gdbm ; then
- modules="${modules},gdbm"
- fi
- if ! use ssl ; then
- modules="${modules},openssl"
- fi
- if ! use ncurses ; then
- modules="${modules},curses"
- fi
- if ! use tk ; then
- modules="${modules},tk"
- fi
-
- # Provide an empty LIBPATHENV because we disable rpath but we do not
- # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
- # #564272
- INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
- --program-suffix=${MY_SUFFIX} \
- --with-soname=ruby${MY_SUFFIX} \
- --docdir=${EPREFIX}/usr/share/doc/${P} \
- --enable-shared \
- --enable-pthread \
- --disable-rpath \
- --with-out-ext="${modules}" \
- $(use_with jemalloc jemalloc) \
- $(use_enable socks5 socks) \
- $(use_enable doc install-doc) \
- --enable-ipv6 \
- $(use_enable debug) \
- ${myconf} \
- --enable-option-checking=no \
- || die "econf failed"
-}
-
-src_compile() {
- emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
- emake -j1 V=1 test || die "make test failed"
-
- elog "Ruby's make test has been run. Ruby also ships with a make check"
- elog "that cannot be run until after ruby has been installed."
- elog
- if use rubytests; then
- elog "You have enabled rubytests, so they will be installed to"
- elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
- elog "than root, and you must place them into a writeable directory."
- elog "Then call: "
- elog
- elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
- else
- elog "Enable the rubytests USE flag to install the make check tests"
- fi
-}
-
-src_install() {
- # Remove the remaining bundled gems. We do this late in the process
- # since they are used during the build to e.g. create the
- # documentation.
- rm -rf ext/json || die
-
- # Ruby is involved in the install process, we don't want interference here.
- unset RUBYOPT
-
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
- LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
- for d in $(find "${S}/ext" -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- emake V=1 DESTDIR="${D}" install || die "make install failed"
-
- # Remove installed rubygems copy
- rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
- rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
- rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
- if use doc; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed"
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r sample
- fi
-
- dodoc ChangeLog NEWS doc/NEWS* README* || die
-
- if use rubytests; then
- pushd test
- insinto /usr/share/${PN}-${SLOT}/test
- doins -r .
- popd
- fi
-}
-
-pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
- eselect ruby set ruby${MY_SUFFIX}
- fi
-
- elog
- elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(19|20|...)"
- elog
-}
-
-pkg_postrm() {
- eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.3.4-r3.ebuild b/dev-lang/ruby/ruby-2.3.4-r3.ebuild
deleted file mode 100644
index c3c8f0b92772..000000000000
--- a/dev-lang/ruby/ruby-2.3.4-r3.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.3.0
-
-if [[ -n ${PATCHSET} ]]; then
- if [[ ${PVR} == ${PV} ]]; then
- PATCHSET="${PV}-r0.${PATCHSET}"
- else
- PATCHSET="${PVR}.${PATCHSET}"
- fi
-else
- PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
- https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
-
-RDEPEND="
- berkdb? ( sys-libs/db:= )
- gdbm? ( sys-libs/gdbm )
- jemalloc? ( dev-libs/jemalloc )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )
- socks5? ( >=net-proxy/dante-1.1.13 )
- tk? (
- dev-lang/tcl:0=[threads]
- dev-lang/tk:0=[threads]
- )
- ncurses? ( sys-libs/ncurses:0= )
- readline? ( sys-libs/readline:0= )
- dev-libs/libyaml
- virtual/libffi
- sys-libs/zlib
- >=app-eselect/eselect-ruby-20151229
- !=dev-ruby/did_you_mean-1.0.0:1[ruby_targets_ruby23]
- >=dev-ruby/minitest-5.8.3[ruby_targets_ruby23]
- >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23]
- >=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23]
- >=dev-ruby/rake-10.4.2[ruby_targets_ruby23]
- >=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23]
-"
-
-PDEPEND="
- ${BUNDLED_GEMS}
- virtual/rubygems[ruby_targets_ruby23]
- >=dev-ruby/json-1.8.3[ruby_targets_ruby23]
- rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] )
- xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/patches"
-
- einfo "Unbundling gems..."
- cd "$S"
- # Remove bundled gems that we will install via PDEPEND, bug
- # 539700. Use explicit version numbers to ensure rm fails when they
- # change so we can update dependencies accordingly.
- rm -f gems/{did_you_mean-1.0.0,minitest-5.8.3,net-telnet-0.1.1,power_assert-0.2.6,rake-10.4.2,test-unit-3.1.5}.gem || die
-
- # Fix a hardcoded lib path in configure script
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
- configure.in || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- local modules= myconf=
-
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
- # SuperH needs this
- use sh && append-flags -mieee
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- # ipv6 hack, bug 168939. Needs --enable-ipv6.
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
- # Determine which modules *not* to build depending in the USE flags.
- if ! use readline ; then
- modules="${modules},readline"
- fi
- if ! use berkdb ; then
- modules="${modules},dbm"
- fi
- if ! use gdbm ; then
- modules="${modules},gdbm"
- fi
- if ! use ssl ; then
- modules="${modules},openssl"
- fi
- if ! use ncurses ; then
- modules="${modules},curses"
- fi
- if ! use tk ; then
- modules="${modules},tk"
- fi
-
- # Provide an empty LIBPATHENV because we disable rpath but we do not
- # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
- # #564272
- INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
- --program-suffix=${MY_SUFFIX} \
- --with-soname=ruby${MY_SUFFIX} \
- --docdir=${EPREFIX}/usr/share/doc/${P} \
- --enable-shared \
- --enable-pthread \
- --disable-rpath \
- --with-out-ext="${modules}" \
- $(use_with jemalloc jemalloc) \
- $(use_enable socks5 socks) \
- $(use_enable doc install-doc) \
- --enable-ipv6 \
- $(use_enable debug) \
- ${myconf} \
- --enable-option-checking=no \
- || die "econf failed"
-}
-
-src_compile() {
- emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
- emake -j1 V=1 test || die "make test failed"
-
- elog "Ruby's make test has been run. Ruby also ships with a make check"
- elog "that cannot be run until after ruby has been installed."
- elog
- if use rubytests; then
- elog "You have enabled rubytests, so they will be installed to"
- elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
- elog "than root, and you must place them into a writeable directory."
- elog "Then call: "
- elog
- elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
- else
- elog "Enable the rubytests USE flag to install the make check tests"
- fi
-}
-
-src_install() {
- # Remove the remaining bundled gems. We do this late in the process
- # since they are used during the build to e.g. create the
- # documentation.
- rm -rf ext/json || die
-
- # Ruby is involved in the install process, we don't want interference here.
- unset RUBYOPT
-
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
- LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
- for d in $(find "${S}/ext" -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- emake V=1 DESTDIR="${D}" install || die "make install failed"
-
- # Remove installed rubygems and rdoc copy
- rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
- rm -rf "${D}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
- rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
- rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
- if use doc; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed"
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r sample
- fi
-
- dodoc ChangeLog NEWS doc/NEWS* README* || die
-
- if use rubytests; then
- pushd test
- insinto /usr/share/${PN}-${SLOT}/test
- doins -r .
- popd
- fi
-}
-
-pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
- eselect ruby set ruby${MY_SUFFIX}
- fi
-
- elog
- elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(19|20|...)"
- elog
-}
-
-pkg_postrm() {
- eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.3.4-r4.ebuild b/dev-lang/ruby/ruby-2.3.4-r4.ebuild
deleted file mode 100644
index c3c8f0b92772..000000000000
--- a/dev-lang/ruby/ruby-2.3.4-r4.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.3.0
-
-if [[ -n ${PATCHSET} ]]; then
- if [[ ${PVR} == ${PV} ]]; then
- PATCHSET="${PV}-r0.${PATCHSET}"
- else
- PATCHSET="${PVR}.${PATCHSET}"
- fi
-else
- PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
- https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
-
-RDEPEND="
- berkdb? ( sys-libs/db:= )
- gdbm? ( sys-libs/gdbm )
- jemalloc? ( dev-libs/jemalloc )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )
- socks5? ( >=net-proxy/dante-1.1.13 )
- tk? (
- dev-lang/tcl:0=[threads]
- dev-lang/tk:0=[threads]
- )
- ncurses? ( sys-libs/ncurses:0= )
- readline? ( sys-libs/readline:0= )
- dev-libs/libyaml
- virtual/libffi
- sys-libs/zlib
- >=app-eselect/eselect-ruby-20151229
- !=dev-ruby/did_you_mean-1.0.0:1[ruby_targets_ruby23]
- >=dev-ruby/minitest-5.8.3[ruby_targets_ruby23]
- >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23]
- >=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23]
- >=dev-ruby/rake-10.4.2[ruby_targets_ruby23]
- >=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23]
-"
-
-PDEPEND="
- ${BUNDLED_GEMS}
- virtual/rubygems[ruby_targets_ruby23]
- >=dev-ruby/json-1.8.3[ruby_targets_ruby23]
- rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] )
- xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/patches"
-
- einfo "Unbundling gems..."
- cd "$S"
- # Remove bundled gems that we will install via PDEPEND, bug
- # 539700. Use explicit version numbers to ensure rm fails when they
- # change so we can update dependencies accordingly.
- rm -f gems/{did_you_mean-1.0.0,minitest-5.8.3,net-telnet-0.1.1,power_assert-0.2.6,rake-10.4.2,test-unit-3.1.5}.gem || die
-
- # Fix a hardcoded lib path in configure script
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
- configure.in || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- local modules= myconf=
-
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
- # SuperH needs this
- use sh && append-flags -mieee
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- # ipv6 hack, bug 168939. Needs --enable-ipv6.
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
- # Determine which modules *not* to build depending in the USE flags.
- if ! use readline ; then
- modules="${modules},readline"
- fi
- if ! use berkdb ; then
- modules="${modules},dbm"
- fi
- if ! use gdbm ; then
- modules="${modules},gdbm"
- fi
- if ! use ssl ; then
- modules="${modules},openssl"
- fi
- if ! use ncurses ; then
- modules="${modules},curses"
- fi
- if ! use tk ; then
- modules="${modules},tk"
- fi
-
- # Provide an empty LIBPATHENV because we disable rpath but we do not
- # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
- # #564272
- INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
- --program-suffix=${MY_SUFFIX} \
- --with-soname=ruby${MY_SUFFIX} \
- --docdir=${EPREFIX}/usr/share/doc/${P} \
- --enable-shared \
- --enable-pthread \
- --disable-rpath \
- --with-out-ext="${modules}" \
- $(use_with jemalloc jemalloc) \
- $(use_enable socks5 socks) \
- $(use_enable doc install-doc) \
- --enable-ipv6 \
- $(use_enable debug) \
- ${myconf} \
- --enable-option-checking=no \
- || die "econf failed"
-}
-
-src_compile() {
- emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
- emake -j1 V=1 test || die "make test failed"
-
- elog "Ruby's make test has been run. Ruby also ships with a make check"
- elog "that cannot be run until after ruby has been installed."
- elog
- if use rubytests; then
- elog "You have enabled rubytests, so they will be installed to"
- elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
- elog "than root, and you must place them into a writeable directory."
- elog "Then call: "
- elog
- elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
- else
- elog "Enable the rubytests USE flag to install the make check tests"
- fi
-}
-
-src_install() {
- # Remove the remaining bundled gems. We do this late in the process
- # since they are used during the build to e.g. create the
- # documentation.
- rm -rf ext/json || die
-
- # Ruby is involved in the install process, we don't want interference here.
- unset RUBYOPT
-
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
- LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
- for d in $(find "${S}/ext" -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- emake V=1 DESTDIR="${D}" install || die "make install failed"
-
- # Remove installed rubygems and rdoc copy
- rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
- rm -rf "${D}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
- rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
- rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
- if use doc; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed"
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r sample
- fi
-
- dodoc ChangeLog NEWS doc/NEWS* README* || die
-
- if use rubytests; then
- pushd test
- insinto /usr/share/${PN}-${SLOT}/test
- doins -r .
- popd
- fi
-}
-
-pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
- eselect ruby set ruby${MY_SUFFIX}
- fi
-
- elog
- elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(19|20|...)"
- elog
-}
-
-pkg_postrm() {
- eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.4.1-r3.ebuild b/dev-lang/ruby/ruby-2.4.1-r3.ebuild
deleted file mode 100644
index 157a4e057d96..000000000000
--- a/dev-lang/ruby/ruby-2.4.1-r3.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-if [[ -n ${PATCHSET} ]]; then
- if [[ ${PVR} == ${PV} ]]; then
- PATCHSET="${PV}-r0.${PATCHSET}"
- else
- PATCHSET="${PVR}.${PATCHSET}"
- fi
-else
- PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
- https://dev.gentoo.org/~graaff/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs"
-
-RDEPEND="
- berkdb? ( sys-libs/db:= )
- gdbm? ( sys-libs/gdbm )
- jemalloc? ( dev-libs/jemalloc )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )
- socks5? ( >=net-proxy/dante-1.1.13 )
- tk? (
- dev-lang/tcl:0=[threads]
- dev-lang/tk:0=[threads]
- )
- dev-libs/libyaml
- virtual/libffi
- sys-libs/zlib
- >=app-eselect/eselect-ruby-20161226
- !=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24]
- >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24]
- >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24]
- >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24]
- >=dev-ruby/rake-12.0.0[ruby_targets_ruby24]
- >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24]
- >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24]
-"
-
-PDEPEND="
- ${BUNDLED_GEMS}
- virtual/rubygems[ruby_targets_ruby24]
- >=dev-ruby/json-2.0.2[ruby_targets_ruby24]
- rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] )
- xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/patches"
-
- einfo "Unbundling gems..."
- cd "$S"
- # Remove bundled gems that we will install via PDEPEND, bug
- # 539700. Use explicit version numbers to ensure rm fails when they
- # change so we can update dependencies accordingly.
- rm -f gems/{did_you_mean-1.1.0,minitest-5.10.1,net-telnet-0.1.1,power_assert-0.4.1,rake-12.0.0,test-unit-3.2.3,xmlrpc-0.2.1}.gem || die
-
- einfo "Removing bundled libraries..."
- rm -fr ext/fiddle/libffi-3.2.1 || die
-
- # Fix a hardcoded lib path in configure script
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
- configure.in || die "sed failed"
-
- eapply_user
-
- eautoreconf
-}
-
-src_configure() {
- local modules= myconf=
-
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
- # SuperH needs this
- use sh && append-flags -mieee
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- # ipv6 hack, bug 168939. Needs --enable-ipv6.
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
- # Determine which modules *not* to build depending in the USE flags.
- if ! use berkdb ; then
- modules="${modules},dbm"
- fi
- if ! use gdbm ; then
- modules="${modules},gdbm"
- fi
- if ! use ssl ; then
- modules="${modules},openssl"
- fi
- if ! use tk ; then
- modules="${modules},tk"
- fi
-
- # Provide an empty LIBPATHENV because we disable rpath but we do not
- # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
- # #564272
- INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
- --program-suffix=${MY_SUFFIX} \
- --with-soname=ruby${MY_SUFFIX} \
- --docdir=${EPREFIX}/usr/share/doc/${P} \
- --enable-shared \
- --enable-pthread \
- --disable-rpath \
- --with-out-ext="${modules}" \
- $(use_with jemalloc jemalloc) \
- $(use_enable socks5 socks) \
- $(use_enable doc install-doc) \
- --enable-ipv6 \
- $(use_enable static-libs static) \
- $(use_enable static-libs install-static-library) \
- $(use_with static-libs static-linked-ext) \
- $(use_enable debug) \
- ${myconf} \
- --enable-option-checking=no \
- || die "econf failed"
-}
-
-src_compile() {
- emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
- emake -j1 V=1 test || die "make test failed"
-
- elog "Ruby's make test has been run. Ruby also ships with a make check"
- elog "that cannot be run until after ruby has been installed."
- elog
- if use rubytests; then
- elog "You have enabled rubytests, so they will be installed to"
- elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
- elog "than root, and you must place them into a writeable directory."
- elog "Then call: "
- elog
- elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
- else
- elog "Enable the rubytests USE flag to install the make check tests"
- fi
-}
-
-src_install() {
- # Remove the remaining bundled gems. We do this late in the process
- # since they are used during the build to e.g. create the
- # documentation.
- rm -rf ext/json || die
-
- # Ruby is involved in the install process, we don't want interference here.
- unset RUBYOPT
-
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
- LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
- for d in $(find "${S}/ext" -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- emake V=1 DESTDIR="${D}" install || die "make install failed"
-
- # Remove installed rubygems and rdoc copy
- rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
- rm -rf "${D}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
- rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
- rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
- if use doc; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed"
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r sample
- fi
-
- dodoc ChangeLog NEWS doc/NEWS* README* || die
-
- if use rubytests; then
- pushd test
- insinto /usr/share/${PN}-${SLOT}/test
- doins -r .
- popd
- fi
-}
-
-pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
- eselect ruby set ruby${MY_SUFFIX}
- fi
-
- elog
- elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(19|20|...)"
- elog
-}
-
-pkg_postrm() {
- eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.4.1-r4.ebuild b/dev-lang/ruby/ruby-2.4.1-r4.ebuild
deleted file mode 100644
index 157a4e057d96..000000000000
--- a/dev-lang/ruby/ruby-2.4.1-r4.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-if [[ -n ${PATCHSET} ]]; then
- if [[ ${PVR} == ${PV} ]]; then
- PATCHSET="${PV}-r0.${PATCHSET}"
- else
- PATCHSET="${PVR}.${PATCHSET}"
- fi
-else
- PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
- https://dev.gentoo.org/~graaff/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs"
-
-RDEPEND="
- berkdb? ( sys-libs/db:= )
- gdbm? ( sys-libs/gdbm )
- jemalloc? ( dev-libs/jemalloc )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )
- socks5? ( >=net-proxy/dante-1.1.13 )
- tk? (
- dev-lang/tcl:0=[threads]
- dev-lang/tk:0=[threads]
- )
- dev-libs/libyaml
- virtual/libffi
- sys-libs/zlib
- >=app-eselect/eselect-ruby-20161226
- !=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24]
- >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24]
- >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24]
- >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24]
- >=dev-ruby/rake-12.0.0[ruby_targets_ruby24]
- >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24]
- >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24]
-"
-
-PDEPEND="
- ${BUNDLED_GEMS}
- virtual/rubygems[ruby_targets_ruby24]
- >=dev-ruby/json-2.0.2[ruby_targets_ruby24]
- rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] )
- xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/patches"
-
- einfo "Unbundling gems..."
- cd "$S"
- # Remove bundled gems that we will install via PDEPEND, bug
- # 539700. Use explicit version numbers to ensure rm fails when they
- # change so we can update dependencies accordingly.
- rm -f gems/{did_you_mean-1.1.0,minitest-5.10.1,net-telnet-0.1.1,power_assert-0.4.1,rake-12.0.0,test-unit-3.2.3,xmlrpc-0.2.1}.gem || die
-
- einfo "Removing bundled libraries..."
- rm -fr ext/fiddle/libffi-3.2.1 || die
-
- # Fix a hardcoded lib path in configure script
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
- configure.in || die "sed failed"
-
- eapply_user
-
- eautoreconf
-}
-
-src_configure() {
- local modules= myconf=
-
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
- # SuperH needs this
- use sh && append-flags -mieee
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- # ipv6 hack, bug 168939. Needs --enable-ipv6.
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
- # Determine which modules *not* to build depending in the USE flags.
- if ! use berkdb ; then
- modules="${modules},dbm"
- fi
- if ! use gdbm ; then
- modules="${modules},gdbm"
- fi
- if ! use ssl ; then
- modules="${modules},openssl"
- fi
- if ! use tk ; then
- modules="${modules},tk"
- fi
-
- # Provide an empty LIBPATHENV because we disable rpath but we do not
- # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
- # #564272
- INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
- --program-suffix=${MY_SUFFIX} \
- --with-soname=ruby${MY_SUFFIX} \
- --docdir=${EPREFIX}/usr/share/doc/${P} \
- --enable-shared \
- --enable-pthread \
- --disable-rpath \
- --with-out-ext="${modules}" \
- $(use_with jemalloc jemalloc) \
- $(use_enable socks5 socks) \
- $(use_enable doc install-doc) \
- --enable-ipv6 \
- $(use_enable static-libs static) \
- $(use_enable static-libs install-static-library) \
- $(use_with static-libs static-linked-ext) \
- $(use_enable debug) \
- ${myconf} \
- --enable-option-checking=no \
- || die "econf failed"
-}
-
-src_compile() {
- emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
- emake -j1 V=1 test || die "make test failed"
-
- elog "Ruby's make test has been run. Ruby also ships with a make check"
- elog "that cannot be run until after ruby has been installed."
- elog
- if use rubytests; then
- elog "You have enabled rubytests, so they will be installed to"
- elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
- elog "than root, and you must place them into a writeable directory."
- elog "Then call: "
- elog
- elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
- else
- elog "Enable the rubytests USE flag to install the make check tests"
- fi
-}
-
-src_install() {
- # Remove the remaining bundled gems. We do this late in the process
- # since they are used during the build to e.g. create the
- # documentation.
- rm -rf ext/json || die
-
- # Ruby is involved in the install process, we don't want interference here.
- unset RUBYOPT
-
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
- LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
- for d in $(find "${S}/ext" -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- emake V=1 DESTDIR="${D}" install || die "make install failed"
-
- # Remove installed rubygems and rdoc copy
- rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
- rm -rf "${D}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
- rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
- rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
- if use doc; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed"
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r sample
- fi
-
- dodoc ChangeLog NEWS doc/NEWS* README* || die
-
- if use rubytests; then
- pushd test
- insinto /usr/share/${PN}-${SLOT}/test
- doins -r .
- popd
- fi
-}
-
-pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
- eselect ruby set ruby${MY_SUFFIX}
- fi
-
- elog
- elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(19|20|...)"
- elog
-}
-
-pkg_postrm() {
- eselect ruby cleanup
-}
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index c962e7f5bb8f..652daec398b2 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -101,6 +101,26 @@ DIST scala-2.11.1-nest.jar 2920 SHA256 3c7cf1a1b9fe9ad2abf3bfcedaa17a976c72f4bcc
DIST scala-2.11.1-push.jar 8886289 SHA256 58eb2b8c501bbff0e78074a058e3fc160012a80952c1cc96ed301d8a08d7e98d SHA512 b5539d381c8978ac57fc4258696e4cb552f47917178152b38b5683e42ed60da4d9da198a0344652f201541a71f92afd2ac8b3c3d3ec5266a8c222e9661d8a06a WHIRLPOOL 8fa6522a0fd9939f4ffd443b55e7a5adbb93a9dc5cbad569ccecd6be77ecd259eadbdb16c2c7eab6d9f175fbf33746faf9c41cf4d1050e7f576b86119301e126
DIST scala-2.11.1-vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99
DIST scala-2.11.1.tar.gz 5633076 SHA256 868a009c89a331ec05914faa204f865d09f2b7b35eabdb41e7f43e8734e0abf5 SHA512 bde7a8fae9fa570df392a70aa06f901bc4987703fadf1e7ad9f090f3b3c9a2ff1bbe055a401b0d851193b5ddcd8b0536c4916f79ae4c63b74c31695de6e651b2 WHIRLPOOL 4f153b829efe7e3435bab5fca27a0e52c94aa8f50f2078cee082575bb8f7677b4e0a70c49a92060c3509cc009f3586ff592c2b332a4c78bb57bcb9973328e6d1
+DIST scala-2.11.11-annotations.jar 2242 SHA256 f2d057a006bba4253d069795284a7610f1c837af6a80c0057736099962e24bcc SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd WHIRLPOOL 51fa0efc5dd14cf8364e9639375511fc3e716bd520a193e6c17a2fe3f02eebd1529eb98fd3b382a6386baa5b779ebd0327e8f141aee172d11d9548d9921c58e1
+DIST scala-2.11.11-ant-contrib.jar 224277 SHA256 be33a69818310b5c55e41dc11d48cd895f5f129da4b0d28c2f4c6c3e1cbcf3fc SHA512 5ec325a55bb213226c86faf8a99951839319e9579956ae58e2ccfe84f62d2742542998f98eed3f0dc8f8f94635d6dff1fe02e3c0f5289df1f09027ae2b9bee83 WHIRLPOOL aa713cc04b10c46adbbb8a5904e3fb34c6e32b67bb9a5f1a89768ceab8c31b977875c84434bc03c5b42105a4019f55cc10d806b0345c365a309e93d3f02e0a10
+DIST scala-2.11.11-ant-dotnet-1.0.jar 57795 SHA256 40c18fcfb8c28e4ee82e53f72a3257db43bcba01e16ebd5a4550fc419edf30c1 SHA512 72afc387cf9dbeb99e627ca7f35f919f627bbf3f072eb46036120695fb70311490593c255c2a2e79b684adb8f213d8ab591d4ceda5d5f2e6b6906a6977b38867 WHIRLPOOL 18aa33fe259bd52e2f37b903be39d462e8622ff744f990fc92871eaa4fe10ff69cd25b2c968cc353b3c5138cd3fffd755715aef6bb16c57b0b72e7e5fd1975e1
+DIST scala-2.11.11-ant.jar 1506140 SHA256 0251dbb938740ace07a53675113eee753ba389db65aebc814b175af50321620e SHA512 ddee72ca62adb20e700022609749a4d6cc848c94e597a7450226770c8b97aa2c1f7f23b7a1c6ac8acd63047101997ebd68c19b393ebffde9ff5c7bb1957cd18c WHIRLPOOL 1b2b7e0289cb16f5131a9c0b1b6eb1279011e7af79fc470dd6dc2047afc7fa99bdeec6d9db4f46adb83f6110593118d0909a4b1fa6b01dc56890bf6d2785373b
+DIST scala-2.11.11-code.jar 683 SHA256 4a03a08954e6b912a469b5e0db898247ea3ebc25b641f328e80f19163a0d908a SHA512 d963c186f3029858b1f6b53cf6e3470946365f13a6bcc334a7c959fd449dace10a953c496dbf3036828f2b5e5ad17d22f5e3912446bed14bd71b2f0de2f6c767 WHIRLPOOL 06e44b713306b3bdb7e878db1598546b45857091eb457c0fdba738d5f8c4de726920532e5cdf10260002c69299bd2756df52f407373053c5883e961899624d85
+DIST scala-2.11.11-enums.jar 1372 SHA256 95c53606c7113333ef95b4efbd3ae08af715ca49f71845a5d33150e6b7e9a072 SHA512 3d2356b9f610e98a03f64cbdd18ee36138b68ba5b170bb9b78bc7449439c3870f6f5bc795f3e1b8d325daf468ae85c581b60d1d360c1ae68c70792ad62b9c1dc WHIRLPOOL 30b26ba56a36272cf5973d3a89850cb3f5bff6c45a7a6bbd6ccf4ff342720bba89dfc0cdbe10058b770b7e73093ea948e574d5e081c36ab866f3bea9f0e14f95
+DIST scala-2.11.11-forkjoin.jar 60850 SHA256 4007ca649f037ed5ecc87c74529f499b75ed1a0f3f78e8f82cd97a71f5d2d5c7 SHA512 702370f2654b1c06f340c100078c630a82808e56c4dcc323881d6547945ce028345a5ee3048cbb9502a3b340b1d84ab5a635f80dbb381fdd88cc25b60cad768f WHIRLPOOL 9d561c9872c140e266efefb1c1afe76a2754eda32357718d048ff0896d6a2d14f168e1e2eddfcb37bbd0ac07fb7a7079b63e0f512946a7e30ff62883ee8bfd84
+DIST scala-2.11.11-genericNest.jar 1136 SHA256 c2c23341eec9fb379b57d7bf1156fedb3e2b9f97d2d5729fbfc7d766fd390faa SHA512 32c3b3e14bc72db2572bf120c1fda49a369b27ff8ae6ae12f6d7b12fdffef4064b515671c8f1b6dbfd78209247f6a7b7b26e700dd70a105de3ca59f5185ff9d6 WHIRLPOOL 61b2d9f840fc0ed86a8207cf353a2f7b9bf8523d31b4e8f74eb21ecac1a405ed04c5a4a8e78a13d64b2dd186a7ec3885cd5e2514ad572e600e5744c3f15f74c5
+DIST scala-2.11.11-gentoo-binary.tar.bz2 31842222 SHA256 fdd72db43e12c60cf2174d57235442ef91dadeb1256628fc3b571ad7c20d933c SHA512 0325dad506d71397dff36d741834f57267b07d1f5f65f8e5e21124754c0dc73ec4613cbb48f6c11383ab8c277f1bea1af5338f1af74e5c5d19ed06ca5f4c6829 WHIRLPOOL 2ef01bd9856eb2b56e8f148a47f46f0dcc61ac9f5cc34294e87797cf5a2cd9d917301baedaf561c4ebf9832f8b8da2b9d58a1a63b10566ea930aaf46546df0c5
+DIST scala-2.11.11-instrumented.jar 31725 SHA256 8a424c8bd5805ec429a9477cbd0f44bf65a2b79b720d438bfd347dba8da06484 SHA512 b1d77c4380a2b8ffe715ec106e58081e5c89e314c5a13071d627c3f974144ad453e79d405cd722d75095b62e8682b7414d40b691506c7d2f5dde62e2fce51e39 WHIRLPOOL 5ef8ee89b3fa66bf5025fd1b5db65d4d628b3452ba8530e3c3b1dd530fb5286fe3acee2cf56de09148cf2d37968626708690cc03da202cf3d58159cfd56fe8bc
+DIST scala-2.11.11-jsoup-1.3.1.jar 133835 SHA256 5695a4351412dbb21cfc9f09a31d66df5da94bd9bf2777325ff22916bbb32cb0 SHA512 365e43b6d8ba14ae32607241481f7c0e6393268f5c3faef860be7674150edece2c30376108e54f307df6a266a91100a1c7dbc2f28b4207b5227bc1bec6e1106d WHIRLPOOL 5b8ecbd677722e59642b630257748260dad0ad2e04b78b4472022729554d3984805dc02214cc983cacb76b0a526b062937074d3122a804e97e3e772e8c2e003c
+DIST scala-2.11.11-jsr166_and_extra.jar 728574 SHA256 e33a59e291bae8dbd2b37c6a4d5eae459a313db3a588f42c59ac5fd8edf6e13b SHA512 40d949cfefc5111c79b79f085657d56aa046d1b318e6ad78de5869f61a6515c2076b70344be5ae3fb93a7b3f54f46a129e2536515b258e0d5bf2e670c5001306 WHIRLPOOL ef8414d7862736cf072ff60fff5008f38dadcf826364cf21929fdfca7d331872d8097e6a6907dd500ef5d5a68964d8c2ed9ebeedf6470dc25ede269c1a8172b5
+DIST scala-2.11.11-macro210.jar 2065 SHA256 c0796c2defec3dcf2f786945fbdced0448a958bb68eaef71efcf5c14184f28ff SHA512 13c119afc4400f1531cad0cf38ab1652fce641090c11bff8f044a0d7f99df90412241ae78d5c623b7ecff1ce4720ae51fca4324f51bde0331e12f2e6e9898dd0 WHIRLPOOL 33b843583c02bd25db09df595026822f4e81d6a80c2cce3a7099dfb77dda80f595e5392e843c786a63b8d430d8acf53c20bc669ec1272b0f58c52cb0b67408b5
+DIST scala-2.11.11-maven-ant-tasks-2.1.1.jar 1314262 SHA256 b8891b4a90aca2793ad385ab57216f51c4879c6ab7e927354f407b46510cab51 SHA512 e3f0ff1d41ec31b2b64acb2ebcc175709714033589cb8e763f94aa80359c84f5d960c46dae713c9e37e1a09b977e7da617f8fe10a5b6fb30c55efd19bc307e68 WHIRLPOOL 73c44ea6aba4a3c697f64d08475b4c17bdc929ac9f320a25714fbe7cdc2939ad334deb7a90eb6c950cce8ba402d19bc2615a104788bafed7d247b997d3146743
+DIST scala-2.11.11-maven-deps.tar.gz 94530315 SHA256 544769138ab3a99c302f4f59d466bbb00f3c2da32dcbc285cb0c35efc5ba6a5a SHA512 b716d5d2a79960bae47dbb96a350027e908b9d5b62a0806e6b6f9905374f3e9cbb06c8865a3a2aa96399b4fc2fa1db949729cbb560e70af31225be151375f1ff WHIRLPOOL 0d97cfdd437297a41fe4c4991b081dff9aa21576cd87d350cee52ad1bb22702ec4c3b4ac396739b523012d5441496a037b6334a49608335f25d2bfb830e669c8
+DIST scala-2.11.11-methvsfield.jar 609 SHA256 730b33d098319d969760f2250dc6924c9f85f94a8a2eb2b2a025dcf05378d9c6 SHA512 6db923ed7059bc91c8442d5804ccd8336e94f5202b3dcc348a4eb5026f09e1e86862f6e94818beae9ad42fcdc8e51df4d59a27109903a8ccb78054425ae47a71 WHIRLPOOL d5362d5fc2795ff0671f386429840bb4f84173f9308e34c2b0eb585fb7cacbd308ab87c42f2fd407597abc4f010e8ffde600dd30addcd63c2d71c2d5f22f1582
+DIST scala-2.11.11-nest.jar 2920 SHA256 3c7cf1a1b9fe9ad2abf3bfcedaa17a976c72f4bccb0e0c7dbcf7ecf27bc20aa5 SHA512 5eaaa870e06b5e00efb1f6ccced71343e8aa01578ea2b320b2d051f2df3713df9c500f074cc74a9e3c5cc509e03cf9c71265329bf2ddb3e82cb331524202fa38 WHIRLPOOL 1d73b612946a6a226841d3e0ad8cb3ebb06997c70e94feb1f9236e4e58a93c429cc7cdecaa4175fd5b78920253bcc157f798593b6a8eacb873b3d9a51284be34
+DIST scala-2.11.11-push.jar 8886289 SHA256 58eb2b8c501bbff0e78074a058e3fc160012a80952c1cc96ed301d8a08d7e98d SHA512 b5539d381c8978ac57fc4258696e4cb552f47917178152b38b5683e42ed60da4d9da198a0344652f201541a71f92afd2ac8b3c3d3ec5266a8c222e9661d8a06a WHIRLPOOL 8fa6522a0fd9939f4ffd443b55e7a5adbb93a9dc5cbad569ccecd6be77ecd259eadbdb16c2c7eab6d9f175fbf33746faf9c41cf4d1050e7f576b86119301e126
+DIST scala-2.11.11-vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99
+DIST scala-2.11.11.tar.gz 6556573 SHA256 f97bccddbc53fc4da027fda3d2e6ad3d7776ec7ce56adad0ddb505266e1689e1 SHA512 c4e8ca544ea86c3e381a7b3d9120b13574cab92d73ff56aa10955afffe64c62ea11cd44abddd75984bc0ac58e8257b00357618cf9377e6690351db269657608c WHIRLPOOL 4cad89bd5e997363435b6a5f6baac6b30baff6f0c2db23f008541371e265b3074ede91384566c9ff5d742c839a15c9f8a6484c37d8161db1fc3fecc0ef78fbbb
DIST scala-2.11.2-annotations.jar 2242 SHA256 f2d057a006bba4253d069795284a7610f1c837af6a80c0057736099962e24bcc SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd WHIRLPOOL 51fa0efc5dd14cf8364e9639375511fc3e716bd520a193e6c17a2fe3f02eebd1529eb98fd3b382a6386baa5b779ebd0327e8f141aee172d11d9548d9921c58e1
DIST scala-2.11.2-ant-contrib.jar 224277 SHA256 be33a69818310b5c55e41dc11d48cd895f5f129da4b0d28c2f4c6c3e1cbcf3fc SHA512 5ec325a55bb213226c86faf8a99951839319e9579956ae58e2ccfe84f62d2742542998f98eed3f0dc8f8f94635d6dff1fe02e3c0f5289df1f09027ae2b9bee83 WHIRLPOOL aa713cc04b10c46adbbb8a5904e3fb34c6e32b67bb9a5f1a89768ceab8c31b977875c84434bc03c5b42105a4019f55cc10d806b0345c365a309e93d3f02e0a10
DIST scala-2.11.2-ant-dotnet-1.0.jar 57795 SHA256 40c18fcfb8c28e4ee82e53f72a3257db43bcba01e16ebd5a4550fc419edf30c1 SHA512 72afc387cf9dbeb99e627ca7f35f919f627bbf3f072eb46036120695fb70311490593c255c2a2e79b684adb8f213d8ab591d4ceda5d5f2e6b6906a6977b38867 WHIRLPOOL 18aa33fe259bd52e2f37b903be39d462e8622ff744f990fc92871eaa4fe10ff69cd25b2c968cc353b3c5138cd3fffd755715aef6bb16c57b0b72e7e5fd1975e1
diff --git a/dev-lang/scala/files/scala-2.11.11-no-git.patch b/dev-lang/scala/files/scala-2.11.11-no-git.patch
new file mode 100644
index 000000000000..b1012626c525
--- /dev/null
+++ b/dev-lang/scala/files/scala-2.11.11-no-git.patch
@@ -0,0 +1,24 @@
+--- scala-2.11.8-orig/tools/get-scala-commit-date 2016-03-04 21:57:12.000000000 +1100
++++ scala-2.11.8/tools/get-scala-commit-date 2016-09-16 10:29:09.215240534 +1000
+@@ -10,8 +10,8 @@
+
+ [[ $# -eq 0 ]] || cd "$1"
+
+-lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1)
+-lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2)
++lastcommitdate="2016-03-04"
++lastcommithours="00:00:00"
+
+ # 20120324
+ echo "${lastcommitdate//-/}-${lastcommithours//:/}"
+--- scala-2.11.8-orig/tools/get-scala-commit-sha 2016-03-04 21:57:12.000000000 +1100
++++ scala-2.11.8/tools/get-scala-commit-sha 2016-09-16 10:29:45.566119137 +1000
+@@ -12,7 +12,7 @@
+
+ # printf %016s is not portable for 0-padding, has to be a digit.
+ # so we're stuck disassembling it.
+-hash=$(git log -1 --format="%H" HEAD)
++hash="1706a37eb84ec252aea77bccebad3e48448534ad"
+ hash=${hash#g}
+ hash=${hash:0:10}
+ echo "$hash"
diff --git a/dev-lang/scala/scala-2.11.11.ebuild b/dev-lang/scala/scala-2.11.11.ebuild
new file mode 100644
index 000000000000..d0bce664a497
--- /dev/null
+++ b/dev-lang/scala/scala-2.11.11.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+JAVA_ANT_DISABLE_ANT_CORE_DEP="yes"
+EANT_TEST_TARGET="test.suite"
+
+inherit eutils check-reqs java-pkg-2 java-ant-2 versionator
+
+MY_P="${PN}-sources-${PV}"
+SV="$(get_version_component_range 1-2)"
+
+# creating the binary:
+# JAVA_PKG_FORCE_VM="$available-1.7" USE="doc source" ebuild scala-*.ebuild compile
+# cd $WORDKIR
+# tar -cjf scala-2.11.8-gentoo-binary.tar.bz2 scala-2.11.8/build/pack/bin \
+# scala-2.11.8/build/pack/lib/ scala-2.11.8/build/pack/man \
+# scala-2.11.8/src/actors/ scala-2.11.8/src/forkjoin/ \
+# scala-2.11.8/src/library scala-2.11.8/src/library-aux/ \
+# scala-2.11.8/src/reflect/ scala-2.11.8/docs/TODO \
+# scala-2.11.8/doc/README scala-2.11.8/build/scaladoc/compiler
+
+# In the pullJarFiles function in tools/binary-repo-lib.sh it executes find commands
+# to search for .desired.sha1 files, which contain sha1 hashes that are appended
+# to ${BURI} along with the subdirectory and filename to form the list of jar files
+# listed in SRC_URI. The output of this find command can be hacked into the desired format:
+# find . -name \*.desired.sha1 -exec sed -e 's@\([0-9a-f]*\).*@\1@' {} \; -print
+# After editing it into the desired format: sort -t / -k 3 file
+
+BURI="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap"
+
+declare -a JURI=(
+ "${BURI}/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> ${P}-ant-contrib.jar"
+ "${BURI}/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> ${P}-ant-dotnet-1.0.jar"
+ "${BURI}/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> ${P}-ant.jar"
+ "${BURI}/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> ${P}-maven-ant-tasks-2.1.1.jar"
+ "${BURI}/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> ${P}-vizant.jar"
+ "${BURI}/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> ${P}-forkjoin.jar"
+ "${BURI}/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> ${P}-jsr166_and_extra.jar"
+ "${BURI}/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> ${P}-code.jar"
+ "${BURI}/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> ${P}-annotations.jar"
+ "${BURI}/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> ${P}-enums.jar"
+ "${BURI}/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> ${P}-genericNest.jar"
+ "${BURI}/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> ${P}-jsoup-1.3.1.jar"
+ "${BURI}/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> ${P}-macro210.jar"
+ "${BURI}/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> ${P}-methvsfield.jar"
+ "${BURI}/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> ${P}-nest.jar"
+ "${BURI}/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> ${P}-instrumented.jar"
+ "${BURI}/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> ${P}-push.jar"
+)
+
+DESCRIPTION="The Scala Programming Language"
+HOMEPAGE="http://www.scala-lang.org/"
+SRC_URI="
+ !binary?
+ ( https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${JURI[@]}
+ https://dev.gentoo.org/~patrick/${P}-maven-deps.tar.gz
+ )
+ binary? ( https://dev.gentoo.org/~patrick/${P}-gentoo-binary.tar.bz2 )
+"
+
+LICENSE="BSD"
+SLOT="${SV}/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="binary emacs"
+
+COMMON_DEP="dev-java/ant-core:0
+ dev-java/hawtjni-runtime:0"
+
+DEPEND="${COMMON_DEP}
+ !binary? (
+ || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ dev-java/ant-core:0
+ dev-java/ant-contrib:0
+ dev-java/ant-nodeps:0
+ media-gfx/graphviz
+ )
+ binary? (
+ || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ )
+ app-arch/xz-utils:0"
+
+RDEPEND="${COMMON_DEP}
+ >=virtual/jre-1.7
+ app-eselect/eselect-scala
+ !dev-lang/scala-bin:0"
+
+PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
+
+S="${WORKDIR}/${P}"
+
+CHECKREQS_MEMORY="1536M"
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+
+ if ! use binary; then
+ debug-print "Checking for sufficient physical RAM"
+
+ ewarn "This package can fail to build with memory allocation errors in some cases."
+ ewarn "If you are unable to build from sources, please try USE=binary"
+ ewarn "for this package. See bug #181390 for more information."
+
+ check-reqs_pkg_setup
+ fi
+}
+
+src_unpack() {
+ # Unpack tar files only.
+ for f in ${A} ; do
+ [[ ${f} == *".tar."* ]] && unpack ${f}
+ done
+}
+
+java_prepare() {
+ java-pkg_getjars ant-core,hawtjni-runtime
+
+ if ! use binary; then
+ local a
+ for a in "${JURI[@]}"
+ do
+ echo "${a}"
+ local g="${a/* -> /}"
+ echo "${g}"
+ local j="${a/ -> */}"
+ echo "${j}"
+ cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
+ done
+ # gentoo patch (by gienah) to stop it calling git log in the build
+ epatch "${FILESDIR}/${P}-no-git.patch"
+ # Note: to bump scala, some things to try are:
+ # 1. update all the sha1s in JURI
+ # 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
+ # 3. try emerge scala. Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2
+ # or /var/tmp/portage/.m2 or /root/.m2
+ # 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI.
+ sed -e "s@\(\)@\1${WORKDIR}\2\n @" \
+ -e "s@\${user.home}/.m2@${WORKDIR}/.m2@g" \
+ -e 's@\(\)@\1\n @g' \
+ -i "${S}/build.xml" \
+ || die "Could not change location of .m2 maven download directory in ${S}/build.xml"
+ sed -e 's@-Xmx1024M@-Xmx1536M@' \
+ -e 's@-XX:MaxPermSize=128M@-XX:MaxPermSize=256M@' \
+ -i "${S}/test/partest" \
+ || die "Could not change increase memory size in ${S}/test/partest"
+ fi
+}
+
+src_compile() {
+ if ! use binary; then
+ #unset ANT_OPTS as this is set in the build.xml
+ #sets -X type variables which might come back to bite me
+ unset ANT_OPTS
+
+ # reported in bugzilla that multiple launches use less resources
+ # https://bugs.gentoo.org/show_bug.cgi?id=282023
+ eant all.clean
+ eant -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \
+ fastdist-opt
+ if use doc; then
+ # The separate build for doc is to workaround this problem that occurs
+ # with one "fastdist docscomp" build (still fails with MaxPermSize=384M)
+ # java.lang.OutOfMemoryError: PermGen space
+ eant -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \
+ docscomp
+ eant -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \
+ docs
+ fi
+ else
+ einfo "Skipping compilation, USE=binary is set."
+ fi
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ pushd build/pack || die
+ local SCALADIR="/usr/share/${PN}-${SV}"
+ exeinto "${SCALADIR}/bin"
+ doexe $(find bin/ -type f ! -iname '*.bat')
+ dodir "${SCALADIR}/lib"
+ insinto "${SCALADIR}/lib"
+ pushd lib || die
+ for j in *.jar; do
+ local i="$(echo "${j}" | sed -e "s@[_-][0-9.-]*\.jar@.jar@")"
+ newins "${j}" "${i}"
+ java-pkg_regjar "${ED}${SCALADIR}/lib/${i}"
+ done
+ popd
+
+ dodir /usr/bin
+ for b in $(find bin/ -type f ! -iname '*.bat'); do
+ local _name=$(basename "${b}")
+ dosym "${SCALADIR}/bin/${_name}" "/usr/bin/${_name}-${SV}"
+ done
+
+ pushd man/man1 || die
+ for i in *.1; do
+ newman "${i}" "${i/./-${SV}.}"
+ done
+ popd
+ popd
+
+ #sources are .scala so no use for java-pkg_dosrc
+ pushd src || die
+ if use source; then
+ dodir "${SCALADIR}/src"
+ insinto "${SCALADIR}/src"
+ doins -r actors forkjoin library library-aux reflect
+ fi
+ popd
+
+ local docdir="build/scaladoc"
+ dodoc docs/TODO doc/README
+ if use doc; then
+ dohtml -r "${docdir}"/{compiler,library}
+ fi
+}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 312f1709f4d8..acd21ba577bd 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -3,6 +3,11 @@ DIST js185-1.0.0.tar.gz 6164605 SHA256 5d12f7e1f5b4a99436685d97b9b7b75f094d33580
DIST mozjs-24.2.0.tar.bz2 15624530 SHA256 e62f3f331ddd90df1e238c09d61a505c516fe9fd8c5c95336611d191d18437d8 SHA512 49805e256f6fa797505c01b7596d5bb941ed7a2454862c52ed42ad48b5ae4540b777e77ed8da1b98c89f8622ed2c76052187983687008a4ff53594addb328df4 WHIRLPOOL ea74d19c79b1a0fe407e2803900c49c23e8b76444fb4e20995072c3c59427e8df1895df04f2f4de779a1c58cd1166dd97aeaf7564350832011efe89dbcf9583e
DIST mozjs-38.2.1.rc0.tar.bz2 25012381 SHA256 01994c758174bc173bcf4960f05ecb4da21014f09641a63b2952bbf9eeaa8b5c SHA512 60262c7619cc418569aec81775a671105acbc5bf372273828868f2fbbbc4ea33f78380f7455710816bfcdae828fb4115a08234d599cb30d0db859fcba17f019d WHIRLPOOL b1661859dc41a61317a48a8ee34cab53a369f37067c6565db2c890c596411e51981e0e64f81c5f5bd2bc2ff943493d972b00a5984b99de6e07ce16c07f784cb7
DIST mozjs-45.0.2.tar.bz2 97508152 SHA256 570530b1e551bf4a459d7cae875f33f99d5ef0c29ccc7742a1b6f588e5eadbee SHA512 84a3cf12e2603e00bcfe518a1a5000f53b21758c1c6b32a0410e63ab7db8d4452028195b0ba3e56144054b06e90f8e5195b4db94dba711f7c75d11da99c6c61d WHIRLPOOL dba2f7d4778f47f6476c3dd2e658a5b39ff9e571d4e71fe2508d58910a0989c24f892cbc7cc64aa7c94692cf947eb1a545fd0752bb5d8aace12c2dc96404c114
-DIST mozjs-52.2.0_pre20170719.tar.bz2 30630133 SHA256 2bab92b432ecbe665616440594463abfb21ce3aff573f360f19ef0cce8ce4c77 SHA512 9657006e071bdf0b6006ab806949eb8371f4d749989d95a3a46da0baedfe669727ccd6430c2022a4ec5ce2bb9cd9a231aba85605de1319a5c678633f0001a78c WHIRLPOOL 14db035ad690b416b793df34a065ddf5096e43346f5a0462cf79605f1745fa18f7f578ae46b0eadeeef3fb7369e76f812c4cdfe227b1442d277fd80625998c52
+DIST mozjs-52.4.0_pre20171003.tar.bz2 30588541 SHA256 12765b2d931fc171014b1e575afb776eebb81cd46cab55838c0f3943e3c51c6a SHA512 80e006ed7550b64dad7cf78335dd9f2d34f50ad486439887f0088eb3817242d24cf7c1d9325e2dcd4a01fd5c5f54d710873113b97fd914ccd961fa46a71653fa WHIRLPOOL 3468e0d2ad65c7b1132711af265054def0b74e2382d31b446b4225467fbf2318f771c1e961cf5eacb656f9db0158282d30383e06daf769a2270501d84c6ec05d
DIST mozjs17.0.0.tar.gz 6778934 SHA256 321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba SHA512 39b68aeb9f712f146778d8b68ee795709a1372c8ab893a222af4eb34882427d6f5cf877e743d6cb2f1b4348c194d8f3774f00cb775b03515b34b49560b748be4 WHIRLPOOL 4df7b51577787194065162b09d2c3dda849c13fa901305f9925d4ca5d38bb7f8e2daa943099e003fb9d11f9264ae2d77ccf04e5eea11e3ddcb624b504b99d52f
DIST spidermonkey-52.0-patches-0.tar.xz 5172 SHA256 20165c0fbf5d441cea6217a7a6dca8b8623b5dbba2496eb769aaef3ca93647bf SHA512 88ad640fb0efa4972f1b7782bd0abee1751b73914ee51faade93b25c4d8eec64e7693898842a406c49fc2ab43733404efeccb138afb64d2193b9a5eb612578e3 WHIRLPOOL bd9f264d54bfd14ad9f339229a29a66f873d2ae66fbbc55edd4ae80135f08c6cd4a5e9c5ab65254749ecbafb7c8fdaa5c5936275e263e53ce47ab606d143114c
+DIST spidermonkey-slot0-patches-01.tar.xz 10488 SHA256 7f0bf9921b9320046b9f06afaa1e0764aead72770ef0a3c29f4967aa20f9f7f9 SHA512 6c878ed0b50c052989a8b965fed845e9c672b691f4c4b1f98ee82e81a33880e1e6bf1dac8222d71322553282de602a88272dedebbcf50d27967fc172f0a8054a WHIRLPOOL 6a35cd027af0b7e730f8e563b9a2048bc8c7b8447889ae4b0cb719a12d48917c34b6e694c84e0e0c23a45b5f5d016580ceb97ac58527f705ffe2a59d56f15869
+DIST spidermonkey-slot17-patches-01.tar.xz 2748 SHA256 366ff6db042face813c7e2145184e750d7f8ec44c0e8725c0b53d6be0cc33e2b SHA512 21a90f85d156de3cca9811317507162a458f908bb447924fcfbf49b7bb70496b611ce7df90b90775316b8ceafda56692be3bf856b168b83ed40b8a5c668eed3f WHIRLPOOL bee9e8b46200a2f8b41d5fa208a18471758c7bc1c08c9621a46e54846f49fecb37325a8ada9c438119e4772554078870a5e3d4d76d9d6e13e2d13c287ed0834a
+DIST spidermonkey-slot24-patches-01.tar.xz 3444 SHA256 6a16001d665443c5e40c3237f6adc16589b26993e9d3c87577e6feabae42f7e0 SHA512 712250983f726eb2fe7ae243e9ca510b6e5b8fa0f221fe5120c2e2f75334f7e4b10b8ab172869d7333a120529dbc2a513c170533d5ad5af27a2643ce1384bbdb WHIRLPOOL ec895aabb0486b9eea41bbc005af552cadb587450af72de79a7d4a20f9258b589c63cf1f8b3afbba8244fe8b748937ebcbf572f1655a57e68c0d2b482cddd153
+DIST spidermonkey-slot38-patches-01.tar.xz 7472 SHA256 ff4b66116b18b376630efa0ced0c0ce8c3a636c43b75e34e904c87f8d4cd4f6a SHA512 953acee985d192c6d0f18f14c70fdda33a7c8f784c6833ca8b75495044b40a8b3f29b281c40dbfcda0c8570c111a3dd1717c2ef0ffd651c1b50d1f2bff1f6d09 WHIRLPOOL b41f21c2b7434332c8bff351af7e030a94db7044995f88df74d7efcf2d196f5ddba6293230b42f528ca22ea2d7fdd58d0da935bb90b155f7c83fc5b3f9645ef5
+DIST spidermonkey-slot45-patches-01.tar.xz 5092 SHA256 713e03f4c95908d93003fa1ca776823cccaf8fdc27db09ea59176edc318504dc SHA512 d52f038a7b4f7b410b5a1f94a55962adafc5906e7d85f605f3fe45ad49417c2b9d58d853a81b5d2395a2842c9780992d5a2c1a0e67aa77fb09f21aff9aeb0f7a WHIRLPOOL 9e4119af5a09f155a8f8781448364a9262ab2fb8d085a7235498f555ffa64eb054706ada3548ac40f76e686ed80e2777d39c565a631bf58b0c2e45f6195ce47b
diff --git a/dev-lang/spidermonkey/files/ff45/7000_drop-Wl-build-id_v4.patch b/dev-lang/spidermonkey/files/ff45/7000_drop-Wl-build-id_v4.patch
deleted file mode 100644
index 8a1e1dd9988f..000000000000
--- a/dev-lang/spidermonkey/files/ff45/7000_drop-Wl-build-id_v4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/js/src/configure.in 2014-06-05 21:15:27.000000000 -0400
-+++ b/js/src/configure.in 2014-06-13 11:01:51.130703283 -0400
-@@ -1156,14 +1156,6 @@
- AC_MSG_RESULT([no])
- LDFLAGS=$_SAVE_LDFLAGS)
-
-- AC_MSG_CHECKING([for --build-id option to ld])
-- _SAVE_LDFLAGS=$LDFLAGS
-- LDFLAGS="$LDFLAGS -Wl,--build-id"
-- AC_TRY_LINK(,,AC_MSG_RESULT([yes])
-- [NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,--build-id"],
-- AC_MSG_RESULT([no])
-- LDFLAGS=$_SAVE_LDFLAGS)
--
- # Turn on gcc/clang warnings:
- # https://gcc.gnu.org/onlinedocs/gcc-4.4.0/gcc/Warning-Options.html
- #
diff --git a/dev-lang/spidermonkey/files/ff45/7003_freebsd_jscpucfg.patch b/dev-lang/spidermonkey/files/ff45/7003_freebsd_jscpucfg.patch
deleted file mode 100644
index 467bf4441444..000000000000
--- a/dev-lang/spidermonkey/files/ff45/7003_freebsd_jscpucfg.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/js/src/jscpucfg.h 2012-01-18 17:38:54.409461514 +0100
-+++ b/js/src/jscpucfg.h 2012-01-18 17:38:59.522462164 +0100
-@@ -77,6 +77,19 @@
- #define IS_BIG_ENDIAN 1
- #endif
-
-+#elif defined(__FreeBSD__)
-+#include
-+
-+#if defined(BYTE_ORDER)
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define IS_LITTLE_ENDIAN 1
-+#undef IS_BIG_ENDIAN
-+#elif BYTE_ORDER == BIG_ENDIAN
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+#endif
-+#endif
-+
- #elif defined(JS_HAVE_ENDIAN_H)
- #include
-
diff --git a/dev-lang/spidermonkey/files/ff45/8001_hppa_js_configure.patch b/dev-lang/spidermonkey/files/ff45/8001_hppa_js_configure.patch
deleted file mode 100644
index a33ab3cd6143..000000000000
--- a/dev-lang/spidermonkey/files/ff45/8001_hppa_js_configure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/js/src/configure.in
-+++ b/js/src/configure.in
-@@ -958,7 +958,7 @@
- CPU_ARCH=s390x
- ;;
-
--hppa* | parisc)
-+hppa* | parisc*)
- CPU_ARCH=hppa
- ;;
-
-@@ -2009,6 +2009,9 @@
- AC_DEFINE(JS_CPU_MIPS)
- AC_DEFINE(JS_NUNBOX32)
- ;;
-+hppa*)
-+ AC_DEFINE(JS_NUNBOX32)
-+ ;;
- esac
-
- MOZ_ARG_DISABLE_BOOL(ion,
diff --git a/dev-lang/spidermonkey/files/ff45/8007_nonejit_ppc64_fix_bug1253216.patch b/dev-lang/spidermonkey/files/ff45/8007_nonejit_ppc64_fix_bug1253216.patch
deleted file mode 100644
index 26e9373dddfc..000000000000
--- a/dev-lang/spidermonkey/files/ff45/8007_nonejit_ppc64_fix_bug1253216.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-
-# HG changeset patch
-# User Lars T Hansen
-# Date 1457091735 -3600
-# Node ID 69f237c2cf9131e97372debee01931dbacd064e5
-# Parent 3aa4483740828617001060fe7386051020521e90
-Bug 1253216 - clean up the atomic ops ifdef nest. r=jorendorff
-
-diff --git a/js/src/jit/AtomicOperations.h b/js/src/jit/AtomicOperations.h
---- a/js/src/jit/AtomicOperations.h
-+++ b/js/src/jit/AtomicOperations.h
-@@ -318,21 +318,29 @@ AtomicOperations::isLockfree(int32_t siz
- } // namespace js
-
- #if defined(JS_CODEGEN_ARM)
- # include "jit/arm/AtomicOperations-arm.h"
- #elif defined(JS_CODEGEN_ARM64)
- # include "jit/arm64/AtomicOperations-arm64.h"
- #elif defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64)
- # include "jit/mips-shared/AtomicOperations-mips-shared.h"
--#elif defined(__ppc64__) || defined(__PPC64_) \
-- || defined(__ppc64le__) || defined(__PPC64LE__) \
-- || defined(__ppc__) || defined(__PPC__)
-+#elif defined(__ppc__) || defined(__PPC__)
- # include "jit/none/AtomicOperations-ppc.h"
- #elif defined(JS_CODEGEN_NONE)
--# include "jit/none/AtomicOperations-none.h"
-+ // You can disable the JIT with --disable-ion but you must still
-+ // provide the atomic operations that will be used by the JS engine.
-+ // When the JIT is disabled the operations are simply safe-for-races
-+ // C++ realizations of atomics. These operations cannot be written
-+ // in portable C++, hence the default here is to crash. See the
-+ // top of the file for more guidance.
-+# if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || defined(__PPC64LE__)
-+# include "jit/none/AtomicOperations-ppc.h"
-+# else
-+# include "jit/none/AtomicOperations-none.h" // These MOZ_CRASH() always
-+# endif
- #elif defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
- # include "jit/x86-shared/AtomicOperations-x86-shared.h"
- #else
- # error "Atomic operations must be defined for this platform"
- #endif
-
- #endif // jit_AtomicOperations_h
-
diff --git a/dev-lang/spidermonkey/files/ff45/8008_nonejit_x86_fix_based_on_bug1253216.patch b/dev-lang/spidermonkey/files/ff45/8008_nonejit_x86_fix_based_on_bug1253216.patch
deleted file mode 100644
index 86b27130205d..000000000000
--- a/dev-lang/spidermonkey/files/ff45/8008_nonejit_x86_fix_based_on_bug1253216.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/js/src/jit/AtomicOperations.h 2016-03-12 13:42:27.914524205 -0500
-+++ b/js/src/jit/AtomicOperations.h 2016-03-12 13:42:15.644573630 -0500
-@@ -311,6 +311,8 @@
- // top of the file for more guidance.
- # if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || defined(__PPC64LE__)
- # include "jit/none/AtomicOperations-ppc.h"
-+# elif defined(__i386__) || defined(__x86_64__)
-+# include "jit/x86-shared/AtomicOperations-x86-shared.h"
- # else
- # include "jit/none/AtomicOperations-none.h" // These MOZ_CRASH() always
- # endif
diff --git a/dev-lang/spidermonkey/files/ff45/8014_ia64_js.patch b/dev-lang/spidermonkey/files/ff45/8014_ia64_js.patch
deleted file mode 100644
index 73075919a864..000000000000
--- a/dev-lang/spidermonkey/files/ff45/8014_ia64_js.patch
+++ /dev/null
@@ -1,248 +0,0 @@
---- a/js/src/jit/AtomicOperations.h 2016-11-08 21:27:30.000000000 +0100
-+++ b/js/src/jit/AtomicOperations.h 2016-11-08 22:17:59.280251831 +0100
-@@ -311,6 +311,8 @@
- // top of the file for more guidance.
- # if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || defined(__PPC64LE__)
- # include "jit/none/AtomicOperations-ppc.h"
-+# elif defined(__ia64__)
-+# include "jit/none/AtomicOperations-ia64.h"
- # elif defined(__i386__) || defined(__x86_64__)
- # include "jit/x86-shared/AtomicOperations-x86-shared.h"
- # else
---- /dev/null
-+++ b/js/src/jit/none/AtomicOperations-ia64.h 2016-11-08 22:09:41.378809457 +0100
-@@ -0,0 +1,234 @@
-+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+ * vim: set ts=8 sts=4 et sw=4 tw=99:
-+ * This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+/* For documentation, see jit/AtomicOperations.h */
-+
-+#ifndef jit_ia64_AtomicOperations_ia64_h
-+#define jit_ia64_AtomicOperations_ia64_h
-+
-+#include "mozilla/Assertions.h"
-+#include "mozilla/Types.h"
-+
-+#if defined(__GNUC__)
-+
-+// The default implementation tactic for gcc is to use the newer
-+// __atomic intrinsics added for use in C++11 . Where that
-+// isn't available, we use GCC's older __sync functions instead.
-+//
-+// ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS is kept as a backward
-+// compatible option for older compilers: enable this to use GCC's old
-+// __sync functions instead of the newer __atomic functions. This
-+// will be required for GCC 4.6.x and earlier, should we need to use
-+// those versions.
-+
-+//#define ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+
-+inline bool
-+js::jit::AtomicOperations::isLockfree8()
-+{
-+# ifndef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+ MOZ_ASSERT(__atomic_always_lock_free(sizeof(int8_t), 0));
-+ MOZ_ASSERT(__atomic_always_lock_free(sizeof(int16_t), 0));
-+ MOZ_ASSERT(__atomic_always_lock_free(sizeof(int32_t), 0));
-+ MOZ_ASSERT(__atomic_always_lock_free(sizeof(int64_t), 0));
-+ return true;
-+# else
-+ return false;
-+# endif
-+}
-+
-+inline void
-+js::jit::AtomicOperations::fenceSeqCst()
-+{
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+ __sync_synchronize();
-+# else
-+ __atomic_thread_fence(__ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+template
-+inline T
-+js::jit::AtomicOperations::loadSeqCst(T* addr)
-+{
-+ MOZ_ASSERT(sizeof(T) < 8 || isLockfree8());
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+ __sync_synchronize();
-+ T v = *addr;
-+ __sync_synchronize();
-+# else
-+ T v;
-+ __atomic_load(addr, &v, __ATOMIC_SEQ_CST);
-+# endif
-+ return v;
-+}
-+
-+template
-+inline void
-+js::jit::AtomicOperations::storeSeqCst(T* addr, T val)
-+{
-+ MOZ_ASSERT(sizeof(T) < 8 || isLockfree8());
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+ __sync_synchronize();
-+ *addr = val;
-+ __sync_synchronize();
-+# else
-+ __atomic_store(addr, &val, __ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+template
-+inline T
-+js::jit::AtomicOperations::compareExchangeSeqCst(T* addr, T oldval, T newval)
-+{
-+ MOZ_ASSERT(sizeof(T) < 8 || isLockfree8());
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+ return __sync_val_compare_and_swap(addr, oldval, newval);
-+# else
-+ __atomic_compare_exchange(addr, &oldval, &newval, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
-+ return oldval;
-+# endif
-+}
-+
-+template
-+inline T
-+js::jit::AtomicOperations::fetchAddSeqCst(T* addr, T val)
-+{
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+ return __sync_fetch_and_add(addr, val);
-+# else
-+ return __atomic_fetch_add(addr, val, __ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+template
-+inline T
-+js::jit::AtomicOperations::fetchSubSeqCst(T* addr, T val)
-+{
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+ return __sync_fetch_and_sub(addr, val);
-+# else
-+ return __atomic_fetch_sub(addr, val, __ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+template
-+inline T
-+js::jit::AtomicOperations::fetchAndSeqCst(T* addr, T val)
-+{
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+ return __sync_fetch_and_and(addr, val);
-+# else
-+ return __atomic_fetch_and(addr, val, __ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+template
-+inline T
-+js::jit::AtomicOperations::fetchOrSeqCst(T* addr, T val)
-+{
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+ return __sync_fetch_and_or(addr, val);
-+# else
-+ return __atomic_fetch_or(addr, val, __ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+template
-+inline T
-+js::jit::AtomicOperations::fetchXorSeqCst(T* addr, T val)
-+{
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+ return __sync_fetch_and_xor(addr, val);
-+# else
-+ return __atomic_fetch_xor(addr, val, __ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+template
-+inline T
-+js::jit::AtomicOperations::exchangeSeqCst(T* addr, T val)
-+{
-+ MOZ_ASSERT(sizeof(T) < 8 || isLockfree8());
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+ T v;
-+ __sync_synchronize();
-+ do {
-+ v = *addr;
-+ } while (__sync_val_compare_and_swap(addr, v, val) != v);
-+ return v;
-+# else
-+ T v;
-+ __atomic_exchange(addr, &val, &v, __ATOMIC_SEQ_CST);
-+ return v;
-+# endif
-+}
-+
-+template
-+inline T
-+js::jit::AtomicOperations::loadSafeWhenRacy(T* addr)
-+{
-+ return *addr; // FIXME (1208663): not yet safe
-+}
-+
-+template
-+inline void
-+js::jit::AtomicOperations::storeSafeWhenRacy(T* addr, T val)
-+{
-+ *addr = val; // FIXME (1208663): not yet safe
-+}
-+
-+inline void
-+js::jit::AtomicOperations::memcpySafeWhenRacy(void* dest, const void* src, size_t nbytes)
-+{
-+ ::memcpy(dest, src, nbytes); // FIXME (1208663): not yet safe
-+}
-+
-+inline void
-+js::jit::AtomicOperations::memmoveSafeWhenRacy(void* dest, const void* src, size_t nbytes)
-+{
-+ ::memmove(dest, src, nbytes); // FIXME (1208663): not yet safe
-+}
-+
-+template
-+inline void
-+js::jit::RegionLock::acquire(void* addr)
-+{
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+ while (!__sync_bool_compare_and_swap(&spinlock, 0, 1))
-+ ;
-+# else
-+ uint32_t zero = 0;
-+ uint32_t one = 1;
-+ while (!__atomic_compare_exchange(&spinlock, &zero, &one, false, __ATOMIC_ACQUIRE, __ATOMIC_ACQUIRE)) {
-+ zero = 0;
-+ continue;
-+ }
-+# endif
-+}
-+
-+template
-+inline void
-+js::jit::RegionLock::release(void* addr)
-+{
-+ MOZ_ASSERT(AtomicOperations::loadSeqCst(&spinlock) == 1, "releasing unlocked region lock");
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+ __sync_sub_and_fetch(&spinlock, 1);
-+# else
-+ uint32_t zero = 0;
-+ __atomic_store(&spinlock, &zero, __ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+# undef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+
-+#elif defined(ENABLE_SHARED_ARRAY_BUFFER)
-+
-+# error "Either disable JS shared memory, use GCC, or add code here"
-+
-+#endif
-+
-+#endif // jit_ia64_AtomicOperations_ia64_h
diff --git a/dev-lang/spidermonkey/files/mozilla_configure_regexp_esr.patch b/dev-lang/spidermonkey/files/mozilla_configure_regexp_esr.patch
deleted file mode 100644
index 9e165ff9e88e..000000000000
--- a/dev-lang/spidermonkey/files/mozilla_configure_regexp_esr.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Jory A. Pratt
-
-Note: the first occurrence of :space: is [:space:] (with a single pair
-of []), where it should be [[:space:]] (with two pairs of []).
-
-This causes the sed command to fail (with the error message quoted in
-my original report), driving to failure the whole configure step.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1329252
-
-diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
---- a/build/autoconf/icu.m4
-+++ b/build/autoconf/icu.m4
-@@ -68,17 +68,17 @@ if test -n "$USE_ICU"; then
- icudir="$_topsrcdir/intl/icu/source"
- if test ! -d "$icudir"; then
- icudir="$_topsrcdir/../../intl/icu/source"
- if test ! -d "$icudir"; then
- AC_MSG_ERROR([Cannot find the ICU directory])
- fi
- fi
-
-- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
-+ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
- if test x"$version" = x; then
- AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
- fi
- MOZ_ICU_VERSION="$version"
-
- if test "$OS_TARGET" = WINNT; then
- MOZ_SHARED_ICU=1
- fi
diff --git a/dev-lang/spidermonkey/files/mozilla_configure_regexp_esr38.patch b/dev-lang/spidermonkey/files/mozilla_configure_regexp_esr38.patch
deleted file mode 100644
index 488b02f12814..000000000000
--- a/dev-lang/spidermonkey/files/mozilla_configure_regexp_esr38.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Jory A. Pratt
-
-Note: the first occurrence of :space: is [:space:] (with a single pair
-of []), where it should be [[:space:]] (with two pairs of []).
-
-This causes the sed command to fail (with the error message quoted in
-my original report), driving to failure the whole configure step.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1329252
-
-diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
---- a/build/autoconf/icu.m4
-+++ b/build/autoconf/icu.m4
-@@ -68,17 +68,17 @@
- icudir="$_topsrcdir/intl/icu/source"
- if test ! -d "$icudir"; then
- icudir="$_topsrcdir/../../intl/icu/source"
- if test ! -d "$icudir"; then
- AC_MSG_ERROR([Cannot find the ICU directory])
- fi
- fi
-
-- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
-+ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
- if test x"$version" = x; then
- AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
- fi
- MOZ_ICU_VERSION="$version"
-
- if test -z "${JS_STANDALONE}" -a -n "${JS_SHARED_LIBRARY}${MOZ_NATIVE_ICU}"; then
- MOZ_SHARED_ICU=1
- fi
diff --git a/dev-lang/spidermonkey/files/mozjs38-1269317.patch b/dev-lang/spidermonkey/files/mozjs38-1269317.patch
deleted file mode 100644
index 39cc6809af57..000000000000
--- a/dev-lang/spidermonkey/files/mozjs38-1269317.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-from https://github.com/GNOME/jhbuild/blob/master/patches/mozjs38-1269317.patch
-
---- a/js/src/jit/RegisterSets.h 2017-02-10 17:33:06.210702431 -0800
-+++ b/js/src/jit/RegisterSets.h 2017-02-10 17:43:52.877514146 -0800
-@@ -7,7 +7,6 @@
- #ifndef jit_RegisterSets_h
- #define jit_RegisterSets_h
-
--#include "mozilla/Alignment.h"
- #include "mozilla/MathAlgorithms.h"
-
- #include "jit/JitAllocPolicy.h"
-@@ -26,8 +25,8 @@
- Code code_;
-
- public:
-- AnyRegister()
-- { }
-+ AnyRegister() = default;
-+
- explicit AnyRegister(Register gpr) {
- code_ = gpr.code();
- }
-@@ -156,7 +155,7 @@
- }
- #endif
-
-- ValueOperand() {}
-+ ValueOperand() = default;
- };
-
- // Registers to hold either either a typed or untyped value.
-@@ -165,46 +164,25 @@
- // Type of value being stored.
- MIRType type_;
-
-- // Space to hold either an AnyRegister or a ValueOperand.
- union U {
-- mozilla::AlignedStorage2 typed;
-- mozilla::AlignedStorage2 value;
-+ AnyRegister typed;
-+ ValueOperand value;
- } data;
-
-- AnyRegister& dataTyped() {
-- MOZ_ASSERT(hasTyped());
-- return *data.typed.addr();
-- }
-- ValueOperand& dataValue() {
-- MOZ_ASSERT(hasValue());
-- return *data.value.addr();
-- }
--
-- AnyRegister dataTyped() const {
-- MOZ_ASSERT(hasTyped());
-- return *data.typed.addr();
-- }
-- const ValueOperand& dataValue() const {
-- MOZ_ASSERT(hasValue());
-- return *data.value.addr();
-- }
--
- public:
-
-- TypedOrValueRegister()
-- : type_(MIRType_None)
-- {}
-+ TypedOrValueRegister() = default;
-
- TypedOrValueRegister(MIRType type, AnyRegister reg)
- : type_(type)
- {
-- dataTyped() = reg;
-+ data.typed = reg;
- }
-
- MOZ_IMPLICIT TypedOrValueRegister(ValueOperand value)
- : type_(MIRType_Value)
- {
-- dataValue() = value;
-+ data.value = value;
- }
-
- MIRType type() const {
-@@ -220,11 +198,13 @@
- }
-
- AnyRegister typedReg() const {
-- return dataTyped();
-+ MOZ_ASSERT(hasTyped());
-+ return data.typed;
- }
-
- ValueOperand valueReg() const {
-- return dataValue();
-+ MOZ_ASSERT(hasValue());
-+ return data.value;
- }
-
- AnyRegister scratchReg() {
-@@ -240,19 +220,18 @@
- // Whether a constant value is being stored.
- bool constant_;
-
-- // Space to hold either a Value or a TypedOrValueRegister.
- union U {
-- mozilla::AlignedStorage2 constant;
-- mozilla::AlignedStorage2 reg;
-+ Value constant;
-+ TypedOrValueRegister reg;
- } data;
-
- Value& dataValue() {
- MOZ_ASSERT(constant());
-- return *data.constant.addr();
-+ return data.constant;
- }
- TypedOrValueRegister& dataReg() {
- MOZ_ASSERT(!constant());
-- return *data.reg.addr();
-+ return data.reg;
- }
-
- public:
diff --git a/dev-lang/spidermonkey/files/mozjs38-copy-headers.patch b/dev-lang/spidermonkey/files/mozjs38-copy-headers.patch
deleted file mode 100644
index 7f352a795c8d..000000000000
--- a/dev-lang/spidermonkey/files/mozjs38-copy-headers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Copy headers on install instead of symlinking
-Author: Rico Tzschichholz
-Forwarded: no
-Last-Update: 2014-10-29
-
----
-
-Index: b/python/mozbuild/mozbuild/backend/recursivemake.py
-===================================================================
---- a/python/mozbuild/mozbuild/backend/recursivemake.py
-+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -796,7 +796,7 @@
- return
-
- for source, dest, _ in self._walk_hierarchy(obj, exports):
-- self._install_manifests['dist_include'].add_symlink(source, dest)
-+ self._install_manifests['dist_include'].add_copy(source, dest)
-
- if not os.path.exists(source):
- raise Exception('File listed in EXPORTS does not exist: %s' % source)
diff --git a/dev-lang/spidermonkey/files/mozjs38-fix-tracelogger.patch b/dev-lang/spidermonkey/files/mozjs38-fix-tracelogger.patch
deleted file mode 100644
index 2197f617a043..000000000000
--- a/dev-lang/spidermonkey/files/mozjs38-fix-tracelogger.patch
+++ /dev/null
@@ -1,605 +0,0 @@
-from https://github.com/GNOME/jhbuild/blob/master/patches/mozjs38-fix-tracelogger.patch
-
-# === Fix the SM38 tracelogger ===
-# This patch is a squashed version of several patches that were adapted
-# to fix failing hunks.
-#
-# Applied in the following order, they are:
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1223767
-# Assertion failure: i < size_, at js/src/vm/TraceLoggingTypes.h:210
-# Also fix stop-information to make reduce.py work correctly.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1227914
-# Limit the memory tracelogger can take.
-# This causes tracelogger to flush data to the disk regularly and prevents out of
-# memory issues if a lot of data gets logged.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1155618
-# Fix tracelogger destructor that touches possibly uninitialised hash table.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1223636
-# Don't treat extraTextId as containing only extra ids.
-# This fixes an assertion failure: id == nextTextId at js/src/vm/TraceLoggingGraph.cpp
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1227028
-# Fix when to keep the payload of a TraceLogger event.
-# This fixes an assertion failure: textId < uint32_t(1 << 31) at js/src/vm/TraceLoggingGraph.h
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1266649
-# Handle failing to add to pointermap gracefully.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1280648
-# Don't cache based on pointers to movable GC things.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1224123
-# Fix the use of LastEntryId in tracelogger.h.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1231170
-# Use size in debugger instead of the current id to track last logged item.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1221844
-# Move TraceLogger_Invalidation to LOG_ITEM.
-# Add some debug checks to logTimestamp.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1255766
-# Also mark resizing of memory.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1259403
-# Only increase capacity by multiples of 2.
-# Always make sure there are 3 free slots for events.
-# ===
-
-diff --git a/js/src/jit-test/tests/tracelogger/bug1231170.js b/js/src/jit-test/tests/tracelogger/bug1231170.js
-new file mode 100644
-index 0000000..023e93e
---- /dev/null
-+++ b/js/src/jit-test/tests/tracelogger/bug1231170.js
-@@ -0,0 +1,3 @@
-+var du = new Debugger();
-+if (typeof du.drainTraceLogger === "function")
-+ du.drainTraceLogger();
-diff --git a/js/src/jit-test/tests/tracelogger/bug1266649.js b/js/src/jit-test/tests/tracelogger/bug1266649.js
-new file mode 100644
-index 0000000..81ae7ad
---- /dev/null
-+++ b/js/src/jit-test/tests/tracelogger/bug1266649.js
-@@ -0,0 +1,10 @@
-+
-+var du = new Debugger();
-+if (typeof du.setupTraceLogger === "function" &&
-+ typeof oomTest === 'function')
-+{
-+ du.setupTraceLogger({
-+ Scripts: true
-+ })
-+ oomTest(() => function(){});
-+}
-diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp
-index 93e2fda..09049d6 100644
---- a/js/src/jit/Ion.cpp
-+++ b/js/src/jit/Ion.cpp
-@@ -1055,6 +1055,8 @@ IonScript::Destroy(FreeOp* fop, IonScript* script)
-
- script->destroyCaches();
- script->unlinkFromRuntime(fop);
-+ // Frees the potential event we have set.
-+ script->traceLoggerScriptEvent_ = TraceLoggerEvent();
- fop->free_(script);
- }
-
-diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
-index 26262fd..af7f313 100644
---- a/js/src/vm/Debugger.cpp
-+++ b/js/src/vm/Debugger.cpp
-@@ -369,10 +369,10 @@ Debugger::Debugger(JSContext* cx, NativeObject* dbg)
- objects(cx),
- environments(cx),
- #ifdef NIGHTLY_BUILD
-- traceLoggerLastDrainedId(0),
-+ traceLoggerLastDrainedSize(0),
- traceLoggerLastDrainedIteration(0),
- #endif
-- traceLoggerScriptedCallsLastDrainedId(0),
-+ traceLoggerScriptedCallsLastDrainedSize(0),
- traceLoggerScriptedCallsLastDrainedIteration(0)
- {
- assertSameCompartment(cx, dbg);
-@@ -3907,9 +3907,9 @@ Debugger::drainTraceLogger(JSContext* cx, unsigned argc, Value* vp)
- size_t num;
- TraceLoggerThread* logger = TraceLoggerForMainThread(cx->runtime());
- bool lostEvents = logger->lostEvents(dbg->traceLoggerLastDrainedIteration,
-- dbg->traceLoggerLastDrainedId);
-+ dbg->traceLoggerLastDrainedSize);
- EventEntry* events = logger->getEventsStartingAt(&dbg->traceLoggerLastDrainedIteration,
-- &dbg->traceLoggerLastDrainedId,
-+ &dbg->traceLoggerLastDrainedSize,
- &num);
-
- RootedObject array(cx, NewDenseEmptyArray(cx));
-@@ -4002,10 +4002,10 @@ Debugger::drainTraceLoggerScriptCalls(JSContext* cx, unsigned argc, Value* vp)
- size_t num;
- TraceLoggerThread* logger = TraceLoggerForMainThread(cx->runtime());
- bool lostEvents = logger->lostEvents(dbg->traceLoggerScriptedCallsLastDrainedIteration,
-- dbg->traceLoggerScriptedCallsLastDrainedId);
-+ dbg->traceLoggerScriptedCallsLastDrainedSize);
- EventEntry* events = logger->getEventsStartingAt(
- &dbg->traceLoggerScriptedCallsLastDrainedIteration,
-- &dbg->traceLoggerScriptedCallsLastDrainedId,
-+ &dbg->traceLoggerScriptedCallsLastDrainedSize,
- &num);
-
- RootedObject array(cx, NewDenseEmptyArray(cx));
-diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h
-index 8cac36a..c92d685 100644
---- a/js/src/vm/Debugger.h
-+++ b/js/src/vm/Debugger.h
-@@ -314,10 +314,10 @@ class Debugger : private mozilla::LinkedListElement
- * lost events.
- */
- #ifdef NIGHTLY_BUILD
-- uint32_t traceLoggerLastDrainedId;
-+ uint32_t traceLoggerLastDrainedSize;
- uint32_t traceLoggerLastDrainedIteration;
- #endif
-- uint32_t traceLoggerScriptedCallsLastDrainedId;
-+ uint32_t traceLoggerScriptedCallsLastDrainedSize;
- uint32_t traceLoggerScriptedCallsLastDrainedIteration;
-
- class FrameRange;
-diff --git a/js/src/vm/TraceLogging.cpp b/js/src/vm/TraceLogging.cpp
-index 6715b36..9766a6f 100644
---- a/js/src/vm/TraceLogging.cpp
-+++ b/js/src/vm/TraceLogging.cpp
-@@ -131,7 +131,7 @@ TraceLoggerThread::init()
- {
- if (!pointerMap.init())
- return false;
-- if (!extraTextId.init())
-+ if (!textIdPayloads.init())
- return false;
- if (!events.init())
- return false;
-@@ -185,10 +185,10 @@ TraceLoggerThread::~TraceLoggerThread()
- graph = nullptr;
- }
-
-- for (TextIdHashMap::Range r = extraTextId.all(); !r.empty(); r.popFront())
-- js_delete(r.front().value());
-- extraTextId.finish();
-- pointerMap.finish();
-+ if (textIdPayloads.initialized()) {
-+ for (TextIdHashMap::Range r = textIdPayloads.all(); !r.empty(); r.popFront())
-+ js_delete(r.front().value());
-+ }
- }
-
- bool
-@@ -287,7 +287,7 @@ TraceLoggerThread::eventText(uint32_t id)
- if (id < TraceLogger_Last)
- return TLTextIdString(static_cast(id));
-
-- TextIdHashMap::Ptr p = extraTextId.lookup(id);
-+ TextIdHashMap::Ptr p = textIdPayloads.lookup(id);
- MOZ_ASSERT(p);
-
- return p->value()->string();
-@@ -341,13 +341,15 @@ TraceLoggerThread::extractScriptDetails(uint32_t textId, const char** filename,
- TraceLoggerEventPayload*
- TraceLoggerThread::getOrCreateEventPayload(TraceLoggerTextId textId)
- {
-- TextIdHashMap::AddPtr p = extraTextId.lookupForAdd(textId);
-- if (p)
-+ TextIdHashMap::AddPtr p = textIdPayloads.lookupForAdd(textId);
-+ if (p) {
-+ MOZ_ASSERT(p->value()->textId() == textId); // Sanity check.
- return p->value();
-+ }
-
- TraceLoggerEventPayload* payload = js_new(textId, (char*)nullptr);
-
-- if (!extraTextId.add(p, textId, payload))
-+ if (!textIdPayloads.add(p, textId, payload))
- return nullptr;
-
- return payload;
-@@ -357,8 +359,10 @@ TraceLoggerEventPayload*
- TraceLoggerThread::getOrCreateEventPayload(const char* text)
- {
- PointerHashMap::AddPtr p = pointerMap.lookupForAdd((const void*)text);
-- if (p)
-+ if (p) {
-+ MOZ_ASSERT(p->value()->textId() < nextTextId); // Sanity check.
- return p->value();
-+ }
-
- size_t len = strlen(text);
- char* str = js_pod_malloc(len + 1);
-@@ -369,7 +373,7 @@ TraceLoggerThread::getOrCreateEventPayload(const char* text)
- MOZ_ASSERT(ret == len);
- MOZ_ASSERT(strlen(str) == len);
-
-- uint32_t textId = extraTextId.count() + TraceLogger_Last;
-+ uint32_t textId = nextTextId;
-
- TraceLoggerEventPayload* payload = js_new(textId, str);
- if (!payload) {
-@@ -377,17 +381,19 @@ TraceLoggerThread::getOrCreateEventPayload(const char* text)
- return nullptr;
- }
-
-- if (!extraTextId.putNew(textId, payload)) {
-+ if (!textIdPayloads.putNew(textId, payload)) {
- js_delete(payload);
- return nullptr;
- }
-
-- if (!pointerMap.add(p, text, payload))
-- return nullptr;
--
- if (graph.get())
- graph->addTextId(textId, str);
-
-+ nextTextId++;
-+
-+ if (!pointerMap.add(p, text, payload))
-+ return nullptr;
-+
- return payload;
- }
-
-@@ -407,9 +413,14 @@ TraceLoggerThread::getOrCreateEventPayload(TraceLoggerTextId type, const char* f
- if (!traceLoggerState->isTextIdEnabled(type))
- return getOrCreateEventPayload(type);
-
-- PointerHashMap::AddPtr p = pointerMap.lookupForAdd(ptr);
-- if (p)
-- return p->value();
-+ PointerHashMap::AddPtr p;
-+ if (ptr) {
-+ p = pointerMap.lookupForAdd(ptr);
-+ if (p) {
-+ MOZ_ASSERT(p->value()->textId() < nextTextId); // Sanity check.
-+ return p->value();
-+ }
-+ }
-
- // Compute the length of the string to create.
- size_t lenFilename = strlen(filename);
-@@ -428,24 +439,28 @@ TraceLoggerThread::getOrCreateEventPayload(TraceLoggerTextId type, const char* f
- MOZ_ASSERT(ret == len);
- MOZ_ASSERT(strlen(str) == len);
-
-- uint32_t textId = extraTextId.count() + TraceLogger_Last;
-+ uint32_t textId = nextTextId;
- TraceLoggerEventPayload* payload = js_new(textId, str);
- if (!payload) {
- js_free(str);
- return nullptr;
- }
-
-- if (!extraTextId.putNew(textId, payload)) {
-+ if (!textIdPayloads.putNew(textId, payload)) {
- js_delete(payload);
- return nullptr;
- }
-
-- if (!pointerMap.add(p, ptr, payload))
-- return nullptr;
--
- if (graph.get())
- graph->addTextId(textId, str);
-
-+ nextTextId++;
-+
-+ if (ptr) {
-+ if (!pointerMap.add(p, ptr, payload))
-+ return nullptr;
-+ }
-+
- return payload;
- }
-
-@@ -453,14 +468,14 @@ TraceLoggerEventPayload*
- TraceLoggerThread::getOrCreateEventPayload(TraceLoggerTextId type, JSScript* script)
- {
- return getOrCreateEventPayload(type, script->filename(), script->lineno(), script->column(),
-- script);
-+ nullptr);
- }
-
- TraceLoggerEventPayload*
- TraceLoggerThread::getOrCreateEventPayload(TraceLoggerTextId type,
- const JS::ReadOnlyCompileOptions& script)
- {
-- return getOrCreateEventPayload(type, script.filename(), script.lineno, script.column, &script);
-+ return getOrCreateEventPayload(type, script.filename(), script.lineno, script.column, nullptr);
- }
-
- void
-@@ -485,7 +500,7 @@ TraceLoggerThread::startEvent(uint32_t id)
- if (!traceLoggerState->isTextIdEnabled(id))
- return;
-
-- logTimestamp(id);
-+ log(id);
- }
-
- void
-@@ -510,7 +525,7 @@ TraceLoggerThread::stopEvent(uint32_t id)
- if (!traceLoggerState->isTextIdEnabled(id))
- return;
-
-- logTimestamp(TraceLogger_Stop);
-+ log(TraceLogger_Stop);
- }
-
- void
-@@ -522,23 +537,57 @@ TraceLoggerThread::logTimestamp(TraceLoggerTextId id)
- void
- TraceLoggerThread::logTimestamp(uint32_t id)
- {
-+ MOZ_ASSERT(id > TraceLogger_LastTreeItem && id < TraceLogger_Last);
-+ log(id);
-+}
-+
-+void
-+TraceLoggerThread::log(uint32_t id)
-+{
- if (enabled == 0)
- return;
-
- MOZ_ASSERT(traceLoggerState);
-- if (!events.ensureSpaceBeforeAdd()) {
-+
-+ // We request for 3 items to add, since if we don't have enough room
-+ // we record the time it took to make more place. To log this information
-+ // we need 2 extra free entries.
-+ if (!events.hasSpaceForAdd(3)) {
- uint64_t start = rdtsc() - traceLoggerState->startupTime;
-
-- if (graph.get())
-- graph->log(events);
-+ if (!events.ensureSpaceBeforeAdd(3)) {
-+ if (graph.get())
-+ graph->log(events);
-+
-+ iteration_++;
-+ events.clear();
-+
-+ // Remove the item in the pointerMap for which the payloads
-+ // have no uses anymore
-+ for (PointerHashMap::Enum e(pointerMap); !e.empty(); e.popFront()) {
-+ if (e.front().value()->uses() != 0)
-+ continue;
-+
-+ TextIdHashMap::Ptr p = textIdPayloads.lookup(e.front().value()->textId());
-+ MOZ_ASSERT(p);
-+ textIdPayloads.remove(p);
-+
-+ e.removeFront();
-+ }
-
-- iteration_++;
-- events.clear();
-+ // Free all payloads that have no uses anymore.
-+ for (TextIdHashMap::Enum e(textIdPayloads); !e.empty(); e.popFront()) {
-+ if (e.front().value()->uses() == 0) {
-+ js_delete(e.front().value());
-+ e.removeFront();
-+ }
-+ }
-+ }
-
- // Log the time it took to flush the events as being from the
- // Tracelogger.
- if (graph.get()) {
-- MOZ_ASSERT(events.capacity() > 2);
-+ MOZ_ASSERT(events.hasSpaceForAdd(2));
- EventEntry& entryStart = events.pushUninitialized();
- entryStart.time = start;
- entryStart.textId = TraceLogger_Internal;
-@@ -548,13 +597,6 @@ TraceLoggerThread::logTimestamp(uint32_t id)
- entryStop.textId = TraceLogger_Stop;
- }
-
-- // Free all TextEvents that have no uses anymore.
-- for (TextIdHashMap::Enum e(extraTextId); !e.empty(); e.popFront()) {
-- if (e.front().value()->uses() == 0) {
-- js_delete(e.front().value());
-- e.removeFront();
-- }
-- }
- }
-
- uint64_t time = rdtsc() - traceLoggerState->startupTime;
-@@ -956,3 +998,16 @@ TraceLoggerEvent::~TraceLoggerEvent()
- if (payload_)
- payload_->release();
- }
-+
-+TraceLoggerEvent&
-+TraceLoggerEvent::operator=(const TraceLoggerEvent& other)
-+{
-+ if (hasPayload())
-+ payload()->release();
-+ if (other.hasPayload())
-+ other.payload()->use();
-+
-+ payload_ = other.payload_;
-+
-+ return *this;
-+}
-diff --git a/js/src/vm/TraceLogging.h b/js/src/vm/TraceLogging.h
-index a124dcb..91a1eb0 100644
---- a/js/src/vm/TraceLogging.h
-+++ b/js/src/vm/TraceLogging.h
-@@ -110,6 +110,9 @@ class TraceLoggerEvent {
- bool hasPayload() const {
- return !!payload_;
- }
-+
-+ TraceLoggerEvent& operator=(const TraceLoggerEvent& other);
-+ TraceLoggerEvent(const TraceLoggerEvent& event) = delete;
- };
-
- /**
-@@ -130,6 +133,10 @@ class TraceLoggerEventPayload {
- uses_(0)
- { }
-
-+ ~TraceLoggerEventPayload() {
-+ MOZ_ASSERT(uses_ == 0);
-+ }
-+
- uint32_t textId() {
- return textId_;
- }
-@@ -166,7 +173,8 @@ class TraceLoggerThread
- mozilla::UniquePtr graph;
-
- PointerHashMap pointerMap;
-- TextIdHashMap extraTextId;
-+ TextIdHashMap textIdPayloads;
-+ uint32_t nextTextId;
-
- ContinuousSpace events;
-
-@@ -181,6 +189,7 @@ class TraceLoggerThread
- : enabled(0),
- failed(false),
- graph(),
-+ nextTextId(TraceLogger_Last),
- iteration_(0),
- top(nullptr)
- { }
-@@ -195,22 +204,22 @@ class TraceLoggerThread
- bool enable(JSContext* cx);
- bool disable();
-
-- // Given the previous iteration and lastEntryId, return an array of events
-+ // Given the previous iteration and size, return an array of events
- // (there could be lost events). At the same time update the iteration and
-- // lastEntry and gives back how many events there are.
-- EventEntry* getEventsStartingAt(uint32_t* lastIteration, uint32_t* lastEntryId, size_t* num) {
-+ // size and gives back how many events there are.
-+ EventEntry* getEventsStartingAt(uint32_t* lastIteration, uint32_t* lastSize, size_t* num) {
- EventEntry* start;
- if (iteration_ == *lastIteration) {
-- MOZ_ASSERT(events.lastEntryId() >= *lastEntryId);
-- *num = events.lastEntryId() - *lastEntryId;
-- start = events.data() + *lastEntryId + 1;
-+ MOZ_ASSERT(*lastSize <= events.size());
-+ *num = events.size() - *lastSize;
-+ start = events.data() + *lastSize;
- } else {
-- *num = events.lastEntryId() + 1;
-+ *num = events.size();
- start = events.data();
- }
-
- *lastIteration = iteration_;
-- *lastEntryId = events.lastEntryId();
-+ *lastSize = events.size();
- return start;
- }
-
-@@ -220,16 +229,16 @@ class TraceLoggerThread
- const char** lineno, size_t* lineno_len, const char** colno,
- size_t* colno_len);
-
-- bool lostEvents(uint32_t lastIteration, uint32_t lastEntryId) {
-+ bool lostEvents(uint32_t lastIteration, uint32_t lastSize) {
- // If still logging in the same iteration, there are no lost events.
- if (lastIteration == iteration_) {
-- MOZ_ASSERT(lastEntryId <= events.lastEntryId());
-+ MOZ_ASSERT(lastSize <= events.size());
- return false;
- }
-
-- // When proceeded to the next iteration and lastEntryId points to
-- // the maximum capacity there are no logs that are lost.
-- if (lastIteration + 1 == iteration_ && lastEntryId == events.capacity())
-+ // If we are in a consecutive iteration we are only sure we didn't lose any events,
-+ // when the lastSize equals the maximum size 'events' can get.
-+ if (lastIteration == iteration_ - 1 && lastSize == events.maxSize())
- return false;
-
- return true;
-@@ -268,6 +277,7 @@ class TraceLoggerThread
- void stopEvent(uint32_t id);
- private:
- void stopEvent();
-+ void log(uint32_t id);
-
- public:
- static unsigned offsetOfEnabled() {
-diff --git a/js/src/vm/TraceLoggingGraph.cpp b/js/src/vm/TraceLoggingGraph.cpp
-index d1b7f2e..a4eb273 100644
---- a/js/src/vm/TraceLoggingGraph.cpp
-+++ b/js/src/vm/TraceLoggingGraph.cpp
-@@ -276,7 +276,7 @@ TraceLoggerGraph::flush()
- if (bytesWritten < tree.size())
- return false;
-
-- treeOffset += tree.lastEntryId();
-+ treeOffset += tree.size();
- tree.clear();
- }
-
-@@ -359,7 +359,7 @@ TraceLoggerGraph::startEventInternal(uint32_t id, uint64_t timestamp)
-
- if (parent.lastChildId() == 0) {
- MOZ_ASSERT(!entry.hasChildren());
-- MOZ_ASSERT(parent.treeId() == tree.lastEntryId() + treeOffset);
-+ MOZ_ASSERT(parent.treeId() == treeOffset + tree.size() - 1);
-
- if (!updateHasChildren(parent.treeId()))
- return false;
-diff --git a/js/src/vm/TraceLoggingTypes.h b/js/src/vm/TraceLoggingTypes.h
-index f1c9d0c..10b76d6 100644
---- a/js/src/vm/TraceLoggingTypes.h
-+++ b/js/src/vm/TraceLoggingTypes.h
-@@ -21,7 +21,6 @@
- _(Internal) \
- _(Interpreter) \
- _(InlinedScripts) \
-- _(Invalidation) \
- _(IonCompilation) \
- _(IonCompilationPaused) \
- _(IonLinking) \
-@@ -60,6 +59,7 @@
-
- #define TRACELOGGER_LOG_ITEMS(_) \
- _(Bailout) \
-+ _(Invalidation) \
- _(Disable) \
- _(Enable) \
- _(Stop)
-@@ -130,6 +130,9 @@ class ContinuousSpace {
- uint32_t size_;
- uint32_t capacity_;
-
-+ // The maximum amount of ram memory a continuous space structure can take (in bytes).
-+ static const uint32_t LIMIT = 200 * 1024 * 1024;
-+
- public:
- ContinuousSpace ()
- : data_(nullptr)
-@@ -151,6 +154,10 @@ class ContinuousSpace {
- data_ = nullptr;
- }
-
-+ static uint32_t maxSize() {
-+ return LIMIT / sizeof(T);
-+ }
-+
- T* data() {
- return data_;
- }
-@@ -187,11 +194,14 @@ class ContinuousSpace {
- if (hasSpaceForAdd(count))
- return true;
-
-+ // Limit the size of a continuous buffer.
-+ if (size_ + count > maxSize())
-+ return false;
-+
- uint32_t nCapacity = capacity_ * 2;
-- if (size_ + count > nCapacity)
-- nCapacity = size_ + count;
-- T* entries = (T*) js_realloc(data_, nCapacity * sizeof(T));
-+ nCapacity = (nCapacity < maxSize()) ? nCapacity : maxSize();
-
-+ T* entries = (T*) js_realloc(data_, nCapacity * sizeof(T));
- if (!entries)
- return false;
-
diff --git a/dev-lang/spidermonkey/files/mozjs38-pkg-config-version.patch b/dev-lang/spidermonkey/files/mozjs38-pkg-config-version.patch
deleted file mode 100644
index 34a43d1f6df8..000000000000
--- a/dev-lang/spidermonkey/files/mozjs38-pkg-config-version.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Add major version to pkg-config filename.
-Author: Rico Tzschichholz
-Forwarded: no
-Last-Update: 2015-05-04
-
-Index: b/js/src/Makefile.in
-===================================================================
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -214,10 +214,10 @@
- $(JS_CONFIG_NAME): js-config
- cp $^ $@
-
--$(LIBRARY_NAME).pc: js.pc
-+$(JS_LIBRARY_NAME).pc: js.pc
- cp $^ $@
-
--install:: $(LIBRARY_NAME).pc
-+install:: $(JS_LIBRARY_NAME).pc
- $(SYSINSTALL) $^ $(DESTDIR)$(libdir)/pkgconfig
-
- install:: js-config.h
diff --git a/dev-lang/spidermonkey/files/mozjs45-1266366.patch b/dev-lang/spidermonkey/files/mozjs45-1266366.patch
deleted file mode 100644
index 590f745d14d4..000000000000
--- a/dev-lang/spidermonkey/files/mozjs45-1266366.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# HG changeset patch
-# User Nicolas B. Pierron
-
-Bug 1266366 - Add branch64 functions to the none-backend MacroAssembler. r=
-
-diff --git a/js/src/jit/none/MacroAssembler-none.h b/js/src/jit/none/MacroAssembler-none.h
-index 512ae81..4441d8d 100644
---- a/js/src/jit/none/MacroAssembler-none.h
-+++ b/js/src/jit/none/MacroAssembler-none.h
-@@ -254,16 +254,18 @@ class MacroAssemblerNone : public Assembler
- template void branchSub32(Condition, T, S, Label*) { MOZ_CRASH(); }
- template void branchPtr(Condition, T, S, Label*) { MOZ_CRASH(); }
- template void branchTestPtr(Condition, T, S, Label*) { MOZ_CRASH(); }
- template void branchDouble(DoubleCondition, T, S, Label*) { MOZ_CRASH(); }
- template void branchFloat(DoubleCondition, T, S, Label*) { MOZ_CRASH(); }
- template void branchPrivatePtr(Condition, T, S, Label*) { MOZ_CRASH(); }
- template void decBranchPtr(Condition, T, S, Label*) { MOZ_CRASH(); }
- template void branchTest64(Condition, T, T, S, Label*) { MOZ_CRASH(); }
-+ template void branch64(Condition, T, S, Label*) { MOZ_CRASH(); }
-+ template void branch64(Condition, T, T, S, Label*) { MOZ_CRASH(); }
- template void mov(T, S) { MOZ_CRASH(); }
- template void movq(T, S) { MOZ_CRASH(); }
- template void movePtr(T, S) { MOZ_CRASH(); }
- template void move32(T, S) { MOZ_CRASH(); }
- template void moveFloat32(T, S) { MOZ_CRASH(); }
- template void moveDouble(T, S) { MOZ_CRASH(); }
- template void move64(T, S) { MOZ_CRASH(); }
- template CodeOffset movWithPatch(T, Register) { MOZ_CRASH(); }
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.5-build.patch b/dev-lang/spidermonkey/files/spidermonkey-1.5-build.patch
deleted file mode 100644
index a5c4b47db529..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.5-build.patch
+++ /dev/null
@@ -1,138 +0,0 @@
---- js/src/Makefile.ref
-+++ js/src/Makefile.ref
-@@ -127,7 +127,7 @@ endif
- ifdef JS_READLINE
- # For those platforms with the readline library installed.
- DEFINES += -DEDITLINE
--PROG_LIBS += -lreadline -ltermcap
-+PROG_LIBS += -lreadline
- else
- ifdef JS_EDITLINE
- # Use the editline library, built locally.
-@@ -370,3 +370,16 @@ TARFILES = files `cat files`
- SUFFIXES: .i
- %.i: %.c
- $(CC) -C -E $(CFLAGS) $< > $*.i
-+
-+DESTDIR :=
-+PREFIX := /usr
-+BINDIR := $(PREFIX)/bin
-+MY_LIBDIR := $(PREFIX)/$(LIBDIR)
-+INCLUDEDIR := $(PREFIX)/include/js
-+INSTALL := install -g 0 -o root
-+install:
-+ $(INSTALL) -m 755 -d $(DESTDIR)$(INCLUDEDIR) $(DESTDIR)$(MY_LIBDIR) $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DESTDIR)$(MY_LIBDIR)
-+ $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(MY_LIBDIR)
-+ $(INSTALL) -m 755 $(OBJDIR)/js $(OBJDIR)/jscpucfg $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 644 $(HFILES) $(DESTDIR)$(INCLUDEDIR)
---- js/src/config/Linux_All.mk
-+++ js/src/config/Linux_All.mk
-@@ -41,37 +41,15 @@
- # Config for all versions of Linux
- #
-
--CC = gcc
--CCC = g++
- CFLAGS += -Wall -Wno-format
- OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
-
- RANLIB = echo
--MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS)
-+MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS) -soname $(notdir $@)
-
- #.c.o:
- # $(CC) -c -MD $*.d $(CFLAGS) $<
-
--CPU_ARCH = $(shell uname -m)
--# don't filter in x86-64 architecture
--ifneq (x86_64,$(CPU_ARCH))
--ifeq (86,$(findstring 86,$(CPU_ARCH)))
--CPU_ARCH = x86
--OS_CFLAGS+= -DX86_LINUX
--
--ifeq (gcc, $(CC))
--# if using gcc on x86, check version for opt bug
--# (http://bugzilla.mozilla.org/show_bug.cgi?id=24892)
--GCC_VERSION := $(shell gcc -v 2>&1 | grep version | awk '{ print $$3 }')
--GCC_LIST:=$(sort 2.91.66 $(GCC_VERSION) )
--
--ifeq (2.91.66, $(firstword $(GCC_LIST)))
--CFLAGS+= -DGCC_OPT_BUG
--endif
--endif
--endif
--endif
--
- GFX_ARCH = x
-
- OS_LIBS = -lm -lc
-@@ -88,16 +66,6 @@
- endif
-
- # Use the editline library to provide line-editing support.
--JS_EDITLINE = 1
-+JS_READLINE = 1
-
--ifeq ($(CPU_ARCH),x86_64)
--# Use VA_COPY() standard macro on x86-64
--# FIXME: better use it everywhere
- OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
--endif
--
--ifeq ($(CPU_ARCH),x86_64)
--# We need PIC code for shared libraries
--# FIXME: better patch rules.mk & fdlibm/Makefile*
--OS_CFLAGS += -DPIC -fPIC
--endif
---- js/src/rules.mk
-+++ js/src/rules.mk
-@@ -82,6 +82,10 @@ $(OBJDIR)/%.o: %.c
- @$(MAKE_OBJDIR)
- $(CC) -o $@ -c $(CFLAGS) $*.c
-
-+$(OBJDIR)/%.lo: %.c
-+ @$(MAKE_OBJDIR)
-+ $(CC) -o $@ -c $(CFLAGS) $*.c -fPIC
-+
- $(OBJDIR)/%.o: %.s
- @$(MAKE_OBJDIR)
- $(AS) -o $@ $(ASFLAGS) $*.s
-@@ -111,11 +115,12 @@ $(SHARED_LIBRARY): $(LIB_OBJS)
- /implib:"$(OBJDIR)/$(@F:.dll=.lib)" $^
- else
- $(LIBRARY): $(LIB_OBJS)
-- $(AR) rv $@ $?
-+ $(AR) cr $@ $?
- $(RANLIB) $@
-
--$(SHARED_LIBRARY): $(LIB_OBJS)
-- $(MKSHLIB) -o $@ $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS)
-+SHARED_LIB_OBJS := $(LIB_OBJS:.o=.lo)
-+$(SHARED_LIBRARY): $(SHARED_LIB_OBJS)
-+ $(MKSHLIB) -o $@ $(SHARED_LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS)
- endif
- endif
-
---- js/src/fdlibm/Makefile.ref
-+++ js/src/fdlibm/Makefile.ref
-@@ -151,7 +151,7 @@
-
- $(OBJDIR)/%.o: %.c
- @$(MAKE_OBJDIR)
-- $(CC) -o $@ -c $(CFLAGS) $*.c
-+ $(CC) -o $@ -c $(CFLAGS) $*.c -fPIC
-
- $(OBJDIR)/%.o: %.s
- @$(MAKE_OBJDIR)
---- js/src/config.mk
-+++ js/src/config.mk
-@@ -112,6 +112,8 @@
- CP = cp
- endif
-
-+BUILD_OPT := 1
-+
- ifdef BUILD_OPT
- OPTIMIZER = -O
- DEFINES += -UDEBUG -DNDEBUG -UDEBUG_$(shell whoami)
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.6-header.patch b/dev-lang/spidermonkey/files/spidermonkey-1.6-header.patch
deleted file mode 100644
index df4cf7d50744..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.6-header.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/Makefile.ref
-===================================================================
---- src.orig/Makefile.ref
-+++ src/Makefile.ref
-@@ -185,6 +185,8 @@ JS_HFILES = \
- jsstr.h \
- jsxdrapi.h \
- jsxml.h \
-+ jsutil.h \
-+ jsprf.h \
- $(NULL)
-
- API_HFILES = \
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch
deleted file mode 100644
index 4ddc3461ea11..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Respect LDFLAGS
-
-http://bugs.gentoo.org/show_bug.cgi?id=331129
-
---- js/src/Makefile.ref
-+++ js/src/Makefile.ref
-@@ -87,7 +87,7 @@
- LDFLAGS = $(XLDFLAGS)
-
- ifndef NO_LIBM
--LDFLAGS += -lm
-+OTHER_LIBS += -lm
- endif
-
- # Prevent floating point errors caused by VC++ optimizations
-@@ -325,7 +325,7 @@
- $(CC) -o $@ -c $(CFLAGS) $<
-
- $(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX): $(OBJDIR)/jskwgen.$(OBJ_SUFFIX)
-- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^
-+ $(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $(OTHER_LIBS) $^
-
- endif
-
-@@ -338,7 +338,7 @@
- link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
- else
- $(PROGRAM): $(PROG_OBJS) $(LIBRARY)
-- $(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
-+ $(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(OTHER_LIBS) \
- $(PROG_LIBS)
- endif
-
-@@ -355,7 +355,7 @@
- $(OBJDIR)/jscpucfg > $@
-
- $(OBJDIR)/jscpucfg: $(OBJDIR)/jscpucfg.o
-- $(CC) -o $@ $(OBJDIR)/jscpucfg.o
-+ $(CC) $(HOST_LDFLAGS) -o $@ $(OBJDIR)/jscpucfg.o
-
- # Add to TARGETS for clobber rule
- TARGETS += $(OBJDIR)/jsautocfg.h $(OBJDIR)/jscpucfg \
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.7.0-threadsafe.diff b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-threadsafe.diff
deleted file mode 100644
index 8728811fbfc4..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.7.0-threadsafe.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: src/Makefile.ref
-===================================================================
---- src.orig/Makefile.ref
-+++ src/Makefile.ref
-@@ -63,11 +63,11 @@ INCLUDES += -I$(OBJDIR)
-
- ifdef JS_THREADSAFE
- DEFINES += -DJS_THREADSAFE
--INCLUDES += -I$(DIST)/include/nspr
-+INCLUDES += -I/usr/include/nspr
- ifdef USE_MSVC
- OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib
- else
--OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX)
-+OTHER_LIBS += -L/usr/$(LIBDIR)/nspr -lnspr$(NSPR_LIBSUFFIX)
- endif
- endif
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch
deleted file mode 100644
index ed497ceebb0b..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- a/js-1.8.5/js/src/configure.in 2011-03-31 15:08:36.000000000 -0400
-+++ b/js-1.8.5/js/src/configure.in 2012-11-02 15:32:38.000000000 -0400
-@@ -3550,7 +3550,7 @@
- _SAVE_CFLAGS="$CFLAGS"
- if test "$GNU_CC"; then
- # gcc needs -mfpu=neon to recognize NEON instructions
-- CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
-+ CFLAGS="$CFLAGS -mfpu=neon"
- fi
- AC_TRY_COMPILE([],
- [asm("vadd.i8 d0, d0, d0");],
-@@ -4654,12 +4654,6 @@
- dnl ========================================================
- MOZ_ARG_HEADER(Individual module options)
-
--dnl Setup default CPU arch for arm target
--case "$target_cpu" in
-- arm*)
-- MOZ_ARM_ARCH=armv7
-- ;;
--esac
- dnl ========================================================
- dnl = Enable building the Thumb2 instruction set
- dnl ========================================================
-@@ -4668,66 +4662,32 @@
- MOZ_THUMB2=1,
- MOZ_THUMB2=)
- if test -n "$MOZ_THUMB2"; then
-- MOZ_ARM_ARCH=armv7
-+ AC_MSG_WARN([thumb2 enabled instead of autodetected -- hope you know what you are doing])
-+else
-+ AC_MSG_CHECKING([whether to build for thumb2])
-+ AC_TRY_COMPILE([],[return sizeof(__thumb2__);],
-+ [MOZ_THUMB2=1
-+ AC_MSG_RESULT([yes])],
-+ [MOZ_THUMB2=
-+ AC_MSG_RESULT([no])])
- fi
-
- dnl ========================================================
- dnl = Enable building for ARM specific CPU features
- dnl ========================================================
--MOZ_ARG_WITH_STRING(cpu-arch,
--[ --with-cpu-arch=arch Use specific arm architecture CPU features, default armv7],
-- MOZ_ARM_ARCH=$withval)
--
- if test -n "$MOZ_THUMB2"; then
- case "$target_cpu" in
- arm*)
-- if test "$MOZ_ARM_ARCH" != "armv7"; then
-- AC_MSG_ERROR([--enable-thumb2 is not compatible with cpu-arch=$MOZ_ARM_ARCH])
-- fi
- if test "$GNU_CC"; then
- AC_DEFINE(MOZ_THUMB2)
-- AC_DEFINE(MOZ_ARM_ARCH)
-- CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-- CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-- ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
- else
- AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
- fi
- ;;
-- *)
-- AC_MSG_ERROR([--enable-thumb2 is not supported for non-ARM CPU architectures])
-- ;;
-- esac
--elif test "$MOZ_ARM_ARCH" = "armv7"; then
-- case "$target_cpu" in
-- arm*)
-- if test "$GNU_CC"; then
-- AC_DEFINE(MOZ_ARM_ARCH)
-- CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-- CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-- ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-- else
-- AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
-- fi
-- ;;
-- *)
-- AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
-- ;;
-- esac
--else
-- case "$target_cpu" in
-- arm*)
-- if test "$GNU_CC"; then
-- CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
-- CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
-- ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
-- fi
-- ;;
- esac
- fi
-
- AC_SUBST(MOZ_THUMB2)
--AC_SUBST(MOZ_ARM_ARCH)
-
- dnl ========================================================
- dnl =
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch
deleted file mode 100644
index c867e45ee4f3..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
-
---- js/src/Makefile.in
-+++ js/src/Makefile.in
-@@ -888,8 +888,8 @@
- ifeq (,$(HOST_BIN_SUFFIX))
- mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
- @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
-- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
-- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
-+ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
-+ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
- endif
- endif
- ifneq (,$(IMPORT_LIBRARY))
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
deleted file mode 100644
index 3927c8717930..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-# HG changeset patch
-# User Mike Hommey
-# Date 1303461188 -7200
-# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1
-# Parent c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec
-Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary
-
-diff --git a/js/src/Makefile.in b/js/src/Makefile.in
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -383,17 +383,17 @@ CPPSRCS += checks.cc \
- platform.cc \
- utils.cc \
- $(NONE)
-
- #
- # END enclude sources for V8 dtoa
- #############################################
-
--ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
-+ifeq (,$(filter arm% %86 x86_64,$(TARGET_CPU)))
-
- VPATH += $(srcdir)/assembler \
- $(srcdir)/assembler/wtf \
- $(srcdir)/yarr/pcre \
- $(NULL)
-
- CPPSRCS += pcre_compile.cpp \
- pcre_exec.cpp \
-
-# HG changeset patch
-# User Luke Wagner
-# Date 1299520258 28800
-# Node ID 68203913d04cf5be53fd16278816183d5670ba5c
-# Parent 27e5814815491ebb68e474e453aff6c2ea908c43
-Bug 618485 - Add missing 64-bit big-endian jsval_layout field (r=luke)
-
-diff --git a/js/src/jsval.h b/js/src/jsval.h
---- a/js/src/jsval.h
-+++ b/js/src/jsval.h
-@@ -342,16 +342,17 @@ typedef union jsval_layout
- JSValueTag tag : 17;
- uint64 payload47 : 47;
- } debugView;
- struct {
- union {
- int32 i32;
- uint32 u32;
- JSWhyMagic why;
-+ jsuword word;
- } payload;
- } s;
- double asDouble;
- void *asPtr;
- } jsval_layout;
- # endif /* JS_BITS_PER_WORD */
- #endif /* defined(IS_LITTLE_ENDIAN) */
-
-
-
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-gcc6.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-gcc6.patch
deleted file mode 100644
index ab2181faf635..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-gcc6.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -upr a/js/src/jsapi.cpp b/js/src/jsapi.cpp
---- a/js/src/jsapi.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsapi.cpp 2016-02-29 18:10:49.302307353 -0600
-@@ -3985,7 +3985,7 @@ JS_Enumerate(JSContext *cx, JSObject *ob
- AutoIdVector props(cx);
- JSIdArray *ida;
- if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &props) || !VectorToIdArray(cx, props, &ida))
-- return false;
-+ return NULL;
- for (size_t n = 0; n < size_t(ida->length); ++n)
- JS_ASSERT(js_CheckForStringIndex(ida->vector[n]) == ida->vector[n]);
- return ida;
-diff -upr a/js/src/jsfun.cpp b/js/src/jsfun.cpp
---- a/js/src/jsfun.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsfun.cpp 2016-02-29 18:21:45.249674890 -0600
-@@ -2051,7 +2051,7 @@ fun_toStringHelper(JSContext *cx, JSObje
-
- JSString *str = JS_DecompileFunction(cx, fun, indent);
- if (!str)
-- return false;
-+ return NULL;
-
- if (!indent)
- cx->compartment->toSourceCache.put(fun, str);
-@@ -2657,7 +2657,7 @@ LookupInterpretedFunctionPrototype(JSCon
- const Shape *shape = funobj->nativeLookup(id);
- if (!shape) {
- if (!ResolveInterpretedFunctionPrototype(cx, funobj))
-- return false;
-+ return NULL;
- shape = funobj->nativeLookup(id);
- }
- JS_ASSERT(!shape->configurable());
-diff -upr a/js/src/jsiter.cpp b/js/src/jsiter.cpp
---- a/js/src/jsiter.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsiter.cpp 2016-02-29 18:24:22.494659919 -0600
-@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN f
- */
- JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0);
- if (!obj)
-- return false;
-+ return NULL;
- obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false);
- obj->setMap(cx->compartment->emptyEnumeratorShape);
- return obj;
-diff -upr a/js/src/jsparse.cpp b/js/src/jsparse.cpp
---- a/js/src/jsparse.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsparse.cpp 2016-02-29 18:29:03.997437475 -0600
-@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, Fun
- if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) {
- JS_ASSERT(pn->pn_cookie.isFree());
- if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom))
-- return false;
-+ return NULL;
- }
-
- pn->pn_blockid = outertc->blockid();
-diff -upr a/js/src/jsstr.cpp b/js/src/jsstr.cpp
---- a/js/src/jsstr.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsstr.cpp 2016-02-29 19:01:45.857779836 -0600
-@@ -1734,7 +1734,7 @@ class RegExpGuard
- if (flat) {
- patstr = flattenPattern(cx, fm.patstr);
- if (!patstr)
-- return false;
-+ return NULL;
- } else {
- patstr = fm.patstr;
- }
-@@ -3400,7 +3400,7 @@ js_InitStringClass(JSContext *cx, JSObje
- UndefinedValue(), NULL, NULL,
- JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0,
- NULL)) {
-- return JS_FALSE;
-+ return NULL;
- }
-
- return proto;
-diff -upr a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
---- a/js/src/jstypedarray.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jstypedarray.cpp 2016-02-29 19:08:53.541136191 -0600
-@@ -1334,7 +1334,7 @@ class TypedArrayTemplate
- if (size != 0 && count >= INT32_MAX / size) {
- JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
- JSMSG_NEED_DIET, "size and count");
-- return false;
-+ return NULL;
- }
-
- int32 bytelen = size * count;
-@@ -1668,7 +1668,7 @@ TypedArrayConstruct(JSContext *cx, jsint
-
- default:
- JS_NOT_REACHED("shouldn't have gotten here");
-- return false;
-+ return NULL;
- }
- }
-
-diff -upr a/js/src/jsxml.cpp b/js/src/jsxml.cpp
---- a/js/src/jsxml.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsxml.cpp 2016-02-29 19:17:10.363279731 -0600
-@@ -282,7 +282,7 @@ NewXMLNamespace(JSContext *cx, JSLinearS
-
- obj = NewBuiltinClassInstanceXML(cx, &js_NamespaceClass);
- if (!obj)
-- return JS_FALSE;
-+ return NULL;
- JS_ASSERT(JSVAL_IS_VOID(obj->getNamePrefixVal()));
- JS_ASSERT(JSVAL_IS_VOID(obj->getNameURIVal()));
- JS_ASSERT(JSVAL_IS_VOID(obj->getNamespaceDeclared()));
-@@ -431,7 +431,7 @@ ConvertQNameToString(JSContext *cx, JSOb
- size_t length = str->length();
- jschar *chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar));
- if (!chars)
-- return JS_FALSE;
-+ return NULL;
- *chars = '@';
- const jschar *strChars = str->getChars(cx);
- if (!strChars) {
-diff -upr a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp
---- a/js/src/methodjit/InvokeHelpers.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/methodjit/InvokeHelpers.cpp 2016-02-29 20:34:14.496983346 -0600
-@@ -728,7 +728,7 @@ AtSafePoint(JSContext *cx)
- {
- JSStackFrame *fp = cx->fp();
- if (fp->hasImacropc())
-- return false;
-+ return NULL;
-
- JSScript *script = fp->script();
- return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc);
-diff -upr a/js/src/nanojit/NativeX64.cpp b/js/src/nanojit/NativeX64.cpp
---- a/js/src/nanojit/NativeX64.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/nanojit/NativeX64.cpp 2016-02-29 20:19:56.487934808 -0600
-@@ -1899,7 +1899,7 @@ namespace nanojit
- }
- }
-
-- static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0};
-+ static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {int64_t(0x8000000000000000LL),0};
-
- void Assembler::asm_fneg(LIns *ins) {
- Register rr, ra;
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-ia64-fix.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-ia64-fix.patch
deleted file mode 100644
index bebe5587180f..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-ia64-fix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=589735
-
---- a/js/src/jsgcchunk.cpp 2011-03-31 21:08:36.000000000 +0200
-+++ b/js/src/jsgcchunk.cpp 2012-11-02 10:36:08.324453878 +0100
-@@ -318,15 +318,48 @@
- static void *
- MapPages(void *addr, size_t size)
- {
-+#if defined(__ia64__)
-+ /*
-+ * The JS engine assumes that all allocated pointers have their high 17 bits clear,
-+ * which ia64's mmap doesn't support directly. However, we can emulate it by passing
-+ * mmap an "addr" parameter with those bits clear. The mmap will return that address,
-+ * or the nearest available memory above that address, providing a near-guarantee
-+ * that those bits are clear. If they are not, we return NULL below to indicate
-+ * out-of-memory.
-+ *
-+ * The addr is chosen as 0x0000070000000000, which still allows about 120TB of virtual
-+ * address space.
-+ *
-+ * See Bug 589735 for more information.
-+ */
-+#endif
-+
- /*
- * We don't use MAP_FIXED here, because it can cause the *replacement*
- * of existing mappings, and we only want to create new mappings.
- */
-+#if defined(__ia64__)
-+ void *p = mmap(addr ? addr : (void*)0x0000070000000000,
-+ size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON,
-+ -1, 0);
-+#else
- void *p = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON,
- -1, 0);
-+#endif
- if (p == MAP_FAILED)
- return NULL;
-+#if defined(__ia64__)
-+ /*
-+ * If the caller requested a specific memory location, verify that's what mmap returned.
-+ * Otherwise: If the allocated memory doesn't have its upper 17 bits clear, consider it
-+ * as out of memory.
-+ */
-+ if (addr && p != addr
-+ || !addr && ((long long)p & 0xffff800000000000)) {
-+#else
-+ /* If the caller requested a specific memory location, verify that's what mmap returned. */
- if (addr && p != addr) {
-+#endif
- /* We succeeded in mapping memory, but not in the right place. */
- JS_ALWAYS_TRUE(munmap(p, size) == 0);
- return NULL;
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-ia64-static-strings.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-ia64-static-strings.patch
deleted file mode 100644
index 5cfed32ae68e..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-ia64-static-strings.patch
+++ /dev/null
@@ -1,381 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=589735
-
---- a/js/src/jsatom.cpp 2011-03-31 21:08:36.000000000 +0200
-+++ b/js/src/jsatom.cpp 2012-11-02 10:43:16.970562590 +0100
-@@ -603,11 +603,13 @@
- JSString str, *str2;
- JSAtomState *state;
-
-+#ifdef JS_HAS_STATIC_STRINGS
- if (length == 1) {
- jschar c = *chars;
- if (c < UNIT_STRING_LIMIT)
- return STRING_TO_ATOM(JSString::unitString(c));
- }
-+#endif
-
- str.initFlatNotTerminated((jschar *)chars, length);
- state = &cx->runtime->atomState;
---- a/js/src/jsiter.cpp 2011-03-31 21:08:36.000000000 +0200
-+++ b/js/src/jsiter.cpp 2012-11-02 10:43:16.974562590 +0100
-@@ -1002,9 +1002,12 @@
-
- JSString *str;
- jsint i;
-+#ifdef JS_HAS_STATIC_STRINGS
- if (rval->isInt32() && (jsuint(i = rval->toInt32()) < INT_STRING_LIMIT)) {
- str = JSString::intString(i);
-- } else {
-+ } else
-+#endif
-+ {
- str = js_ValueToString(cx, *rval);
- if (!str)
- return false;
---- a/js/src/jsnum.cpp 2011-03-31 21:08:36.000000000 +0200
-+++ b/js/src/jsnum.cpp 2012-11-02 10:43:16.982562589 +0100
-@@ -605,8 +605,10 @@
- {
- uint32 ui;
- if (si >= 0) {
-+#ifdef JS_HAS_STATIC_STRINGS
- if (si < INT_STRING_LIMIT)
- return JSString::intString(si);
-+#endif
- ui = si;
- } else {
- ui = uint32(-si);
-@@ -1169,6 +1171,7 @@
-
- int32_t i;
- if (JSDOUBLE_IS_INT32(d, &i)) {
-+#ifdef JS_HAS_STATIC_STRINGS
- if (base == 10 && jsuint(i) < INT_STRING_LIMIT)
- return JSString::intString(i);
- if (jsuint(i) < jsuint(base)) {
-@@ -1176,6 +1179,7 @@
- return JSString::intString(i);
- return JSString::unitString(jschar('a' + i - 10));
- }
-+#endif
-
- if (JSString *str = c->dtoaCache.lookup(base, d))
- return str;
---- a/js/src/jsstr.cpp 2011-03-31 21:08:36.000000000 +0200
-+++ b/js/src/jsstr.cpp 2012-11-02 10:43:16.990562588 +0100
-@@ -3121,6 +3121,8 @@
- JS_FS_END
- };
-
-+#ifdef JS_HAS_STATIC_STRINGS
-+
- /*
- * Set up some tools to make it easier to generate large tables. After constant
- * folding, for each n, Rn(0) is the comma-separated list R(0), R(1), ..., R(2^n-1).
-@@ -3291,6 +3293,8 @@
- #undef R3
- #undef R7
-
-+#endif /* defined(JS_HAS_STATIC_STRINGS) */
-+
- JSBool
- js_String(JSContext *cx, uintN argc, Value *vp)
- {
-@@ -3331,6 +3335,7 @@
- uint16_t code;
- if (!ValueToUint16(cx, argv[0], &code))
- return JS_FALSE;
-+#ifdef JS_HAS_STATIC_STRINGS
- if (code < UNIT_STRING_LIMIT) {
- str = JSString::unitString(code);
- if (!str)
-@@ -3338,6 +3343,7 @@
- vp->setString(str);
- return JS_TRUE;
- }
-+#endif
- argv[0].setInt32(code);
- }
- chars = (jschar *) cx->malloc((argc + 1) * sizeof(jschar));
-@@ -3367,8 +3373,10 @@
- {
- JS_ASSERT(JS_ON_TRACE(cx));
- jschar c = (jschar)i;
-+#ifdef JS_HAS_STATIC_STRINGS
- if (c < UNIT_STRING_LIMIT)
- return JSString::unitString(c);
-+#endif
- return js_NewStringCopyN(cx, &c, 1);
- }
- #endif
---- a/js/src/jsstr.h 2011-03-31 21:08:36.000000000 +0200
-+++ b/js/src/jsstr.h 2012-11-02 10:43:16.998562587 +0100
-@@ -57,6 +57,15 @@
- #include "jsvalue.h"
- #include "jscell.h"
-
-+#if !defined(__ia64__)
-+/*
-+ * Don't use static strings on ia64 since the compiler may put the static
-+ * memory out of the acceptable 47-bit jsval pointer range.
-+ */
-+# define JS_HAS_STATIC_STRINGS
-+#endif
-+
-+#ifdef JS_HAS_STATIC_STRINGS
- enum {
- UNIT_STRING_LIMIT = 256U,
- SMALL_CHAR_LIMIT = 128U, /* Bigger chars cannot be in a length-2 string. */
-@@ -64,6 +73,7 @@
- INT_STRING_LIMIT = 256U,
- NUM_HUNDRED_STRINGS = 156U
- };
-+#endif
-
- extern jschar *
- js_GetDependentStringChars(JSString *str);
-@@ -380,10 +390,15 @@
- typedef uint8 SmallChar;
-
- static inline bool fitsInSmallChar(jschar c) {
-+#ifdef JS_HAS_STATIC_STRINGS
- return c < SMALL_CHAR_LIMIT && toSmallChar[c] != INVALID_SMALL_CHAR;
-+#else
-+ return false;
-+#endif
- }
-
- static inline bool isUnitString(void *ptr) {
-+#ifdef JS_HAS_STATIC_STRINGS
- jsuword delta = reinterpret_cast(ptr) -
- reinterpret_cast(unitStringTable);
- if (delta >= UNIT_STRING_LIMIT * sizeof(JSString))
-@@ -392,9 +407,13 @@
- /* If ptr points inside the static array, it must be well-aligned. */
- JS_ASSERT(delta % sizeof(JSString) == 0);
- return true;
-+#else
-+ return false;
-+#endif
- }
-
- static inline bool isLength2String(void *ptr) {
-+#ifdef JS_HAS_STATIC_STRINGS
- jsuword delta = reinterpret_cast(ptr) -
- reinterpret_cast(length2StringTable);
- if (delta >= NUM_SMALL_CHARS * NUM_SMALL_CHARS * sizeof(JSString))
-@@ -403,9 +422,13 @@
- /* If ptr points inside the static array, it must be well-aligned. */
- JS_ASSERT(delta % sizeof(JSString) == 0);
- return true;
-+#else
-+ return false;
-+#endif
- }
-
- static inline bool isHundredString(void *ptr) {
-+#ifdef JS_HAS_STATIC_STRINGS
- jsuword delta = reinterpret_cast(ptr) -
- reinterpret_cast(hundredStringTable);
- if (delta >= NUM_HUNDRED_STRINGS * sizeof(JSString))
-@@ -414,6 +437,9 @@
- /* If ptr points inside the static array, it must be well-aligned. */
- JS_ASSERT(delta % sizeof(JSString) == 0);
- return true;
-+#else
-+ return false;
-+#endif
- }
-
- static inline bool isStatic(void *ptr) {
-@@ -424,6 +450,7 @@
- #pragma align 8 (__1cIJSStringPunitStringTable_, __1cIJSStringSlength2StringTable_, __1cIJSStringShundredStringTable_)
- #endif
-
-+#ifdef JS_HAS_STATIC_STRINGS
- static const SmallChar INVALID_SMALL_CHAR = -1;
-
- static const jschar fromSmallChar[];
-@@ -436,6 +463,7 @@
- * strings, we keep a table to map from integer to the correct string.
- */
- static const JSString *const intStringTable[];
-+#endif
-
- static JSFlatString *unitString(jschar c);
- static JSLinearString *getUnitString(JSContext *cx, JSString *str, size_t index);
---- a/js/src/jsstrinlines.h 2011-03-31 21:08:36.000000000 +0200
-+++ b/js/src/jsstrinlines.h 2012-11-02 10:43:17.010562586 +0100
-@@ -215,52 +215,75 @@
- inline JSFlatString *
- JSString::unitString(jschar c)
- {
-+#ifdef JS_HAS_STATIC_STRINGS
- JS_ASSERT(c < UNIT_STRING_LIMIT);
- return const_cast(&unitStringTable[c])->assertIsFlat();
-+#else
-+ JS_NOT_REACHED("no static strings");
-+ return NULL;
-+#endif
- }
-
- inline JSLinearString *
- JSString::getUnitString(JSContext *cx, JSString *str, size_t index)
- {
- JS_ASSERT(index < str->length());
-+#ifdef JS_HAS_STATIC_STRINGS
- const jschar *chars = str->getChars(cx);
- if (!chars)
- return NULL;
- jschar c = chars[index];
- if (c < UNIT_STRING_LIMIT)
- return unitString(c);
-+#endif
- return js_NewDependentString(cx, str, index, 1);
- }
-
- inline JSFlatString *
- JSString::length2String(jschar c1, jschar c2)
- {
-+#ifdef JS_HAS_STATIC_STRINGS
- JS_ASSERT(fitsInSmallChar(c1));
- JS_ASSERT(fitsInSmallChar(c2));
- return const_cast (
- &length2StringTable[(((size_t)toSmallChar[c1]) << 6) + toSmallChar[c2]]
- )->assertIsFlat();
-+#else
-+ JS_NOT_REACHED("no static strings");
-+ return NULL;
-+#endif
- }
-
- inline JSFlatString *
- JSString::length2String(uint32 i)
- {
-+#ifdef JS_HAS_STATIC_STRINGS
- JS_ASSERT(i < 100);
- return length2String('0' + i / 10, '0' + i % 10);
-+#else
-+ JS_NOT_REACHED("no static strings");
-+ return NULL;
-+#endif
- }
-
- inline JSFlatString *
- JSString::intString(jsint i)
- {
-+#ifdef JS_HAS_STATIC_STRINGS
- jsuint u = jsuint(i);
- JS_ASSERT(u < INT_STRING_LIMIT);
- return const_cast(JSString::intStringTable[u])->assertIsFlat();
-+#else
-+ JS_NOT_REACHED("no static strings");
-+ return NULL;
-+#endif
- }
-
- /* Get a static atomized string for chars if possible. */
- inline JSFlatString *
- JSString::lookupStaticString(const jschar *chars, size_t length)
- {
-+#ifdef JS_HAS_STATIC_STRINGS
- if (length == 1) {
- if (chars[0] < UNIT_STRING_LIMIT)
- return unitString(chars[0]);
-@@ -290,6 +313,7 @@
- return intString(i);
- }
- }
-+#endif
-
- return NULL;
- }
---- a/js/src/jstracer.cpp 2011-03-31 21:08:36.000000000 +0200
-+++ b/js/src/jstracer.cpp 2012-11-02 10:43:17.022562584 +0100
-@@ -11505,6 +11505,7 @@
- }
- if (vp[1].isString()) {
- JSString *str = vp[1].toString();
-+#ifdef JS_HAS_STATIC_STRINGS
- if (native == js_str_charAt) {
- jsdouble i = vp[2].toNumber();
- if (JSDOUBLE_IS_NaN(i))
-@@ -11518,7 +11519,9 @@
- set(&vp[0], char_ins);
- pendingSpecializedNative = IGNORE_NATIVE_CALL_COMPLETE_CALLBACK;
- return RECORD_CONTINUE;
-- } else if (native == js_str_charCodeAt) {
-+ } else
-+#endif
-+ if (native == js_str_charCodeAt) {
- jsdouble i = vp[2].toNumber();
- if (JSDOUBLE_IS_NaN(i))
- i = 0;
-@@ -12967,6 +12970,7 @@
- JS_STATIC_ASSERT(sizeof(JSString) == 16 || sizeof(JSString) == 32);
-
-
-+#ifdef JS_HAS_STATIC_STRINGS
- JS_REQUIRES_STACK LIns*
- TraceRecorder::getUnitString(LIns* str_ins, LIns* idx_ins)
- {
-@@ -13010,6 +13014,7 @@
- }
- return RECORD_CONTINUE;
- }
-+#endif
-
- // Typed array tracing depends on EXPANDED_LOADSTORE and F2I
- #if NJ_EXPANDED_LOADSTORE_SUPPORTED && NJ_F2I_SUPPORTED
-@@ -13044,6 +13049,7 @@
- LIns* obj_ins = get(&lval);
- LIns* idx_ins = get(&idx);
-
-+#ifdef JS_HAS_STATIC_STRINGS
- // Special case for array-like access of strings.
- if (lval.isString() && hasInt32Repr(idx)) {
- if (call)
-@@ -13056,6 +13062,7 @@
- set(&lval, char_ins);
- return ARECORD_CONTINUE;
- }
-+#endif
-
- if (lval.isPrimitive())
- RETURN_STOP_A("JSOP_GETLEM on a primitive");
---- a/js/src/jstracer.h 2011-03-31 21:08:36.000000000 +0200
-+++ b/js/src/jstracer.h 2012-11-02 10:43:17.034562582 +0100
-@@ -1394,10 +1394,12 @@
- JS_REQUIRES_STACK RecordingStatus getCharCodeAt(JSString *str,
- nanojit::LIns* str_ins, nanojit::LIns* idx_ins,
- nanojit::LIns** out_ins);
-+#ifdef JS_HAS_STATIC_STRINGS
- JS_REQUIRES_STACK nanojit::LIns* getUnitString(nanojit::LIns* str_ins, nanojit::LIns* idx_ins);
- JS_REQUIRES_STACK RecordingStatus getCharAt(JSString *str,
- nanojit::LIns* str_ins, nanojit::LIns* idx_ins,
- JSOp mode, nanojit::LIns** out_ins);
-+#endif
-
- JS_REQUIRES_STACK RecordingStatus initOrSetPropertyByName(nanojit::LIns* obj_ins,
- Value* idvalp, Value* rvalp,
---- a/js/src/tracejit/Writer.cpp 2011-03-31 21:08:36.000000000 +0200
-+++ b/js/src/tracejit/Writer.cpp 2012-11-02 10:43:17.038562582 +0100
-@@ -246,7 +246,9 @@
- // ins = andq ins_oprnd1, ins_oprnd2
- ret = true;
- #endif
-- } else if (ins->isop(LIR_addp) &&
-+ }
-+#ifdef JS_HAS_STATIC_STRINGS
-+ else if (ins->isop(LIR_addp) &&
- ((ins->oprnd1()->isImmP() &&
- (void *)ins->oprnd1()->immP() == JSString::unitStringTable) ||
- (ins->oprnd2()->isImmP() &&
-@@ -258,6 +260,7 @@
- // ins = addp JSString::unitStringTable, ...
- ret = true;
- }
-+#endif
-
- return ret;
- }
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-isfinite.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-isfinite.patch
deleted file mode 100644
index edf4d01e64bd..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-isfinite.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- js/src/jsnum.h 2011-03-03 05:43:06.000000000 -0500
-+++ js/src/jsnum.h.new 2012-08-16 14:58:04.000000000 -0400
-@@ -97,6 +97,8 @@
- {
- #ifdef WIN32
- return _finite(d);
-+#elif defined(__UCLIBC__)
-+ return isfinite(d);
- #else
- return finite(d);
- #endif
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch
deleted file mode 100644
index 66475b6c34c4..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/js/src/configure.in 2012-11-01 19:42:20.130330321 +0100
-+++ b/js/src/configure.in 2012-11-01 20:34:03.561351492 +0100
-@@ -3477,7 +3477,16 @@
- esac
-
- dnl Performance measurement headers.
--AC_CHECK_HEADER(linux/perf_event.h, HAVE_LINUX_PERF_EVENT_H=1)
-+AC_CHECK_HEADER(linux/perf_event.h,
-+ [AC_CACHE_CHECK(for perf_event_open system call,ac_cv_perf_event_open,
-+ [AC_TRY_COMPILE([#include ],[return sizeof(__NR_perf_event_open);],
-+ ac_cv_perf_event_open=yes,
-+ ac_cv_perf_event_open=no)])])
-+if test "$ac_cv_perf_event_open" = "yes"; then
-+ HAVE_LINUX_PERF_EVENT_H=1
-+else
-+ HAVE_LINUX_PERF_EVENT_H=
-+fi
- AC_SUBST(HAVE_LINUX_PERF_EVENT_H)
-
- dnl Checks for libraries.
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch
deleted file mode 100644
index 460394d33f13..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur js/src/configure.in js.new/src/configure.in
---- a/js/src/symverscript.in 2012-11-07 09:36:16.000000000 -0500
-+++ b/js/src/symverscript.in 2012-11-07 09:37:05.000000000 -0500
-@@ -0,0 +1,4 @@
-+mozjs185 {
-+ global: *;
-+};
-+
-diff -Naur js/src/Makefile.in js.new/src/Makefile.in
---- a/js/src/Makefile.in 2012-11-07 09:36:16.000000000 -0500
-+++ b/js/src/Makefile.in 2012-11-07 09:37:09.000000000 -0500
-@@ -837,7 +837,10 @@
- mozjs185.pc \
- $(NULL)
-
--GARBAGE += $(pkg_config_files)
-+symverscript: symverscript.in
-+ cat $< > $@
-+
-+GARBAGE += $(pkg_config_files) symverscript
-
- %.pc: $(srcdir)/%.pc.in Makefile
- cat $< | sed \
-@@ -872,6 +875,8 @@
- SHLIB_ABI_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION)
- SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION)
- $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER))
-+$(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
-+$(SHARED_LIBRARY): symverscript
- endif
- endif
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-freebsd-pthreads.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-freebsd-pthreads.patch
deleted file mode 100644
index 4324df0d6093..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-freebsd-pthreads.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/js/src/config/system-headers
-+++ b/js/src/config/system-headers
-@@ -595,6 +595,7 @@ proto/exec.h
- psap.h
- Pt.h
- pthread.h
-+pthread_np.h
- pwd.h
- Python.h
- QDOffscreen.h
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-x32.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-x32.patch
deleted file mode 100644
index f14a269ee3fc..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-x32.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/js/src/jslock.cpp 2012-04-06 16:24:51.000000000 -0500
-+++ b/js/src/jslock.cpp 2012-06-21 20:57:00.877937542 -0500
-@@ -150,17 +150,22 @@
-
- static JS_ALWAYS_INLINE int
- NativeCompareAndSwap(volatile jsword *w, jsword ov, jsword nv)
- {
- unsigned int res;
-
- __asm__ __volatile__ (
- "lock\n"
-+/* GCC's x32 abi support */
-+#if defined(__LP64__)
- "cmpxchgq %2, (%1)\n"
-+#else
-+ "cmpxchg %2, (%1)\n"
-+#endif
- "sete %%al\n"
- "movzbl %%al, %%eax\n"
- : "=a" (res)
- : "r" (w), "r" (nv), "a" (ov)
- : "cc", "memory");
- return (int)res;
- }
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-17-clang.patch b/dev-lang/spidermonkey/files/spidermonkey-17-clang.patch
deleted file mode 100644
index 062bd06b7772..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-17-clang.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix compilation of spidermonkey-17 with clang
-
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=458142
-Upstream-Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=887645
-
-b/js/src/js-config.in
---- a/js/src/jsinterp.cpp 2016-06-03 00:08:04.376312080 -0500
-+++ b/js/src/jsinterp.cpp 2016-06-03 00:12:17.740329180 -0500
-@@ -3664,7 +3664,9 @@
- BEGIN_CASE(JSOP_LEAVEFORLETIN)
- BEGIN_CASE(JSOP_LEAVEBLOCKEXPR)
- {
-+ #ifdef DEBUG
- DebugOnly blockDepth = regs.fp()->blockChain().stackDepth();
-+ #endif
-
- regs.fp()->popBlock(cx);
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-17-fix_pointer_dereference.patch b/dev-lang/spidermonkey/files/spidermonkey-17-fix_pointer_dereference.patch
deleted file mode 100644
index da6a49f637cd..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-17-fix_pointer_dereference.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User Mike Hommey
-# Date 1373958382 -32400
-# Tue Jul 16 16:06:22 2013 +0900
-# Node ID 1880537f26d2ce22866974a8cdf1927dc66f6dbc
-# Parent 673ea5cd6ba7fc37086d1dab71ee4a6d6a77a1ab
-Bug 894240 - Fix pointer dereference in js::cli::OptionParser::extractValue
-
-diff --git a/js/src/shell/jsoptparse.cpp b/js/src/shell/jsoptparse.cpp
---- a/js/src/shell/jsoptparse.cpp
-+++ b/js/src/shell/jsoptparse.cpp
-@@ -248,17 +248,17 @@ OptionParser::printHelp(const char *prog
-
- OptionParser::Result
- OptionParser::extractValue(size_t argc, char **argv, size_t *i, char **value)
- {
- JS_ASSERT(*i < argc);
- char *eq = strchr(argv[*i], '=');
- if (eq) {
- *value = eq + 1;
-- if (value[0] == '\0')
-+ if (*value[0] == '\0')
- return error("A value is required for option %.*s", eq - argv[*i], argv[*i]);
- return Okay;
- }
-
- if (argc == *i + 1)
- return error("Expected a value for option %s", argv[*i]);
-
- *i += 1;
diff --git a/dev-lang/spidermonkey/files/spidermonkey-17-ia64-mmap.patch b/dev-lang/spidermonkey/files/spidermonkey-17-ia64-mmap.patch
deleted file mode 100644
index 7adbd118d408..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-17-ia64-mmap.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/js/src/gc/Memory.cpp 2013-02-11 17:33:22.000000000 -0500
-+++ b/js/src/gc/Memory.cpp 2014-01-08 12:36:29.406851422 -0500
-@@ -302,10 +302,46 @@
- void
- InitMemorySubsystem()
- {
-+#if !defined(__ia64__)
- if (size_t(sysconf(_SC_PAGESIZE)) != PageSize)
- MOZ_CRASH();
-+#endif
- }
-
-+static inline void *
-+MapMemory(size_t length, int prot, int flags, int fd, off_t offset)
-+{
-+#if defined(__ia64__)
-+ /*
-+ * The JS engine assumes that all allocated pointers have their high 17 bits clear,
-+ * which ia64's mmap doesn't support directly. However, we can emulate it by passing
-+ * mmap an "addr" parameter with those bits clear. The mmap will return that address,
-+ * or the nearest available memory above that address, providing a near-guarantee
-+ * that those bits are clear. If they are not, we return NULL below to indicate
-+ * out-of-memory.
-+ *
-+ * The addr is chosen as 0x0000070000000000, which still allows about 120TB of virtual
-+ * address space.
-+ *
-+ * See Bug 589735 for more information.
-+ */
-+ void *region = mmap((void*)0x0000070000000000, length, prot, flags, fd, offset);
-+ if (region == MAP_FAILED)
-+ return MAP_FAILED;
-+ /*
-+ * If the allocated memory doesn't have its upper 17 bits clear, consider it
-+ * as out of memory.
-+ */
-+ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) {
-+ JS_ALWAYS_TRUE(0 == munmap(region, length));
-+ return MAP_FAILED;
-+ }
-+ return region;
-+#else
-+ return mmap(NULL, length, prot, flags, fd, offset);
-+#endif
-+}
-+
- void *
- MapAlignedPages(size_t size, size_t alignment)
- {
-@@ -319,12 +353,15 @@
-
- /* Special case: If we want page alignment, no further work is needed. */
- if (alignment == PageSize) {
-- return mmap(NULL, size, prot, flags, -1, 0);
-+ void *region = MapMemory(size, prot, flags, -1, 0);
-+ if (region == MAP_FAILED)
-+ return NULL;
-+ return region;
- }
-
- /* Overallocate and unmap the region's edges. */
- size_t reqSize = Min(size + 2 * alignment, 2 * size);
-- void *region = mmap(NULL, reqSize, prot, flags, -1, 0);
-+ void *region = MapMemory(reqSize, prot, flags, -1, 0);
- if (region == MAP_FAILED)
- return NULL;
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-17-js-config-shebang.patch b/dev-lang/spidermonkey/files/spidermonkey-17-js-config-shebang.patch
deleted file mode 100644
index ec77b2368289..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-17-js-config-shebang.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/js/src/js-config.in 2013-03-25 16:34:20.000000000 -0400
-+++ b/js/src/js-config.in 2013-08-09 22:15:29.000901763 -0400
-@@ -2,7 +2,7 @@
- # This Source Code Form is subject to the terms of the Mozilla Public
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
--#filter substitution
-+%filter substitution
-
- prefix='@prefix@'
- mozilla_version='@MOZILLA_VERSION@'
---- a/js/src/Makefile.in 2013-03-25 16:34:20.000000000 -0400
-+++ b/js/src/Makefile.in 2013-08-09 22:17:20.211903793 -0400
-@@ -778,7 +778,7 @@
-
- $(JS_CONFIG_NAME): js-config.in Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk $(topsrcdir)/config/rules.mk
- $(RM) $@.tmp
-- $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(JS_CONFIG_SUBSTITUTIONS) $< > $@.tmp \
-+ $(PYTHON) $(topsrcdir)/config/Preprocessor.py --marker="%" $(JS_CONFIG_SUBSTITUTIONS) $< > $@.tmp \
- && mv $@.tmp $@ && chmod +x $@
-
- SCRIPTS = $(JS_CONFIG_NAME)
diff --git a/dev-lang/spidermonkey/files/spidermonkey-17.0.0-fix-file-permissions.patch b/dev-lang/spidermonkey/files/spidermonkey-17.0.0-fix-file-permissions.patch
deleted file mode 100644
index f4eee9305425..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-17.0.0-fix-file-permissions.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -urN a/js/src/Makefile.in b/js/src/Makefile.in
---- a/js/src/Makefile.in 2013-03-25 15:34:20.000000000 -0500
-+++ b/js/src/Makefile.in 2014-03-08 08:26:36.726979744 -0600
-@@ -788,7 +788,7 @@
- $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(JS_CONFIG_SUBSTITUTIONS) $< > $@
-
- install:: $(LIBRARY_NAME).pc
-- $(SYSINSTALL) $^ $(DESTDIR)$(libdir)/pkgconfig
-+ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(libdir)/pkgconfig
-
- ######################################################
- # BEGIN SpiderMonkey header installation
-@@ -836,19 +836,19 @@
- #
-
- install:: $(INSTALLED_HEADERS)
-- $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)
-+ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(includedir)/$(MODULE)
-
- install:: $(EXPORTS_ds)
-- $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)/ds
-+ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(includedir)/$(MODULE)/ds
-
- install:: $(EXPORTS_gc)
-- $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)/gc
-+ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(includedir)/$(MODULE)/gc
-
- install:: $(EXPORTS_js)
-- $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)/js
-+ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(includedir)/$(MODULE)/js
-
- install:: $(EXPORTS_mozilla)
-- $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)/mozilla
-+ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(includedir)/$(MODULE)/mozilla
-
- #
- # END SpiderMonkey header installation
diff --git a/dev-lang/spidermonkey/files/spidermonkey-24-system-icu.patch b/dev-lang/spidermonkey/files/spidermonkey-24-system-icu.patch
deleted file mode 100644
index 59ba0c958ea3..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-24-system-icu.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff --git a/js/src/Makefile.in b/js/src/Makefile.in
-index 4944d31..4176e14 100644
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -237,12 +237,17 @@ endif
- # ICU headers need to be available whether we build with the complete
- # Internationalization API or not - ICU stubs rely on them.
-
-+ifdef MOZ_NATIVE_ICU
-+LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
-+else
- LOCAL_INCLUDES += \
- -I$(topsrcdir)/../../intl/icu/source/common \
- -I$(topsrcdir)/../../intl/icu/source/i18n \
- $(NULL)
-+endif
-
- ifdef ENABLE_INTL_API
-+ifndef MOZ_NATIVE_ICU
-
- ifeq ($(OS_ARCH),WINNT)
- # Parallel gmake is buggy on Windows
-@@ -271,6 +276,7 @@ distclean clean::
- $(call SUBMAKE,$@,intl/icu)
-
- endif
-+endif
-
- #
- # END ECMAScript Internationalization API
-@@ -403,7 +409,11 @@ ifneq (,$(MOZ_ZLIB_LIBS)$(MOZ_GLUE_LDFLAGS))
- DEFINES += -DUSE_ZLIB
- endif
-
--SHARED_LIBRARY_LIBS += $(ICU_LIBS)
-+ifdef MOZ_NATIVE_ICU
-+EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS)
-+else
-+SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS)
-+endif
-
- # Prevent floating point errors caused by VC++ optimizations
- ifdef _MSC_VER
-diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in
-index 5f60d15..e1fe1f8 100644
---- a/js/src/config/Makefile.in
-+++ b/js/src/config/Makefile.in
-@@ -59,6 +59,7 @@ export:: \
- $(call mkdir_deps,system_wrappers_js) \
- $(NULL)
- $(PYTHON) $(srcdir)/Preprocessor.py $(DEFINES) $(ACDEFINES) \
-+ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
- $(srcdir)/system-headers | $(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers_js
- $(INSTALL) system_wrappers_js $(DIST)
-
-diff --git a/js/src/config/system-headers b/js/src/config/system-headers
-index b52aed6..1ca7420 100644
---- a/js/src/config/system-headers
-+++ b/js/src/config/system-headers
-@@ -1132,3 +1132,14 @@ kvm.h
- spawn.h
- err.h
- xlocale.h
-+#if MOZ_NATIVE_ICU==1
-+unicode/locid.h
-+unicode/numsys.h
-+unicode/ucal.h
-+unicode/ucol.h
-+unicode/udat.h
-+unicode/udatpg.h
-+unicode/uenum.h
-+unicode/unum.h
-+unicode/ustring.h
-+#endif
-diff --git a/js/src/configure.in b/js/src/configure.in
-index 4bccbe3..d535491 100644
---- a/js/src/configure.in
-+++ b/js/src/configure.in
-@@ -4409,6 +4409,16 @@ fi
- dnl ========================================================
- dnl ECMAScript Internationalization API Support (uses ICU)
- dnl ========================================================
-+ICU_LIB_NAMES=
-+MOZ_NATIVE_ICU=
-+MOZ_ARG_WITH_BOOL(system-icu,
-+[ --with-system-icu
-+ Use system icu (located with pkgconfig)],
-+ MOZ_NATIVE_ICU=1)
-+
-+if test -n "$MOZ_NATIVE_ICU"; then
-+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
-+fi
-
- if test -n "$JS_STANDALONE"; then
- ENABLE_INTL_API=1
-@@ -4421,37 +4431,34 @@ MOZ_ARG_ENABLE_BOOL(intl-api,
- dnl Settings for the implementation of the ECMAScript Internationalization API
- if test -n "$ENABLE_INTL_API"; then
- AC_DEFINE(ENABLE_INTL_API)
-- # We build ICU as a static library.
-- AC_DEFINE(U_STATIC_IMPLEMENTATION)
--
-- case "$OS_TARGET" in
-- WINNT)
-- ICU_LIB_NAMES="icuin icuuc icudt"
-- ;;
-- Darwin|Linux)
-- ICU_LIB_NAMES="icui18n icuuc icudata"
-- ;;
-- *)
-- AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform])
-- esac
--
-- ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)'
--else
-- ICU_LIB_NAMES=
-- ICU_LIBS=
-+ if test -z "$MOZ_NATIVE_ICU"; then
-+ case "$OS_TARGET" in
-+ WINNT)
-+ ICU_LIB_NAMES="icuin icuuc icudt"
-+ ;;
-+ Darwin|Linux|DragonFly|FreeBSD|NetBSD|OpenBSD)
-+ ICU_LIB_NAMES="icui18n icuuc icudata"
-+ ;;
-+ *)
-+ AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform])
-+ esac
-+ MOZ_ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)'
-+ fi
- fi
-
- AC_SUBST(ENABLE_INTL_API)
- AC_SUBST(ICU_LIB_NAMES)
--AC_SUBST(ICU_LIBS)
--
--dnl Source files that use ICU should have control over which parts of the ICU
--dnl namespace they want to use.
--AC_DEFINE(U_USING_ICU_NAMESPACE,0)
--
-+AC_SUBST(MOZ_ICU_LIBS)
-+AC_SUBST(MOZ_NATIVE_ICU)
-
- dnl Settings for ICU
--if test -n "$ENABLE_INTL_API" ; then
-+if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then
-+ dnl We build ICU as a static library.
-+ AC_DEFINE(U_STATIC_IMPLEMENTATION)
-+
-+ dnl Source files that use ICU should have control over which parts of the ICU
-+ dnl namespace they want to use.
-+ AC_DEFINE(U_USING_ICU_NAMESPACE,0)
- # Set ICU compile options
- ICU_CPPFLAGS=""
- # don't use icu namespace automatically in client code
-diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in
-index 288934a..a582dfe 100644
---- a/js/src/gdb/Makefile.in
-+++ b/js/src/gdb/Makefile.in
-@@ -19,6 +19,10 @@ LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIB
-
- LOCAL_INCLUDES += -I$(topsrcdir) -I..
-
-+ifdef MOZ_NATIVE_ICU
-+EXTRA_LIBS += $(MOZ_ICU_LIBS)
-+endif
-+
- EXTRA_LIBS += $(MOZ_FFI_LIBS)
-
- # Place a GDB Python auto-load file next to the gdb-tests executable, both
-diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
-index 5f7d594..10d7054 100644
---- a/js/src/jsapi-tests/Makefile.in
-+++ b/js/src/jsapi-tests/Makefile.in
-@@ -20,6 +20,10 @@ LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLI
-
- LOCAL_INCLUDES += -I$(topsrcdir) -I..
-
-+ifdef MOZ_NATIVE_ICU
-+EXTRA_LIBS += $(MOZ_ICU_LIBS)
-+endif
-+
- EXTRA_LIBS += $(MOZ_FFI_LIBS)
-
- ifdef QEMU_EXE
-diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in
-index 2e1df09..db66c69 100644
---- a/js/src/shell/Makefile.in
-+++ b/js/src/shell/Makefile.in
-@@ -27,6 +27,9 @@ LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_
- ifdef MOZ_NATIVE_FFI
- EXTRA_LIBS += $(MOZ_FFI_LIBS)
- endif
-+ifdef MOZ_NATIVE_ICU
-+EXTRA_LIBS += $(MOZ_ICU_LIBS)
-+endif
-
- LOCAL_INCLUDES += -I$(topsrcdir) -I..
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-24-upward-growing-stack.patch b/dev-lang/spidermonkey/files/spidermonkey-24-upward-growing-stack.patch
deleted file mode 100644
index 70963627bcc5..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-24-upward-growing-stack.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur mozjs-24.2.0/js/src/gc/RootMarking.cpp mozjs-24.2.0.new/js/src/gc/RootMarking.cpp
---- mozjs-24.2.0/js/src/gc/RootMarking.cpp 2013-10-29 16:40:26.000000000 -0400
-+++ mozjs-24.2.0.new/js/src/gc/RootMarking.cpp 2014-05-05 16:16:15.570098309 -0400
-@@ -320,7 +320,7 @@
-
- uintptr_t *stackMin, *stackEnd;
- #if JS_STACK_GROWTH_DIRECTION > 0
-- stackMin = rt->nativeStackBase;
-+ stackMin = reinterpret_cast(rt->nativeStackBase);
- stackEnd = cgcd->nativeStackTop;
- #else
- stackMin = cgcd->nativeStackTop + 1;
-diff -Naur mozjs-24.2.0/js/src/jsapi.cpp mozjs-24.2.0.new/js/src/jsapi.cpp
---- mozjs-24.2.0/js/src/jsapi.cpp 2013-12-06 17:52:35.000000000 -0500
-+++ mozjs-24.2.0.new/js/src/jsapi.cpp 2014-05-05 16:17:01.330099145 -0400
-@@ -863,10 +863,6 @@
-
- PodZero(&debugHooks);
- PodZero(&atomState);
--
--#if JS_STACK_GROWTH_DIRECTION > 0
-- nativeStackLimit = UINTPTR_MAX;
--#endif
- }
-
- bool
-diff -Naur mozjs-24.2.0/js/src/jsfriendapi.cpp mozjs-24.2.0.new/js/src/jsfriendapi.cpp
---- mozjs-24.2.0/js/src/jsfriendapi.cpp 2013-10-29 16:40:20.000000000 -0400
-+++ mozjs-24.2.0.new/js/src/jsfriendapi.cpp 2014-05-05 16:18:30.350100769 -0400
-@@ -32,7 +32,11 @@
- PerThreadDataFriendFields::RuntimeMainThreadOffset);
-
- PerThreadDataFriendFields::PerThreadDataFriendFields()
-+#if JS_STACK_GROWTH_DIRECTION > 0
-+ : nativeStackLimit(UINTPTR_MAX)
-+#else
- : nativeStackLimit(0)
-+#endif
- {
- #if defined(JSGC_ROOT_ANALYSIS) || defined(JSGC_USE_EXACT_ROOTING)
- PodArrayZero(thingGCRooters);
diff --git a/dev-lang/spidermonkey/files/spidermonkey-24.2.0-fix-file-permissions.patch b/dev-lang/spidermonkey/files/spidermonkey-24.2.0-fix-file-permissions.patch
deleted file mode 100644
index a2247164111a..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-24.2.0-fix-file-permissions.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN a/js/src/Makefile.in b/js/src/Makefile.in
---- a/js/src/Makefile.in 2013-11-19 13:42:43.000000000 -0600
-+++ b/js/src/Makefile.in 2014-03-08 08:07:28.331006149 -0600
-@@ -542,7 +542,7 @@
- $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(JS_CONFIG_SUBSTITUTIONS) $< > $@
-
- install:: $(LIBRARY_NAME).pc
-- $(SYSINSTALL) $^ $(DESTDIR)$(libdir)/pkgconfig
-+ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(libdir)/pkgconfig
-
- ######################################################
- # BEGIN SpiderMonkey header installation
-@@ -569,13 +569,13 @@
- #
-
- install:: $(EXPORTS)
-- $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(LIBRARY_NAME)
-+ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(includedir)/$(LIBRARY_NAME)
-
- install:: $(EXPORTS_js)
-- $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(LIBRARY_NAME)/js
-+ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(includedir)/$(LIBRARY_NAME)/js
-
- install:: $(EXPORTS_mozilla)
-- $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(LIBRARY_NAME)/mozilla
-+ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(includedir)/$(LIBRARY_NAME)/mozilla
-
- #
- # END SpiderMonkey header installation
diff --git a/dev-lang/spidermonkey/files/spidermonkey-38-jsapi-tests.patch b/dev-lang/spidermonkey/files/spidermonkey-38-jsapi-tests.patch
deleted file mode 100644
index 8b023fd31807..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-38-jsapi-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/js/src/jsapi-tests/testPreserveJitCode.cpp 2015-09-17 16:12:22.000000000 -0400
-+++ b/js/src/jsapi-tests/testPreserveJitCode.cpp 2017-02-27 16:30:28.899191525 -0500
-@@ -16,8 +16,12 @@
-
- BEGIN_TEST(test_PreserveJitCode)
- {
-+#ifndef JS_CODEGEN_NONE
- CHECK(testPreserveJitCode(false, 0));
- CHECK(testPreserveJitCode(true, 1));
-+#else
-+ printf("*JIT is disabled, therefore CANNOT preserve jit code - skipping.\n");
-+#endif
- return true;
- }
-
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-45-dont-symlink-non-objfiles.patch b/dev-lang/spidermonkey/files/spidermonkey-45-dont-symlink-non-objfiles.patch
deleted file mode 100644
index 061e8a572db3..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-45-dont-symlink-non-objfiles.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/python/mozbuild/mozbuild/backend/recursivemake.py 2016-04-14 13:55:21.000000000 -0400
-+++ b/python/mozbuild/mozbuild/backend/recursivemake.py 2017-02-28 14:43:09.431448016 -0500
-@@ -1301,17 +1301,17 @@
-
- for path, files in files.walk():
- target_var = (mozpath.join(target, path)
- if path else target).replace('/', '_')
- have_objdir_files = False
- for f in files:
- if not isinstance(f, ObjDirPath):
- dest = mozpath.join(reltarget, path, mozpath.basename(f))
-- install_manifest.add_symlink(f.full_path, dest)
-+ install_manifest.add_copy(f.full_path, dest)
- else:
- backend_file.write('%s_FILES += %s\n' % (
- target_var, self._pretty_path(f, backend_file)))
- have_objdir_files = True
- if have_objdir_files:
- backend_file.write('%s_DEST := $(DEPTH)/%s\n'
- % (target_var,
- mozpath.join(target, path)))
diff --git a/dev-lang/spidermonkey/files/spidermonkey-52-baseconfig.patch b/dev-lang/spidermonkey/files/spidermonkey-52-baseconfig.patch
new file mode 100644
index 000000000000..ee52728fa952
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-52-baseconfig.patch
@@ -0,0 +1,22 @@
+Fix various paths to include MOZ_APP_VERSION
+
+This has been committed upstream but was not included in
+the 52.4.0 sources that spidermonkey was rolled from.
+
+--- a/config/baseconfig.mk 2017-10-03 14:00:45.000000000 -0400
++++ b/config/baseconfig.mk 2017-10-03 16:36:10.857663794 -0400
+@@ -2,10 +2,10 @@
+ # directly in python/mozbuild/mozbuild/base.py for gmake validation.
+ # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
+ # whether a normal build is happening or whether the check is running.
+-includedir := $(includedir)/$(MOZ_APP_NAME)
+-idldir = $(includedir)/idl/$(MOZ_APP_NAME)
+-installdir = $(libdir)/$(MOZ_APP_NAME)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)
++includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir = $(includedir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ ifeq (.,$(DEPTH))
+ DIST = dist
+ else
diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild
index 7df8506f5120..e66d66acb107 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.7.0-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"
@@ -8,7 +8,9 @@ inherit eutils toolchain-funcs multilib flag-o-matic
MY_P="js-${PV}"
DESCRIPTION="Stand-alone JavaScript C library"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.gz"
+SRC_URI="http://archive.mozilla.org/pub/js/${MY_P}.tar.gz
+ https://dev.gentoo.org/~axs/distfiles/${PN}-slot0-patches-01.tar.xz
+ "
LICENSE="NPL-1.1"
SLOT="0/js"
@@ -21,10 +23,10 @@ RDEPEND="threadsafe? ( dev-libs/nspr )"
DEPEND="${RDEPEND}"
src_prepare() {
- epatch "${FILESDIR}/${PN}-1.5-build.patch"
- epatch "${FILESDIR}/${PN}-1.6-header.patch"
- epatch "${FILESDIR}/${P}-threadsafe.diff" \
- "${FILESDIR}"/${P}-ldflags.patch
+ epatch "${WORKDIR}"/sm0/${PN}-1.5-build.patch \
+ "${WORKDIR}"/sm0/${PN}-1.6-header.patch \
+ "${WORKDIR}"/sm0/${P}-threadsafe.diff \
+ "${WORKDIR}"/sm0/${P}-ldflags.patch
# don't force owner for Prefix
sed -i -e '/^INSTALL :=/s/-g 0 -o root//' Makefile.ref || die
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
index 5d181130fcd4..a5e340c26864 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.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,8 @@ MY_P="${MY_PN}-${PV}"
TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
DESCRIPTION="Stand-alone JavaScript C library"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
+SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz
+ https://dev.gentoo.org/~axs/distfiles/${PN}-slot0-patches-01.tar.xz"
LICENSE="NPL-1.1"
SLOT="0/mozjs185"
@@ -39,23 +40,23 @@ pkg_setup(){
src_prepare() {
# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
- epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
+ epatch "${WORKDIR}"/sm0/${P}-fix-install-symlinks.patch
# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
- epatch "${FILESDIR}/${P}-fix-ppc64.patch"
+ epatch "${WORKDIR}"/sm0/${P}-fix-ppc64.patch
# https://bugs.gentoo.org/show_bug.cgi?id=400727
# https://bugs.gentoo.org/show_bug.cgi?id=420471
- epatch "${FILESDIR}/${P}-arm_respect_cflags-3.patch"
+ epatch "${WORKDIR}"/sm0/${P}-arm_respect_cflags-3.patch
# https://bugs.gentoo.org/show_bug.cgi?id=438746
- epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
+ epatch "${WORKDIR}"/sm0/${PN}-1.8.7-freebsd-pthreads.patch
# https://bugs.gentoo.org/show_bug.cgi?id=441928
- epatch "${FILESDIR}"/${PN}-1.8.5-perf_event-check.patch
+ epatch "${WORKDIR}"/sm0/${PN}-1.8.5-perf_event-check.patch
# https://bugs.gentoo.org/show_bug.cgi?id=439260
- epatch "${FILESDIR}"/${P}-symbol-versions.patch
+ epatch "${WORKDIR}"/sm0/${P}-symbol-versions.patch
# https://bugs.gentoo.org/show_bug.cgi?id=441934
- epatch "${FILESDIR}"/${PN}-1.8.5-ia64-fix.patch
- epatch "${FILESDIR}"/${PN}-1.8.5-ia64-static-strings.patch
+ epatch "${WORKDIR}"/sm0/${PN}-1.8.5-ia64-fix.patch
+ epatch "${WORKDIR}"/sm0/${PN}-1.8.5-ia64-static-strings.patch
# https://bugs.gentoo.org/show_bug.cgi?id=431560
- epatch "${FILESDIR}"/${PN}-1.8.5-isfinite.patch
+ epatch "${WORKDIR}"/sm0/${PN}-1.8.5-isfinite.patch
# https://bugs.gentoo.org/show_bug.cgi?id=552786
epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r5.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r5.ebuild
deleted file mode 100644
index c9ca487769f7..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r5.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-WANT_AUTOCONF="2.1"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-inherit autotools eutils toolchain-funcs multilib python-any-r1 versionator pax-utils
-
-MY_PN="js"
-TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
-MY_P="${MY_PN}-${PV}"
-TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
-
-LICENSE="NPL-1.1"
-SLOT="0/mozjs185"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
-IUSE="debug minimal static-libs test"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.7.0
- sys-libs/readline:0=
- x64-macos? ( dev-libs/jemalloc )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-arch/zip
- virtual/pkgconfig"
-
-pkg_setup(){
- if [[ ${MERGE_TYPE} != "binary" ]]; then
- export LC_ALL="C"
- fi
-}
-
-src_prepare() {
- # https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
- epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
- # https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
- epatch "${FILESDIR}/${P}-fix-ppc64.patch"
- # https://bugs.gentoo.org/show_bug.cgi?id=400727
- # https://bugs.gentoo.org/show_bug.cgi?id=420471
- epatch "${FILESDIR}/${P}-arm_respect_cflags-3.patch"
- # https://bugs.gentoo.org/show_bug.cgi?id=438746
- epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
- # https://bugs.gentoo.org/show_bug.cgi?id=441928
- epatch "${FILESDIR}"/${PN}-1.8.5-perf_event-check.patch
- # https://bugs.gentoo.org/show_bug.cgi?id=439260
- epatch "${FILESDIR}"/${P}-symbol-versions.patch
- # https://bugs.gentoo.org/show_bug.cgi?id=441934
- epatch "${FILESDIR}"/${PN}-1.8.5-ia64-fix.patch
- epatch "${FILESDIR}"/${PN}-1.8.5-ia64-static-strings.patch
- # https://bugs.gentoo.org/show_bug.cgi?id=431560
- epatch "${FILESDIR}"/${PN}-1.8.5-isfinite.patch
- # https://bugs.gentoo.org/show_bug.cgi?id=552786
- epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
- # https://bugs.gentoo.org/show_bug.cgi?id=439558
- epatch "${FILESDIR}"/${PN}-1.8.7-x32.patch
-
- epatch_user
-
- cd "${BUILDDIR}" || die
- eautoconf
-}
-
-src_configure() {
- cd "${BUILDDIR}" || die
-
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
- AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
- LD="$(tc-getLD)" \
- econf \
- ${myopts} \
- --enable-jemalloc \
- --enable-readline \
- --enable-threadsafe \
- --with-system-nspr \
- --disable-optimize \
- --disable-profile-guided-optimization \
- $(use_enable debug) \
- $(use_enable static-libs static) \
- $(use_enable test tests)
-}
-
-cross_make() {
- emake \
- CFLAGS="${BUILD_CFLAGS}" \
- CXXFLAGS="${BUILD_CXXFLAGS}" \
- AR="${BUILD_AR}" \
- CC="${BUILD_CC}" \
- CXX="${BUILD_CXX}" \
- RANLIB="${BUILD_RANLIB}" \
- "$@"
-}
-src_compile() {
- cd "${BUILDDIR}" || die
- if tc-is-cross-compiler; then
- tc-export_build_env BUILD_{AR,CC,CXX,RANLIB}
- cross_make jscpucfg host_jsoplengen host_jskwgen
- cross_make -C config nsinstall
- mv {,native-}jscpucfg || die
- mv {,native-}host_jskwgen || die
- mv {,native-}host_jsoplengen || die
- mv config/{,native-}nsinstall || die
- sed -i \
- -e 's@./jscpucfg@./native-jscpucfg@' \
- -e 's@./host_jskwgen@./native-host_jskwgen@' \
- -e 's@./host_jsoplengen@./native-host_jsoplengen@' \
- Makefile || die
- sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die
- rm -f config/host_nsinstall.o \
- config/host_pathsub.o \
- host_jskwgen.o \
- host_jsoplengen.o || die
- fi
- emake
-}
-
-src_test() {
- cd "${BUILDDIR}/jsapi-tests" || die
- # for bug 415791
- pax-mark mr jsapi-tests
- emake check
-}
-
-src_install() {
- cd "${BUILDDIR}" || die
- emake DESTDIR="${D}" install
- # bug 437520 , exclude js shell for small systems
- if ! use minimal ; then
- dobin shell/js
- pax-mark m "${ED}/usr/bin/js"
- fi
- dodoc ../../README
- dohtml README.html
-
- if ! use static-libs; then
- # We can't actually disable building of static libraries
- # They're used by the tests and in a few other places
- find "${D}" -iname '*.a' -delete || die
- fi
-}
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild
index 1ae283e263ab..7cb19fe5087f 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild
@@ -13,7 +13,9 @@ MY_P="${MY_PN}-${PV}"
TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
DESCRIPTION="Stand-alone JavaScript C library"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
+SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz
+ https://dev.gentoo.org/~axs/distfiles/${PN}-slot0-patches-01.tar.xz
+ "
LICENSE="NPL-1.1"
SLOT="0/mozjs185"
@@ -39,29 +41,29 @@ pkg_setup(){
src_prepare() {
# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
- epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
+ epatch "${WORKDIR}"/sm0/${P}-fix-install-symlinks.patch
# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
- epatch "${FILESDIR}/${P}-fix-ppc64.patch"
+ epatch "${WORKDIR}"/sm0/${P}-fix-ppc64.patch
# https://bugs.gentoo.org/show_bug.cgi?id=400727
# https://bugs.gentoo.org/show_bug.cgi?id=420471
- epatch "${FILESDIR}/${P}-arm_respect_cflags-3.patch"
+ epatch "${WORKDIR}"/sm0/${P}-arm_respect_cflags-3.patch
# https://bugs.gentoo.org/show_bug.cgi?id=438746
- epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
+ epatch "${WORKDIR}"/sm0/${PN}-1.8.7-freebsd-pthreads.patch
# https://bugs.gentoo.org/show_bug.cgi?id=441928
- epatch "${FILESDIR}"/${PN}-1.8.5-perf_event-check.patch
+ epatch "${WORKDIR}"/sm0/${PN}-1.8.5-perf_event-check.patch
# https://bugs.gentoo.org/show_bug.cgi?id=439260
- epatch "${FILESDIR}"/${P}-symbol-versions.patch
+ epatch "${WORKDIR}"/sm0/${P}-symbol-versions.patch
# https://bugs.gentoo.org/show_bug.cgi?id=441934
- epatch "${FILESDIR}"/${PN}-1.8.5-ia64-fix.patch
- epatch "${FILESDIR}"/${PN}-1.8.5-ia64-static-strings.patch
+ epatch "${WORKDIR}"/sm0/${PN}-1.8.5-ia64-fix.patch
+ epatch "${WORKDIR}"/sm0/${PN}-1.8.5-ia64-static-strings.patch
# https://bugs.gentoo.org/show_bug.cgi?id=431560
- epatch "${FILESDIR}"/${PN}-1.8.5-isfinite.patch
+ epatch "${WORKDIR}"/sm0/${PN}-1.8.5-isfinite.patch
# https://bugs.gentoo.org/show_bug.cgi?id=552786
epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
# https://bugs.gentoo.org/show_bug.cgi?id=439558
- epatch "${FILESDIR}"/${PN}-1.8.7-x32.patch
+ epatch "${WORKDIR}"/sm0/${PN}-1.8.7-x32.patch
# https://bugs.gentoo.org/show_bug.cgi?id=582478
- epatch "${FILESDIR}"/${PN}-1.8.5-gcc6.patch
+ epatch "${WORKDIR}"/sm0/${PN}-1.8.5-gcc6.patch
epatch_user
diff --git a/dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild
index 3a77b7146655..06416bed5282 100644
--- a/dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-17.0.0-r4.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"
@@ -11,7 +11,8 @@ MY_PN="mozjs"
MY_P="${MY_PN}${PV}"
DESCRIPTION="Stand-alone JavaScript C library"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/js/${MY_PN}${PV}.tar.gz"
+SRC_URI="http://archive.mozilla.org/pub/js/${MY_PN}${PV}.tar.gz
+ https://dev.gentoo.org/~axs/distfiles/${PN}-slot17-patches-01.tar.xz"
LICENSE="NPL-1.1"
SLOT="17"
@@ -42,9 +43,9 @@ pkg_setup(){
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-${SLOT}-js-config-shebang.patch
- epatch "${FILESDIR}"/${PN}-${SLOT}-ia64-mmap.patch
- epatch "${FILESDIR}"/${PN}-17.0.0-fix-file-permissions.patch
+ epatch "${WORKDIR}"/sm17/${PN}-${SLOT}-js-config-shebang.patch
+ epatch "${WORKDIR}"/sm17/${PN}-${SLOT}-ia64-mmap.patch
+ epatch "${WORKDIR}"/sm17/${PN}-17.0.0-fix-file-permissions.patch
# https://bugs.gentoo.org/show_bug.cgi?id=552786
epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
diff --git a/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild b/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild
index 05a4758968e8..6a67fe8f8d5a 100644
--- a/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild
@@ -11,12 +11,13 @@ MY_PN="mozjs"
MY_P="${MY_PN}${PV}"
DESCRIPTION="Stand-alone JavaScript C library"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/js/${MY_PN}${PV}.tar.gz"
+SRC_URI="http://archive.mozilla.org/pub/js/${MY_PN}${PV}.tar.gz
+ https://dev.gentoo.org/~axs/distfiles/${PN}-slot17-patches-01.tar.xz"
LICENSE="NPL-1.1"
SLOT="17"
# "MIPS, MacroAssembler is not supported" wrt #491294 for -mips
-KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 -mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm -hppa ia64 -mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="debug jit minimal static-libs test"
REQUIRED_USE="debug? ( jit )"
@@ -42,12 +43,12 @@ pkg_setup(){
}
PATCHES=(
- "${FILESDIR}"/${PN}-${SLOT}-js-config-shebang.patch
- "${FILESDIR}"/${PN}-${SLOT}-ia64-mmap.patch
- "${FILESDIR}"/${PN}-17.0.0-fix-file-permissions.patch
- "${FILESDIR}"/${PN}-17-clang.patch
+ "${WORKDIR}"/sm17/${PN}-${SLOT}-js-config-shebang.patch
+ "${WORKDIR}"/sm17/${PN}-${SLOT}-ia64-mmap.patch
+ "${WORKDIR}"/sm17/${PN}-17.0.0-fix-file-permissions.patch
+ "${WORKDIR}"/sm17/${PN}-17-clang.patch
"${FILESDIR}"/${PN}-perl-defined-array-check.patch
- "${FILESDIR}"/${PN}-17-fix_pointer_dereference.patch
+ "${WORKDIR}"/sm17/${PN}-17-fix_pointer_dereference.patch
)
src_prepare() {
diff --git a/dev-lang/spidermonkey/spidermonkey-24.2.0-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-24.2.0-r3.ebuild
index 9779ba987f80..3d94feba95d4 100644
--- a/dev-lang/spidermonkey/spidermonkey-24.2.0-r3.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-24.2.0-r3.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"
@@ -11,7 +11,8 @@ MY_PN="mozjs"
MY_P="${MY_PN}-${PV/_/.}"
DESCRIPTION="Stand-alone JavaScript C library"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.bz2"
+SRC_URI="https://archive.mozilla.org/pub/js/${MY_P}.tar.bz2
+ https://dev.gentoo.org/~axs/distfiles/${PN}-slot24-patches-01.tar.xz"
LICENSE="NPL-1.1"
SLOT="24"
@@ -41,9 +42,9 @@ pkg_setup(){
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-${SLOT}-system-icu.patch
- epatch "${FILESDIR}"/${PN}-24.2.0-fix-file-permissions.patch
- epatch "${FILESDIR}"/${PN}-${SLOT}-upward-growing-stack.patch
+ epatch "${WORKDIR}"/sm24/${PN}-${SLOT}-system-icu.patch
+ epatch "${WORKDIR}"/sm24/${PN}-24.2.0-fix-file-permissions.patch
+ epatch "${WORKDIR}"/sm24/${PN}-${SLOT}-upward-growing-stack.patch
# https://bugs.gentoo.org/show_bug.cgi?id=552786
epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
epatch_user
diff --git a/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild
index 1e3f7b5b0404..edee003c55b7 100644
--- a/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild
@@ -11,7 +11,8 @@ MY_PN="mozjs"
MY_P="${MY_PN}-${PV/_/.}"
DESCRIPTION="Stand-alone JavaScript C library"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.bz2"
+SRC_URI="https://archive.mozilla.org/pub/js/${MY_P}.tar.bz2
+ https://dev.gentoo.org/~axs/distfiles/${PN}-slot24-patches-01.tar.xz"
LICENSE="NPL-1.1"
SLOT="24"
@@ -34,11 +35,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${PN}-${SLOT}-system-icu.patch
- "${FILESDIR}"/${PN}-24.2.0-fix-file-permissions.patch
- "${FILESDIR}"/${PN}-${SLOT}-upward-growing-stack.patch
+ "${WORKDIR}"/sm24/${PN}-${SLOT}-system-icu.patch
+ "${WORKDIR}"/sm24/${PN}-24.2.0-fix-file-permissions.patch
+ "${WORKDIR}"/sm24/${PN}-${SLOT}-upward-growing-stack.patch
"${FILESDIR}"/${PN}-perl-defined-array-check.patch
- "${FILESDIR}"/${PN}-17-fix_pointer_dereference.patch
+ "${WORKDIR}"/sm24/${PN}-17-fix_pointer_dereference.patch
)
pkg_setup(){
diff --git a/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild b/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild
index 42e2c0460c41..c55476923b0c 100644
--- a/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild
@@ -9,7 +9,8 @@ MY_PN="mozjs"
MY_P="${MY_PN}-${PV/_/.}"
DESCRIPTION="Stand-alone JavaScript C library"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-SRC_URI="https://people.mozilla.org/~sstangl/${MY_P}.tar.bz2"
+SRC_URI="https://people.mozilla.org/~sstangl/${MY_P}.tar.bz2
+ https://dev.gentoo.org/~axs/distfiles/${PN}-slot38-patches-01.tar.xz"
LICENSE="NPL-1.1"
SLOT="38"
@@ -36,12 +37,12 @@ pkg_setup(){
}
src_prepare() {
- eapply "${FILESDIR}"/${PN}-38-jsapi-tests.patch \
- "${FILESDIR}"/mozjs38-1269317.patch \
- "${FILESDIR}"/mozjs38-fix-tracelogger.patch \
- "${FILESDIR}"/mozjs38-copy-headers.patch \
- "${FILESDIR}"/mozjs38-pkg-config-version.patch \
- "${FILESDIR}"/mozilla_configure_regexp_esr38.patch
+ eapply "${WORKDIR}"/sm38/${PN}-38-jsapi-tests.patch \
+ "${WORKDIR}"/sm38/mozjs38-1269317.patch \
+ "${WORKDIR}"/sm38/mozjs38-fix-tracelogger.patch \
+ "${WORKDIR}"/sm38/mozjs38-copy-headers.patch \
+ "${WORKDIR}"/sm38/mozjs38-pkg-config-version.patch \
+ "${WORKDIR}"/sm38/mozilla_configure_regexp_esr38.patch
eapply_user
diff --git a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
index 26f88cce97ff..2602ecc5e97c 100644
--- a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
@@ -9,7 +9,8 @@ MY_PN="mozjs"
MY_P="${MY_PN}-${PV/_/.}"
DESCRIPTION="Stand-alone JavaScript C library"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-SRC_URI="https://people.mozilla.org/~sfink/${MY_P}.tar.bz2"
+SRC_URI="https://people.mozilla.org/~sfink/${MY_P}.tar.bz2
+ https://dev.gentoo.org/~axs/distfiles/${PN}-slot45-patches-01.tar.xz"
LICENSE="NPL-1.1"
SLOT="45"
@@ -35,14 +36,14 @@ pkg_setup(){
}
src_prepare() {
- eapply "${FILESDIR}"/${PN}-38-jsapi-tests.patch \
- "${FILESDIR}"/mozjs45-1266366.patch \
- "${FILESDIR}"/mozjs38-pkg-config-version.patch \
- "${FILESDIR}"/mozilla_configure_regexp_esr.patch \
- "${FILESDIR}"/${PN}-${SLOT}-dont-symlink-non-objfiles.patch
+ eapply "${WORKDIR}"/sm45/${PN}-38-jsapi-tests.patch \
+ "${WORKDIR}"/sm45/mozjs45-1266366.patch \
+ "${WORKDIR}"/sm45/mozjs38-pkg-config-version.patch \
+ "${WORKDIR}"/sm45/mozilla_configure_regexp_esr.patch \
+ "${WORKDIR}"/sm45/${PN}-${SLOT}-dont-symlink-non-objfiles.patch
# apply relevant (modified) patches from gentoo's firefox-45 patchset
- eapply "${FILESDIR}"/ff45
+ eapply "${WORKDIR}"/sm45/ff45
eapply_user
diff --git a/dev-lang/spidermonkey/spidermonkey-52.2.0_pre20170719.ebuild b/dev-lang/spidermonkey/spidermonkey-52.4.0_pre20171003-r1.ebuild
similarity index 91%
rename from dev-lang/spidermonkey/spidermonkey-52.2.0_pre20170719.ebuild
rename to dev-lang/spidermonkey/spidermonkey-52.4.0_pre20171003-r1.ebuild
index 68a046e61daf..7c80ac01c86e 100644
--- a/dev-lang/spidermonkey/spidermonkey-52.2.0_pre20170719.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-52.4.0_pre20171003-r1.ebuild
@@ -37,7 +37,14 @@ pkg_setup(){
}
src_prepare() {
+ # remove patches integrated by upstream
+ rm -f "${WORKDIR}"/${PN}/0002-build-Add-major-version-to-make-parallel-installable.patch \
+ "${WORKDIR}"/${PN}/0005-headers-Fix-symbols-visibility.patch \
+ "${WORKDIR}"/${PN}/0007-build-Remove-unnecessary-NSPR-dependency.patch \
+ || die
+
eapply "${WORKDIR}/${PN}"
+ eapply "${FILESDIR}"/${PN}-52-baseconfig.patch
eapply_user
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index aefd7317aa1d..bc55f4189a6e 100644
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -1,4 +1,4 @@
DIST XSB360.tar.gz 12842882 SHA256 bb8d2b30e598574e263ddb48b7569e5582953a0c4f8b16d55f6bbf306e9e7faa SHA512 2ac2f4d4c7501479648b7f618815d4cd996969791a617f2148ef7498cf08bacd67eab298136303b6804cb689129ae3365e1490ec693f2232f9c9f1ad515d9c6c WHIRLPOOL 057a1939ff4115c2fc4cd91f10458a4d89847b6394723ea05a4a86d9e7986ee3c03f7ff1b2eff2389ec3c1be7d20b69cdf77be016066cf261b2af131dfbb2176
DIST XSB370.tar.gz 12322913 SHA256 282936b17ca581e6f546a4cb15687653ad19144897c4776b01a8caf7027ebc6d SHA512 e2c11b0e5fbbffc2fb6d493e39b7dd74de43509ea1c844f1b3e5d1002c116d6fb8b245905b7b512499e40765a6603d4bef883052bdeec4a3078011c305f85a9f WHIRLPOOL 7fad63fbd66e902eaccc5ae1e542787a824d4396df1a49f08b003cada4f424eaf563b0eff693296e7adecb46bfd24931938baf5dde95ad01694dfcdf4b2fb4ef
-DIST xsb-3.6.0-gentoo-patchset-3.tar.gz 7340 SHA256 a142a50f1720c62602914bccb2ae038c94fe08f31732db785fc0780eecc0f164 SHA512 3ed8dbe376ab27e9587f72151d4e4a49859bc0170f490219f6ac218501b194ddad8d24666e873f6cf1c11de371114430dde2c6480f4082db0f7b330fd65c6d74 WHIRLPOOL a9fa13086da4cb0463b37a3b77ed2867bdd65bdb19bab2a99f601f485413492535e0fc72bbd44f724399d3eea3ed002b778f82f8ec5af167ed7b0714106cbb18
-DIST xsb-3.7.0-gentoo-patchset-2.tar.gz 5531 SHA256 ab095b64e1723af6e3cdfe1dfdd685054769de7768960972bd5bfc892f0c16e3 SHA512 f0ea99a7ba8a4d02a6e36900725f774859e4c270bcaa5c83d1fae7f312e509411f1992edfb7b1a88e2bd3933beb6216d17c66bc40bb62a1cc9ce17600bac4af8 WHIRLPOOL 5478bee51b17b263611bb2a386b1b5f4bab6a980584f8a95e0c51c55c4383acc472b4c082ef7eacd79f3df382bb8160099cb19d9a1675522a43104e0582b0f6c
+DIST xsb-3.6.0-gentoo-patchset-4.tar.gz 7513 SHA256 99e03006242b027bdc4738cc7fec71f501aad0bad0280bc3dabf20ec677f478f SHA512 bb7ba7836fa2df7a54fd2837b4cb760f7ae0e9511bc0a4b2be8cba89ed4aeedda6712937a4748bd9e9ee16366d442fd962a121dbf83017e2199eb3a287efb1d5 WHIRLPOOL 03c6bd4bb2c9dea1bf67ab623102c194dd23fa2ae3a97723e832bf9390bf2666e484e4ab2149b094216fedcfe7316de7f6753fc4c91ca1619799d0fa306855f4
+DIST xsb-3.7.0-gentoo-patchset-3.tar.gz 5636 SHA256 cdbdb8f6cd16fb2df24666fd4a91f00a54b30c71170588d84e9894410f70ad6c SHA512 bee6d62b900c9ee3a373dfa0ad7362b18c748bb9e0559a878534ed517067d753e1fa79277b0588133a1eeceafcd56b4dcc9ff81892309f6c6666150baaaaf047 WHIRLPOOL 5165841bebb0bf9430865486b923e612a3db7746073e226da4ce71bcef76e2d2c1f8c04a1901dfdea95d59ba3bbbf8b367a106372559d70d850d66c0eb187f9a
diff --git a/dev-lang/xsb/xsb-3.6.0.ebuild b/dev-lang/xsb/xsb-3.6.0.ebuild
index 8dab717879d0..f0ea2805b12f 100644
--- a/dev-lang/xsb/xsb-3.6.0.ebuild
+++ b/dev-lang/xsb/xsb-3.6.0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
MY_P="XSB${PV//./}"
-PATCHSET_VER="3"
+PATCHSET_VER="4"
inherit eutils autotools java-pkg-opt-2
diff --git a/dev-lang/xsb/xsb-3.7.0.ebuild b/dev-lang/xsb/xsb-3.7.0.ebuild
index d5634b239ba8..8bd4db509d01 100644
--- a/dev-lang/xsb/xsb-3.7.0.ebuild
+++ b/dev-lang/xsb/xsb-3.7.0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
MY_P="XSB${PV//./}"
-PATCHSET_VER="2"
+PATCHSET_VER="3"
inherit eutils autotools java-pkg-opt-2
diff --git a/dev-libs/icu-layoutex/icu-layoutex-58.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-58.2.ebuild
index a0adfd437cbb..92aedc3ca2d9 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-58.2.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-58.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 x86"
IUSE="debug static-libs"
RDEPEND="
diff --git a/dev-libs/icu/icu-58.2-r1.ebuild b/dev-libs/icu/icu-58.2-r1.ebuild
index 86abec06ec35..1eaa578e41b3 100644
--- a/dev-libs/icu/icu-58.2-r1.ebuild
+++ b/dev-libs/icu/icu-58.2-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="debug doc examples static-libs"
DEPEND="
diff --git a/dev-libs/libRocket/Manifest b/dev-libs/libRocket/Manifest
deleted file mode 100644
index a0c54f76284a..000000000000
--- a/dev-libs/libRocket/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libRocket-1.2.1_p20130110.tar.xz 845572 SHA256 5661f0d1b0a3e19b9f2856b9927ed7ec4ad6939e732230832cd701bf078a732b SHA512 1c474e0cad2e13ebe6102cd5d31c3fa61370d23062c31fd7703ec431f0da56f008c9711b49b73d8a9b32af0313e2cb3aa8c46888a36044fef05c15fe1cbc23b5 WHIRLPOOL 52ef88ebc35ac762c6b50fbaed8713b2568f80bc65390e696537f4935eaf1c4182a64b414fd6bfadb3e1a6cadb0589fcb20bc12c26e3ea87edaf342b5ff09bb6
-DIST libRocket-1.3.0.0.tar.gz 1858846 SHA256 574e992ac0bb62c1aa782114986d440ade69f4408971d0fb4ddc5922df761b75 SHA512 579fb5b9ca48b44999ca9c64e5fde3f28b83b12487928d34cf6e2834e60c4fff06c845832d38387f4ba639e2bd906b96940da4ce5e4c73625c48c6658726d3bd WHIRLPOOL a72c72c38780bc4dba9fbdb14365b675579e0a4d251c88bcf780fa076c16728c09c9ba7dff733d8f54da8064184e585ea568e12275f8e7ab86d55333a6242b0f
diff --git a/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild b/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild
deleted file mode 100644
index 9d21accbda41..000000000000
--- a/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild
+++ /dev/null
@@ -1,96 +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 cmake-utils eutils python-r1 multilib-minimal
-
-DESCRIPTION="A HTML/CSS User Interface library"
-HOMEPAGE="https://librocket.com/"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python samples"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost[${PYTHON_USEDEP}]
- )
- samples? (
- virtual/opengl
- x11-libs/libXext
- x11-libs/libX11
- )"
-DEPEND="${RDEPEND}"
-
-DOCS=( changelog.txt readme.md )
-
-python_BUILD_DIR=${WORKDIR}/${P}_build_python
-CMAKE_USE_DIR="${S}"/Build
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_PYTHON_BINDINGS=OFF
- -DSAMPLES_DIR=/usr/share/${PN}/samples
- )
-
- if multilib_is_native_abi ; then
- mycmakeargs+=( $(cmake-utils_use_build samples SAMPLES) )
- else
- mycmakeargs+=( -DBUILD_SAMPLES=OFF )
- fi
-
- cmake-utils_src_configure
-
- if multilib_is_native_abi ; then
- if use python ; then
- cfgpybind() {
- local mycmakeargs=(
- -DBUILD_PYTHON_BINDINGS=ON
- -DCMAKE_SKIP_RPATH=YES
- )
- BUILD_DIR="${python_BUILD_DIR}-${EPYTHON}" cmake-utils_src_configure
- }
- einfo "configuring python binding"
- python_foreach_impl cfgpybind
- fi
- fi
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
- local abi_build_dir=${BUILD_DIR}
-
- if multilib_is_native_abi ; then
- if use python ; then
- buildpybind() {
- cp "${abi_build_dir}"/{libRocketCore*,libRocketControls*} "${python_BUILD_DIR}-${EPYTHON}"/ || die
- BUILD_DIR="${python_BUILD_DIR}-${EPYTHON}" cmake-utils_src_make _rocketcontrols/fast _rocketcore/fast
- }
- einfo "compiling python binding"
- python_foreach_impl buildpybind
- fi
- fi
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-
- if multilib_is_native_abi ; then
- if use python ; then
- instpybind() {
- python_domodule "${S}"/bin/rocket.py
- exeinto "$(python_get_sitedir)"
- doexe ${python_BUILD_DIR}-${EPYTHON}/_rocket{core,controls}.so
- }
- einfo "installing python binding"
- python_foreach_impl instpybind
- fi
- fi
-}
diff --git a/dev-libs/libRocket/libRocket-1.3.0.0.ebuild b/dev-libs/libRocket/libRocket-1.3.0.0.ebuild
deleted file mode 100644
index a99590e83998..000000000000
--- a/dev-libs/libRocket/libRocket-1.3.0.0.ebuild
+++ /dev/null
@@ -1,98 +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 cmake-utils eutils python-r1 multilib-minimal
-
-DESCRIPTION="A HTML/CSS User Interface library"
-HOMEPAGE="https://librocket.com/"
-SRC_URI="https://github.com/libRocket/libRocket/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="python samples"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost[${PYTHON_USEDEP}]
- )
- samples? (
- virtual/opengl
- x11-libs/libXext
- x11-libs/libX11
- )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-release-${PV}
-
-DOCS=( changelog.txt readme.md )
-
-python_BUILD_DIR=${WORKDIR}/${P}_build_python
-CMAKE_USE_DIR="${S}"/Build
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_PYTHON_BINDINGS=OFF
- -DSAMPLES_DIR=/usr/share/${PN}/samples
- )
-
- if multilib_is_native_abi ; then
- mycmakeargs+=( $(cmake-utils_use_build samples SAMPLES) )
- else
- mycmakeargs+=( -DBUILD_SAMPLES=OFF )
- fi
-
- cmake-utils_src_configure
-
- if multilib_is_native_abi ; then
- if use python ; then
- cfgpybind() {
- local mycmakeargs=(
- -DBUILD_PYTHON_BINDINGS=ON
- -DCMAKE_SKIP_RPATH=YES
- )
- BUILD_DIR="${python_BUILD_DIR}-${EPYTHON}" cmake-utils_src_configure
- }
- einfo "configuring python binding"
- python_foreach_impl cfgpybind
- fi
- fi
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
- local abi_build_dir=${BUILD_DIR}
-
- if multilib_is_native_abi ; then
- if use python ; then
- buildpybind() {
- cp "${abi_build_dir}"/{libRocketCore*,libRocketControls*} "${python_BUILD_DIR}-${EPYTHON}"/ || die
- BUILD_DIR="${python_BUILD_DIR}-${EPYTHON}" cmake-utils_src_make _rocketcontrols/fast _rocketcore/fast
- }
- einfo "compiling python binding"
- python_foreach_impl buildpybind
- fi
- fi
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-
- if multilib_is_native_abi ; then
- if use python ; then
- instpybind() {
- python_domodule "${S}"/bin/rocket.py
- exeinto "$(python_get_sitedir)"
- doexe ${python_BUILD_DIR}-${EPYTHON}/_rocket{core,controls}.so
- }
- einfo "installing python binding"
- python_foreach_impl instpybind
- fi
- fi
-}
diff --git a/dev-libs/libRocket/libRocket-9999.ebuild b/dev-libs/libRocket/libRocket-9999.ebuild
deleted file mode 100644
index 8612a41c005f..000000000000
--- a/dev-libs/libRocket/libRocket-9999.ebuild
+++ /dev/null
@@ -1,97 +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 cmake-utils git-2 python-r1 multilib-minimal
-
-DESCRIPTION="A HTML/CSS User Interface library"
-HOMEPAGE="https://librocket.com/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/hasufell/libRocket.git"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="python samples"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost[${PYTHON_USEDEP}]
- )
- samples? (
- virtual/opengl
- x11-libs/libXext
- x11-libs/libX11
- )"
-DEPEND="${RDEPEND}"
-
-DOCS=( changelog.txt readme.md )
-
-python_BUILD_DIR=${WORKDIR}/${P}_build_python
-CMAKE_USE_DIR="${S}"/Build
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_PYTHON_BINDINGS=OFF
- -DSAMPLES_DIR=/usr/share/${PN}/samples
- )
-
- if multilib_is_native_abi ; then
- mycmakeargs+=( $(cmake-utils_use_build samples SAMPLES) )
- else
- mycmakeargs+=( -DBUILD_SAMPLES=OFF )
- fi
-
- cmake-utils_src_configure
-
- if multilib_is_native_abi ; then
- if use python ; then
- cfgpybind() {
- local mycmakeargs=(
- -DBUILD_PYTHON_BINDINGS=ON
- -DCMAKE_SKIP_RPATH=YES
- )
- BUILD_DIR="${python_BUILD_DIR}-${EPYTHON}" cmake-utils_src_configure
- }
- einfo "configuring python binding"
- python_foreach_impl cfgpybind
- fi
- fi
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
- local abi_build_dir=${BUILD_DIR}
-
- if multilib_is_native_abi ; then
- if use python ; then
- buildpybind() {
- cp "${abi_build_dir}"/{libRocketCore*,libRocketControls*} "${python_BUILD_DIR}-${EPYTHON}"/ || die
- BUILD_DIR="${python_BUILD_DIR}-${EPYTHON}" cmake-utils_src_make _rocketcontrols/fast _rocketcore/fast
- }
- einfo "compiling python binding"
- python_foreach_impl buildpybind
- fi
- fi
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-
- if multilib_is_native_abi ; then
- if use python ; then
- instpybind() {
- python_domodule "${S}"/bin/rocket.py
- exeinto "$(python_get_sitedir)"
- doexe ${python_BUILD_DIR}-${EPYTHON}/_rocket{core,controls}.so
- }
- einfo "installing python binding"
- python_foreach_impl instpybind
- fi
- fi
-}
diff --git a/dev-libs/libRocket/metadata.xml b/dev-libs/libRocket/metadata.xml
deleted file mode 100644
index 00acc1335772..000000000000
--- a/dev-libs/libRocket/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
- libRocket/libRocket
-
-
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
index 33c5d1bf8629..06429a30746b 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
LICENSE="BSD-2"
# Subslot == SONAME version
SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
IUSE="static-libs test"
RDEPEND=">=dev-libs/protobuf-2.6.0:0=[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 373430950a37..1e6cab89337d 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -4,3 +4,4 @@ DIST skalibs-2.3.9.0.tar.gz 211781 SHA256 6229fb4fb415699bbff3b446ff44aa5b7fb9c5
DIST skalibs-2.4.0.2.tar.gz 215964 SHA256 0708172bc2ec9825f8a4f312d35f8dcd94da5f291425a598c33c873b3de77df8 SHA512 1a60ff7bf2364cfe56dc5847321dad4eaa3942be90555a405c4c6c6fff287e197621796624cd52030f4373665ef53d4f7cd5832e8492ecf1d75c82544a4c8f2e WHIRLPOOL 921f30c49c14b26ddef4e4a92f22f097379619e1ad42a4486081efe2436ca07ac7343144663efce738b35fc2cf0580a7651b81ca308edca5a7d262ec8a1b3559
DIST skalibs-2.5.0.0.tar.gz 207065 SHA256 38408ff6d0aec581010ecf9e49703ec5f4c8887bbe68717ec087634a7ade849c SHA512 fe96cb0a128dc5060c74dca1ac96df96bf1f9383229ef283b7b23b98c7910137f3ca25ecd7cf91446a7f6d1ce7bb6a36e346c45c6d5723f73eea008626a3792e WHIRLPOOL bdc773fb34eed7d321047c3ac8dbca9b0330914e3c46331b898fd5135c90ef2f1572f87264156a91f3a6eaebbb4baffcca936391f2d3e013f8f239d444cda750
DIST skalibs-2.5.1.1.tar.gz 210356 SHA256 aa387f11a01751b37fd32603fdf9328a979f74f97f0172def1b0ad73b7e8d51d SHA512 a1139c6c192b4b4b29fb5b93242d206274ad80503a7b68fda117105e5344e2a15547d52145f488759c5cfa7be45a8a22be8a4b606328556a92dc980186143dc4 WHIRLPOOL 4b22049146db47b15227b5b20767726ebdab07eff5e52e0ece48e0088e12418b454a2aa59141ddaff0b78a661fec8abf30764d4c17ccb42980b245a3dc862526
+DIST skalibs-2.6.0.0.tar.gz 209377 SHA256 3572cb8c7d2ae9d16da5a0f3d23b48e013e0c957f1329d100f04dd5accb054c3 SHA512 dffc50c71a43fc152fcd38267bd136f937bd573012743eb74659b0a42bf2812ba4ce1fd28a43bf1b7fc7f9f1f68fd80f7a1df66f33a379ce6e253658c81ce778 WHIRLPOOL f6f5db2fcdc4e86fa380b7b3f906945887887d6083b89bc89a652d46986c06737bf83d6258be347353aa70afc72dbed66a5a363fce41ac1c2348bc22c16ecf52
diff --git a/dev-libs/skalibs/skalibs-2.6.0.0.ebuild b/dev-libs/skalibs/skalibs-2.6.0.0.ebuild
new file mode 100644
index 000000000000..60f48967282c
--- /dev/null
+++ b/dev-libs/skalibs/skalibs-2.6.0.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 versionator
+
+DESCRIPTION="skarnet.org general-purpose libraries"
+HOMEPAGE="https://www.skarnet.org/software/skalibs/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc ipv6 static-libs"
+
+DEPEND=">=sys-devel/make-3.81"
+RDEPEND=""
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+ default
+
+ # Remove QA warning about LDFLAGS addition
+ sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+ # configure overrides gentoo's -fstack-protector default
+ sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+ econf \
+ --datadir=/etc \
+ --dynlibdir=/$(get_libdir) \
+ --libdir=/usr/$(get_libdir)/${PN} \
+ --sysdepdir=/usr/$(get_libdir)/${PN} \
+ --enable-clock \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ $(use_enable ipv6)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ use doc && einstalldocs
+}
diff --git a/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.0.11.ebuild b/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.0.11.ebuild
index cbf45da0f4d1..34ef1cfdf678 100644
--- a/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.0.11.ebuild
+++ b/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.0.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/edicl/cl-ppcre/archive/v${PV}.tar.gz -> cl-ppcre-${P
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
IUSE=""
RDEPEND="=dev-lisp/cl-ppcre-${PV}
diff --git a/dev-lisp/cl-ppcre/Manifest b/dev-lisp/cl-ppcre/Manifest
index f1163a14c50b..2e1534095069 100644
--- a/dev-lisp/cl-ppcre/Manifest
+++ b/dev-lisp/cl-ppcre/Manifest
@@ -1,2 +1 @@
DIST cl-ppcre-2.0.11.tar.gz 158418 SHA256 ed8571915216788dc4f6cdb44e49b0e0782e203ed547fe2e58cd5b0e5c57edc4 SHA512 c693c568065c0571e5509599018e58951425a857cec3793312af0d22e248e32233f924eafc8ba67fbedad38cb3f4efa11343b785b073eaac53c31871422488b1 WHIRLPOOL 85e0bda97b1bea3da32fbe9a56dd45eb6926fccb7546ee41528a4c6b7b079a94f0d30c59d98cd0288ea26efe6b004b6856cabaaeb3cb93e441cdebc5d588bdf7
-DIST cl-ppcre_1.2.16.orig.tar.gz 168039 SHA256 fc9f0a72d1efb59dd91f79ab449ca6eec16bdf8a4b46903d24a10ee93be96e8f SHA512 b25b0bd526b8e41d6c96c59d5991a21538d10bbb935452de2bc16a461af5e838da54cfccb79183b4693e64b26d083a703189e44b72c1a0b9ef46dfecd32dacfa WHIRLPOOL 56de74b73a2c5aee9d7c7c4ae00d9072fc320e87ca64ec3cf2a590a4dc263e91a07d619cebaabb3c1ffb2cd9fd5eb48d96a3c618782e8adac9c82b20728d36fc
diff --git a/dev-lisp/cl-ppcre/cl-ppcre-1.2.16.ebuild b/dev-lisp/cl-ppcre/cl-ppcre-1.2.16.ebuild
deleted file mode 100644
index 23079e45bdd2..000000000000
--- a/dev-lisp/cl-ppcre/cl-ppcre-1.2.16.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit common-lisp
-
-DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp"
-HOMEPAGE="http://weitz.de/cl-ppcre/
- http://www.cliki.net/cl-ppcre"
-SRC_URI="mirror://gentoo/${PN}_${PV}.orig.tar.gz"
-LICENSE="BSD"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
- virtual/commonlisp"
-SLOT="0"
-
-CLPACKAGE=cl-ppcre
-
-src_install() {
- common-lisp-install *.lisp *.asd
- common-lisp-system-symlink
- dodoc CHANGELOG README doc/benchmarks.2002-12-22.txt
- dohtml doc/index.html
-}
diff --git a/dev-lisp/cl-ppcre/cl-ppcre-2.0.11.ebuild b/dev-lisp/cl-ppcre/cl-ppcre-2.0.11.ebuild
index ba65b3febed6..df216d535ff0 100644
--- a/dev-lisp/cl-ppcre/cl-ppcre-2.0.11.ebuild
+++ b/dev-lisp/cl-ppcre/cl-ppcre-2.0.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/edicl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
IUSE=""
RDEPEND="dev-lisp/flexi-streams"
diff --git a/dev-lisp/cl-unicode/cl-unicode-0.1.5.ebuild b/dev-lisp/cl-unicode/cl-unicode-0.1.5.ebuild
index 2472c1d5832b..eb1a89c6b5f9 100644
--- a/dev-lisp/cl-unicode/cl-unicode-0.1.5.ebuild
+++ b/dev-lisp/cl-unicode/cl-unicode-0.1.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/edicl/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
IUSE=""
DEPEND="virtual/commonlisp
diff --git a/dev-lisp/flexi-streams/flexi-streams-1.0.16.ebuild b/dev-lisp/flexi-streams/flexi-streams-1.0.16.ebuild
index 722cdce44efd..f9d5b59764d1 100644
--- a/dev-lisp/flexi-streams/flexi-streams-1.0.16.ebuild
+++ b/dev-lisp/flexi-streams/flexi-streams-1.0.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/edicl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
IUSE=""
RDEPEND="!dev-lisp/cl-${PN}
diff --git a/dev-lisp/trivial-gray-streams/trivial-gray-streams-20170830.ebuild b/dev-lisp/trivial-gray-streams/trivial-gray-streams-20170830.ebuild
index 127f7c341077..63d5924ffdb0 100644
--- a/dev-lisp/trivial-gray-streams/trivial-gray-streams-20170830.ebuild
+++ b/dev-lisp/trivial-gray-streams/trivial-gray-streams-20170830.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
IUSE=""
RDEPEND="!dev-lisp/cl-${PN}"
diff --git a/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.250.0.ebuild b/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.250.0.ebuild
new file mode 100644
index 000000000000..00091ed9e06f
--- /dev/null
+++ b/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.250.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=RAZ
+DIST_VERSION=0.25
+DIST_EXAMPLES=("script/*")
+inherit perl-module
+
+DESCRIPTION="Perl client for memcached, in C language"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+PATCHES=(
+ "${FILESDIR}/0.230.0-parallel-make.patch"
+ "${FILESDIR}/${P}-no-flto.patch"
+)
+RDEPEND="virtual/perl-Storable"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ net-misc/memcached
+ virtual/perl-Test-Simple
+ )
+"
+
+src_test() {
+ perl_rm_files t/pod-coverage.t t/pod.t
+
+ local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 )
+ [[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
+ memcached "${memcached_opts[@]}" || die "Can't start memcached test server"
+
+ local exit_status
+ perl-module_src_test
+ exit_status=$?
+
+ kill "$(<"${T}/memcached.pid")"
+ return ${exit_status}
+}
diff --git a/dev-perl/Cache-Memcached-Fast/Manifest b/dev-perl/Cache-Memcached-Fast/Manifest
index b3cdfeeaa4e5..2396242f5fba 100644
--- a/dev-perl/Cache-Memcached-Fast/Manifest
+++ b/dev-perl/Cache-Memcached-Fast/Manifest
@@ -1 +1,2 @@
DIST Cache-Memcached-Fast-0.23.tar.gz 102205 SHA256 df20beaebf85180154be5a99886686793cf1beee9081ed7de0ae66c4573d200f SHA512 2023eaec65da3ad8ac48907f86dd2f6a679939659a0047c46654aafaf3aceefcd0e03aee340214aa4300a0f4469da74b646a7a1f2c99ea9dcc6e3438f5d7899e WHIRLPOOL 34a54ed1c27524631849fca7720dad5b866c777e7c6776e7e2463add63a4af535eb4519b72db325f1c9a85af14165350c0d7c2739c2dd75b290a0a2f312da411
+DIST Cache-Memcached-Fast-0.25.tar.gz 104313 SHA256 782a259094c4667871b23cdccd500bd50802d9529f1b3d6ebe2a68f5292c5c46 SHA512 385b58f9dd66f86c7f99859782f098101d0f6bce9e2b22552895ab22d775ed73a1886544a51904797812b77e6849d8f2d79e61fb999a11e30497c6ae6de8c5c0 WHIRLPOOL edd6ecc74f6fee288f577f960463366e2ab1fd645f853119998c4b93b6a7ca4045e27deb2c0b2aec134a7928df2ee52509ac6d1465b7bd86983e8e23e2a788f5
diff --git a/dev-perl/Cache-Memcached-Fast/files/Cache-Memcached-Fast-0.250.0-no-flto.patch b/dev-perl/Cache-Memcached-Fast/files/Cache-Memcached-Fast-0.250.0-no-flto.patch
new file mode 100644
index 000000000000..d78c3fad0d7f
--- /dev/null
+++ b/dev-perl/Cache-Memcached-Fast/files/Cache-Memcached-Fast-0.250.0-no-flto.patch
@@ -0,0 +1,32 @@
+From d1c5f70b144abfd4783f866aef27f60a35b61f8b Mon Sep 17 00:00:00 2001
+From: Kent Fredric
+Date: Tue, 3 Oct 2017 20:20:14 +1300
+Subject: Strip -flto from CFLAGS
+
+-flto breaks compilation of static archives and needs significant magic
+to not break, including sentience about which CC you're using.
+---
+ Makefile.PL | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 0054164..ad249b9 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -22,6 +22,13 @@ WriteMakefile(
+ },
+ );
+
++sub MY::cflags {
++ my $self = shift;
++ my $orig = $self->MM::cflags(@_);
++ $orig =~ s/-flto\b//g;
++ return $orig;
++}
++
+ sub MY::postamble {
+ '
+ $(MYEXTLIB): src/Makefile
+--
+2.14.1
+
diff --git a/dev-perl/Canary-Stability/Canary-Stability-2012.0.0.ebuild b/dev-perl/Canary-Stability/Canary-Stability-2012.0.0.ebuild
new file mode 100644
index 000000000000..4b2254f99c4c
--- /dev/null
+++ b/dev-perl/Canary-Stability/Canary-Stability-2012.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=2012
+inherit perl-module
+
+DESCRIPTION="Canary to check perl compatibility for schmorp's modules"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
+src_test() {
+ perl-module_src_test
+ perl -Mblib="${S}" -M"Canary::Stability ${DIST_VERSION} ()" -e1 ||
+ die "Could not load Canary::Stability"
+}
diff --git a/dev-perl/Canary-Stability/Manifest b/dev-perl/Canary-Stability/Manifest
index 0dcff2e5c625..a054412c508f 100644
--- a/dev-perl/Canary-Stability/Manifest
+++ b/dev-perl/Canary-Stability/Manifest
@@ -1,2 +1,3 @@
DIST Canary-Stability-2006.tar.gz 3621 SHA256 47afc038ece0b77e212afc05656791345ac08826f6102181a429dd231720d62e SHA512 e68de850f1383e086780ccddc125243c79d391838e5bf4ede7824023f5055d9dde6d9945f84b3016c60c8d7a3c71934fc1c8c9e7b4b0fdee2bcb1e737fb5261a WHIRLPOOL 6267f74ff51d318961672592d9a6eb77ea9a882d24f54645f4aaf48307312106529eda21169e9827de644bf3e8a7a31f8da34627daa1eb70e471fc8296cf7297
DIST Canary-Stability-2011.tar.gz 4265 SHA256 63f852d196b4e32ac28998ea7987bd5960b919110ed441512c6191bcc352c1fc SHA512 1505750855b969ff733985098a50040e3346aec848c3f5d2cb9c74c9123379b5e918f23603a02f0d440f57f944caf4e39ff06a088697b5f1c4c4e90bc0c272de WHIRLPOOL 39f354a7ef0c2eeb7230705d7c7cc259142729078ba4489fbd98737c5475a6c4a317e5f9fc8cd0a4103f285995a961972070d7b870d319d281e811f4092ee683
+DIST Canary-Stability-2012.tar.gz 4334 SHA256 fd240b111d834dbae9630c59b42fae2145ca35addc1965ea311edf0d07817107 SHA512 7780731e4142d536182e1820c041c43ae67c5b47c044f15d8dcc060646bbab10a974bddcb703fdb27f427db3cd4dbdff54e131dc708c0260d7275be869eb27b1 WHIRLPOOL 67073f5355ddf562547a6cd56edd8d8ac8f15e062be822537da07e3fc697b0287d659ab469acc675317eda9f7ff4738f72c129128a67a5e56be9e5e1c53151a4
diff --git a/dev-perl/Carp-Assert-More/Carp-Assert-More-1.160.0.ebuild b/dev-perl/Carp-Assert-More/Carp-Assert-More-1.160.0.ebuild
new file mode 100644
index 000000000000..7202b242610b
--- /dev/null
+++ b/dev-perl/Carp-Assert-More/Carp-Assert-More-1.160.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=PETDANCE
+DIST_VERSION=1.16
+inherit perl-module
+
+DESCRIPTION="convenience wrappers around Carp::Assert"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+ virtual/perl-Carp
+ dev-perl/Carp-Assert
+ virtual/perl-Scalar-List-Utils
+"
+DEPEND="${RDEPEND}
+ test? ( dev-perl/Test-Exception )"
+
+src_test() {
+ perl_rm_files t/pod-coverage.t t/pod.t
+ perl-module_src_test
+ local MODULES=(
+ "Carp::Assert::More ${DIST_VERSION}"
+ )
+ for dep in "${MODULES[@]}"; do
+ perl -Mblib="${S}" -M"${dep} ()" -e1 ||
+ die "Could not load ${dep}"
+ done
+}
diff --git a/dev-perl/Carp-Assert-More/Manifest b/dev-perl/Carp-Assert-More/Manifest
index 5652a7d4c83e..64d2addf5d59 100644
--- a/dev-perl/Carp-Assert-More/Manifest
+++ b/dev-perl/Carp-Assert-More/Manifest
@@ -1 +1,2 @@
DIST Carp-Assert-More-1.14.tar.gz 10304 SHA256 3f004cbfa53476d85ab604a1e09fc4a5d7b28898c52f9549bd17c385c9c40733 SHA512 0411908afd5cc45cedce83fb10e67f78f7513fa788421d9c4e0f0f0064bf6fdd7154c2414a449456ff4c600f31eba138fb4d3f94e68743af4b71f7368c30b398 WHIRLPOOL 747a1ddf1bd8973a7ebbeb3a673aae00a182969291f1a946597e801afc5dab1237c5b13c28f46297bd43d44b904929faf552d8337a9965f040f31d4d51827452
+DIST Carp-Assert-More-1.16.tar.gz 12290 SHA256 8ed01cdd95715c41b690ed3add4f121f5161b0fae09dff8cb227613ab46932f5 SHA512 9f81604574eab5a0a5003ad747ffec3a3dd33bc63e67d12697e4e30de8cb234a73e225f82a4d0f31576e19382cc2d6a402962f5fe1e4c5289e080ca23b30c0fe WHIRLPOOL e95875e85281a8e3cd3448cc842c9e6f49be1863e0e66b5b76f45c5603c861423d465defaa3080c5a15c630a45309ff397c8669f974328971524e776a25bd24a
diff --git a/dev-perl/Git-Wrapper/Git-Wrapper-0.47.0.ebuild b/dev-perl/Git-Wrapper/Git-Wrapper-0.47.0-r1.ebuild
similarity index 75%
rename from dev-perl/Git-Wrapper/Git-Wrapper-0.47.0.ebuild
rename to dev-perl/Git-Wrapper/Git-Wrapper-0.47.0-r1.ebuild
index c6964a0471f4..bc2693e5b6e6 100644
--- a/dev-perl/Git-Wrapper/Git-Wrapper-0.47.0.ebuild
+++ b/dev-perl/Git-Wrapper/Git-Wrapper-0.47.0-r1.ebuild
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND="
+ dev-vcs/git
virtual/perl-File-Temp
dev-perl/File-chdir
virtual/perl-IPC-Cmd
@@ -34,3 +35,13 @@ DEPEND="${RDEPEND}
virtual/perl-Test-Simple
)
"
+src_compile() {
+ perl-module_src_compile
+ local MODULES=(
+ "Git::Wrapper ${DIST_VERSION}"
+ )
+ for dep in "${MODULES[@]}"; do
+ perl -Mblib="${S}" -M"${dep} ()" -e1 ||
+ die "Could not load ${dep}"
+ done
+}
diff --git a/dev-perl/WWW-Dict-Leo-Org/Manifest b/dev-perl/WWW-Dict-Leo-Org/Manifest
index ab520e81fef1..2b1d3b763302 100644
--- a/dev-perl/WWW-Dict-Leo-Org/Manifest
+++ b/dev-perl/WWW-Dict-Leo-Org/Manifest
@@ -1,2 +1,3 @@
DIST WWW-Dict-Leo-Org-1.40.tar.gz 13656 SHA256 4285702fd5d3e0633891739cb149b9f950afe4c69ad0a10a9c6e185ff29552da SHA512 1f71e7571eef4f68addf1b999e61bc0ecbe3fd5fc5bf1156c20d1c5018f232d7ed986bbf714bc549865c1cf81e3863b453065234033d8b763768db29f8e565f7 WHIRLPOOL 7b70536cc2ddd040a21a9027910afbbdcedf080fd07f677b410764e2cb24c143acc23fe5ee38122046bd04bf9f4a715b098a336c3edc7f65f8534d152822f13b
DIST WWW-Dict-Leo-Org-2.00.tar.gz 14169 SHA256 36da8827396263791c097724c9545c39877a0b827d1fa7f61463ee54b3c20428 SHA512 7fa523eb1668dd96ec7486eb977851785fec3124be770ae5237f0dd6b27c0cfbafa31b7f5153f68904a2789682c53255b7a48b61c7bf2fbca5fea6d88616e42e WHIRLPOOL 4bb6235f84e95ab76a0a5627f8e0a98bcd84f809a40c4ce63297cf75e35e8fbf47b79e5a6db815e1a028cad26a7fd91ea218a78196198256f1c83e77b7820c49
+DIST WWW-Dict-Leo-Org-2.02.tar.gz 14235 SHA256 c845270cc7490131a5b93d3314228c90802f9a6a15e72df95c50daf12662f84c SHA512 eb967ff667545c5cfca384d9759e5def194aa72f4d6957a1f5b021c0b4be5d1acd43d084efadaa6e5e74e93458d82a1290a8a35360a4caeb6ba497da13ce2a92 WHIRLPOOL ec186ceb9b46e5e5ec7e504c9c983290b1ede5e44daafc5814b22c761114273697ba3922fa0c88466927bad6308c661dee104e30b6fbebc04a604cedd375a3f9
diff --git a/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-2.20.0.ebuild b/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-2.20.0.ebuild
new file mode 100644
index 000000000000..56f9175c9c1b
--- /dev/null
+++ b/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-2.20.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=TLINDEN
+DIST_VERSION=2.02
+DIST_EXAMPLES=("samples/*")
+inherit perl-module
+
+DESCRIPTION="Commandline interface to http://dict.leo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ virtual/perl-Carp
+ dev-perl/IO-Socket-SSL
+ dev-perl/HTML-TableParser
+ virtual/perl-MIME-Base64
+ dev-perl/XML-Simple
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
+
+src_prepare() {
+ einfo "Renaming leo to Leo"
+ mv "${S}/"{l,L}eo || die
+ sed -i "s/'leo'/'Leo'/" "${S}/"Makefile.PL || die
+ sed -i "s/^leo$/Leo/" "${S}/"MANIFEST || die
+ perl-module_src_prepare
+}
+
+pkg_postinst() {
+ elog "We renamed leo to Leo"
+ elog "due to conflicts with app-editors/leo"
+}
diff --git a/dev-perl/XML-AutoWriter/Manifest b/dev-perl/XML-AutoWriter/Manifest
deleted file mode 100644
index a877444dc4a3..000000000000
--- a/dev-perl/XML-AutoWriter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST XML-AutoWriter-0.4.tar.gz 48672 SHA256 8ff09ff84c3c91f7db8e79db2de149391a97605a35f55f3cafb5e95f1e1f759c SHA512 ef49a052df8686d5e3fa14ff83053b5dfb617a3fac66db47c5f7d539d54423e7a95aa7612e313a581c9f2012f996f4a8019652079ef096ced3b22203de26e992 WHIRLPOOL 886535946fd6e9318478bea1a27afd197a5f4afdd490d745ce0ef9d13198ead8fb3cad2b7e48b27fbdd40167de7cef5e40bc2a17ab109efcf86733c0016a6f0f
diff --git a/dev-perl/XML-AutoWriter/XML-AutoWriter-0.400.0-r1.ebuild b/dev-perl/XML-AutoWriter/XML-AutoWriter-0.400.0-r1.ebuild
deleted file mode 100644
index 77d701623563..000000000000
--- a/dev-perl/XML-AutoWriter/XML-AutoWriter-0.400.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=PERIGRIN
-DIST_VERSION=0.4
-inherit perl-module
-
-DESCRIPTION="DOCTYPE based XML output"
-
-LICENSE="|| ( Artistic GPL-1+ BSD )"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-perl/XML-Parser"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- sed -i '/^auto_set_repository/d' Makefile.PL || die
-
- sed -i -e 's/use inc::Module::Install/use lib q[.]; use inc::Module::Install/' Makefile.PL ||
- die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-
- perl-module_src_prepare
-}
diff --git a/dev-perl/XML-AutoWriter/metadata.xml b/dev-perl/XML-AutoWriter/metadata.xml
deleted file mode 100644
index ff13239aca4c..000000000000
--- a/dev-perl/XML-AutoWriter/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- perl@gentoo.org
- Gentoo Perl Project
-
-
- XML-AutoWriter
- XML::AutoWriter
- XML::Doctype
- XML::Doctype::AttDef
- XML::Doctype::ElementDecl
- XML::VWElement
- XML::ValidWriter
-
-
diff --git a/dev-python/oslo-service/oslo-service-1.25.0.ebuild b/dev-python/oslo-service/oslo-service-1.25.0.ebuild
index 1afe877be3e7..4443ed6a468e 100644
--- a/dev-python/oslo-service/oslo-service-1.25.0.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.25.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.service-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index 82f0b88ee1a1..c5e4961abd86 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -1,3 +1,4 @@
DIST ovs-2.4.0.tar.gz 61230 SHA256 ea38287b56fd19af24dd6d1c0098ccc8ded9e8f9daeb04b152e3835278becd01 SHA512 45dd7e040c56f8ef16a2ca1fddb769c6d2c67c729f1889dcd867d57d6de8fe4f6baafe99113db05e20adf41389feea2ea9f69739256842404edce6ac28782e07 WHIRLPOOL 2dfde0a2eb334deea8bf88ceea15ad8c5e237cdd3e01cf6a0a7a5a1029bb7aca9bfc3ee83f88687d014723e82199776882ac89ccca1cac051142f48e46ad53a5
DIST ovs-2.6.1.tar.gz 67436 SHA256 939aa4e3135b02143907c850ab573d42c192b14a5c210cd6417a9489a7e65f3f SHA512 967baf44ccb36902fb28eb0df299bd9cca42a5cc030aa059d7cf90c79b8ad79ce8d854801acba4f711753bca47957485d6f4ad7deacd72cbce7d9fa9fba02292 WHIRLPOOL 561ad0cab25e7471cd189f9ea3b1d6a358f2cd48fe78550c2020333db66eb8cb13fac9486a033e96b65abffb7e47924d1987d26b84030e9d568dc13542b6fad5
DIST ovs-2.7.0.tar.gz 73714 SHA256 a9bc0a530122e45bf0d0f4248dbaab58fec023db005b3038ba79ff20736c9e4a SHA512 6732721f494b0de24dd6b79ca12d45d7e2da8598906384c6fcc4cc0de4dadb87a822c5e0aa4c07065138a0837a850e7d07ae50e6dea9e0752beba667bf154e22 WHIRLPOOL eace56d7fc39d41f8b1dd551daf63dc0ae708f6e52a6752384a8c6f8e2a13b8692695b17afbee77fad8f0ee9d48576dd13cdf0b082c8215cb5e9602d4263d7c3
+DIST ovs-2.7.2.tar.gz 74222 SHA256 24cc9e324b03ba8d5799f07edf6c8eef013d6cbf741707f42200b1674fd60928 SHA512 568f256a2ad204d5b4a237f1f52c903a1041bb03e30b56e390ea4995c646b49225f69eb5804faf996a9db56916398597100a16ff86bd6798d01ee427073c89ac WHIRLPOOL 3e03a9db516fc725b99ad209e7140266097dcc3508df11caa9cd99dd0450fc1c2cb0e5b06bb3d27c461c6917e6c239b75830ef1d7ed6c8440a141e2a3ac6cdde
diff --git a/dev-python/ovs/ovs-2.7.2.ebuild b/dev-python/ovs/ovs-2.7.2.ebuild
new file mode 100644
index 000000000000..b0aff0382bd3
--- /dev/null
+++ b/dev-python/ovs/ovs-2.7.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OVS bindings for python."
+HOMEPAGE="https://github.com/openvswitch/ovs/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-qt/qtphonon/Manifest b/dev-qt/qtphonon/Manifest
deleted file mode 100644
index 1bd4b07babd8..000000000000
--- a/dev-qt/qtphonon/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
diff --git a/dev-qt/qtphonon/metadata.xml b/dev-qt/qtphonon/metadata.xml
deleted file mode 100644
index 36aa5c7fc9d4..000000000000
--- a/dev-qt/qtphonon/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
- qt@gentoo.org
- Gentoo Qt Project
-
-
-
- https://bugreports.qt.io/
- https://doc.qt.io/
-
-
diff --git a/dev-qt/qtphonon/qtphonon-4.8.6-r1.ebuild b/dev-qt/qtphonon/qtphonon-4.8.6-r1.ebuild
deleted file mode 100644
index 45ec18f3461b..000000000000
--- a/dev-qt/qtphonon/qtphonon-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The Phonon module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS="arm hppa ppc ppc64"
-else
- KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd"
-fi
-
-IUSE="dbus qt3support"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
- aqua? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] )
- !aqua? (
- >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-meta-0.10-r9:0.10[${MULTILIB_USEDEP}]
- )
- dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
- !kde-apps/phonon-kde
- !media-libs/phonon
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
- src/phonon
- src/plugins/phonon"
-
-QCONFIG_ADD="phonon"
-
-pkg_setup() {
- QCONFIG_DEFINE="
- QT_PHONON
- $(use aqua || echo QT_GSTREAMER)"
-}
-
-multilib_src_configure() {
- local myconf=(
- -phonon -phonon-backend
- -no-opengl -no-svg
- $(qt_use dbus qdbus)
- $(qt_use qt3support)
- )
- qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtphonon/qtphonon-4.8.7.ebuild b/dev-qt/qtphonon/qtphonon-4.8.7.ebuild
deleted file mode 100644
index d346189534d8..000000000000
--- a/dev-qt/qtphonon/qtphonon-4.8.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=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The Phonon module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd"
-fi
-
-IUSE="dbus qt3support"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
- aqua? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] )
- !aqua? (
- >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-meta-0.10-r9:0.10[${MULTILIB_USEDEP}]
- )
- dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
- !kde-apps/phonon-kde
- !media-libs/phonon
- !media-libs/phonon-gstreamer
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
- src/phonon
- src/plugins/phonon"
-
-QCONFIG_ADD="phonon"
-
-pkg_setup() {
- QCONFIG_DEFINE="
- QT_PHONON
- $(use aqua || echo QT_GSTREAMER)"
-}
-
-multilib_src_configure() {
- local myconf=(
- -phonon -phonon-backend
- -no-opengl -no-svg
- $(qt_use dbus qdbus)
- $(qt_use qt3support)
- )
- qt4_multilib_src_configure
-}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index b997cf1643dc..de3cdaf40fdb 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -2,3 +2,5 @@ DIST capybara-1.1.4.gem 72192 SHA256 33073d7e4920a3e74c61ec46d1afe655eb0f3361187
DIST capybara-2.13.0.gem 257024 SHA256 09d574e170b8042914c08630382ed784694c1b2bd1c04af482fbfd71cd56994d SHA512 35e096fa4aed8fea1456d3271bb0dbeb14215ab856a52071243e76d27aaa25f34b256edf8e391cfe024368555aeb2b68dafc896269d231c01e58c247e7a10ac2 WHIRLPOOL 723a4090cc4a438c45c23a491967043e7a2a9a996df6097b88ce7dd7eb69697f19fdbaa63d4b12c7dea317dbd90456c5ae8dde89899d1888fe0633675daa231f
DIST capybara-2.14.4.gem 265728 SHA256 bbdfd40c542c790dab81032e23bbc7438a562bbe440b4712abcad67f10d17d7d SHA512 d3ebbd8d96e4d2026327b1c70ff723225ce052fff510a909111b8cc7e02b12fec9e00acddc0bc2565371cc5eb0b590abef43d42a99c3938a929ea25930fdefd1 WHIRLPOOL e4829ed0895af9b80c936ffe7f274e0637ab0b1cc2e790e261089fae14a0f8544fd178409e1420527d5eec69104a96aa4ab87e0f6f088e94bad9371e4c260ce2
DIST capybara-2.15.1.gem 270336 SHA256 22718339815ad16a26b9832f496f8c9fdee41af8fe941e2283eee6d03287502d SHA512 03295b5008889523930898b51d943cd0976e0c3a771acb2d54a899009d77ab8248d94153089283cb73813e3397e656c3bc1ee7deee0d0cd001f8e15a79c45119 WHIRLPOOL f246bce1ff16f748f3628c8382e0c6a520e56a90b36ed4e8cf3432ab9de79711890952356b412f3e23b0a1d9526690955c706c4b061c94f09ceb2425035d8497
+DIST capybara-2.15.2.gem 270848 SHA256 11223a4f98942913a67520c8e1126ae6f544b48f26844a9098f5f440caf12b50 SHA512 8c7eec2d23dcf82b1c41144fcaf5151330c220277bf2fe2a4713a79c6b065789465a9e867936a25d00bce727ab218cd3ff9934a67158552a04f552d734ee5387 WHIRLPOOL 519d6c841e8a1edd5372086f76400856525c7f6daa3c97616ab2c6ef4a382d0a66718137b29295af44292608a35d699f1977bf313f628f1abf50a0c619ac7050
+DIST capybara-2.15.3.gem 271360 SHA256 b67bcaa5ed9082c14179d9ea5268ff1b3455ece0a52f21bee4e203fe6fc791bf SHA512 8248f29e2da570b693092136850f6a4b8e06451c502493177884a9306bd8704843ddc2d3caa8c530c39909257e308bda86cedf263bcf5eded83d734229de6bca WHIRLPOOL 8777ed1248d8edd36bbb6b142806900d9a2c5785f892e249d27ec1c09bc3537b8b9a686a0475132c1c46bf427055f6644a83dc5ffc72fb76839ae5d6b5adc103
diff --git a/dev-ruby/capybara/capybara-2.15.2.ebuild b/dev-ruby/capybara/capybara-2.15.2.ebuild
new file mode 100644
index 000000000000..e978384153dc
--- /dev/null
+++ b/dev-ruby/capybara/capybara-2.15.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="2"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( www-client/firefox )"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
+
+ruby_add_rdepend "
+ dev-ruby/addressable
+ >=dev-ruby/mini_mime-0.1.3
+ >=dev-ruby/nokogiri-1.3.3
+ >=dev-ruby/rack-1.0.0:*
+ >=dev-ruby/rack-test-0.5.4:*
+ >=dev-ruby/xpath-2.0.0:2"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
+
+ # Avoid window-manager specific tests (sizes are specific for fluxbox)
+ sed -i -e '/#maximize/,/^ end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+ # Avoid spec that requires unpackaged geckodriver
+ sed -i -e '/register_server/,/^ end/ s:^:#:' spec/capybara_spec.rb || die
+
+ # Avoid test dependency on puma server for now
+ sed -i -e '/should have :puma registered/,/^ end/ s:^:#:' spec/capybara_spec.rb || die
+}
+
+each_ruby_test() {
+ virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
+}
diff --git a/dev-ruby/capybara/capybara-2.15.3.ebuild b/dev-ruby/capybara/capybara-2.15.3.ebuild
new file mode 100644
index 000000000000..e978384153dc
--- /dev/null
+++ b/dev-ruby/capybara/capybara-2.15.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="2"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( www-client/firefox )"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
+
+ruby_add_rdepend "
+ dev-ruby/addressable
+ >=dev-ruby/mini_mime-0.1.3
+ >=dev-ruby/nokogiri-1.3.3
+ >=dev-ruby/rack-1.0.0:*
+ >=dev-ruby/rack-test-0.5.4:*
+ >=dev-ruby/xpath-2.0.0:2"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
+
+ # Avoid window-manager specific tests (sizes are specific for fluxbox)
+ sed -i -e '/#maximize/,/^ end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+ # Avoid spec that requires unpackaged geckodriver
+ sed -i -e '/register_server/,/^ end/ s:^:#:' spec/capybara_spec.rb || die
+
+ # Avoid test dependency on puma server for now
+ sed -i -e '/should have :puma registered/,/^ end/ s:^:#:' spec/capybara_spec.rb || die
+}
+
+each_ruby_test() {
+ virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
+}
diff --git a/dev-ruby/flexmock/Manifest b/dev-ruby/flexmock/Manifest
index d26527870863..1927b2c120f3 100644
--- a/dev-ruby/flexmock/Manifest
+++ b/dev-ruby/flexmock/Manifest
@@ -1 +1,2 @@
DIST flexmock-2.3.5.tar.gz 91482 SHA256 97404104df369f1dc0c88f1845bae2c872cd721f577f49615a820b6c6a712d70 SHA512 5012228b5fdf5f7501655a6d0d6073b2a2ff6e5b975fd71dd59db16ff9996e0742e0f8ed9ca9a20d4c4da773835b40453de26ff6e43b93f96b5ba6760f01a130 WHIRLPOOL 0c50c954854d1fe1741536e9561a322f0f54eccdc802a5732e05813589eaa7af2c1e0c33959064f310c42c14f651b0a4e09012f7fd812d4f19789e92ee024f82
+DIST flexmock-2.3.6.tar.gz 91601 SHA256 f52c6858a761ed035080a767c5ac91b65852092eacd1455425ad4c35897178fc SHA512 0fcc25c1a83ba1e2aed91eed98242592dfc1a69d57c033fbd363383962b16d6e72011d62a906ae8bf076801a3d5e8e8501bdb9f6ca3750c9615dfe8b9b0bdbbc WHIRLPOOL 52d94a39971992c498ff4f9baf689f045a3ed13b3e89a04efb3e7fb5d2eac05e4b2ca1a9fcc289447fb2bffa75f61ac4d91798610d0e2c19f47bff0707c9a62c
diff --git a/dev-ruby/flexmock/flexmock-2.3.6.ebuild b/dev-ruby/flexmock/flexmock-2.3.6.ebuild
new file mode 100644
index 000000000000..c82cff10c13d
--- /dev/null
+++ b/dev-ruby/flexmock/flexmock-2.3.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*.rdoc doc/releases/*"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple mock object library for Ruby unit testing"
+HOMEPAGE="https://github.com/doudou/flexmock"
+SRC_URI="https://github.com/doudou/flexmock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="flexmock"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~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:5
+ dev-ruby/rspec:3
+ )"
+
+each_ruby_test() {
+ RSPEC_VERSION=3 ruby-ng_rspec test/rspec_integration
+ ${RUBY} -Ilib:.:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
+
+all_ruby_prepare() {
+ sed -i -e '1igem "minitest", "~>5.0"' test/test_helper.rb || die
+}
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index 3b3973c2b6b9..bbb083aff859 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -5,3 +5,4 @@ DIST hiera-3.3.0.gem 40448 SHA256 58ebf6e9d778e7d671f0e5ab381a80497d1e251770057c
DIST hiera-3.3.1.gem 40960 SHA256 501b8188e9ac6ed4266742e4e47df185815cb7ed6023a121fbf97b2308c3394b SHA512 c9032fa0d01f43b22b5d59fa9e8f3b6353b2a91b4ddba9aa6f7c8debfbd2b1089f0b471be5cd0f864025aabeb3f117dabab0a342ae9f659d6dfc13480f27a7a5 WHIRLPOOL 14e006dd17bdfaef9a8b1942e44f37346ad3cc01b1c4f291bb69a7515fddddd14f26f58d87e79125e85870d71be751f6a296c76e63331d47d25848e3aba5c936
DIST hiera-3.4.0.gem 40960 SHA256 9d036ccd8a45594ebbb5cdc0dd79a8ff5a3a52c3c276943126f18149af302459 SHA512 046e2af62a914563b141674f70f5dc9bc75c22f73e8fb1e1a5fd33b0d1c33ce3464327f7508d5f2f0af62261cbe6f4a3eee55646ff50fc768e325d3407111b11 WHIRLPOOL 29b9e7a3ca578fdd341b3e6bad8bb4c3fce3a6cdf2c29f0adef7a7aa035e34ccfeb15d2220d2bc00352b1bab8a13690eb52526640e9326928d8558c5b2951940
DIST hiera-3.4.1.gem 41472 SHA256 dafd7497d62dede5bc96f3ed986479f4989a54a19b45120fb87c6b4c2a0507e3 SHA512 ce8d5ed3a2bb4a7180331f8d3020e76862643174caffd3b6a593f62363b9ddd9d9cf0761a2b05d9132ce296b36b2d9dc80376a67c6e63f14911b7a512629c8c1 WHIRLPOOL e740bc03c5bb0720e01dd87362fa69cbfb72451141e9eaa753a2b2dd0acb6fc11faa2ec210696e9f3f9162d371a1b479c69c6e955b6c80dfcbbbbf806f0d36a5
+DIST hiera-3.4.2.gem 41472 SHA256 ff6bc8a27c9c0627790bc67dbedb8c3c5907f594f0ec798659c99bcd0ff2026d SHA512 33045e395fa06467ae61f42eeab5b48b76a03274243db52dff7dbf8a08052b8cd2e0dd609d6a13317efab485408c7351cc2553ba2e5a767afa09a8a21735852f WHIRLPOOL 5778f329464422818aa91a99672493ded20f09fc49186f165cae113eea3dc91e44af729d061ffe219c72cc040bf52f055e2655ac6c712602ac55d39b9e9adf8c
diff --git a/dev-ruby/hiera/hiera-3.4.2.ebuild b/dev-ruby/hiera/hiera-3.4.2.ebuild
new file mode 100644
index 000000000000..91b6811fbdba
--- /dev/null
+++ b/dev-ruby/hiera/hiera-3.4.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple pluggable Hierarchical Database"
+HOMEPAGE="https://docs.puppet.com/hiera/latest/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index ea91f3fc98f7..3220d8a5d60e 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -1,4 +1,3 @@
-DIST tzinfo-0.3.52.gem 299520 SHA256 8354497af5f03549fbca9880074b6fa3f33c842accec0d8e5d5f19c3bae43c17 SHA512 12923bdf4743787be17416b60ee6bf10e851e9fb74c4d4ed9039ee94fa782ff38e5c2468f5bfcdff87d79bd4c73424b972e2f8a698c28c79c90d8df73e6da0b8 WHIRLPOOL 274a10a88ee4b96c0a6ec40cc49de89ff5ea697221f43aa462f6e6d1b322d6e848463607c376d0112cc6d52106952fc38bd7579308caa2c3ac76c55beda8adc4
DIST tzinfo-0.3.53.gem 301056 SHA256 7e16e6ed8c0c44c0d1e581f3b21bbaae9c8ae206c243dc1cba4368270d8fb83e SHA512 f5a0119c04852845f1e4c8db36a2a374f2886ee5a14eee74ecacf19bc60bdf3e65197ee2ad1fe4fee56ac882b2e7cf17dcb4fef593767675e1fdb3da33b31b24 WHIRLPOOL ff3cb38a531a4f3fdcc8bfcd0a5ded8f18f2e14fdc27f51c0c57b7b758ec9b4096d10d1c90641f031d01b18c60fc791a2b48c4750b3d9b5e26889c8ad8972518
DIST tzinfo-1.2.2.gem 147456 SHA256 fdb1d3fdf2776d490c82a0e589a08e7cbde70ac1ae7d2b1f0b7e77f3e6b801b0 SHA512 717f5bda5a40e8225446c4ff413746a526682e5bb58e5047a2d1c8d0769cadaaca612d1f01c758fab5751f81f285156d77abbab08131de627a62def1a4e2eeb1 WHIRLPOOL f49a1b91f6765671043c4a7435df0cd6dfb4b5d55b9305b6fec0cde790708e90adf0d30c966000bf88908e4b2cf39c508d9a1f2dd1b352b689f2c0f4a2d2b6f7
DIST tzinfo-1.2.3.gem 151552 SHA256 9469862963cf5e8f12bb7d1cf89e681ebfee417537f6835b2e471c7c260d2817 SHA512 79a0c364d02ae1964e032586546073ebda3af822cbc064c06927cf48b7c9d0577ad38a738dc4e7065fd8a56e5a7939290e74031d850172635906744c841a6d2c WHIRLPOOL ed678c620c95a565da1f3115c78545602cb5cd66018fd33d2f3f2da82a8bf4fb015b3a94614d3823cd3eb52a8e71b7b21b00f1e5cdad17e315ba4a4d75f6ec62
diff --git a/dev-ruby/tzinfo/tzinfo-0.3.52.ebuild b/dev-ruby/tzinfo/tzinfo-0.3.52.ebuild
deleted file mode 100644
index f134b56aa725..000000000000
--- a/dev-ruby/tzinfo/tzinfo-0.3.52.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ruby23 -> fails tests
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Daylight-savings aware timezone library"
-HOMEPAGE="http://tzinfo.github.io/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-all_ruby_prepare() {
- # With rubygems 1.3.1 we get the following warning
- # warning: Insecure world writable dir /var/tmp in LOAD_PATH, mode 041777
- # when running the test_get_tainted_not_loaded test.
- sed -i \
- -e '/^ def test_get_tainted_not_loaded/, /^ end/ s:^:#:' \
- "${S}"/test/tc_timezone.rb || die "unable to sed out the test"
-}
-
-each_ruby_test() {
- TZ='America/Los_Angeles' ${RUBY} -I. -S testrb test/tc_*.rb || die
-}
diff --git a/dev-util/Orange/Orange-3.4.5-r1.ebuild b/dev-util/Orange/Orange-3.4.5-r2.ebuild
similarity index 97%
rename from dev-util/Orange/Orange-3.4.5-r1.ebuild
rename to dev-util/Orange/Orange-3.4.5-r2.ebuild
index 55fd7219d13c..3e1710650bc0 100644
--- a/dev-util/Orange/Orange-3.4.5-r1.ebuild
+++ b/dev-util/Orange/Orange-3.4.5-r2.ebuild
@@ -30,6 +30,7 @@ RDEPEND="
>=dev-python/pyqtgraph-0.10.0[${PYTHON_USEDEP}]
dev-python/PyQt5[webkit,svg,${PYTHON_USEDEP}]
dev-python/radon[${PYTHON_USEDEP}]
+ dev-python/typing[${PYTHON_USEDEP}]
>=dev-python/xlrd-0.9.2[${PYTHON_USEDEP}]
>=sci-libs/scipy-0.11.0[${PYTHON_USEDEP}]
>=sci-libs/scikits_learn-0.18.1[${PYTHON_USEDEP}]"
diff --git a/dev-util/btyacc/metadata.xml b/dev-util/btyacc/metadata.xml
index fa6a94bf1c19..40aa45df2b01 100644
--- a/dev-util/btyacc/metadata.xml
+++ b/dev-util/btyacc/metadata.xml
@@ -1,18 +1,8 @@
-
-wlt@obsidian-studios.com
-William L. Thomson Jr.
-Maintainer. Assign bugs to him
-
-
-patrick@gentoo.org
-Patrick Lauer
-Proxy maintainer. CC him on bugs
-
-
-proxy-maint@gentoo.org
-Proxy Maintainers
-
+
+ patrick@gentoo.org
+ Patrick Lauer
+
diff --git a/dev-util/dejagnu/dejagnu-1.6.ebuild b/dev-util/dejagnu/dejagnu-1.6.ebuild
index 6ea9754aa795..3c1d667317da 100644
--- a/dev-util/dejagnu/dejagnu-1.6.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="doc"
+IUSE=""
DEPEND="dev-lang/tcl
dev-tcltk/expect"
@@ -25,5 +25,4 @@ src_test() {
src_install() {
emake install DESTDIR="${D}"
dodoc AUTHORS ChangeLog NEWS README TODO
- use doc && dodoc -r doc/html
}
diff --git a/dev-util/icemon/Manifest b/dev-util/icemon/Manifest
index 1aca7a3ab2fb..8e10952b98ce 100644
--- a/dev-util/icemon/Manifest
+++ b/dev-util/icemon/Manifest
@@ -1,2 +1 @@
-DIST icemon-20140102.tar.xz 69212 SHA256 6af68804b554dd55fcd89aae8e4032a70df653dc24cb81aa5a8557c7733cdb34 SHA512 96ffa914fb02f4dfefe489b4a55d62db736d71e0df0e613f7d0135b477449e687919001711661f4892fde6cc0d58267ecfd09dad95a4fff84c4381aba705845e WHIRLPOOL bc5f35dd920a59a69849d1bdf5fd9c6e45ea86f6bd66c3abb050276feba984b3c385afc18a4ce08b58068742af867450ebc4a6e97b9af8d569a2361119012336
DIST icemon-3.1.0.tar.gz 111139 SHA256 8500501d3f4968d52a1f4663491e26d861e006f843609351ec1172c983ad4464 SHA512 43b5c959cd66fa65cac25994e5b8f26646b49b57405bd80d6ddb12cc7ed5bfeb5f91f5816900883078075685c25159f5a19b3198594027b3a1b8b0c489237b39 WHIRLPOOL f796343ece42fa5c505bd39902d6198177bc4e61c0a888b6dc17cdcb426ce14ec48f3902a23e18f7c64c702eec40cbef990bf3b7dbbd8e38bb42cf04767d9037
diff --git a/dev-util/icemon/icemon-20140102.ebuild b/dev-util/icemon/icemon-20140102.ebuild
deleted file mode 100644
index 02edb48197fc..000000000000
--- a/dev-util/icemon/icemon-20140102.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit kde4-base
-
-DESCRIPTION="Icemon is a KDE monitor program for use with Icecream compile clusters"
-HOMEPAGE="http://www.opensuse.org/icecream"
-SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- sys-devel/icecream
-"
-DEPEND="${RDEPEND}
- app-text/docbook2X
-"
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 46d6bdaee811..4248aedfd97f 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -5,3 +5,4 @@ DIST jenkins-bin-2.71.war 72956752 SHA256 14727da24054e956dc8b8514998e19001c99ef
DIST jenkins-bin-2.73.1.war 72954406 SHA256 171c6b3d819fb0240ccd06831b4b493bc7d1eb37ca2632c94f907f15b3aedf7f SHA512 82287ecb00c2638afd7f865b1e84da64fb1203c7d93926b7eb1b6dc46b44344d3ae020442d900264e525c3a5d25209a5aaa1c5ee253689ea4acd50ee906a9638 WHIRLPOOL 182c4615b33d818d6758b7da1ca1059926b06a0c1d11655c68538af6d19dbf2d8f299c7820aa52fd016be1396607b06006cbbef69f2887cc3327b0fd459b7380
DIST jenkins-bin-2.78.war 73240530 SHA256 9d8ce9653d7a1ada2071ad9688ba7938e1e0672586e893e578dbfecdff725df6 SHA512 444c566c96c6d333319bf03629f58a05060628511326cd4fc02252fa55e70950c7901315318e9acd44ee33b51ab911da5f716fc3073b88fb10e3c0ed5977251e WHIRLPOOL 89e0a5ddad12e7f455546189fb878fef8b6d112832079f9ef96f4a298b7d1abd2b670d9b29a2fe22ef277a871b5986d91c967b1cdd0e72be3397ddb6c0cc5752
DIST jenkins-bin-2.80.war 73094442 SHA256 69a84b894ad03518a66ffef6f63e289476a35a15e0ff186f0ab70f17b87a2a88 SHA512 3e39a4be9e4d977003db72fbdee77824eb9e65a62730a489bc8fcc45941f659d0d766e80d8d1913a2027bbbf8f356b9db18872f03ce1627467e3be373c781ab1 WHIRLPOOL d8fd4140944e44f84704f4eb4bdfca3dd865e3ce21b54a43c0d571a3ab95d95137d35e5ca856c2d41797765f30b9548bfb404e4674b8e338399737ab80a7e10b
+DIST jenkins-bin-2.81.war 73097494 SHA256 6cdb8912f63b19bad5f87e9200babb8926ab1a1a480998b1f54d4a215c354338 SHA512 94b250119441f19996672bd5df216d86034c1188f0293beea8833bf77ad59706dbb8082a8540aa70c0ddc96cb5e1cf57f30c87ee5bda3e7794040a6df436e5de WHIRLPOOL 0b6e2804526e739953c3a004d8d0918f2fcc13fa0a8ec125dca04240f77582c9c85ddca5d1bd359cbd1594c823e6e4bf47b02a7d1fced55f2468147b2bc954d8
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.81.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.81.ebuild
new file mode 100644
index 000000000000..2101948a704e
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.81.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/ragel/ragel-6.10.ebuild b/dev-util/ragel/ragel-6.10.ebuild
index 6ccf394ea31b..6beccbb01917 100644
--- a/dev-util/ragel/ragel-6.10.ebuild
+++ b/dev-util/ragel/ragel-6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="vim-syntax"
DEPEND=""
diff --git a/dev-util/webstorm/Manifest b/dev-util/webstorm/Manifest
index f0037b8bef91..d852ce7c3770 100644
--- a/dev-util/webstorm/Manifest
+++ b/dev-util/webstorm/Manifest
@@ -1,2 +1,3 @@
DIST WebStorm-10.0.4.tar.gz 130242508 SHA256 f2c6b6fde74513858f204a6fc5d4f39a6b3424edcc1abc435e566ead0929319c SHA512 2523795dc3cc4395549313584e8e597b2782eb2c6ad577d0aae81b72656f00a2cc2f9bbac77f83f9e1f74350aaa762d8b7ba873558a37af316839784e506c6ec WHIRLPOOL a76ad8b92e454e12ce2948c98041a1cbc671848519a3fe329b3f6524b3bc9cb52922755668048b72011f856fadf28386ebd048830558197516029a8594a83d87
DIST WebStorm-2016.2.2.tar.gz 215535491 SHA256 06af83ee181b37ae0a1108b4b88ae9a8d10f153796f3c59c879a4ead24dc4e58 SHA512 84123bd5e169e87490f3b71f7259b6b13a7885b5a66b912957cd6e869b6f985db0f0a0f3a232436b1894096ec8d74c2b907c4162f2fdd212f96cb0a3d5f41f48 WHIRLPOOL 9a9cb5d88cded6d6472a6c64425e692144d209da1b72f725db7b5f0dd0a5ff4b1fc90c2da659be7a6520fa2056ae90a99c779ce7bfbd0bf713e9323375ea85a1
+DIST WebStorm-2017.2.4.tar.gz 257748171 SHA256 c0aa4f21bdb2bed8a2fe1b1a831ac7ace625695ce2cfc0d3a88ea8ecf572a2b5 SHA512 283339f7757093affde698cfb751f7ced18d54159db7696c9fe6b4d37751e94ad1ca9f0c54db9d5ca256da35ee24454a3b48ced21d6db434c23ec94b023a4d09 WHIRLPOOL 2c223a3c8ef37b64b568934c488ef4afb85e2e7577c3a9305205cf31c542783019f2dc0710bf0560772fe8a280bf91135969b6d0a5f89438316549191848eafd
diff --git a/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild b/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
new file mode 100644
index 000000000000..cd605cc309aa
--- /dev/null
+++ b/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+EAPI=6
+
+inherit eutils versionator
+
+DESCRIPTION="JavaScript IDE for client- and server-side development with Node.js"
+HOMEPAGE="http://www.jetbrains.com/webstorm"
+SRC_URI="http://download.jetbrains.com/${PN}/WebStorm-$(get_version_component_range 1-3).tar.gz"
+
+LICENSE="WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal"
+SLOT="$(get_major_version)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jdk-1.7"
+
+S="${WORKDIR}/WebStorm-$(get_version_component_range 4-6)"
+
+src_install() {
+ insinto "/opt/${PN}"
+ doins -r .
+ fperms 755 /opt/${PN}/bin/{${PN}.sh,fsnotifier{,64}}
+
+ make_wrapper "${PN}" "/opt/${PN}/bin/${PN}.sh"
+ newicon "bin/${PN}.svg" "${PN}.svg"
+ make_desktop_entry "${PN}" "${PN}" "${PN}" "Development;IDE;"
+}
diff --git a/dev-vcs/git/git-2.13.6.ebuild b/dev-vcs/git/git-2.13.6.ebuild
index c1535051f481..c6e03f2bf299 100644
--- a/dev-vcs/git/git-2.13.6.ebuild
+++ b/dev-vcs/git/git-2.13.6.ebuild
@@ -38,7 +38,7 @@ if [[ ${PV} != *9999 ]]; then
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
[[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/games-action/barrage/barrage-1.0.4-r1.ebuild b/games-action/barrage/barrage-1.0.4-r1.ebuild
index 1ebaa22b2d3a..16aeec97af84 100644
--- a/games-action/barrage/barrage-1.0.4-r1.ebuild
+++ b/games-action/barrage/barrage-1.0.4-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils
DESCRIPTION="A violent point-and-click shooting game"
-HOMEPAGE="http://lgames.sourceforge.net"
+HOMEPAGE="http://lgames.sourceforge.net/Barrage/"
SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/games-action/barrage/barrage-1.0.4.ebuild b/games-action/barrage/barrage-1.0.4.ebuild
index aec46d86d06e..0360dc6f83cb 100644
--- a/games-action/barrage/barrage-1.0.4.ebuild
+++ b/games-action/barrage/barrage-1.0.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils games
DESCRIPTION="A violent point-and-click shooting game"
-HOMEPAGE="http://lgames.sourceforge.net"
+HOMEPAGE="http://lgames.sourceforge.net/Barrage/"
SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/games-action/supermariowar/metadata.xml b/games-action/supermariowar/metadata.xml
index 30f464f613ab..bd948f685035 100644
--- a/games-action/supermariowar/metadata.xml
+++ b/games-action/supermariowar/metadata.xml
@@ -1,7 +1,7 @@
-
+
monsieurp@gentoo.org
Patrice Clement
diff --git a/games-arcade/lbreakout/lbreakout-010315.ebuild b/games-arcade/lbreakout/lbreakout-010315.ebuild
index 5a197c35a005..536e479de6ab 100644
--- a/games-arcade/lbreakout/lbreakout-010315.ebuild
+++ b/games-arcade/lbreakout/lbreakout-010315.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+
EAPI=5
inherit games
DESCRIPTION="Breakout clone written with the SDL library"
-HOMEPAGE="http://lgames.sourceforge.net/"
+HOMEPAGE="http://lgames.sourceforge.net/LBreakout/"
SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/games-arcade/lbreakout2/lbreakout2-2.6.4.ebuild b/games-arcade/lbreakout2/lbreakout2-2.6.4.ebuild
index d19c8fb05ff0..8d9ccf79a233 100644
--- a/games-arcade/lbreakout2/lbreakout2-2.6.4.ebuild
+++ b/games-arcade/lbreakout2/lbreakout2-2.6.4.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
@@ -8,7 +8,7 @@ levels_V=20120815
themes_V=20111026
DESCRIPTION="Breakout clone written with the SDL library"
-HOMEPAGE="http://lgames.sourceforge.net/index.php?project=LBreakout2"
+HOMEPAGE="http://lgames.sourceforge.net/LBreakout2/"
SRC_URI=" mirror://sourceforge/lgames/${P}.tar.gz
mirror://sourceforge/lgames/${PN}-levelsets-${levels_V}.tar.gz
themes? ( mirror://sourceforge/lgames/${PN}-themes-${themes_V}.tar.gz )"
diff --git a/games-arcade/lbreakout2/lbreakout2-2.6.5.ebuild b/games-arcade/lbreakout2/lbreakout2-2.6.5.ebuild
index cdc995e91257..5b6c7ae115e9 100644
--- a/games-arcade/lbreakout2/lbreakout2-2.6.5.ebuild
+++ b/games-arcade/lbreakout2/lbreakout2-2.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ levels_V=20141220
themes_V=20141220
DESCRIPTION="Breakout clone written with the SDL library"
-HOMEPAGE="http://lgames.sourceforge.net/index.php?project=LBreakout2"
+HOMEPAGE="http://lgames.sourceforge.net/LBreakout2/"
SRC_URI=" mirror://sourceforge/lgames/${P}.tar.gz
mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-levelsets-${levels_V}.tar.gz
themes? ( mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-themes-${levels_V}.tar.gz )"
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 90c7709350ea..6f190dafc6f8 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,2 +1,3 @@
DIST mgba-0.5.2.tar.gz 5343635 SHA256 3d9fda762e6e0dd26ffbd3cbaa5365dc7ca7ed324cee5c65b7c85eaa3c37c4f3 SHA512 8d3ef901bae9b503f8d5afff63c23be9af4b519f86cc6f3656c51374756107e4852bc0472cb7393cb04c8f0ff2f134367a81e32a5ff3dab8ae0c6cbd7d3858da WHIRLPOOL 977da5589b6e04fd67d32295befccf76988b3f23d13d0d92ab525deb51c58aae18ae1d40d0849b8bd2b3fc9e8c15703367458812404ca797b4f0eedbc26f1272
DIST mgba-0.6.0.tar.gz 7434157 SHA256 d8cf01befd7f452415a9191b058bc21e47e39c7f2c865257cd93c2780b17fe07 SHA512 24a9c75370465246e467f03498994e2f142bed18435658aa75ee8dc7ad9f8fa649b476b7846c0f3c4be474ca1d3b7c36e34af05b4088fa3a7a11e3edb0074308 WHIRLPOOL 26588a452d9c2ae8456f0f8be63246ae8a637b6d0bce7b90ba2a11813682ae9402652a99b2d4844f8eddd5c07347f63dbbeb857887448cd328bb27e38939da07
+DIST mgba-0.6.1.tar.gz 7437240 SHA256 7c78feb0aa12930b993ca1b220d282ed178e306621559e48bb168623030eb876 SHA512 fb4d2bd490afa052c32d263e4d7b65ff83ccdcad01f5df6572d73c81de3c4e0c268b102ac36cff4a85ab20fc190d2f1a4959a3058e559a528be5e49c4808ce57 WHIRLPOOL 333b663dfff0610cf6701178f68beed2fc3ae6fe21380d96636a9a2ac66c2ed98081d31fae78a97cd14d9c6cbc89e246961cc8d246ea3214bd26dd98dd6a3a66
diff --git a/games-emulation/mgba/mgba-0.6.1.ebuild b/games-emulation/mgba/mgba-0.6.1.ebuild
new file mode 100644
index 000000000000..7ba7da1f8956
--- /dev/null
+++ b/games-emulation/mgba/mgba-0.6.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+DESCRIPTION="A new Game Boy Advance emulator written in C."
+HOMEPAGE="https://mgba.io"
+SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ffmpeg imagemagick opengl qt5 +sdl"
+REQUIRED_USE="|| ( qt5 sdl )
+ qt5? ( opengl )"
+
+RDEPEND="
+ dev-db/sqlite:3
+ media-libs/libpng:0=
+ sys-libs/zlib[minizip]
+ ffmpeg? ( virtual/ffmpeg )
+ imagemagick? ( media-gfx/imagemagick:= )
+ opengl? ( virtual/opengl )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtwidgets:5
+ opengl? ( dev-qt/qtopengl:5 )
+ )
+ sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+
+ # Get rid of any bundled stuff we don't want
+ for pkg in libpng lzma sqlite3 zlib ; do
+ rm -r "${S}"/src/third-party/${pkg} || die
+ done
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_GL="$(usex opengl)"
+ -DBUILD_GLES=OFF
+ -DBUILD_PYTHON=OFF
+ -DBUILD_QT="$(usex qt5)"
+ -DBUILD_SDL="$(usex sdl)"
+ -DBUILD_SHARED=ON
+ # test suite fails to build (0.6.0)
+ -DBUILD_SUITE=OFF
+ -DBUILD_TEST=OFF
+ -DM_CORE_GB=ON
+ -DM_CORE_GBA=ON
+ -DUSE_DEBUGGERS="$(usex debug)"
+ -DUSE_EDITLINE="$(usex debug)"
+ -DUSE_EPOXY=OFF
+ -DUSE_FFMPEG="$(usex ffmpeg)"
+ -DUSE_GDB_STUB="$(usex debug)"
+ -DUSE_LIBZIP=OFF
+ -DUSE_LZMA=OFF
+ -DUSE_MAGICK="$(usex imagemagick)"
+ -DUSE_MINIZIP=ON
+ -DUSE_PNG=ON
+ # build fails with sqlite being disabled (0.6.0)
+ -DUSE_SQLITE3=ON
+ -DUSE_ZLIB=ON
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ if use qt5 ; then
+ for size in 16 24 32 48 64 96 128 256; do
+ newicon -s ${size} res/${PN}-${size}.png ${PN}.png
+ done
+ doman doc/${PN}-qt.6
+ domenu res/${PN}-qt.desktop
+ dobin ../${P}_build/qt/${PN}-qt
+ fi
+ if use sdl ; then
+ doman doc/${PN}.6
+ newbin ../${P}_build/sdl/${PN} ${PN}-sdl
+ fi
+
+ dolib.so ../${P}_build/lib${PN}.so*
+}
+
+pkg_preinst() {
+ if use qt5 ; then
+ gnome2_icon_savelist
+ fi
+}
+
+pkg_postinst() {
+ if use qt5 ; then
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use qt5 ; then
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest
index da5357e36840..6b22ca7d56fd 100644
--- a/games-engines/stratagus/Manifest
+++ b/games-engines/stratagus/Manifest
@@ -1 +1,2 @@
+DIST stratagus-2.4.1.tar.gz 1087678 SHA256 4f77d0e3cb09c6322a9d5576b55bc2eb498e041a4d77c79dfc3a9b5612913788 SHA512 1f0420677df72e3e2d2f31e60030fa2eba4c3d1ab80cfc79c045724fe39ac237846bc38e8762ee9aa51768a443cdbbaa1fe91bf80fb2164261288a1bb17e27cd WHIRLPOOL 47bef0b10e0bbcab840cf48c5f85e75532f4c6d78bda75b846f711b35b255f5594647df3db736637a46c28b2d08722591223b05fc1d81fb66e93ad9377a0ae02
DIST stratagus_2.3.0.orig.tar.gz 1000990 SHA256 d3d124f253e987ee1be396ebcdec31228790163a121a9f4e0049d334114adb99 SHA512 ad38568029aa777fcc2d2e6d4a862b4192bc87354b23712270b9f0a62e269548a08097305e97adcea7bc9d9d506a6d092c578656a1957db808a48f44712a76bf WHIRLPOOL 705ab071fff4dc6d865d8e14c67bf3ef1e64fde45a85115178b4686d3c066907e193d733f5f9d09ec363660925349097f83afa6895a8c27e73c680e27db357a9
diff --git a/games-engines/stratagus/stratagus-2.4.1.ebuild b/games-engines/stratagus/stratagus-2.4.1.ebuild
new file mode 100644
index 000000000000..a692d77f9475
--- /dev/null
+++ b/games-engines/stratagus/stratagus-2.4.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils
+
+DESCRIPTION="A realtime strategy game engine"
+HOMEPAGE="https://launchpad.net/stratagus/"
+SRC_URI="https://github.com/Wargus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 debug doc fluidsynth mikmod mng theora vorbis"
+
+RDEPEND="dev-db/sqlite:3
+ >=dev-lang/lua-5:0
+ dev-lua/toluapp
+ media-libs/libpng:0
+ virtual/opengl
+ x11-libs/libX11
+ media-libs/libsdl[sound,opengl,video]
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ fluidsynth? ( media-sound/fluidsynth )
+ mikmod? ( media-libs/libmikmod )
+ mng? ( media-libs/libmng )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ theora? ( media-libs/libtheora )
+ )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig"
+
+REQUIRED_USE="theora? ( vorbis )"
+PATCHES=(
+ "${FILESDIR}/${PN}"-2.3.0-debug.patch
+ "${FILESDIR}/${PN}"-2.3.0-doc.patch
+)
+
+src_configure() {
+ # there are in-source switches
+ use debug && CMAKE_BUILD_TYPE=Debug
+
+ local mycmakeargs=(
+ -DGAMEDIR="/usr/bin"
+ -DDOCDIR="/usr/share/doc/${PF}"
+ -DWITH_BZIP2=$(usex bzip2)
+ -DENABLE_DOC=$(usex doc)
+ -DWITH_FLUIDSYNTH=$(usex fluidsynth)
+ -DWITH_MIKMOD=$(usex mikmod)
+ -DWITH_MNG=$(usex mng)
+ -DWITH_OGGVORBIS=$(usex vorbis)
+ -DWITH_THEORA=$(usex theora)
+ -DENABLE_DEV=ON
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+}
diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest
deleted file mode 100644
index 07d6affe3471..000000000000
--- a/games-fps/warsow/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST warsow-1.5.1-build.patch.gz 4008 SHA256 7b1796cdc49a449772696fb4db96a654456c5f3514a82a966d98f8d72dae2b36 SHA512 3fb9eb00c1a5e28cfd3aa258a70b4c0cf4ca2618c13ff8ed1559c046e33cbd1842b836973b97eac8f90c5640c7045a34e2a6104e241f492fe794149ae4c6aac1 WHIRLPOOL 721d9a3e1ba535a52f00e45fae3aa2e9b0b741f05b81c5c171927f8de652ac4a81eb5f521abb6f9e8cd76fbda4f629a84731ddaea50fc80144e996f55e26283c
-DIST warsow.png 1692 SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954 SHA512 76476fd6f624b4043405fbddeaa0fa46338b96bf46a9b64434940d9a84738a20c25243ef1316048159698b6a70b3e0f26218da3332203a93944312e77ba22c8f WHIRLPOOL 94b7c77641d5a8f581de4eb0e4e91b71f25347248a6aa6c1160e8fefda92951daa3fbbf04aee4920fc9b53fb07872d3fb7d870d4207d13844e07afa51c93e85b
-DIST warsow_1.51_sdk.tar.gz 89191554 SHA256 ac635c654e088566d30d53e8fab21abd2d40762d7f4ab0e09faa827aac5c4f97 SHA512 64de961de91eee781b90442b275d24e13239dc2b594ece665c24c1d8da75e206a00ab43a2a6f193a953e9b0173b4a93dd18fa94b9b33d92eebcb776493a8b158 WHIRLPOOL 0a1db561eedfb4cafa2bb8f91e4de121adbbb171405828936788c9fa537a821855d89dd7c5b8a9ec186ece0655f1c821b38fa07fc0c2477c61681cf354d3d657
-DIST warsow_1.51_unified.tar.gz 601553865 SHA256 94510d85e4a245b5f8c0c715ae41b1d162c96e06dbfe75ccd99fffb9a76426b5 SHA512 a6c3392010de192d9984655193cb2c4359e9e3959bb39176416936c0227e3f6060bb19149688b89e36285572045c2ab19c6ef8de71ace7cd514e30196da83da9 WHIRLPOOL 1f0bf896dd0aad18e3bf3090d856a6ecbfabfa1873d62f9f5c0ccb1fa8dd0e34f0a22e8c095030c309adf32c85894bbadc77496916bddc6302f7646f500aa6ac
diff --git a/games-fps/warsow/files/warsow-1.5.1-openal.patch b/games-fps/warsow/files/warsow-1.5.1-openal.patch
deleted file mode 100644
index 1bce87730556..000000000000
--- a/games-fps/warsow/files/warsow-1.5.1-openal.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup warsow_1.51_sdk-upstream/source/source/Makefile warsow_1.51_sdk/source/source/Makefile
---- warsow_1.51_sdk-upstream/source/source/Makefile 2014-07-23 16:59:16.819811217 +0300
-+++ warsow_1.51_sdk/source/source/Makefile 2014-07-23 16:37:40.069824137 +0300
-@@ -285,7 +285,7 @@ endif
- ifeq ($(BUILD_SND_QF),YES)
- SDL_CONFIG?=sdl-config
-
--CFLAGS_QF=$(shell $(SDL_CONFIG) --cflags) -I./snd_openal -I./snd_common
-+CFLAGS_QF=$(shell $(SDL_CONFIG) --cflags) -I./snd_qf -I./snd_common
- LDFLAGS_QF=$(shell $(SDL_CONFIG) --libs) -lvorbisfile
- endif # BUILD_SND_QF
-
diff --git a/games-fps/warsow/files/warsow-1.5.1-pic.patch b/games-fps/warsow/files/warsow-1.5.1-pic.patch
deleted file mode 100644
index 71c4d8eed690..000000000000
--- a/games-fps/warsow/files/warsow-1.5.1-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/snd_qf/snd_mix.c
-+++ source/snd_qf/snd_mix.c
-@@ -27,7 +27,7 @@
- int *snd_p, snd_linear_count, snd_vol, music_vol;
- short *snd_out;
-
--#if !defined ( id386 ) || defined ( __MACOSX__ )
-+#if defined ( PIC ) || !defined ( id386 ) || defined ( __MACOSX__ )
- #ifdef _WIN32
- #pragma warning( push )
- #pragma warning( disable : 4310 ) // cast truncates constant value
diff --git a/games-fps/warsow/metadata.xml b/games-fps/warsow/metadata.xml
deleted file mode 100644
index a693398acc48..000000000000
--- a/games-fps/warsow/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
-
diff --git a/games-fps/warsow/warsow-1.5.1-r1.ebuild b/games-fps/warsow/warsow-1.5.1-r1.ebuild
deleted file mode 100644
index e1af04c24ddc..000000000000
--- a/games-fps/warsow/warsow-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils check-reqs gnome2-utils flag-o-matic games
-
-# BASE_DATA_PV=1.0
-# BASE_DATA_P=${PN}_${BASE_DATA_PV}_unified
-DATA_PV=1.51
-UPDATE_P=${PN}_${DATA_PV}_update
-ENGINE_PV=1.51
-ENGINE_P=${PN}_${ENGINE_PV}_sdk
-
-DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
-HOMEPAGE="http://www.warsow.net/"
-SRC_URI="http://www.warsow.net/${ENGINE_P}.tar.gz
- http://www.warsow.net/warsow_${DATA_PV}_unified.tar.gz
- mirror://gentoo/warsow.png
- mirror://gentoo/${P}-build.patch.gz"
-
-# ZLIB: bundled angelscript
-LICENSE="GPL-2 ZLIB warsow"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug dedicated irc openal server"
-
-RDEPEND=">=dev-libs/libRocket-1.2.1_p20130110
-
-
-
-
- java@gentoo.org
- Java
-
-
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
new file mode 100644
index 000000000000..4f8cd512557b
--- /dev/null
+++ b/mail-client/neomutt/Manifest
@@ -0,0 +1,2 @@
+DIST neomutt-20170714.tar.gz 2509160 SHA256 40d48920f95ca49ab96eb109b658f5cf6e1c222320c58bdd03769c1355d7a383 SHA512 eb31d2f23b7211904cd66ba293c008f953778b37f13fd09d4db571d013f1c8e6449fccd827872f3ad0a2c8e62555f92b3f9591a1f0f4ac37ab362a4681abaaa0 WHIRLPOOL 455495501a2ab1989d5f3bfa75aa2370896956cdfd7d2e852e225c96aa23a1abdaf2dbb9d886d1d96486d19b2b38c225e8263f268ebafcef8cbd0024885189f3
+DIST neomutt-20170912.tar.gz 2533245 SHA256 9f0d128fe8dbbbddb67e2b629f8b5e52a9d892f82c735845c1708c14e3046657 SHA512 7551da47029667443257d9d370af7217846abf988d1469c4e08f367ef0bce2dfb658321df27176622bbd07e6d46c320380749d4ce05ee39cb1e8d9b6c3e1d7e6 WHIRLPOOL 0dad6380acf5b6f891bcb77388023de27d23e4ea8ad0eb3563c1704de555a2fc54604d47b9b67557c6ab0310e1c365c786a1952f6794b2012594f1c19033ad3c
diff --git a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170714.patch b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170714.patch
new file mode 100644
index 000000000000..bb01dbf98013
--- /dev/null
+++ b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170714.patch
@@ -0,0 +1,436 @@
+From bb4a3d41530619970d5c3c30be7e9424dd169de5 Mon Sep 17 00:00:00 2001
+From: Nicolas Bock
+Date: Tue, 8 Aug 2017 13:36:20 +0200
+Subject: [PATCH] Rename mutt to neomutt
+
+---
+ Makefile.am | 30 ++++++++++++++++--------------
+ configure.ac | 8 ++++----
+ contrib/gpg.rc | 8 ++++----
+ contrib/pgp2.rc | 4 ++--
+ contrib/pgp5.rc | 8 ++++----
+ contrib/pgp6.rc | 4 ++--
+ doc/Makefile.am | 24 +++++++++++-------------
+ doc/PGP-Notes.txt | 8 ++++----
+ doc/mutt.man | 2 +-
+ doc/pgpewrap.1 | 12 ++++++------
+ doc/pgpring.1 | 10 +++++-----
+ hcache/hcachever.sh | 2 +-
+ 12 files changed, 60 insertions(+), 60 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5b6494e8..d34d3e4c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,7 @@
+ include $(top_srcdir)/flymake.am
+
+ AUTOMAKE_OPTIONS = 1.6 foreign
+-EXTRA_PROGRAMS = mutt_md5 pgpewrap pgpring
++EXTRA_PROGRAMS = neomutt_md5 neomutt_pgpewrap neomutt_pgpring
+
+ # Test the .tar file by building everything
+ AM_DISTCHECK_CONFIGURE_FLAGS = \
+@@ -42,9 +42,9 @@ distdir = neo$(PACKAGE)-$(VERSION)
+
+ BUILT_SOURCES = conststrings.c git_ver.h keymap_alldefs.h keymap_defs.h
+
+-bin_PROGRAMS = mutt $(PGPAUX_TARGET)
++bin_PROGRAMS = neomutt $(PGPAUX_TARGET)
+
+-mutt_SOURCES = account.c addrbook.c address.h alias.c alias.h ascii.c attach.c \
++neomutt_SOURCES = account.c addrbook.c address.h alias.c alias.h ascii.c attach.c \
+ base64.c bcache.c body.h browser.c buffer.c buffy.c charset.c color.c \
+ commands.c complete.c compose.c compress.c content.h context.h copy.c \
+ curs_lib.c curs_main.c date.c edit.c editmsg.c enter.c enter_state.h \
+@@ -59,15 +59,15 @@ mutt_SOURCES = account.c addrbook.c address.h alias.c alias.h ascii.c attach.c \
+ smtp.c sort.c state.h status.c system.c thread.c thread.h url.c \
+ version.c where.h
+
+-nodist_mutt_SOURCES = $(BUILT_SOURCES)
++nodist_neomutt_SOURCES = $(BUILT_SOURCES)
+
+ LIBIMAP = -Limap -limap
+ LIBIMAPDEPS = $(top_srcdir)/imap/imap.h imap/libimap.a
+
+-mutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \
++neomutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \
+ $(LIBIMAP) $(LIBICONV) $(GPGME_LIBS) $(INTLLIBS)
+
+-mutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \
++neomutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \
+ $(HCACHE_DEPS) $(NCRYPT_DEPS) $(INTLDEPS)
+
+ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
+@@ -75,7 +75,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
+
+ AM_CPPFLAGS=-I. -I$(top_srcdir) $(GPGME_CFLAGS)
+
+-EXTRA_mutt_SOURCES = browser.h mbyte.h mutt_idna.c mutt_idna.h \
++EXTRA_neomutt_SOURCES = browser.h mbyte.h mutt_idna.c mutt_idna.h \
+ mutt_lua.c mutt_sasl.c mutt_notmuch.c mutt_ssl.c mutt_ssl_gnutls.c \
+ remailer.c remailer.h resize.c sha1.c url.h utf8.c wcwidth.c
+
+@@ -95,13 +95,15 @@ EXTRA_DIST = account.h ascii.h attach.h bcache.h browser.h buffer.h buffy.h \
+
+ EXTRA_SCRIPTS =
+
+-pgpring_SOURCES = ascii.c extlib.c lib.c md5.c pgppubring.c sha1.c
+-pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS)
+-pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS)
++neomutt_pgpewrap_SOURCES = pgpewrap.c
+
+-mutt_md5_SOURCES = md5.c
+-mutt_md5_CFLAGS = -DMD5UTIL
+-mutt_md5_LDADD =
++neomutt_pgpring_SOURCES = ascii.c extlib.c lib.c md5.c pgppubring.c sha1.c
++neomutt_pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS)
++neomutt_pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS)
++
++neomutt_md5_SOURCES = md5.c
++neomutt_md5_CFLAGS = -DMD5UTIL
++neomutt_md5_LDADD =
+
+ txt2c_SOURCES = txt2c.c
+ txt2c_LDADD =
+@@ -141,7 +143,7 @@ keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.SIDEBAR $(srcdir)/OPS.NOTMUCH $(sr
+ $(srcdir)/OPS.MIX $(srcdir)/OPS.PGP $(srcdir)/OPS.SMIME $(srcdir)/OPS.CRYPT \
+ > $@
+
+-git_ver.h: $(mutt_SOURCES) $(SUBDIRS)
++git_ver.h: $(neomutt_SOURCES) $(SUBDIRS)
+ version=`git describe --dirty --abbrev=6 --match "neomutt-*" 2> /dev/null | sed -e 's/^neomutt-[0-9]\{8\}//' -e 's/g//'`; \
+ echo 'const char *GitVer = "'$$version'";' > git_ver.h.tmp; \
+ cmp -s git_ver.h.tmp git_ver.h || mv git_ver.h.tmp git_ver.h; \
+diff --git a/configure.ac b/configure.ac
+index bc88adc7..17796620 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,7 @@ dnl autoreconf -i
+ CFLAGS=$CFLAGS
+ LDFLAGS=$LDFLAGS
+
+-AC_INIT([NeoMutt], [20170714], [neomutt-devel@neomutt.org], [mutt], [https://www.neomutt.org])
++AC_INIT([NeoMutt], [20170714], [neomutt-devel@neomutt.org], [neomutt], [https://www.neomutt.org])
+ AC_CONFIG_SRCDIR(mutt.h)
+ AC_CONFIG_AUX_DIR([.build-aux])
+ AM_INIT_AUTOMAKE
+@@ -192,7 +192,7 @@ AS_IF([test x$use_gpgme = xyes && test x$gpgme_found = xno], [
+ dnl --enable-pgp
+ AS_IF([test x$use_pgp != "xno"], [
+ AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP, 1, [Define if you want classic PGP Support.])
+- PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(EXEEXT)"
++ PGPAUX_TARGET="neomutt_pgpring\$(EXEEXT) neomutt_pgpewrap\$(EXEEXT)"
+ build_ncrypt_pgp="yes"
+ ])
+
+@@ -449,7 +449,7 @@ AC_SUBST([datarootdir])
+ AC_MSG_CHECKING(where to put the documentation)
+ AC_ARG_WITH(docdir, AS_HELP_STRING([--with-docdir=PATH],[Specify where to put the documentation]),
+ [mutt_cv_docdir=$withval],
+- [mutt_cv_docdir='${datarootdir}/doc/mutt'])
++ [mutt_cv_docdir='${datarootdir}/doc/neomutt'])
+ AC_MSG_RESULT($mutt_cv_docdir)
+ if test -z "$docdir" -o -n "$with_docdir"; then
+ docdir=$mutt_cv_docdir
+@@ -825,7 +825,7 @@ AM_CONDITIONAL(BUILD_HC_QDBM, test "x$build_hc_qdbm" = "xyes")
+ AM_CONDITIONAL(BUILD_HC_TC, test "x$build_hc_tc" = "xyes")
+ dnl -- end cache --
+
+-MUTT_MD5="mutt_md5$EXEEXT"
++MUTT_MD5="neomutt_md5$EXEEXT"
+
+ AC_SUBST(MUTT_MD5)
+ AC_SUBST(MUTT_LIB_OBJECTS)
+diff --git a/contrib/gpg.rc b/contrib/gpg.rc
+index 3392038b..86dc23c7 100644
+--- a/contrib/gpg.rc
++++ b/contrib/gpg.rc
+@@ -46,12 +46,12 @@ set pgp_sign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphra
+ set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
+
+ # create a pgp/mime encrypted attachment
+-# set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+-set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
++# set pgp_encrypt_only_command="neomutt_pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
++set pgp_encrypt_only_command="neomutt_pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+
+ # create a pgp/mime encrypted and signed attachment
+-# set pgp_encrypt_sign_command="pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+-set pgp_encrypt_sign_command="pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
++# set pgp_encrypt_sign_command="neomutt_pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
++set pgp_encrypt_sign_command="neomutt_pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+
+ # import a key into the public key ring
+ set pgp_import_command="gpg --no-verbose --import %f"
+diff --git a/contrib/pgp2.rc b/contrib/pgp2.rc
+index bd01e2d2..08b592dd 100644
+--- a/contrib/pgp2.rc
++++ b/contrib/pgp2.rc
+@@ -37,10 +37,10 @@ set pgp_export_command="pgp -kxaf +language=mutt %r"
+ set pgp_verify_key_command="pgp -kcc +language=mutt %r"
+
+ # read in the public key ring
+-set pgp_list_pubring_command="pgpring -2 %r"
++set pgp_list_pubring_command="neomutt_pgpring -2 %r"
+
+ # read in the secret key ring
+-set pgp_list_secring_command="pgpring -s -2 %r"
++set pgp_list_secring_command="neomutt_pgpring -s -2 %r"
+
+ # pattern for good signature
+ set pgp_good_sign="Good signature"
+diff --git a/contrib/pgp5.rc b/contrib/pgp5.rc
+index 4440d6b7..aea3ae54 100644
+--- a/contrib/pgp5.rc
++++ b/contrib/pgp5.rc
+@@ -19,10 +19,10 @@ set pgp_decrypt_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgpv +languag
+ set pgp_sign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgps +language=mutt +verbose=0 +batchmode -abft %?a? -u %a?"
+
+ # create a pgp/mime encrypted attachment
+-set pgp_encrypt_only_command="pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -aft -- -r %r < %f"
++set pgp_encrypt_only_command="neomutt_pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -aft -- -r %r < %f"
+
+ # create a pgp/mime encrypted and signed attachment
+-set pgp_encrypt_sign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -afts %?a? -u %a? -- -r %r"
++set pgp_encrypt_sign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | neomutt_pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -afts %?a? -u %a? -- -r %r"
+
+ # import a key into the public key ring
+ set pgp_import_command="pgpk -a +language=mutt --OutputInformationFD=1 %f"
+@@ -34,9 +34,9 @@ set pgp_export_command="pgpk -xa +language=mutt --OutputInformationFD=1 %r"
+ set pgp_verify_key_command="pgpk -c +batchmode +language=mutt --OutputInformationFD=1 %r"
+
+ # read in the public key ring
+-set pgp_list_pubring_command="pgpring -5 %r"
++set pgp_list_pubring_command="neomutt_pgpring -5 %r"
+
+ # read in the secret key ring
+-set pgp_list_secring_command="pgpring -5 -s %r"
++set pgp_list_secring_command="neomutt_pgpring -5 -s %r"
+
+
+diff --git a/contrib/pgp6.rc b/contrib/pgp6.rc
+index a8708042..6b1ef985 100644
+--- a/contrib/pgp6.rc
++++ b/contrib/pgp6.rc
+@@ -31,10 +31,10 @@ set pgp_export_command="pgp6 +compatible -kxaf %r"
+ set pgp_verify_key_command="pgp6 +compatible -kcc %r"
+
+ # read in the public key ring
+-set pgp_list_pubring_command="pgpring -5 %r"
++set pgp_list_pubring_command="neomutt_pgpring -5 %r"
+
+ # read in the secret key ring
+-set pgp_list_secring_command="pgpring -s -5 %r"
++set pgp_list_secring_command="neomutt_pgpring -s -5 %r"
+
+ # create a clearsigned message
+ set pgp_clearsign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgp6 +compatible +verbose=0 +batchmode +clearsig -afst %?a? -u %a?"
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 6a6c711b..770dc16c 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -33,20 +33,18 @@ topsrcdir_DOCFILES = ChangeLog.md CODE_OF_CONDUCT.md COPYRIGHT INSTALL \
+
+ all: makedoc-all
+
+-makedoc-all: $(CHUNKED_DOCFILES) index.html manual.html manual.txt mutt.1 \
+- Muttrc muttrc.man neomutt-syntax.vim
++makedoc-all: $(CHUNKED_DOCFILES) index.html manual.html manual.txt neomutt.1 \
++ Muttrc neomuttrc.man neomutt-syntax.vim
+
+ install-data-local: makedoc-all
+ $(MKDIR_P) $(DESTDIR)$(mandir)/man1
+ $(MKDIR_P) $(DESTDIR)$(mandir)/man5
+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)
+- $(INSTALL) -m 644 mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1
+- $(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
++ $(INSTALL) -m 644 neomutt.1 $(DESTDIR)$(mandir)/man1/neomutt.1
++ $(INSTALL) -m 644 neomuttrc.man $(DESTDIR)$(mandir)/man5/neomuttrc.5
+ $(INSTALL) -m 644 $(srcdir)/smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1
+- $(INSTALL) -m 644 $(srcdir)/pgpewrap.1 $(DESTDIR)$(mandir)/man1/pgpewrap.1
+- $(INSTALL) -m 644 $(srcdir)/pgpring.1 $(DESTDIR)$(mandir)/man1/pgpring.1
+- $(INSTALL) -m 644 $(srcdir)/mbox.5 $(DESTDIR)$(mandir)/man5/mbox.5
+- $(INSTALL) -m 644 $(srcdir)/mmdf.5 $(DESTDIR)$(mandir)/man5/mmdf.5
++ $(INSTALL) -m 644 $(srcdir)/pgpewrap.1 $(DESTDIR)$(mandir)/man1/neomutt_pgpewrap.1
++ $(INSTALL) -m 644 $(srcdir)/pgpring.1 $(DESTDIR)$(mandir)/man1/neomutt_pgpring.1
+ $(MKDIR_P) $(DESTDIR)$(docdir)
+ for f in $(topsrcdir_DOCFILES); do \
+ $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir); \
+@@ -69,10 +67,10 @@ install-data-local: makedoc-all
+ -$(INSTALL) -m 644 $(srcdir)/neomutt-syntax.vim $(DESTDIR)$(docdir)
+
+ uninstall-local:
+- for f in mutt.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
++ for f in neomutt.1 smime_keys.1 neomutt_pgpewrap.1 neomutt_pgpring.1; do \
+ rm -f $(DESTDIR)$(mandir)/man1/$$f; \
+ done
+- for f in muttrc.5 mbox.5 mmdf.5; do \
++ for f in neomuttrc.5; do \
+ rm -f $(DESTDIR)$(mandir)/man5/$$f; \
+ done
+ for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) $(HTML_DOCFILES); do \
+@@ -120,11 +118,11 @@ sortcheck: manual.xml
+ rm -rf vars.tmp.1 vars.tmp.2
+
+ clean-local:
+- rm -f *.html mutt.1 muttrc.man
++ rm -f *.html neomutt.1 neomuttrc.man
+
+ DISTCLEANFILES = manual.txt manual.html manual.xml Muttrc
+
+-muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
++neomuttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
+ $(MAKEDOC_CPP) $(top_srcdir)/init.h | \
+ ./makedoc$(EXEEXT) -m | \
+ cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail > $@
+@@ -133,7 +131,7 @@ EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
+ -e 's,@bindir\@,$(bindir),g' \
+ -e 's,@docdir\@,$(docdir),g'
+
+-mutt.1: $(srcdir)/mutt.man
++neomutt.1: $(srcdir)/mutt.man
+ $(EDIT) $(srcdir)/mutt.man > $@
+
+ manual.xml: makedoc$(EXEEXT) ../config.h $(top_srcdir)/init.h \
+diff --git a/doc/PGP-Notes.txt b/doc/PGP-Notes.txt
+index 2215c410..a358f818 100644
+--- a/doc/PGP-Notes.txt
++++ b/doc/PGP-Notes.txt
+@@ -157,7 +157,7 @@ or exim.
+ Auxiliary Programs
+ ------------------
+
+-Mutt needs two auxiliary programs for its PGP support: pgpewrap and
++Mutt needs two auxiliary programs for its PGP support: neomutt_pgpewrap and
+ pgpring.
+
+
+@@ -186,17 +186,17 @@ Command line options:
+
+
+
+-2. pgpewrap
++2. neomutt_pgpewrap
+
+ This is a little C program which does some command line munging: The
+-first argument is a command to be executed. When pgpewrap
++first argument is a command to be executed. When neomutt_pgpewrap
+ encounters a "--" (dash-dash) argument, it will interpret the next
+ argument as a prefix which is put in front of all following
+ arguments.
+
+ Example:
+
+- pgpewrap pgpe file -- -r a b c
++ neomutt_pgpewrap pgpe file -- -r a b c
+
+ will execute:
+
+diff --git a/doc/mutt.man b/doc/mutt.man
+index 8edee96e..9bc49a90 100644
+--- a/doc/mutt.man
++++ b/doc/mutt.man
+@@ -171,7 +171,7 @@ If this variable is set, mailcap are always used without prompting first.
+ .IP "PGPPATH"
+ Directory in which the user's PGP public keyring can be found. When used with
+ the original PGP program, mutt and
+-.B pgpring (1)
++.B neomutt_pgpring (1)
+ rely on this being set.
+ .IP "TMPDIR"
+ Directory in which temporary files are created.
+diff --git a/doc/pgpewrap.1 b/doc/pgpewrap.1
+index 20327349..9ad7bff7 100644
+--- a/doc/pgpewrap.1
++++ b/doc/pgpewrap.1
+@@ -1,6 +1,6 @@
+ .\" -*-nroff-*-
+ .\"
+-.\" pgpewrap, a command line munging tool
++.\" neomutt_pgpewrap, a command line munging tool
+ .\" Manpage Copyright (c) 2013 Honza Horak
+ .\"
+ .\" This program is free software; you can redistribute it and/or modify
+@@ -17,25 +17,25 @@
+ .\" along with this program; if not, write to the Free Software
+ .\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .\"
+-.TH pgpewrap 1 "May 2013" Unix "User Manuals"
++.TH neomutt_pgpewrap 1 "May 2013" Unix "User Manuals"
+ .SH NAME
+-pgpewrap \- Mutt command line munging tool
++neomutt_pgpewrap \- Mutt command line munging tool
+
+ .SH SYNTAX
+ .PP
+-\fBpgpewrap\fP [ \fBflags\fP ] \-\- \fBprefix\fP [ \fBrecipients\fP ]
++\fBneomutt_pgpewrap\fP [ \fBflags\fP ] \-\- \fBprefix\fP [ \fBrecipients\fP ]
+
+ .SH DESCRIPTION
+ .PP
+ This is a little C program which does some command line munging: The
+-first argument is a command to be executed. When \fBpgpewrap\fP
++first argument is a command to be executed. When \fBneomutt_pgpewrap\fP
+ encounters a "\-\-" (dash\-dash) argument, it will interpret the next
+ argument as a prefix which is put in front of all following
+ arguments.
+
+ .SH EXAMPLE
+
+- pgpewrap pgpe file \-\- \-r a b c
++ neomutt_pgpewrap pgpe file \-\- \-r a b c
+
+ will execute:
+
+diff --git a/doc/pgpring.1 b/doc/pgpring.1
+index 0009ad92..d23ebf55 100644
+--- a/doc/pgpring.1
++++ b/doc/pgpring.1
+@@ -1,6 +1,6 @@
+ .\" -*-nroff-*-
+ .\"
+-.\" pgpring, a key ring dumper
++.\" neomutt_pgpring, a key ring dumper
+ .\" Manpage Copyright (c) 2004-2013 Matthew Wilcox, Honza Horak
+ .\"
+ .\" This program is free software; you can redistribute it and/or modify
+@@ -17,18 +17,18 @@
+ .\" along with this program; if not, write to the Free Software
+ .\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .\"
+-.TH pgpring 1 "May 2013" Unix "User Manuals"
++.TH neomutt_pgpring 1 "May 2013" Unix "User Manuals"
+ .SH NAME
+-pgpring \- Mutt key ring dumper
++neomutt_pgpring \- Mutt key ring dumper
+
+ .SH SYNTAX
+ .PP
+-\fBpgpring\fP [ \fB\-k\fP \fIkeyring\fP ] [ \fB\-2\fP | \fB\-5\fP ]
++\fBneomutt_pgpring\fP [ \fB\-k\fP \fIkeyring\fP ] [ \fB\-2\fP | \fB\-5\fP ]
+ [ \fB\-s\fP ] [ \fB\-S\fP ] [ \fB\-f\fP ]
+
+ .SH DESCRIPTION
+ .PP
+-pgpring is a key ring dumper. It extracts information from PGP's
++neomutt_pgpring is a key ring dumper. It extracts information from PGP's
+ binary key ring and emits it in an (almost) readable output format
+ understood by mutt's key selection routines. This output format
+ mimics the one used by the GNU Privacy Guard (GPG).
+diff --git a/hcache/hcachever.sh b/hcache/hcachever.sh
+index 733e6ca1..c35425d1 100755
+--- a/hcache/hcachever.sh
++++ b/hcache/hcachever.sh
+@@ -77,7 +77,7 @@ do
+ done
+ echo " */" >> $TMPD
+
+-MD5TEXT=`echo "$TEXT" | ../mutt_md5`
++MD5TEXT=`echo "$TEXT" | ../neomutt_md5`
+ echo "#define HCACHEVER 0x"`echo $MD5TEXT | cut -c-8` >> $TMPD
+
+ # TODO: validate we have all structs
+--
+2.13.5
+
diff --git a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170912.patch b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170912.patch
new file mode 100644
index 000000000000..598a684a21af
--- /dev/null
+++ b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170912.patch
@@ -0,0 +1,265 @@
+From 3a44a22841c2d5861c8fc79391f8615d22bcd08f Mon Sep 17 00:00:00 2001
+From: Nicolas Bock
+Date: Mon, 2 Oct 2017 14:04:34 -0600
+Subject: [PATCH] Rename mutt to neomutt
+
+---
+ Makefile.am | 28 +++++++++++++++-------------
+ configure.ac | 6 +++---
+ contrib/pgp2.rc | 4 ++--
+ contrib/pgp5.rc | 4 ++--
+ contrib/pgp6.rc | 4 ++--
+ doc/Makefile.am | 30 +++++++++++++++---------------
+ lib/Makefile.am | 4 ++--
+ 7 files changed, 41 insertions(+), 39 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 97218b8f..859b2bcd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,7 @@
+ include $(top_srcdir)/flymake.am
+
+ AUTOMAKE_OPTIONS = 1.6 foreign
+-EXTRA_PROGRAMS = pgpewrap pgpring
++EXTRA_PROGRAMS = neomutt_pgpewrap neomutt_pgpring
+
+ # Test the .tar file by building everything
+ AM_DISTCHECK_CONFIGURE_FLAGS = \
+@@ -42,9 +42,9 @@ distdir = neo$(PACKAGE)-$(VERSION)
+
+ BUILT_SOURCES = conststrings.c git_ver.h
+
+-bin_PROGRAMS = mutt $(PGPAUX_TARGET)
++bin_PROGRAMS = neomutt $(PGPAUX_TARGET)
+
+-mutt_SOURCES = account.c addrbook.c address.h alias.c alias.h attach.c \
++neomutt_SOURCES = account.c addrbook.c address.h alias.c alias.h attach.c \
+ bcache.c body.c body.h browser.c buffy.c charset.c color.c \
+ commands.c complete.c compose.c compress.c content.h context.h copy.c \
+ curs_lib.c curs_main.c edit.c editmsg.c enter.c enter_state.h \
+@@ -59,18 +59,18 @@ mutt_SOURCES = account.c addrbook.c address.h alias.c alias.h attach.c \
+ smtp.c sort.c state.c state.h status.c system.c thread.c thread.h url.c \
+ version.c where.h
+
+-nodist_mutt_SOURCES = $(BUILT_SOURCES)
++nodist_neomutt_SOURCES = $(BUILT_SOURCES)
+
+ LIBIMAP = -Limap -limap
+ LIBIMAPDEPS = $(top_srcdir)/imap/imap.h imap/libimap.a
+
+-LIBMUTT = -Llib -lmutt
+-LIBMUTTDEPS = $(top_srcdir)/lib/lib.h lib/libmutt.a
++LIBMUTT = -Llib -lneomutt
++LIBMUTTDEPS = $(top_srcdir)/lib/lib.h lib/libneomutt.a
+
+-mutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \
++neomutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \
+ $(LIBIMAP) $(LIBMUTT) $(LIBICONV) $(GPGME_LIBS) $(INTLLIBS)
+
+-mutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \
++neomutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \
+ $(LIBMUTTDEPS) $(HCACHE_DEPS) $(NCRYPT_DEPS) $(INTLDEPS)
+
+ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
+@@ -78,7 +78,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
+
+ AM_CPPFLAGS=-I. -I$(top_srcdir) $(GPGME_CFLAGS)
+
+-EXTRA_mutt_SOURCES = browser.h mbyte.h mutt_idna.c mutt_idna.h \
++EXTRA_neomutt_SOURCES = browser.h mbyte.h mutt_idna.c mutt_idna.h \
+ mutt_lua.c mutt_sasl.c mutt_notmuch.c mutt_ssl.c mutt_ssl_gnutls.c \
+ remailer.c remailer.h resize.c url.h
+
+@@ -94,11 +94,13 @@ EXTRA_DIST = account.h attach.h bcache.h browser.h buffy.h \
+ rfc1524.h rfc2047.h rfc2231.h rfc3676.h rfc822.h sidebar.h \
+ sort.h txt2c.c txt2c.sh version.h
+
++neomutt_pgpewrap_SOURCES = pgpewrap.c
++
+ EXTRA_SCRIPTS =
+
+-pgpring_SOURCES = pgppubring.c
+-pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS) $(LIBMUTT)
+-pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS) $(LIBMUTTDEPS)
++neomutt_pgpring_SOURCES = pgppubring.c
++neomutt_pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS) $(LIBMUTT)
++neomutt_pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS) $(LIBMUTTDEPS)
+
+ txt2c_SOURCES = txt2c.c
+ txt2c_LDADD =
+@@ -130,7 +132,7 @@ LDADD = $(LIBOBJS) $(INTLLIBS)
+ dist-hook:
+ echo $(VERSION) > $(distdir)/.tarball-version
+
+-git_ver.h: $(mutt_SOURCES) $(SUBDIRS)
++git_ver.h: $(neomutt_SOURCES) $(SUBDIRS)
+ version=`git describe --dirty --abbrev=6 --match "neomutt-*" 2> /dev/null | sed -e 's/^neomutt-[0-9]\{8\}//' -e 's/g//'`; \
+ echo 'const char *GitVer = "'$$version'";' > git_ver.h.tmp; \
+ cmp -s git_ver.h.tmp git_ver.h || mv git_ver.h.tmp git_ver.h; \
+diff --git a/configure.ac b/configure.ac
+index 1e888e86..471100b1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,7 @@ dnl autoreconf -i
+ CFLAGS=$CFLAGS
+ LDFLAGS=$LDFLAGS
+
+-AC_INIT([NeoMutt], [20170912], [neomutt-devel@neomutt.org], [mutt], [https://www.neomutt.org])
++AC_INIT([NeoMutt], [20170912], [neomutt-devel@neomutt.org], [neomutt], [https://www.neomutt.org])
+ AC_CONFIG_SRCDIR(mutt.h)
+ AC_CONFIG_AUX_DIR([.build-aux])
+ AM_INIT_AUTOMAKE
+@@ -186,7 +186,7 @@ AC_ARG_WITH(mailpath,
+ AC_ARG_WITH(docdir,
+ AS_HELP_STRING([--with-docdir=PATH],[Specify where to put the documentation]),
+ [mutt_cv_docdir=$withval],
+- [mutt_cv_docdir='${datarootdir}/doc/mutt'])
++ [mutt_cv_docdir='${datarootdir}/doc/neomutt'])
+
+ AC_ARG_WITH(domain,
+ AS_HELP_STRING([--with-domain=DOMAIN],[Specify your DNS domain name]),
+@@ -213,7 +213,7 @@ AS_IF([test x$use_gpgme = xyes && test x$gpgme_found = xno], [
+ dnl --enable-pgp
+ AS_IF([test x$use_pgp != "xno"], [
+ AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP, 1, [Define if you want classic PGP Support.])
+- PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(EXEEXT)"
++ PGPAUX_TARGET="neomutt_pgpring\$(EXEEXT) neomutt_pgpewrap\$(EXEEXT)"
+ build_ncrypt_pgp="yes"
+ ])
+
+diff --git a/contrib/pgp2.rc b/contrib/pgp2.rc
+index bd01e2d2..08b592dd 100644
+--- a/contrib/pgp2.rc
++++ b/contrib/pgp2.rc
+@@ -37,10 +37,10 @@ set pgp_export_command="pgp -kxaf +language=mutt %r"
+ set pgp_verify_key_command="pgp -kcc +language=mutt %r"
+
+ # read in the public key ring
+-set pgp_list_pubring_command="pgpring -2 %r"
++set pgp_list_pubring_command="neomutt_pgpring -2 %r"
+
+ # read in the secret key ring
+-set pgp_list_secring_command="pgpring -s -2 %r"
++set pgp_list_secring_command="neomutt_pgpring -s -2 %r"
+
+ # pattern for good signature
+ set pgp_good_sign="Good signature"
+diff --git a/contrib/pgp5.rc b/contrib/pgp5.rc
+index 4440d6b7..cdd85217 100644
+--- a/contrib/pgp5.rc
++++ b/contrib/pgp5.rc
+@@ -34,9 +34,9 @@ set pgp_export_command="pgpk -xa +language=mutt --OutputInformationFD=1 %r"
+ set pgp_verify_key_command="pgpk -c +batchmode +language=mutt --OutputInformationFD=1 %r"
+
+ # read in the public key ring
+-set pgp_list_pubring_command="pgpring -5 %r"
++set pgp_list_pubring_command="neomutt_pgpring -5 %r"
+
+ # read in the secret key ring
+-set pgp_list_secring_command="pgpring -5 -s %r"
++set pgp_list_secring_command="neomutt_pgpring -5 -s %r"
+
+
+diff --git a/contrib/pgp6.rc b/contrib/pgp6.rc
+index a8708042..6b1ef985 100644
+--- a/contrib/pgp6.rc
++++ b/contrib/pgp6.rc
+@@ -31,10 +31,10 @@ set pgp_export_command="pgp6 +compatible -kxaf %r"
+ set pgp_verify_key_command="pgp6 +compatible -kcc %r"
+
+ # read in the public key ring
+-set pgp_list_pubring_command="pgpring -5 %r"
++set pgp_list_pubring_command="neomutt_pgpring -5 %r"
+
+ # read in the secret key ring
+-set pgp_list_secring_command="pgpring -s -5 %r"
++set pgp_list_secring_command="neomutt_pgpring -s -5 %r"
+
+ # create a clearsigned message
+ set pgp_clearsign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgp6 +compatible +verbose=0 +batchmode +clearsig -afst %?a? -u %a?"
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 9bfe7ea6..dffbe5f6 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -40,11 +40,11 @@ install-data-local: makedoc-all
+ $(MKDIR_P) $(DESTDIR)$(mandir)/man1
+ $(MKDIR_P) $(DESTDIR)$(mandir)/man5
+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)
+- $(INSTALL) -m 644 mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1
+- $(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
++ $(INSTALL) -m 644 mutt.1 $(DESTDIR)$(mandir)/man1/neomutt.1
++ $(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/neomuttrc.5
+ $(INSTALL) -m 644 $(srcdir)/smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1
+- $(INSTALL) -m 644 $(srcdir)/pgpewrap.1 $(DESTDIR)$(mandir)/man1/pgpewrap.1
+- $(INSTALL) -m 644 $(srcdir)/pgpring.1 $(DESTDIR)$(mandir)/man1/pgpring.1
++ $(INSTALL) -m 644 $(srcdir)/pgpewrap.1 $(DESTDIR)$(mandir)/man1/neomutt_pgpewrap.1
++ $(INSTALL) -m 644 $(srcdir)/pgpring.1 $(DESTDIR)$(mandir)/man1/neomutt_pgpring.1
+ $(INSTALL) -m 644 $(srcdir)/mbox.5 $(DESTDIR)$(mandir)/man5/mbox.5
+ $(INSTALL) -m 644 $(srcdir)/mmdf.5 $(DESTDIR)$(mandir)/man5/mmdf.5
+ $(MKDIR_P) $(DESTDIR)$(docdir)
+@@ -58,28 +58,28 @@ install-data-local: makedoc-all
+ -for f in $(HTML_DOCFILES); do \
+ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir); \
+ done
+- $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
+- -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ]; then \
+- mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir); \
+- elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ]; then \
+- mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir); \
+- elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ]; then \
+- $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir); \
++ $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/neoMuttrc.dist
++ -if [ -f $(DESTDIR)$(pkgdatadir)/neoMuttrc ]; then \
++ mv $(DESTDIR)$(pkgdatadir)/neoMuttrc* $(DESTDIR)$(sysconfdir); \
++ elif [ -f $(DESTDIR)$(pkgdatadir)/../neoMuttrc ]; then \
++ mv $(DESTDIR)$(pkgdatadir)/../neoMuttrc* $(DESTDIR)$(sysconfdir); \
++ elif [ ! -f $(DESTDIR)$(sysconfdir)/neoMuttrc ]; then \
++ $(INSTALL) -m 644 neoMuttrc $(DESTDIR)$(sysconfdir); \
+ fi
+ -$(INSTALL) -m 644 $(srcdir)/neomutt-syntax.vim $(DESTDIR)$(docdir)
+
+ uninstall-local:
+- for f in mutt.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
++ for f in neomutt.1 smime_keys.1 neomutt_pgpewrap.1 neomutt_pgpring.1; do \
+ rm -f $(DESTDIR)$(mandir)/man1/$$f; \
+ done
+- for f in muttrc.5 mbox.5 mmdf.5; do \
++ for f in neomuttrc.5 mbox.5 mmdf.5; do \
+ rm -f $(DESTDIR)$(mandir)/man5/$$f; \
+ done
+ for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) $(HTML_DOCFILES); do \
+ rm -f $(DESTDIR)$(docdir)/$$f; \
+ done
+ -rm -f $(DESTDIR)$(docdir)/manual.txt
+- for i in Muttrc; do \
++ for i in neoMuttrc; do \
+ if cmp -s $(DESTDIR)$(sysconfdir)/$$i.dist $(DESTDIR)$(sysconfdir)/$$i; then \
+ rm $(DESTDIR)$(sysconfdir)/$$i; \
+ fi; \
+@@ -122,7 +122,7 @@ sortcheck: manual.xml
+ clean-local:
+ rm -f *.html mutt.1 muttrc.man
+
+-DISTCLEANFILES = manual.txt manual.html manual.xml Muttrc
++DISTCLEANFILES = manual.txt manual.html manual.xml neoMuttrc
+
+ muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
+ $(MAKEDOC_CPP) $(top_srcdir)/init.h | \
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index ac7658a9..222cbc68 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -7,7 +7,7 @@ EXTRA_DIST = lib.h base64.h buffer.h date.h debug.h exit.h file.h hash.h mapping
+
+ AM_CPPFLAGS = -I$(top_srcdir)
+
+-noinst_LIBRARIES = libmutt.a
++noinst_LIBRARIES = libneomutt.a
+
+-libmutt_a_SOURCES = base64.c buffer.c date.c debug.c exit.c file.c hash.c mapping.c md5.c memory.c message.c sha1.c string.c
++libneomutt_a_SOURCES = base64.c buffer.c date.c debug.c exit.c file.c hash.c mapping.c md5.c memory.c message.c sha1.c string.c
+
+--
+2.13.6
+
diff --git a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt.patch b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt.patch
new file mode 100644
index 000000000000..319adafc80bc
--- /dev/null
+++ b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt.patch
@@ -0,0 +1,81 @@
+From 8bbf8197154cea2cfec0236a0fad6e7c1eff8163 Mon Sep 17 00:00:00 2001
+From: Nicolas Bock
+Date: Mon, 2 Oct 2017 14:04:34 -0600
+Subject: [PATCH] Rename mutt to neomutt
+
+---
+ Makefile.am | 4 ++--
+ configure.ac | 2 +-
+ doc/Makefile.am | 6 +++---
+ lib/Makefile.am | 4 ++--
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b00d1f8a..08a16a7e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -62,8 +62,8 @@ nodist_neomutt_SOURCES = $(BUILT_SOURCES)
+ LIBIMAP = -Limap -limap
+ LIBIMAPDEPS = $(top_srcdir)/imap/imap.h imap/libimap.a
+
+-LIBMUTT = -Llib -lmutt
+-LIBMUTTDEPS = $(top_srcdir)/lib/lib.h lib/libmutt.a
++LIBMUTT = -Llib -lneomutt
++LIBMUTTDEPS = $(top_srcdir)/lib/lib.h lib/libneomutt.a
+
+ neomutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \
+ $(LIBIMAP) $(LIBMUTT) $(LIBICONV) $(GPGME_LIBS) $(INTLLIBS)
+diff --git a/configure.ac b/configure.ac
+index 0299f921..667b7f65 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -184,7 +184,7 @@ AC_ARG_WITH(mailpath,
+ AC_ARG_WITH(docdir,
+ AS_HELP_STRING([--with-docdir=PATH],[Specify where to put the documentation]),
+ [mutt_cv_docdir=$withval],
+- [mutt_cv_docdir='${datarootdir}/doc/mutt'])
++ [mutt_cv_docdir='${datarootdir}/doc/neomutt'])
+
+ AC_ARG_WITH(domain,
+ AS_HELP_STRING([--with-domain=DOMAIN],[Specify your DNS domain name]),
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index cbb5efec..96bae35a 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -43,8 +43,8 @@ install-data-local: makedoc-all
+ $(INSTALL) -m 644 neomutt.1 $(DESTDIR)$(mandir)/man1/neomutt.1
+ $(INSTALL) -m 644 neomuttrc.man $(DESTDIR)$(mandir)/man5/neomuttrc.5
+ $(INSTALL) -m 644 $(srcdir)/smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys_$(PACKAGE).1
+- $(INSTALL) -m 644 $(srcdir)/pgpewrap.1 $(DESTDIR)$(mandir)/man1/pgpewrap_$(PACKAGE).1
+- $(INSTALL) -m 644 $(srcdir)/pgpring.1 $(DESTDIR)$(mandir)/man1/pgpring_$(PACKAGE).1
++ $(INSTALL) -m 644 $(srcdir)/pgpewrap.1 $(DESTDIR)$(mandir)/man1/neomutt_pgpewrap_$(PACKAGE).1
++ $(INSTALL) -m 644 $(srcdir)/pgpring.1 $(DESTDIR)$(mandir)/man1/neomutt_pgpring_$(PACKAGE).1
+ $(INSTALL) -m 644 $(srcdir)/mbox.5 $(DESTDIR)$(mandir)/man5/mbox_$(PACKAGE).5
+ $(INSTALL) -m 644 $(srcdir)/mmdf.5 $(DESTDIR)$(mandir)/man5/mmdf_$(PACKAGE).5
+ $(MKDIR_P) $(DESTDIR)$(docdir)
+@@ -63,7 +63,7 @@ install-data-local: makedoc-all
+ -$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(docdir)/mime.types
+
+ uninstall-local:
+- for f in neomutt.1 smime_keys_$(PACKAGE).1 pgpewrap_$(PACKAGE).1 pgpring_$(PACKAGE).1; do \
++ for f in neomutt.1 smime_keys_$(PACKAGE).1 neomutt_pgpewrap_$(PACKAGE).1 neomutt_pgpring_$(PACKAGE).1; do \
+ rm -f $(DESTDIR)$(mandir)/man1/$$f; \
+ done
+ for f in neomuttrc.5 mbox_$(PACKAGE).5 mmdf_$(PACKAGE).5; do \
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index ac7658a9..222cbc68 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -7,7 +7,7 @@ EXTRA_DIST = lib.h base64.h buffer.h date.h debug.h exit.h file.h hash.h mapping
+
+ AM_CPPFLAGS = -I$(top_srcdir)
+
+-noinst_LIBRARIES = libmutt.a
++noinst_LIBRARIES = libneomutt.a
+
+-libmutt_a_SOURCES = base64.c buffer.c date.c debug.c exit.c file.c hash.c mapping.c md5.c memory.c message.c sha1.c string.c
++libneomutt_a_SOURCES = base64.c buffer.c date.c debug.c exit.c file.c hash.c mapping.c md5.c memory.c message.c sha1.c string.c
+
+--
+2.13.6
+
diff --git a/mail-client/neomutt/files/Muttrc b/mail-client/neomutt/files/Muttrc
new file mode 100644
index 000000000000..6f0d63e3b527
--- /dev/null
+++ b/mail-client/neomutt/files/Muttrc
@@ -0,0 +1,19 @@
+# Some minimal Mutt settings, Gentoo-style. These reflect the Gentoo
+# predilection for maildir folders.
+#
+# Please don't add settings to this file to change other user
+# preferences (such as colors), since those can be hard for a user to
+# undo if their preference doesn't match yours! For example, it is
+# *impossible* currently in mutt to remove color settings from objects
+# other than the index.
+
+set mbox_type=Maildir
+set folder=~/.maildir
+set spoolfile=~/.maildir/
+set record=~/.maildir-sent/
+set move=no
+
+# Maybe we shouldn't set index_format here, but this is a recommended
+# one for maildir-style folders.
+
+set index_format="%4C %Z %{%b %d} %-16.16L %s"
diff --git a/mail-client/neomutt/files/Muttrc.mbox b/mail-client/neomutt/files/Muttrc.mbox
new file mode 100644
index 000000000000..1382a374ea68
--- /dev/null
+++ b/mail-client/neomutt/files/Muttrc.mbox
@@ -0,0 +1,9 @@
+# Some minimal Mutt settings, Gentoo-style. Since mutt was installed
+# with USE=mbox, this file doesn't have any changes from the default
+# mutt settings, making it very minimal indeed...
+#
+# Please don't add settings to this file to change other user
+# preferences (such as colors), since those can be hard for a user to
+# undo if their preference doesn't match yours! For example, it is
+# *impossible* currently in mutt to remove color settings from objects
+# other than the index.
diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
new file mode 100644
index 000000000000..3bea116a368a
--- /dev/null
+++ b/mail-client/neomutt/metadata.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ nicolasbock@gentoo.org
+ Nicolas Bock
+
+
+
+
+
diff --git a/mail-client/neomutt/neomutt-20170714.ebuild b/mail-client/neomutt/neomutt-20170714.ebuild
new file mode 100644
index 000000000000..db298e091290
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20170714.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://www.neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet
+ libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl +symlink
+ tokyocabinet"
+
+CDEPEND="
+ app-misc/mime-types
+ berkdb? ( >=sys-libs/db-4:= )
+ gdbm? ( sys-libs/gdbm )
+ kyotocabinet? ( dev-db/kyotocabinet )
+ lmdb? ( dev-db/lmdb )
+ nls? ( virtual/libintl )
+ qdbm? ( dev-db/qdbm )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ gpg? ( >=app-crypt/gpgme-0.9.0 )
+ idn? ( net-dns/libidn )
+ kerberos? ( virtual/krb5 )
+ notmuch? ( net-mail/notmuch )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ !slang? ( sys-libs/ncurses:0 )
+ slang? ( sys-libs/slang )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+"
+DEPEND="${CDEPEND}
+ net-mail/mailbase
+ doc? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ || ( www-client/lynx www-client/w3m www-client/elinks )
+ )"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-mutt )
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+ eapply "${FILESDIR}/0001-Rename-mutt-to-neomutt-${PV}.patch"
+ eapply_user
+ AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ "$(use_enable crypt pgp)"
+ "$(use_enable debug)"
+ "$(use_enable doc)"
+ "$(use_enable gpg gpgme)"
+ "$(use_enable nls)"
+ "$(use_enable smime)"
+ "$(use_enable notmuch)"
+ "$(use_with idn)"
+ "$(use_with kerberos gss)"
+ "$(use_with sasl)"
+ "$(use_with tokyocabinet)"
+ "$(use_with kyotocabinet)"
+ "$(use_with qdbm)"
+ "$(use_with gdbm)"
+ "$(use_with berkdb bdb)"
+ "$(use_with lmdb)"
+ "--with-$(usex slang slang curses)"
+ "--sysconfdir=${EPREFIX}/etc/${PN}"
+ "--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ if use gnutls; then
+ myconf+=( "--with-gnutls" )
+ elif use ssl; then
+ myconf+=( "--with-ssl" )
+ fi
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # A newer file is provided by app-misc/mime-types. So we link it.
+ rm "${ED}"/etc/${PN}/mime.types || die
+ dosym "${EPREFIX}/etc/mime.types" /etc/${PN}/mime.types
+
+ ## A man-page is always handy, so fake one
+ if use !doc; then
+ emake -C doc neomuttrc.man
+ # make the fake slightly better, bug #413405
+ sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
+ -e 's#in @docdir@,#at http://www.neomutt.org/,#' \
+ -e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+ -e "s#@bindir@#${EPREFIX}/usr/bin#" \
+ doc/mutt.man > neomutt.1 || die
+ cp doc/neomuttrc.man neomuttrc.5 || die
+ doman neomutt.1 neomuttrc.5
+ fi
+
+ dodoc COPYRIGHT ChangeLog* OPS* README*
+}
diff --git a/mail-client/neomutt/neomutt-20170912.ebuild b/mail-client/neomutt/neomutt-20170912.ebuild
new file mode 100644
index 000000000000..404b40f4688d
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20170912.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://www.neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet
+ libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl +symlink
+ tokyocabinet"
+
+CDEPEND="
+ app-misc/mime-types
+ berkdb? ( >=sys-libs/db-4:= )
+ gdbm? ( sys-libs/gdbm )
+ kyotocabinet? ( dev-db/kyotocabinet )
+ lmdb? ( dev-db/lmdb )
+ nls? ( virtual/libintl )
+ qdbm? ( dev-db/qdbm )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ gpg? ( >=app-crypt/gpgme-0.9.0 )
+ idn? ( net-dns/libidn )
+ kerberos? ( virtual/krb5 )
+ notmuch? ( net-mail/notmuch )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ !slang? ( sys-libs/ncurses:0 )
+ slang? ( sys-libs/slang )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+"
+DEPEND="${CDEPEND}
+ net-mail/mailbase
+ doc? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ || ( www-client/lynx www-client/w3m www-client/elinks )
+ )"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-mutt )
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+ eapply "${FILESDIR}/0001-Rename-mutt-to-neomutt-${PV}.patch"
+ eapply_user
+ AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ "$(use_enable crypt pgp)"
+ "$(use_enable debug)"
+ "$(use_enable doc)"
+ "$(use_enable gpg gpgme)"
+ "$(use_enable nls)"
+ "$(use_enable smime)"
+ "$(use_enable notmuch)"
+ "$(use_with idn)"
+ "$(use_with kerberos gss)"
+ "$(use_with sasl)"
+ "$(use_with tokyocabinet)"
+ "$(use_with kyotocabinet)"
+ "$(use_with qdbm)"
+ "$(use_with gdbm)"
+ "$(use_with berkdb bdb)"
+ "$(use_with lmdb)"
+ "--with-$(usex slang slang curses)"
+ "--sysconfdir=${EPREFIX}/etc/${PN}"
+ "--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ if use gnutls; then
+ myconf+=( "--with-gnutls" )
+ elif use ssl; then
+ myconf+=( "--with-ssl" )
+ fi
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # A newer file is provided by app-misc/mime-types. So we link it.
+ rm "${ED}"/etc/${PN}/mime.types || die
+ dosym "${EPREFIX}/etc/mime.types" /etc/${PN}/mime.types
+
+ ## A man-page is always handy, so fake one
+ if use !doc; then
+ emake -C doc muttrc.man
+ # make the fake slightly better, bug #413405
+ sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
+ -e 's#in @docdir@,#at http://www.neomutt.org/,#' \
+ -e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+ -e "s#@bindir@#${EPREFIX}/usr/bin#" \
+ doc/mutt.man > neomutt.1 || die
+ cp doc/muttrc.man neomuttrc.5 || die
+ doman neomutt.1 neomuttrc.5
+ fi
+
+ dodoc COPYRIGHT LICENSE* ChangeLog* README*
+}
diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
new file mode 100644
index 000000000000..efec30f01e83
--- /dev/null
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic git-r3
+
+EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
+KEYWORDS=""
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://www.neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet
+ libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl +symlink
+ tokyocabinet"
+
+CDEPEND="
+ app-misc/mime-types
+ berkdb? ( >=sys-libs/db-4:= )
+ gdbm? ( sys-libs/gdbm )
+ kyotocabinet? ( dev-db/kyotocabinet )
+ lmdb? ( dev-db/lmdb )
+ nls? ( virtual/libintl )
+ qdbm? ( dev-db/qdbm )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ gpg? ( >=app-crypt/gpgme-0.9.0 )
+ idn? ( net-dns/libidn )
+ kerberos? ( virtual/krb5 )
+ notmuch? ( net-mail/notmuch )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ !slang? ( sys-libs/ncurses:0 )
+ slang? ( sys-libs/slang )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+"
+DEPEND="${CDEPEND}
+ net-mail/mailbase
+ doc? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ || ( www-client/lynx www-client/w3m www-client/elinks )
+ )"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-mutt )
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+ eapply "${FILESDIR}/0001-Rename-mutt-to-neomutt.patch"
+ eapply_user
+ AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ "$(use_enable crypt pgp)"
+ "$(use_enable debug)"
+ "$(use_enable doc)"
+ "$(use_enable gpg gpgme)"
+ "$(use_enable nls)"
+ "$(use_enable smime)"
+ "$(use_enable notmuch)"
+ "$(use_with idn)"
+ "$(use_with kerberos gss)"
+ "$(use_with sasl)"
+ "$(use_with tokyocabinet)"
+ "$(use_with kyotocabinet)"
+ "$(use_with qdbm)"
+ "$(use_with gdbm)"
+ "$(use_with berkdb bdb)"
+ "$(use_with lmdb)"
+ "--with-$(usex slang slang curses)"
+ "--sysconfdir=${EPREFIX}/etc/${PN}"
+ "--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ if use gnutls; then
+ myconf+=( "--with-gnutls" )
+ elif use ssl; then
+ myconf+=( "--with-ssl" )
+ fi
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # A newer file is provided by app-misc/mime-types. So we link it.
+ #rm "${ED}"/etc/${PN}/mime.types || die
+ #dosym "${EPREFIX}/etc/mime.types" /etc/${PN}/mime.types
+
+ # A man-page is always handy, so fake one
+ if use !doc; then
+ emake -C doc neomuttrc.man
+ # make the fake slightly better, bug #413405
+ sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
+ -e 's#in @docdir@,#at http://www.neomutt.org/,#' \
+ -e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+ -e "s#@bindir@#${EPREFIX}/usr/bin#" \
+ doc/neomutt.man > neomutt.1 || die
+ cp doc/neomuttrc.man neomuttrc.5 || die
+ doman neomutt.1 neomuttrc.5
+ fi
+
+ dodoc COPYRIGHT LICENSE* ChangeLog* README*
+}
diff --git a/media-gfx/freewrl/freewrl-9999.ebuild b/media-gfx/freewrl/freewrl-9999.ebuild
index 536fd1261b7e..9987dd19fbc8 100644
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ b/media-gfx/freewrl/freewrl-9999.ebuild
@@ -7,7 +7,7 @@ inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
if [[ ${PV} == "9999" ]]; then
inherit git-r3
- EGIT_REPO_URI="git://git.code.sf.net/p/freewrl/git"
+ EGIT_REPO_URI="https://git.code.sf.net/p/freewrl/git"
EGIT_BRANCH="develop"
S="${WORKDIR}/${P}/freex3d"
SRC_URI=
diff --git a/media-gfx/propaganda/propaganda-1.0-r1.ebuild b/media-gfx/propaganda/propaganda-1.0-r1.ebuild
new file mode 100644
index 000000000000..86f584a1d5f7
--- /dev/null
+++ b/media-gfx/propaganda/propaganda-1.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+S="${WORKDIR}/Propaganda"
+DESCRIPTION="Propaganda Volume 1-14 + E. Tiling images for your desktop"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SITE="mirror://gentoo/"
+SRC_URI="${SITE}Propaganda-Vol-01.tar.gz
+ ${SITE}Propaganda-Vol-02.tar.gz
+ ${SITE}Propaganda-Vol-03.tar.gz
+ ${SITE}Propaganda-Vol-04.tar.gz
+ ${SITE}Propaganda-Vol-05.tar.gz
+ ${SITE}Propaganda-Vol-06.tar.gz
+ ${SITE}Propaganda-Vol-07.tar.gz
+ ${SITE}Propaganda-Vol-08.tar.gz
+ ${SITE}Propaganda-Vol-09.tar.gz
+ ${SITE}Propaganda-Vol-10.tar.gz
+ ${SITE}Propaganda-Vol-11.tar.gz
+ ${SITE}Propaganda-Vol-12.tar.gz
+ ${SITE}Propaganda-13.tar.gz
+ ${SITE}Propaganda-14.tar.gz
+ ${SITE}Propaganda-For-E.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+src_prepare() {
+ default
+
+ mv ../Propaganda-Vol-11 Vol11 || die
+ mv ../Propaganda-Vol-12 Vol12 || die
+
+ rename JPG jpg */*.JPG || die
+}
+
+src_install() {
+ dodoc README-PROPAGANDA
+
+ local VOLUME
+ for VOLUME in Vol* Propaganda-For-E; do
+ insinto "/usr/share/pixmaps/Propaganda/${VOLUME}"
+ doins "${VOLUME}"/*.jpg
+ done
+}
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 67032d336aba..761e93636909 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,2 +1,3 @@
DIST rawtherapee-5.1.tar.xz 10785516 SHA256 fb742065a6b2e1b89df67c70395e52ee1ebd537c86dfc473b41e7af171655b67 SHA512 6a881fe24a4109c7db39cb8bee500eb2f9357c479ddb32b3c9b7987aa5d12e4f10083533b5657a0e0f0713fe4ebc58e0dcf204eb8d5c5b656f3e7867a775ab19 WHIRLPOOL 0fc24843015750ab4747311d5ac6f40e5ebd9cedaa9c78e73c7fa7250dcbda9ea1260b7f6fc9a0c91559be4530a84e3826f991d9b9199d7caf25691ad78fd78b
DIST rawtherapee-5.2.tar.xz 10819936 SHA256 5c32679bfb77eca36c26288483be75696086459b7a59bd4437e371ea1bf827b6 SHA512 ed2ff2e96ad4f0c50ebbc8a232d85b8c5b118bc956bc26aa72beb4741f464c46900aa668127fe7bdc963fabb5c2e2931c50cf784d1fc4fbc4dce3090412a1b5d WHIRLPOOL 02c71705b76df25e86b6ba5bf6439a3a2966e84dfa968b0a82c1dbe0c6297af826d2ffff6e973a56db21f5821d0a4eead6c05422bc6cb36269ed18b829bad1df
+DIST rawtherapee-5.3.tar.xz 11042548 SHA256 97959c946b7cc346affce53efc4bf6eca4125873343f96d1fbe43a5c717f3ef8 SHA512 8a9a7fe98ba0c8e03e964c809afc90afcc03a31b8b88e0f9e2ab4ecdc1fbe4712231f692d0585d95d638cae7171393e01860296149fc9dfbd86ecb35c3709284 WHIRLPOOL 4ad4824ec499a3c10ca20fae5d95e36bc5503a5c878219d4fae12116b96d99c8f02a4017932e753284a93d6d01302cb64363fb953af600fb223b11758ae286ff
diff --git a/media-gfx/rawtherapee/rawtherapee-5.3.ebuild b/media-gfx/rawtherapee/rawtherapee-5.3.ebuild
new file mode 100644
index 000000000000..a345df7ead1c
--- /dev/null
+++ b/media-gfx/rawtherapee/rawtherapee-5.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs flag-o-matic
+
+DESCRIPTION="A powerful cross-platform raw image processing program"
+HOMEPAGE="http://www.rawtherapee.com/"
+
+MY_P=${P/_rc/-rc}
+SRC_URI="http://rawtherapee.com/shared/source/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="openmp"
+
+RDEPEND="x11-libs/gtk+:3
+ dev-libs/expat
+ dev-libs/libsigc++:2
+ media-libs/libcanberra[gtk3]
+ media-libs/tiff:0
+ media-libs/libpng:0
+ media-libs/libiptcdata
+ media-libs/lcms:2
+ media-libs/lensfun
+ sci-libs/fftw:3.0
+ sys-libs/zlib
+ virtual/jpeg:0"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig
+ dev-cpp/gtkmm:3.0"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+ if use openmp ; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+ # https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
+ # https://github.com/vivo75/vivovl/issues/2
+ if [[ $(get-flag -O3) != "-O3" ]] ; then
+ ewarn "upstream suggest using {C,CXX}FLAGS+=\"-O3\" for better performances"
+ ewarn "see bug#606896#c2"
+ ewarn "take a look at https://wiki.gentoo.org/wiki//etc/portage/package.env"
+ ewarn "for suggestion on how to change environment for a single package"
+ fi
+}
+
+src_configure() {
+ filter-flags -ffast-math
+ # In case we add an ebuild for klt we can (i)use that one,
+ # see http://cecas.clemson.edu/~stb/klt/
+ local mycmakeargs=(
+ -DOPTION_OMP=$(usex openmp)
+ -DDOCDIR=/usr/share/doc/${PF}
+ -DCREDITSDIR=/usr/share/${PN}
+ -DLICENCEDIR=/usr/share/${PN}
+ -DCACHE_NAME_SUFFIX=""
+ -DWITH_SYSTEM_KLT="off"
+ )
+ cmake-utils_src_configure
+}
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index 183b4473855d..fec9ab52e708 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -1,3 +1,3 @@
DIST faac-1.28.tar.gz 678891 SHA256 c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df SHA512 0ef721ad28835e95cad41afc0cb6130e1ebb634cb6dd4b40f649bc2269b7bb5bf2887f6d8f023c74628d521f8bdf55b4dd070f972ecff162a5fe0384e026235b WHIRLPOOL fe56f3c2b40670f03e0c1880b253d7f0cc6e318c0b407f4e57fb7eaeac8692c6de9829402e670ddc0f397396935131ade0f8dadfc89b88fcdedecbf404e1b54e
-DIST faac-1.29.7.3.tar.gz 497155 SHA256 39a8c2b622b6374362a5e5d2481fdef208f732f4ba4b84038a2c20029e39beb6 SHA512 265aff7d02ec4a9fcc96831ad4f4da943f0bbfc0b08975ad8bd6fca420b1747edb1231f9f29a1dc483e82050351ac5fa464e06b4d03feeb7e8a226b4ea892e0f WHIRLPOOL 3277e058804f6a16d5a11ccfd380269e80eec78d3ca8530ca306481ec15d132dcc8912bf7cbd427470d295fc14a4c8da308ecc1e4ceae9cfade546a0ef61b953
DIST faac-1.29.7.4.tar.gz 488685 SHA256 374e0a2c166e4c67cc049e6b76b0158ba881156b9c428142104340fb7fcf6abc SHA512 b9f812cf4075ce7ad11833dff19bf6a8ebed5a0d73e0472b1d9798e2764b43e19a55689a6ec0fca86742bb3f62ca1bde21747386816d3d4c45f08e3c558b69d4 WHIRLPOOL 027f919f85d354f7991e778377dafcbad517d45b6599a1fded0a814a4578162e6f21019b58826cbf2a6767d15f3994a68ad2d11b44c006e77880c139e64792d1
+DIST faac-1.29.7.7.tar.gz 477124 SHA256 b898fcf55e7b52f964ee62d077f56fe9b3b35650e228f006fbef4ce903b4d731 SHA512 4461e5ee8dc3e6045e348a1ce50aa2df878aceffdc242fe256853f11f22e4895236bc64e3bbe89aad9c5a806d27368ed9e134699ee739225f407846ff2ebe2b8 WHIRLPOOL 496cc5a1e4f1955d4cd39255f4967ac263724800643eb7bb949b563c44d8ca137db1e2a34a6ce5f53c88566c9494027ed9936804e01cf71e18ba993e9a18b12a
diff --git a/media-libs/faac/faac-1.29.7.3.ebuild b/media-libs/faac/faac-1.29.7.7.ebuild
similarity index 89%
rename from media-libs/faac/faac-1.29.7.3.ebuild
rename to media-libs/faac/faac-1.29.7.7.ebuild
index cd62caf3d01c..4dfb024938ef 100644
--- a/media-libs/faac/faac-1.29.7.3.ebuild
+++ b/media-libs/faac/faac-1.29.7.7.ebuild
@@ -45,11 +45,3 @@ multilib_src_install() {
emake DESTDIR="${D}" install
prune_libtool_files
}
-
-multilib_src_install_all() {
- einstalldocs
- docinto html
- dodoc docs/*.html
- insinto /usr/share/doc/${PF}/pdf
- doins docs/libfaac.pdf
-}
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 476a3adb6aac..7a2d71818f82 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,2 +1,3 @@
DIST faad2-2.7.tar.gz 1137407 SHA256 ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330 SHA512 8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161 WHIRLPOOL 6e30d466e47de0e06751718005573a632c5aa0cd209445c56c25d859f917265452676ce897ac5ad1cd308d411911aaf232bfc50904469f9434b2cc95b6ae928f
DIST faad2-2.8.1.tar.gz 802453 SHA256 133270a9be0c9ab8fea18017703ab4a94f9eddbb45a8aa6a511a1469fa413591 SHA512 102271e72b3d2f7f043f89d503ff8bf32c276001510055d8db5d9242fe51004ba727b33180134773fc77b2498ee61fe84a1a8db45705200ce79e4aa06b9da9ee WHIRLPOOL 5303692dcdac21d64ae6db0aa71c5ecbac7550a8227d5ea163374f15ee0433f7221ccb683f67ffa2ffe4dbbe3b8f0bad226cec7a99e264cd8a1022896d60915e
+DIST faad2-2.8.5.tar.gz 1025674 SHA256 ba7364ba8ff9256abb8aa4af8736f27d0b7eaab51c14ff828cc86aabff33ec65 SHA512 bb3445aa82b18688b32d7ac9983e5fbf47b6c717486e58c711483967cbf3887540e8a57840a76e686eb990eae341496457ec39278f1c62256708b2d5ef4587ae WHIRLPOOL dc5023eee9f6d4c6e55ef7697a2e27c7282bbc48ddf9b8643be975067093f452050534eb8dc041cc03da9c97b4a5020002fab96eff52dfe0284adcb579745ff0
diff --git a/media-libs/faad2/faad2-2.8.5.ebuild b/media-libs/faad2/faad2-2.8.5.ebuild
new file mode 100644
index 000000000000..3429665fa71f
--- /dev/null
+++ b/media-libs/faad2/faad2-2.8.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools ltprune multilib-minimal
+
+DESCRIPTION="AAC audio decoding library"
+HOMEPAGE="http://www.audiocoding.com/faad2.html"
+SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="digitalradio static-libs"
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+RDEPEND=""
+DEPEND=""
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.8.5-libmp4ff-shared-lib.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i -e 's:iquote :I:' libfaad/Makefile.am || die
+
+ # bug 466986
+ sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --without-xmms
+ $(use_with digitalradio drm)
+ $(use_enable static-libs static)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+ # do not build the frontend for non default abis
+ if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+ sed -i -e 's/frontend//' Makefile || die
+ fi
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --all
+ einstalldocs
+}
diff --git a/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch b/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch
new file mode 100644
index 000000000000..944b5f8bd610
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch
@@ -0,0 +1,25 @@
+--- faad2-2.8.5/common/mp4ff/Makefile.am
++++ faad2-2.8.5/common/mp4ff/Makefile.am
+@@ -1,7 +1,8 @@
+-noinst_LIBRARIES = libmp4ff.a
+-noinst_HEADERS = mp4ff.h mp4ffint.h
++lib_LTLIBRARIES = libmp4ff.la
++include_HEADERS = mp4ff.h mp4ffint.h
+
+-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
++AM_CFLAGS = -DUSE_TAGGING=1
+
+-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
++libmp4ff_la_LDFLAGS = -version-info 0:0:0
++libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
+ mp4tagupdate.c mp4ff.h mp4ffint.h
+--- faad2-2.8.5/frontend/Makefile.am
++++ faad2-2.8.5/frontend/Makefile.am
+@@ -4,6 +4,7 @@
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+
+ faad_LDADD = $(top_builddir)/libfaad/libfaad.la
++ $(top_builddir)/common/mp4ff/libmp4ff.la
+
+ faad_SOURCES = mp4read.c audio.c main.c audio.h mp4read.h
+
diff --git a/media-libs/jbig2dec/jbig2dec-0.13-r4.ebuild b/media-libs/jbig2dec/jbig2dec-0.13-r4.ebuild
index 19f1289c5584..38e94e73b33f 100644
--- a/media-libs/jbig2dec/jbig2dec-0.13-r4.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.13-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.ghostscript.com/public/${PN}/${P}.tar.gz
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
IUSE="png static-libs test"
RDEPEND="png? ( media-libs/libpng:0= )"
diff --git a/media-libs/liblo/liblo-0.29.ebuild b/media-libs/liblo/liblo-0.29.ebuild
index 0397195ad001..ed828875e22f 100644
--- a/media-libs/liblo/liblo-0.29.ebuild
+++ b/media-libs/liblo/liblo-0.29.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~ppc-macos"
IUSE="doc ipv6 static-libs"
RESTRICT="test"
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 19fcca9e54bb..61d4101a9b4c 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,3 +1,3 @@
-DIST libmtp-1.1.11.tar.gz 788911 SHA256 15d96dff79a4f7ad14338894a4096d4ac584c6ad25fdcca955bc4726303287e9 SHA512 966d5d831695dc02411fbe0a153873d9e5604a00e75bf0d4cc1a957887a2e7656c82209f5bf86150f7b9af037d66a96b3e3523e16d5b52ae013b835febf622c9 WHIRLPOOL 16e31709054de63d954c691b6396d7e1ad23c3327228188a5b918326a2ac9458d5701dabd73f86568dc5d7cd8512cbe2ddbaccb96d1e31d7e2c69ff0ac14b9a5
DIST libmtp-1.1.12.tar.gz 776555 SHA256 cdf59e816c6cda3e908a876c7fb42943f40b85669aea0029a1ca431c89afa1a0 SHA512 2fff8f6653aa1fa6d7a545fc4f0ae8cb3e54fdb4486a0f065b733ffb5c33f994f66067a697ffe52fe65fb39ffe2bacc418543f84e504e18f443e3c563a116c4f WHIRLPOOL 3825139caa3304be041f0a786e3c871000b47b568cfa0015edecb2ce9ff9e377817abceabe0a81fce368d76efa03e2e9dce2490d57dd9e41f133e94b86a29c67
DIST libmtp-1.1.13.tar.gz 801519 SHA256 494ee02fbfbc316aad75b93263dac00f02a4899f28cfda1decbbd6e26fda6d40 SHA512 99d5a277806f29f1d27a64a478e344916e8bfc9949a41a807c16d37bd29ec99dc3f36d504cfc6e67f1e91ee932a7cf82f13d4c9fe14b7e34333d9b12b04fff77 WHIRLPOOL ce0e63f07a60b7dd71e7d413d4ddafd215c78a4bf9782ce1f74777871d751f302f37da1a09a05c454c865dfcee7c4559a85f9602f95a7e0401af50a119b42c16
+DIST libmtp-1.1.14.tar.gz 804354 SHA256 3817d3e296be8f1bc527385585780e70984e8e0d6a0d00349240d67e3df412e8 SHA512 337d259462cf9700fe5a5f09b38f4652045ee71249d54562661362e6d0ec7fe087ab77ec68d443e4fb84839a8ad9dc686c207d723ab47bc1a542dd0a71b294b1 WHIRLPOOL 52f67b1425979d37404ddbc0c14098849c66e2e21003b956094f629bba1f5f5ea3de4eca8e89bfebfd4c7d2347f8ac804a44f838776f542cc225e998b980ee91
diff --git a/media-libs/libmtp/libmtp-1.1.11.ebuild b/media-libs/libmtp/libmtp-1.1.14.ebuild
similarity index 92%
rename from media-libs/libmtp/libmtp-1.1.11.ebuild
rename to media-libs/libmtp/libmtp-1.1.14.ebuild
index 1d0a489f0b18..b009b4abaff4 100644
--- a/media-libs/libmtp/libmtp-1.1.11.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.14.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 udev user
if [[ ${PV} == 9999* ]]; then
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
inherit autotools git-r3
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
fi
DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
@@ -25,12 +25,15 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen )"
+DOCS="AUTHORS README TODO"
+
pkg_setup() {
- DOCS="AUTHORS README TODO"
enewgroup plugdev
}
src_prepare() {
+ default
+
# ChangeLog says "RETIRING THIS FILE ..pause.. GIT" (Last entry from start of 2011)
rm -f ChangeLog
diff --git a/media-libs/libopenshot-audio/metadata.xml b/media-libs/libopenshot-audio/metadata.xml
index 79f888359b57..380e62435237 100644
--- a/media-libs/libopenshot-audio/metadata.xml
+++ b/media-libs/libopenshot-audio/metadata.xml
@@ -1,14 +1,7 @@
-
- sautier.louis@gmail.com
- Louis Sautier
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
libopenshot
OpenShot/libopenshot-audio
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 2b94907f7ac1..3a35d834afc0 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,2 +1,3 @@
DIST libopenshot-0.1.3.tar.gz 11019740 SHA256 4a35318af4fbeeb0c658963275e8ec1edb985497ab9674d76eb02a1d72cbb64d SHA512 d59817505812868db408a88dc1d30b5b1833910f45dd0df03937110b7d4cbd85a270773008e75a1501f4b3b89a09ea798ed9b580755adf3ae79ac24d403f6982 WHIRLPOOL 31e7b7fe98e2709d1d88c6e2c39ceaa0b81c4f9a624ea9853ffd9b86771148e1bec808ec67192cede3578bc30860f8f5a878f67745d2d2ac9838ea93f01b628c
DIST libopenshot-0.1.7.tar.gz 11022594 SHA256 71cf5c18c76c36bec40c775cb98ab1ed672aa48d2de63a26c33c5cc5d6f0875a SHA512 4c8871ff30c03a14766e35a64052695768311afd81ecc55598720ad146f53c122ef3b1293467670f7dd48da77bf6cb4f4f14a18c298a649b8827f901ed653709 WHIRLPOOL 1730155af6b22ead4655e69c47df395566eb97dc66e5ec683ac2025130eded9060b515fd637b58de0254c4673adfbea1620a3253064f150fcb9bf9dfd492eb88
+DIST libopenshot-0.1.8.tar.gz 11019495 SHA256 a9b0706433c5c0e6edc9b1cc3c0ff1af4c8b7e8e31b5e071445a113fbb365d45 SHA512 02630d7ce9fd378ad648d034622d4f971728a2074691d7facc8a36dcd52b87c1372dd5a9588c0ba852589105bdbf78941083fd6b1eb1bcc0a33d4ca49634162c WHIRLPOOL ce007a69609ef34c3be0828d8b337a9eca795e5e806a056a3a391b804e438aa43063d80a7df0c42d31e79932c56eef5f55c17ebbd2fd846410c16bf227c6c844
diff --git a/media-libs/libopenshot/files/libopenshot-0.1.8-fix-tests.patch b/media-libs/libopenshot/files/libopenshot-0.1.8-fix-tests.patch
new file mode 100644
index 000000000000..bad8bcb9b4f0
--- /dev/null
+++ b/media-libs/libopenshot/files/libopenshot-0.1.8-fix-tests.patch
@@ -0,0 +1,26 @@
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 431987b..2c45550 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -24,16 +24,19 @@
+ # along with OpenShot Library. If not, see .
+ ################################################################################
+
++SET(TEST_MEDIA_PATH "${openshot_SOURCE_DIR}/src/examples/")
+
+ ################ WINDOWS ##################
+ # Set some compiler options for Windows
+ # required for libopenshot-audio headers
+ IF (WIN32)
+- STRING(REPLACE "/" "\\\\" TEST_MEDIA_PATH "${openshot_SOURCE_DIR}/src/examples/")
+- add_definitions( -DIGNORE_JUCE_HYPOT=1 -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" )
++ STRING(REPLACE "/" "\\\\" TEST_MEDIA_PATH TEST_MEDIA_PATH)
++ add_definitions( -DIGNORE_JUCE_HYPOT=1 )
+ SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -include cmath")
+ ENDIF(WIN32)
+
++add_definitions( -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" )
++
+ ################### UNITTEST++ #####################
+ # Find UnitTest++ libraries (used for unit testing)
+ FIND_PACKAGE(UnitTest++ REQUIRED)
diff --git a/media-libs/libopenshot/libopenshot-0.1.8.ebuild b/media-libs/libopenshot/libopenshot-0.1.8.ebuild
new file mode 100644
index 000000000000..b663cdc7ff24
--- /dev/null
+++ b/media-libs/libopenshot/libopenshot-0.1.8.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit cmake-utils python-single-r1 toolchain-funcs versionator
+
+DESCRIPTION="Video editing library used by OpenShot"
+HOMEPAGE="http://www.openshotvideo.com/"
+SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+imagemagick libav +python test"
+# https://github.com/OpenShot/libopenshot/issues/43
+RESTRICT="test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ net-libs/cppzmq
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5[widgets]
+ media-libs/libopenshot-audio
+ imagemagick? (
-
- sautier.louis@gmail.com
- Louis Sautier
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
libopenshot
OpenShot/libopenshot
diff --git a/media-plugins/vdr-skinnopacity/Manifest b/media-plugins/vdr-skinnopacity/Manifest
deleted file mode 100644
index db9b15d09073..000000000000
--- a/media-plugins/vdr-skinnopacity/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST vdr-skinnopacity-1.1.1.tgz 13064884 SHA256 eb2528994ea3fbbb7c38594b9c90e974cbf0e6ce5bc038b7ec97725d5dc7b67a SHA512 9ad62911792a49b8384752c8965bb083898e9e4d93b9d153e3c59657dbf517bec5cdb1df02355884ce71c11fc90f41afe497b61e9b016a2fce33fef82388d91b WHIRLPOOL 1cee5449f5540fd2cddf76d647b1fd2b12651709089f9a91aa46d20a25f680938c087dadc80107ebc2150fa59d078f7d86a3a5c3e569023b4a6d2c9632cf56df
-DIST vdr-skinnopacity-1.1.3.tgz 15005569 SHA256 6fde30bcc1cdf7be61c84a42a53d63dfe7efcb0997ea45b44aaec2990f70709d SHA512 4ac6c59744f2ea99a7f3b5b32e67924ae062dfb2f1f66342c358e26c928345a6416836cebc28fc2d41d999cffbad2b9640f8a5120e6f7b72353723e042390dae WHIRLPOOL bf7dffd73940c39ea622332096e838662abd80e127784f37348d7c374a07849ede88f7f07f6fa6764c0d693202979403af7fa3a10e56c2f940b66a19ac3521fb
diff --git a/media-plugins/vdr-skinnopacity/files/confd b/media-plugins/vdr-skinnopacity/files/confd
deleted file mode 100644
index e41f3e625d60..000000000000
--- a/media-plugins/vdr-skinnopacity/files/confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# /etc/conf.d/vdr.skinnopacity
-# Configuration file for the VDR skin nOpacity
-
-#SKINNOPACITY_EPGIMAGESPATH=
-
-#SKINNOPACITY_ICONSPATH=
-
-#SKINNOPACITY_LOGOPATH=
diff --git a/media-plugins/vdr-skinnopacity/files/rc-addon.sh b/media-plugins/vdr-skinnopacity/files/rc-addon.sh
deleted file mode 100644
index bcb0362adf7b..000000000000
--- a/media-plugins/vdr-skinnopacity/files/rc-addon.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-plugin_pre_vdr_start() {
- if [ -n "${SKINNOPACITY_EPGIMAGESPATH}" ]; then
- add_plugin_param "-e ${SKINNOPACITY_EPGIMAGESPATH}"
- fi
-
- if [ -n "${SKINNOPACITY_ICONSPATH}" ]; then
- add_plugin_param "-i ${SKINNOPACITY_ICONSPATH}"
- fi
-
- if [ -n "${SKINNOPACITY_LOGOPATH}" ]; then
- add_plugin_param "-l ${SKINNOPACITY_LOGOPATH}"
- fi
-}
diff --git a/media-plugins/vdr-skinnopacity/metadata.xml b/media-plugins/vdr-skinnopacity/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/media-plugins/vdr-skinnopacity/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/media-plugins/vdr-skinnopacity/vdr-skinnopacity-1.1.1-r1.ebuild b/media-plugins/vdr-skinnopacity/vdr-skinnopacity-1.1.1-r1.ebuild
deleted file mode 100644
index a050e79b4912..000000000000
--- a/media-plugins/vdr-skinnopacity/vdr-skinnopacity-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/vdr-}"
-VERSION="1671"
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Skin Plugin: customizable native true color skin for the Video Disc Recorder"
-HOMEPAGE="http://projects.vdr-developer.org/projects/skin-nopacity/"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="net-misc/curl
- dev-libs/libxml2
- virtual/imagemagick-tools
- media-plugins/vdr-epgsearch"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- vdr-plugin-2_src_prepare
-
- if has_version media-gfx/graphicsmagick; then
- sed -i -e 's:^IMAGELIB =.*:IMAGELIB = graphicsmagick:' Makefile
- fi
-}
-
-pkg_postinst() {
- vdr-plugin-2_pkg_postinst
-
- einfo "See http://projects.vdr-developer.org/projects/skin-nopacity/wiki"
- einfo "for more information about how to use channel logos"
-}
diff --git a/media-plugins/vdr-skinnopacity/vdr-skinnopacity-1.1.3-r1.ebuild b/media-plugins/vdr-skinnopacity/vdr-skinnopacity-1.1.3-r1.ebuild
deleted file mode 100644
index 792faeb94e50..000000000000
--- a/media-plugins/vdr-skinnopacity/vdr-skinnopacity-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/vdr-}"
-VERSION="1743"
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Skin Plugin: customizable native true color skin for the Video Disc Recorder"
-HOMEPAGE="http://projects.vdr-developer.org/projects/skin-nopacity/"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="net-misc/curl
- dev-libs/libxml2
- virtual/imagemagick-tools
- media-plugins/vdr-epgsearch"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- vdr-plugin-2_src_prepare
-
- if has_version media-gfx/graphicsmagick; then
- sed -i -e 's:^IMAGELIB =.*:IMAGELIB = graphicsmagick:' Makefile
- fi
-}
-
-pkg_postinst() {
- vdr-plugin-2_pkg_postinst
-
- einfo "See http://projects.vdr-developer.org/projects/skin-nopacity/wiki"
- einfo "for more information about how to use channel logos"
-}
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index b79347ac26ed..1a1db5b59978 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,3 +1,4 @@
DIST openshot-1.4.3.tar.gz 31990991 SHA256 5bebf1c59a8667b0263599544f2d23ce6be3ab79ce24a85b766e1e39cab859d0 SHA512 f3221c3e508ccf61d4fd2771de47f42ddb1a78996853011ee336e8ccf842a0fd97707a60c677e1465a89e6eb67911b6eb98b002959f8a29ac9e31924bbb6fcda WHIRLPOOL 4fd8d5b5db2923c8b7349032847087b9cf4ccdbade206c5c6cc9aac27ace6e99c6053bd1184cf14b20c80b4f666baf356798a5b6a8d6c7c737a9a986894943af
DIST openshot-qt-2.2.0.tar.gz 94924926 SHA256 8de6e193784af3b9149ea13c0552d4556df33396452360d5f9ac30682148e6f7 SHA512 696a95fe1438b8a62261c41e5d495ef1e5107c5e4ee0ab80a980ba5e0e3b7fb5002f1bb780120f9f46a9f3c1fed2de858b61dc38d897bd4235358d617b2406b0 WHIRLPOOL 08a8861b8893c94821bc4dfbf81bfa54101fb34af1f30f15cb26b284f1970bc9d2901e05f7b3a1f159a0690806e64c2ca345f3a56d37f016ec17e1db3e7d6204
DIST openshot-qt-2.3.4.tar.gz 60646277 SHA256 b110eb144a3d3dcfe08f112c66ccc9265620b6fcf540cb690441bc47bf91eaec SHA512 06faaaf1e3e3d996fafca8c7bde5a7fe8b9c66efb03c85448ab19bba85508d7c6334ba43a1368b20d7608cd34526c653e1956aa51ce05099be314538682fd484 WHIRLPOOL dbed47fa4b9d220c75b8cec2e314beca4ba5f2cca687d016b3950aedd93e6e6f1b4d243ddf31b41d5a22d652f2257f725b6e4b85a2882ad1d5938409e1469b20
+DIST openshot-qt-2.4.0.tar.gz 60710408 SHA256 ca6b746671c931dd76af93f31fe3d85ce7f122002013b3a24e45e8222fdbb348 SHA512 95778effa5b02a467c44741384b0f43bf90343d4f450d5fcc2319ff1c3bee212338435dd8c781e0ff111a704aacdce3dbfb6bdcf62afa1f59bbb0668b58074ca WHIRLPOOL 7d0736a2b58fee3af6a54c65da89b8c33b7bdb73d73d708e3e0b48865c981b4f5fa1ec43a9d521e25b72242b1c75cb06731382edbcdc1f5f1575ab8ed5fa752c
diff --git a/media-video/openshot/metadata.xml b/media-video/openshot/metadata.xml
index 1384ef3130c6..6dbde2947b33 100644
--- a/media-video/openshot/metadata.xml
+++ b/media-video/openshot/metadata.xml
@@ -1,14 +1,7 @@
-
- sautier.louis@gmail.com
- Louis Sautier
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
Free, open-source, non-linear video editor to create and edit videos and movies
openshot
diff --git a/media-video/openshot/openshot-2.4.0.ebuild b/media-video/openshot/openshot-2.4.0.ebuild
new file mode 100644
index 000000000000..0ed0f8455c6f
--- /dev/null
+++ b/media-video/openshot/openshot-2.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_REQ_USE=xml
+PYTHON_COMPAT=( python3_{4,5,6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils versionator xdg-utils
+
+MY_PN="${PN}-qt"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Free, open-source, non-linear video editor to create and edit videos and movies"
+HOMEPAGE="http://www.openshot.org/ https://launchpad.net/openshot"
+SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/PyQt5[svg,webkit,${PYTHON_USEDEP}]
+ >=media-libs/libopenshot-0.1.8[python,${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/pyzmq[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}"
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+ # prevent setup.py from trying to update MIME databases
+ sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 2062814c0833..8bc24e99afe6 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 03 Oct 2017 05:09:47 +0000
+Wed, 04 Oct 2017 06:09:55 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 2062814c0833..8bc24e99afe6 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 03 Oct 2017 05:09:47 +0000
+Wed, 04 Oct 2017 06:09:55 +0000
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.2.1 b/metadata/md5-cache/app-admin/keepassxc-2.2.1
new file mode 100644
index 000000000000..05f10a5d8f35
--- /dev/null
+++ b/metadata/md5-cache/app-admin/keepassxc-2.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
+EAPI=6
+HOMEPAGE=https://github.com/keepassxreboot/keepassxc
+IUSE=autotype debug http test yubikey
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 GPL-2 GPL-3
+RDEPEND=dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) yubikey? ( sys-auth/ykpers )
+SLOT=0
+SRC_URI=https://github.com/keepassxreboot/keepassxc/archive/2.2.1.tar.gz -> keepassxc-2.2.1.tar.gz
+_eclasses_=cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=baa5fc5ac89804581616471e48dc09fe
diff --git a/metadata/md5-cache/app-admin/monit-5.23.0 b/metadata/md5-cache/app-admin/monit-5.23.0
index c885d8fe3017..510965751252 100644
--- a/metadata/md5-cache/app-admin/monit-5.23.0
+++ b/metadata/md5-cache/app-admin/monit-5.23.0
@@ -4,10 +4,10 @@ DESCRIPTION=Monitoring and managing daemons or similar programs running on a Uni
EAPI=6
HOMEPAGE=http://mmonit.com/monit/
IUSE=libressl pam ssl
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ppc ~ppc64 ~x86 ~amd64-linux
LICENSE=AGPL-3
RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
SLOT=0
SRC_URI=http://mmonit.com/monit/dist/monit-5.23.0.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=b3d5adbf632076738584fd43d4f66974
+_md5_=16b2cc88e938f2dda031ad1026e10c11
diff --git a/metadata/md5-cache/app-backup/restic-0.4.0 b/metadata/md5-cache/app-backup/restic-0.4.0
deleted file mode 100644
index 94c2f3da6c03..000000000000
--- a/metadata/md5-cache/app-backup/restic-0.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/go test? ( sys-fs/fuse:0 )
-DESCRIPTION=restic is a backup program that is fast, efficient and secure
-EAPI=6
-HOMEPAGE=https://restic.github.io/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-fs/fuse:0
-SLOT=0
-SRC_URI=https://github.com/restic/restic/archive/v0.4.0.tar.gz -> restic-0.4.0.tar.gz
-_md5_=aee3182fe0e36a6b867b39c93852ff60
diff --git a/metadata/md5-cache/app-backup/restic-0.5.0 b/metadata/md5-cache/app-backup/restic-0.5.0
deleted file mode 100644
index b40341cc6f42..000000000000
--- a/metadata/md5-cache/app-backup/restic-0.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/go test? ( sys-fs/fuse )
-DESCRIPTION=restic is a backup program that is fast, efficient and secure
-EAPI=6
-HOMEPAGE=https://restic.github.io/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-fs/fuse:0
-SLOT=0
-SRC_URI=https://github.com/restic/restic/archive/v0.5.0.tar.gz -> restic-0.5.0.tar.gz
-_md5_=825fbe9107eafeeebaa568afefe39eda
diff --git a/metadata/md5-cache/app-backup/restic-0.7.3 b/metadata/md5-cache/app-backup/restic-0.7.3
new file mode 100644
index 000000000000..ade529c67187
--- /dev/null
+++ b/metadata/md5-cache/app-backup/restic-0.7.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=dev-lang/go test? ( sys-fs/fuse:0 ) >=dev-lang/go-1.8
+DESCRIPTION=A backup program that is fast, efficient and secure
+EAPI=6
+HOMEPAGE=https://restic.github.io/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD-2
+RDEPEND=sys-fs/fuse:0
+SLOT=0
+SRC_URI=https://github.com/restic/restic/archive/v0.7.3.tar.gz -> restic-0.7.3.tar.gz
+_eclasses_=golang-base 51a1f13e065f1cff4507685d9cc268c7 golang-vcs-snapshot 913580335becddd3ebecefe852e47536
+_md5_=e77b8fda57dd89a0ee9841ed83a3864d
diff --git a/metadata/md5-cache/app-benchmarks/bonnie++-1.97.3 b/metadata/md5-cache/app-benchmarks/bonnie++-1.97.3
index 348e5774ad2d..b7075b5fdc59 100644
--- a/metadata/md5-cache/app-benchmarks/bonnie++-1.97.3
+++ b/metadata/md5-cache/app-benchmarks/bonnie++-1.97.3
@@ -3,8 +3,8 @@ DESCRIPTION=Hard drive bottleneck testing benchmark suite
EAPI=6
HOMEPAGE=http://www.coker.com.au/bonnie++/
IUSE=debug
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.coker.com.au/bonnie++/experimental/bonnie++-1.97.3.tgz
-_md5_=126b56fc144fe2b4c9e675056c6edeb7
+_md5_=c4f3f4585c78659fabc25242db4c63ba
diff --git a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4 b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4
deleted file mode 100644
index 39975e4f9169..000000000000
--- a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 doc? ( >=dev-java/velocity-1.4 ) dev-java/ant-nodeps sys-apps/sed beanshell? ( dev-java/bsh ) >=dev-java/bsf-2.3 =dev-java/junit-3.8* java-virtuals/javamail >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Load test and measure performance on HTTP/FTP services and databases
-EAPI=0
-HOMEPAGE=http://jmeter.apache.org/
-IUSE=beanshell doc elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 beanshell? ( dev-java/bsh ) >=dev-java/bsf-2.3 =dev-java/junit-3.8* java-virtuals/javamail >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/jakarta/jmeter/source/jakarta-jmeter-2.0.1_src.tgz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-ant-2 4e2b30d918dda38a51839a4d45282b62 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2cb954bc6c6509790bf5378a297df364
diff --git a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r5 b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r5
deleted file mode 100644
index a888eac63c76..000000000000
--- a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 doc? ( >=dev-java/velocity-1.4 ) dev-java/ant-nodeps sys-apps/sed beanshell? ( dev-java/bsh ) >=dev-java/bsf-2.3 =dev-java/junit-3.8* java-virtuals/javamail >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Load test and measure performance on HTTP/FTP services and databases
-EAPI=5
-HOMEPAGE=http://jmeter.apache.org/
-IUSE=beanshell elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 beanshell? ( dev-java/bsh ) >=dev-java/bsf-2.3 =dev-java/junit-3.8* java-virtuals/javamail >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/jakarta/jmeter/source/jakarta-jmeter-2.0.1_src.tgz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-ant-2 4e2b30d918dda38a51839a4d45282b62 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=433b73abcdc9da85f2a1d2aaa39009b5
diff --git a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r6 b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r6
deleted file mode 100644
index 2d3bd091a956..000000000000
--- a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=virtual/jdk:1.7 doc? ( dev-java/velocity:0 ) dev-java/ant-nodeps sys-apps/sed beanshell? ( dev-java/bsh:0 ) dev-java/bsf:2.3 dev-java/junit:0 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Load test and measure performance on HTTP/FTP services and databases
-EAPI=5
-HOMEPAGE=http://jmeter.apache.org/
-IUSE=beanshell elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=virtual/jre:1.7 beanshell? ( dev-java/bsh:0 ) dev-java/bsf:2.3 dev-java/junit:0 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/jakarta/jmeter/source/jakarta-jmeter-2.0.1_src.tgz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-ant-2 4e2b30d918dda38a51839a4d45282b62 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=bc922b461943d15f4dbae09deff0e5a1
diff --git a/metadata/md5-cache/app-emacs/basic-toolkit-0.3 b/metadata/md5-cache/app-emacs/basic-toolkit-0.3
index 5b4cc3875306..d2963e267922 100644
--- a/metadata/md5-cache/app-emacs/basic-toolkit-0.3
+++ b/metadata/md5-cache/app-emacs/basic-toolkit-0.3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
LICENSE=GPL-3+
RDEPEND=app-emacs/windows app-emacs/cycle-buffer >=virtual/emacs-23
SLOT=0
-SRC_URI=https://enise.org/users/victor/share/distfiles/basic-toolkit-0.3.el.xz
+SRC_URI=https://github.com/gavv/distfiles/raw/master/basic-toolkit-0.3.el.xz
_eclasses_=elisp 571fd9c6c9d8b71c8461bb9f33e135ab elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=6203b7f5d3ea27db6dcbb164a4a61587
+_md5_=0c230d096a7327451b5e32ee55203705
diff --git a/metadata/md5-cache/app-emacs/buffer-extension-0.1 b/metadata/md5-cache/app-emacs/buffer-extension-0.1
index 489b4e82d6f3..a19f5c668648 100644
--- a/metadata/md5-cache/app-emacs/buffer-extension-0.1
+++ b/metadata/md5-cache/app-emacs/buffer-extension-0.1
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
LICENSE=GPL-3+
RDEPEND=app-emacs/basic-toolkit >=virtual/emacs-23
SLOT=0
-SRC_URI=https://enise.org/users/victor/share/distfiles/buffer-extension-0.1.el.xz
+SRC_URI=https://github.com/gavv/distfiles/raw/master/buffer-extension-0.1.el.xz
_eclasses_=elisp 571fd9c6c9d8b71c8461bb9f33e135ab elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=a7f782a608e64db913f5dfc6d0dca124
+_md5_=5dab96960a294f850aef70706167cd5a
diff --git a/metadata/md5-cache/app-emacs/cycle-buffer-2.16 b/metadata/md5-cache/app-emacs/cycle-buffer-2.16
index bd20ca4fb400..81a535b81e73 100644
--- a/metadata/md5-cache/app-emacs/cycle-buffer-2.16
+++ b/metadata/md5-cache/app-emacs/cycle-buffer-2.16
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
LICENSE=public-domain
RDEPEND=>=virtual/emacs-23
SLOT=0
-SRC_URI=https://enise.org/users/victor/share/distfiles/cycle-buffer-2.16.el.xz
+SRC_URI=https://github.com/gavv/distfiles/raw/master/cycle-buffer-2.16.el.xz
_eclasses_=elisp 571fd9c6c9d8b71c8461bb9f33e135ab elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=a068064bb54cd3e6689db18482be3419
+_md5_=72d457acf3e4bd192ce764344e2d1dcf
diff --git a/metadata/md5-cache/app-emacs/revive-2.23 b/metadata/md5-cache/app-emacs/revive-2.23
index 7994cb381abf..2dfd44815fed 100644
--- a/metadata/md5-cache/app-emacs/revive-2.23
+++ b/metadata/md5-cache/app-emacs/revive-2.23
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
LICENSE=yuuji
RDEPEND=>=virtual/emacs-23
SLOT=0
-SRC_URI=https://enise.org/users/victor/share/distfiles/revive-2.23.el.xz
+SRC_URI=https://github.com/gavv/distfiles/raw/master/revive-2.23.el.xz
_eclasses_=elisp 571fd9c6c9d8b71c8461bb9f33e135ab elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=918930817db0ab20f37a0a0a60a2f889
+_md5_=98b19388c02e94f02e99f204863785b8
diff --git a/metadata/md5-cache/app-emacs/windows-2.49 b/metadata/md5-cache/app-emacs/windows-2.49
index b08ed2e1ef25..d116fd2ee384 100644
--- a/metadata/md5-cache/app-emacs/windows-2.49
+++ b/metadata/md5-cache/app-emacs/windows-2.49
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
LICENSE=yuuji
RDEPEND=app-emacs/revive >=virtual/emacs-23
SLOT=0
-SRC_URI=https://enise.org/users/victor/share/distfiles/windows-2.49.el.xz
+SRC_URI=https://github.com/gavv/distfiles/raw/master/windows-2.49.el.xz
_eclasses_=elisp 571fd9c6c9d8b71c8461bb9f33e135ab elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=84e00c9f567f5a501ad427026566ba21
+_md5_=9c6a2d43c06f511f5d9069322a3e25b9
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r1 b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r1
index b3ddbacbba00..268d08a27c65 100644
--- a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r1
+++ b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r1
@@ -3,11 +3,11 @@ DEPEND=dev-db/sqlite:3 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/intltool s
DESCRIPTION=A Statistical Language Model based Chinese input method library
EAPI=5
HOMEPAGE=https://github.com/sunpinyin/sunpinyin
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ppc64 ~x86
LICENSE=LGPL-2.1 CDDL
PDEPEND=app-i18n/sunpinyin-data
RDEPEND=dev-db/sqlite:3
SLOT=0/1
SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d scons-utils fcace052aef60e6b0eb3023c26aa585a toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=b1b44a9ae8882714c485e11580524095
+_md5_=87cbfe3ca58e00a8f6a683ba36c4b3f1
diff --git a/metadata/md5-cache/app-misc/khal-0.8.1 b/metadata/md5-cache/app-misc/khal-0.8.1
deleted file mode 100644
index 32832b98a3e8..000000000000
--- a/metadata/md5-cache/app-misc/khal-0.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools_scm[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-DESCRIPTION=A CalDAV based calendar
-EAPI=6
-HOMEPAGE=http://lostpackets.de/khal/
-IUSE=zsh-completion python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/click-3.2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/icalendar[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/urwid[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pyxdg[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pytz[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/vdirsyncer-0.5.2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pkginfo[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/configobj[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/tzlocal[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/setproctitle[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] zsh-completion? ( app-shells/zsh ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/k/khal/khal-0.8.1.tar.gz
-_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d0fcbf12b5e2058c9db5d7ade55c035f
diff --git a/metadata/md5-cache/app-misc/khal-0.8.3 b/metadata/md5-cache/app-misc/khal-0.8.3
deleted file mode 100644
index dbb7ef2cc83f..000000000000
--- a/metadata/md5-cache/app-misc/khal-0.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools_scm[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-DESCRIPTION=A CalDAV based calendar
-EAPI=6
-HOMEPAGE=http://lostpackets.de/khal/
-IUSE=zsh-completion python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/click-3.2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/icalendar[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/urwid[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pyxdg[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pytz[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/vdirsyncer[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pkginfo[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/configobj[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/tzlocal-1.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/setproctitle[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] zsh-completion? ( app-shells/zsh ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/k/khal/khal-0.8.3.tar.gz
-_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6366faafa69065530ec392057d7bbaf8
diff --git a/metadata/md5-cache/app-misc/khal-0.9.7 b/metadata/md5-cache/app-misc/khal-0.9.7
new file mode 100644
index 000000000000..ba244e63a58a
--- /dev/null
+++ b/metadata/md5-cache/app-misc/khal-0.9.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>dev-python/setuptools_scm-1.12.0[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(-)] dev-python/freezegun python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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(-)]
+DESCRIPTION=A CalDAV based calendar
+EAPI=6
+HOMEPAGE=http://lostpackets.de/khal/
+IUSE=zsh-completion python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/click-3.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(-)] >=dev-python/click-log-0.1.3[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(-)] dev-python/icalendar[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(-)] dev-python/urwid[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(-)] dev-python/pyxdg[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(-)] dev-python/pytz[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(-)] dev-python/python-dateutil[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(-)] dev-python/configobj[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(-)] >=dev-python/atomicwrites-0.1.7[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(-)] >=dev-python/tzlocal-1.0[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(-)] dev-python/setproctitle[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(-)] zsh-completion? ( app-shells/zsh ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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 )
+SLOT=0
+SRC_URI=mirror://pypi/k/khal/khal-0.9.7.tar.gz
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1c7ddcc401edfe5005e44e4299764de2
diff --git a/metadata/md5-cache/app-misc/pdfpc-4.0.8 b/metadata/md5-cache/app-misc/pdfpc-4.0.8
new file mode 100644
index 000000000000..d1e6612c1f2c
--- /dev/null
+++ b/metadata/md5-cache/app-misc/pdfpc-4.0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/poppler:=[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Presenter console with multi-monitor support for PDF files
+EAPI=6
+HOMEPAGE=http://pdfpc.github.io
+IUSE=gstreamer
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/poppler:=[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3
+SLOT=0
+SRC_URI=https://github.com/pdfpc/pdfpc/archive/v4.0.8.tar.gz -> pdfpc-4.0.8.tar.gz
+_eclasses_=cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af vala 103e6885c83965507391cdc5b6fa0e67 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a17a25db77429152df705e21d9db9ab9
diff --git a/metadata/md5-cache/app-portage/eix-0.32.9 b/metadata/md5-cache/app-portage/eix-0.32.9
index 623d68507485..2acd7bfefcee 100644
--- a/metadata/md5-cache/app-portage/eix-0.32.9
+++ b/metadata/md5-cache/app-portage/eix-0.32.9
@@ -4,10 +4,10 @@ DESCRIPTION=Search and query ebuilds
EAPI=6
HOMEPAGE=https://github.com/vaeth/eix/
IUSE=debug doc nls sqlite linguas_de linguas_ru
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1
SLOT=0
SRC_URI=https://github.com/vaeth/eix/releases/download/v0.32.9/eix-0.32.9.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 l10n 2c2e15383ba891d642f51896a7f0ecfe libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=aedc6b85913e7e2706eccc4d4e23768d
+_md5_=52104b2723c3ed572f2acdd5ae35adf2
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.3 b/metadata/md5-cache/app-portage/mirrorselect-2.2.3
index ddbcc4a1c96d..9bb8480280d4 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.3
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.3
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
EAPI=5
HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
IUSE=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 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
LICENSE=GPL-2
RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[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[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=https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.2.3.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e prefix 7b6fb2fc216b101b5d97d171925a847c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a6d9533f62bc3d2f000bec637b513724
+_md5_=bba8efdfc16d28b062d123254f6ff1ab
diff --git a/metadata/md5-cache/app-shells/dash-0.5.9.1-r3 b/metadata/md5-cache/app-shells/dash-0.5.9.1-r3
index b4cc66298d69..f0d9a27c7fdc 100644
--- a/metadata/md5-cache/app-shells/dash-0.5.9.1-r3
+++ b/metadata/md5-cache/app-shells/dash-0.5.9.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Debian Almquist Shell
EAPI=6
HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
IUSE=libedit static vanilla
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
SLOT=0
SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.9.1.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4269c370de8d05b485afc2e2f5d8dfbb
+_md5_=ff302995fff8f3639c7236e048f83831
diff --git a/metadata/md5-cache/app-shells/fish-2.6.0 b/metadata/md5-cache/app-shells/fish-2.6.0
index 0df60b589cbe..3f03552a4037 100644
--- a/metadata/md5-cache/app-shells/fish-2.6.0
+++ b/metadata/md5-cache/app-shells/fish-2.6.0
@@ -4,9 +4,9 @@ DESCRIPTION=fish is the Friendly Interactive SHell
EAPI=6
HOMEPAGE=http://fishshell.com/
IUSE=nls
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
LICENSE=GPL-2
RDEPEND=>=dev-libs/libpcre2-10.21[pcre32] sys-libs/ncurses:0=
SLOT=0
SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/2.6.0/fish-2.6.0.tar.gz
-_md5_=c13aabe4d31d7691f71db52e53017a41
+_md5_=8d3a4f2e979f2c5791f5686cdf8c963b
diff --git a/metadata/md5-cache/app-shells/push-2.0-r1 b/metadata/md5-cache/app-shells/push-2.0-r1
index e3caa41a5f96..0daade3220f4 100644
--- a/metadata/md5-cache/app-shells/push-2.0-r1
+++ b/metadata/md5-cache/app-shells/push-2.0-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
DESCRIPTION=A POSIX shell function to treat a variable like an array, quoting args
EAPI=6
HOMEPAGE=https://github.com/vaeth/push/
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
LICENSE=BSD
SLOT=0
SRC_URI=https://github.com/vaeth/push/archive/v2.0.tar.gz -> push-2.0.tar.gz
_eclasses_=vcs-snapshot 03289f51c769cf409d200d2d628cdd6e
-_md5_=7b2f41daa2b1c958fd92098f103d7abe
+_md5_=a58f1e9f8fed662afc8fd5204b0e3cd7
diff --git a/metadata/md5-cache/app-shells/quoter-3.0_p2-r1 b/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
index 9501f9f09fda..bfa0ad3480ad 100644
--- a/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
+++ b/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
DESCRIPTION=Quote arguments or standard input for usage in POSIX shell by eval
EAPI=6
HOMEPAGE=https://github.com/vaeth/quoter/
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
LICENSE=MIT
SLOT=0
SRC_URI=https://github.com/vaeth/quoter/archive/v3.0_p2.tar.gz -> quoter-3.0_p2.tar.gz
_eclasses_=vcs-snapshot 03289f51c769cf409d200d2d628cdd6e
-_md5_=f27e9f32998be4b695f50340a9ce8d07
+_md5_=8cead2aaff283d965bc9e12638e56323
diff --git a/metadata/md5-cache/app-text/adiff-1.4 b/metadata/md5-cache/app-text/adiff-1.4
deleted file mode 100644
index 651b7f23cfde..000000000000
--- a/metadata/md5-cache/app-text/adiff-1.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=dev-lang/perl !app-arch/atool
-DESCRIPTION=wordwise diff
-EAPI=0
-HOMEPAGE=http://agriffis.n01se.net/adiff/
-KEYWORDS=alpha amd64 ia64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl !app-arch/atool sys-apps/diffutils
-SLOT=0
-SRC_URI=http://agriffis.n01se.net/adiff//adiff-1.4
-_md5_=240a9158e9767f82c35c4690908b30a8
diff --git a/metadata/md5-cache/app-text/adiff-1.4-r1 b/metadata/md5-cache/app-text/adiff-1.4-r1
deleted file mode 100644
index dfd10fafc849..000000000000
--- a/metadata/md5-cache/app-text/adiff-1.4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=dev-lang/perl !app-arch/atool
-DESCRIPTION=Wordise diff
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl !app-arch/atool sys-apps/diffutils
-SLOT=0
-SRC_URI=mirror://gentoo/adiff-1.4
-_md5_=274033dddd69983fb51cf845dea44c43
diff --git a/metadata/md5-cache/app-text/aspell-0.60.7_rc1 b/metadata/md5-cache/app-text/aspell-0.60.7_rc1
index 16a5e232d152..8cf1da33da71 100644
--- a/metadata/md5-cache/app-text/aspell-0.60.7_rc1
+++ b/metadata/md5-cache/app-text/aspell-0.60.7_rc1
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/ncurses:0=[unicode?] nls? ( virtual/libintl ) !=app-dicts/aspel
SLOT=0
SRC_URI=mirror://gnu-alpha/aspell/aspell-0.60.7-rc1.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=0180ea6237519642650b716c44112b8e
+_md5_=353dbe4a52c1b412300975a05f267b47
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.21 b/metadata/md5-cache/app-text/ghostscript-gpl-9.21
index af04ff278c6c..f5a4028bab17 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.21
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.21
@@ -4,10 +4,10 @@ DESCRIPTION=Ghostscript is an interpreter for the PostScript language and for PD
EAPI=6
HOMEPAGE=http://ghostscript.com/
IUSE=cups dbus gtk l10n_de static-libs tiff unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=AGPL-3 CPL-1.0
RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= media-libs/jbig2dec >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=sys-libs/zlib-1.2.7:= virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) unicode? ( net-dns/libidn ) tiff? ( >=media-libs/tiff-4.0.1:0= ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.5-r1 >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other !=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
RESTRICT=test
SLOT=0/68
SRC_URI=https://poppler.freedesktop.org/poppler-0.57.0.tar.xz
_eclasses_=cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4d2ce8ba3bdeded85fa24a7d47e5f819
+_md5_=9c10dc391ef31aa1e57a763f4ec902de
diff --git a/metadata/md5-cache/dev-db/postgresql-9.2.22 b/metadata/md5-cache/dev-db/postgresql-9.2.22
index 6a91562ff720..aaca6bcaf04a 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.2.22
+++ b/metadata/md5-cache/dev-db/postgresql-9.2.22
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
EAPI=6
HOMEPAGE=http://www.postgresql.org/
IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server 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 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 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~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:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.2 !dev-db/postgresql-base:9.2 !dev-db/postgresql-server:9.2 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.2
SRC_URI=mirror://postgresql/source/v9.2.22/postgresql-9.2.22.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 prefix 7b6fb2fc216b101b5d97d171925a847c python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=77a104e2e7c7b40a46a4a16bd9bc1c4b
+_md5_=8b387273bbfcd3ff9b04c40ba8f28a0b
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.18 b/metadata/md5-cache/dev-db/postgresql-9.3.18
index 8baff767f9e8..79b33f68230b 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.18
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.18
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
EAPI=6
HOMEPAGE=http://www.postgresql.org/
IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server 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 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 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~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:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.3 !dev-db/postgresql-base:9.3 !dev-db/postgresql-server:9.3 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.3
SRC_URI=mirror://postgresql/source/v9.3.18/postgresql-9.3.18.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 prefix 7b6fb2fc216b101b5d97d171925a847c python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=54570779bfb50fae59515b5f68d3f336
+_md5_=69c105053c482b79535327c026a8c3d6
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.13 b/metadata/md5-cache/dev-db/postgresql-9.4.13
index ee142897ce94..5db28c4635dd 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.13
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.13
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
EAPI=6
HOMEPAGE=http://www.postgresql.org/
IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server 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 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~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:= ) ) 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.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 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.4
SRC_URI=mirror://postgresql/source/v9.4.13/postgresql-9.4.13.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 prefix 7b6fb2fc216b101b5d97d171925a847c python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=725976d8c92645e0301cca6e5a1de7d8
+_md5_=3b87a360807fd1b5f48b7adc1c94f9c7
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.8 b/metadata/md5-cache/dev-db/postgresql-9.5.8
index 3aac3fe6fb04..e891974cd5b3 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.8
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.8
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
EAPI=6
HOMEPAGE=http://www.postgresql.org/
IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server 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:= ) ) 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.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 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.5
SRC_URI=mirror://postgresql/source/v9.5.8/postgresql-9.5.8.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 prefix 7b6fb2fc216b101b5d97d171925a847c python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0eddf66a6bae802274e324f68f3ff8ff
+_md5_=2b0ef065b17dd5f470068ba705c7d646
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.4 b/metadata/md5-cache/dev-db/postgresql-9.6.4
index 402734112f90..d99cc3878a8a 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.4
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.4
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
EAPI=6
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.4/postgresql-9.6.4.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 prefix 7b6fb2fc216b101b5d97d171925a847c python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d8272dab1233f46ffa569004b6b207e6
+_md5_=3ca824204546d4c4c82c5eb099373b24
diff --git a/metadata/md5-cache/dev-games/physfs-3.0.0 b/metadata/md5-cache/dev-games/physfs-3.0.0
new file mode 100644
index 000000000000..2a39c58e54ed
--- /dev/null
+++ b/metadata/md5-cache/dev-games/physfs-3.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Abstraction layer for filesystem and archive access
+EAPI=6
+HOMEPAGE=http://icculus.org/physfs/
+IUSE=grp hog mvl qpak static-libs wad +zip 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 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=ZLIB
+SLOT=0
+SRC_URI=http://icculus.org/physfs/downloads/physfs-3.0.0.tar.bz2
+_eclasses_=cmake-multilib 7bc2cc09a4a5082b915541d447be8e5e cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8f0438c1736923a33ef490193ebcc184
diff --git a/metadata/md5-cache/dev-games/physfs-9999 b/metadata/md5-cache/dev-games/physfs-9999
index c23bd73eadd8..738e8f2873fe 100644
--- a/metadata/md5-cache/dev-games/physfs-9999
+++ b/metadata/md5-cache/dev-games/physfs-9999
@@ -1,10 +1,10 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.7.2 dev-vcs/mercurial
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 dev-vcs/mercurial
DESCRIPTION=Abstraction layer for filesystem and archive access
EAPI=6
HOMEPAGE=http://icculus.org/physfs/
-IUSE=doc grp hog mvl qpak static-libs wad +zip 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
+IUSE=grp hog mvl qpak static-libs wad +zip 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
LICENSE=ZLIB
SLOT=0
_eclasses_=cmake-multilib 7bc2cc09a4a5082b915541d447be8e5e cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e mercurial 0bdc9ce12272665fa3749c8408b4d389 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=71ff69ed0a8171e5c4b1ed997f66e1c9
+_md5_=778d14c126d2c55be435797f433f9a56
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3 b/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3
deleted file mode 100644
index 8816647f0f06..000000000000
--- a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.3 >=virtual/jre-1.3 >=dev-java/gnu-crypto-2.0.1 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Network extensions library for GNU classpath and classpathx
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/classpath/
-IUSE=doc elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.3 >=dev-java/gnu-crypto-2.0.1 >=dev-java/java-config-2.2.0-r3
-SLOT=1.0
-SRC_URI=mirror://gnu/classpath/inetlib-1.0.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3a8f9ceb257ec5e440c66c47fc7e70de
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3 b/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3
deleted file mode 100644
index 6ec335b6920c..000000000000
--- a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.3 >=virtual/jre-1.3 >=dev-java/gnu-crypto-2.0.1 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Network extensions library for GNU classpath and classpathx
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/classpath/
-IUSE=doc elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.3 >=dev-java/gnu-crypto-2.0.1 >=dev-java/java-config-2.2.0-r3
-SLOT=1.1
-SRC_URI=mirror://gnu/classpath/inetlib-1.1.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-ant-2 4e2b30d918dda38a51839a4d45282b62 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=123cd150616b1e151804ea9e817ecb05
diff --git a/metadata/md5-cache/dev-java/gnu-javamail-1.0-r2 b/metadata/md5-cache/dev-java/gnu-javamail-1.0-r2
deleted file mode 100644
index 5a1821bcf2d6..000000000000
--- a/metadata/md5-cache/dev-java/gnu-javamail-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=virtual/jdk-1.4 >=virtual/jre-1.4 =dev-java/gnu-jaf-1* =dev-java/gnu-classpath-inetlib-1.0* !<=dev-java/mx4j-3.0.1 !<=dev-java/mx4j-3.0.1-r2 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=GNU implementation of the Javamail API
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/classpathx/javamail/
-IUSE=doc elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.4 =dev-java/gnu-jaf-1* =dev-java/gnu-classpath-inetlib-1.0* !<=dev-java/mx4j-3.0.1 !<=dev-java/mx4j-3.0.1-r2 >=dev-java/java-config-2.2.0-r3
-SLOT=1
-SRC_URI=mirror://gnu/classpathx/mail-1.0.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6c2e7b7d9937c9b36f763cd43c9094be
diff --git a/metadata/md5-cache/dev-java/javax-mail-1.4 b/metadata/md5-cache/dev-java/javax-mail-1.4
deleted file mode 100644
index bde8cc79857f..000000000000
--- a/metadata/md5-cache/dev-java/javax-mail-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Provides a platform/protocol-independent framework for mail and messaging apps
-EAPI=5
-HOMEPAGE=https://javamail.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-classpath-exception )
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://repo1.maven.org/maven2/javax/mail/mail/1.4/mail-1.4-sources.jar
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-pkg-simple 3e71074eb6884746b37b70b2c9c881f4 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8c354652c8c04a6e83eb1c21d54a2d22
diff --git a/metadata/md5-cache/dev-java/sun-javamail-1.4.3-r1 b/metadata/md5-cache/dev-java/sun-javamail-1.4.3-r1
deleted file mode 100644
index b5861e2a1633..000000000000
--- a/metadata/md5-cache/dev-java/sun-javamail-1.4.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java-based framework to build multiplatform mail and messaging applications
-EAPI=6
-HOMEPAGE=http://java.sun.com/products/javamail/index.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( CDDL GPL-2 BSD )
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/javamail-1.4.3-src.zip -> sun-javamail-1.4.3.zip
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-pkg-simple 3e71074eb6884746b37b70b2c9c881f4 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b291a8a82b1d24abc56deee6de7d72d4
diff --git a/metadata/md5-cache/dev-lang/execline-2.3.0.2 b/metadata/md5-cache/dev-lang/execline-2.3.0.2
new file mode 100644
index 000000000000..2ae488187268
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/execline-2.3.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-libs/skalibs-2.6.0.0[static-libs] ) !static? ( >=dev-libs/skalibs-2.6.0.0 )
+DESCRIPTION=a non-interactive scripting language
+EAPI=6
+HOMEPAGE=https://www.skarnet.org/software/execline/
+IUSE=static static-libs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=!static? ( >=dev-libs/skalibs-2.6.0.0:= )
+SLOT=0/2.3
+SRC_URI=https://www.skarnet.org/software/execline/execline-2.3.0.2.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7ba7a3ce26bcd3fc7e09c4453e3d4ca9
diff --git a/metadata/md5-cache/dev-lang/lazarus-1.0.12 b/metadata/md5-cache/dev-lang/lazarus-1.0.12
index 1c810eb06d64..f39e30588403 100644
--- a/metadata/md5-cache/dev-lang/lazarus-1.0.12
+++ b/metadata/md5-cache/dev-lang/lazarus-1.0.12
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install prepare
DEPEND=>=dev-lang/fpc-2.6.0[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/binutils-2.19.1-r1
DESCRIPTION=Lazarus IDE is a feature rich visual programming environment emulating Delphi
EAPI=5
-HOMEPAGE=https://www.lazarus.freepascal.org/
+HOMEPAGE=https://www.lazarus-ide.org/
IUSE=minimal
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2 LGPL-2.1-with-linking-exception
@@ -11,4 +11,4 @@ RESTRICT=strip
SLOT=0
SRC_URI=https://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%201.0.12/lazarus-1.0.12-0.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=665dd1df3cb10ee8bfe200fbb18a7bbd
+_md5_=23855fbc87314a36504e5aed8eb6a8c3
diff --git a/metadata/md5-cache/dev-lang/lazarus-1.6.2 b/metadata/md5-cache/dev-lang/lazarus-1.6.2
index 14036a051a5d..97e3c99ace2b 100644
--- a/metadata/md5-cache/dev-lang/lazarus-1.6.2
+++ b/metadata/md5-cache/dev-lang/lazarus-1.6.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install prepare
DEPEND=>=dev-lang/fpc-3.0.0[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/binutils-2.19.1-r1:=
DESCRIPTION=Lazarus IDE is a feature rich visual programming environment emulating Delphi
EAPI=6
-HOMEPAGE=https://www.lazarus.freepascal.org/
+HOMEPAGE=https://www.lazarus-ide.org/
IUSE=minimal
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 LGPL-2.1-with-linking-exception
@@ -11,4 +11,4 @@ RESTRICT=strip
SLOT=0
SRC_URI=https://sourceforge.net/projects/lazarus/files/Lazarus%20Zip%20_%20GZip/Lazarus%201.6.2/lazarus-1.6.2-0.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=6f0bb1f45da066ebc5de21f8fb973f3d
+_md5_=84378e6bb2b68228cf4ab495cb34ad29
diff --git a/metadata/md5-cache/dev-lang/lazarus-1.6.4 b/metadata/md5-cache/dev-lang/lazarus-1.6.4
index 14dff0974b2a..2db7ed9053b9 100644
--- a/metadata/md5-cache/dev-lang/lazarus-1.6.4
+++ b/metadata/md5-cache/dev-lang/lazarus-1.6.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install prepare
DEPEND=>=dev-lang/fpc-3.0.0[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/binutils-2.19.1-r1:=
DESCRIPTION=Lazarus IDE is a feature rich visual programming environment emulating Delphi
EAPI=6
-HOMEPAGE=https://www.lazarus.freepascal.org/
+HOMEPAGE=https://www.lazarus-ide.org/
IUSE=minimal
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 LGPL-2.1-with-linking-exception
@@ -11,4 +11,4 @@ RESTRICT=strip
SLOT=0
SRC_URI=https://sourceforge.net/projects/lazarus/files/Lazarus%20Zip%20_%20GZip/Lazarus%201.6.4/lazarus-1.6.4-0.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=6a5d401bf6a6ac67c77afa0d2daefc14
+_md5_=31c83c56bf0ff81bec1a0c6a39431298
diff --git a/metadata/md5-cache/dev-lang/php-7.0.24 b/metadata/md5-cache/dev-lang/php-7.0.24
new file mode 100644
index 000000000000..04b7ddb68d27
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.0.24
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=http://php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+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
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
+SLOT=7.0
+SRC_URI=http://php.net/distributions/php-7.0.24.tar.xz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=657cc69b2e0dcc0f3c433e6a3a5bcacb
diff --git a/metadata/md5-cache/dev-lang/php-7.1.10 b/metadata/md5-cache/dev-lang/php-7.1.10
new file mode 100644
index 000000000000..279492b4db6c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.1.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=http://php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+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
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
+SLOT=7.1
+SRC_URI=http://php.net/distributions/php-7.1.10.tar.xz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5cf4623f91b1f37af52e5d06006f538c
diff --git a/metadata/md5-cache/dev-lang/php-7.2.0_rc3 b/metadata/md5-cache/dev-lang/php-7.2.0_rc3
new file mode 100644
index 000000000000..1fec383d30e3
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.2.0_rc3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=http://php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
+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
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
+SLOT=7.2
+SRC_URI=https://downloads.php.net/~remi/php-7.2.0RC3.tar.xz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=09577ae95b26cfc0e433a4ba63b89ac7
diff --git a/metadata/md5-cache/dev-lang/ruby-2.2.6 b/metadata/md5-cache/dev-lang/ruby-2.2.6
deleted file mode 100644
index 0c703f71198f..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-2.2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20141227 !=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An object-oriented scripting language
-EAPI=5
-HOMEPAGE=http://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/minitest-5.4.3[ruby_targets_ruby22] >=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22] virtual/rubygems[ruby_targets_ruby22] >=dev-ruby/json-1.8.1[ruby_targets_ruby22] >=dev-ruby/rake-0.9.6[ruby_targets_ruby22] rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20141227 !=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20141227 !=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An object-oriented scripting language
-EAPI=5
-HOMEPAGE=http://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline
-KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/minitest-5.4.3[ruby_targets_ruby22] >=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22] virtual/rubygems[ruby_targets_ruby22] >=dev-ruby/json-1.8.1[ruby_targets_ruby22] >=dev-ruby/rake-0.9.6[ruby_targets_ruby22] rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20141227 !=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20141227 !=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An object-oriented scripting language
-EAPI=5
-HOMEPAGE=http://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/minitest-5.4.3[ruby_targets_ruby22] >=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22] virtual/rubygems[ruby_targets_ruby22] >=dev-ruby/json-1.8.1[ruby_targets_ruby22] >=dev-ruby/rake-0.9.6[ruby_targets_ruby22] rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20141227 !=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20151229 !=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An object-oriented scripting language
-EAPI=5
-HOMEPAGE=http://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/did_you_mean-1.0.0:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.8.3[ruby_targets_ruby23] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23] >=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23] >=dev-ruby/rake-10.4.2[ruby_targets_ruby23] >=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23] virtual/rubygems[ruby_targets_ruby23] >=dev-ruby/json-1.8.3[ruby_targets_ruby23] rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20151229 !=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20151229 !=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An object-oriented scripting language
-EAPI=5
-HOMEPAGE=http://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/did_you_mean-1.0.0:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.8.3[ruby_targets_ruby23] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23] >=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23] >=dev-ruby/rake-10.4.2[ruby_targets_ruby23] >=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23] virtual/rubygems[ruby_targets_ruby23] >=dev-ruby/json-1.8.3[ruby_targets_ruby23] rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20151229 !=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An object-oriented scripting language
-EAPI=6
-HOMEPAGE=http://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24] >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24] >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24] >=dev-ruby/rake-12.0.0[ruby_targets_ruby24] >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24] >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24] virtual/rubygems[ruby_targets_ruby24] >=dev-ruby/json-2.0.2[ruby_targets_ruby24] rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An object-oriented scripting language
-EAPI=6
-HOMEPAGE=http://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24] >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24] >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24] >=dev-ruby/rake-12.0.0[ruby_targets_ruby24] >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24] >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24] virtual/rubygems[ruby_targets_ruby24] >=dev-ruby/json-2.0.2[ruby_targets_ruby24] rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=The Scala Programming Language
+EAPI=5
+HOMEPAGE=http://www.scala-lang.org/
+IUSE=binary emacs elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=BSD
+PDEPEND=emacs? ( app-emacs/scala-mode:0 )
+RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2.11/2.11.11
+SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.11.tar.gz -> scala-2.11.11.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.11-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.11-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.11-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.11-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.11-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.11-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.11-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.11-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.11-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.11-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.11-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.11-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.11-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.11-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.11-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.11-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.11-push.jar https://dev.gentoo.org/~patrick/scala-2.11.11-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~patrick/scala-2.11.11-gentoo-binary.tar.bz2 )
+_eclasses_=check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-ant-2 4e2b30d918dda38a51839a4d45282b62 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fe1dbd3e4e278681dd181b4fe7a8fa79
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r3 b/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r3
index df6e6ee718d4..21bc7101eea5 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r3
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r3
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd
LICENSE=NPL-1.1
RDEPEND=threadsafe? ( dev-libs/nspr )
SLOT=0/js
-SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz
+SRC_URI=http://archive.mozilla.org/pub/js/js-1.7.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-01.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=6498049e2429be8027df2a4d4ffc37e3
+_md5_=05961dca67a184f7fc51021e81db09c7
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r4 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r4
index 1435e5944192..130ed5c2a9f1 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r4
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r4
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd
LICENSE=NPL-1.1
RDEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc )
SLOT=0/mozjs185
-SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
+SRC_URI=https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-01.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9e535fc247efc753f131d68bdd4df97a
+_md5_=c010436d4d4ad233680c743d1b23922b
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r5 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r5
deleted file mode 100644
index 1f71341b14c6..000000000000
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) app-arch/zip virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
-DESCRIPTION=Stand-alone JavaScript C library
-EAPI=5
-HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
-IUSE=debug minimal static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
-LICENSE=NPL-1.1
-RDEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc )
-SLOT=0/mozjs185
-SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=623fd6993339ffe15138b83e7cfe9c8b
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6
index 8ee986b6df2d..119ab68298cd 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~
LICENSE=NPL-1.1
RDEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc )
SLOT=0/mozjs185
-SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
+SRC_URI=https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-01.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=670241bc1804d91259f2df432996114b
+_md5_=da7f40384992c8712c373375fa13d0aa
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r4 b/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r4
index 8b46e4d899cf..535b80578c2c 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r4
+++ b/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r4
@@ -10,6 +10,6 @@ RDEPEND=>=dev-libs/nspr-4.9.4 virtual/libffi sys-libs/readline:0= >=sys-libs/zli
REQUIRED_USE=debug? ( jit )
RESTRICT=ia64? ( test )
SLOT=17
-SRC_URI=http://ftp.mozilla.org/pub/mozilla.org/js/mozjs17.0.0.tar.gz
+SRC_URI=http://archive.mozilla.org/pub/js/mozjs17.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot17-patches-01.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=bb7e4c11663dd1be756ffaaf1f4b0d3a
+_md5_=c53cff6c9f34de4db9d6cf14a6190bc2
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5 b/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5
index 3f2ce209b22e..c5251c72c789 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5
+++ b/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5
@@ -4,12 +4,12 @@ DESCRIPTION=Stand-alone JavaScript C library
EAPI=6
HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
IUSE=debug jit minimal static-libs test
-KEYWORDS=~alpha ~amd64 ~arm -hppa ~ia64 -mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm -hppa ia64 -mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
LICENSE=NPL-1.1
RDEPEND=>=dev-libs/nspr-4.9.4 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.1.4
REQUIRED_USE=debug? ( jit )
RESTRICT=ia64? ( test )
SLOT=17
-SRC_URI=http://ftp.mozilla.org/pub/mozilla.org/js/mozjs17.0.0.tar.gz
+SRC_URI=http://archive.mozilla.org/pub/js/mozjs17.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot17-patches-01.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f4a3c00375618d494d6ae1180582a1ef
+_md5_=5cdfb4160b0059e14b89f750caa68abf
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r3 b/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r3
index c3ec0a576689..a2e1797debe0 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r3
+++ b/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r3
@@ -9,6 +9,6 @@ LICENSE=NPL-1.1
RDEPEND=>=dev-libs/nspr-4.9.4 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.1.4 system-icu? ( >=dev-libs/icu-1.51:= )
RESTRICT=ia64? ( test )
SLOT=24
-SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/js/mozjs-24.2.0.tar.bz2
+SRC_URI=https://archive.mozilla.org/pub/js/mozjs-24.2.0.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot24-patches-01.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=32283276140bd02966fb4fd2a051cc83
+_md5_=eab15efd731eaadd52cdc95f51eb8d17
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r4 b/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r4
index 16bb3e984727..23ed562f6e48 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r4
+++ b/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r4
@@ -9,6 +9,6 @@ LICENSE=NPL-1.1
RDEPEND=>=dev-libs/nspr-4.9.4 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.1.4 system-icu? ( >=dev-libs/icu-1.51:= )
RESTRICT=ia64? ( test )
SLOT=24
-SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/js/mozjs-24.2.0.tar.bz2
+SRC_URI=https://archive.mozilla.org/pub/js/mozjs-24.2.0.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot24-patches-01.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=474cceba46190a2972ab80524b84f340
+_md5_=dd2800b5fbfed82c16a39eee6ca08ee0
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-38.2.1_rc0 b/metadata/md5-cache/dev-lang/spidermonkey-38.2.1_rc0
index b993f3705c00..67a5f9e284cf 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-38.2.1_rc0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-38.2.1_rc0
@@ -9,6 +9,6 @@ LICENSE=NPL-1.1
RDEPEND=>=dev-libs/nspr-4.10.10 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3 system-icu? ( >=dev-libs/icu-51.1:= )
RESTRICT=ia64? ( test )
SLOT=38
-SRC_URI=https://people.mozilla.org/~sstangl/mozjs-38.2.1.rc0.tar.bz2
+SRC_URI=https://people.mozilla.org/~sstangl/mozjs-38.2.1.rc0.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot38-patches-01.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e mozcoreconf-v4 6492fb2259ea94a750f79656278d8218 multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f273d0f787ba12d222c2c1aa42cbc445
+_md5_=0e9587b6b5fe154e3d106c0f2877415e
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-45.0.2 b/metadata/md5-cache/dev-lang/spidermonkey-45.0.2
index 66f9709d8f95..f55a52a49e38 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-45.0.2
+++ b/metadata/md5-cache/dev-lang/spidermonkey-45.0.2
@@ -9,6 +9,6 @@ LICENSE=NPL-1.1
RDEPEND=>=dev-libs/nspr-4.10.10 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3 system-icu? ( >=dev-libs/icu-51.1:= )
RESTRICT=ia64? ( test )
SLOT=45
-SRC_URI=https://people.mozilla.org/~sfink/mozjs-45.0.2.tar.bz2
+SRC_URI=https://people.mozilla.org/~sfink/mozjs-45.0.2.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot45-patches-01.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e mozcoreconf-v4 6492fb2259ea94a750f79656278d8218 multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=40c736b111494c43ef0a502482145de4
+_md5_=f899f19f5bc1dd11ce5f8c0ac8afbdd7
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-52.2.0_pre20170719 b/metadata/md5-cache/dev-lang/spidermonkey-52.4.0_pre20171003-r1
similarity index 90%
rename from metadata/md5-cache/dev-lang/spidermonkey-52.2.0_pre20170719
rename to metadata/md5-cache/dev-lang/spidermonkey-52.4.0_pre20171003-r1
index ccb333cd261e..a49de139a812 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-52.2.0_pre20170719
+++ b/metadata/md5-cache/dev-lang/spidermonkey-52.4.0_pre20171003-r1
@@ -9,6 +9,6 @@ LICENSE=NPL-1.1
RDEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3 system-icu? ( >=dev-libs/icu-58.1:= )
RESTRICT=ia64? ( test )
SLOT=52
-SRC_URI=https://dev.gentoo.org/~axs/distfiles/mozjs-52.2.0_pre20170719.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-52.0-patches-0.tar.xz
+SRC_URI=https://dev.gentoo.org/~axs/distfiles/mozjs-52.4.0_pre20171003.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-52.0-patches-0.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e mozcoreconf-v5 dfc58397c1e9ecd4420428e695cf8dc8 multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8dfcc432c658a5e8bd4670e450be2254
+_md5_=5cd1df94c81cca40f229b2dfbe3ef0fe
diff --git a/metadata/md5-cache/dev-lang/xsb-3.6.0 b/metadata/md5-cache/dev-lang/xsb-3.6.0
index a735e1d9ed3f..dfaafb4a2c1c 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.6.0
+++ b/metadata/md5-cache/dev-lang/xsb-3.6.0
@@ -8,6 +8,6 @@ KEYWORDS=amd64 x86
LICENSE=GPL-2 LGPL-2
RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
-SRC_URI=http://xsb.sourceforge.net/downloads/XSB360.tar.gz mirror://gentoo/xsb-3.6.0-gentoo-patchset-3.tar.gz
+SRC_URI=http://xsb.sourceforge.net/downloads/XSB360.tar.gz mirror://gentoo/xsb-3.6.0-gentoo-patchset-4.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=11a0e29037826dd0c6e0f5c928876ffa
+_md5_=8ab846767bb89613672428f03f3c4fd7
diff --git a/metadata/md5-cache/dev-lang/xsb-3.7.0 b/metadata/md5-cache/dev-lang/xsb-3.7.0
index 53760ec0e05d..5bdd60fc0f5c 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.7.0
+++ b/metadata/md5-cache/dev-lang/xsb-3.7.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 LGPL-2
RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
-SRC_URI=http://xsb.sourceforge.net/downloads/XSB370.tar.gz mirror://gentoo/xsb-3.7.0-gentoo-patchset-2.tar.gz
+SRC_URI=http://xsb.sourceforge.net/downloads/XSB370.tar.gz mirror://gentoo/xsb-3.7.0-gentoo-patchset-3.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9b473cafe3e16579ec465f4adc4e0f64
+_md5_=1e303ec8975979a87d44c48ff8a3f28c
diff --git a/metadata/md5-cache/dev-libs/icu-58.2-r1 b/metadata/md5-cache/dev-libs/icu-58.2-r1
index b6a0bd3452f3..a4d56a858b89 100644
--- a/metadata/md5-cache/dev-libs/icu-58.2-r1
+++ b/metadata/md5-cache/dev-libs/icu-58.2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=International Components for Unicode
EAPI=6
HOMEPAGE=http://www.icu-project.org/
IUSE=debug doc examples 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 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=BSD
SLOT=0/58.2
SRC_URI=http://download.icu-project.org/files/icu4c/58.2/icu4c-58_2-src.tgz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=315d4243e56b30980696046eee60d3bc
+_md5_=20fc8cf0fb3aab2be1c93bed8c700fe8
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-58.2 b/metadata/md5-cache/dev-libs/icu-layoutex-58.2
index 66ac2cc82061..f25b94558722 100644
--- a/metadata/md5-cache/dev-libs/icu-layoutex-58.2
+++ b/metadata/md5-cache/dev-libs/icu-layoutex-58.2
@@ -4,10 +4,10 @@ DESCRIPTION=External layout part of International Components for Unicode
EAPI=6
HOMEPAGE=http://www.icu-project.org/
IUSE=debug 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 ~hppa ia64 ppc ppc64 x86
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 x86
LICENSE=BSD
RDEPEND=~dev-libs/icu-58.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/icu-le-hb[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/58.2
SRC_URI=http://download.icu-project.org/files/icu4c/58.2/icu4c-58_2-src.tgz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=b8c6fabeedfd17d7363d92ccbd0f1b49
+_md5_=540492fb141f54c9a62f26b17195499a
diff --git a/metadata/md5-cache/dev-libs/libRocket-1.2.1_p20130110-r1 b/metadata/md5-cache/dev-libs/libRocket-1.2.1_p20130110-r1
deleted file mode 100644
index 9b64cb2846e8..000000000000
--- a/metadata/md5-cache/dev-libs/libRocket-1.2.1_p20130110-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/freetype-2.5.0.1[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(-)?] 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_python2_7(-)] dev-libs/boost[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) samples? ( virtual/opengl x11-libs/libXext x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A HTML/CSS User Interface library
-EAPI=5
-HOMEPAGE=https://librocket.com/
-IUSE=python samples 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
-LICENSE=MIT
-RDEPEND=>=media-libs/freetype-2.5.0.1[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(-)?] 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_python2_7(-)] dev-libs/boost[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) samples? ( virtual/opengl x11-libs/libXext x11-libs/libX11 )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/libRocket-1.2.1_p20130110.tar.xz
-_eclasses_=cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9467e2688fa4cf0f647f72c5ba9ecbeb
diff --git a/metadata/md5-cache/dev-libs/libRocket-1.3.0.0 b/metadata/md5-cache/dev-libs/libRocket-1.3.0.0
deleted file mode 100644
index d3f08535c8bd..000000000000
--- a/metadata/md5-cache/dev-libs/libRocket-1.3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/freetype-2.5.0.1[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(-)?] 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_python2_7(-)] dev-libs/boost[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) samples? ( virtual/opengl x11-libs/libXext x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A HTML/CSS User Interface library
-EAPI=5
-HOMEPAGE=https://librocket.com/
-IUSE=python samples 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
-LICENSE=MIT
-RDEPEND=>=media-libs/freetype-2.5.0.1[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(-)?] 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_python2_7(-)] dev-libs/boost[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) samples? ( virtual/opengl x11-libs/libXext x11-libs/libX11 )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0/1
-SRC_URI=https://github.com/libRocket/libRocket/archive/release-1.3.0.0.tar.gz -> libRocket-1.3.0.0.tar.gz
-_eclasses_=cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b3d10d96c60b8bcf6c3043628a6223b1
diff --git a/metadata/md5-cache/dev-libs/libRocket-9999 b/metadata/md5-cache/dev-libs/libRocket-9999
deleted file mode 100644
index b470e2fa6a97..000000000000
--- a/metadata/md5-cache/dev-libs/libRocket-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=media-libs/freetype-2.5.0.1[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(-)?] 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_python2_7(-)] dev-libs/boost[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) samples? ( virtual/opengl x11-libs/libXext x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.7.2 dev-vcs/git
-DESCRIPTION=A HTML/CSS User Interface library
-EAPI=5
-HOMEPAGE=https://librocket.com/
-IUSE=python samples 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
-LICENSE=MIT
-RDEPEND=>=media-libs/freetype-2.5.0.1[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(-)?] 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_python2_7(-)] dev-libs/boost[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) samples? ( virtual/opengl x11-libs/libXext x11-libs/libX11 )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-_eclasses_=cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-2 195a672bfaf52d868442171c9469bbb6 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9dc5a995ba3d780c50b235fe8fad9b08
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.3.0-r1 b/metadata/md5-cache/dev-libs/protobuf-c-1.3.0-r1
index d59ab5dcd140..7d75f8bf167b 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.3.0-r1
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.3.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Protocol Buffers implementation in C
EAPI=6
HOMEPAGE=https://github.com/protobuf-c/protobuf-c/
IUSE=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 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
LICENSE=BSD-2
RDEPEND=>=dev-libs/protobuf-2.6.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(-)?]
SLOT=0/1.0.0
SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.0/protobuf-c-1.3.0.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool 0081a71a261724730ec4c248494f044d multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=35c2bbbb6035c8afac4973f60ac7b81e
+_md5_=9034546a2ed7a4d5c48619566e42ed6d
diff --git a/metadata/md5-cache/dev-libs/skalibs-2.6.0.0 b/metadata/md5-cache/dev-libs/skalibs-2.6.0.0
new file mode 100644
index 000000000000..5002921c003d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/skalibs-2.6.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-devel/make-3.81
+DESCRIPTION=skarnet.org general-purpose libraries
+EAPI=6
+HOMEPAGE=https://www.skarnet.org/software/skalibs/
+IUSE=doc ipv6 static-libs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+SLOT=0/2.6
+SRC_URI=https://www.skarnet.org/software/skalibs/skalibs-2.6.0.0.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=37a08308db82131a938325c26252d9a1
diff --git a/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.16 b/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.16
deleted file mode 100644
index bb3fca469b9b..000000000000
--- a/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=dev-lisp/common-lisp-controller virtual/commonlisp dev-lisp/common-lisp-controller
-DESCRIPTION=CL-PPCRE is a portable regular expression library for Common Lisp
-EAPI=0
-HOMEPAGE=http://weitz.de/cl-ppcre/ http://www.cliki.net/cl-ppcre
-KEYWORDS=amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-lisp/common-lisp-controller virtual/commonlisp
-SLOT=0
-SRC_URI=mirror://gentoo/cl-ppcre_1.2.16.orig.tar.gz
-_eclasses_=common-lisp e0f344f4c23788d1a46fc2143b183b0d common-lisp-common 3dbf57c1ebb52444d95e020652e1e579 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=98295f72925534d7107fa4243124c714
diff --git a/metadata/md5-cache/dev-lisp/cl-ppcre-2.0.11 b/metadata/md5-cache/dev-lisp/cl-ppcre-2.0.11
index 3295903bd5a1..6cdc78287ca7 100644
--- a/metadata/md5-cache/dev-lisp/cl-ppcre-2.0.11
+++ b/metadata/md5-cache/dev-lisp/cl-ppcre-2.0.11
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install unpack
DESCRIPTION=CL-PPCRE is a portable regular expression library for Common Lisp.
EAPI=6
HOMEPAGE=http://weitz.de/cl-ppcre/ http://www.cliki.net/cl-ppcre
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
LICENSE=BSD-2
PDEPEND=dev-lisp/cl-ppcre-unicode virtual/commonlisp
RDEPEND=dev-lisp/flexi-streams
@@ -10,4 +10,4 @@ RESTRICT=mirror
SLOT=0
SRC_URI=https://github.com/edicl/cl-ppcre/archive/v2.0.11.tar.gz -> cl-ppcre-2.0.11.tar.gz
_eclasses_=common-lisp-3 b451d02fe9e6d10bf682c647dcedc9a1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=105761f7d550e2d1eac22215e8c00ebf
+_md5_=e15b6bcd65bdee2db0ae2101d607d833
diff --git a/metadata/md5-cache/dev-lisp/cl-ppcre-unicode-2.0.11 b/metadata/md5-cache/dev-lisp/cl-ppcre-unicode-2.0.11
index 3d1ed983ea30..b6cf3b681842 100644
--- a/metadata/md5-cache/dev-lisp/cl-ppcre-unicode-2.0.11
+++ b/metadata/md5-cache/dev-lisp/cl-ppcre-unicode-2.0.11
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install
DESCRIPTION=CL-PPCRE is a portable regular expression library for Common Lisp.
EAPI=6
HOMEPAGE=http://weitz.de/cl-ppcre/ http://www.cliki.net/cl-ppcre
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
LICENSE=BSD-2
PDEPEND=virtual/commonlisp
RDEPEND==dev-lisp/cl-ppcre-2.0.11 dev-lisp/cl-unicode
@@ -10,4 +10,4 @@ RESTRICT=mirror
SLOT=0
SRC_URI=https://github.com/edicl/cl-ppcre/archive/v2.0.11.tar.gz -> cl-ppcre-2.0.11.tar.gz
_eclasses_=common-lisp-3 b451d02fe9e6d10bf682c647dcedc9a1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=217779b0ac5ba516a6b3f78ed286cde6
+_md5_=2efd9c3ef0e868f83310baf034ae0205
diff --git a/metadata/md5-cache/dev-lisp/cl-unicode-0.1.5 b/metadata/md5-cache/dev-lisp/cl-unicode-0.1.5
index 84ff27dc7b6a..73d4d082c1a8 100644
--- a/metadata/md5-cache/dev-lisp/cl-unicode-0.1.5
+++ b/metadata/md5-cache/dev-lisp/cl-unicode-0.1.5
@@ -3,7 +3,7 @@ DEPEND=virtual/commonlisp dev-lisp/flexi-streams
DESCRIPTION=Provides Common Lisp implementations with knowledge about Unicode characters.
EAPI=6
HOMEPAGE=http://weitz.de/cl-unicode/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
LICENSE=BSD-2
PDEPEND=virtual/commonlisp
RDEPEND=dev-lisp/cl-ppcre
@@ -11,4 +11,4 @@ RESTRICT=mirror
SLOT=0
SRC_URI=https://github.com/edicl/cl-unicode/archive/v0.1.5.tar.gz -> cl-unicode-0.1.5.tar.gz
_eclasses_=common-lisp-3 b451d02fe9e6d10bf682c647dcedc9a1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bb0675cb0c9e81ec78c15b4f56dc0d35
+_md5_=e237740a1ec1d21658606a24699c2158
diff --git a/metadata/md5-cache/dev-lisp/flexi-streams-1.0.16 b/metadata/md5-cache/dev-lisp/flexi-streams-1.0.16
index a94b5034fbf6..4eb05fa1ba8e 100644
--- a/metadata/md5-cache/dev-lisp/flexi-streams-1.0.16
+++ b/metadata/md5-cache/dev-lisp/flexi-streams-1.0.16
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install
DESCRIPTION=Flexible bivalent streams for Common Lisp
EAPI=6
HOMEPAGE=http://weitz.de/flexi-streams/ http://www.cliki.net/flexi-streams/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
LICENSE=BSD-2
PDEPEND=virtual/commonlisp
RDEPEND=!dev-lisp/cl-flexi-streams >=dev-lisp/trivial-gray-streams-20060925
@@ -10,4 +10,4 @@ RESTRICT=mirror
SLOT=0
SRC_URI=https://github.com/edicl/flexi-streams/archive/v1.0.16.tar.gz -> flexi-streams-1.0.16.tar.gz
_eclasses_=common-lisp-3 b451d02fe9e6d10bf682c647dcedc9a1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=a2cf1996ccc2cdbe535142f4c6bba550
+_md5_=6b400638654f3a48c25b94b2b8fb1d01
diff --git a/metadata/md5-cache/dev-lisp/trivial-gray-streams-20170830 b/metadata/md5-cache/dev-lisp/trivial-gray-streams-20170830
index a6e9995af22a..621046917e70 100644
--- a/metadata/md5-cache/dev-lisp/trivial-gray-streams-20170830
+++ b/metadata/md5-cache/dev-lisp/trivial-gray-streams-20170830
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install
DESCRIPTION=A thin compatibility layer between Gray Stream Common Lisp implementations
EAPI=6
HOMEPAGE=https://common-lisp.net/project/trivial-gray-streams/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
LICENSE=MIT
PDEPEND=virtual/commonlisp
RDEPEND=!dev-lisp/cl-trivial-gray-streams
@@ -10,4 +10,4 @@ RESTRICT=mirror
SLOT=0
SRC_URI=mirror://gentoo/trivial-gray-streams-20170830.tar.bz2
_eclasses_=common-lisp-3 b451d02fe9e6d10bf682c647dcedc9a1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=209ab55545faff0b0c820b87eaf89578
+_md5_=cd1fbc470a518475fefcb05e0e24c245
diff --git a/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.250.0 b/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.250.0
new file mode 100644
index 000000000000..1ccbc82c845b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.250.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Storable virtual/perl-ExtUtils-MakeMaker test? ( net-misc/memcached virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Perl client for memcached, in C language
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Cache-Memcached-Fast/
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Storable dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.25.tar.gz
+_eclasses_=multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
+_md5_=a1a5f2cfad2b06f49cafe2458bfb16c0
diff --git a/metadata/md5-cache/dev-perl/Canary-Stability-2012.0.0 b/metadata/md5-cache/dev-perl/Canary-Stability-2012.0.0
new file mode 100644
index 000000000000..7eee2858c66b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Canary-Stability-2012.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Canary to check perl compatibility for schmorp's modules
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Canary-Stability/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Canary-Stability-2012.tar.gz
+_eclasses_=multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
+_md5_=477c4d7476c3f8f73c3ba8867473294e
diff --git a/metadata/md5-cache/dev-perl/Carp-Assert-More-1.160.0 b/metadata/md5-cache/dev-perl/Carp-Assert-More-1.160.0
new file mode 100644
index 000000000000..bd975a92f652
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Carp-Assert-More-1.160.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp dev-perl/Carp-Assert virtual/perl-Scalar-List-Utils test? ( dev-perl/Test-Exception ) dev-lang/perl:=
+DESCRIPTION=convenience wrappers around Carp::Assert
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Carp-Assert-More/
+IUSE=test
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-perl/Carp-Assert virtual/perl-Scalar-List-Utils dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.16.tar.gz
+_eclasses_=multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
+_md5_=c7c14300e99256f91d4d76120e1d9f11
diff --git a/metadata/md5-cache/dev-perl/Git-Wrapper-0.47.0 b/metadata/md5-cache/dev-perl/Git-Wrapper-0.47.0
deleted file mode 100644
index 743e303b938f..000000000000
--- a/metadata/md5-cache/dev-perl/Git-Wrapper-0.47.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-File-Temp dev-perl/File-chdir virtual/perl-IPC-Cmd virtual/perl-Scalar-List-Utils dev-perl/Sort-Versions dev-perl/Devel-CheckBin virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec test? ( virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO dev-perl/Test-Deep dev-perl/Test-Exception virtual/perl-Test-Simple ) dev-lang/perl:=
-DESCRIPTION=Wrap git(7) command-line interface
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Git-Wrapper/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-File-Temp dev-perl/File-chdir virtual/perl-IPC-Cmd virtual/perl-Scalar-List-Utils dev-perl/Sort-Versions dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GE/GENEHACK/Git-Wrapper-0.047.tar.gz
-_eclasses_=multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
-_md5_=6791c2b98e974aaf8fdc593cac221cdd
diff --git a/metadata/md5-cache/dev-perl/Git-Wrapper-0.47.0-r1 b/metadata/md5-cache/dev-perl/Git-Wrapper-0.47.0-r1
new file mode 100644
index 000000000000..94be1ddf1833
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Git-Wrapper-0.47.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-vcs/git virtual/perl-File-Temp dev-perl/File-chdir virtual/perl-IPC-Cmd virtual/perl-Scalar-List-Utils dev-perl/Sort-Versions dev-perl/Devel-CheckBin virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec test? ( virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO dev-perl/Test-Deep dev-perl/Test-Exception virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Wrap git(7) command-line interface
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Git-Wrapper/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-vcs/git virtual/perl-File-Temp dev-perl/File-chdir virtual/perl-IPC-Cmd virtual/perl-Scalar-List-Utils dev-perl/Sort-Versions dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GE/GENEHACK/Git-Wrapper-0.047.tar.gz
+_eclasses_=multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
+_md5_=fb75f32d480a34cc9ee78f57a144555d
diff --git a/metadata/md5-cache/dev-perl/WWW-Dict-Leo-Org-2.20.0 b/metadata/md5-cache/dev-perl/WWW-Dict-Leo-Org-2.20.0
new file mode 100644
index 000000000000..72127e6c39d9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/WWW-Dict-Leo-Org-2.20.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=virtual/perl-Carp dev-perl/IO-Socket-SSL dev-perl/HTML-TableParser virtual/perl-MIME-Base64 dev-perl/XML-Simple virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Commandline interface to http://dict.leo.org/
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/WWW-Dict-Leo-Org/
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/perl-Carp dev-perl/IO-Socket-SSL dev-perl/HTML-TableParser virtual/perl-MIME-Base64 dev-perl/XML-Simple dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TL/TLINDEN/WWW-Dict-Leo-Org-2.02.tar.gz
+_eclasses_=multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
+_md5_=d7608a1be0225fe48c43bb226225ba0f
diff --git a/metadata/md5-cache/dev-perl/XML-AutoWriter-0.400.0-r1 b/metadata/md5-cache/dev-perl/XML-AutoWriter-0.400.0-r1
deleted file mode 100644
index dc82ed38ad16..000000000000
--- a/metadata/md5-cache/dev-perl/XML-AutoWriter-0.400.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/XML-Parser dev-lang/perl:=
-DESCRIPTION=DOCTYPE based XML output
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/XML-AutoWriter/
-KEYWORDS=amd64 hppa ia64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ BSD )
-RDEPEND=dev-perl/XML-Parser dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PE/PERIGRIN/XML-AutoWriter-0.4.tar.gz
-_eclasses_=multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
-_md5_=8141ecedc1dab2a9e1ce133f013dfd64
diff --git a/metadata/md5-cache/dev-python/oslo-service-1.25.0 b/metadata/md5-cache/dev-python/oslo-service-1.25.0
index f92b568d0c3a..1cfa0c071ca2 100644
--- a/metadata/md5-cache/dev-python/oslo-service-1.25.0
+++ b/metadata/md5-cache/dev-python/oslo-service-1.25.0
@@ -4,11 +4,11 @@ DESCRIPTION=Library for running OpenStack services
EAPI=6
HOMEPAGE=https://pypi.python.org/pypi/oslo.service
IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
LICENSE=Apache-2.0
RDEPEND=>=dev-python/pbr-2.0.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/pbr-2.1.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/webob-1.7.1[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/eventlet-0.18.4[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/eventlet-0.20.1[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/greenlet-0.3.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/monotonic-0.6[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/oslo-utils-3.20.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/oslo-concurrency-3.8.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/oslo-config-4.0.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/oslo-config-4.3.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/oslo-config-4.4.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/oslo-log-3.22.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/six-1.9.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/oslo-i18n-2.1.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/oslo-i18n-3.15.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/pastedeploy-1.5.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/routes-2.3.1[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/paste[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/o/oslo.service/oslo.service-1.25.0.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=670b142bafbfa207ef7f69b207358959
+_md5_=be26ea28e5a58c5c9d7ff210f63c0c7a
diff --git a/metadata/md5-cache/dev-python/ovs-2.7.2 b/metadata/md5-cache/dev-python/ovs-2.7.2
new file mode 100644
index 000000000000..3d958586b6f9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ovs-2.7.2
@@ -0,0 +1,14 @@
+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(-)] 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=OVS bindings for python.
+EAPI=6
+HOMEPAGE=https://github.com/openvswitch/ovs/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+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/o/ovs/ovs-2.7.2.tar.gz
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=893af13fdc5bb2d4ae547051d68e37a1
diff --git a/metadata/md5-cache/dev-qt/qtphonon-4.8.6-r1 b/metadata/md5-cache/dev-qt/qtphonon-4.8.6-r1
deleted file mode 100644
index fa496c3b104f..000000000000
--- a/metadata/md5-cache/dev-qt/qtphonon-4.8.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-4.8.6[aqua=,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(-)?] ~dev-qt/qtgui-4.8.6[aqua=,debug=,qt3support=,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(-)?] aqua? ( ~dev-qt/qtopengl-4.8.6[aqua=,debug=,qt3support=,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(-)?] ) !aqua? ( >=media-libs/gstreamer-0.10.36-r1:0.10[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-plugins/gst-plugins-meta-0.10-r9:0.10[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(-)?] ) dbus? ( ~dev-qt/qtdbus-4.8.6[aqua=,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(-)?] ) !kde-apps/phonon-kde !media-libs/phonon dev-lang/perl virtual/pkgconfig[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(-)?]
-DESCRIPTION=The Phonon module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=dbus qt3support 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 aqua debug pch +exceptions
-KEYWORDS=amd64 arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,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(-)?] ~dev-qt/qtgui-4.8.6[aqua=,debug=,qt3support=,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(-)?] aqua? ( ~dev-qt/qtopengl-4.8.6[aqua=,debug=,qt3support=,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(-)?] ) !aqua? ( >=media-libs/gstreamer-0.10.36-r1:0.10[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-plugins/gst-plugins-meta-0.10-r9:0.10[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(-)?] ) dbus? ( ~dev-qt/qtdbus-4.8.6[aqua=,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(-)?] ) !kde-apps/phonon-kde !media-libs/phonon dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 qt4-build-multilib 277a1997239523435425a3e17d116e23 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=c6dbe03079fdf6678ee4024bf6fb3967
diff --git a/metadata/md5-cache/dev-qt/qtphonon-4.8.7 b/metadata/md5-cache/dev-qt/qtphonon-4.8.7
deleted file mode 100644
index 792823f64d8e..000000000000
--- a/metadata/md5-cache/dev-qt/qtphonon-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,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(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,qt3support=,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(-)?] aqua? ( ~dev-qt/qtopengl-4.8.7[aqua=,debug=,qt3support=,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(-)?] ) !aqua? ( >=media-libs/gstreamer-0.10.36-r1:0.10[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-plugins/gst-plugins-meta-0.10-r9:0.10[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(-)?] ) dbus? ( ~dev-qt/qtdbus-4.8.7[aqua=,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(-)?] ) !kde-apps/phonon-kde !media-libs/phonon !media-libs/phonon-gstreamer dev-lang/perl virtual/pkgconfig[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(-)?]
-DESCRIPTION=The Phonon module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=dbus qt3support 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 aqua debug pch +exceptions
-KEYWORDS=amd64 arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,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(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,qt3support=,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(-)?] aqua? ( ~dev-qt/qtopengl-4.8.7[aqua=,debug=,qt3support=,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(-)?] ) !aqua? ( >=media-libs/gstreamer-0.10.36-r1:0.10[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-plugins/gst-plugins-meta-0.10-r9:0.10[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(-)?] ) dbus? ( ~dev-qt/qtdbus-4.8.7[aqua=,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(-)?] ) !kde-apps/phonon-kde !media-libs/phonon !media-libs/phonon-gstreamer dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 qt4-build-multilib 277a1997239523435425a3e17d116e23 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=4fa212bd6550fe2135ed534ecfc24d06
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.15.2 b/metadata/md5-cache/dev-ruby/capybara-2.15.2
new file mode 100644
index 000000000000..6961605bdd30
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capybara-2.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( www-client/firefox ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/launchy[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby24] dev-ruby/sinatra[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby24] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
+EAPI=6
+HOMEPAGE=https://github.com/jnicklas/capybara
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby24] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby24] ) 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_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_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=2
+SRC_URI=mirror://rubygems/capybara-2.15.2.gem
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066
+_md5_=055e393c954472c40af848327e7adff7
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.15.3 b/metadata/md5-cache/dev-ruby/capybara-2.15.3
new file mode 100644
index 000000000000..eae3a4b0bdbb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capybara-2.15.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( www-client/firefox ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/launchy[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby24] dev-ruby/sinatra[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby24] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
+EAPI=6
+HOMEPAGE=https://github.com/jnicklas/capybara
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby24] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby24] ) 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_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_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=2
+SRC_URI=mirror://rubygems/capybara-2.15.3.gem
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066
+_md5_=055e393c954472c40af848327e7adff7
diff --git a/metadata/md5-cache/dev-ruby/flexmock-2.3.6 b/metadata/md5-cache/dev-ruby/flexmock-2.3.6
new file mode 100644
index 000000000000..6778f027db26
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/flexmock-2.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] ) ) 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_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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Simple mock object library for Ruby unit testing
+EAPI=5
+HOMEPAGE=https://github.com/doudou/flexmock
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=flexmock
+RDEPEND=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_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_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/doudou/flexmock/archive/v2.3.6.tar.gz -> flexmock-2.3.6.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c8cda320abfad2be615ab55f1122587b
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.4.2 b/metadata/md5-cache/dev-ruby/hiera-3.4.2
new file mode 100644
index 000000000000..5c4cef0a6e97
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/hiera-3.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/deep_merge[ruby_targets_ruby24] ) ) 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_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_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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A simple pluggable Hierarchical Database
+EAPI=6
+HOMEPAGE=https://docs.puppet.com/hiera/latest/
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/deep_merge[ruby_targets_ruby24] ) 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_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_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/hiera-3.4.2.gem
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=22bd1a750083647f9f194416fbc3e325
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-0.3.52 b/metadata/md5-cache/dev-ruby/tzinfo-0.3.52
deleted file mode 100644
index e060e71a2e9a..000000000000
--- a/metadata/md5-cache/dev-ruby/tzinfo-0.3.52
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Daylight-savings aware timezone library
-EAPI=5
-HOMEPAGE=http://tzinfo.github.io/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/tzinfo-0.3.52.gem
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fdc0b3f438e7d92fc8f8c4adbd6a4bc9
diff --git a/metadata/md5-cache/dev-util/Orange-3.4.5-r1 b/metadata/md5-cache/dev-util/Orange-3.4.5-r2
similarity index 74%
rename from metadata/md5-cache/dev-util/Orange-3.4.5-r1
rename to metadata/md5-cache/dev-util/Orange-3.4.5-r2
index 575c0a06faed..cfae23bf79b0 100644
--- a/metadata/md5-cache/dev-util/Orange-3.4.5-r1
+++ b/metadata/md5-cache/dev-util/Orange-3.4.5-r2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/anyqt[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(-)] >=dev-python/bottleneck-1.0.0[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(-)] >=dev-python/CommonMark-0.5.5[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(-)] dev-python/dill[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(-)] >=dev-python/chardet-2.3.0[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(-)] >=dev-python/joblib-0.9.4[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(-)] dev-python/keyring[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(-)] dev-python/keyrings_alt[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(-)] dev-python/pylint[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(-)] >=dev-python/pip-9.0.1[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(-)] >=dev-python/pyqtgraph-0.10.0[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(-)] dev-python/PyQt5[webkit,svg,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(-)] dev-python/radon[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(-)] >=dev-python/xlrd-0.9.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(-)] >=sci-libs/scipy-0.11.0[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(-)] >=sci-libs/scikits_learn-0.18.1[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(-)] dev-python/setuptools[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(-)] >=dev-python/numpy-1.9.0[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(-)] 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(-)]
+DEPEND=dev-python/anyqt[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(-)] >=dev-python/bottleneck-1.0.0[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(-)] >=dev-python/CommonMark-0.5.5[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(-)] dev-python/dill[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(-)] >=dev-python/chardet-2.3.0[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(-)] >=dev-python/joblib-0.9.4[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(-)] dev-python/keyring[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(-)] dev-python/keyrings_alt[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(-)] dev-python/pylint[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(-)] >=dev-python/pip-9.0.1[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(-)] >=dev-python/pyqtgraph-0.10.0[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(-)] dev-python/PyQt5[webkit,svg,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(-)] dev-python/radon[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(-)] dev-python/typing[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(-)] >=dev-python/xlrd-0.9.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(-)] >=sci-libs/scipy-0.11.0[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(-)] >=sci-libs/scikits_learn-0.18.1[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(-)] dev-python/setuptools[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(-)] >=dev-python/numpy-1.9.0[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(-)] 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(-)]
DESCRIPTION=Open source data visualization and analysis for novice and experts.
EAPI=6
HOMEPAGE=https://orange.biolab.si/
IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
-RDEPEND=dev-python/anyqt[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(-)] >=dev-python/bottleneck-1.0.0[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(-)] >=dev-python/CommonMark-0.5.5[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(-)] dev-python/dill[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(-)] >=dev-python/chardet-2.3.0[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(-)] >=dev-python/joblib-0.9.4[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(-)] dev-python/keyring[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(-)] dev-python/keyrings_alt[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(-)] dev-python/pylint[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(-)] >=dev-python/pip-9.0.1[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(-)] >=dev-python/pyqtgraph-0.10.0[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(-)] dev-python/PyQt5[webkit,svg,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(-)] dev-python/radon[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(-)] >=dev-python/xlrd-0.9.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(-)] >=sci-libs/scipy-0.11.0[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(-)] >=sci-libs/scikits_learn-0.18.1[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(-)] 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(-)]
+RDEPEND=dev-python/anyqt[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(-)] >=dev-python/bottleneck-1.0.0[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(-)] >=dev-python/CommonMark-0.5.5[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(-)] dev-python/dill[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(-)] >=dev-python/chardet-2.3.0[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(-)] >=dev-python/joblib-0.9.4[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(-)] dev-python/keyring[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(-)] dev-python/keyrings_alt[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(-)] dev-python/pylint[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(-)] >=dev-python/pip-9.0.1[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(-)] >=dev-python/pyqtgraph-0.10.0[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(-)] dev-python/PyQt5[webkit,svg,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(-)] dev-python/radon[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(-)] dev-python/typing[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(-)] >=dev-python/xlrd-0.9.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(-)] >=sci-libs/scipy-0.11.0[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(-)] >=sci-libs/scikits_learn-0.18.1[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(-)] 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 )
SLOT=0
SRC_URI=https://github.com/biolab/orange3/archive/3.4.5.tar.gz -> Orange-3.4.5.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a1b6756f9e991e20a0e31134116983dd
+_md5_=4991d184236e5eb31b3071f950552f6c
diff --git a/metadata/md5-cache/dev-util/dejagnu-1.6 b/metadata/md5-cache/dev-util/dejagnu-1.6
index 11c7da728396..1b884d7ddea4 100644
--- a/metadata/md5-cache/dev-util/dejagnu-1.6
+++ b/metadata/md5-cache/dev-util/dejagnu-1.6
@@ -3,9 +3,8 @@ DEPEND=dev-lang/tcl dev-tcltk/expect
DESCRIPTION=Framework for testing other programs
EAPI=6
HOMEPAGE=https://www.gnu.org/software/dejagnu/
-IUSE=doc
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
LICENSE=GPL-3
SLOT=0
SRC_URI=mirror://gnu/dejagnu/dejagnu-1.6.tar.gz
-_md5_=b7458566f5dfcdccb7d2d2caf5c1cb52
+_md5_=8cd8fe44aec9456edad520b33524bdae
diff --git a/metadata/md5-cache/dev-util/icemon-20140102 b/metadata/md5-cache/dev-util/icemon-20140102
deleted file mode 100644
index d57830d964ec..000000000000
--- a/metadata/md5-cache/dev-util/icemon-20140102
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/icecream app-text/docbook2X >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-DESCRIPTION=Icemon is a KDE monitor program for use with Icecream compile clusters
-EAPI=5
-HOMEPAGE=http://www.opensuse.org/icecream
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-devel/icecream kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-SLOT=0
-SRC_URI=http://dev.gentooexperimental.org/~scarabeus/icemon-20140102.tar.xz
-_eclasses_=cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 gnome2-utils 4d211d7614f303710fca59db6ec12c88 kde4-base 4dd1bbb7aed9ca9a21e3dc940cbd2ce7 kde4-functions 5d5c723ca3cbd3a92b826a68c3729969 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c8d6edc9c8d1f0c397d169d543da5c48
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.81 b/metadata/md5-cache/dev-util/jenkins-bin-2.81
new file mode 100644
index 000000000000..5f1508e0a95f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.81
@@ -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.81/jenkins.war -> jenkins-bin-2.81.war
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7
+_md5_=62e8d5a174d9794790c833c251dc4e85
diff --git a/metadata/md5-cache/dev-util/ragel-6.10 b/metadata/md5-cache/dev-util/ragel-6.10
index 74681e71438d..4ea801f8e453 100644
--- a/metadata/md5-cache/dev-util/ragel-6.10
+++ b/metadata/md5-cache/dev-util/ragel-6.10
@@ -4,10 +4,10 @@ DESCRIPTION=Compiles finite state machines from regular languages into executabl
EAPI=5
HOMEPAGE=http://www.colm.net/open-source/ragel/
IUSE=vim-syntax
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RESTRICT=test
SLOT=0
SRC_URI=http://www.colm.net/files/ragel/ragel-6.10.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 autotools-utils 5a4611dfba155b1659528663fad4cd5e epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=33fee869fbbcf2a13a00938603b349e6
+_md5_=9f6b61bb332b7e18542f2e7bd7f06097
diff --git a/metadata/md5-cache/dev-util/webstorm-2017.2.4.172.4155.35 b/metadata/md5-cache/dev-util/webstorm-2017.2.4.172.4155.35
new file mode 100644
index 000000000000..dae1bb012fe5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/webstorm-2017.2.4.172.4155.35
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=JavaScript IDE for client- and server-side development with Node.js
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/webstorm
+KEYWORDS=~amd64 ~x86
+LICENSE=WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal
+RDEPEND=>=virtual/jdk-1.7
+SLOT=2017
+SRC_URI=http://download.jetbrains.com/webstorm/WebStorm-2017.2.4.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=947090c64d9b4fe71afa4f0b922453a5
diff --git a/metadata/md5-cache/dev-vcs/git-2.13.6 b/metadata/md5-cache/dev-vcs/git-2.13.6
index 0f02fe56f151..ba16cc9d5e83 100644
--- a/metadata/md5-cache/dev-vcs/git-2.13.6
+++ b/metadata/md5-cache/dev-vcs/git-2.13.6
@@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
EAPI=6
HOMEPAGE=http://www.git-scm.com/
IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) 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(+)] )
REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) python? ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://kernel/software/scm/git/git-2.13.6.tar.xz mirror://kernel/software/scm/git/git-manpages-2.13.6.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.13.6.tar.xz )
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 l10n 2c2e15383ba891d642f51896a7f0ecfe ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=28fd9bddc36ae47ca33c1ecb7c73dc18
+_md5_=3de01c1d756c377e70752a51bead690c
diff --git a/metadata/md5-cache/games-action/barrage-1.0.4 b/metadata/md5-cache/games-action/barrage-1.0.4
index 659d8ed98749..77721e1d9349 100644
--- a/metadata/md5-cache/games-action/barrage-1.0.4
+++ b/metadata/md5-cache/games-action/barrage-1.0.4
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
DEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2.4
DESCRIPTION=A violent point-and-click shooting game
EAPI=5
-HOMEPAGE=http://lgames.sourceforge.net
+HOMEPAGE=http://lgames.sourceforge.net/Barrage/
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2.4 games-misc/games-envd
SLOT=0
SRC_URI=mirror://sourceforge/lgames/barrage-1.0.4.tar.gz
_eclasses_=base df2aa567b3f0595aae0d0923889f7631 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7
-_md5_=5f85feaa62585c8a4032c0d62f44a452
+_md5_=b0bb4e6edd66736b6556e8298524e353
diff --git a/metadata/md5-cache/games-action/barrage-1.0.4-r1 b/metadata/md5-cache/games-action/barrage-1.0.4-r1
index 9a9bc9e27959..4a8477089a16 100644
--- a/metadata/md5-cache/games-action/barrage-1.0.4-r1
+++ b/metadata/md5-cache/games-action/barrage-1.0.4-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
DEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2.4
DESCRIPTION=A violent point-and-click shooting game
EAPI=6
-HOMEPAGE=http://lgames.sourceforge.net
+HOMEPAGE=http://lgames.sourceforge.net/Barrage/
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2.4
SLOT=0
SRC_URI=mirror://sourceforge/lgames/barrage-1.0.4.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=aa4ad0339be398eec7a43632d6f61005
+_md5_=3de1c22d4ee1ce97f5db287a4d7347a7
diff --git a/metadata/md5-cache/games-arcade/lbreakout-010315 b/metadata/md5-cache/games-arcade/lbreakout-010315
index 46c76c4fc1da..763763050de4 100644
--- a/metadata/md5-cache/games-arcade/lbreakout-010315
+++ b/metadata/md5-cache/games-arcade/lbreakout-010315
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
DEPEND=>=media-libs/libsdl-1.1.5
DESCRIPTION=Breakout clone written with the SDL library
EAPI=5
-HOMEPAGE=http://lgames.sourceforge.net/
+HOMEPAGE=http://lgames.sourceforge.net/LBreakout/
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=media-libs/libsdl-1.1.5 games-misc/games-envd
SLOT=0
SRC_URI=mirror://sourceforge/lgames/lbreakout-010315.tar.gz
_eclasses_=base df2aa567b3f0595aae0d0923889f7631 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7
-_md5_=dd276f4d2ffdf9d77a6a3dc863c224f0
+_md5_=994022b780df4000710aca9a1b6ff5d6
diff --git a/metadata/md5-cache/games-arcade/lbreakout2-2.6.4 b/metadata/md5-cache/games-arcade/lbreakout2-2.6.4
index add213701824..a23246b9121d 100644
--- a/metadata/md5-cache/games-arcade/lbreakout2-2.6.4
+++ b/metadata/md5-cache/games-arcade/lbreakout2-2.6.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup u
DEPEND=media-libs/libpng:0 sys-libs/zlib media-libs/libsdl[sound,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
DESCRIPTION=Breakout clone written with the SDL library
EAPI=5
-HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LBreakout2
+HOMEPAGE=http://lgames.sourceforge.net/LBreakout2/
IUSE=nls themes
KEYWORDS=amd64 x86 ~x86-fbsd
LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libpng:0 sys-libs/zlib media-libs/libsdl[sound,joystick,video
SLOT=0
SRC_URI=mirror://sourceforge/lgames/lbreakout2-2.6.4.tar.gz mirror://sourceforge/lgames/lbreakout2-levelsets-20120815.tar.gz themes? ( mirror://sourceforge/lgames/lbreakout2-themes-20111026.tar.gz )
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 base df2aa567b3f0595aae0d0923889f7631 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=edad261e02d13438aba3842f2cc21cd0
+_md5_=1fa3893437b3c4dda90329d5d323260c
diff --git a/metadata/md5-cache/games-arcade/lbreakout2-2.6.5 b/metadata/md5-cache/games-arcade/lbreakout2-2.6.5
index 4f7ab93820d4..b4143a0fed34 100644
--- a/metadata/md5-cache/games-arcade/lbreakout2-2.6.5
+++ b/metadata/md5-cache/games-arcade/lbreakout2-2.6.5
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup u
DEPEND=media-libs/libpng:0 sys-libs/zlib media-libs/libsdl[sound,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
DESCRIPTION=Breakout clone written with the SDL library
EAPI=5
-HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LBreakout2
+HOMEPAGE=http://lgames.sourceforge.net/LBreakout2/
IUSE=nls themes
KEYWORDS=amd64 x86 ~x86-fbsd
LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libpng:0 sys-libs/zlib media-libs/libsdl[sound,joystick,video
SLOT=0
SRC_URI=mirror://sourceforge/lgames/lbreakout2-2.6.5.tar.gz mirror://sourceforge/lgames/add-ons/lbreakout2/lbreakout2-levelsets-20141220.tar.gz themes? ( mirror://sourceforge/lgames/add-ons/lbreakout2/lbreakout2-themes-20141220.tar.gz )
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 base df2aa567b3f0595aae0d0923889f7631 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a6cb7a073418ab5810d65ed345a6b45
+_md5_=b7bcafb6ff42fddef1d023904d65873b
diff --git a/metadata/md5-cache/games-emulation/mgba-0.6.1 b/metadata/md5-cache/games-emulation/mgba-0.6.1
new file mode 100644
index 000000000000..abe29b2fa7c6
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/mgba-0.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=A new Game Boy Advance emulator written in C.
+EAPI=6
+HOMEPAGE=https://mgba.io
+IUSE=debug ffmpeg imagemagick opengl qt5 +sdl
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
+REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
+SLOT=0
+SRC_URI=https://github.com/mgba-emu/mgba/archive/0.6.1.tar.gz -> mgba-0.6.1.tar.gz
+_eclasses_=cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c27060b9ddd88651062f00f8b0cef504
diff --git a/metadata/md5-cache/games-engines/stratagus-2.4.1 b/metadata/md5-cache/games-engines/stratagus-2.4.1
new file mode 100644
index 000000000000..a0939a7f8aa7
--- /dev/null
+++ b/metadata/md5-cache/games-engines/stratagus-2.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-db/sqlite:3 >=dev-lang/lua-5:0 dev-lua/toluapp media-libs/libpng:0 virtual/opengl x11-libs/libX11 media-libs/libsdl[sound,opengl,video] sys-libs/zlib bzip2? ( app-arch/bzip2 ) fluidsynth? ( media-sound/fluidsynth ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libogg media-libs/libvorbis theora? ( media-libs/libtheora ) ) doc? ( app-doc/doxygen ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A realtime strategy game engine
+EAPI=6
+HOMEPAGE=https://launchpad.net/stratagus/
+IUSE=bzip2 debug doc fluidsynth mikmod mng theora vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite:3 >=dev-lang/lua-5:0 dev-lua/toluapp media-libs/libpng:0 virtual/opengl x11-libs/libX11 media-libs/libsdl[sound,opengl,video] sys-libs/zlib bzip2? ( app-arch/bzip2 ) fluidsynth? ( media-sound/fluidsynth ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libogg media-libs/libvorbis theora? ( media-libs/libtheora ) )
+REQUIRED_USE=theora? ( vorbis )
+SLOT=0
+SRC_URI=https://github.com/Wargus/stratagus/archive/v2.4.1.tar.gz -> stratagus-2.4.1.tar.gz
+_eclasses_=cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=04773915a035b2a6f8d55bf768c1f129
diff --git a/metadata/md5-cache/games-fps/warsow-1.5.1-r1 b/metadata/md5-cache/games-fps/warsow-1.5.1-r1
deleted file mode 100644
index 286653ce6ca7..000000000000
--- a/metadata/md5-cache/games-fps/warsow-1.5.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/libRocket-1.2.1_p20130110 =sys-apps/sed-4
-DESCRIPTION=Multiplayer FPS based on the QFusion engine (evolved from Quake 2)
-EAPI=5
-HOMEPAGE=http://www.warsow.net/
-IUSE=debug dedicated irc openal server
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 ZLIB warsow
-RDEPEND=>=dev-libs/libRocket-1.2.1_p20130110 =app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=puzzle game inspired by Atomix and written in SDL
EAPI=5
-HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LMarbles
+HOMEPAGE=http://lgames.sourceforge.net/LMarbles/
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer games-misc/games-envd
SLOT=0
SRC_URI=mirror://sourceforge/lgames/lmarbles-1.0.8.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 base df2aa567b3f0595aae0d0923889f7631 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7
-_md5_=821f81331ab1ab66fc8fef639d01b251
+_md5_=f921a94b11d81a024b2be45a39be473d
diff --git a/metadata/md5-cache/games-puzzle/lpairs-1.0.4 b/metadata/md5-cache/games-puzzle/lpairs-1.0.4
index 717b29cd7e96..6d2ba0e8dae9 100644
--- a/metadata/md5-cache/games-puzzle/lpairs-1.0.4
+++ b/metadata/md5-cache/games-puzzle/lpairs-1.0.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
DEPEND=media-libs/libsdl[sound?,video] nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
DESCRIPTION=A classical memory game
EAPI=5
-HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LPairs
+HOMEPAGE=http://lgames.sourceforge.net/LPairs/
IUSE=nls sound
KEYWORDS=amd64 x86
LICENSE=GPL-2+
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsdl[sound?,video] nls? ( virtual/libintl ) games-misc/game
SLOT=0
SRC_URI=mirror://sourceforge/lgames/lpairs-1.0.4.tar.gz
_eclasses_=base df2aa567b3f0595aae0d0923889f7631 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7
-_md5_=a5b6a056e4512e3d8ca2d02eb419f10f
+_md5_=8b80ceda2016b539f841dd2338144e9b
diff --git a/metadata/md5-cache/games-puzzle/ltris-1.0.19 b/metadata/md5-cache/games-puzzle/ltris-1.0.19
index d5dbbf1ac01a..9b92d7f737ca 100644
--- a/metadata/md5-cache/games-puzzle/ltris-1.0.19
+++ b/metadata/md5-cache/games-puzzle/ltris-1.0.19
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=very polished Tetris clone
EAPI=5
-HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LTris
+HOMEPAGE=http://lgames.sourceforge.net/LTris/
IUSE=nls
KEYWORDS=amd64 x86
LICENSE=GPL-2+
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl ) g
SLOT=0
SRC_URI=mirror://sourceforge/lgames/ltris-1.0.19.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 base df2aa567b3f0595aae0d0923889f7631 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7
-_md5_=3a3c60cec93cb093fcc641914b4a6821
+_md5_=27c4b1a39ab4e01c5ae4d8597a6969c3
diff --git a/metadata/md5-cache/games-rpg/manaplus-1.7.9.2 b/metadata/md5-cache/games-rpg/manaplus-1.7.9.2
index a8ec3d0673ff..c57118a92d96 100644
--- a/metadata/md5-cache/games-rpg/manaplus-1.7.9.2
+++ b/metadata/md5-cache/games-rpg/manaplus-1.7.9.2
@@ -4,9 +4,9 @@ DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
EAPI=6
HOMEPAGE=http://manaplus.evolonline.org
IUSE=mumble nls opengl pugixml +sdl2 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2+
RDEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf )
SLOT=0
SRC_URI=http://download.evolonline.org/manaplus/download/1.7.9.2/manaplus-1.7.9.2.tar.xz
-_md5_=609f04dc4da4d8458f5de2321e909951
+_md5_=58e038479dc767bba835a6cbe305bee2
diff --git a/metadata/md5-cache/games-rpg/manaplus-1.7.8.19 b/metadata/md5-cache/games-rpg/manaplus-1.7.9.30
similarity index 91%
rename from metadata/md5-cache/games-rpg/manaplus-1.7.8.19
rename to metadata/md5-cache/games-rpg/manaplus-1.7.9.30
index 926d302e6b43..9a4c71f8a529 100644
--- a/metadata/md5-cache/games-rpg/manaplus-1.7.8.19
+++ b/metadata/md5-cache/games-rpg/manaplus-1.7.9.30
@@ -4,9 +4,9 @@ DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
EAPI=6
HOMEPAGE=http://manaplus.evolonline.org
IUSE=mumble nls opengl pugixml +sdl2 test
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf )
SLOT=0
-SRC_URI=http://download.evolonline.org/manaplus/download/1.7.8.19/manaplus-1.7.8.19.tar.xz
-_md5_=58e038479dc767bba835a6cbe305bee2
+SRC_URI=http://download.evolonline.org/manaplus/download/1.7.9.30/manaplus-1.7.9.30.tar.xz
+_md5_=609f04dc4da4d8458f5de2321e909951
diff --git a/metadata/md5-cache/games-strategy/lgeneral-1.3.1 b/metadata/md5-cache/games-strategy/lgeneral-1.3.1
index 592de24a2553..65c0c6542f46 100644
--- a/metadata/md5-cache/games-strategy/lgeneral-1.3.1
+++ b/metadata/md5-cache/games-strategy/lgeneral-1.3.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup u
DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer nls? ( virtual/libintl ) sys-devel/gettext >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
DESCRIPTION=A Panzer General clone written in SDL
EAPI=5
-HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LGeneral
+HOMEPAGE=http://lgames.sourceforge.net/LGeneral/
IUSE=nls
KEYWORDS=amd64 x86
LICENSE=GPL-2+
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer nls? ( virtual/libin
SLOT=0
SRC_URI=mirror://sourceforge/lgeneral/lgeneral-1.3.1.tar.gz mirror://sourceforge/lgeneral/pg-data.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 base df2aa567b3f0595aae0d0923889f7631 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=722bd87d018db26a4e1a7a0af32152ac
+_md5_=3e7b4851bfb1c2632fedb1cbda593caa
diff --git a/metadata/md5-cache/games-strategy/lgeneral-1.3.1-r1 b/metadata/md5-cache/games-strategy/lgeneral-1.3.1-r1
index 041cac8e5c93..16847e8f41ee 100644
--- a/metadata/md5-cache/games-strategy/lgeneral-1.3.1-r1
+++ b/metadata/md5-cache/games-strategy/lgeneral-1.3.1-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup u
DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer nls? ( virtual/libintl ) sys-devel/gettext >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
DESCRIPTION=A Panzer General clone written in SDL
EAPI=5
-HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LGeneral
+HOMEPAGE=http://lgames.sourceforge.net/LGeneral/
IUSE=nls
KEYWORDS=amd64 x86
LICENSE=GPL-2+
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer nls? ( virtual/libin
SLOT=0
SRC_URI=mirror://sourceforge/lgeneral/lgeneral-1.3.1.tar.gz mirror://sourceforge/lgeneral/pg-data.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 base df2aa567b3f0595aae0d0923889f7631 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=89caa131361f33e91a2a2488ee103c36
+_md5_=79e3411f53174bf92459354390c4db15
diff --git a/metadata/md5-cache/games-util/grfcodec-6.0.6 b/metadata/md5-cache/games-util/grfcodec-6.0.6
index 738c1b5e6bc5..34f33ca57104 100644
--- a/metadata/md5-cache/games-util/grfcodec-6.0.6
+++ b/metadata/md5-cache/games-util/grfcodec-6.0.6
@@ -3,10 +3,10 @@ DEPEND=media-libs/libpng:0 !games-util/nforenum dev-lang/perl dev-libs/boost
DESCRIPTION=A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files
EAPI=6
HOMEPAGE=http://dev.openttdcoop.org/projects/grfcodec
-KEYWORDS=amd64 ~arm ~ppc64 x86
+KEYWORDS=amd64 ~arm ppc64 x86
LICENSE=GPL-2+
RDEPEND=media-libs/libpng:0
SLOT=0
SRC_URI=http://binaries.openttd.org/extra/grfcodec/6.0.6/grfcodec-6.0.6-source.tar.xz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=e072a56e8152ebe6212245cc70d1e9df
+_md5_=482a012d4b49aba06c526491b5a94b6a
diff --git a/metadata/md5-cache/java-virtuals/javamail-1.0-r4 b/metadata/md5-cache/java-virtuals/javamail-1.0-r4
deleted file mode 100644
index 9d19b2de1152..000000000000
--- a/metadata/md5-cache/java-virtuals/javamail-1.0-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Virtual for javamail implementations
-EAPI=5
-HOMEPAGE=https://www.gentoo.org
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=|| ( dev-java/oracle-javamail:0 dev-java/sun-javamail:0 dev-java/gnu-javamail:1 ) >=dev-java/java-config-2.2.0-r3
-SLOT=0
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd java-virtuals-2 be9aebb5236e69c1a0cda5b275e4ea22 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ebf105eb711486fa63c9ad8551298f20
diff --git a/metadata/md5-cache/mail-client/neomutt-20170714 b/metadata/md5-cache/mail-client/neomutt-20170714
new file mode 100644
index 000000000000..852fbdd80c70
--- /dev/null
+++ b/metadata/md5-cache/mail-client/neomutt-20170714
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=6
+HOMEPAGE=https://www.neomutt.org/
+IUSE=berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl +symlink tokyocabinet
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
+SLOT=0
+SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20170714.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=1fc4d48fe6b8b62b8c14ff1bfb33c249
diff --git a/metadata/md5-cache/mail-client/neomutt-20170912 b/metadata/md5-cache/mail-client/neomutt-20170912
new file mode 100644
index 000000000000..2f7299a18116
--- /dev/null
+++ b/metadata/md5-cache/mail-client/neomutt-20170912
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=6
+HOMEPAGE=https://www.neomutt.org/
+IUSE=berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl +symlink tokyocabinet
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
+SLOT=0
+SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20170912.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=77c2f2462ecd52b1812dadb838b06aa3
diff --git a/metadata/md5-cache/mail-client/neomutt-9999 b/metadata/md5-cache/mail-client/neomutt-9999
new file mode 100644
index 000000000000..e6f99b3fd5d2
--- /dev/null
+++ b/metadata/md5-cache/mail-client/neomutt-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=6
+HOMEPAGE=https://www.neomutt.org/
+IUSE=berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl +symlink tokyocabinet
+LICENSE=GPL-2
+RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
+SLOT=0
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=ae3c0ef0b65929b497ac9f2c67f967f9
diff --git a/metadata/md5-cache/media-gfx/freewrl-9999 b/metadata/md5-cache/media-gfx/freewrl-9999
index 0a63cce4377d..0577400db0f7 100644
--- a/metadata/md5-cache/media-gfx/freewrl-9999
+++ b/metadata/md5-cache/media-gfx/freewrl-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-3
RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa virtual/opengl media-libs/freealut media-libs/openal media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) opencl? ( virtual/opencl ) rbp? ( dev-games/ode:0=[double-precision] ) dev-lang/spidermonkey:0= media-fonts/dejavu app-arch/unzip virtual/imagemagick-tools java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e mozextension e5d920147bfccf4930062e462e2a417d multilib 97f470f374f2e94ccab04a2fb21d811e nsplugins 2049586e425364a1c5bdb004205d1758 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5b3fe8aea266e717d62afd3758621fa0
+_md5_=29f18fea9842f0de247c6c6c2aa00480
diff --git a/metadata/md5-cache/media-gfx/propaganda-1.0-r1 b/metadata/md5-cache/media-gfx/propaganda-1.0-r1
new file mode 100644
index 000000000000..199f463f9243
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/propaganda-1.0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Propaganda Volume 1-14 + E. Tiling images for your desktop
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://gentoo/Propaganda-Vol-01.tar.gz mirror://gentoo/Propaganda-Vol-02.tar.gz mirror://gentoo/Propaganda-Vol-03.tar.gz mirror://gentoo/Propaganda-Vol-04.tar.gz mirror://gentoo/Propaganda-Vol-05.tar.gz mirror://gentoo/Propaganda-Vol-06.tar.gz mirror://gentoo/Propaganda-Vol-07.tar.gz mirror://gentoo/Propaganda-Vol-08.tar.gz mirror://gentoo/Propaganda-Vol-09.tar.gz mirror://gentoo/Propaganda-Vol-10.tar.gz mirror://gentoo/Propaganda-Vol-11.tar.gz mirror://gentoo/Propaganda-Vol-12.tar.gz mirror://gentoo/Propaganda-13.tar.gz mirror://gentoo/Propaganda-14.tar.gz mirror://gentoo/Propaganda-For-E.tar.gz
+_md5_=9cf67837b30e2648fb5456e6779aded9
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-5.3 b/metadata/md5-cache/media-gfx/rawtherapee-5.3
new file mode 100644
index 000000000000..5079ba150dcb
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/rawtherapee-5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=x11-libs/gtk+:3 dev-libs/expat dev-libs/libsigc++:2 media-libs/libcanberra[gtk3] media-libs/tiff:0 media-libs/libpng:0 media-libs/libiptcdata media-libs/lcms:2 media-libs/lensfun sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0 app-arch/xz-utils virtual/pkgconfig dev-cpp/gtkmm:3.0 sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A powerful cross-platform raw image processing program
+EAPI=6
+HOMEPAGE=http://www.rawtherapee.com/
+IUSE=openmp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=x11-libs/gtk+:3 dev-libs/expat dev-libs/libsigc++:2 media-libs/libcanberra[gtk3] media-libs/tiff:0 media-libs/libpng:0 media-libs/libiptcdata media-libs/lcms:2 media-libs/lensfun sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0
+SLOT=0
+SRC_URI=http://rawtherapee.com/shared/source/rawtherapee-5.3.tar.xz
+_eclasses_=cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=954ed9f728e3450667bbc7d88942fa3e
diff --git a/metadata/md5-cache/media-libs/faac-1.29.7.3 b/metadata/md5-cache/media-libs/faac-1.29.7.7
similarity index 93%
rename from metadata/md5-cache/media-libs/faac-1.29.7.3
rename to metadata/md5-cache/media-libs/faac-1.29.7.7
index bc416b173510..cc9845139fa8 100644
--- a/metadata/md5-cache/media-libs/faac-1.29.7.3
+++ b/metadata/md5-cache/media-libs/faac-1.29.7.7
@@ -7,6 +7,6 @@ IUSE=digitalradio static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=LGPL-2.1 MPEG-4
SLOT=0
-SRC_URI=mirror://sourceforge/faac/faac-1.29.7.3.tar.gz
+SRC_URI=mirror://sourceforge/faac/faac-1.29.7.7.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx e99babeaa7d98c1caaa6a61a79902210 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=48434ef8f4ec8f4d146ff217492b061c
+_md5_=9eca13969aa725c0c8199cb3289948c0
diff --git a/metadata/md5-cache/media-libs/faad2-2.8.5 b/metadata/md5-cache/media-libs/faad2-2.8.5
new file mode 100644
index 000000000000..682c9fa4a67e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/faad2-2.8.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=AAC audio decoding library
+EAPI=6
+HOMEPAGE=http://www.audiocoding.com/faad2.html
+IUSE=digitalradio 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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://sourceforge/faac/faad2-2.8.5.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=f8aecdc4862729e6c1b5c0d90687bbd0
diff --git a/metadata/md5-cache/media-libs/jbig2dec-0.13-r4 b/metadata/md5-cache/media-libs/jbig2dec-0.13-r4
index 055f9c248ade..26b80bfc8145 100644
--- a/metadata/md5-cache/media-libs/jbig2dec-0.13-r4
+++ b/metadata/md5-cache/media-libs/jbig2dec-0.13-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A decoder implementation of the JBIG2 image compression format
EAPI=6
HOMEPAGE=http://ghostscript.com/jbig2dec.html
IUSE=png static-libs test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
LICENSE=AGPL-3
RDEPEND=png? ( media-libs/libpng:0= )
RESTRICT=test
SLOT=0
SRC_URI=http://downloads.ghostscript.com/public/jbig2dec/jbig2dec-0.13.tar.gz test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )
-_md5_=9495288e12a029099f9a50b2fe0e842b
+_md5_=17bca3db5382746b67561c53004f76f9
diff --git a/metadata/md5-cache/media-libs/liblo-0.29 b/metadata/md5-cache/media-libs/liblo-0.29
index 905e8e18cb1c..24b2759832d8 100644
--- a/metadata/md5-cache/media-libs/liblo-0.29
+++ b/metadata/md5-cache/media-libs/liblo-0.29
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight OSC (Open Sound Control) implementation
EAPI=6
HOMEPAGE=http://plugin.org.uk/liblo
IUSE=doc ipv6 static-libs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos
+KEYWORDS=~amd64 ppc ~ppc64 ~x86 ~ppc-macos
LICENSE=LGPL-2.1
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/liblo/liblo-0.29.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=e8ee38907cb0cc50d11554f43b9dcbb1
+_md5_=ef5fc776318130988dbaab6e337659a9
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.11 b/metadata/md5-cache/media-libs/libmtp-1.1.14
similarity index 80%
rename from metadata/md5-cache/media-libs/libmtp-1.1.11
rename to metadata/md5-cache/media-libs/libmtp-1.1.14
index d283b0fabdda..bf53a24d8750 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.11
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.14
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install prepare setup
DEPEND=virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= ) virtual/pkgconfig doc? ( app-doc/doxygen ) virtual/pkgconfig
DESCRIPTION=An implementation of Microsoft's Media Transfer Protocol (MTP)
-EAPI=5
+EAPI=6
HOMEPAGE=http://libmtp.sourceforge.net/
IUSE=+crypt doc examples static-libs
-KEYWORDS=amd64 ~arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
LICENSE=LGPL-2.1
RDEPEND=virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
SLOT=0/9
-SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.11.tar.gz
+SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.14.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7
-_md5_=4b7cce18a217b3fcfcd770ca8e2bfa35
+_md5_=baef03001443ca2120019357bcba1100
diff --git a/metadata/md5-cache/media-libs/libopenshot-0.1.8 b/metadata/md5-cache/media-libs/libopenshot-0.1.8
new file mode 100644
index 000000000000..fd0528773a90
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libopenshot-0.1.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=net-libs/cppzmq dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] media-libs/libopenshot-audio imagemagick? ( =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(+)?] ) python? ( dev-lang/swig ) test? ( dev-libs/unittest++ ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Video editing library used by OpenShot
+EAPI=6
+HOMEPAGE=http://www.openshotvideo.com/
+IUSE=+imagemagick libav +python test 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 ~x86
+LICENSE=GPL-3
+RDEPEND=net-libs/cppzmq dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] media-libs/libopenshot-audio imagemagick? ( =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(+)?] )
+REQUIRED_USE=python? ( ^^ ( 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=test
+SLOT=0
+SRC_URI=https://github.com/OpenShot/libopenshot/archive/v0.1.8.tar.gz -> libopenshot-0.1.8.tar.gz
+_eclasses_=cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8a0a8f266f0e308857af849166def8ba
diff --git a/metadata/md5-cache/media-plugins/vdr-skinnopacity-1.1.1-r1 b/metadata/md5-cache/media-plugins/vdr-skinnopacity-1.1.1-r1
deleted file mode 100644
index 980843760e49..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-skinnopacity-1.1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=net-misc/curl dev-libs/libxml2 virtual/imagemagick-tools media-plugins/vdr-epgsearch virtual/pkgconfig >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Skin Plugin: customizable native true color skin for the Video Disc Recorder
-EAPI=5
-HOMEPAGE=http://projects.vdr-developer.org/projects/skin-nopacity/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-misc/curl dev-libs/libxml2 virtual/imagemagick-tools media-plugins/vdr-epgsearch >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=mirror://vdr-developerorg/1671/vdr-skinnopacity-1.1.1.tgz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 vdr-plugin-2 786b4f5aa9f17e2d5cec5e628f462c01
-_md5_=6a933e8653111b38b7634e1b995480a7
diff --git a/metadata/md5-cache/media-plugins/vdr-skinnopacity-1.1.3-r1 b/metadata/md5-cache/media-plugins/vdr-skinnopacity-1.1.3-r1
deleted file mode 100644
index 2d209efc41b0..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-skinnopacity-1.1.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=net-misc/curl dev-libs/libxml2 virtual/imagemagick-tools media-plugins/vdr-epgsearch virtual/pkgconfig >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Skin Plugin: customizable native true color skin for the Video Disc Recorder
-EAPI=5
-HOMEPAGE=http://projects.vdr-developer.org/projects/skin-nopacity/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-misc/curl dev-libs/libxml2 virtual/imagemagick-tools media-plugins/vdr-epgsearch >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=mirror://vdr-developerorg/1743/vdr-skinnopacity-1.1.3.tgz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 vdr-plugin-2 786b4f5aa9f17e2d5cec5e628f462c01
-_md5_=84b78338ca5e3299e4ebc4f7c6f29b63
diff --git a/metadata/md5-cache/media-video/openshot-2.4.0 b/metadata/md5-cache/media-video/openshot-2.4.0
new file mode 100644
index 000000000000..41c81919deb3
--- /dev/null
+++ b/metadata/md5-cache/media-video/openshot-2.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-python/setuptools[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(+)?] python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=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(+)?] >=sys-apps/sed-4
+DESCRIPTION=Free, open-source, non-linear video editor to create and edit videos and movies
+EAPI=6
+HOMEPAGE=http://www.openshot.org/ https://launchpad.net/openshot
+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 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/PyQt5[svg,webkit,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(+)?] >=media-libs/libopenshot-0.1.8[python,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(+)?] dev-python/httplib2[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(+)?] dev-python/pyzmq[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(+)?] python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=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(+)?]
+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 )
+SLOT=1
+SRC_URI=https://launchpad.net/openshot/2.4/2.4.0/+download/openshot-qt-2.4.0.tar.gz
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=549eb2c33b43053754f8343633640313
diff --git a/metadata/md5-cache/net-dialup/gtkterm-0.99.7_rc1 b/metadata/md5-cache/net-dialup/gtkterm-0.99.7_rc1
deleted file mode 100644
index 8315374f9a48..000000000000
--- a/metadata/md5-cache/net-dialup/gtkterm-0.99.7_rc1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/gtk+-2.16:2 >=x11-libs/vte-0.20:0 >=dev-util/intltool-0.40 virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A serial port terminal written in GTK+, similar to Windows' HyperTerminal
-EAPI=5
-HOMEPAGE=https://fedorahosted.org/gtkterm/
-IUSE=nls linguas_fr linguas_hu
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.16:2 >=x11-libs/vte-0.20:0
-SLOT=0
-SRC_URI=https://fedorahosted.org/released/gtkterm/gtkterm-0.99.7-rc1.tar.gz
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=683769bcb2e7993bfe7929e8bb6e96a0
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.78 b/metadata/md5-cache/net-dns/dnsmasq-2.78
index 07de1720dc80..c080960bcc96 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.78
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.78
@@ -4,11 +4,11 @@ DESCRIPTION=Small forwarding DNS server
EAPI=6
HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify ipv6 lua nls script selinux static tftp linguas_de linguas_es linguas_fi linguas_fr linguas_id linguas_it linguas_no linguas_pl linguas_pt_BR linguas_ro
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
LICENSE=|| ( GPL-2 GPL-3 )
RDEPEND=dbus? ( sys-apps/dbus ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( >=net-dns/libidn2-2.0 ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn )
SLOT=0
SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.78.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7
-_md5_=6edd78e062d41b107ad0a2a189663ea6
+_md5_=512a89bbd76b0baf65adc42285a7e04e
diff --git a/metadata/md5-cache/net-dns/libidn2-2.0.4 b/metadata/md5-cache/net-dns/libidn2-2.0.4
index dddc14ca7fe7..b891ffb8e00e 100644
--- a/metadata/md5-cache/net-dns/libidn2-2.0.4
+++ b/metadata/md5-cache/net-dns/libidn2-2.0.4
@@ -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.4.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=aeebefee2d8a9c3c0502a1e4745e8007
+_md5_=f2626463f714cf609c5934c2a0409e45
diff --git a/metadata/md5-cache/net-dns/s6-dns-2.2.0.1 b/metadata/md5-cache/net-dns/s6-dns-2.2.0.1
new file mode 100644
index 000000000000..1022f84c4253
--- /dev/null
+++ b/metadata/md5-cache/net-dns/s6-dns-2.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-libs/skalibs-2.6.0.0[static-libs] ) !static? ( >=dev-libs/skalibs-2.6.0.0 )
+DESCRIPTION=suite of DNS client programs and libraries for Unix systems
+EAPI=6
+HOMEPAGE=https://www.skarnet.org/software/s6-dns/
+IUSE=static static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=!static? ( >=dev-libs/skalibs-2.6.0.0:= )
+SLOT=0/2.2
+SRC_URI=https://www.skarnet.org/software/s6-dns/s6-dns-2.2.0.1.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c54486e5842df40ebb6e91558b1482ca
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r2 b/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r2
index 5e81bb22bcee..36c0accc4a6c 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r2
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r2
@@ -10,4 +10,4 @@ RDEPEND=net-firewall/iptables snmp? ( net-analyzer/net-snmp ) kernel_linux? ( vi
SLOT=0
SRC_URI=mirror://sourceforge/ipt-netflow/ipt-netflow-2.2.tgz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fa8a2eea43da574981b53e2a6afa998e
+_md5_=1934ef93dc1df21b49b047140f85aa7d
diff --git a/metadata/md5-cache/net-fs/openafs-1.6.21-r1 b/metadata/md5-cache/net-fs/openafs-1.6.21-r1
index dcde16e2ae11..bf1a2b803fa9 100644
--- a/metadata/md5-cache/net-fs/openafs-1.6.21-r1
+++ b/metadata/md5-cache/net-fs/openafs-1.6.21-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenAFS distributed file system
EAPI=6
HOMEPAGE=https://www.openafs.org/
IUSE=bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups
-KEYWORDS=~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=IBM BSD openafs-krb5-a APSL-2
RDEPEND=virtual/libintl fuse? ( sys-fs/fuse ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) pam? ( virtual/pam ) modules? ( ~net-fs/openafs-kernel-1.6.21 )
SLOT=0
SRC_URI=https://openafs.org/dl/openafs/1.6.21/openafs-1.6.21-src.tar.bz2 https://openafs.org/dl/openafs/1.6.21/openafs-1.6.21-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170822.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9fbc4d0b2a9dfd236551ed32bea9aa2c
+_md5_=6aff462e1ef2f7334be2946704f4a8b2
diff --git a/metadata/md5-cache/net-ftp/ncftp-3.2.6 b/metadata/md5-cache/net-ftp/ncftp-3.2.6
index e175cc28a3f5..6ed27125bc40 100644
--- a/metadata/md5-cache/net-ftp/ncftp-3.2.6
+++ b/metadata/md5-cache/net-ftp/ncftp-3.2.6
@@ -4,10 +4,10 @@ DESCRIPTION=An extremely configurable ftp client
EAPI=6
HOMEPAGE=http://www.ncftp.com/
IUSE=pch
-KEYWORDS=alpha ~amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
LICENSE=Clarified-Artistic
RDEPEND=sys-libs/ncurses:*
SLOT=0
SRC_URI=ftp://ftp.ncftp.com/ncftp/ncftp-3.2.6-src.tar.xz -> ncftp-3.2.6.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=617ce6a2888131122d76ac6dca6d39be
+_md5_=03917affb2ec9da44acf017b0efc029c
diff --git a/metadata/md5-cache/net-irc/weechat-1.9.1 b/metadata/md5-cache/net-irc/weechat-1.9.1
index b2c25e5642be..d40e7979b210 100644
--- a/metadata/md5-cache/net-irc/weechat-1.9.1
+++ b/metadata/md5-cache/net-irc/weechat-1.9.1
@@ -4,7 +4,7 @@ DESCRIPTION=Portable and multi-interface IRC client
EAPI=6
HOMEPAGE=https://weechat.org/
IUSE=doc nls +ssl test linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_tr guile lua +perl +python ruby tcl +alias +buflist +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer +irc 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
+KEYWORDS=amd64 x86 ~x64-macos
LICENSE=GPL-3
RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) 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(+)?] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
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 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://weechat.org/files/src/weechat-1.9.1.tar.xz
_eclasses_=cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=935112de790416ba6e06ad7f5c934acf
+_md5_=3ebc741533e733589ea09b5d40154c26
diff --git a/metadata/md5-cache/net-libs/libtirpc-1.0.2-r1 b/metadata/md5-cache/net-libs/libtirpc-1.0.2-r1
index 86d9b3869082..455e269f3478 100644
--- a/metadata/md5-cache/net-libs/libtirpc-1.0.2-r1
+++ b/metadata/md5-cache/net-libs/libtirpc-1.0.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Transport Independent RPC library (SunRPC replacement)
EAPI=5
HOMEPAGE=http://libtirpc.sourceforge.net/
IUSE=ipv6 kerberos 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 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=kerberos? ( >=virtual/krb5-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/3
SRC_URI=mirror://sourceforge/libtirpc/libtirpc-1.0.2.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=09bcd6ac5f1ddaa9dd035d50b3828f9d
+_md5_=0dc4951b0d27ff08579ac5514f8e234e
diff --git a/metadata/md5-cache/net-misc/asterisk-13.17.2 b/metadata/md5-cache/net-misc/asterisk-13.17.2
index 8e149edcacaa..756d0b27d19b 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.17.2
+++ b/metadata/md5-cache/net-misc/asterisk-13.17.2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:= ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig pjproject? ( >=net-libs/pjproject-2.6 ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig pjproject? ( >=net-libs/pjproject-2.6 ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
DESCRIPTION=Asterisk: A Modular Open Source PBX System
EAPI=6
HOMEPAGE=http://www.asterisk.org/
@@ -7,9 +7,9 @@ IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
PDEPEND=net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound
-RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:= ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
+RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
SLOT=0
SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.17.2.tar.gz mirror://gentoo/gentoo-asterisk-patchset-4.05.tar.bz2
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d2d5e7017405e630dc13a8f63f7413d6
+_md5_=4eb22b086cdbcced663f2106dc57c2db
diff --git a/metadata/md5-cache/net-misc/axel-2.14.1 b/metadata/md5-cache/net-misc/axel-2.14.1
new file mode 100644
index 000000000000..f62af5748161
--- /dev/null
+++ b/metadata/md5-cache/net-misc/axel-2.14.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst prepare
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Light Unix download accelerator
+EAPI=6
+HOMEPAGE=https://github.com/axel-download-accelerator/axel
+IUSE=debug libressl nls ssl
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris
+LICENSE=GPL-2
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( virtual/libintl virtual/libiconv )
+REQUIRED_USE=libressl? ( ssl )
+SLOT=0
+SRC_URI=https://github.com/axel-download-accelerator/axel/archive/v2.14.1.tar.gz -> axel-2.14.1.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=985e7c8aeae1f20532cb79d192a87660
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.8.1 b/metadata/md5-cache/net-misc/openvswitch-2.8.1
new file mode 100644
index 000000000000..43921d8f2bf6
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openvswitch-2.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
+DEPEND=|| ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) ssl? ( dev-libs/openssl: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_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/ovs-2.7.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/twisted[conch,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/twisted-web[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/zope-interface[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(-)] debug? ( dev-lang/perl ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DESCRIPTION=Production quality, multilayer virtual switch
+EAPI=6
+HOMEPAGE=http://openvswitch.org
+IUSE=debug modules monitor +ssl kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=|| ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) ssl? ( dev-libs/openssl: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_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/ovs-2.7.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/twisted[conch,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/twisted-web[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/zope-interface[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(-)] debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=http://openvswitch.org/releases/openvswitch-2.8.1.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=28cb4bc1796848204f9026a7f668a1d1
diff --git a/metadata/md5-cache/net-misc/s6-networking-2.3.0.2 b/metadata/md5-cache/net-misc/s6-networking-2.3.0.2
new file mode 100644
index 000000000000..1358a5536abf
--- /dev/null
+++ b/metadata/md5-cache/net-misc/s6-networking-2.3.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-lang/execline-2.3.0.2[static-libs] >=dev-libs/skalibs-2.6.0.0[static-libs] >=net-dns/s6-dns-2.2.0.1[static-libs] >=sys-apps/s6-2.6.1.0[static-libs] ssl? ( >=dev-libs/libressl-2.4.5[static-libs] ) ) !static? ( >=dev-lang/execline-2.3.0.2[static=] >=dev-libs/skalibs-2.6.0.0 >=net-dns/s6-dns-2.2.0.1[static=] >=sys-apps/s6-2.6.1.0[static=] ssl? ( >=dev-libs/libressl-2.4.5 ) )
+DESCRIPTION=suite of small networking utilities for Unix systems
+EAPI=6
+HOMEPAGE=https://www.skarnet.org/software/s6-networking/
+IUSE=ssl static static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/execline-2.3.0.2:=[!static?] >=sys-apps/s6-2.6.1.0:=[!static?] !static? ( >=dev-libs/skalibs-2.6.0.0:= >=net-dns/s6-dns-2.2.0.1:= ssl? ( >=dev-libs/libressl-2.4.5:= ) )
+SLOT=0/2.3
+SRC_URI=https://www.skarnet.org/software/s6-networking/s6-networking-2.3.0.2.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=418f08c22eba8310db5ce2dfbd81a8a4
diff --git a/metadata/md5-cache/net-misc/spiped-1.5.0-r1 b/metadata/md5-cache/net-misc/spiped-1.5.0-r1
deleted file mode 100644
index b218615d75af..000000000000
--- a/metadata/md5-cache/net-misc/spiped-1.5.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=dev-libs/openssl:*
-DESCRIPTION=secure pipe daemon
-EAPI=5
-HOMEPAGE=http://www.tarsnap.com/spiped.html
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:* !net-mail/qlogtools
-SLOT=0
-SRC_URI=http://www.tarsnap.com/spiped/spiped-1.5.0.tgz
-_md5_=e8d698f4030364b3d29e62572224c76f
diff --git a/metadata/md5-cache/net-misc/spiped-1.5.0-r2 b/metadata/md5-cache/net-misc/spiped-1.5.0-r2
deleted file mode 100644
index ffc56edb6601..000000000000
--- a/metadata/md5-cache/net-misc/spiped-1.5.0-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=dev-libs/openssl:*
-DESCRIPTION=secure pipe daemon
-EAPI=6
-HOMEPAGE=http://www.tarsnap.com/spiped.html
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:* !net-mail/qlogtools
-SLOT=0
-SRC_URI=http://www.tarsnap.com/spiped/spiped-1.5.0.tgz
-_md5_=0b73e7877e6a9a1d99e8909060ef75a4
diff --git a/metadata/md5-cache/net-misc/spiped-1.5.0-r3 b/metadata/md5-cache/net-misc/spiped-1.5.0-r3
deleted file mode 100644
index 25f796c50082..000000000000
--- a/metadata/md5-cache/net-misc/spiped-1.5.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=secure pipe daemon
-EAPI=6
-HOMEPAGE=http://www.tarsnap.com/spiped.html
-IUSE=libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !net-mail/qlogtools
-SLOT=0
-SRC_URI=http://www.tarsnap.com/spiped/spiped-1.5.0.tgz
-_md5_=98fa3526bd374b4b903572b4610070c4
diff --git a/metadata/md5-cache/net-misc/spiped-1.6.0 b/metadata/md5-cache/net-misc/spiped-1.6.0
deleted file mode 100644
index 0f39298d8910..000000000000
--- a/metadata/md5-cache/net-misc/spiped-1.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=secure pipe daemon
-EAPI=6
-HOMEPAGE=http://www.tarsnap.com/spiped.html
-IUSE=libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !net-mail/qlogtools
-SLOT=0
-SRC_URI=http://www.tarsnap.com/spiped/spiped-1.6.0.tgz
-_md5_=98fa3526bd374b4b903572b4610070c4
diff --git a/metadata/md5-cache/net-misc/spiped-1.6.0-r1 b/metadata/md5-cache/net-misc/spiped-1.6.0-r1
index 74e3679a4cff..37897c838d51 100644
--- a/metadata/md5-cache/net-misc/spiped-1.6.0-r1
+++ b/metadata/md5-cache/net-misc/spiped-1.6.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=secure pipe daemon
EAPI=6
HOMEPAGE=http://www.tarsnap.com/spiped.html
IUSE=libressl
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !net-mail/qlogtools
SLOT=0
SRC_URI=http://www.tarsnap.com/spiped/spiped-1.6.0.tgz
-_md5_=197a6d04ba574ff32a3342a4593fceb5
+_md5_=8eee854431af46b03b103af561e0ce2a
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2017.09.15 b/metadata/md5-cache/net-misc/youtube-dl-2017.10.01
similarity index 95%
rename from metadata/md5-cache/net-misc/youtube-dl-2017.09.15
rename to metadata/md5-cache/net-misc/youtube-dl-2017.10.01
index d80605263a9f..769cdca00b8e 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2017.09.15
+++ b/metadata/md5-cache/net-misc/youtube-dl-2017.10.01
@@ -9,6 +9,6 @@ LICENSE=public-domain
RDEPEND=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-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=http://youtube-dl.org/downloads/2017.09.15/youtube-dl-2017.09.15.tar.gz
+SRC_URI=http://youtube-dl.org/downloads/2017.10.01/youtube-dl-2017.10.01.tar.gz
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f26d4f62a286cb185ccde00c8ef8632a
+_md5_=34313dda9d0bc4ea708bbd95bfbaa3d1
diff --git a/metadata/md5-cache/net-nntp/nzbget-20.0_pre2108 b/metadata/md5-cache/net-nntp/nzbget-20.0_pre2108
new file mode 100644
index 000000000000..24438a4418a6
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/nzbget-20.0_pre2108
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst preinst prepare pretend setup test
+DEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0= ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A command-line based binary newsgrabber supporting .nzb files
+EAPI=6
+HOMEPAGE=https://nzbget.net/
+IUSE=debug gnutls ncurses parcheck ssl test zlib
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0= ) ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=https://github.com/nzbget/nzbget/releases/download/v20.0-r2108/nzbget-20.0-testing-r2108-src.tar.gz -> nzbget-20.0_pre2108.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7
+_md5_=cfcea0ce803918cd126f8120d84f971d
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.0.10 b/metadata/md5-cache/net-vpn/tor-0.3.0.10
index 196125b9c059..6d3b42ce9ba6 100644
--- a/metadata/md5-cache/net-vpn/tor-0.3.0.10
+++ b/metadata/md5-cache/net-vpn/tor-0.3.0.10
@@ -4,10 +4,10 @@ DESCRIPTION=Anonymizing overlay network for TCP
EAPI=6
HOMEPAGE=http://www.torproject.org/
IUSE=libressl scrypt seccomp selinux systemd tor-hardening test web
-KEYWORDS=amd64 arm ~mips ~ppc ppc64 ~sparc x86 ~ppc-macos
+KEYWORDS=amd64 arm ~mips ppc ppc64 ~sparc x86 ~ppc-macos
LICENSE=BSD GPL-2
RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-tor )
SLOT=0
SRC_URI=https://www.torproject.org/dist/tor-0.3.0.10.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.0.10.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0baa8e0c20f8a0e00b26bb9c8367f70f
+_md5_=8054d84d23572dee266c522939b6539f
diff --git a/metadata/md5-cache/net-vpn/wireguard-0.0.20171001 b/metadata/md5-cache/net-vpn/wireguard-0.0.20171001
index 93e11a9c2197..1805aab1e4e6 100644
--- a/metadata/md5-cache/net-vpn/wireguard-0.0.20171001
+++ b/metadata/md5-cache/net-vpn/wireguard-0.0.20171001
@@ -10,4 +10,4 @@ RDEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils )
SLOT=0
SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20171001.tar.xz
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fe062d2d3335c7ec93a0262f6c9826b8
+_md5_=15e81fb4a0ad2f3a499fa16225bed975
diff --git a/metadata/md5-cache/net-vpn/wireguard-9999 b/metadata/md5-cache/net-vpn/wireguard-9999
index effaf6f7602f..b2a85b19e688 100644
--- a/metadata/md5-cache/net-vpn/wireguard-9999
+++ b/metadata/md5-cache/net-vpn/wireguard-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
RDEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) )
SLOT=0
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 git-r3 52a888802d25387c2c74cb845d1219bc linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fe062d2d3335c7ec93a0262f6c9826b8
+_md5_=15e81fb4a0ad2f3a499fa16225bed975
diff --git a/metadata/md5-cache/sci-calculators/units-2.14-r1 b/metadata/md5-cache/sci-calculators/units-2.14-r1
index 19fcf5359c3f..240f59943669 100644
--- a/metadata/md5-cache/sci-calculators/units-2.14-r1
+++ b/metadata/md5-cache/sci-calculators/units-2.14-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Unit conversion program
EAPI=6
HOMEPAGE=https://www.gnu.org/software/units/units.html
IUSE=+units_cur 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=~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=FDL-1.3 GPL-3
RDEPEND=sys-libs/readline:= units_cur? ( dev-python/unidecode[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(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_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_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(+)?] )
REQUIRED_USE=units_cur? ( ^^ ( 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=0
SRC_URI=mirror://gnu/units/units-2.14.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=e205f25f98951593d43843c500171174
+_md5_=1e07014bfc1c2a33bc2b25d8d4a2942f
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.4.1-r1 b/metadata/md5-cache/sys-apps/baselayout-2.4.1-r1
deleted file mode 100644
index 1a41c2366d68..000000000000
--- a/metadata/md5-cache/sys-apps/baselayout-2.4.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare setup
-DESCRIPTION=Filesystem baselayout and init scripts
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-IUSE=build kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.4.1.tar.bz2
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a1a1548e1f9d84d497df5a7b77dbe09c
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2 b/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
index eacd4d0a127f..70cd25ed2f77 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
+++ b/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
@@ -8,4 +8,4 @@ LICENSE=GPL-2
SLOT=0
SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.4.1.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e prefix 7b6fb2fc216b101b5d97d171925a847c toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6de7c53df4a48c8f56b338cc781f4832
+_md5_=ac5951f7b6e5ce6a6a6a2ea2b42f2d16
diff --git a/metadata/md5-cache/sys-apps/gentoo-functions-0.10 b/metadata/md5-cache/sys-apps/gentoo-functions-0.10
deleted file mode 100644
index 384642d870c4..000000000000
--- a/metadata/md5-cache/sys-apps/gentoo-functions-0.10
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=base functions required by all gentoo systems
-EAPI=5
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~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=GPL-2
-SLOT=0
-SRC_URI=https://github.com/gentoo/gentoo-functions/archive/0.10.tar.gz -> gentoo-functions-0.10.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=cc01aa864edd309c650083e2dd67b1fd
diff --git a/metadata/md5-cache/sys-apps/gentoo-functions-0.11 b/metadata/md5-cache/sys-apps/gentoo-functions-0.11
deleted file mode 100644
index 574f9e21a8e2..000000000000
--- a/metadata/md5-cache/sys-apps/gentoo-functions-0.11
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=base functions required by all Gentoo systems
-EAPI=5
-HOMEPAGE=https://www.gentoo.org
-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=GPL-2
-SLOT=0
-SRC_URI=https://github.com/gentoo/gentoo-functions/archive/0.11.tar.gz -> gentoo-functions-0.11.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=c0c786154f7f8f279bd48905c9ed0c69
diff --git a/metadata/md5-cache/sys-apps/hwids-20171003 b/metadata/md5-cache/sys-apps/hwids-20171003
new file mode 100644
index 000000000000..73e94e421619
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hwids-20171003
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Hardware (PCI, USB, OUI, IAB) IDs databases
+EAPI=6
+HOMEPAGE=https://github.com/gentoo/hwids
+IUSE=+net +pci +udev +usb
+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
+LICENSE=|| ( GPL-2 BSD ) public-domain
+RDEPEND=udev? ( virtual/udev ) !=virtual/udev-206 ) udev? ( net-misc/curl ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=net-misc/curl udev? ( || ( ( dev-lang/python:3.6 dev-python/pyparsing[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1
DESCRIPTION=Hardware (PCI, USB, OUI, IAB) IDs databases
EAPI=6
HOMEPAGE=https://github.com/gentoo/hwids
IUSE=+net +pci +udev +usb
LICENSE=|| ( GPL-2 BSD ) public-domain
-RDEPEND=! lm_sensors-3.4.0_p20160725.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=be6cdf5ab6a807aed4a53284dca5c85a
+_md5_=5244d178883f4551e00f1a30a2dff1f5
diff --git a/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20170901 b/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20170901
new file mode 100644
index 000000000000..72f0ffe28ab7
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20170901
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) sys-devel/bison sys-devel/flex virtual/pkgconfig
+DESCRIPTION=Hardware Monitoring user-space utilities
+EAPI=6
+HOMEPAGE=https://hwmon.wiki.kernel.org/ https://github.com/groeck/lm-sensors
+IUSE=contrib sensord 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2.1
+RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl ! lm_sensors-3.4.0_p20170901.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6336406f5c85ac3b29d9b80859e0aaf4
diff --git a/metadata/md5-cache/sys-apps/more-2.12r b/metadata/md5-cache/sys-apps/more-2.12r
deleted file mode 100644
index d6e8087830b8..000000000000
--- a/metadata/md5-cache/sys-apps/more-2.12r
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 ) selinux? ( sys-libs/libselinux ) !sys-apps/util-linux static? ( >=sys-libs/ncurses-5.2-r2[static-libs] ) nls? ( sys-devel/gettext )
-DESCRIPTION=Primitive text file viewer
-EAPI=2
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
-IUSE=static nls selinux
-KEYWORDS=~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 ) selinux? ( sys-libs/libselinux ) !sys-apps/util-linux
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/util-linux/util-linux-2.12r.tar.bz2
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=cbe05f6c820674d5d8dce287f35820f9
diff --git a/metadata/md5-cache/sys-apps/s6-2.6.1.0 b/metadata/md5-cache/sys-apps/s6-2.6.1.0
new file mode 100644
index 000000000000..d27f1805992b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-2.6.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-lang/execline-2.3.0.2[static-libs] >=dev-libs/skalibs-2.6.0.0[static-libs] ) !static? ( >=dev-lang/execline-2.3.0.2[static=] >=dev-libs/skalibs-2.6.0.0 )
+DESCRIPTION=skarnet.org's small and secure supervision software suite
+EAPI=6
+HOMEPAGE=https://www.skarnet.org/software/s6/
+IUSE=static static-libs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/execline-2.3.0.2:=[!static?] !static? ( >=dev-libs/skalibs-2.6.0.0:= )
+SLOT=0/2.6
+SRC_URI=https://www.skarnet.org/software/s6/s6-2.6.1.0.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e1c706f115dde5b0949ac0a25bc0c8f2
diff --git a/metadata/md5-cache/sys-apps/s6-linux-init-0.3.1.0 b/metadata/md5-cache/sys-apps/s6-linux-init-0.3.1.0
new file mode 100644
index 000000000000..0ead5a64a99d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-linux-init-0.3.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure postinst prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-libs/skalibs-2.6.0.0[static-libs] ) !static? ( >=dev-libs/skalibs-2.6.0.0 )
+DESCRIPTION=Generates an init binary for s6-based init systems
+EAPI=6
+HOMEPAGE=https://www.skarnet.org/software/s6-linux-init/
+IUSE=static
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/execline-2.3.0.2 >=sys-apps/s6-2.6.1.0 >=sys-apps/s6-linux-utils-2.4.0.0 >=sys-apps/s6-portable-utils-2.2.1.1 !static? ( >=dev-libs/skalibs-2.6.0.0:= )
+SLOT=0
+SRC_URI=https://www.skarnet.org/software/s6-linux-init/s6-linux-init-0.3.1.0.tar.gz
+_md5_=2f8223c41523105da8c5f70c34e15fe1
diff --git a/metadata/md5-cache/sys-apps/s6-linux-utils-2.4.0.1 b/metadata/md5-cache/sys-apps/s6-linux-utils-2.4.0.1
new file mode 100644
index 000000000000..ba0ede667de3
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-linux-utils-2.4.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-libs/skalibs-2.6.0.0[static-libs] ) !static? ( >=dev-libs/skalibs-2.6.0.0 )
+DESCRIPTION=set of tiny linux utilities
+EAPI=6
+HOMEPAGE=https://www.skarnet.org/software/s6-linux-utils/
+IUSE=static
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=!static? ( >=dev-libs/skalibs-2.6.0.0:= )
+SLOT=0
+SRC_URI=https://www.skarnet.org/software/s6-linux-utils/s6-linux-utils-2.4.0.1.tar.gz
+_md5_=e2bc2265fb1ebf4f0d004d7a3e057273
diff --git a/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.1.1 b/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.1.1
new file mode 100644
index 000000000000..0de039bbd43b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-libs/skalibs-2.6.0.0[static-libs] ) !static? ( >=dev-libs/skalibs-2.6.0.0 )
+DESCRIPTION=set of tiny portable unix utilities
+EAPI=6
+HOMEPAGE=https://www.skarnet.org/software/s6-portable-utils/
+IUSE=static
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=!static? ( >=dev-libs/skalibs-2.6.0.0:= )
+SLOT=0
+SRC_URI=https://www.skarnet.org/software/s6-portable-utils/s6-portable-utils-2.2.1.1.tar.gz
+_md5_=eb1b37d99c056ca4ea80da84313df5cf
diff --git a/metadata/md5-cache/sys-apps/s6-rc-0.2.1.2 b/metadata/md5-cache/sys-apps/s6-rc-0.2.1.2
new file mode 100644
index 000000000000..2055c7cb3508
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-rc-0.2.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-lang/execline-2.3.0.2[static-libs] >=dev-libs/skalibs-2.6.0.0[static-libs] >=sys-apps/s6-2.6.1.0[static-libs] ) !static? ( >=dev-lang/execline-2.3.0.2[static=] >=dev-libs/skalibs-2.6.0.0 >=sys-apps/s6-2.6.1.0[static=] )
+DESCRIPTION=service manager for the s6 supervision suite
+EAPI=6
+HOMEPAGE=https://www.skarnet.org/software/s6-rc/
+IUSE=static static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/execline-2.3.0.2:=[!static?] >=sys-apps/s6-2.6.1.0:=[!static?] !static? ( >=dev-libs/skalibs-2.6.0.0:= )
+SLOT=0/0.2
+SRC_URI=https://www.skarnet.org/software/s6-rc/s6-rc-0.2.1.2.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=52d7be1cfadabcdc35aa14704e3702a8
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.10-r1 b/metadata/md5-cache/sys-apps/sandbox-2.10-r1
deleted file mode 100644
index 293852ce2061..000000000000
--- a/metadata/md5-cache/sys-apps/sandbox-2.10-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst test unpack
-DEPEND=app-arch/xz-utils >=app-misc/pax-utils-0.1.19
-DESCRIPTION=sandbox'd LD_PRELOAD hack
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
-IUSE=multilib
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/sandbox-2.10.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.10.tar.xz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e pax-utils 4f95120230a315c8caaabeb2307b7eee toolchain-funcs 185a06792159ca143528e7010368e8af unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=970362b701f9f23297afa129599ee135
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.10-r2 b/metadata/md5-cache/sys-apps/sandbox-2.10-r2
deleted file mode 100644
index ec1ad0f5c9b6..000000000000
--- a/metadata/md5-cache/sys-apps/sandbox-2.10-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=app-arch/xz-utils >=app-misc/pax-utils-0.1.19
-DESCRIPTION=sandbox'd LD_PRELOAD hack
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
-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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/sandbox-2.10.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.10.tar.xz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 6f5991c7101863d0b29df63990ad852e pax-utils 4f95120230a315c8caaabeb2307b7eee toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=87f88181f6e3be5b4bf827cba6ca16b2
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.11-r3 b/metadata/md5-cache/sys-apps/sandbox-2.11-r3
deleted file mode 100644
index c2feb3f4085a..000000000000
--- a/metadata/md5-cache/sys-apps/sandbox-2.11-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=app-arch/xz-utils >=app-misc/pax-utils-0.1.19
-DESCRIPTION=sandbox'd LD_PRELOAD hack
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
-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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/sandbox-2.11.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.11.tar.xz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 6f5991c7101863d0b29df63990ad852e pax-utils 4f95120230a315c8caaabeb2307b7eee toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=0640c8b2759ca019d42979b31260af11
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.11-r5 b/metadata/md5-cache/sys-apps/sandbox-2.11-r5
deleted file mode 100644
index 36da81ba053a..000000000000
--- a/metadata/md5-cache/sys-apps/sandbox-2.11-r5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=app-arch/xz-utils >=app-misc/pax-utils-0.1.19
-DESCRIPTION=sandbox'd LD_PRELOAD hack
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
-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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/sandbox-2.11.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.11.tar.xz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 6f5991c7101863d0b29df63990ad852e pax-utils 4f95120230a315c8caaabeb2307b7eee toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=632f5c7266b109d2da80895525a2e7ac
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.11-r4 b/metadata/md5-cache/sys-apps/sandbox-2.12
similarity index 81%
rename from metadata/md5-cache/sys-apps/sandbox-2.11-r4
rename to metadata/md5-cache/sys-apps/sandbox-2.12
index 4acc1b41bba2..077c56ec7f30 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.11-r4
+++ b/metadata/md5-cache/sys-apps/sandbox-2.12
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEFINED_PHASES=compile configure install postinst preinst test
DEPEND=app-arch/xz-utils >=app-misc/pax-utils-0.1.19
DESCRIPTION=sandbox'd LD_PRELOAD hack
-EAPI=5
+EAPI=6
HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
LICENSE=GPL-2
SLOT=0
-SRC_URI=mirror://gentoo/sandbox-2.11.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.11.tar.xz
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/sandbox-2.12.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 6f5991c7101863d0b29df63990ad852e pax-utils 4f95120230a315c8caaabeb2307b7eee toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=63b24a5a37a5e2f2f691ff07eb199fa7
+_md5_=f8d22b77fee93402f91b14fec392dff4
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.6-r1 b/metadata/md5-cache/sys-apps/sandbox-2.6-r1
deleted file mode 100644
index d51894a00ada..000000000000
--- a/metadata/md5-cache/sys-apps/sandbox-2.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst test unpack
-DEPEND=app-arch/xz-utils >=app-misc/pax-utils-0.1.19
-DESCRIPTION=sandbox'd LD_PRELOAD hack
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
-IUSE=multilib
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd -x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/sandbox-2.6.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.6.tar.xz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e toolchain-funcs 185a06792159ca143528e7010368e8af unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=df125415b1c28aca135e99f7f3e206f7
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.7 b/metadata/md5-cache/sys-apps/sandbox-2.7
deleted file mode 100644
index ac8ff55bea68..000000000000
--- a/metadata/md5-cache/sys-apps/sandbox-2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst test unpack
-DEPEND=app-arch/xz-utils >=app-misc/pax-utils-0.1.19
-DESCRIPTION=sandbox'd LD_PRELOAD hack
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
-IUSE=multilib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/sandbox-2.7.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.7.tar.xz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e toolchain-funcs 185a06792159ca143528e7010368e8af unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=32a7a49b8219e6406de7bcd4de684ca1
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.8 b/metadata/md5-cache/sys-apps/sandbox-2.8
deleted file mode 100644
index 65272a9ab59a..000000000000
--- a/metadata/md5-cache/sys-apps/sandbox-2.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst test unpack
-DEPEND=app-arch/xz-utils >=app-misc/pax-utils-0.1.19
-DESCRIPTION=sandbox'd LD_PRELOAD hack
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
-IUSE=multilib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/sandbox-2.8.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.8.tar.xz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e toolchain-funcs 185a06792159ca143528e7010368e8af unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=8a7d31fc22f3c2ba0f040a04ae9c181f
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.9 b/metadata/md5-cache/sys-apps/sandbox-2.9
deleted file mode 100644
index b890f9bf36bf..000000000000
--- a/metadata/md5-cache/sys-apps/sandbox-2.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst test unpack
-DEPEND=app-arch/xz-utils >=app-misc/pax-utils-0.1.19
-DESCRIPTION=sandbox'd LD_PRELOAD hack
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
-IUSE=multilib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/sandbox-2.9.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.9.tar.xz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e toolchain-funcs 185a06792159ca143528e7010368e8af unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=32a7a49b8219e6406de7bcd4de684ca1
diff --git a/metadata/md5-cache/sys-apps/texinfo-4.13-r2 b/metadata/md5-cache/sys-apps/texinfo-4.13-r2
deleted file mode 100644
index 8686a21f91de..000000000000
--- a/metadata/md5-cache/sys-apps/texinfo-4.13-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=The GNU info program and utilities
-EAPI=2
-HOMEPAGE=https://www.gnu.org/software/texinfo/
-IUSE=nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu/texinfo/texinfo-4.13.tar.lzma
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=44ad4b96abddbe16732fcbea850d43fb
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.30.2 b/metadata/md5-cache/sys-apps/util-linux-2.30.2
new file mode 100644
index 000000000000..2b7e47bbd8f7
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/util-linux-2.30.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) 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= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers >=app-portage/elt-patches-20170422 virtual/pkgconfig
+DESCRIPTION=Various useful Linux utilities
+EAPI=6
+HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
+IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode 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 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-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
+RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) 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= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !sys-process/schedutils !sys-apps/setarch !=sys-apps/gentoo-functions-0.10
SLOT=0
SRC_URI=mirror://gentoo/gcc-config-1.8.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-config-1.8.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=ac034a3370e13594fd83fdb0f1abf693
+_md5_=66c9151c20466dfbb2ff34cd12cdb22c
diff --git a/metadata/md5-cache/sys-libs/glibc-2.26-r2 b/metadata/md5-cache/sys-libs/glibc-2.26-r2
new file mode 100644
index 000000000000..b27908023940
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.26-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend test unpack
+DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 !=sys-devel/binutils-2.24 >=sys-devel/gcc-4.9 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
+DESCRIPTION=GNU libc C library
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libc/
+IUSE=audit caps debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+PDEPEND=!vanilla? ( sys-libs/timezone-data )
+RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
+RESTRICT=strip
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.26.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.26-patches-2.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e prefix 7b6fb2fc216b101b5d97d171925a847c systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af toolchain-glibc f5c5d253dc6b28e3711b690fb3486f57 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a89ae1ea422449281ccdc210ffa78557
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 3760047382e0..170694723825 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -11,4 +11,4 @@ RESTRICT=strip
SLOT=2.2
SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/glibc-9999-patches-3.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e prefix 7b6fb2fc216b101b5d97d171925a847c systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af toolchain-glibc f5c5d253dc6b28e3711b690fb3486f57 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=48f9f35e75cfb271e7c0ff91e2abc2f8
+_md5_=7df7a931aa945b856193e237b6d9fa47
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.11 b/metadata/md5-cache/sys-libs/libblockdev-2.13
similarity index 88%
rename from metadata/md5-cache/sys-libs/libblockdev-2.11
rename to metadata/md5-cache/sys-libs/libblockdev-2.13
index d00df9de4687..d604c8a5cc24 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.11
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.13
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/util-linux-2.27 >=
DESCRIPTION=A library for manipulating block devices
EAPI=6
HOMEPAGE=https://github.com/rhinstaller/libblockdev
-IUSE=bcache crypt dmraid doc lvm kbd test 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
+IUSE=bcache +crypt dmraid doc lvm kbd test 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 ~x86
LICENSE=LGPL-2+
RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 crypt? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key >=sys-fs/cryptsetup-1.6.7 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) kbd? ( >=sys-apps/kmod-19 ) 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(+)?]
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 )
SLOT=0
-SRC_URI=https://github.com/rhinstaller/libblockdev/archive/2.11-1.tar.gz -> libblockdev-2.11-1.tar.gz
+SRC_URI=https://github.com/rhinstaller/libblockdev/archive/2.13-1.tar.gz -> libblockdev-2.13-1.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=41c4087ea4de2a768a65b16b8b0a12d9
+_md5_=feca8ab8d11115c8e13f2f9caab414ff
diff --git a/metadata/md5-cache/sys-libs/libunwind-1.2_rc1 b/metadata/md5-cache/sys-libs/libunwind-1.2_rc1
deleted file mode 100644
index a68189073790..000000000000
--- a/metadata/md5-cache/sys-libs/libunwind-1.2_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=lzma? ( app-arch/xz-utils ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170422
-DESCRIPTION=Portable and efficient API to determine the call-chain of a program
-EAPI=5
-HOMEPAGE=https://savannah.nongnu.org/projects/libunwind
-IUSE=debug debug-frame doc libatomic lzma +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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=lzma? ( app-arch/xz-utils )
-RESTRICT=test
-SLOT=7
-SRC_URI=mirror://nongnu/libunwind/libunwind-1.2-rc1.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=acd79a3ca95cfab661fb08d4d0a93e43
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.11-r1 b/metadata/md5-cache/sys-libs/zlib-1.2.11-r1
index 3361671761a6..3698f87de24f 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.2.11-r1
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.11-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Standard (de)compression library
EAPI=5
HOMEPAGE=https://zlib.net/
IUSE=minizip 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=ZLIB
RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selinux-mozilla ) >=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 ) !gtk2? ( >=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 )
RESTRICT=!bindist? ( bindist )
SLOT=0
SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ach.xpi -> firefox-52.4.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/af.xpi -> firefox-52.4.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/an.xpi -> firefox-52.4.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ar.xpi -> firefox-52.4.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/as.xpi -> firefox-52.4.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ast.xpi -> firefox-52.4.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/az.xpi -> firefox-52.4.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/bg.xpi -> firefox-52.4.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.4.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.4.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/br.xpi -> firefox-52.4.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/bs.xpi -> firefox-52.4.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ca.xpi -> firefox-52.4.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/cak.xpi -> firefox-52.4.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/cs.xpi -> firefox-52.4.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/cy.xpi -> firefox-52.4.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/da.xpi -> firefox-52.4.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/de.xpi -> firefox-52.4.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/dsb.xpi -> firefox-52.4.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/el.xpi -> firefox-52.4.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.4.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.4.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/eo.xpi -> firefox-52.4.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.4.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.4.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.4.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.4.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/et.xpi -> firefox-52.4.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/eu.xpi -> firefox-52.4.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/fa.xpi -> firefox-52.4.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ff.xpi -> firefox-52.4.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/fi.xpi -> firefox-52.4.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/fr.xpi -> firefox-52.4.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.4.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.4.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/gd.xpi -> firefox-52.4.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/gl.xpi -> firefox-52.4.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/gn.xpi -> firefox-52.4.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.4.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/he.xpi -> firefox-52.4.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.4.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/hr.xpi -> firefox-52.4.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.4.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/hu.xpi -> firefox-52.4.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.4.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/id.xpi -> firefox-52.4.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/is.xpi -> firefox-52.4.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/it.xpi -> firefox-52.4.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ja.xpi -> firefox-52.4.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ka.xpi -> firefox-52.4.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/kab.xpi -> firefox-52.4.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/kk.xpi -> firefox-52.4.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/km.xpi -> firefox-52.4.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/kn.xpi -> firefox-52.4.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ko.xpi -> firefox-52.4.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/lij.xpi -> firefox-52.4.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/lt.xpi -> firefox-52.4.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/lv.xpi -> firefox-52.4.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/mai.xpi -> firefox-52.4.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/mk.xpi -> firefox-52.4.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ml.xpi -> firefox-52.4.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/mr.xpi -> firefox-52.4.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ms.xpi -> firefox-52.4.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.4.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/nl.xpi -> firefox-52.4.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.4.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/or.xpi -> firefox-52.4.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.4.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/pl.xpi -> firefox-52.4.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.4.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.4.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/rm.xpi -> firefox-52.4.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ro.xpi -> firefox-52.4.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ru.xpi -> firefox-52.4.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/si.xpi -> firefox-52.4.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/sk.xpi -> firefox-52.4.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/sl.xpi -> firefox-52.4.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/son.xpi -> firefox-52.4.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/sq.xpi -> firefox-52.4.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/sr.xpi -> firefox-52.4.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.4.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/ta.xpi -> firefox-52.4.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/te.xpi -> firefox-52.4.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/th.xpi -> firefox-52.4.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/tr.xpi -> firefox-52.4.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/uk.xpi -> firefox-52.4.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/uz.xpi -> firefox-52.4.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/vi.xpi -> firefox-52.4.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/xh.xpi -> firefox-52.4.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.4.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.4.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/52.4.0esr/source/firefox-52.4.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e mozconfig-v6.52 0c29133650826a0ead684f84f2efe90f mozcoreconf-v5 dfc58397c1e9ecd4420428e695cf8dc8 mozextension e5d920147bfccf4930062e462e2a417d mozlinguas-v2 e7b3bd89af6dc1a3dd10be68ba3d574d multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a09327d977ab960d6d2ee531da50b557
+_md5_=5e6dee3bbf895d9ebaf901147bfe35d6
diff --git a/metadata/md5-cache/www-client/opera-48.0.2685.35 b/metadata/md5-cache/www-client/opera-48.0.2685.35
new file mode 100644
index 000000000000..4cc72e848440
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-48.0.2685.35
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=http://download1.operacdn.com/pub/opera/desktop/48.0.2685.35/linux/opera-stable_48.0.2685.35_amd64.deb http://download2.operacdn.com/pub/opera/desktop/48.0.2685.35/linux/opera-stable_48.0.2685.35_amd64.deb http://download3.operacdn.com/pub/opera/desktop/48.0.2685.35/linux/opera-stable_48.0.2685.35_amd64.deb http://download4.operacdn.com/pub/opera/desktop/48.0.2685.35/linux/opera-stable_48.0.2685.35_amd64.deb
+_eclasses_=chromium-2 fcd0e1c5eaae64392927ca67cdb13e0c epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7a5314a73caa178adc7cf4c9e41a354a
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-27.0.0.130-r1 b/metadata/md5-cache/www-plugins/adobe-flash-27.0.0.130-r1
index bff167b60e53..4d75a76a9fa7 100644
--- a/metadata/md5-cache/www-plugins/adobe-flash-27.0.0.130-r1
+++ b/metadata/md5-cache/www-plugins/adobe-flash-27.0.0.130-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm test unpack
DEPEND=>=sys-apps/sed-4 app-arch/unzip
DESCRIPTION=Adobe Flash Player
EAPI=6
-HOMEPAGE=http://www.adobe.com/products/flashplayer.html http://get.adobe.com/flashplayer/ https://helpx.adobe.com/security/products/flash-player.html
+HOMEPAGE=https://www.adobe.com/products/flashplayer.html https://get.adobe.com/flashplayer/ https://helpx.adobe.com/security/products/flash-player.html
IUSE=+nsplugin +ppapi 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
LICENSE=AdobeFlash-11.x
@@ -12,4 +12,4 @@ RESTRICT=strip mirror
SLOT=22
SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/27.0.0.130/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-27.0.0.130-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/27.0.0.130/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-27.0.0.130-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/27.0.0.130/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-27.0.0.130-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/27.0.0.130/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-27.0.0.130-ppapi.x86_64.tar.gz ) )
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 2770eed66a9b8ef944714cd0e968182e mozextension e5d920147bfccf4930062e462e2a417d multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 nsplugins 2049586e425364a1c5bdb004205d1758 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e9ce8cda7676d4daa5947168e927b559
+_md5_=599c09e5a8b798188eaea58d9068f453
diff --git a/metadata/md5-cache/x11-misc/xcape-1.2 b/metadata/md5-cache/x11-misc/xcape-1.2
new file mode 100644
index 000000000000..dd814f1ac1f2
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xcape-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXtst virtual/pkgconfig
+DESCRIPTION=Utility to make modifier keys send custom key events when pressed on their own
+EAPI=6
+HOMEPAGE=https://github.com/alols/xcape
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=x11-libs/libX11 x11-libs/libXtst
+SLOT=0
+SRC_URI=https://github.com/alols/xcape/archive/v1.2.tar.gz -> xcape-1.2.tar.gz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=1ed36cac0e3b96bb03cb30a6a8fa8436
diff --git a/metadata/md5-cache/x11-plugins/enigmail-1.9.7 b/metadata/md5-cache/x11-plugins/enigmail-1.9.8.3
similarity index 79%
rename from metadata/md5-cache/x11-plugins/enigmail-1.9.7
rename to metadata/md5-cache/x11-plugins/enigmail-1.9.8.3
index 1769230ac91b..ef0804758616 100644
--- a/metadata/md5-cache/x11-plugins/enigmail-1.9.7
+++ b/metadata/md5-cache/x11-plugins/enigmail-1.9.8.3
@@ -3,10 +3,10 @@ DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pi
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
+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.7.tar.gz
+SRC_URI=http://www.enigmail.net/download/source/enigmail-1.9.8.3.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=6c91c09e2e64b9596da659cbd3c97d6e
+_md5_=c35d41cf77ca00d7a1f41481e570b664
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mixer-4.11.0 b/metadata/md5-cache/xfce-extra/xfce4-mixer-4.11.0
deleted file mode 100644
index bb5582257070..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-mixer-4.11.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.24 dev-libs/libunique:1 media-libs/gst-plugins-base:0.10 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10 keybinder? ( dev-libs/keybinder:0 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=A volume control application and panel plug-in for Xfce
-EAPI=5
-HOMEPAGE=https://git.xfce.org/apps/xfce4-mixer/
-IUSE=alsa debug +keybinder oss
-KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.24 dev-libs/libunique:1 media-libs/gst-plugins-base:0.10 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10 keybinder? ( dev-libs/keybinder:0 ) alsa? ( media-plugins/gst-plugins-alsa:0.10 ) oss? ( media-plugins/gst-plugins-oss:0.10 ) !alsa? ( !oss? ( media-plugins/gst-plugins-meta:0.10 ) )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfce4-mixer/4.11/xfce4-mixer-4.11.0.tar.bz2
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25 xfconf 25bb7fe99d6e58851633dc43d429c5ae
-_md5_=140f4958715198fa6c3adc6f5eee4108
diff --git a/metadata/md5-cache/xfce-extra/xfce4-volumed-0.1.13 b/metadata/md5-cache/xfce-extra/xfce4-volumed-0.1.13
deleted file mode 100644
index e421273ff361..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-volumed-0.1.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/keybinder:0 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 >=xfce-base/xfconf-4.8 libnotify? ( x11-libs/libnotify ) virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=Daemon to control volume up/down and mute keys
-EAPI=5
-HOMEPAGE=https://launchpad.net/xfce4-volumed
-IUSE=alsa debug libnotify oss
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/keybinder:0 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 >=xfce-base/xfconf-4.8 libnotify? ( x11-libs/libnotify ) alsa? ( media-plugins/gst-plugins-alsa:0.10 ) oss? ( media-plugins/gst-plugins-oss:0.10 ) !alsa? ( !oss? ( media-plugins/gst-plugins-meta:0.10 ) )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfce4-volumed/0.1/xfce4-volumed-0.1.13.tar.bz2
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25 xfconf 25bb7fe99d6e58851633dc43d429c5ae
-_md5_=a0bd68ef6a08b506e8ec177f00fc1f24
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 2062814c0833..8bc24e99afe6 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 03 Oct 2017 05:09:47 +0000
+Wed, 04 Oct 2017 06:09:55 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 028c7700d7cb..c803af64152c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Oct 3 05:09:47 UTC 2017
+Wed Oct 4 06:09:55 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d68ec73e3b68..dcbb423f1dbd 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 03 Oct 2017 05:30:01 +0000
+Wed, 04 Oct 2017 06:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 52c4eebcf0bf..23d4bfa65c05 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-59ef04f89900f7e9dc5b264bbd1f8558c343d721 1507005661 2017-10-03T04:41:01+00:00
+dc2190543b12c1479363d94991540e49183a2bbb 1507091644 2017-10-04T04:34:04+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c2dbb3981368..dbee317415ab 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1507007101 Tue 03 Oct 2017 05:05:01 AM UTC
+1507097402 Wed 04 Oct 2017 06:10:02 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 2062814c0833..8bc24e99afe6 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 03 Oct 2017 05:09:47 +0000
+Wed, 04 Oct 2017 06:09:55 +0000
diff --git a/net-dialup/gtkterm/Manifest b/net-dialup/gtkterm/Manifest
deleted file mode 100644
index b95cdbe5afb8..000000000000
--- a/net-dialup/gtkterm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gtkterm-0.99.7-rc1.tar.gz 172866 SHA256 91f555af0e0e8bf1fd73744a5486587a8a743ac7e6111e462763cf43def623d0 SHA512 9d629bb9b4700a9976f9bfc8c6bdfb170e06d38828e24747e2cb4cb7ab4908e030b3ba175ca7376929955c892843b6a6dae4e0cd4d67c80a6d959e4f6614424d WHIRLPOOL b6afaca868c1147c44d099202f82ee4222a8635019e5a633f964d76cb4ef0343e16acef9c86b217f0fbb2d3388cd653cd7e1fa1ccc8f41b2cce891dbeb42b411
diff --git a/net-dialup/gtkterm/files/gtkterm-0.99.7_rc1-configure.patch b/net-dialup/gtkterm/files/gtkterm-0.99.7_rc1-configure.patch
deleted file mode 100644
index 795025623ac5..000000000000
--- a/net-dialup/gtkterm/files/gtkterm-0.99.7_rc1-configure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN gtkterm-0.99.7-rc1.old/configure.in gtkterm-0.99.7-rc1/configure.in
---- gtkterm-0.99.7-rc1.old/configure.in 2012-03-02 14:05:29.842885142 -0800
-+++ gtkterm-0.99.7-rc1/configure.in 2012-03-02 14:11:20.242419122 -0800
-@@ -32,8 +32,8 @@
- dnl Checks for GTK+ and Imlib and libvte
- PKG_CHECK_MODULES(VTE, vte >= 0.20, , AC_MSG_ERROR([*** vte >= 0.20 not installed ***]))
-
--AC_SUBST(VTE_CFLAGS)
--AC_SUBST(VTE_LIBS)
-+AC_SUBST(TERMINAL_WIDGET_CFLAGS)
-+AC_SUBST(TERMINAL_WIDGET_LIBS)
-
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16, , AC_MSG_ERROR([*** GTK >= 2.16 not installed ***]))
-
diff --git a/net-dialup/gtkterm/gtkterm-0.99.7_rc1.ebuild b/net-dialup/gtkterm/gtkterm-0.99.7_rc1.ebuild
deleted file mode 100644
index 24c9ad49b31c..000000000000
--- a/net-dialup/gtkterm/gtkterm-0.99.7_rc1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P="${P/_/-}"
-DESCRIPTION="A serial port terminal written in GTK+, similar to Windows' HyperTerminal"
-HOMEPAGE="https://fedorahosted.org/gtkterm/"
-SRC_URI="https://fedorahosted.org/released/gtkterm/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-inherit eutils autotools
-
-RDEPEND=">=x11-libs/gtk+-2.16:2
- >=x11-libs/vte-0.20:0"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-# Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
-MY_AVAILABLE_LINGUAS=" fr hu"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
-
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
- # Fix test
- echo "src/term_config.c" >> po/POTFILES.in || die
-
- epatch "${FILESDIR}/${P}-configure.patch"
- sed -i -e "s/AM_SYS_POSIX_TERMIOS/AC_SYS_POSIX_TERMIOS/" \
- configure.in || die #bug #483346
-
- eautoreconf
-}
-
-src_install() {
- default
- make_desktop_entry "${PN}"
-
- if use nls; then
- cd "${S}/po"
- local MY_LINGUAS="" lang
-
- for lang in ${MY_AVAILABLE_LINGUAS} ; do
- if use linguas_${lang} ; then
- MY_LINGUAS="${MY_LINGUAS} ${lang}"
- fi
- done
- if [[ "${MY_LINGUAS}" ]] ; then
-
- elog "Locale messages will be installed for following languages:"
- elog " ${MY_LINGUAS}"
-
- for lang in ${MY_LINGUAS}; do
- msgfmt -o ${lang}.mo ${lang}.po && \
- insinto /usr/share/locale/${lang}/LC_MESSAGES && \
- newins ${lang}.mo gtkterm.mo || \
- die "failed to install locale messages for ${lang} language"
- done
- fi
- fi
-}
diff --git a/net-dialup/gtkterm/metadata.xml b/net-dialup/gtkterm/metadata.xml
deleted file mode 100644
index b8577cf13940..000000000000
--- a/net-dialup/gtkterm/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-A simplified "clone" of the famous Hyperterminal, without support for X/Y/ZMODEM protocols.
-
diff --git a/net-dns/dnsmasq/dnsmasq-2.78.ebuild b/net-dns/dnsmasq/dnsmasq-2.78.ebuild
index d35012578794..1dcd9a4d208c 100644
--- a/net-dns/dnsmasq/dnsmasq-2.78.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.78.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify"
IUSE+=" ipv6 lua nls script selinux static tftp"
diff --git a/net-dns/libidn2/libidn2-2.0.4.ebuild b/net-dns/libidn2/libidn2-2.0.4.ebuild
index f2f21017ecf8..f0fe8d573560 100644
--- a/net-dns/libidn2/libidn2-2.0.4.ebuild
+++ b/net-dns/libidn2/libidn2-2.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="GPL-2+ LGPL-3+"
SLOT="0"
-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"
IUSE="static-libs"
RDEPEND="
diff --git a/net-dns/s6-dns/Manifest b/net-dns/s6-dns/Manifest
index 728c2fbe3d9f..2993d74683ae 100644
--- a/net-dns/s6-dns/Manifest
+++ b/net-dns/s6-dns/Manifest
@@ -1,2 +1,3 @@
DIST s6-dns-2.1.0.0.tar.gz 77415 SHA256 8455f3b1edad8f01a1340cb1242c141755729bfd5d71059739eced5c006539ad SHA512 c75722b3ddd9d1646116654983558efde22d0d5d3ff1c296a8d5e2ba44abe0d5a86fc86804cf90bea2ee8c3e82028e182d28cdbf5155d46c6b3d8f4d1c3387fc WHIRLPOOL 7c1eb845d6101c53fd65579bd46ad83c0085ee734d2623b616a34db0721bbca913820f21c6979bdc1c87582d8a92c547f7f9a5b640c4f31badbc3bd0098f75fd
DIST s6-dns-2.2.0.0.tar.gz 76702 SHA256 06856745aa034a1655b7d8226a4b235579b098c58b6009d92151dedd41b15fc2 SHA512 55cc0a4e677a28d5ebeeab1f995ee8d03c6aaa0c839ad420e006468c0712f45e638a3d32e082a34e09098d20c3bb08496afcefbec4c58f7674017e22732b1cda WHIRLPOOL 7b4c8e5e12a53d41ef6bd8ee7854aaa9d97206766b7eb5bc5bcac06b27c0487d3ddbfe516b74f37e609eae677a57c5b4ab4ba6daa692009fd23ef12bbbd42326
+DIST s6-dns-2.2.0.1.tar.gz 76046 SHA256 e31b454aef2bd0e35afb497c42dd0d49c011e0535ad2bf4dd6719afcf6e5e6b4 SHA512 9b62ddec94be86d186520f0240dafda95861c54345f92a1fac3251f8560e70932bc5915cca4136d428ed02d0718e8082ad382bffd0c707ae867f1896d93ecaed WHIRLPOOL 4eafa9f6062d4eb80f46150a3db9745b42270183857c97aecc19c189a570eb39cb26b2bc003fb2ab6900bb0c708e32168b3453b59948a60ca8e7a41e5018cdf4
diff --git a/net-dns/s6-dns/s6-dns-2.2.0.1.ebuild b/net-dns/s6-dns/s6-dns-2.2.0.1.ebuild
new file mode 100644
index 000000000000..1c86a6a85661
--- /dev/null
+++ b/net-dns/s6-dns/s6-dns-2.2.0.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="suite of DNS client programs and libraries for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+ static? (
+ >=dev-libs/skalibs-2.6.0.0[static-libs]
+ )
+ !static? (
+ >=dev-libs/skalibs-2.6.0.0
+ )
+"
+RDEPEND="
+ !static? (
+ >=dev-libs/skalibs-2.6.0.0:=
+ )
+"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+ default
+
+ # Remove QA warning about LDFLAGS addition
+ sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+ # configure overrides gentoo's -fstack-protector default
+ sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+ econf \
+ --bindir=/bin \
+ --dynlibdir=/$(get_libdir) \
+ --libdir=/usr/$(get_libdir)/${PN} \
+ --with-dynlib=/$(get_libdir) \
+ --with-lib=/usr/$(get_libdir)/skalibs \
+ --with-sysdeps=/usr/$(get_libdir)/skalibs \
+ $(use_enable !static shared) \
+ $(use_enable static allstatic) \
+ $(use_enable static static-libc) \
+ $(use_enable static-libs static)
+}
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
index 9fa1da5e4485..c2ed5f6f4274 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
@@ -84,7 +84,7 @@ src_configure() {
--kdir="${KV_DIR}" \
--kver="${KV_FULL}" \
$(use debug && echo '--enable-debugfs') \
- $(use_enable natevents) \
+ $(use natevents && echo '--enable-natevents') \
$(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent')
}
diff --git a/net-fs/openafs/openafs-1.6.21-r1.ebuild b/net-fs/openafs/openafs-1.6.21-r1.ebuild
index 4ecf063fc89f..3c3aa6efbac9 100644
--- a/net-fs/openafs/openafs-1.6.21-r1.ebuild
+++ b/net-fs/openafs/openafs-1.6.21-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="IBM BSD openafs-krb5-a APSL-2"
SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups"
diff --git a/net-ftp/ncftp/ncftp-3.2.6.ebuild b/net-ftp/ncftp/ncftp-3.2.6.ebuild
index 7c9077b08c9a..a508342267a6 100644
--- a/net-ftp/ncftp/ncftp-3.2.6.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="Clarified-Artistic"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
IUSE="pch"
DEPEND="
diff --git a/net-im/qutim/metadata.xml b/net-im/qutim/metadata.xml
index f84be2388b5b..a8922ddd4abf 100644
--- a/net-im/qutim/metadata.xml
+++ b/net-im/qutim/metadata.xml
@@ -26,7 +26,7 @@
Enable IRC protocol support
Enable mail.ru protocol support
Enable plugin for encrypted conversations (Off-The-Record messaging)
- Add sound support via media-libs/phonon or dev-qt/qtphonon
+ Add sound support via media-libs/phonon
Enable libpurple-based protocol support
Enable QtQuick-based chat plugin
Add sound support via media-libs/sdl-mixer
diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml
index 1a7bfcc663df..5bcadd4c1b6e 100644
--- a/net-irc/inspircd/metadata.xml
+++ b/net-irc/inspircd/metadata.xml
@@ -31,4 +31,8 @@
wadecline@hotmail.com
Wade Cline
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
diff --git a/net-irc/quasselgrep/metadata.xml b/net-irc/quasselgrep/metadata.xml
index 09746d072a90..23dc8ab4748e 100644
--- a/net-irc/quasselgrep/metadata.xml
+++ b/net-irc/quasselgrep/metadata.xml
@@ -5,6 +5,10 @@
om@organizedmagnetism.com
Scott Martin
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
https://github.com/fish-face/quasselgrep/blob/master/README.md
diff --git a/net-irc/weechat/weechat-1.9.1.ebuild b/net-irc/weechat/weechat-1.9.1.ebuild
index f1e007217342..0597605d4a5e 100644
--- a/net-irc/weechat/weechat-1.9.1.ebuild
+++ b/net-irc/weechat/weechat-1.9.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/weechat/weechat.git"
else
SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
- KEYWORDS="amd64 x86"
+ KEYWORDS="amd64 x86 ~x64-macos"
fi
DESCRIPTION="Portable and multi-interface IRC client"
@@ -95,6 +95,15 @@ src_prepare() {
# install docs in correct directory
sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ # fix linking error on Darwin
+ sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+ cmake/FindPython.cmake || die
+ # allow to find the plugins by default
+ sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+ src/core/wee-config.c || die
+ fi
}
src_configure() {
diff --git a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
index cdff71d98a7d..85d91d74f077 100644
--- a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="ipv6 kerberos static-libs"
RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-misc/asterisk/asterisk-13.17.2.ebuild b/net-misc/asterisk/asterisk-13.17.2.ebuild
index 7235f13116f7..47689e396d0d 100644
--- a/net-misc/asterisk/asterisk-13.17.2.ebuild
+++ b/net-misc/asterisk/asterisk-13.17.2.ebuild
@@ -66,7 +66,7 @@ CDEPEND="dev-db/sqlite:3
snmp? ( net-analyzer/net-snmp )
span? ( media-libs/spandsp )
speex? ( media-libs/speex )
- srtp? ( net-libs/libsrtp:= )
+ srtp? ( net-libs/libsrtp:0 )
vorbis? ( media-libs/libvorbis )"
DEPEND="${CDEPEND}
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 48500a58b562..289d41fbb9b5 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,2 +1,3 @@
DIST axel-2.12.tar.gz 82995 SHA256 28e7bb26b7be3f56a61b60ef07e15e05ea9a41850b0ed45a0c56d6d2202f4a8b SHA512 5e163c319366f7efd16f8b35dbcf901300c884ab303696dabe87ad47511f56cc3f1e399af738dc79ca717ca70fd529b6dd1adf30f5162cfb530105ce34e2eaf2 WHIRLPOOL dece4ad9eae5441e0b24952a96189417e75eb155ad46b199ce531b35fa6d027ffb75a16c016044a37dd4e76601865e51c0310b69b7fc70b974f9b67a6b2b1fe5
+DIST axel-2.14.1.tar.gz 89356 SHA256 acf6820d98a792faf309fc9acf22f7caf4b8a4b7001072c8f546b3c4fc755e39 SHA512 72c37fc6def0c765ed8220c27efe22255073b1e3cf1c8f6bda5ee2ce9cd36ac46263ac602a185efd40ca8f197a268612f2dcda69bcb49891c2538b910d971e8b WHIRLPOOL 1384ab65a689200f68d2549deb2f22526ae82a25f1b580ce5a270babc33d577513c2732a57676ea1e51b99eb09267960a5e24b6507ebca64a61d6ab4070eb374
DIST axel-2.4.tar.bz2 44995 SHA256 ebc7d40e989c680d2afa632a17e5208101608924cf446da20814a6f3c3338612 SHA512 34d73cea19f2bf393aa8d3e4b6c24296f8b1d4e6177da6f4728763e013d5d9d073aa5dae31d0ff175126e8fcbd973daf94674a70f100afc9e7d00b92b78b8ec9 WHIRLPOOL 373af984738008572847ae0ed84a518d0b61323e3612f48affa96175792b0856c2bd13601ddcdd0c81ead5059ee41130759bf9b0ada2a2654f767ec69d992a0f
diff --git a/net-misc/axel/axel-2.14.1.ebuild b/net-misc/axel/axel-2.14.1.ebuild
new file mode 100644
index 000000000000..4bd7ad89659d
--- /dev/null
+++ b/net-misc/axel/axel-2.14.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Light Unix download accelerator"
+HOMEPAGE="https://github.com/axel-download-accelerator/axel"
+SRC_URI="https://github.com/axel-download-accelerator/axel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+IUSE="debug libressl nls ssl"
+
+REQUIRED_USE="libressl? ( ssl )"
+
+CDEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+"
+DEPEND="${CDEPEND}
+ nls? ( sys-devel/gettext )"
+RDEPEND="${CDEPEND}
+ nls? ( virtual/libintl virtual/libiconv )"
+
+DOCS=( doc/. )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ $(use_with ssl)
+}
+
+pkg_postinst() {
+ einfo 'To use axel with portage, create a script in'
+ einfo '/usr/local/bin/fetchwrapper.sh with the following content:'
+ einfo
+ einfo ' #!/bin/bash'
+ einfo ' set -e'
+ einfo ' /usr/bin/axel -o "$1.axel" "$2"'
+ einfo ' mv "$1.axel" "$1"'
+ einfo
+ einfo 'and then add the following to your make.conf:'
+ einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}.axel" "\${URI}"'\'
+ einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
+}
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index f3657364ffad..bb25830ae85d 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,2 +1,3 @@
DIST openvswitch-2.6.1.tar.gz 5399107 SHA256 307b20aba6a179bf13e5da9ac242933c31349073762473a9d4782619c8c1cf0c SHA512 c5a716d2d9ac5f353827a4ad1e26f4d0ddfc4d7bf1e8f696043c32676e77c068e3e0dd423348cc33d5507753d7a27ce24898b823dad3fbc6a8d79297fa088b39 WHIRLPOOL 1ab35852ad45fc99964c814923ea54b22ec6c4630b2aa6cb6aee7b96ca806095d0be60c1b08f926419efa79a3c7ce4d484efe497bb50a9596db69b6020175092
DIST openvswitch-2.7.2.tar.gz 6192414 SHA256 fe36c86ed52f6f7c17b01cdbb7ae37bf521cc5c2e50997b618f3f742485f655b SHA512 790a715dd31729893a1c21af4197400b7362569d15cb763cbbab82830c5f5168d2dea0cb40282faa17734a2ad967bc40d02b8f4f92ea585164386d2aa0719470 WHIRLPOOL 6525d475cc10b3e32d5b9c01cbfd909dff3cfad28bbe13bf55b5775471a58fd49e9f9cf484a9e68a0f371c56824910142513c34dc5d2f11a0dcebf5b789e75d4
+DIST openvswitch-2.8.1.tar.gz 6746474 SHA256 8d1c439e26d7044f0ec823c7fef1b00b7c6465da0b83a7d0cf3191ed1dc43893 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7 WHIRLPOOL 864ac85d1330cf04cf499dcbbbed0e0b09351795a5ecd780e0f94cae3dc744229875181cea05fa39a7108583271319cedc7a0dfc77b7793453c76604e81a7fe1
diff --git a/net-misc/openvswitch/openvswitch-2.8.1.ebuild b/net-misc/openvswitch/openvswitch-2.8.1.ebuild
new file mode 100644
index 000000000000..35188c9569d4
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.8.1.ebuild
@@ -0,0 +1,155 @@
+# 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 autotools eutils linux-info linux-mod python-r1 systemd
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="http://openvswitch.org"
+SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug modules monitor +ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ || (
+ >=sys-apps/openrc-0.10.5
+ sys-apps/systemd
+ )
+ ssl? ( dev-libs/openssl:0= )
+ ${PYTHON_DEPS}
+ ~dev-python/ovs-2.7.2[${PYTHON_USEDEP}]
+ || (
+ dev-python/twisted[conch,${PYTHON_USEDEP}]
+ dev-python/twisted-web[${PYTHON_USEDEP}]
+ )
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+ if use modules ; then
+ CONFIG_CHECK+=" ~!OPENVSWITCH"
+ kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+ kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+ linux-mod_pkg_setup
+ else
+ CONFIG_CHECK+=" ~OPENVSWITCH"
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # Never build kernelmodules, doing this manually
+ sed -i \
+ -e '/^SUBDIRS/d' \
+ datapath/Makefile.in || die "sed failed"
+ eautoreconf
+ default
+}
+
+src_configure() {
+ set_arch_to_kernel
+ # monitor is statically enabled for bug 596206
+ # use monitor || export ovs_cv_python="no"
+ # pyside is staticly disabled
+ export ovs_cv_pyuic4="no"
+
+ local linux_config
+ use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+ econf ${linux_config} \
+ --with-rundir=/var/run/openvswitch \
+ --with-logdir=/var/log/openvswitch \
+ --with-pkidir=/etc/ssl/openvswitch \
+ --with-dbdir=/var/lib/openvswitch \
+ $(use_enable ssl) \
+ $(use_enable !debug ndebug)
+}
+
+src_compile() {
+ default
+
+ use modules && linux-mod_src_compile
+}
+
+src_install() {
+ default
+
+ local SCRIPT
+ if use monitor; then
+ for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+ sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
+ python_foreach_impl python_doscript utilities/"${SCRIPT}"
+ done
+ rm -r "${ED%/}"/usr/share/openvswitch/python || die
+ fi
+
+ keepdir /var/{lib,log}/openvswitch
+ keepdir /etc/ssl/openvswitch
+ fperms 0750 /etc/ssl/openvswitch
+
+ rm -rf "${ED%/}"/var/run || die
+
+ newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+ newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
+ newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+ newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+ systemd_dounit "${FILESDIR}/ovsdb-server.service"
+ systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
+ systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+ insinto /etc/logrotate.d
+ newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+ use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+ use modules && linux-mod_pkg_postinst
+
+ local pv
+ for pv in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 1.9.0 ${pv} ; then
+ ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
+ ewarn " /etc/openvswitch"
+ ewarn "to"
+ ewarn " /var/lib/openvswitch"
+ ewarn "Please copy/move the database manually before running the schema upgrade."
+ ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
+ fi
+ done
+
+ elog "Use the following command to create an initial database for ovsdb-server:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ elog "(will create a database in /var/lib/openvswitch/conf.db)"
+ elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+ local db="${EROOT%/}"/var/lib/openvswitch/conf.db
+ if [[ -e "${db}" ]] ; then
+ einfo "Database '${db}' already exists, doing schema migration..."
+ einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+ ovsdb-tool convert "${db}" \
+ "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+ else
+ einfo "Creating new database '${db}'..."
+ ovsdb-tool create "${db}" \
+ "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+ fi
+}
diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index 0ed73220159f..323d991f82b7 100644
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -1,3 +1,4 @@
DIST s6-networking-2.2.1.0.tar.gz 85242 SHA256 5d8150d7413b335693c6e63092381dd0866b1b6f95662a2cbae5ec17ca449ab0 SHA512 33085e2a855079ab046b6f851b4dc15801012dc1a353a1254508c6c9da9e45da4f7e2b62e16ab1d0a41d42b424bebe7b362860f68f3be0f9eba37b7a15817633 WHIRLPOOL e76817f4803dfff8e85efbc3f70c050ca88fd5046863abc2832d3e8d7765840e5e91e443f7ce96b66bde0d6697e4764b1b820d04eaf981e958eabc5b30107442
DIST s6-networking-2.3.0.0.tar.gz 86538 SHA256 1a21d6f3e29eaa50a8de8cddd1e60372fb36c024f2a0c1afc4c9b704b4e3e6dd SHA512 ca247f3926d790e388347c610ae10fdb3e7be48d8381b9178223c470258b264315997f627b6ddcc508f08ba83e9212f386041b92dbaa3ad576c4e37f205a0c91 WHIRLPOOL ba77c93b90bb7928b54e87cb2e196f94eb4c24cb4adc885dd3f40d000bfc839e28b8a7ee021f162c70441abdc0d526f0d0a2ea3e086d823bbe02c58e012f71d6
DIST s6-networking-2.3.0.1.tar.gz 86602 SHA256 67c4beab39377b60bb996000a336c764adf4b5456c0283a8fd27657b15e9c6d6 SHA512 d0f2367a916d578e02ed8b482c73e62c59eed60cf08f98d6294b12fd7aa046b2fe18294b0243a59a05a9ec1a082e8e9398d6e89145edcb2b1022fa90e7197da2 WHIRLPOOL d99ace6bd459abc8db2a527e3f5fefaf5ec943251665567cf2d37359134492ad5a5ed1088ab7e280ac24bf1df3b3f6d69e6bf95e92b4992489613c31889f4a00
+DIST s6-networking-2.3.0.2.tar.gz 85977 SHA256 d81968756abbcecde6a872c89d82f643cd621a0c295c2c57650705dbe875481a SHA512 c99afd9bdbd5003f57de8f88f091971f0269cd8efee5791c3c4aa90ad34b978d0f57724d4128e9d20d6a40d731853bb4bdaa76dd860f975ff7f84a56b0050256 WHIRLPOOL 17222c4e90dd95a8f8cc4234d66f56c71a871d0e154bad3c0d590f07f85f8c97aed4d5b2de915302b301e03c95dad7fc5420c4ce747a5c8d2cc0bd61f00a8df1
diff --git a/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild
new file mode 100644
index 000000000000..c8544a93760d
--- /dev/null
+++ b/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="suite of small networking utilities for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+ static? (
+ >=dev-lang/execline-2.3.0.2[static-libs]
+ >=dev-libs/skalibs-2.6.0.0[static-libs]
+ >=net-dns/s6-dns-2.2.0.1[static-libs]
+ >=sys-apps/s6-2.6.1.0[static-libs]
+ ssl? ( >=dev-libs/libressl-2.4.5[static-libs] )
+ )
+ !static? (
+ >=dev-lang/execline-2.3.0.2[static=]
+ >=dev-libs/skalibs-2.6.0.0
+ >=net-dns/s6-dns-2.2.0.1[static=]
+ >=sys-apps/s6-2.6.1.0[static=]
+ ssl? ( >=dev-libs/libressl-2.4.5 )
+ )
+"
+RDEPEND="
+ >=dev-lang/execline-2.3.0.2:=[!static?]
+ >=sys-apps/s6-2.6.1.0:=[!static?]
+ !static? (
+ >=dev-libs/skalibs-2.6.0.0:=
+ >=net-dns/s6-dns-2.2.0.1:=
+ ssl? ( >=dev-libs/libressl-2.4.5:= )
+ )
+"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+ default
+
+ # Remove QA warning about LDFLAGS addition
+ sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+ # configure overrides gentoo's -fstack-protector default
+ sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+ econf \
+ --bindir=/bin \
+ --dynlibdir=/$(get_libdir) \
+ --libdir=/usr/$(get_libdir)/${PN} \
+ --with-dynlib=/$(get_libdir) \
+ --with-lib=/usr/$(get_libdir)/s6 \
+ --with-lib=/usr/$(get_libdir)/s6-dns \
+ --with-lib=/usr/$(get_libdir)/skalibs \
+ --with-sysdeps=/usr/$(get_libdir)/skalibs \
+ $(use_enable ssl ssl libressl) \
+ $(use_enable !static shared) \
+ $(use_enable static allstatic) \
+ $(use_enable static static-libc) \
+ $(use_enable static-libs static)
+}
diff --git a/net-misc/spiped/Manifest b/net-misc/spiped/Manifest
index 21b1c64b687c..186816189151 100644
--- a/net-misc/spiped/Manifest
+++ b/net-misc/spiped/Manifest
@@ -1,2 +1 @@
-DIST spiped-1.5.0.tgz 68813 SHA256 b2f74b34fb62fd37d6e2bfc969a209c039b88847e853a49e91768dec625facd7 SHA512 55e9f18fc82415d28f44af538c6dd8c222798f6ac719a9ad43772357c0f05f281a883cf1189552deeb4b646abe3d060089d66b5f2ba66b5a2a82627dc62513cc WHIRLPOOL be07cfd67a21dfafc37a1d514193c3f45f9f9cb41a3009d50ad564f39fdde1342d2b716baca2b67040b0a75a9b3d469f372c6cc861c3376117d31d7ec4e4b0b3
DIST spiped-1.6.0.tgz 94431 SHA256 e6f7f8f912172c3ad55638af8346ae7c4ecaa92aed6d3fb60f2bda4359cba1e4 SHA512 9bca8e7da31b86f956a653279f9346d8270a7e28a07d30b4a7104b21fbfbd1a81410e6a7dc0827127331a8f10226d5b8d2ddaacb94c9f76ecc6d15d728ead27a WHIRLPOOL 7fa1b30ba031b8214ae8fa64ac0d7b4586a9551869f76b16cc5b0d9b043abb79a12905802c34d87ef519183e940735cfdf8e8b7d2ed1bab144d013b2aa28aae9
diff --git a/net-misc/spiped/spiped-1.5.0-r1.ebuild b/net-misc/spiped/spiped-1.5.0-r1.ebuild
deleted file mode 100644
index 517c5377a96e..000000000000
--- a/net-misc/spiped/spiped-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="secure pipe daemon"
-HOMEPAGE="http://www.tarsnap.com/spiped.html"
-SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-MY_PN="${PN/d/}"
-
-DEPEND="dev-libs/openssl:*"
-
-# Blocker added due to #548126
-RDEPEND="${DEPEND}
- !net-mail/qlogtools"
-
-src_install() {
- dobin ${MY_PN}/${MY_PN}
- dosbin ${PN}/${PN}
-
- doman ${MY_PN}/"${MY_PN}.1" ${PN}/"${PN}.1"
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
- dodir etc/${PN}
-}
-
-pkg_postinst() {
- elog
- elog "You will need to configure spiped via its"
- elog "configuration file located in /etc/conf.d/."
- elog
- elog "Please have a look at this file prior to starting up spiped!"
- elog
-}
diff --git a/net-misc/spiped/spiped-1.5.0-r2.ebuild b/net-misc/spiped/spiped-1.5.0-r2.ebuild
deleted file mode 100644
index 6ec20666c0c0..000000000000
--- a/net-misc/spiped/spiped-1.5.0-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="secure pipe daemon"
-HOMEPAGE="http://www.tarsnap.com/spiped.html"
-SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-MY_PN="${PN/d/}"
-
-DEPEND="
- dev-libs/openssl:*"
-
-# Blocker added due to #548126
-RDEPEND="
- ${DEPEND}
- !net-mail/qlogtools"
-
-src_install() {
- dobin "${MY_PN}/${MY_PN}"
- dosbin "${PN}/${PN}"
-
- doman "${MY_PN}/${MY_PN}.1" "${PN}/${PN}.1"
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
- dodir "etc/${PN}"
-}
-
-pkg_postinst() {
- elog
- elog "You will need to configure spiped via its"
- elog "configuration file located in /etc/conf.d/."
- elog
- elog "Please have a look at this file prior to starting up spiped!"
- elog
-}
diff --git a/net-misc/spiped/spiped-1.5.0-r3.ebuild b/net-misc/spiped/spiped-1.5.0-r3.ebuild
deleted file mode 100644
index ed4c445cb511..000000000000
--- a/net-misc/spiped/spiped-1.5.0-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="secure pipe daemon"
-HOMEPAGE="http://www.tarsnap.com/spiped.html"
-SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-
-MY_PN="${PN/d/}"
-
-DEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )"
-
-# Blocker added due to #548126
-RDEPEND="
- ${DEPEND}
- !net-mail/qlogtools"
-
-src_install() {
- dobin "${MY_PN}/${MY_PN}"
- dosbin "${PN}/${PN}"
-
- doman "${MY_PN}/${MY_PN}.1" "${PN}/${PN}.1"
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
- dodir "etc/${PN}"
-}
-
-pkg_postinst() {
- elog
- elog "You will need to configure spiped via its"
- elog "configuration file located in /etc/conf.d/."
- elog
- elog "Please have a look at this file prior to starting up spiped!"
- elog
-}
diff --git a/net-misc/spiped/spiped-1.6.0-r1.ebuild b/net-misc/spiped/spiped-1.6.0-r1.ebuild
index cccae52737d3..b3ab508eb627 100644
--- a/net-misc/spiped/spiped-1.6.0-r1.ebuild
+++ b/net-misc/spiped/spiped-1.6.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="libressl"
MY_PN="${PN/d/}"
diff --git a/net-misc/spiped/spiped-1.6.0.ebuild b/net-misc/spiped/spiped-1.6.0.ebuild
deleted file mode 100644
index ed4c445cb511..000000000000
--- a/net-misc/spiped/spiped-1.6.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="secure pipe daemon"
-HOMEPAGE="http://www.tarsnap.com/spiped.html"
-SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-
-MY_PN="${PN/d/}"
-
-DEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )"
-
-# Blocker added due to #548126
-RDEPEND="
- ${DEPEND}
- !net-mail/qlogtools"
-
-src_install() {
- dobin "${MY_PN}/${MY_PN}"
- dosbin "${PN}/${PN}"
-
- doman "${MY_PN}/${MY_PN}.1" "${PN}/${PN}.1"
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
- dodir "etc/${PN}"
-}
-
-pkg_postinst() {
- elog
- elog "You will need to configure spiped via its"
- elog "configuration file located in /etc/conf.d/."
- elog
- elog "Please have a look at this file prior to starting up spiped!"
- elog
-}
diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml
index 69e2d4564697..f74a15637a8b 100644
--- a/net-misc/vde/metadata.xml
+++ b/net-misc/vde/metadata.xml
@@ -6,7 +6,8 @@
NP-Hardass
- mlspamcb@noci.xs4all.nl
+ mlspamcb@noci.work
+ Nico Baggus
jmbsvicetto@gentoo.org
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 20367ae08a27..17d30bcd9d77 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
DIST youtube-dl-2017.03.16.tar.gz 2631620 SHA256 55df3cbda9cf86e49baf54040340ec74c692bb3d6da3d2f5a1bc1238017dd492 SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c WHIRLPOOL 8345da00074e62ec9a9c244cb9ef64930fbd0e5e9e5bc1709bfcf56517cc6312031a09523c3016db2a1542c16a0297bea9d6883a201ae94e347e358307e92422
-DIST youtube-dl-2017.09.15.tar.gz 2795468 SHA256 eef429c94978febb7b022ad7805adda3fdc78814c92c293eebfe2eb83fbe88cf SHA512 91b286485ba9b8706b8606f97259796b26496e4f6d0ebc61bc8f8e15eb170008be7abb868636f0ceb1d658d8bf4bdba09fa179e53d98fea94cba2d6c5b4ba363 WHIRLPOOL 98d79b73c67afacffb7409deee6b4ab7200df6a5efdde546b16b08d1bf2c164ebcadd9a8079cd789cb6051087c09e7553ce39fbb88ce5512c2765d95c1a240ca
DIST youtube-dl-2017.09.24.tar.gz 2810181 SHA256 7d7140ce63377e84a2072b4922809c7a2e90e3916cde2f4f1cc8860664395548 SHA512 de96406aeabb993a39941f5c67947fd1b77ec003be36b215cb3df1e5c90d63c7c570a5ca7627f5b2faae6a15ee07d45cf339cac6b511890acf49c5c38e6c5672 WHIRLPOOL e248990cce1bcbe50ae9e0ac6a95d760948809ec371b93126011d71599e721f1e9b0784690b832d3c5c04fb55c048b08c091193f821b18e1211f4c393ab2d017
+DIST youtube-dl-2017.10.01.tar.gz 2813364 SHA256 0b4f0e12b099c46ad47597764b10f45ceae3935834abf99d49ccd8cfb48dff10 SHA512 f1eafecb2418276df7e7bdb73402779521197f551be3431eda9727390884d42c50a73895d0c58fc3783ab04712e4bf5aa072dad6d3241724e19e6c4c80c0080d WHIRLPOOL 281b7cdb288c1890e785d15cf1aa7c1f8e33976c521559551924b0f18b26981fb33a0b60ff86df796613ef34d273a13b3ada3c5f3e851534dad4bf124260f509
diff --git a/net-misc/youtube-dl/youtube-dl-2017.09.15.ebuild b/net-misc/youtube-dl/youtube-dl-2017.10.01.ebuild
similarity index 99%
rename from net-misc/youtube-dl/youtube-dl-2017.09.15.ebuild
rename to net-misc/youtube-dl/youtube-dl-2017.10.01.ebuild
index fa2e8cbf808f..975ce26c347e 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.09.15.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.10.01.ebuild
@@ -2,7 +2,6 @@
# 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 bash-completion-r1 distutils-r1
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 2677674e2dfd..45d909cec84a 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -1,3 +1,4 @@
DIST nzbget-14.1.tar.gz 1332334 SHA256 a16b816b61f7035cc373e9b77094ca474d5b7b7f7ceff5fa8818249181db4b18 SHA512 fae938529bb3968c0161f63ec3af07f844a8128b61abf6298457a4878ac0d47541d76730c8a068509fa091b102de07c9d28dcd668a8192fcfac60980f69be56d WHIRLPOOL 9e9636b67d0af7780d2cc8f897465f5a2e23cd8695b3bd982e3e9f78d68adb34f84faf59253044c7b2f95db737cf59207b35cf312d1f1825fe4b9ecce2e4014f
DIST nzbget-19.1.tar.gz 1809849 SHA256 06df42356ac2d63bbc9f7861abe9c3216df56fa06802e09e8a50b05f4ad95ce6 SHA512 3ba7cd7f7fec28e29129be0a1ca5879a0593bc54be49e3776e84eeb7804377eec47106aa2371b31dec7d9152301d68b199ce9e66db714195defc8e15ef636532 WHIRLPOOL 157168fde3152a02d4f1d8b257998851b05b6c1dcb0a839868f0d85859ae9539ef6281035c44ccdbc981ec6f093f28f8333cc40c4871e4d7f415658a5599f5aa
DIST nzbget-20.0_pre2075.tar.gz 1817105 SHA256 0fcb83077c878db13e13590690a873d14c5ef62df777bb80ac9f105034388750 SHA512 d386b61dee32e3f30d580eba484f1431fb29ced31e63adc6135f88e603993502e3d93f2d36a3ce654492a014a51c07451361c1954c62e7ccc439d2a3fc48554f WHIRLPOOL e37b53aa596b094e3b2e783b365e4bc421d0a8b35bb8aaea5de201da55d3fd0b9c3c25122476313900ff02fa982b8a56261af0cd467a385bae7791c437ed5172
+DIST nzbget-20.0_pre2108.tar.gz 1820172 SHA256 6889079774f847334dbecf0c4e700eaab51bb61025df06c3a372947e85e0aee1 SHA512 4abdab3d45829eb5574d2cb6b532372ba0a9c62a701acdebe498b71466f7ac8c7b47aa85ed80c1132c10e86b829c48dd6df4826d20f542a7a935aaa958ba0222 WHIRLPOOL 723e3da5d6d16002539f792f3a4a78b8e3ba821839093b667470c2ae94e6b3c7ee62994a5ee8630eb7362825a04d4d16ae3100f149b8ba182cf6928fc214109c
diff --git a/net-nntp/nzbget/nzbget-20.0_pre2108.ebuild b/net-nntp/nzbget/nzbget-20.0_pre2108.ebuild
new file mode 100644
index 000000000000..c6d86f04383d
--- /dev/null
+++ b/net-nntp/nzbget/nzbget-20.0_pre2108.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic user
+
+MY_PV=${PV/_pre/-r}
+MY_P=${PN}-${PV/_pre/-testing-r}
+
+DESCRIPTION="A command-line based binary newsgrabber supporting .nzb files"
+HOMEPAGE="https://nzbget.net/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="debug gnutls ncurses parcheck ssl test zlib"
+
+RDEPEND="dev-libs/libxml2
+ ncurses? ( sys-libs/ncurses:0= )
+ ssl? (
+ gnutls? (
+ net-libs/gnutls:=
+ dev-libs/nettle:=
+ )
+ !gnutls? ( dev-libs/openssl:0= )
+ )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+DOCS=( ChangeLog README nzbget.conf )
+
+S=${WORKDIR}/${PN}-${PV/_pre*/-testing}
+
+check_compiler() {
+ if [[ ${MERGE_TYPE} != binary ]] && ! test-flag-CXX -std=c++14; then
+ eerror "${P} requires a C++14-capable compiler. Your current compiler"
+ eerror "does not seem to support the -std=c++14 option. Please"
+ eerror "upgrade to gcc-4.9 or an equivalent version supporting C++14."
+ die "The currently active compiler does not support -std=c++14"
+ fi
+}
+
+pkg_pretend() {
+ check_compiler
+}
+
+pkg_setup() {
+ check_compiler
+}
+
+src_prepare() {
+ default
+ eautoreconf
+
+ sed -i 's:^ScriptDir=.*:ScriptDir=/usr/share/nzbget/ppscripts:' nzbget.conf || die
+
+ sed \
+ -e 's:^MainDir=.*:MainDir=/var/lib/nzbget:' \
+ -e 's:^LockFile=.*:LockFile=/run/nzbget/nzbget.pid:' \
+ -e 's:^LogFile=.*:LogFile=/var/log/nzbget/nzbget.log:' \
+ -e 's:^WebDir=.*:WebDir=/usr/share/nzbget/webui:' \
+ -e 's:^ConfigTemplate=.*:ConfigTemplate=/usr/share/nzbget/nzbget.conf:' \
+ -e 's:^DaemonUsername=.*:DaemonUsername=nzbget:' \
+ nzbget.conf > nzbgetd.conf || die
+}
+
+src_configure() {
+ econf \
+ $(use_enable debug) \
+ $(use_enable ncurses curses) \
+ $(use_enable parcheck) \
+ $(use_enable ssl tls) \
+ $(use_enable zlib gzip) \
+ $(use_enable test tests) \
+ --with-tlslib=$(usex gnutls GnuTLS OpenSSL)
+}
+
+src_test() {
+ ./nzbget --tests || die "Tests failed"
+}
+
+src_install() {
+ default
+
+ insinto /etc
+ doins nzbget.conf
+ doins nzbgetd.conf
+
+ keepdir /var/lib/nzbget/{dst,nzb,queue,tmp}
+ keepdir /var/log/nzbget
+
+ newinitd "${FILESDIR}"/nzbget.initd nzbget
+ newconfd "${FILESDIR}"/nzbget.confd nzbget
+}
+
+pkg_preinst() {
+ enewgroup nzbget
+ enewuser nzbget -1 -1 /var/lib/nzbget nzbget
+
+ fowners nzbget:nzbget /var/lib/nzbget/{dst,nzb,queue,tmp}
+ fperms 750 /var/lib/nzbget/{queue,tmp}
+ fperms 770 /var/lib/nzbget/{dst,nzb}
+
+ fowners nzbget:nzbget /var/log/nzbget
+ fperms 750 /var/log/nzbget
+
+ fowners nzbget:nzbget /etc/nzbgetd.conf
+ fperms 640 /etc/nzbgetd.conf
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog
+ elog "Please add users that you want to be able to use the system-wide"
+ elog "nzbget daemon to the nzbget group. To access the daemon run nzbget"
+ elog "with the --configfile /etc/nzbgetd.conf option."
+ elog
+ fi
+}
diff --git a/net-vpn/tor/tor-0.3.0.10.ebuild b/net-vpn/tor/tor-0.3.0.10.ebuild
index 2548a4498dab..e6148d5d5b4a 100644
--- a/net-vpn/tor/tor-0.3.0.10.ebuild
+++ b/net-vpn/tor/tor-0.3.0.10.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PF}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~mips ~ppc ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86 ~ppc-macos"
IUSE="libressl scrypt seccomp selinux systemd tor-hardening test web"
DEPEND="
diff --git a/net-vpn/wireguard/wireguard-0.0.20171001.ebuild b/net-vpn/wireguard/wireguard-0.0.20171001.ebuild
index 1c1f3973c943..303cc217b58b 100644
--- a/net-vpn/wireguard/wireguard-0.0.20171001.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20171001.ebuild
@@ -38,7 +38,7 @@ pkg_setup() {
}
src_compile() {
- BUILD_PARAMS="KERNELDIR=${KERNEL_DIR} V=1"
+ BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
use module && linux-mod_src_compile
use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools
diff --git a/net-vpn/wireguard/wireguard-9999.ebuild b/net-vpn/wireguard/wireguard-9999.ebuild
index 1c1f3973c943..303cc217b58b 100644
--- a/net-vpn/wireguard/wireguard-9999.ebuild
+++ b/net-vpn/wireguard/wireguard-9999.ebuild
@@ -38,7 +38,7 @@ pkg_setup() {
}
src_compile() {
- BUILD_PARAMS="KERNELDIR=${KERNEL_DIR} V=1"
+ BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
use module && linux-mod_src_compile
use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index fb003407a9ed..f9284d17fab6 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,7 +1,9 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# This file requires >=portage-2.1.1
+# Sergei Trofimovich (3 Oct 2017)
+# Incomplete support, bug #605878.
+net-vpn/tor seccomp
# Michał Górny (23 Mar 2017)
# Most of clang runtimes are not supported here
diff --git a/profiles/package.mask b/profiles/package.mask
index 1f6f318b2e22..c245d05d9b10 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -211,13 +211,6 @@ games-rpg/nwn-penultima
games-rpg/nwn-penultimarerolled
games-rpg/nwn-shadowlordsdreamcatcherdemon
-# Kent Fredric (05 Sep 2017)
-# Broken since Perl 5.16 circa 2012, no longer maintained upstream
-# Bug: https://bugs.gentoo.org/623900
-# Bug: https://rt.cpan.org/Public/Bug/Display.html?id=85991
-# Removal in 30 days
-dev-perl/XML-AutoWriter
-
# Gilles Dartiguelongue (04 Sep 2017)
# Incompatible changes in API in Enchant 2. Bug #629838.
>=app-text/enchant-2
@@ -228,11 +221,6 @@ dev-perl/XML-AutoWriter
# See also our tracker bug: https://bugs.gentoo.org/629836
>=app-text/poppler-0.58.0
-# Michael Palimaka (03 Sep 2017)
-# Dead upstream. Use media-libs/phonon instead.
-# Masked for removal in 30 days. Bug #629144.
-dev-qt/qtphonon
-
# Gilles Dartiguelongue (2 Sep 1017)
# Gnome 3.26 package mask
>=app-text/libgepub-0.5
@@ -242,66 +230,16 @@ dev-qt/qtphonon
# net-analyzer/ntopng is available
net-analyzer/ntop
-# James Le Cuirot (29 Aug 2017)
-# The FOSS-friendly oracle-javamail has rendered other implementations
-# and the virtual obsolete. Removal in 30 days. See bug #553186.
-dev-java/gnu-classpath-inetlib
-dev-java/gnu-javamail
-dev-java/javax-mail
-dev-java/sun-javamail
-java-virtuals/javamail
-
-# James Le Cuirot (29 Aug 2017)
-# Old and holding up the removal of Java 7. Still alive upstream but
-# new versions have proven too tricky to package under our current
-# infrastructure. It may return one day. Removal in 30 days.
-app-benchmarks/jmeter
-
-# Jonas Stein (29 Aug 2017)
-# SRC_URI and HOMEPAGE are dead and the ebuild is in a very bad
-# state.
-# Removal in 30 days. #629112.
-app-text/adiff
-
-# Michał Górny (29 Aug 2017)
-# The new snapshot introduces more issues than it fixes, even after
-# reverting one of the most breaking commits. Downgrade to 4.13.0
-# is suggested, I will probably add a new revision with some specific
-# patches if necessary.
-=xfce-base/xfwm4-4.13.0_p20170825
-
-# Michał Górny (28 Aug 2017)
-# Alike xfce4-mixer, relies on gstreamer:0.10 (gstreamer:1.0 removed
-# mixer wrappers). Last commit upstream in 2014. PulseAudio users
-# can switch to xfce-extra/xfce4-pulseaudio-plugin
-# or xfce-extra/xfce4-volumed-pulse.
-# Removal in 30 days. Bug #629212.
-xfce-extra/xfce4-volumed
-
# Anthony G. Basile (27 Aug 2017)
# Upstream is no longer providing public patches
sys-kernel/hardened-sources
-# Mikle Kolyada (26 Aug 2017)
-# Masked for removal in 30 days.
-# No major keywords, old EAPI, no maintainer.
-# Use sys-apps/less instead.
-sys-apps/more
-
# Patrice Clement (23 Aug 2017)
# Packages depending on this library need to be tested first before
# it is unmasked. Possibly some slotting is still needed.
# Package testing tracked in bug #611022.
>=dev-libs/msgpack-1.4.2
-# Michał Górny (21 Aug 2017)
-# xfce4-mixer is discontinued upstream and no longer considered part
-# of the DE since 4.12. It requires vulnerable gstreamer:0.10, and no
-# longer builds with the development versions of core Xfce4 components.
-# The suggested replacement is xfce-extra/xfce4-pulseaudio-plugin.
-# Removal in 30 days. Bug #628424.
-xfce-extra/xfce4-mixer
-
# Hanno Boeck (21 Aug 2017)
# Open security bugs, no upstream, bug 628432
# Alternatives: app-arch/libarchive, app-arch/unar
@@ -402,24 +340,10 @@ dev-lang/spidermonkey:52
net-vpn/kvpnc
# Pacho Ramos (14 Jul 2017)
-# Doesn't compile, upstream dead, removal in 2 months (#584296).
+# Randomly broken due to sys-devel/binutils-config bug (#584296).
+# Unmask when it is finally fixed, so people can build the package.
dev-util/mutrace
-# Pacho Ramos (14 Jul 2017)
-# Multiple unresolved bugs (#600680), need major version bumps and a
-# maintainer, removal in 2 months.
-dev-libs/libRocket
-games-fps/warsow
-
-# Pacho Ramos (14 Jul 2017)
-# Dead for ages, relies on dead libs (#622010), you can move to moserial, cutecom or
-# minicom. Removal in 2 months.
-net-dialup/gtkterm
-
-# Pacho Ramos (14 Jul 2017)
-# Doesn't build (#623562). Removal in 2 months.
-media-plugins/vdr-skinnopacity
-
# Lars Wendler (07 Jul 2017)
# Masked until >=net-fs/samba-4.7 is in the tree and
# unmasked. (bug #624106)
@@ -701,13 +625,6 @@ x11-libs/gtk+:1
=dev-db/redis-3.2.8-r1
=dev-db/redis-3.2.8-r3
-# Ian Stakenvicius (17 Nov 2016)
-# Does not honour LD_LIBRARY_PATH set in the environment, causing
-# all mozilla packages to fail in src_install() when xpcshell is
-# called in ${WORKDIR}, #580726
-# Segfaults when creating directories #578582
-=sys-apps/sandbox-2.11*
-
# Michał Górny (17 Nov 2016)
# New version masked for testing. It supports source-window buffer size
# over 2G but it 'currently performs 3-5% slower and has 1-2% worse
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index 950bdf8f098b..f3bea2e52345 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -20,10 +20,6 @@ media-video/mpv lua luajit -sdl
# Needed by x11-misc/xdg-utils.
app-text/xmlto text
-# Serget Popov (09 Feb 2016)
-# Do not force Qt4 implemenation of RetroShare
-net-p2p/retroshare -qt4
-
# Alexandre Rostovtsev (19 Feb 2015)
# Set reasonable default toolkit for all desktops to prevent emerge error
# when USE=tools
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 7a29a153a8c5..05e33501bcf3 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -1,23 +1,26 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# Required by kde-plasma/plasma-pa
-media-sound/pulseaudio gnome
-
# Avoid circular dependency when installing from scratch
dev-util/cmake -qt5
# Not required, but makes life easier with Qt; bug 457934
app-arch/unzip natspec
-# Required by kde-apps/akonadi
-dev-qt/qtsql mysql
-
# Required by dev-qt/qtcore
dev-libs/libpcre pcre16
-# Required by media-gfx/graphviz which is required by kde-apps/kcachegrind
-media-libs/gd fontconfig
+# Required by kde-frameworks/kcoreaddons
+dev-qt/qtcore:5 icu
+
+# Required by kde-frameworks/kwayland
+dev-qt/qtgui:5 egl
+
+# Required by kde-apps/okteta
+dev-qt/qtscript:5 scripttools
+
+# Required by kde-apps/akonadi
+dev-qt/qtsql:5 mysql
# Required by kde-apps/kate[addons]
dev-libs/libgit2 threads
@@ -28,32 +31,29 @@ kde-apps/ktp-common-internals otr
# Required by kde-apps/libkexiv2
media-gfx/exiv2 xmp
-# Required by kde-apps/okteta
-dev-qt/qtscript scripttools
-
-# Required by kde-frameworks/kactivities
-sys-libs/zlib minizip
-
# Required by kde-frameworks/kapidox
media-gfx/graphviz python
-# Required by kde-frameworks/kcoreaddons
-dev-qt/qtcore icu
+# Required by media-gfx/graphviz which is required by kde-apps/kcachegrind
+media-libs/gd fontconfig
+
+# Required by dev-qt/qtwebengine
+media-libs/libvpx svc
# Required by kde-plasma/kwin
media-libs/mesa egl wayland
-# Required by kde-frameworks/kwayland
-dev-qt/qtgui:5 egl
-
# Required by kde-apps/kdenlive
>=media-libs/mlt-0.9.8-r2 ffmpeg kdenlive melt
# Required by app-office/libreoffice
media-libs/phonon designer
-# Required by dev-qt/qtwebengine
-media-libs/libvpx svc
+# Required by kde-plasma/plasma-pa
+media-sound/pulseaudio gnome
+
+# Required by kde-frameworks/kactivities
+sys-libs/zlib minizip
# FIXME: unnecessary REQUIRED_USE ^^ ( qt4 qt5 )
/dev/null ; then
- ln -s ${def_libdir} "${prefix}lib" || die
- else
- die "non-empty dir found where we needed a symlink: ${prefix}lib"
- fi
- else
- # nothing exists, so just set it up sanely
- ewarn "Initializing ${prefix}lib as a symlink"
- mkdir -p "${prefix}" || die
- rm -f "${prefix}lib" || die
- ln -s ${def_libdir} "${prefix}lib" || die
- mkdir -p "${prefix}${def_libdir}" #423571
- fi
- else
- # we need to make sure "lib" is a dir
- if [ -h "${prefix}lib" ] ; then
- # "lib" is a symlink, so need to convert to a dir
- ewarn "Converting ${prefix}lib from a symlink to a dir"
- rm -f "${prefix}lib" || die
- if [ -d "${prefix}lib32" ] ; then
- ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
- mv "${prefix}lib32" "${prefix}lib" || die
- else
- mkdir -p "${prefix}lib" || die
- fi
- elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
- # make sure the old "lib" ABI location does not exist; we
- # only symlinked the lib dir on systems where we moved it
- # to "lib32" ...
- case ${CHOST} in
- *-gentoo-freebsd*) ;; # We want it the other way on fbsd.
- i?86*|x86_64*|powerpc*|sparc*|s390*)
- if [ -d "${prefix}lib32" ] ; then
- rm -f "${prefix}lib32"/.keep
- if ! rmdir "${prefix}lib32" 2>/dev/null ; then
- ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
- die "non-empty dir found where there should be none: ${prefix}lib32"
- fi
- fi
- ;;
- esac
- else
- # nothing exists, so just set it up sanely
- ewarn "Initializing ${prefix}lib as a dir"
- mkdir -p "${prefix}lib" || die
- fi
- fi
- done
-}
-
-pkg_preinst() {
- # Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of
- # the baselayout-1.x ebuild copies all the real configs from the user's
- # /etc/conf.d into ${D}, it makes them all appear to be the default
- # versions. In order to protect them from being unmerged after this
- # upgrade, modify their timestamps.
- touch "${EROOT}"/etc/conf.d/* 2>/dev/null
-
- # This is written in src_install (so it's in CONTENTS), but punt all
- # pending updates to avoid user having to do etc-update (and make the
- # pkg_postinst logic simpler).
- rm -f "${EROOT}"/etc/._cfg????_gentoo-release
-
- # We need to install directories and maybe some dev nodes when building
- # stages, but they cannot be in CONTENTS.
- # Also, we cannot reference $S as binpkg will break so we do this.
- multilib_layout
- if use build ; then
- emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout || die
- fi
- rm -f "${ED}"/usr/share/${PN}/Makefile
-}
-
-src_prepare() {
- default
- if use prefix; then
- sed -i -r\
- -e "/PATH=/!s:/(etc|usr/bin|bin):\"${EPREFIX}\"/\1:g" \
- -e "/PATH=/s|([:\"])/|\1${EPREFIX}/|g" \
- -e "/PATH=.*\/sbin/s|\"$|:/usr/sbin:/sbin\"|" \
- -e "/PATH=.*\/bin/s|\"$|:/usr/bin:/bin\"|" \
- etc/profile || die
- sed -i -r \
- -e "s@:/bin@:${EPREFIX}/bin@g" \
- -e "s:/(etc/env.d|opt|usr):${EPREFIX}/\1:g" \
- -e "/^PATH=/s|\"$|:${EPREFIX}/usr/sbin:${EPREFIX}/sbin\"|" \
- etc/env.d/50baselayout || die
- sed -i "s:/bin:${EPREFIX}/bin:" etc/shells || die
- sed -i -r \
- -e "s,:/(root|bin|sbin|var|),:${EPREFIX}/\1,g" \
- share.Linux/passwd || die
- fi
-
- # handle multilib paths. do it here because we want this behavior
- # regardless of the C library that you're using. we do explicitly
- # list paths which the native ldconfig searches, but this isn't
- # problematic as it doesn't change the resulting ld.so.cache or
- # take longer to generate. similarly, listing both the native
- # path and the symlinked path doesn't change the resulting cache.
- local libdir ldpaths
- for libdir in $(get_all_libdirs) ; do
- ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
- ldpaths+=":${EPREFIX}/usr/local/${libdir}"
- done
- echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-
- # rc-scripts version for testing of features that *should* be present
- echo "Gentoo Base System release ${PV}" > etc/gentoo-release
-}
-
-src_install() {
- emake \
- OS=$(usex kernel_FreeBSD BSD Linux) \
- DESTDIR="${ED}" \
- install
- dodoc ChangeLog
-
- # need the makefile in pkg_preinst
- insinto /usr/share/${PN}
- doins Makefile
-}
-
-pkg_postinst() {
- local x
-
- # We installed some files to /usr/share/baselayout instead of /etc to stop
- # (1) overwriting the user's settings
- # (2) screwing things up when attempting to merge files
- # (3) accidentally packaging up personal files with quickpkg
- # If they don't exist then we install them
- for x in master.passwd passwd shadow group fstab ; do
- [ -e "${EROOT}etc/${x}" ] && continue
- [ -e "${EROOT}usr/share/baselayout/${x}" ] || continue
- cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc
- done
-
- # Force shadow permissions to not be world-readable #260993
- for x in shadow ; do
- [ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}"
- done
-
- # Take care of the etc-update for the user
- if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then
- mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release
- fi
-
- # whine about users that lack passwords #193541
- if [[ -e "${EROOT}"etc/shadow ]] ; then
- local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
- if [[ -n ${bad_users} ]] ; then
- echo
- ewarn "The following users lack passwords!"
- ewarn ${bad_users}
- fi
- fi
-
- # baselayout leaves behind a lot of .keep files, so let's clean them up
- find "${EROOT}"lib*/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null
- find "${EROOT}"lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null
-
- # whine about users with invalid shells #215698
- if [[ -e "${EROOT}"etc/passwd ]] ; then
- local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort)
- if [[ -n ${bad_shells} ]] ; then
- echo
- ewarn "The following users have non-existent shells!"
- ewarn "${bad_shells}"
- fi
- fi
-
- # https://bugs.gentoo.org/361349
- if use kernel_linux; then
- mkdir -p "${EROOT}"run
-
- if ! grep -qs "^tmpfs.*/run " "${ROOT}"proc/mounts ; then
- echo
- ewarn "You should reboot the system now to get /run mounted with tmpfs!"
- fi
- fi
-
- for x in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 2.4 ${v}; then
- ewarn "After updating ${EROOT}etc/profile, please run"
- ewarn "env-update and . /etc/profile"
- break
- fi
- done
-
- if [[ -e "${EROOT}"etc/env.d/00basic ]]; then
- ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout"
- ewarn "Please migrate your changes."
- fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index 0d17f0e8894a..d137c15e5274 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
@@ -224,10 +224,12 @@ pkg_postinst() {
if use kernel_linux; then
mkdir -p "${EROOT}"run
- if ! grep -qs "^tmpfs.*/run " "${ROOT}"proc/mounts ; then
- echo
- ewarn "You should reboot the system now to get /run mounted with tmpfs!"
- fi
+ local found fstype mountpoint
+ while read -r _ mountpoint fstype _; do
+ [[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+ done < "${ROOT}"proc/mounts
+ [[ -z ${found} ]] &&
+ ewarn "You should reboot now to get /run mounted with tmpfs!"
fi
for x in ${REPLACING_VERSIONS}; do
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index df76aeb6f1d9..e99219d1888a 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,3 +1 @@
-DIST gentoo-functions-0.10.tar.gz 11432 SHA256 709c8b22f404001a512e47a7a4d3192070b3e150fb9d0f943de09736d665b0db SHA512 2622cede032089c7b8a2dec576e848852f9964e0198ab161f0ff5c426c542d0849bd3d30a40c296805bfec90b533c419df43c7975ed85678471483c827ca4cdb WHIRLPOOL 6559c62083eca8a016f005d1003c8a0b6e2c89836c130cec9e0a40575e1604039f669313547c63f6cf84f1a40cdd7249d227c6f0b57f282764df8d20ef239051
-DIST gentoo-functions-0.11.tar.gz 11511 SHA256 e861e1fc4da45c07c62889d80e9d2d869ef92bba4f96d1b41aff119c3e9c8099 SHA512 eb9a0ee72c31ca18b6b71e08223b3c0ba822333f051947579e4f66b26082c5e6fc91c2da34967cf9fed9e2b5143690e0e1166282c26d122c5aaa24848b8418a3 WHIRLPOOL 37185f024b67ac0ba40ff5aff44e054f1b6ce4f657834d6f06bc95ccd3a3d8f74bc9faae54d1f386dfbb41e54e655f3023fda064cc3b30243ed58029765c024f
DIST gentoo-functions-0.12.tar.gz 11514 SHA256 4a6ddb1d8be7b52aae68761fb26546663b6b0e74b155df263cddfbfa72373965 SHA512 181e09216e1ed78f590e0bb50c60cfb0295bfeef335ed6c957ea7f2a1d6145d91c0a6dc4377bd6cd538fb4e5871e9a5ef8332d91bc91931792d5f05f62bc4705 WHIRLPOOL 18b10a8fab6c4bd4f206d752915d5a43ee21d60d0dec952b2c5db44c5b9e9abfa05aca34984750a3fbbdc48b159a017cb9923afd92b79e3e868da702ef8db267
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.10.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.10.ebuild
deleted file mode 100644
index 3ab4bcd0c376..000000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-0.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
-else
- SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~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"
-fi
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="base functions required by all gentoo systems"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
- tc-export CC
- append-lfs-flags
-}
-
-src_install() {
- emake install DESTDIR="${ED}"
-}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.11.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.11.ebuild
deleted file mode 100644
index e6bc35afed3e..000000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-0.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
-else
- SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- 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"
-fi
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="base functions required by all Gentoo systems"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
- tc-export CC
- append-lfs-flags
-}
-
-src_install() {
- emake install DESTDIR="${ED}"
-}
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 814ac9e504bc..08ee8ea13000 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,2 +1,3 @@
DIST hwids-20170328.tar.gz 2049249 SHA256 e46abb9ccb54aff728bb0502405aa700974a2a7366d3bb257967ce60d847cfb3 SHA512 ffccbcda78f856b93026102d1d7f62f4639910671c63e30471c990b1029db94b542c555b6ad69820f8a91a45ef9d52c320b9767d38ff08b6e72c041a28e6f0f3 WHIRLPOOL c08493ad1e96c53ec1cc7b7df46e6e8f9db982bcdda57595f7a51820b43ab955a40760adfa9d03bfbc283a05dffe18075d0244a638b5ecf94a4068906f2ffc24
DIST hwids-20170715.tar.gz 2091853 SHA256 5a20e6f0f3567b23dfc45a103c0b73333dd3a73a1ea7256b68374e841586e80e SHA512 6f1d2e3d7b7fc260f02b3cc87b46385292503dda2a46dea4e69b02915e9d411e9682fb98ca921eb45289e416320a8ef46a3df0753f8f820d20c719663076bd88 WHIRLPOOL 74b77157c1a2f8496bad708009017b925b651f50ca6919a3acd112cab84fcd6512ecb8bd95587a8572e4f79258db7173c3d18c50a21f2fe8f5ef171a467721bd
+DIST hwids-20171003.tar.gz 3035908 SHA256 9befd0d4d796fe77f3ab7576d5beba8ea5c0066285db255d93389d1592d5cd2f SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a WHIRLPOOL e3bfeb025e60c11dc6f576b044ceee10e17bd318cbde26de64ea146519f707c4d95fdf592f90becd860df5059af272074871b33f5d039392651845ebbf785737
diff --git a/sys-apps/hwids/hwids-20171003.ebuild b/sys-apps/hwids/hwids-20171003.ebuild
new file mode 100644
index 000000000000..3f04c8534c6c
--- /dev/null
+++ b/sys-apps/hwids/hwids-20171003.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit udev
+
+DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
+HOMEPAGE="https://github.com/gentoo/hwids"
+if [[ ${PV} == "99999999" ]]; then
+ PYTHON_COMPAT=( python3_6 )
+ inherit git-r3 python-any-r1
+ EGIT_REPO_URI="${HOMEPAGE}.git"
+else
+ SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+ 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"
+fi
+
+LICENSE="|| ( GPL-2 BSD ) public-domain"
+SLOT="0"
+IUSE="+net +pci +udev +usb"
+
+DEPEND=""
+RDEPEND="
+ udev? ( virtual/udev )
+ !=virtual/udev-206
-)"
-[[ ${PV} == "99999999" ]] && DEPEND+=" udev? ( net-misc/curl )"
-RDEPEND="!/dev/null 2>&1
- if [ ${?} = 0 ]; then
- if ! ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ); then
- ebegin " Loading i2c-core"
- modprobe i2c-core >/dev/null 2>&1
- if [ ${?} != 0 ]; then
- eerror " Could not load i2c-core!"
- eend 1
- fi
- ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ) || return 1
- eend 0
- fi
- elif ! [ -e /proc/sys/dev/sensors ]; then
- ebegin " Loading i2c-proc"
- modprobe i2c-proc >/dev/null 2>&1
- if [ ${?} != 0 ]; then
- eerror " Could not load i2c-proc!"
- eend 1
- fi
- [ -e /proc/sys/dev/sensors ] || return 1
- eend 0
- fi
-
- i=0
- while true; do
- module=`eval echo '$'MODULE_${i}`
- module_args=`eval echo '$'MODULE_${i}_ARGS`
- if [ -z "${module}" ]; then
- break
- fi
- ebegin " Loading ${module}"
- modprobe ${module} ${module_args} >/dev/null 2>&1
- eend $?
- i=$(($i+1))
- done
- fi
-
- if [ "${INITSENSORS}" = "yes" ]; then
- if ! [ -f /etc/sensors3.conf ]; then
- eerror "/etc/sensors3.conf does not exist!"
- return 1
- fi
-
- ebegin "Initializing sensors"
- /usr/bin/sensors -s >/dev/null 2>&1
- eend ${?}
- fi
-}
-
-stop() {
- checkconfig || return 1
-
- if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
- einfo "Unloading lm_sensors modules..."
-
- # find the highest possible MODULE_ number
- i=0
- while true; do
- module=`eval echo '$'MODULE_${i}`
- if [ -z "${module}" ] ; then
- break
- fi
- i=$(($i+1))
- done
-
- while [ ${i} -gt 0 ]; do
- i=$(($i-1))
- module=`eval echo '$'MODULE_${i}`
- ebegin " Unloading ${module}"
- rmmod ${module} >/dev/null 2>&1
- eend $?
- done
-
- if [ -e /proc/sys/dev/sensors ] ; then
- ebegin " Unloading i2c-proc"
- rmmod i2c-proc >/dev/null 2>&1
- eend $?
- fi
- fi
-}
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.3.4-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.3.4-sensors-detect-gentoo.patch
deleted file mode 100644
index 215969af2cb6..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-3.3.4-sensors-detect-gentoo.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
-index fb17481..bb324c2 100755
---- a/prog/detect/sensors-detect
-+++ b/prog/detect/sensors-detect
-@@ -20,6 +20,9 @@
- # MA 02110-1301 USA.
- #
-
-+# Gentoo specific modifications based on a patch from Rudo Thomas
-+#
-+
- require 5.004;
-
- use strict;
-@@ -6671,26 +6674,33 @@ sub write_config
- print MODPROBE_D $configfile;
- close(MODPROBE_D);
- } else {
-+ print "\nIf you want to load the modules at startup, generate a config file\n",
-+ "below and make sure lm_sensors gets started at boot time; e.g\n",
-+ "\$ rc-update add lm_sensors default\n";
- print "To make the sensors modules behave correctly, add these lines to\n".
-- "/etc/modprobe.conf:\n\n";
-+ "/etc/modules.d/lm_sensors and run modules-update:\n\n";
- print "#----cut here----\n".
- $configfile.
- "#----cut here----\n\n";
- }
- }
-
-- my $have_sysconfig = -d '/etc/sysconfig';
-- printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ",
-- (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'),
-- ($have_sysconfig ? 'YES/no' : 'yes/NO');
-- $_ = ;
-- if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
-- unless ($have_sysconfig) {
-- mkdir('/etc/sysconfig', 0777)
-- or die "Sorry, can't create /etc/sysconfig ($!)";
-+ my $have_config = -f '/etc/conf.d/lm_sensors';
-+ print "\nDo you want to ".($have_config?"overwrite":"generate").
-+ " /etc/conf.d/lm_sensors? Enter s to specify other file name?\n",
-+ " (".($have_config?"yes/NO":"YES/no")."/s): ";
-+ my $reply = ;
-+
-+ if (($have_config and $reply =~ /^\s*[Yy]/) or
-+ (not $have_config and not $reply =~ /^\s*[Nn]/) or
-+ $reply =~ /^\s*[Ss]/) {
-+ my $filename = "/etc/conf.d/lm_sensors";
-+ if ($reply =~ /^\s*[Ss]/) {
-+ print "Specify the file to store the configuration to: ";
-+ $filename = ;
- }
-- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
-- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
-+ open(local *SYSCONFIG, ">".$filename)
-+ or die "Sorry, can't create $filename ($!).";
- print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
- print SYSCONFIG <<'EOT';
- # This file is sourced by /etc/init.d/lm_sensors and defines the modules to
-@@ -6701,30 +6711,17 @@ sub write_config
- # BUS_MODULES for any required bus driver module (for example for I2C or SPI).
-
- EOT
-+ print SYSCONFIG
-+ "# Load modules at startup\n".
-+ "LOADMODULES=yes\n\n".
-+ "# Initialize sensors at startup\n".
-+ "INITSENSORS=yes\n\n";
- print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n"
- if @{$bus_modules};
- print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n";
- close(SYSCONFIG);
-
-- if (-x "/bin/systemctl" && -d "/lib/systemd/system" &&
-- ! -f "/lib/systemd/system/lm_sensors.service") {
-- print "Copy prog/init/lm_sensors.service to /lib/systemd/system\n".
-- "and run 'systemctl enable lm_sensors.service'\n".
-- "for initialization at boot time.\n";
-- return;
-- }
--
-- if (-x "/bin/systemctl" &&
-- -f "/lib/systemd/system/lm_sensors.service") {
-- system("/bin/systemctl", "enable", "lm_sensors.service");
-- system("/bin/systemctl", "start", "lm_sensors.service");
-- # All done, don't check for /etc/init.d/lm_sensors
-- return;
-- }
--
-- print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
-- "for initialization at boot time.\n"
-- unless -f "/etc/init.d/lm_sensors";
-+ print "Done.\n";
-
- if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
- system("/sbin/insserv", "/etc/init.d/lm_sensors");
-@@ -6738,20 +6735,6 @@ EOT
- "kernel modules.\n\n";
- }
- } else {
-- print "To load everything that is needed, add this to one of the system\n".
-- "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n";
-- print "#----cut here----\n";
-- if (@{$bus_modules}) {
-- print "# Adapter drivers\n";
-- print "modprobe $_\n" foreach (@{$bus_modules});
-- }
-- print "# Chip drivers\n";
-- print "modprobe $_\n" foreach (@{$hwmon_modules});
-- print((-e '/usr/bin/sensors' ?
-- "/usr/bin/sensors -s\n" :
-- "/usr/local/bin/sensors -s\n").
-- "#----cut here----\n\n");
--
- print "If you have some drivers built into your kernel, the list above will\n".
- "contain too many modules. Skip the appropriate ones! You really\n".
- "should try these commands right now to make sure everything is\n".
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.3.5-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.3.5-sensors-detect-gentoo.patch
deleted file mode 100644
index 0ea9a02b3f9a..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-3.3.5-sensors-detect-gentoo.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- lm_sensors-3.3.5/prog/detect/sensors-detect
-+++ lm_sensors-3.3.5/prog/detect/sensors-detect
-@@ -20,6 +20,9 @@
- # MA 02110-1301 USA.
- #
-
-+# Gentoo specific modifications based on a patch from Rudo Thomas
-+#
-+
- require 5.004;
-
- use strict;
-@@ -6762,26 +6765,33 @@
- print MODPROBE_D $configfile;
- close(MODPROBE_D);
- } else {
-+ print "\nIf you want to load the modules at startup, generate a config file\n",
-+ "below and make sure lm_sensors gets started at boot time; e.g\n",
-+ "\$ rc-update add lm_sensors default\n";
- print "To make the sensors modules behave correctly, add these lines to\n".
-- "/etc/modprobe.conf:\n\n";
-+ "/etc/modules.d/lm_sensors and run modules-update:\n\n";
- print "#----cut here----\n".
- $configfile.
- "#----cut here----\n\n";
- }
- }
-
-- my $have_sysconfig = -d '/etc/sysconfig';
-- printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ",
-- (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'),
-- ($have_sysconfig ? 'YES/no' : 'yes/NO');
-- $_ = read_answer();
-- if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
-- unless ($have_sysconfig) {
-- mkdir('/etc/sysconfig', 0777)
-- or die "Sorry, can't create /etc/sysconfig ($!)";
-+ my $have_sysconfig = -f '/etc/conf.d/lm_sensors';
-+ printf "Do you want to ".($have_sysconfig?"overwrite":"generate").
-+ " /etc/conf.d/lm_sensors? Enter s to specify other file name?\n",
-+ " (".($have_sysconfig?"yes/NO":"YES/no")."/s): ";
-+ my $reply = read_answer();
-+
-+ if (($have_sysconfig and $reply =~ /^\s*[Yy]/) or
-+ (not $have_sysconfig and not $reply =~ /^\s*[Nn]/) or
-+ $reply =~ /^\s*[Ss]/) {
-+ my $filename = "/etc/conf.d/lm_sensors";
-+ if ($reply =~ /^\s*[Ss]/) {
-+ print "Specify the file to store the configuration to: ";
-+ $filename = read_answer();
- }
-- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
-- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
-+ open(local *SYSCONFIG, ">".$filename)
-+ or die "Sorry, can't create $filename ($!).";
- print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
- print SYSCONFIG <<'EOT';
- # This file is sourced by /etc/init.d/lm_sensors and defines the modules to
-@@ -6792,30 +6802,17 @@
- # BUS_MODULES for any required bus driver module (for example for I2C or SPI).
-
- EOT
-+ print SYSCONFIG
-+ "# Load modules at startup\n".
-+ "LOADMODULES=yes\n\n".
-+ "# Initialize sensors at startup\n".
-+ "INITSENSORS=yes\n\n";
- print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n"
- if @{$bus_modules};
- print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n";
- close(SYSCONFIG);
-
-- if (-x "/bin/systemctl" && -d "/lib/systemd/system" &&
-- ! -f "/lib/systemd/system/lm_sensors.service") {
-- print "Copy prog/init/lm_sensors.service to /lib/systemd/system\n".
-- "and run 'systemctl enable lm_sensors.service'\n".
-- "for initialization at boot time.\n";
-- return;
-- }
--
-- if (-x "/bin/systemctl" &&
-- -f "/lib/systemd/system/lm_sensors.service") {
-- system("/bin/systemctl", "enable", "lm_sensors.service");
-- system("/bin/systemctl", "start", "lm_sensors.service");
-- # All done, don't check for /etc/init.d/lm_sensors
-- return;
-- }
--
-- print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
-- "for initialization at boot time.\n"
-- unless -f "/etc/init.d/lm_sensors";
-+ print "Done.\n";
-
- if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
- system("/sbin/insserv", "/etc/init.d/lm_sensors");
-@@ -6828,24 +6825,6 @@
- print "You should now start the lm_sensors service to load the required\n".
- "kernel modules.\n\n";
- }
-- } else {
-- print "To load everything that is needed, add this to one of the system\n".
-- "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n";
-- print "#----cut here----\n";
-- if (@{$bus_modules}) {
-- print "# Adapter drivers\n";
-- print "modprobe $_\n" foreach (@{$bus_modules});
-- }
-- print "# Chip drivers\n";
-- print "modprobe $_\n" foreach (@{$hwmon_modules});
-- print((-e '/usr/bin/sensors' ?
-- "/usr/bin/sensors -s\n" :
-- "/usr/local/bin/sensors -s\n").
-- "#----cut here----\n\n");
--
-- print "You really should try these commands right now to make sure everything\n".
-- "is working properly. Monitoring programs won't work until the needed\n".
-- "modules are loaded.\n\n";
- }
- }
-
diff --git a/sys-apps/lm_sensors/files/sensord-4-init.d b/sys-apps/lm_sensors/files/sensord-4-init.d
deleted file mode 100644
index beaecbfabf77..000000000000
--- a/sys-apps/lm_sensors/files/sensord-4-init.d
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CONFIG=/etc/sensors3.conf
-
-depend() {
- need localmount
- use logger lm_sensors
-}
-
-pidfile=/run/sensord.pid
-command=/usr/sbin/sensord
-command_args="--config-file ${CONFIG} ${SENSORD_OPTIONS} --pid-file ${pidfile}"
-
-start_pre() {
- if [ ! -f ${CONFIG} ]; then
- eerror "Configuration file ${CONFIG} not found"
- return 1
- fi
-}
diff --git a/sys-apps/lm_sensors/files/sensord-conf.d b/sys-apps/lm_sensors/files/sensord-conf.d
deleted file mode 100644
index d82841aebd4a..000000000000
--- a/sys-apps/lm_sensors/files/sensord-conf.d
+++ /dev/null
@@ -1,3 +0,0 @@
-# Extra options to pass to the sensord daemon,
-# see sensord(8) for more information
-SENSORD_OPTIONS=""
diff --git a/sys-apps/lm_sensors/files/sensord.service b/sys-apps/lm_sensors/files/sensord.service
deleted file mode 100644
index 6d272f1efd15..000000000000
--- a/sys-apps/lm_sensors/files/sensord.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Sensor information logging daemon
-
-[Service]
-PIDFile=/var/run/sensord.pid
-ExecStart=/usr/sbin/sensord
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-apps/lm_sensors/lm_sensors-3.3.4-r1.ebuild b/sys-apps/lm_sensors/lm_sensors-3.3.4-r1.ebuild
deleted file mode 100644
index 66fc2741908e..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-3.3.4-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info multilib systemd toolchain-funcs
-
-DESCRIPTION="Hardware Monitoring user-space utilities"
-HOMEPAGE="http://www.lm-sensors.org/"
-SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="sensord static-libs"
-
-RDEPEND="
- dev-lang/perl
- sensord? (
- net-analyzer/rrdtool
- virtual/logger
- )"
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex"
-
-CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
-WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
-WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
-WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
-
- use sensord && { sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || die; }
-
- # Respect LDFLAGS
- sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || die
-
- # Fix shipped unit file paths
- sed -i -e 's:\(^EnvironmentFile=\).*:\1/etc/conf.d/lm_sensors:' \
- prog/init/lm_sensors.service || die
-
- use static-libs || { sed -i -e '/^BUILD_STATIC_LIB/d' Makefile || die; }
-}
-
-src_compile() {
- einfo
- einfo "You may safely ignore any errors from compilation"
- einfo "that contain \"No such file or directory\" references."
- einfo
-
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- PREFIX="${EPREFIX}/usr" \
- MANDIR="${EPREFIX}/usr/share/man" \
- ETCDIR="${EPREFIX}/etc" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- install
-
- newinitd "${FILESDIR}"/${PN}-3-init.d ${PN}
- systemd_dounit prog/init/lm_sensors.service
-
- newinitd "${FILESDIR}"/fancontrol-init.d-2 fancontrol
- systemd_dounit "${FILESDIR}"/fancontrol.service
-
- if use sensord; then
- newconfd "${FILESDIR}"/sensord-conf.d sensord
- newinitd "${FILESDIR}"/sensord-4-init.d sensord
- systemd_dounit "${FILESDIR}"/sensord.service
- fi
-
- dodoc CHANGES CONTRIBUTORS INSTALL README \
- doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid}
-
- docinto developers
- dodoc doc/developers/applications
-}
-
-pkg_postinst() {
- echo
- elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
- elog "/etc/conf.d/${PN}."
- echo
- elog "/etc/conf.d/${PN} is vital to the init-script."
- elog "Please make sure you also add ${PN} to the desired"
- elog "runlevel. Otherwise your I2C modules won't get loaded"
- elog "on the next startup."
- echo
- elog "You will also need to run the above command if you're upgrading from"
- elog "<=${PN}-2, as the needed entries in /etc/conf.d/${PN} has"
- elog "changed."
- echo
- elog "Be warned, the probing of hardware in your system performed by"
- elog "sensors-detect could freeze your system. Also make sure you read"
- elog "the documentation before running ${PN} on IBM ThinkPads."
- echo
- elog "Also make sure you have read:"
- elog "http://www.lm-sensors.org/wiki/FAQ/Chapter3#Mysensorshavestoppedworkinginkernel2.6.31"
- echo
- elog "Please refer to the ${PN} documentation for more information."
- elog "(http://www.lm-sensors.org/wiki/Documentation)"
- echo
-}
diff --git a/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild b/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild
deleted file mode 100644
index 5d6d9242a943..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info multilib systemd toolchain-funcs
-
-DESCRIPTION="Hardware Monitoring user-space utilities"
-HOMEPAGE="http://www.lm-sensors.org/"
-SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="sensord static-libs"
-
-RDEPEND="
- dev-lang/perl
- sensord? (
- net-analyzer/rrdtool
- virtual/logger
- )"
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex"
-
-CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
-WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
-WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
-WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
-
- use sensord && { sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || die; }
-
- # Respect LDFLAGS
- sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || die
-
- # Fix shipped unit file paths
- sed -i -e 's:\(^EnvironmentFile=\).*:\1/etc/conf.d/lm_sensors:' \
- prog/init/lm_sensors.service || die
-
- use static-libs || { sed -i -e '/^BUILD_STATIC_LIB/d' Makefile || die; }
-}
-
-src_compile() {
- einfo
- einfo "You may safely ignore any errors from compilation"
- einfo "that contain \"No such file or directory\" references."
- einfo
-
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- PREFIX="${EPREFIX}/usr" \
- MANDIR="${EPREFIX}/usr/share/man" \
- ETCDIR="${EPREFIX}/etc" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- install
-
- newinitd "${FILESDIR}"/${PN}-3-init.d ${PN}
- systemd_dounit prog/init/lm_sensors.service
-
- newinitd "${FILESDIR}"/fancontrol-init.d-2 fancontrol
- systemd_dounit "${FILESDIR}"/fancontrol.service
-
- if use sensord; then
- newconfd "${FILESDIR}"/sensord-conf.d sensord
- newinitd "${FILESDIR}"/sensord-4-init.d sensord
- systemd_dounit "${FILESDIR}"/sensord.service
- fi
-
- dodoc CHANGES CONTRIBUTORS INSTALL README \
- doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid}
-
- docinto developers
- dodoc doc/developers/applications
-}
-
-pkg_postinst() {
- echo
- elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
- elog "/etc/conf.d/${PN}."
- echo
- elog "/etc/conf.d/${PN} is vital to the init-script."
- elog "Please make sure you also add ${PN} to the desired"
- elog "runlevel. Otherwise your I2C modules won't get loaded"
- elog "on the next startup."
- echo
- elog "You will also need to run the above command if you're upgrading from"
- elog "<=${PN}-2, as the needed entries in /etc/conf.d/${PN} has"
- elog "changed."
- echo
- elog "Be warned, the probing of hardware in your system performed by"
- elog "sensors-detect could freeze your system. Also make sure you read"
- elog "the documentation before running ${PN} on IBM ThinkPads."
- echo
- elog "Also make sure you have read:"
- elog "http://www.lm-sensors.org/wiki/FAQ/Chapter3#Mysensorshavestoppedworkinginkernel2.6.31"
- echo
- elog "Please refer to the ${PN} documentation for more information."
- elog "(http://www.lm-sensors.org/wiki/Documentation)"
- echo
-}
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0.ebuild
deleted file mode 100644
index 3f0943216e6a..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info multilib systemd toolchain-funcs
-
-DESCRIPTION="Hardware Monitoring user-space utilities"
-HOMEPAGE="http://www.lm-sensors.org/"
-SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="sensord static-libs"
-
-RDEPEND="
- dev-lang/perl
- sensord? (
- net-analyzer/rrdtool
- virtual/logger
- )"
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex"
-
-CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
-WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
-WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
-WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.3.5-sensors-detect-gentoo.patch
-
- use sensord && { sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || die; }
-
- # Respect LDFLAGS
- sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || die
-
- # Fix shipped unit file paths
- sed -i -e 's:\(^EnvironmentFile=\).*:\1/etc/conf.d/lm_sensors:' \
- prog/init/lm_sensors.service || die
-
- use static-libs || { sed -i -e '/^BUILD_STATIC_LIB/d' Makefile || die; }
-}
-
-src_compile() {
- einfo
- einfo "You may safely ignore any errors from compilation"
- einfo "that contain \"No such file or directory\" references."
- einfo
-
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- PREFIX="${EPREFIX}/usr" \
- MANDIR="${EPREFIX}/usr/share/man" \
- ETCDIR="${EPREFIX}/etc" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- install
-
- newinitd "${FILESDIR}"/${PN}-3-init.d ${PN}
- systemd_dounit prog/init/lm_sensors.service
-
- newinitd "${FILESDIR}"/fancontrol-init.d-2 fancontrol
- systemd_dounit "${FILESDIR}"/fancontrol.service
-
- if use sensord; then
- newconfd "${FILESDIR}"/sensord-conf.d sensord
- newinitd "${FILESDIR}"/sensord-4-init.d sensord
- systemd_dounit "${FILESDIR}"/sensord.service
- fi
-
- dodoc CHANGES CONTRIBUTORS INSTALL README \
- doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid}
-
- docinto developers
- dodoc doc/developers/applications
-}
-
-pkg_postinst() {
- echo
- elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
- elog "/etc/conf.d/${PN}."
- echo
- elog "/etc/conf.d/${PN} is vital to the init-script."
- elog "Please make sure you also add ${PN} to the desired"
- elog "runlevel. Otherwise your I2C modules won't get loaded"
- elog "on the next startup."
- echo
- elog "You will also need to run the above command if you're upgrading from"
- elog "<=${PN}-2, as the needed entries in /etc/conf.d/${PN} has"
- elog "changed."
- echo
- elog "Be warned, the probing of hardware in your system performed by"
- elog "sensors-detect could freeze your system. Also make sure you read"
- elog "the documentation before running ${PN} on IBM ThinkPads."
- echo
- elog "Also make sure you have read:"
- elog "http://www.lm-sensors.org/wiki/FAQ/Chapter3#Mysensorshavestoppedworkinginkernel2.6.31"
- echo
- elog "Please refer to the ${PN} documentation for more information."
- elog "(http://www.lm-sensors.org/wiki/Documentation)"
- echo
-}
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20160725.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20160725.ebuild
index cedde703a395..f543e8be3a74 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20160725.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20160725.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
inherit linux-info systemd toolchain-funcs multilib-minimal
DESCRIPTION="Hardware Monitoring user-space utilities"
-HOMEPAGE="http://www.lm-sensors.org/ https://github.com/groeck/lm-sensors"
+HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/groeck/lm-sensors"
COMMIT="45ffa15cf02e63f70ff3b85c23e22dfbab7e8f9c"
MY_PN="${PN/_/-}"
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
new file mode 100644
index 000000000000..e8e4a92c8a22
--- /dev/null
+++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info systemd toolchain-funcs multilib-minimal
+
+DESCRIPTION="Hardware Monitoring user-space utilities"
+HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/groeck/lm-sensors"
+
+COMMIT="83cafd29f28d463573750d897014ec7143217ae5"
+MY_PN="${PN/_/-}"
+
+#SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.bz2"
+SRC_URI="https://github.com/groeck/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1"
+
+# SUBSLOT based on SONAME of libsensors.so
+SLOT="0/4.4.0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="contrib sensord static-libs"
+
+COMMON_DEPS="
+ sensord? (
+ net-analyzer/rrdtool
+ virtual/logger
+ )"
+
+RDEPEND="${COMMON_DEPS}
+ dev-lang/perl
+ !\", \"HWMON_MODULES\" or \"BUS_MODULES\""
+ elog " variables from \"/etc/conf.d/lm_modules\" to"
+ elog " \"/etc/modules-load.d/lm_sensors.conf\" and adjust format."
+ elog ""
+ elog " For details see https://wiki.gentoo.org/wiki/Systemd#Automatic_module_loading"
+ elog ""
+ elog " Important: Don't forget to migrate your module's argument"
+ elog " (modules__args variable) if your are not already"
+ elog " using \"/etc/modprobe.d\" (which is recommended)."
+
+ # Show this elog only once
+ break
+ fi
+ done
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # New installation
+
+ elog ""
+ elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
+ elog "\"/etc/modules-load.d/lm_sensors.conf\"."
+ elog ""
+ elog "You might want to add ${PN} to your default runlevel to make"
+ elog "sure the sensors get initialized on the next startup."
+ elog ""
+ elog "Be warned, the probing of hardware in your system performed by"
+ elog "sensors-detect could freeze your system. Also make sure you read"
+ elog "the documentation before running ${PN} on IBM ThinkPads."
+ fi
+}
diff --git a/sys-apps/lm_sensors/metadata.xml b/sys-apps/lm_sensors/metadata.xml
index 164d1b160312..897d37da3562 100644
--- a/sys-apps/lm_sensors/metadata.xml
+++ b/sys-apps/lm_sensors/metadata.xml
@@ -13,6 +13,12 @@
Reflect ABI of libsensors.so.