diff --git a/Manifest.files.gz b/Manifest.files.gz
index a52bc0750b9e..a9a843e9d1a7 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 97b2480e575d..0d221af1ea67 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/helm/helm-2.7.2-r2.ebuild b/app-admin/helm/helm-2.7.2-r3.ebuild
similarity index 97%
rename from app-admin/helm/helm-2.7.2-r2.ebuild
rename to app-admin/helm/helm-2.7.2-r3.ebuild
index d846bcdf781b..bff2ba014b44 100644
--- a/app-admin/helm/helm-2.7.2-r2.ebuild
+++ b/app-admin/helm/helm-2.7.2-r3.ebuild
@@ -128,7 +128,7 @@ src_compile() {
GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
./scripts/setup-apimachinery.sh || die
GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
- go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+ go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
popd || die
bin/${PN} completion bash > ${PN}.bash || die
bin/${PN} completion zsh > ${PN}.zsh || die
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
new file mode 100644
index 000000000000..3b03336f3abd
--- /dev/null
+++ b/app-admin/kube-bench/Manifest
@@ -0,0 +1,20 @@
+DIST github.com-fatih-color-5df930a27be2502f99b292b7cc09ebad4d0891f4.tar.gz 588446 BLAKE2B 0e3acbea72d4e6d14964c53a13eac4ddb4299f86045bc4751498c1e80ee997f3392b3236f1f7fa872ceef73edf0c4e87154d5cc1605d5637ae090979596f1906 SHA512 9c7a1f5d67e0c8da788624a24ec42a9a1504f497840590e50b8fe9204dde5511be00a94645c2e9326dba23a8514adffdc242192abb270021c37e231636bafc71
+DIST github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz 30624 BLAKE2B ced6ca6f115eedc954f6b583b28e470ec5dcfe0c279d55a63c00ee942acde095e9eef8fb4c3fa289f34871f43a7562fb71142d070a54398bc5d91122e64b4ad0 SHA512 cff467ffbed22edf4cde7a52e0f0d7a5b4a06446a6140ad7fa018dfcce3b400342223d888a0389042d2e6fd7abe261d0e515adc6e4c03a74e3cf074e88af17ab
+DIST github.com-go-yaml-yaml-287cf08546ab5e7e37d55a84f7ed3fd1db036de5.tar.gz 64826 BLAKE2B 47e9182124037317bdfc31137a2715db979146688e637a586f5a7c4a12250d0fcffdbbaa8793e189421d189b1071f48d8588cfda9ac1f3e297bfc244f30bcae7 SHA512 429256bb847defb53dee5c960edc726455397045e7dc2e4833e0e9088f9ec11452e2198961080dc00b8eff9d165df5e0377f4039932df0e46cd960827b8f800d
+DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
+DIST github.com-golang-sys-b8f5ef32195cae6470b728e8ca677f0dbed1a004.tar.gz 787670 BLAKE2B 87927d110e2aceec2b1745aa8b8d28bf2b38cc6fc679a72b7336e7f59bc07dba90e008228096e3e56798e76056804782893b1902bb508b21149a21346f150263 SHA512 ffbeab6ba7a9ce8ac192c3b1b560e7886ff3248d056e92334bdf180a506cdf8fde52b6446622a3076eded808cd2564774d430f82c62664509da90b7a3d5f9983
+DIST github.com-golang-text-3b24cac7bc3a458991ab409aa2a339ac9e0d60d6.tar.gz 5693588 BLAKE2B fe989eaa037c382168f4c580317858fb842a3f12b66868cf2983314146b546088a850dceb9b22a52239468c41988f637196bc0e4d117e8f21a4d0cdd2fecaef1 SHA512 17ac801e5a35b0fd5c8c650846778803da1e25cc970136c943d251a89cfacf611fbcdce0527ca2730c6291891738333b29ec9b5339ecb4a18069ea3c6e44b106
+DIST github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz 69787 BLAKE2B e1d034d5863ae8bca85736e971e613e6821665861e35954a067e5d659029a8680b6902387848a318aee374cd4f6b810ae160046979b5bc86e64df0e1ff5d08f6 SHA512 751ea2fcea04ab2a9b61a45443a71cdee9cd09c2576af048108ccb56027b34f46b00e14aa664b966165b7d8cbb994e49f128bf54e3469c627d73f7ee2809ebf8
+DIST github.com-jinzhu-gorm-0a51f6cdc55d1650d9ed3b4c13026cfa9133b01e.tar.gz 80567 BLAKE2B 3ab0a7fa8acde2dac0901cca66ef600f0187febb0a4950695f35b5d9db1675acde303b9d4bc0b89d0dd3ac6032b9e8e39953e4fbcbfc328cdba9f40767595cd2 SHA512 8d86fccddd59ea227fc571e46cd64ac02d80cc261832c4d64dafbee3eed861220be34e14ff73707118f272814469bae047da2a67b435f839a579b84554e720b3
+DIST github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz 4506 BLAKE2B bf66be135369acdef3c356310de015f9b0f3eeaaf9273e315d52ef21fad3d93d27a90535252a846e5f0c7d2680dccd1080c7f4c56d3d48ba38ef0cffba18129d SHA512 bf30d10b9e101c9fde9079b12b519e8bdeb5f40bc964109940b58a2bccdb2f9775c6bf25dfe47ae7b8bc7e34a0b9109a0d9f1f5b4e70cc4093264758bdce749d
+DIST github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz 90080 BLAKE2B e411640c603f1bffc0966c748393ef33172e326b452b5736288b720a14b6d6311f8265aaae958ef9a56c0c81cce53882f4ee88aa51b975ba8c57a9477bfa372e SHA512 f275a8d2b8705ad6e2e57a81072c16e4ce058fe658a57b6e4846c306363ffd5c675b3e6aaf9104a4fa5b7112e1f18e84474a7a494ffbee58d4d51e7e3dbef12b
+DIST github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz 27761 BLAKE2B 0f39a63d3d19ad5d3ac367739d568dd3abe74a8a6aa0e60cf19ca8203412270fc45dd1fea07627290a85c42db6ead0229f72bfd845b9e4f645976db1585838e7 SHA512 493a7493e415b45abe2109c79e02ed7903de6a559911cff0323f9577fcf41134ab8f4ac26d776fdf9a891654f063bd2452c7e557c643d73de5f558b13533f62c
+DIST github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz 15601 BLAKE2B c2212f4c34ae15eefa1a681b2beaa8cbf3f63fb2317a8fd95f21df54eb6a05b2d312d96848deb1afdd47aefdeecadd20920ae25a0d865f31c16b6a5da4ac6dbd SHA512 30b6f8f902ab7d4dad899c19687b6ec0e8c51655a04163c37ed1fa36cb420695631534097d4de0f342dbe649b412d38d0254b40bbb2970c3a70adc0244a6e800
+DIST github.com-pelletier-go-toml-4e9e0ee19b60b13eb79915933f44d8ed5f268bdd.tar.gz 55245 BLAKE2B 11d696edf77495d1d78968daab59b7fce4b79d4360aa237d27d849d701392e96ebd63f2628d8b05cf05c6866ac30707e9901d474aac67ab37918988de4998b5b SHA512 0cd167d35e7f5c596088211e4b7d33f46338a2bc547086d99945bb52084fb9a20c4ff8f3713cea747efb3bc5a25094c70462efb4b2175be8799e42be25f3e82c
+DIST github.com-spf13-afero-8d919cbe7e2627e417f3e45c3c0e489a5b7e2536.tar.gz 43475 BLAKE2B 024f8754e4ef6af0a2fd8ce274e82ab46c12ac4b81ebbfd5c93c1c44327ead58bf71242714eebaaca5f2adafed63ebf112ad5b2eae125895514bffe8e21b117c SHA512 900ce0ed04dab86bc7f33a0ec94f2b49a7d91dd1bbca65a6be50bd4575ff1ad5fcbb4f02bb0fb0b7b2d1b2473b3e6512fe5f8c877947c11819a4aa5d763a6d2c
+DIST github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz 9594 BLAKE2B 4979fd23b48a6bcd2538357d33b7670326b9129b5de309548492d9597eace1320875e1b242b594c98777192c1e0c6abb0bda4ba946a43530cc68ec762d1949c6 SHA512 2b97f56aa83dd1302e02603a8fcbc8f2642ceff8bdc19cf8a26120801023c4a8a3fed689de0ac392f6a4144450ac85d32b00fbde200b22e972c31cbabd996cad
+DIST github.com-spf13-cobra-ccaecb155a2177302cb56cae929251a256d0f646.tar.gz 99213 BLAKE2B 0abb03f6409ae50832b41e5c3d16a35df315a99a562c7a95795e0524ef00f5db3537ce1aebf2c6bc9c7ec2a48bc3c5ee7daa522719f30cf99ee18e7b5d8cf1b9 SHA512 94c70d46a11a156406ee17a1607cade576bc27b6cbbaa0e0a061e16a488b166dbe719075e3cb78d24c53140f85472b33e08dfd8000636163884c71306ae85a80
+DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz 6347 BLAKE2B a1e62d37f3f736086ba5b198ca33e243f4650571d42448c593ba7c0970883aea401e8ddfc90975686bb5c992e5133294662a05b245620ca52c254b2a7e866d29 SHA512 04522be3439a2c3a06f38f764e275d8d093b935d610386bb99364f105d7d805a6a7e7a928796682955549a88d43b21f385404c1401ee66374d324f954bd4769c
+DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297
+DIST github.com-spf13-viper-1a0c4a370c3e8286b835467d2dfcdaf636c3538b.tar.gz 32229 BLAKE2B 95b1ed58026f177674a452e531ad445582a8cdafc1e86293918e3b8a8e81f71644b66873c621621655eb87c0cfb67f8e2b089b02bb74bdb30a714b92fdae0cc3 SHA512 004f7cb37ce692cb86b3f793afe5ade9dd478ffdceb23ac8da667c626539503e199f424d6b3183c8907257186eb1a16552ba36979bcdaf363482a6f19cc98d89
+DIST kube-bench-0.0.6.tar.gz 172957 BLAKE2B e6ce4ab094ac38790d802e0df0c9c8c19a2b85d00bbdd6a968d7e680a3b2bc465bcc7f24ff8b68d85043fa82b15cba835e72c6e4da4f43c4d6786a0ad994ed98 SHA512 f1aacd90090c39cf521b73bbdaf4fed4440b2d011b8e1cf40837522e1f696575ef7c03cab9592ad68766e3bed5b4ae890692a4aa25c42e296704ce1a9260ac5a
diff --git a/app-admin/kube-bench/kube-bench-0.0.6.ebuild b/app-admin/kube-bench/kube-bench-0.0.6.ebuild
new file mode 100644
index 000000000000..aa639411cc68
--- /dev/null
+++ b/app-admin/kube-bench/kube-bench-0.0.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/aquasecurity/kube-bench"
+
+EGO_VENDOR=( "github.com/fatih/color 5df930a27be2502f99b292b7cc09ebad4d0891f4"
+ "github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+ "github.com/jinzhu/gorm 0a51f6cdc55d1650d9ed3b4c13026cfa9133b01e"
+ "github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
+ "github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
+ "github.com/spf13/cobra ccaecb155a2177302cb56cae929251a256d0f646"
+ "github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
+ "github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
+ "github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
+ "github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
+ "github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
+ "github.com/pelletier/go-toml 4e9e0ee19b60b13eb79915933f44d8ed5f268bdd"
+ "github.com/spf13/afero 8d919cbe7e2627e417f3e45c3c0e489a5b7e2536"
+ "github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
+ "github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
+ "github.com/spf13/viper 1a0c4a370c3e8286b835467d2dfcdaf636c3538b"
+ "golang.org/x/sys b8f5ef32195cae6470b728e8ca677f0dbed1a004 github.com/golang/sys"
+ "golang.org/x/text 3b24cac7bc3a458991ab409aa2a339ac9e0d60d6 github.com/golang/text"
+ "gopkg.in/yaml.v2 287cf08546ab5e7e37d55a84f7ed3fd1db036de5 github.com/go-yaml/yaml" )
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
+HOMEPAGE="https://github.com/aquasecurity/kube-bench"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+ pushd src/${EGO_PN} || die
+ GOPATH="${S}" go build -o ${PN} . || die
+ popd || die
+}
+
+src_install() {
+ dobin src/${EGO_PN}/${PN}
+ insinto /etc/kube-bench
+ doins -r src/${EGO_PN}/cfg
+}
diff --git a/app-admin/kube-bench/metadata.xml b/app-admin/kube-bench/metadata.xml
new file mode 100644
index 000000000000..9e426ff1b44b
--- /dev/null
+++ b/app-admin/kube-bench/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ mrueg@gentoo.org
+ Manuel RĂ¼ger
+
+
+ aquasecurity/kube-bench
+
+
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index c09dbe9ac0b7..573405bc0bed 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/lrzip/files/lrzip-0.631-solaris.patch b/app-arch/lrzip/files/lrzip-0.631-solaris.patch
new file mode 100644
index 000000000000..d8eb95e563d2
--- /dev/null
+++ b/app-arch/lrzip/files/lrzip-0.631-solaris.patch
@@ -0,0 +1,11 @@
+--- a/liblrzip.c
++++ b/liblrzip.c
+@@ -36,7 +36,7 @@
+ #include "lrzip_core.h"
+ #include "rzip.h"
+
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun) || defined(sun)
+ # define fmemopen(s, len, modes) fake_fmemopen((s), (len), (modes))
+ static FILE *fake_fmemopen(void *buf, size_t buflen, const char *mode)
+ {
diff --git a/app-arch/lrzip/lrzip-0.631.ebuild b/app-arch/lrzip/lrzip-0.631.ebuild
index d3b839bd266c..e5f89de483dd 100644
--- a/app-arch/lrzip/lrzip-0.631.ebuild
+++ b/app-arch/lrzip/lrzip-0.631.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="dev-libs/lzo
@@ -23,7 +23,8 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-missing-stdarg_h.patch
- )
+ "${FILESDIR}"/${P}-solaris.patch
+)
src_configure() {
econf $(use_enable static-libs static)
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index b2562483eda1..4b27d33cf21f 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
index 8f55dd6e71a8..3bd4cc56bd52 100644
--- a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
MODULES_OPTIONAL_USE="modules"
-inherit user linux-mod cmake-utils udev
+inherit flag-o-matic user linux-mod cmake-utils udev
MY_P=${P/-/_}
DESCRIPTION="Emulator driver for tpm"
@@ -46,6 +46,7 @@ src_configure() {
local mycmakeargs=(
-DUSE_OPENSSL=$(usex ssl)
)
+ append-cflags -Wno-implicit-fallthrough
cmake-utils_src_configure
# only here we have BUILD_DIR
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index a5b2778ee8ba..46f89b34c5fa 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index fb0d9caa5f69..d790afaaa4f4 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,2 +1,3 @@
DIST docker-compose-1.17.1.tar.gz 219947 BLAKE2B a5438e66f156b98ffc9ecf63a57443610f76713532369d519689b697dbc91bd196e24b831882a4c39a43c5b17640242d98f47a2c337832395dc48019d58e3e90 SHA512 711c0a73546f0b396a920d3310b92fc15e3c13f93439eeda363124c9bd971aa942395b2405ad7441df8982384be367c20a767fe5b9e3e150690b63deda58f553
DIST docker-compose-1.18.0_rc1.tar.gz 230199 BLAKE2B ccec8431c75be2beaf988e1f10a7e4587f9708f4a4b55280e335783250665b7ff660f1a781aa42b59ee7529fc26abf00e438904c9f9ca4ac0210f1f55490c36a SHA512 9d3e437f9a0889dc09c1c5ad141c0ebcee05d8ac9ec0e842d1544b58ec651270f397e4d41f08d2eab98c4e43cd0cfa950f287d6bcf8095f7972ab46e5a9c1c33
+DIST docker-compose-1.18.0_rc2.tar.gz 229767 BLAKE2B 6f7b886cd3a52759868c3c23f86b402fffb197afb0eb4052e9aa363a5556e36aa129bbe0b7ea3bb1a29c3ab34053c12e93af02b558699b1391f6064ab060d91e SHA512 0c3e37d6116ca32c19399965b26311bd6fe115dd60058df7cffe176b47bb88b523e80a4f4fa5150d95ff7f90649638745da4c78c6a7264a84ac30ad92eb7bb44
diff --git a/app-emulation/docker-compose/docker-compose-1.18.0_rc2.ebuild b/app-emulation/docker-compose/docker-compose-1.18.0_rc2.ebuild
new file mode 100644
index 000000000000..534ceb504f63
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.18.0_rc2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 distutils-r1 vcs-snapshot
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+ =dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+ =dev-python/docker-py-2.6.1[${PYTHON_USEDEP}]
+ =dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+ =dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+ =dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+ !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+ =dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+ =dev-python/requests-2.6.1[${PYTHON_USEDEP}]
+ >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+ =dev-python/texttable-0.9[${PYTHON_USEDEP}]
+ =dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+ =dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+ $(python_gen_cond_dep '=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+ $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+ ${CDEPEND}
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
+ )
+"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+ ${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+ insinto /usr/share/zsh/site-functions
+ doins contrib/completion/zsh/*
+
+ distutils-r1_python_install_all
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 3774eeaafb83..c7cec8dc5dfc 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r2.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r2.ebuild
deleted file mode 100644
index 4dec17a54184..000000000000
--- a/app-eselect/eselect-php/eselect-php-0.9.4-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="PHP eselect module"
-HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
-SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
-
-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"
-IUSE="fpm apache2"
-
-# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
-RDEPEND="app-admin/eselect
- apache2? ( www-servers/apache[apache2_modules_dir] )
- fpm? ( sys-apps/gentoo-functions )"
-
-src_configure(){
- # We expect localstatedir to be "var"ish, not "var/lib"ish, because
- # that's what PHP upstream expects. See for example the FPM
- # configuration where they put logs in @localstatedir@/log.
- #
- # The libdir is passed explicitly in case the /usr/lib symlink
- # is not present (bug 624528).
- econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --localstatedir="${EPREFIX}/var" \
- --with-piddir="${EPREFIX}/run" \
- $(use_enable apache2) \
- $(use_enable fpm)
-}
-
-src_install() {
- default
-
- # This can be removed after a while...
- if use apache2 ; then
- insinto /etc/apache2/modules.d
- newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf
- fi
-
- if use fpm ; then
- systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
- exeinto /usr/libexec
- newexe "${FILESDIR}/php-fpm-launcher-r2" php-fpm-launcher
- fi
-}
-
-pkg_postinst() {
- if use apache2 ; then
- elog
- elog "If you are upgrading, be warned that our mod_php configuration"
- elog "file has changed! You should now define -DPHP for the apache2"
- elog "daemon, and inspect the new 70_mod_php.conf which has been"
- elog "installed. Module loading involves eselect as of this version."
- elog
- elog "You must run eselect at least once to choose your apache2 target"
- elog "before the new configuration will work. Afterwards, and after you"
- elog "have reviewed your new configuration, you are advised to remove"
- elog "the obsolete 70_mod_php5.conf file."
- elog
- fi
-}
diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r3.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
similarity index 60%
rename from app-eselect/eselect-php/eselect-php-0.9.4-r3.ebuild
rename to app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
index 9d383514ec4f..c99ebdbb421a 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.4-r3.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
@@ -16,8 +16,7 @@ IUSE="fpm apache2"
# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
RDEPEND="app-admin/eselect
- apache2? ( www-servers/apache[apache2_modules_dir] )
- fpm? ( sys-apps/gentoo-functions )"
+ apache2? ( www-servers/apache[apache2_modules_dir] )"
src_configure(){
# We expect localstatedir to be "var"ish, not "var/lib"ish, because
@@ -36,12 +35,6 @@ src_configure(){
src_install() {
default
- # This can be removed after a while...
- if use apache2 ; then
- insinto /etc/apache2/modules.d
- newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf
- fi
-
if use fpm ; then
systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die
@@ -49,19 +42,3 @@ src_install() {
doexe "${T}"/php-fpm-launcher
fi
}
-
-pkg_postinst() {
- if use apache2 ; then
- elog
- elog "If you are upgrading, be warned that our mod_php configuration"
- elog "file has changed! You should now define -DPHP for the apache2"
- elog "daemon, and inspect the new 70_mod_php.conf which has been"
- elog "installed. Module loading involves eselect as of this version."
- elog
- elog "You must run eselect at least once to choose your apache2 target"
- elog "before the new configuration will work. Afterwards, and after you"
- elog "have reviewed your new configuration, you are advised to remove"
- elog "the obsolete 70_mod_php5.conf file."
- elog
- fi
-}
diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild
index a8aa5bb8f4a5..e6b5ef3d8804 100644
--- a/app-eselect/eselect-php/eselect-php-9999.ebuild
+++ b/app-eselect/eselect-php/eselect-php-9999.ebuild
@@ -16,8 +16,7 @@ IUSE="fpm apache2"
# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
RDEPEND="app-admin/eselect
- apache2? ( www-servers/apache[apache2_modules_dir] )
- fpm? ( sys-apps/gentoo-functions )"
+ apache2? ( www-servers/apache[apache2_modules_dir] )"
src_prepare() {
eapply_user
@@ -41,12 +40,6 @@ src_configure(){
src_install() {
default
- # This can be removed after a while...
- if use apache2 ; then
- insinto /etc/apache2/modules.d
- newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf
- fi
-
if use fpm ; then
systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die
@@ -54,19 +47,3 @@ src_install() {
doexe "${T}"/php-fpm-launcher
fi
}
-
-pkg_postinst() {
- if use apache2 ; then
- elog
- elog "If you are upgrading, be warned that our mod_php configuration"
- elog "file has changed! You should now define -DPHP for the apache2"
- elog "daemon, and inspect the new 70_mod_php.conf which has been"
- elog "installed. Module loading involves eselect as of this version."
- elog
- elog "You must run eselect at least once to choose your apache2 target"
- elog "before the new configuration will work. Afterwards, and after you"
- elog "have reviewed your new configuration, you are advised to remove"
- elog "the obsolete 70_mod_php5.conf file."
- elog
- fi
-}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 0d89b3c25153..3ad21452da14 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index fe1dfdfaa015..955b322260ee 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,12 +1,24 @@
+DIST amd64-debug-libreoffice-5.4.2.2-r1.tar.xz 1156508068 BLAKE2B c7b399d7e70ff5e757bb5c80fef2c044a6ffb807c816ee489c9d9b39b82290ae4d0bb774079ec5b0d1bc13b0f891a295b7f6ab99798c2c064702580a34dd2168 SHA512 4125fcd01be4dc4587095f4c7da641dd0dd2195399a3965928d7447fa6ec7743bb355c6fab767b652c04da2d682dc285d8722e0ad4b16860b02390370f1697eb
DIST amd64-debug-libreoffice-5.4.2.2.tar.xz 1138708128 BLAKE2B b2daf5b0afad8be984dba09955ccd5ec5ee28762bc4295a921ff39d152ae9b3e73f5f15fb832cf5cec5f915cc705862f4cac2d3ca4ae239e457c991fcbaec06a SHA512 60d1d6560e44471572cf024db1ca5b00c6b3ece2a0c02c09dc523bca101351c24bcd57db25d8a5616496b2d74656c4b8f5e9c8d7d084be53143c5b050e8315d7
+DIST amd64-debug-libreoffice-gnome-5.4.2.2-r1.xd3 331470039 BLAKE2B 540b21340e8bc95ac1fda1d886566860bd8f69eadf8922354b5e298a1612f4385ee761d16ebd1d2f369a6b286cec40e3cd09ae5f0c5f95137c0a330d3daa95fc SHA512 33048353072959c22d22108aeaf7a9be42139187a89493152f3a3b987f6caed6fc61647d090ccf1241da2afcacb80f2e6dbba3f503960a0f22886a49f4a0d46a
DIST amd64-debug-libreoffice-gnome-5.4.2.2.xd3 320539580 BLAKE2B 985493066127f8a2c3bac5ac4fad083dd6de16b0504eab928fe61e2fcbf8e913d8cf40488ed70fb40585ec4cf14b068392a2f5a7af1bb62a2288ad926fc9e2e0 SHA512 bdae4832e9ea5c0191ebd1d3e46cef75543088ba0591f25ad70ab5b32b86846b72857b61ea44ad52453b42f2a9c9277a967b6fdd8abd3c33517ca1ef422b5af8
+DIST amd64-debug-libreoffice-gnome-java-5.4.2.2-r1.xd3 560720309 BLAKE2B 2e9a40728b82427aad554c8f2d718adb76039ea42b317eac811a70dbe1e5295d932da9cd7652244254bce724fcb07ba0f34e39a05fec6c894bf3a6c3ab85bd9e SHA512 f72e0b405720091d039b7cc9268408a1e4894fed8a686caf59074700ac177638d62b38790890df5b73e58d53e287ad268c2054ef9777def417edfb5c68cd7c79
DIST amd64-debug-libreoffice-gnome-java-5.4.2.2.xd3 550445993 BLAKE2B 29923d61be3412e51a12aff824f0f46836dda99864b4cf152d58e30153e7cc7261eea041b064a0010b664b19e174dcd586b09489d630f7dfef04ef864afb652c SHA512 85e95fd1fa0519ba60a39185245c15ca1cd6ffce084df65016585645a5b98c1d13ebc6df96ef8583697b6388d086e20a48845c879a83cadc5124c8b5b145e041
+DIST amd64-debug-libreoffice-java-5.4.2.2-r1.xd3 552785398 BLAKE2B 417ced59083618c0f2b8ef92c5d70677c43f94a2fd5637400d2d89318ab4cda033f8b852e421c70061ad76527346651021dae68097020cedd157aa2b762dbd67 SHA512 84701111da26928577ef5c03c54016c2c239e219681bdf95160a462889a15be54aed4d2075dd96700b70bb86008cd3c09f31bddf406fe93918e986b6fc09dd6f
DIST amd64-debug-libreoffice-java-5.4.2.2.xd3 543230548 BLAKE2B 32e16d1e8d1847dff3152fea0723dfe95b429340a4155491c6ac8a805a0ac403a75db97afa86add13050f00a30c80122f6fcd9117667a8fd532fa51f227fc85e SHA512 a0a6f92102c7e9a81b4653fbb260e012d27eae821b9b1148f4022d752bc55aa740c12d27309889b171407bc16311b0982ae3320ad81766616735491e3b850cdc
+DIST amd64-debug-libreoffice-kde-5.4.2.2-r1.xd3 338146804 BLAKE2B 5e5636792fdff2c4f42b5004937a88f7adfc3832f11243a6534eab2e679f7ecbd43619825dbde25dcef6338554c1c46575a4a5aa1bbfb9bbc838c53adf047995 SHA512 cc16b11664e2e86f7f2915ef767f4116a98445b9aedbc7ad440c4ef7b88d42f8dcec957f0f92c24ab8c0d78c73301b244f9aa4ba06b595186d90e4e084ed06f3
DIST amd64-debug-libreoffice-kde-5.4.2.2.xd3 327453528 BLAKE2B 78ee5cbf9d411b5c355f8e86322a156624f0541994d966790ef81c4ed4ee9a3bf0f1ca937daa1eb076e3e30784b5fa329f95bd8c4d90a39377dd75e0a619149d SHA512 fd25a18f0200b37081d4cf40cfe5127f60e090776ae42d2b7a62f79ec66aaa79cf8ea26cd1b7fdb14b082cd242e34b415a4dd6d2b535e8fd5615b65ac9093129
+DIST amd64-debug-libreoffice-kde-java-5.4.2.2-r1.xd3 554592932 BLAKE2B d095455bc430cdc7ebc79af7569a2160005bac5c86aaadb65f1898f02721155306ac33597abb3816fc3a2f70fbc952d330503b5d3bff8ca8e84634ee70d341b9 SHA512 2698392c7644ca06033767b1eb01e4cf74ffd16b093369bb7b3e19d75f0b58e21629db7f626fb675bad6ba3cff61d1f6cd2f5df21f19d3b9a540cd3f0c928411
DIST amd64-debug-libreoffice-kde-java-5.4.2.2.xd3 544806690 BLAKE2B 493462e6cd2e50343a08563cf726a55e8a64216da1aade02875d597a92266471e3d41f9b80408903d4047a88f27fc897a31b9ffdfb101b62a3db9258820f7354 SHA512 dd3867e585ff6f91d5aa8edc878fd6f9f6f3d4e780faa836c9986ef8fb359cf7fdf2cc24ff6124277d7af4e1ed73ad86fbee3b3ce6c1d8114b48be4219db8a02
+DIST x86-debug-libreoffice-5.4.2.2-r1.tar.xz 1128856012 BLAKE2B 75b72abadb56bf02456cf60b39d89c811dbcd275547cfa53e961d42bc8eb124fadaea666b7dce9b9ebc5c4758a83e81532f164c59317d98d2cda3a39416af233 SHA512 feccb169682c979820f402c0ecb0d5be1455c01a56f350e7cc0e335ebe809215c6f4a7201ef12270b882e2dbec206da8bdf85dceeb589de7748a790844354c97
DIST x86-debug-libreoffice-5.4.2.2.tar.xz 1107530632 BLAKE2B 3bd31738d031755c05fc1c2c8edb33d845d3a64b578c812f2fc473e6a6981851bf30b450a0cfe8a63e24f35cc1a3853b4fcd9d045cc3f6ac4403f6f61807ebee SHA512 78aad2e4bd7ff3e6b561008c65f538aa2d7941eb0290b374e82cb96e7d327ee8d7f80a298805bd38fd94884b66e14295a93b4319bb45a7e0fc860d1287f7c241
+DIST x86-debug-libreoffice-gnome-5.4.2.2-r1.xd3 321601178 BLAKE2B dc9fc8b94f1c7cb856c2af96560ef6c4da5f6f12a65c55c1dfb001ca14306a8a654d53841671d6be07b742f0c69b68138275bae48fa0eaf2398f6fadd50c9b4e SHA512 81f0173a4eac6fe73b3d9a1f773e7f4d463898b4f347e6465df66449094cd7cd5b9e3d0e119e67a18dbe0d56c6428cda50b2bd08d633de8c9097acae79eee8bf
DIST x86-debug-libreoffice-gnome-5.4.2.2.xd3 309369878 BLAKE2B a190f404a835fa80f95ca637c3e60bdb3d4dc4e53f5cc1ff4d0a58b142cd71780e397270f011128d034c258ee5d007104cef73cd30cab0ba4541dfd04ab59b11 SHA512 1f97dce9172034cdaf6e86e3d5b485119e577cba79a0013fe9efb0f326e21598bb0856b656619ee3c273b4252db0327d86e38e4c717d215fb29936c08eb3ef0a
+DIST x86-debug-libreoffice-gnome-java-5.4.2.2-r1.xd3 538276484 BLAKE2B 607bd39450aea3720086abca0fc32b60f09b2a704296887bcede01f4c5b633fba5ef72826b7af1b138539849d35b9c581e79b2597e55524034794f904eb8ec96 SHA512 4007d50c3c8644edd8e5ef061c5691d6c0a5d5595331b75fc9e29deb4b557e52c645a6722085e6187527d2c9269df0a23880a6a79175bb2b03a8c8370acd5b08
DIST x86-debug-libreoffice-gnome-java-5.4.2.2.xd3 523725289 BLAKE2B 3101a58d45e94f2b890fb07060aaead80d57a0fb3b3a2e7919b40fd15bcef731cf2d5067b65ffd9f567a8ff68f73bd091beb61988c8b7d7583ca188714732a83 SHA512 f9f1fe8b602c0b4dd59a1bfd110b24ff50f1ec33e1b41f5af2f28bc2da610c05e3ba5f4571420047261e206e5e7f89cac747e9a795957238e975ee8d77f313b3
+DIST x86-debug-libreoffice-java-5.4.2.2-r1.xd3 530463158 BLAKE2B db2c2ac52d6071626c453cfa5cd35bcb45567e21598d7d6dd1bdd0c556f29927e591ee43d0b1364271aaf9071099f45af3b59d69b4f9627870afdb538383ba75 SHA512 45cec98e3d4d04edc8daf1c711b6e28a661ab2899a4a931867d42cd0b4704a2b22b59beb98d1bba1d501a10c5de0158ca3b8e952de88ae71871246be60bcfddd
DIST x86-debug-libreoffice-java-5.4.2.2.xd3 516739219 BLAKE2B eea40866178941f96d66a5f5d1061b47a1fb187093afcce4bfbc372a36f629722f45a3e60117c9c7a8601c6526fd67b300611363d96431b48bd47d037faf22ca SHA512 f49bd0fc9609015e892d9da046083b121165aad445b336ab99e8991a5c9077b603c6c8c052238358487839dbdf5379f13074e1a25bca6d8ade0927055e92da7a
+DIST x86-debug-libreoffice-kde-5.4.2.2-r1.xd3 328224707 BLAKE2B be0e44514784a79d36bfe445ec20a90629c1b715f5705a83fb3604aa53d0137180e008f484c27bf004bcac91b3763d692658045d620236656fdb9563bf7d4d83 SHA512 e7909d4557e8999aa62126da7bed480e255a1486882e7e4524fc997e358cc81c35a3a30fa87d7f185a2c17aea0e5536fe464bfe3cf5870fe65c20611d4202f40
DIST x86-debug-libreoffice-kde-5.4.2.2.xd3 314850500 BLAKE2B b7b6e3b03e99f7fc44452b57d8eebf254bcc0b2d9cb40e248dd07399684dd54f821fd8b9356c0e12d650a0f9ac49c96acbcc319456764642f556770716a1c620 SHA512 218c51994cf8c27e3a20d1c88443b7cdb4501263342f01b4bcb555bad1b36cf05ec9b0def4b14e5262654819d17ce77dbbc642d4e646b46a3b2b72271b4e9dbc
+DIST x86-debug-libreoffice-kde-java-5.4.2.2-r1.xd3 532241334 BLAKE2B 50a0a344a6458d6773ee9590122ee3e0ba5debdbd1e67e73ec08e4a68969962ba9e5a42c223ed6ed3d58d4d067c80925a2e551f1accb78cb468c2e5b158a6944 SHA512 19df982e8642f068c8147bdf82b37ffc5b2b95b9070a87dd97ffab8ae054ae2c842f83961620571d0485a6455c576920af62eeec197539f6855d1b6d1613f52a
DIST x86-debug-libreoffice-kde-java-5.4.2.2.xd3 518297724 BLAKE2B 580d482859c27ae57fcde8605561b0e1315f942853b9e3dd3b341c03099e8824be879ebd7af90432126050beb8c00d655dcec8e200a433c9064bc2f4dd3e3197 SHA512 e89c17e1cb65c28d4fe2961de12e22321b19456e3562466fdf601a20a0ff22704bf385311fda971892ea25a6d4bc74444ec93e39bc59ce7d95682b08603cd1df
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.2.2-r1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.2.2-r1.ebuild
new file mode 100644
index 000000000000..1665a9827b14
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.2.2-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI_AMD64="
+ ${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+ kde? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+ ) )
+"
+SRC_URI_X86="
+ ${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+ kde? (
+ !java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+ ) )
+"
+
+SRC_URI="
+ amd64? ( ${SRC_URI_AMD64} )
+ x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+src_unpack() {
+ einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+ xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+ local patchname
+ use kde && patchname="-kde"
+ use gnome && patchname="-gnome"
+ use java && patchname="${patchname}-java"
+
+ if [ -n "${patchname}" ]; then
+ einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+ xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+ mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+ fi
+
+ einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+ unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+ dodir /usr
+ cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 4b9da7e8f165..39d3a7f27037 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,12 +1,24 @@
+DIST amd64-bin-libreoffice-5.4.2.2-r1.tar.xz 75362012 BLAKE2B d217824ed319df6b3e9b7b772f9f131141674e0cfb6c2e0d860ab2b62e30438f7b7a1a5f987affd5fed9cdd5009fcdf7638ecc268775d9ca0f48dff73a7061df SHA512 a28f64b8e1c5e2b7ddc204227bf7e49b929199b818fa8ee830f0b95d23b5fe2d088ad820696b23a45202e600f7be9c3edda901f475c106df4634f8cd47a159d1
DIST amd64-bin-libreoffice-5.4.2.2.tar.xz 76103708 BLAKE2B 289b0fa454effdf4ad9a8bbeec633d2592f547f6907eb9c814e32c1ec25a45aff72ade4b84294d8c0960b3385a945e030ebd15306f6c261c414a8eb42a50d83f SHA512 ac577138f065ad8699b26743b905c7b94b4875eb45fa3c9a580410d2e587519df01de7669c0f6c1baff879b879f41140be4fe844174037dd89bdfa10eb0c4812
+DIST amd64-bin-libreoffice-gnome-5.4.2.2-r1.xd3 16337443 BLAKE2B a784e90e24987c09122ea44e59aa44f9d3730c4aae6498da934518ddc0ad708fb3fbe7c64c32041616b4d04dd45281e7c618769cbbaf1ae7385f5a7055a5d464 SHA512 8a35544616ea145b2862e9b9fefc54f55a9f2aedeb98cab691f37d3a308dff0b7a92a46068956c7e3b26ce455bdc7744720d24db990615bb19c1a0377015dd04
DIST amd64-bin-libreoffice-gnome-5.4.2.2.xd3 17096769 BLAKE2B 7d91c62ef0f10b10758de63a463ac52350ea8cf2f426c6d52b4c7fc9edca4ca615be7d9ce8481d78031b3a40f38653ca3e5bb9267097d921055c2a18e78f2eff SHA512 079141e1ac63a228682b3b3f204fca288285fa2064841d66a0eab4cbf36e743a402e7d85129ab5b4f3b60f023ca1f04217529ca78ac6f40ebeb08933f59d75aa
+DIST amd64-bin-libreoffice-gnome-java-5.4.2.2-r1.xd3 26558117 BLAKE2B 2ee08980b53314b0570a96f4bb76f8d61dd7c752348a0ab626ce5fb732f1c44319c64af9a595183ed13df832958266b4c958995d9253a1ac172b6e90f42d626c SHA512 dd8004642025a958a213dc767e4f73a282710fcc2ed3c2b8e0622ce8aa7833d466962d45016e81fff71896a7148ec8cb1447b3df77c4e6547279c109e1f4241e
DIST amd64-bin-libreoffice-gnome-java-5.4.2.2.xd3 27455524 BLAKE2B a2271382f4c8e533467f4cc8158a2fcb4996c387012f016f1ffe1a82d5b1e7fd9b81a3ce078cb470de1a38094b8e64a0f8fda6b1ca349bbb3c97d14fe16043f4 SHA512 06a03f256ab45087706bf51999dab4e4185ee55c9d28bbf60c438ae71789b84fdded9614713afdd3b83c7bbbc72cc80747a7d41a633bd606a00715079c85f97c
+DIST amd64-bin-libreoffice-java-5.4.2.2-r1.xd3 25596784 BLAKE2B 493066f074077baeeb991935362291599db567e4ec4114ba78a733e89fdadc810cee607f77529f2543cba767000cc26c03ea9238ba892f4dea50374b6af98a04 SHA512 f25ddc420a63a8cb3fa89104dc875898b73c3be48936b0c59c34a4bec4ce574ab36e0ea5f4c06fe824b50dd15bd9c301ac181ead095d6bebb676e1255880254e
DIST amd64-bin-libreoffice-java-5.4.2.2.xd3 26415061 BLAKE2B d7583a90bbec71436f9a66f6effe09131c9f89193eb1d1618cc890646f436b956e0e5952da9f6be6629dea02a35ff08caf7563318d14a3331e35c47f3edb5928 SHA512 e73c8710035337a5aaa07c3751deec9cd842dda61c5fefb9f3f63cb5b79b47f643f87e2559605855f5970daedf78ea2f5788d82351e623b86c909d90576cbb50
+DIST amd64-bin-libreoffice-kde-5.4.2.2-r1.xd3 10234903 BLAKE2B 633e27bf7992ea7735680e33f22a2a1f6af84fd538999cf4cd98362ebfeac214c897862d5eab5f3644cb3e23ab640d6ace23a5d63f1c4db1452113808a66724c SHA512 07010c1e1370a6d3a375fafbdcd44496f34abb06c8bfa949eddbafbd85dc0d548ce43668b1c73e4cad2735564607454bdbfb893f48e76619b33f61f24439aa25
DIST amd64-bin-libreoffice-kde-5.4.2.2.xd3 9501055 BLAKE2B 3f98ee516ecdd506fb6a03506ce2dca9e9b93438f4287aec84bf29c729aba76294b6721f84fcc38f0ddad373a2a0780697fb3ee000362a4ce8aed9e7ad150a1e SHA512 f9f144971f7b1619b7124f68f0c5591ff440d891233662985c659dcf98c8ba93738f28a9c70c11f83e216f3488503e9b49b359eee44989e85c754b061147c575
+DIST amd64-bin-libreoffice-kde-java-5.4.2.2-r1.xd3 25826013 BLAKE2B ad18ba2ae78f6973d98816680804da8d838cf22567759fcf9536d42ec526e252e5ae47423f37ee5a68eebbd3471263417865f51b0b0c0dcff70e3e0abf7fe5fa SHA512 c80fd243aa8150ac69d8f9ce1ec76f32a7873aeb3d93e73841d34ea7c87c3afff07a414029806419b5fd99345a94769de40d4cf0d89b56960f14fe6d247c5c6a
DIST amd64-bin-libreoffice-kde-java-5.4.2.2.xd3 26621192 BLAKE2B 5d9d6ceac4bb7772bc236ee44f0d602cc555626bab8cd89f4bc9221d16beb3d44469ac47e9a4a20dcb670ad87cf4bae895bcbae19f0c9161736045f9d05ff381 SHA512 883a897357cffef3f37961dae7be10d1d47093762a842cbd775c6a14b202fe5c9a2cf8878ed2d9587c511c1d427ce20da71ec3b21da6f7bf4f22fd5169ebbff2
+DIST x86-bin-libreoffice-5.4.2.2-r1.tar.xz 77497504 BLAKE2B f4258171c91144f7a96fc4c3f885337ca2f8614d2f1619c56db9f18bfb3e0d9f932c151bbf508b34755a390e5f61c62f5b564e441d4d328b1a2699fe1d60d717 SHA512 f670737962b667782542aafe5956dccec5bcc82e0a080311dade7565b8c702ae020c4ceaa917ac22135d5c57bc021681521e6d5863abf1adbc9789d25c36a186
DIST x86-bin-libreoffice-5.4.2.2.tar.xz 76197244 BLAKE2B d14cd52d70649a7d96348734ddf34796ae4e1612eb8965c1c294fa6c5dabd6b39d3d3c34345d4d8300f71917cb74ea5f079ed258c09f6f7198453488e3539967 SHA512 3e6a04ed0febacbdf78d0514df1d863196463cf777a646a5f33afb6ab3cdfb9f27245d4e362974f2112b484c29c810c2d563d5b57894feb603d9a4ac8ea19b5d
+DIST x86-bin-libreoffice-gnome-5.4.2.2-r1.xd3 14217445 BLAKE2B e952d53d749bbc78c67c1f987ea6ad48e1c0d345d36d092106798dded817f3625b60bcdc23998eea01bacdfc812a9175c18d4980ae47fde907cee595702e91b8 SHA512 568a176241b4d52d3872a3ed6e5004ebac5fbbc0561d1768b7990cf98c0172126e41e0f66febf6860262d9ab060952d62d40ad3d6b72e23b848e0d68d76ac907
DIST x86-bin-libreoffice-gnome-5.4.2.2.xd3 14720380 BLAKE2B 4790acfe2bc37c41597300e7283b1157e2047e5fb4c6e865f23e5494b9e7f35dc337d806702f8fbfc5a5c20ae63834e0c12ba2992a6471d3c105ee32417a593c SHA512 b73e6da0979a78049f1563a0fe61764d7b97197d27a307579b76639d881952a4dd656a49249351c172ef45a488291ce3a4f60879f9bff473df6db22ae598abd5
+DIST x86-bin-libreoffice-gnome-java-5.4.2.2-r1.xd3 23765116 BLAKE2B d01b9c2f9eb2631a60d57c28de5911140a410bb96088bceb0a1c23d79ffa1565f87ba17f000c0111594551d3fb65c32dbdf5909f85c2edb661ac362664612da0 SHA512 c11f03628b9886d40ca8e4564c2d758ad71a7fcc5058cfdb794c3280b0f86d247e59adac0d8865678553f58b216cf6d12cd13de778d8b9e564f25d057a0e07d1
DIST x86-bin-libreoffice-gnome-java-5.4.2.2.xd3 25943139 BLAKE2B c1a76a8b1c10d8fdef90599c55fc566708877e245007959d5baec5b408bfbd74652acb61528bc13d795c8fc7ac1cb47c7ee99a8b0d127fc575e3d49fcf26cb2a SHA512 38de8628272f7633c9e1c32dc08161ecb40ca824bac433122f45d696b1d89376fb6a5843c125295f66e00f61c354da223b2cebb2683f0a03d38b6017b002f7a8
+DIST x86-bin-libreoffice-java-5.4.2.2-r1.xd3 22549416 BLAKE2B f1f1dfd68af16cfc3be1727bf223c8bcf3945045519cac1515a22dcff7d8304831917d610be4f269195238ca903d9150abe04df7e71b9f5149cb0dd78dc47b53 SHA512 2d8e4324bc588d6d9950daaa1d85f02580ced2c743326c656a1ef04aace957b2999828d607126bb4195fbce1f6dcd2dcd70da48bf6c5e6f889b641905e9faedf
DIST x86-bin-libreoffice-java-5.4.2.2.xd3 24836939 BLAKE2B ccc413ba0900e7cc6605b0a17102cfcbc0410158580ecce759a149bde3614838d9d4f7fbed279b09331b388357467ba97e75892897e7095b26820f97cdbba69a SHA512 1b9a4ecb1f2304b60a19079d19405bd3d88da4123d80b14915a7494e0f8bb78b11fb9cbbba026691072cceeb74c4f7736a18167bfa67eb74b7a25dfafb69fa4d
+DIST x86-bin-libreoffice-kde-5.4.2.2-r1.xd3 6268866 BLAKE2B 0870aaafe5d5d205d1abcf45504030190066fa7a2d0dcb27ef6486baf2f70b2277a6dbf931ef19a10e354e9bd285e0bb55cdd3dcbac19c416240c2d6456128ef SHA512 581916d02c36df1b27057acd21ff98b74ec574ef78441992598cb4aa9fa4795cb5c8767040d08711c2b3f3b471a1fbb6fc4b6139e4eda1b7b6de21fb76d0ed35
DIST x86-bin-libreoffice-kde-5.4.2.2.xd3 7039660 BLAKE2B 9c6bc3cac15ab322c206292c7e9cf560ef675737ad82bddf58d411069e5c657542bc7d8bbea365caf6f16960b70a4e092400783dfa1d7b50ac1b301a39b654ea SHA512 6e289355170bb7fdb9273902647332a8dff4f4b02e420416eabfcf40b1aca6986adcb7f682ad9d8a89907d90a1090ad8eff3c283f025ae688a1547b653149cdc
+DIST x86-bin-libreoffice-kde-java-5.4.2.2-r1.xd3 22630525 BLAKE2B 744267ac7c1fcc12c818a2a77bae7c2dc07009518712627103952a9e74355cbbb7c99b925340d211ae74e50df267fe8b135cfc88c66e41cbe9ca366acc09d5fe SHA512 580a19d8ac55dcd179daf3a04692d1eed397912202fd11de5003d6a9b445b8e3e2a8a93ed9406b40ef287f8b98b685b0418f72ce5c9874d3a7fba0befa34b807
DIST x86-bin-libreoffice-kde-java-5.4.2.2.xd3 24919539 BLAKE2B 7da2fcad2eee3d35ad876d988bce486f11721cbe4506069bb782e760ef7b02372f529f4329eb290c603f0c7146a04c711f3facc431028b42b2c8ec655e25de8d SHA512 5c982b7bdd2071c57556e821e46ab58d2ceb3c34a8e45a4e9abc3719917991c5c69d3bb242639fc51654163849f3dc0668620939d082228e048d1236d6ce96fd
diff --git a/app-office/libreoffice-bin/libreoffice-bin-5.4.2.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-5.4.2.2-r1.ebuild
new file mode 100644
index 000000000000..2847919976e3
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-5.4.2.2-r1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_REQUIRED="optional"
+CMAKE_REQUIRED="never"
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python3_5 )
+PYTHON_REQ_USE="threads,xml"
+
+inherit kde4-base java-pkg-opt-2 python-single-r1 pax-utils prefix versionator
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI_AMD64="
+ ${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+ kde? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+ ) )
+"
+SRC_URI_X86="
+ ${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+ kde? (
+ !java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+ ) )
+"
+
+SRC_URI="
+ amd64? ( ${SRC_URI_AMD64} )
+ x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BIN_COMMON_DEPEND="
+ app-text/hunspell:0/1.6
+ =app-text/libexttextcat-3.4*
+ =app-text/libmwaw-0.3*
+ dev-libs/boost:0/1.63.0
+ dev-libs/icu:0/58.2
+ >=media-gfx/graphite2-1.3.10
+ media-libs/harfbuzz:0/0.9.18[icu]
+ media-libs/libpng:0/16
+ >=sys-devel/gcc-6.4.0
+ >=sys-libs/glibc-2.25
+ virtual/jpeg:62
+ kde? ( >=kde-frameworks/kdelibs-4.14.37:4 >=dev-qt/qtcore-4.8.7-r3:4 >=dev-qt/qtgui-4.8.7:4 )
+"
+
+# PLEASE place any restrictions that are specific to the binary builds
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
+# the source ebuilds.
+
+COMMON_DEPEND="
+ ${BIN_COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libodfgen-0.1.0
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ =dev-libs/liborcus-0.12*
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/openssl-1.0.0d:0
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ net-print/cups
+ dev-libs/dbus-glib
+ gnome? (
+ dev-libs/glib:2
+ gnome-extra/evolution-data-server
+ )
+ gnome? ( gnome-base/dconf )
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ gnome? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ x11-libs/gtk+:3
+ )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice
+ !app-office/openoffice
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+"
+
+PDEPEND="
+ =app-office/libreoffice-l10n-${PV}*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_pretend() {
+ [[ $(gcc-major-version) -lt 4 ]] || \
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
+ && die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
+}
+
+pkg_setup() {
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+ xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+ local patchname
+ use kde && patchname="-kde"
+ use gnome && patchname="-gnome"
+ use java && patchname="${patchname}-java"
+
+ if [ -n "${patchname}" ]; then
+ einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+ xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+ mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+ fi
+
+ einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+ unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_prepare() {
+ cp "${FILESDIR}"/50-${PN} "${T}"
+ eprefixify "${T}"/50-${PN}
+ default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+ dodir /usr
+ cp -aR "${S}"/usr/* "${ED}"/usr/
+
+ # prevent revdep-rebuild from attempting to rebuild all the time
+ insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+
+ use java || \
+ ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 2a978bbe3f28..a4536b1dc1da 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/jdbc2-stdext/Manifest b/dev-java/jdbc2-stdext/Manifest
index 2e1a72d534f8..101d6e83f55f 100644
--- a/dev-java/jdbc2-stdext/Manifest
+++ b/dev-java/jdbc2-stdext/Manifest
@@ -1 +1 @@
-DIST jdbc2_0-stdext-src.zip 21642 SHA256 70470d9f3a2e1f4e29b909bf9c89005a9d2523825eb50cf70b2fa2957ff8b2aa SHA512 5157a5835983c094b13d947a39311d08ea57cd8e60197176681289d41a209f3f8b464e1e0dd97ed714534ba5afb749807e02efb3edba4e2c91e273e71f6f1ce3 WHIRLPOOL a57f77ae2b268b21e7733b7cf4edf1cd8751c8c5c25f1b7a6ae78677c14d5f499a9a05c36cd88a3c9ec9c4fc361476cc7433fa81cb94ed51b09ac4a2bca341a5
+DIST jdbc2_0-stdext-src.zip 21642 BLAKE2B 475892fc77247a93eaaf400e48c585832df843cedcd1ff2f8de364f6895fc9661d1d2241969b126fbb056b23be78085317fbb14c69c349612d39b700913a5b72 SHA512 5157a5835983c094b13d947a39311d08ea57cd8e60197176681289d41a209f3f8b464e1e0dd97ed714534ba5afb749807e02efb3edba4e2c91e273e71f6f1ce3
diff --git a/dev-java/jta/Manifest b/dev-java/jta/Manifest
index 14e89ae0074e..50bda7fa8158 100644
--- a/dev-java/jta/Manifest
+++ b/dev-java/jta/Manifest
@@ -1 +1 @@
-DIST jta-1_1-classes.zip 13236 SHA256 6202127f8e3fe63ebbaa8c3ddf455bae862d5563b4c210ea29484df52ce505da SHA512 fb8b76223ccdec0ef97b00d7248d74b6316dd67c570667f3a644d03b05cd28af061a191cf71b6624fd4a4195f7bc107281eb847fc4c0ee4606c85c414da79a14 WHIRLPOOL c6b97d35eb09cd027596594ce009c251cc61014ceacd7d49748eb157ddbec6700eb29d07a4f9fd0d6273652cd83e067fc7f2a4d99e584ad13c7f13c2f8a07271
+DIST jta-1_1-classes.zip 13236 BLAKE2B f2e1ffd531fce804d562c4cdcbe9b260d08eb2bcd79a879f94fbd3e23801849cbf311d8f7410a9776f9a8866027dcedcac479a64444321e8c6b2b23bd9a69054 SHA512 fb8b76223ccdec0ef97b00d7248d74b6316dd67c570667f3a644d03b05cd28af061a191cf71b6624fd4a4195f7bc107281eb847fc4c0ee4606c85c414da79a14
diff --git a/dev-java/sun-java3d-bin/Manifest b/dev-java/sun-java3d-bin/Manifest
index 51c699353feb..defd3e211e85 100644
--- a/dev-java/sun-java3d-bin/Manifest
+++ b/dev-java/sun-java3d-bin/Manifest
@@ -1,6 +1,6 @@
-DIST j3d-1_5_2-linux-amd64.zip 1956319 SHA256 906e84747d4993df08b765576b8ac0fd580a1062fe1bcca173ff0d060967b175 SHA512 6105b460d09f68c7a1ab289e23717016329900d1e113b516965ee3015fe47836d2165bb450c43f7fa5f7a42ff819c70581193990d153226cb41dcecb1b9c71bf WHIRLPOOL 1f40fcf75dcc5c70485e5ede6d64da43241da326d0085ae456f81662aa89ca1bb820bcb53cdf053331e82e70c18ca80b2dc7bb1f51d1886e789616274fccbfd3
-DIST j3d-1_5_2-linux-i586.zip 1956020 SHA256 264af1e73738d33ed52c56527122d7e17c3d64b19d7ed765ac235c5c4d0f9522 SHA512 1504d2dbcdc9a49be84f1a6327669764febc83f4e5c4365894b8a4bc15b14857262bc0d548b678820ad3aee8f349f2515cfa9a06dfdc0e8bb9afd50de0c4ca56 WHIRLPOOL 05dd7c6dada0bb201829017472064599d73a402d486dd5283a91a6228d6bcd6a21ecaae8d3958622674e6374e3714c5d7ac0cc37cec6286782d0004b8664e367
-DIST java3d-1_3_2-linux-amd64.zip 1241855 SHA256 e248fc43792db5a351540e7c1a7c4c594fee30d5a8e622dbd8290075becca8a8 SHA512 6781be7d5c510b9ed4fb533e58eed792ceade0245b7ace00947f6cbac711b589d787500322d3ad4e6478c61e017cf2be9c7542a59a6a0af780d9e0a06b5a5f78 WHIRLPOOL 00dac2f26e8c71df5dcbf6fda2c25434994a40d7aab8b7901c2b2805d354218563b634b82b2d957e6f642624726e3e2f8923576618f09dac1699d27d9cc88028
-DIST java3d-1_3_2-linux-i586.zip 1235329 SHA256 1fc3a02714bcfd938b5449561cee49c3ffe5f8c320591374caab4a0c2bb9f415 SHA512 5fb459ead7cfdae468017bc40cb6f8831a8fadbd27fd3c62404b9cf5ebdacef092e8a4153058731c2a004672bc69f4061b664412ed937a7b49a15ca580762839 WHIRLPOOL a9287b5b6d6f4346c736c7b707e34715b6515c0df0368848212ef82a4686d8d8374db756fcaf67b18617c42aaf6c7ab34832126650dacabd74b96c74e452dc5b
-DIST java3d-1_4_0-build5-linux-amd64.zip 1281828 SHA256 1ec9d7dc176eff6bf2c3568f452fc5b13d471d4f963090570996a635b8f8a301 SHA512 ec1074e5ad40964a80e2ec3332f67d1b7067db6aa5d99379f9e488e2c6a342b0c3d0c78aadd995bd647047efdeb0f040c8e8c7e4557a5161b6a8919fe93cff81 WHIRLPOOL 835257f8099a71cff3533a651d08af2f487ca79699e3e0165999d8b3dede75bed373a7b7f9dbf42070adce5aab87563a2338195a9b96fbf4130db16456434686
-DIST java3d-1_4_0-build5-linux-i586.zip 1274577 SHA256 e03d87159b4d2cecd48f90d1373dfc496049e41888e8a545cf5bfe94a89aa4ff SHA512 1b6b87d660b98029c8a5a2cfc9435538c89032b4318243ee5dc01629c72f8f4ea189ee383150821b291a6bbe2b3284ef7c6da6404851a8d6adfe6fea0af3ac59 WHIRLPOOL d9e73a16ccc54ac16dc5275ad67aa2fae98da8475f7c7ca54db2e68fdea751048f578a4f12ef43e06f11c50e0e2eb53cef8804623e86865b0bce0acd7ae476a6
+DIST j3d-1_5_2-linux-amd64.zip 1956319 BLAKE2B 05e229dedddde18c261e652adfe6dd87e9bad90ea8129fd351f9122210049a587dcbf1a6e982d06f75f8936762d37b7b2710b374462c6a0e356acfb7bb8dffb9 SHA512 6105b460d09f68c7a1ab289e23717016329900d1e113b516965ee3015fe47836d2165bb450c43f7fa5f7a42ff819c70581193990d153226cb41dcecb1b9c71bf
+DIST j3d-1_5_2-linux-i586.zip 1956020 BLAKE2B fe2dc4275b021a302a3914ae2243f75142f40370dcf01e256d4557c5dd10fdeb060b4a8cbf5e274c8ae38dc984ad6dc488a8d15aff621b0fdd5e2185c1523cea SHA512 1504d2dbcdc9a49be84f1a6327669764febc83f4e5c4365894b8a4bc15b14857262bc0d548b678820ad3aee8f349f2515cfa9a06dfdc0e8bb9afd50de0c4ca56
+DIST java3d-1_3_2-linux-amd64.zip 1241855 BLAKE2B 342b09f8643060115e642ba9da302772b1514322f1157059fdb8e9d83e8c307fa970a90d1d2dccc88fd54e26c31c8b6beef2ae61855463e6ca25613fb78716af SHA512 6781be7d5c510b9ed4fb533e58eed792ceade0245b7ace00947f6cbac711b589d787500322d3ad4e6478c61e017cf2be9c7542a59a6a0af780d9e0a06b5a5f78
+DIST java3d-1_3_2-linux-i586.zip 1235329 BLAKE2B f380465fa6442e129bcc4c2c7b0f1c2d00775735ccb1755eff0cbfa063bdceb23209fe157c1127a36dc24e5fa7988194e2b5e830a3ff43891dd8e0b00cc2d855 SHA512 5fb459ead7cfdae468017bc40cb6f8831a8fadbd27fd3c62404b9cf5ebdacef092e8a4153058731c2a004672bc69f4061b664412ed937a7b49a15ca580762839
+DIST java3d-1_4_0-build5-linux-amd64.zip 1281828 BLAKE2B 90f1faa775d1c0f29cb32dc36801dbb697721f9509a45b9cbf9e26750e928359dad5e7458d98412ed3c473ed108e4ec937d6ef1fd8bad75d5feb3a5e152a8967 SHA512 ec1074e5ad40964a80e2ec3332f67d1b7067db6aa5d99379f9e488e2c6a342b0c3d0c78aadd995bd647047efdeb0f040c8e8c7e4557a5161b6a8919fe93cff81
+DIST java3d-1_4_0-build5-linux-i586.zip 1274577 BLAKE2B 38bab843a406b563f21dbffd51aff26937035c48488c4c50fdc8268fa8fcd73455219b927018958c2a87b35085aa51c8abe565564690047a2da6628e914c5722 SHA512 1b6b87d660b98029c8a5a2cfc9435538c89032b4318243ee5dc01629c72f8f4ea189ee383150821b291a6bbe2b3284ef7c6da6404851a8d6adfe6fea0af3ac59
diff --git a/dev-java/sun-jimi/Manifest b/dev-java/sun-jimi/Manifest
index 74dfd56f6b98..e3e08403373f 100644
--- a/dev-java/sun-jimi/Manifest
+++ b/dev-java/sun-jimi/Manifest
@@ -1 +1 @@
-DIST jimi1_0.zip 3880977 SHA256 06c193de5d78f2597191963c34cf306a960f7144759337264c1c60a3b3b8a0c4 SHA512 28ae3b3044910fca80dbdf23fee5f0d050df64ef48a09c41a836f3ff78365258c747f69a958579abda68d6d6f1c6b6a3ea5e960d36f2199afdb06258a25173d5 WHIRLPOOL c9ff66c4a15eb39c30e70c47bd7c8694024e34ebba09a7a440b927f5e3da0498f4ae2b8c6ddd96e3fe18933b93cacbb9c01f63b672caef45b601e4cf0bcec4fa
+DIST jimi1_0.zip 3880977 BLAKE2B b286cdc725cad2037d19bb188145ca0cd0799993011a8f22aa671e8807afd96dd3a9f3035a82dff9823ccba503e711db6b2ef377fc039c7050fc105655114ce6 SHA512 28ae3b3044910fca80dbdf23fee5f0d050df64ef48a09c41a836f3ff78365258c747f69a958579abda68d6d6f1c6b6a3ea5e960d36f2199afdb06258a25173d5
diff --git a/dev-java/sun-jms/Manifest b/dev-java/sun-jms/Manifest
index c70ecaa0c012..9e8f8d20964c 100644
--- a/dev-java/sun-jms/Manifest
+++ b/dev-java/sun-jms/Manifest
@@ -1 +1 @@
-DIST jms-1_1-fr-apidocs.zip 361922 SHA256 7091506ff106f29828bc7ef68559f054cb000f1d3b1bcda57b59666efb1ccd8f SHA512 ac2c7925b7f5bd3918f0c69a7b18dfa2a15f58243aef7cb429c0571ea218860fc146fd355c905e17310072263f64385b9010eafb1050158f42f498d7f21dfe1d WHIRLPOOL 976d869f53bd3b76b751b48ac664f0caad6b29117a9c29ce5c1469cf00c1864cfcc2da7373cc536c63ae795d616ac567f7fd0df4fe69631ab75b0252def76654
+DIST jms-1_1-fr-apidocs.zip 361922 BLAKE2B 75342eaeb56ba329948a226f48304e0a520e83f7284d5d8b46b981531b7f8c78283e38b2a488177349aaabb70276fd4ca09bc86993800906aea1469a6549f318 SHA512 ac2c7925b7f5bd3918f0c69a7b18dfa2a15f58243aef7cb429c0571ea218860fc146fd355c905e17310072263f64385b9010eafb1050158f42f498d7f21dfe1d
diff --git a/dev-java/sun-jmx/Manifest b/dev-java/sun-jmx/Manifest
index 3ef24cba4548..aff90230b6d2 100644
--- a/dev-java/sun-jmx/Manifest
+++ b/dev-java/sun-jmx/Manifest
@@ -1 +1 @@
-DIST jmx-1_2_1-ri.zip 1624569 SHA256 cd61a03be89e169c8efc994e45517a91ed42c4b3fb35c728cb04c10a2b687819 SHA512 39c933ec39f3fcc631d6d8f3aa88724bb0aa11ff62dfbac61762d07c718dff4ba1e16b1b565c7aa1ede7d616516e68d0dbe8c227db34a6d30bd8f29880c7a5d1 WHIRLPOOL 01ec4824ba27143ec0f25953ef4dcabe75036cb6208343206bb156471c334ef3fd32c137ea93e7af986b53b6d2e383f26303a18d2deafb46b21438e818e54956
+DIST jmx-1_2_1-ri.zip 1624569 BLAKE2B 7262ee10ab49d7371da988f6f636c22e7ad8cc06bd61db5490659899424465f2ed85000d176e6dc5cb7631942079fde19cde35837cda677fa463cdf53c94780c SHA512 39c933ec39f3fcc631d6d8f3aa88724bb0aa11ff62dfbac61762d07c718dff4ba1e16b1b565c7aa1ede7d616516e68d0dbe8c227db34a6d30bd8f29880c7a5d1
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index e1c7940b2cc9..82f1ee637b9e 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index c0ba30242448..29524660167b 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -1,3 +1,4 @@
DIST crystal-0.23.0-1-linux-i686.tar.gz 18498501 BLAKE2B 7a8e4e5a2b1425b6effe0a634b74b28c340c4d23c4bfccc0abac4e5d47473e10421d025e68e1fb1fa5b0ba8296108e36cd17d393fb143b8012168d595e5852f9 SHA512 8745114c4824d2859c569ed1bd1057d6d649d57b10d41d22c17627f623704eb98ec2e3ab2bf06622de624906f53e053975a6b9d852aeaafeae4f43585609de28
DIST crystal-0.23.0-1-linux-x86_64.tar.gz 18729061 BLAKE2B bfca07702b2f7c7d6b11aac864475316cabe86bdba90b1819ecd5cb45769b2b7fd9fb4c9f80e46301785209cc5b35fe39bf689163b9376a32b24f8a685a6281b SHA512 6a4e427b4ab3c3be6efcfaee5c1a19eff04eaf00db949d1e1ba8f29c3277affe96a7aba4273d93fd05251453d5b5b937aa792bc448ff2f6d6aa7f2b17d175f75
+DIST crystal-0.23.1-patchset.tar.bz2 7268 BLAKE2B 135990ac9f1a225f169dbc5bb6034d2194d9fc917954764564d68afec09af703382743965a801c9ce54a5866af60847b4c4fc0b9daf2cf5ea99052fbeb771b2a SHA512 68896fc5d1772eeb3dd263f1615fc8031a63d0f3eebca1feb35165adf14a610157302541c84cbc9031a3070fd5566ffe88ad03a8c523f55980520e5614b00b89
DIST crystal-0.23.1.tar.gz 1646650 BLAKE2B 3105a683e61835d1e514d5d403b00d3dfae01100a9862d6346c45201c5fb6cba879255469652463719998e976afc495ee9fd4f14f829a709f832cd323cfc2b3b SHA512 06ee0d45cc79cc343d04c346e9cd47b6e4ebc79bf21833662f268f9604f7d2080f7696824e1959de341539f801ae8f898fe1d7b18e4c75378d4eb191878668d5
diff --git a/dev-lang/crystal/crystal-0.23.1.ebuild b/dev-lang/crystal/crystal-0.23.1.ebuild
index 08967bd554f6..41f26d88e363 100644
--- a/dev-lang/crystal/crystal-0.23.1.ebuild
+++ b/dev-lang/crystal/crystal-0.23.1.ebuild
@@ -12,6 +12,7 @@ BV_X86=${BV}-linux-i686
DESCRIPTION="The Crystal Programming Language"
HOMEPAGE="https://crystal-lang.org"
SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2
amd64? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz )
x86? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )"
@@ -37,14 +38,14 @@ RDEPEND="${DEPEND}
"
PATCHES=(
- "${FILESDIR}"/${PN}-0.23.0-verbose-LDFLAGS.patch
- "${FILESDIR}"/${PN}-0.23.1-llvm-5.patch
+ "${WORKDIR}"/${P}-patchset/${PN}-0.23.0-verbose-LDFLAGS.patch
+ "${WORKDIR}"/${P}-patchset/${PN}-0.23.1-llvm-5.patch
)
src_prepare() {
default
- use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch
+ use blocking-stdio-hack && eapply "${WORKDIR}"/${P}-patchset/${PN}-0.22.0-blocking-stdio-hack.patch
}
src_compile() {
diff --git a/dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch b/dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch
deleted file mode 100644
index 07b7dba7be65..000000000000
--- a/dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Workaround tty corruption in crystal.
-
-Patch restores blocking mode of file desriptors
-in exchange of potential runtime deadlocks
-when dealing with stdio.
-
-Reported-by: Renich Bon Ciric
-Bug: https://github.com/crystal-lang/crystal/issues/2065
-Bug: https://bugs.gentoo.org/616256
-diff --git a/src/compiler/crystal/stdio.cr b/src/compiler/crystal/stdio.cr
-new file mode 100644
-index 000000000..e65f65089
---- /dev/null
-+++ b/src/compiler/crystal/stdio.cr
-@@ -0,0 +1,5 @@
-+module Crystal
-+ STDIN.blocking = true
-+ STDOUT.blocking=true
-+ STDERR.blocking = true
-+end
diff --git a/dev-lang/crystal/files/crystal-0.23.0-verbose-LDFLAGS.patch b/dev-lang/crystal/files/crystal-0.23.0-verbose-LDFLAGS.patch
deleted file mode 100644
index 35eace15dae0..000000000000
--- a/dev-lang/crystal/files/crystal-0.23.0-verbose-LDFLAGS.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Makefile b/Makefile
-index eff69e5..5c0c024 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,3 +28,3 @@ SOURCES := $(shell find src -name '*.cr')
- SPEC_SOURCES := $(shell find spec -name '*.cr')
--FLAGS := $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )
-+FLAGS := $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(verbose),--verbose )$(if $(LDFLAGS),--link-flags="$(LDFLAGS)" )
- SPEC_FLAGS := $(if $(verbose),-v )$(if $(junit_output),--junit_output $(junit_output) )
diff --git a/dev-lang/crystal/files/crystal-0.23.1-llvm-5.patch b/dev-lang/crystal/files/crystal-0.23.1-llvm-5.patch
deleted file mode 100644
index bbfd922149eb..000000000000
--- a/dev-lang/crystal/files/crystal-0.23.1-llvm-5.patch
+++ /dev/null
@@ -1,837 +0,0 @@
-https://bugs.gentoo.org/630634
-diff --git a/.gitignore b/.gitignore
-index 9a883edfd..5f852d930 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -12,5 +12,6 @@ all_spec
- /tmp
- /doc/
- /src/llvm/ext/llvm_ext.o
-+/src/llvm/ext/llvm_ext.dwo
- /src/ext/*.o
- /src/ext/libcrystal.a
-diff --git a/Makefile b/Makefile
-index a5dc0d7e3..14a21bb86 100644
---- a/Makefile
-+++ b/Makefile
-@@ -37,8 +37,6 @@ LLVM_CONFIG_FINDER := \
- (command -v llvm-config > /dev/null && (case "$(llvm-config --version)" in 3.9*) command -v llvm-config;; *) false;; esac)) || \
- command -v llvm-config-3.8 || command -v llvm-config38 || \
- (command -v llvm-config > /dev/null && (case "$(llvm-config --version)" in 3.8*) command -v llvm-config;; *) false;; esac)) || \
-- command -v llvm-config-3.6 || command -v llvm-config36 || \
-- command -v llvm-config-3.5 || command -v llvm-config35 || \
- command -v llvm-config
- LLVM_CONFIG := $(shell $(LLVM_CONFIG_FINDER))
- LLVM_EXT_DIR = src/llvm/ext
-diff --git a/src/compiler/crystal/compiler.cr b/src/compiler/crystal/compiler.cr
-index a2bed9a95..afc7976e3 100644
---- a/src/compiler/crystal/compiler.cr
-+++ b/src/compiler/crystal/compiler.cr
-@@ -447,9 +447,6 @@ module Crystal
-
- protected def optimize(llvm_mod)
- fun_pass_manager = llvm_mod.new_function_pass_manager
-- {% if LibLLVM::IS_35 || LibLLVM::IS_36 %}
-- fun_pass_manager.add_target_data target_machine.data_layout
-- {% end %}
- pass_manager_builder.populate fun_pass_manager
- fun_pass_manager.run llvm_mod
- module_pass_manager.run llvm_mod
-@@ -460,9 +457,6 @@ module Crystal
- private def module_pass_manager
- @module_pass_manager ||= begin
- mod_pass_manager = LLVM::ModulePassManager.new
-- {% if LibLLVM::IS_35 || LibLLVM::IS_36 %}
-- mod_pass_manager.add_target_data target_machine.data_layout
-- {% end %}
- pass_manager_builder.populate mod_pass_manager
- mod_pass_manager
- end
-@@ -554,54 +548,29 @@ module Crystal
- can_reuse_previous_compilation =
- !compiler.emit && !@bc_flags_changed && File.exists?(bc_name) && File.exists?(object_name)
-
-- {% if LibLLVM::IS_35 %}
-- # In LLVM 3.5 we can't write a bitcode to memory,
-- # so instead we write it to another file
-- bc_name_new = self.bc_name_new
-- llvm_mod.write_bitcode_to_file(bc_name_new)
--
-- if can_reuse_previous_compilation
-- if FileUtils.cmp(bc_name, bc_name_new)
-- # If the user cancelled a previous compilation it might be that
-- # the .o file is empty
-- if File.size(object_name) > 0
-- File.delete bc_name_new
-- must_compile = false
-- end
-- end
-- end
-+ memory_buffer = llvm_mod.write_bitcode_to_memory_buffer
-
-- if must_compile
-- # Create/overwrite the .bc file (for next compilations)
-- File.rename(bc_name_new, bc_name)
-- compiler.optimize llvm_mod if compiler.release?
-- compiler.target_machine.emit_obj_to_file llvm_mod, object_name
-- end
-- {% else %}
-- memory_buffer = llvm_mod.write_bitcode_to_memory_buffer
--
-- if can_reuse_previous_compilation
-- memory_io = IO::Memory.new(memory_buffer.to_slice)
-- changed = File.open(bc_name) { |bc_file| !FileUtils.cmp(bc_file, memory_io) }
--
-- # If the user cancelled a previous compilation
-- # it might be that the .o file is empty
-- if !changed && File.size(object_name) > 0
-- must_compile = false
-- memory_buffer.dispose
-- memory_buffer = nil
-- else
-- # We need to compile, so we'll write the memory buffer to file
-- end
-- end
-+ if can_reuse_previous_compilation
-+ memory_io = IO::Memory.new(memory_buffer.to_slice)
-+ changed = File.open(bc_name) { |bc_file| !FileUtils.cmp(bc_file, memory_io) }
-
-- # If there's a memory buffer, it means we must create a .o from it
-- if memory_buffer
-- # Create the .bc file (for next compilations)
-- File.write(bc_name, memory_buffer.to_slice)
-+ # If the user cancelled a previous compilation
-+ # it might be that the .o file is empty
-+ if !changed && File.size(object_name) > 0
-+ must_compile = false
- memory_buffer.dispose
-+ memory_buffer = nil
-+ else
-+ # We need to compile, so we'll write the memory buffer to file
- end
-- {% end %}
-+ end
-+
-+ # If there's a memory buffer, it means we must create a .o from it
-+ if memory_buffer
-+ # Create the .bc file (for next compilations)
-+ File.write(bc_name, memory_buffer.to_slice)
-+ memory_buffer.dispose
-+ end
-
- if must_compile
- compiler.optimize llvm_mod if compiler.release?
-diff --git a/src/llvm.cr b/src/llvm.cr
-index 44a03c272..f9b31cf4b 100644
---- a/src/llvm.cr
-+++ b/src/llvm.cr
-@@ -94,11 +94,5 @@ module LLVM
- string
- end
-
-- {% if LibLLVM::IS_35 %}
-- DEBUG_METADATA_VERSION = 1
-- {% elsif LibLLVM::IS_36 %}
-- DEBUG_METADATA_VERSION = 2
-- {% else %}
-- DEBUG_METADATA_VERSION = 3
-- {% end %}
-+ DEBUG_METADATA_VERSION = 3
- end
-diff --git a/src/llvm/context.cr b/src/llvm/context.cr
-index 8485eedf1..7d66a4365 100644
---- a/src/llvm/context.cr
-+++ b/src/llvm/context.cr
-@@ -9,9 +9,9 @@ class LLVM::Context
- end
-
- def new_module(name : String) : Module
-- {% if LibLLVM::IS_38 || LibLLVM::IS_36 || LibLLVM::IS_35 %}
-+ {% if LibLLVM::IS_38 %}
- Module.new(LibLLVM.module_create_with_name_in_context(name, self), name, self)
-- {% else %}
-+ {% else %} # LLVM >= 3.9
- Module.new(LibLLVM.module_create_with_name_in_context(name, self), self)
- {% end %}
- end
-@@ -104,9 +104,9 @@ class LLVM::Context
- if ret != 0 && msg
- raise LLVM.string_and_dispose(msg)
- end
-- {% if LibLLVM::IS_38 || LibLLVM::IS_36 || LibLLVM::IS_35 %}
-+ {% if LibLLVM::IS_38 %}
- Module.new(mod, "unknown", self)
-- {% else %}
-+ {% else %} # LLVM >= 3.9
- Module.new(mod, self)
- {% end %}
- end
-diff --git a/src/llvm/di_builder.cr b/src/llvm/di_builder.cr
-index b8c0fd628..79571d2c0 100644
---- a/src/llvm/di_builder.cr
-+++ b/src/llvm/di_builder.cr
-@@ -31,16 +31,8 @@ struct LLVM::DIBuilder
-
- def create_function(scope, name, linkage_name, file, line, composite_type, is_local_to_unit, is_definition,
- scope_line, flags, is_optimized, func)
-- {% if LibLLVM::IS_36 || LibLLVM::IS_35 %}
-- LibLLVMExt.di_builder_create_function(self, scope, name, linkage_name, file, line, composite_type,
-- is_local_to_unit ? 1 : 0,
-- is_definition ? 1 : 0,
-- scope_line, flags,
-- is_optimized ? 1 : 0, func)
-- {% else %}
-- LibLLVMExt.di_builder_create_function(self, scope, name, linkage_name, file, line, composite_type,
-- is_local_to_unit, is_definition, scope_line, flags, is_optimized, func)
-- {% end %}
-+ LibLLVMExt.di_builder_create_function(self, scope, name, linkage_name, file, line, composite_type,
-+ is_local_to_unit, is_definition, scope_line, flags, is_optimized, func)
- end
-
- def create_auto_variable(scope, name, file, line, type, align_in_bits)
-@@ -87,19 +79,11 @@ struct LLVM::DIBuilder
- end
-
- def create_replaceable_composite_type(scope, name, file, line, context : Context)
-- {% if LibLLVM::IS_35 || LibLLVM::IS_36 %}
-- LibLLVMExt.temporary_md_node(context, nil, 0).as(LibLLVMExt::Metadata)
-- {% else %}
-- LibLLVMExt.di_builder_create_replaceable_composite_type(self, scope, name, file, line)
-- {% end %}
-+ LibLLVMExt.di_builder_create_replaceable_composite_type(self, scope, name, file, line)
- end
-
- def replace_temporary(from, to)
-- {% if LibLLVM::IS_35 || LibLLVM::IS_36 %}
-- LibLLVMExt.metadata_replace_all_uses_with(from, to)
-- {% else %}
-- LibLLVMExt.di_builder_replace_temporary(self, from, to)
-- {% end %}
-+ LibLLVMExt.di_builder_replace_temporary(self, from, to)
- end
-
- def end
-diff --git a/src/llvm/ext/llvm_ext.cc b/src/llvm/ext/llvm_ext.cc
-index d13446160..3dbdd4220 100644
---- a/src/llvm/ext/llvm_ext.cc
-+++ b/src/llvm/ext/llvm_ext.cc
-@@ -18,35 +18,22 @@ using namespace llvm;
- #define LLVM_VERSION_LE(major, minor) \
- (LLVM_VERSION_MAJOR < (major) || LLVM_VERSION_MAJOR == (major) && LLVM_VERSION_MINOR <= (minor))
-
-+#if LLVM_VERSION_LE(4, 0)
- typedef struct LLVMOpaqueDIBuilder *LLVMDIBuilderRef;
- DEFINE_SIMPLE_CONVERSION_FUNCTIONS(DIBuilder, LLVMDIBuilderRef)
-
--#if LLVM_VERSION_EQ(3, 5)
--typedef LLVMValueRef LLVMMetadataRef;
--typedef Value Metadata;
--#define DIBuilderRef LLVMDIBuilderRef
--
--#else /* LLVM != 3.5 */
- typedef struct LLVMOpaqueMetadata *LLVMMetadataRef;
- DEFINE_ISA_CONVERSION_FUNCTIONS(Metadata, LLVMMetadataRef)
- inline Metadata **unwrap(LLVMMetadataRef *Vals) {
- return reinterpret_cast(Vals);
- }
--#endif /* LLVM == 3.5 */
--
--#if LLVM_VERSION_LE(3, 6)
--template T unwrapDIptr(LLVMMetadataRef v) {
-- return v ? T(unwrap(v)) : T();
--}
--#define DIBuilderRef LLVMDIBuilderRef
-+#endif
-
--#else /* LLVM > 3.6 */
- typedef DIBuilder *DIBuilderRef;
- #define DIArray DINodeArray
- template T *unwrapDIptr(LLVMMetadataRef v) {
- return (T *)(v ? unwrap(v) : NULL);
- }
--#endif /* LLVM <= 3.6 */
-
- #if LLVM_VERSION_LE(3, 6)
- #define OperandBundleDef void
-@@ -66,13 +53,7 @@ void LLVMDIBuilderFinalize(LLVMDIBuilderRef dref) { unwrap(dref)->finalize(); }
-
- LLVMMetadataRef LLVMDIBuilderCreateFile(DIBuilderRef Dref, const char *File,
- const char *Dir) {
--#if LLVM_VERSION_LE(3, 6)
-- DIBuilder *D = unwrap(Dref);
-- DIFile F = D->createFile(File, Dir);
-- return wrap(F);
--#else
- return wrap(Dref->createFile(File, Dir));
--#endif
- }
-
- LLVMMetadataRef LLVMDIBuilderCreateCompileUnit(DIBuilderRef Dref, unsigned Lang,
-@@ -82,20 +63,13 @@ LLVMMetadataRef LLVMDIBuilderCreateCompileUnit(DIBuilderRef Dref, unsigned Lang,
- int Optimized,
- const char *Flags,
- unsigned RuntimeVersion) {
--#if LLVM_VERSION_LE(3, 6)
-- DIBuilder *D = unwrap(Dref);
-- DICompileUnit CU = D->createCompileUnit(Lang, File, Dir, Producer, Optimized,
-- Flags, RuntimeVersion);
-- return wrap(CU);
--#else
--# if LLVM_VERSION_LE(3, 9)
-+#if LLVM_VERSION_LE(3, 9)
- return wrap(Dref->createCompileUnit(Lang, File, Dir, Producer, Optimized,
- Flags, RuntimeVersion));
--# else
-+#else
- DIFile *F = Dref->createFile(File, Dir);
- return wrap(Dref->createCompileUnit(Lang, F, Producer, Optimized,
- Flags, RuntimeVersion));
--# endif
- #endif
- }
-
-@@ -111,19 +85,11 @@ LLVMMetadataRef LLVMDIBuilderCreateFunction(
- #endif
- bool IsOptimized,
- LLVMValueRef Func) {
--#if LLVM_VERSION_LE(3, 6)
-- DIBuilder *D = unwrap(Dref);
-- DISubprogram Sub = D->createFunction(
-- unwrapDI(Scope), Name, LinkageName, unwrapDI(File),
-- Line, unwrapDI(CompositeType), IsLocalToUnit,
-- IsDefinition, ScopeLine, Flags, IsOptimized, unwrap(Func));
--#else
- DISubprogram *Sub = Dref->createFunction(
- unwrapDI(Scope), Name, LinkageName, unwrapDI(File), Line,
- unwrapDI(CompositeType), IsLocalToUnit, IsDefinition,
- ScopeLine, Flags, IsOptimized);
- unwrap(Func)->setSubprogram(Sub);
--#endif
- return wrap(Sub);
- }
-
-@@ -132,18 +98,8 @@ LLVMMetadataRef LLVMDIBuilderCreateLexicalBlock(DIBuilderRef Dref,
- LLVMMetadataRef File,
- unsigned Line,
- unsigned Column) {
--#if LLVM_VERSION_LE(3, 6)
-- DIBuilder *D = unwrap(Dref);
--# if LLVM_VERSION_EQ(3, 5)
-- DILexicalBlock LB = D->createLexicalBlock(unwrapDI(Scope), unwrapDI(File), Line, Column, 0);
--# else /* LLVM <= 3.6 && LLVM != 3.5 */
-- DILexicalBlock LB = D->createLexicalBlock(unwrapDI(Scope), unwrapDI(File), Line, Column);
--# endif
-- return wrap(LB);
--#else /* LLVM > 3.6 */
- return wrap(Dref->createLexicalBlock(unwrapDI(Scope),
- unwrapDI(File), Line, Column));
--#endif /* LLVM <= 3.6 */
- }
-
- LLVMMetadataRef LLVMDIBuilderCreateBasicType(DIBuilderRef Dref,
-@@ -151,71 +107,34 @@ LLVMMetadataRef LLVMDIBuilderCreateBasicType(DIBuilderRef Dref,
- uint64_t SizeInBits,
- uint64_t AlignInBits,
- unsigned Encoding) {
--#if LLVM_VERSION_LE(3, 6)
-- DIBuilder *D = unwrap(Dref);
-- DIBasicType T = D->createBasicType(Name, SizeInBits, AlignInBits, Encoding);
-- return wrap(T);
--#else
--# if LLVM_VERSION_LE(3, 9)
-+#if LLVM_VERSION_LE(3, 9)
- return wrap(Dref->createBasicType(Name, SizeInBits, AlignInBits, Encoding));
--# else
-+#else
- return wrap(Dref->createBasicType(Name, SizeInBits, Encoding));
--# endif
- #endif
- }
-
- LLVMMetadataRef LLVMDIBuilderGetOrCreateTypeArray(DIBuilderRef Dref,
- LLVMMetadataRef *Data,
- unsigned Length) {
--#if LLVM_VERSION_LE(3, 6)
-- DIBuilder *D = unwrap(Dref);
--# if LLVM_VERSION_EQ(3, 5)
-- Value **DataValue = unwrap(Data);
-- ArrayRef Elements(DataValue, Length);
-- DIArray A = D->getOrCreateArray(Elements);
--# else /* LLVM <= 3.6 && LLVM != 3.5 */
-- Metadata **DataValue = unwrap(Data);
-- ArrayRef Elements(DataValue, Length);
-- DITypeArray A = D->getOrCreateTypeArray(Elements);
--# endif
-- return wrap(A);
--#else /* LLVM > 3.6 */
- Metadata **DataValue = unwrap(Data);
- return wrap(
- Dref->getOrCreateTypeArray(ArrayRef(DataValue, Length))
- .get());
--#endif /* LLVM <= 3.6 */
- }
-
- LLVMMetadataRef LLVMDIBuilderGetOrCreateArray(DIBuilderRef Dref,
- LLVMMetadataRef *Data,
- unsigned Length) {
--#if LLVM_VERSION_LE(3, 6)
-- DIBuilder *D = unwrap(Dref);
-- ArrayRef elements(unwrap(Data), Length);
-- DIArray a = D->getOrCreateArray(elements);
--
-- return wrap(a);
--#else
- Metadata **DataValue = unwrap(Data);
- return wrap(
- Dref->getOrCreateArray(ArrayRef(DataValue, Length)).get());
--#endif
- }
-
- LLVMMetadataRef
- LLVMDIBuilderCreateSubroutineType(DIBuilderRef Dref, LLVMMetadataRef File,
- LLVMMetadataRef ParameterTypes) {
--#if LLVM_VERSION_LE(3, 6)
-- DIBuilder *D = unwrap(Dref);
--# if LLVM_VERSION_EQ(3, 5)
-- DICompositeType CT = D->createSubroutineType(unwrapDI(File), unwrapDI(ParameterTypes));
--# else /* LLVM <= 3.6 && LLVM != 3.5 */
-- DICompositeType CT = D->createSubroutineType(unwrapDI(File), unwrapDI(ParameterTypes));
--# endif
--#else /* LLVM > 3.6 */
- DISubroutineType *CT = Dref->createSubroutineType(DITypeRefArray(unwrap(ParameterTypes)));
--#endif /* LLVM <= 3.6 */
- return wrap(CT);
- }
-
-@@ -229,21 +148,14 @@ LLVMMetadataRef LLVMDIBuilderCreateAutoVariable(
- DINode::DIFlags Flags,
- #endif
- uint32_t AlignInBits) {
--#if LLVM_VERSION_LE(3, 6)
-- DIBuilder *D = unwrap(Dref);
-- DIVariable V = D->createLocalVariable(
-- llvm::dwarf::DW_TAG_auto_variable, unwrapDI(Scope), Name, unwrapDI(File), Line,
-- unwrapDI(Ty), AlwaysPreserve, Flags, 0);
--#else
--# if LLVM_VERSION_LE(3, 9)
-+#if LLVM_VERSION_LE(3, 9)
- DILocalVariable *V = Dref->createAutoVariable(
- unwrapDI(Scope), Name, unwrapDI(File), Line,
- unwrapDI(Ty), AlwaysPreserve, Flags);
--# else
-+#else
- DILocalVariable *V = Dref->createAutoVariable(
- unwrapDI(Scope), Name, unwrapDI(File), Line,
- unwrapDI(Ty), AlwaysPreserve, Flags, AlignInBits);
--# endif
- #endif
- return wrap(V);
- }
-@@ -258,18 +170,10 @@ LLVMMetadataRef LLVMDIBuilderCreateParameterVariable(
- DINode::DIFlags Flags
- #endif
- ) {
--#if LLVM_VERSION_LE(3, 6)
-- DIBuilder *D = unwrap(Dref);
-- DIVariable V = D->createLocalVariable(
-- llvm::dwarf::DW_TAG_arg_variable, unwrapDI(Scope), Name, unwrapDI(File), Line,
-- unwrapDI(Ty), AlwaysPreserve, Flags, ArgNo);
-- return wrap(V);
--#else
- DILocalVariable *V = Dref->createParameterVariable
- (unwrapDI(Scope), Name, ArgNo, unwrapDI(File), Line,
- unwrapDI(Ty), AlwaysPreserve, Flags);
- return wrap(V);
--#endif
- }
-
- LLVMValueRef LLVMDIBuilderInsertDeclareAtEnd(DIBuilderRef Dref,
-@@ -278,46 +182,17 @@ LLVMValueRef LLVMDIBuilderInsertDeclareAtEnd(DIBuilderRef Dref,
- LLVMMetadataRef Expr,
- LLVMValueRef DL,
- LLVMBasicBlockRef Block) {
--#if LLVM_VERSION_EQ(3, 5)
-- DIBuilder *D = unwrap(Dref);
-- Instruction *Instr =
-- D->insertDeclare(unwrap(Storage), unwrapDI(VarInfo),
-- unwrap(Block));
-- Instr->setDebugLoc(DebugLoc::getFromDILocation(cast(DL)));
--#endif
--
--#if LLVM_VERSION_EQ(3, 6)
-- DIBuilder *D = unwrap(Dref);
-- Instruction *Instr =
-- D->insertDeclare(unwrap(Storage), unwrapDI(VarInfo),
-- unwrapDI(Expr), unwrap(Block));
-- Instr->setDebugLoc(DebugLoc::getFromDILocation(cast(unwrap(DL)->getMetadata())));
--#endif
--
--#if LLVM_VERSION_GE(3, 7)
- Instruction *Instr =
- Dref->insertDeclare(unwrap(Storage), unwrap(VarInfo),
- unwrapDI(Expr),
- DebugLoc(cast(unwrap(DL)->getMetadata())),
- unwrap(Block));
--#endif
--
- return wrap(Instr);
- }
-
- LLVMMetadataRef LLVMDIBuilderCreateExpression(DIBuilderRef Dref, int64_t *Addr,
- size_t Length) {
--#if LLVM_VERSION_LE(3, 6)
--# if LLVM_VERSION_EQ(3, 5)
-- return nullptr;
--# else /* LLVM <= 3.6 && LLVM != 3.5 */
-- DIBuilder *D = unwrap(Dref);
-- DIExpression Expr = D->createExpression(ArrayRef(Addr, Length));
-- return wrap(Expr);
--# endif
--#else /* LLVM > 3.6 */
- return wrap(Dref->createExpression(ArrayRef(Addr, Length)));
--#endif
- }
-
- LLVMMetadataRef LLVMDIBuilderCreateEnumerationType(
-@@ -325,30 +200,16 @@ LLVMMetadataRef LLVMDIBuilderCreateEnumerationType(
- LLVMMetadataRef File, unsigned LineNumber, uint64_t SizeInBits,
- uint64_t AlignInBits, LLVMMetadataRef Elements,
- LLVMMetadataRef UnderlyingType) {
--#if LLVM_VERSION_LE(3, 6)
-- DIBuilder *D = unwrap(Dref);
-- DICompositeType enumType = D->createEnumerationType(
-- unwrapDI(Scope), Name, unwrapDI(File), LineNumber,
-- SizeInBits, AlignInBits, unwrapDI(Elements),
-- unwrapDI(UnderlyingType));
--#else
- DICompositeType *enumType = Dref->createEnumerationType(
- unwrapDI(Scope), Name, unwrapDI(File), LineNumber,
- SizeInBits, AlignInBits, DINodeArray(unwrapDI(Elements)),
- unwrapDI(UnderlyingType));
--#endif
- return wrap(enumType);
- }
-
- LLVMMetadataRef LLVMDIBuilderCreateEnumerator(DIBuilderRef Dref,
- const char *Name, int64_t Value) {
--#if LLVM_VERSION_LE(3, 6)
-- DIBuilder *D = unwrap(Dref);
-- DIEnumerator e = D->createEnumerator(Name, Value);
-- return wrap(e);
--#else
- DIEnumerator *e = Dref->createEnumerator(Name, Value);
--#endif
- return wrap(e);
- }
-
-@@ -367,22 +228,13 @@ LLVMDIBuilderCreateStructType(DIBuilderRef Dref,
- #endif
- LLVMMetadataRef DerivedFrom,
- LLVMMetadataRef Elements) {
--#if LLVM_VERSION_LE(3, 6)
-- DIBuilder *D = unwrap(Dref);
-- DICompositeType CT = D->createStructType(
-- unwrapDI(Scope), Name, unwrapDI(File), Line,
-- SizeInBits, AlignInBits, Flags, unwrapDI(DerivedFrom),
-- unwrapDI(Elements));
--#else
- DICompositeType *CT = Dref->createStructType(
- unwrapDI(Scope), Name, unwrapDI(File), Line,
- SizeInBits, AlignInBits, Flags, unwrapDI(DerivedFrom),
- DINodeArray(unwrapDI(Elements)));
--#endif
- return wrap(CT);
- }
-
--#if LLVM_VERSION_GE(3, 8)
- LLVMMetadataRef
- LLVMDIBuilderCreateReplaceableCompositeType(DIBuilderRef Dref,
- LLVMMetadataRef Scope,
-@@ -409,7 +261,6 @@ LLVMDIBuilderReplaceTemporary(DIBuilderRef Dref,
- llvm::TempMDNode fwd_decl(Node);
- Dref->replaceTemporary(std::move(fwd_decl), Type);
- }
--#endif
-
- LLVMMetadataRef
- LLVMDIBuilderCreateMemberType(DIBuilderRef Dref, LLVMMetadataRef Scope,
-@@ -422,16 +273,9 @@ LLVMDIBuilderCreateMemberType(DIBuilderRef Dref, LLVMMetadataRef Scope,
- DINode::DIFlags Flags,
- #endif
- LLVMMetadataRef Ty) {
--#if LLVM_VERSION_LE(3, 6)
-- DIBuilder *D = unwrap(Dref);
-- DIDerivedType DT = D->createMemberType(
-- unwrapDI(Scope), Name, unwrapDI(File), Line,
-- SizeInBits, AlignInBits, OffsetInBits, Flags, unwrapDI(Ty));
--#else
- DIDerivedType *DT = Dref->createMemberType(
- unwrapDI(Scope), Name, unwrapDI(File), Line,
- SizeInBits, AlignInBits, OffsetInBits, Flags, unwrapDI(Ty));
--#endif
- return wrap(DT);
- }
-
-@@ -440,39 +284,24 @@ LLVMMetadataRef LLVMDIBuilderCreatePointerType(DIBuilderRef Dref,
- uint64_t SizeInBits,
- uint64_t AlignInBits,
- const char *Name) {
--#if LLVM_VERSION_LE(3, 6)
-- DIBuilder *D = unwrap(Dref);
-- DIDerivedType T = D->createPointerType(unwrapDI(PointeeType),
-- SizeInBits, AlignInBits, Name);
--#else
- DIDerivedType *T = Dref->createPointerType(unwrapDI(PointeeType),
-- SizeInBits, AlignInBits, Name);
-+ SizeInBits, AlignInBits,
-+#if LLVM_VERSION_GE(5, 0)
-+ None,
- #endif
-+ Name);
- return wrap(T);
- }
-
- LLVMMetadataRef LLVMTemporaryMDNode(LLVMContextRef C, LLVMMetadataRef *MDs,
- unsigned Count) {
--#if LLVM_VERSION_LE(3, 6)
-- return wrap(MDNode::getTemporary(*unwrap(C),
-- ArrayRef(unwrap(MDs), Count)));
--#else
- return wrap(MDTuple::getTemporary(*unwrap(C),
- ArrayRef(unwrap(MDs), Count))
- .release());
--#endif
- }
-
- void LLVMMetadataReplaceAllUsesWith(LLVMMetadataRef MD, LLVMMetadataRef New) {
--#if LLVM_VERSION_LE(3, 6)
--# if LLVM_VERSION_EQ(3, 5)
- auto *Node = unwrap(MD);
--# else /* LLVM <= 3.6 && LLVM != 3.5 */
-- auto *Node = unwrap(MD);
--# endif
--#else /* LLVM > 3.6 */
-- auto *Node = unwrap(MD);
--#endif
- Node->replaceAllUsesWith(unwrap(New));
- MDNode::deleteTemporary(Node);
- }
-diff --git a/src/llvm/function_pass_manager.cr b/src/llvm/function_pass_manager.cr
-index 979cb9c97..834d72a20 100644
---- a/src/llvm/function_pass_manager.cr
-+++ b/src/llvm/function_pass_manager.cr
-@@ -2,12 +2,6 @@ class LLVM::FunctionPassManager
- def initialize(@unwrap : LibLLVM::PassManagerRef)
- end
-
-- {% if LibLLVM::IS_35 || LibLLVM::IS_36 %}
-- def add_target_data(target_data)
-- LibLLVM.add_target_data target_data, self
-- end
-- {% end %}
--
- def run(mod : Module)
- changed = false
- run do |runner|
-diff --git a/src/llvm/lib_llvm.cr b/src/llvm/lib_llvm.cr
-index e2c7a9445..5a0b67cdd 100644
---- a/src/llvm/lib_llvm.cr
-+++ b/src/llvm/lib_llvm.cr
-@@ -6,8 +6,6 @@ lib LibLLVM
- (command -v llvm-config > /dev/null && (case "$(llvm-config --version)" in 3.9*) command -v llvm-config;; *) false;; esac)) || \
- command -v llvm-config-3.8 || command -v llvm-config38 || \
- (command -v llvm-config > /dev/null && (case "$(llvm-config --version)" in 3.8*) command -v llvm-config;; *) false;; esac)) || \
-- command -v llvm-config-3.6 || command -v llvm-config36 || \
-- command -v llvm-config-3.5 || command -v llvm-config35 || \
- command -v llvm-config
- `.chomp.stringify
- }}
-@@ -32,8 +30,6 @@ end
- IS_40 = {{LibLLVM::VERSION.starts_with?("4.0")}}
- IS_39 = {{LibLLVM::VERSION.starts_with?("3.9")}}
- IS_38 = {{LibLLVM::VERSION.starts_with?("3.8")}}
-- IS_36 = {{LibLLVM::VERSION.starts_with?("3.6")}}
-- IS_35 = {{LibLLVM::VERSION.starts_with?("3.5")}}
- end
- {% end %}
-
-@@ -283,9 +279,7 @@ lib LibLLVM
- fun set_alignment = LLVMSetAlignment(value : ValueRef, bytes : UInt32)
- fun get_return_type = LLVMGetReturnType(TypeRef) : TypeRef
-
-- {% unless LibLLVM::IS_35 %}
-- fun write_bitcode_to_memory_buffer = LLVMWriteBitcodeToMemoryBuffer(mod : ModuleRef) : MemoryBufferRef
-- {% end %}
-+ fun write_bitcode_to_memory_buffer = LLVMWriteBitcodeToMemoryBuffer(mod : ModuleRef) : MemoryBufferRef
-
- fun dispose_memory_buffer = LLVMDisposeMemoryBuffer(buf : MemoryBufferRef) : Void
- fun get_buffer_start = LLVMGetBufferStart(buf : MemoryBufferRef) : UInt8*
-@@ -293,26 +287,22 @@ lib LibLLVM
-
- fun write_bitcode_to_fd = LLVMWriteBitcodeToFD(mod : ModuleRef, fd : LibC::Int, should_close : LibC::Int, unbuffered : LibC::Int) : LibC::Int
-
-- {% if LibLLVM::IS_36 || LibLLVM::IS_35 %}
-- fun add_target_data = LLVMAddTargetData(td : TargetDataRef, pm : PassManagerRef)
-- {% end %}
--
-- {% if LibLLVM::IS_38 || LibLLVM::IS_36 || LibLLVM::IS_35 %}
-+ {% if LibLLVM::IS_38 %}
- fun copy_string_rep_of_target_data = LLVMCopyStringRepOfTargetData(data : TargetDataRef) : UInt8*
- fun get_target_machine_data = LLVMGetTargetMachineData(t : TargetMachineRef) : TargetDataRef
- fun set_data_layout = LLVMSetDataLayout(mod : ModuleRef, data : UInt8*)
-- {% else %}
-+ {% else %} # LLVM >= 3.9
- fun create_target_data_layout = LLVMCreateTargetDataLayout(t : TargetMachineRef) : TargetDataRef
- fun set_module_data_layout = LLVMSetModuleDataLayout(mod : ModuleRef, data : TargetDataRef)
- {% end %}
-
-- {% if LibLLVM::IS_38 || LibLLVM::IS_36 || LibLLVM::IS_35 %}
-+ {% if LibLLVM::IS_38 %}
- fun add_attribute = LLVMAddAttribute(arg : ValueRef, attr : LLVM::Attribute)
- fun add_instr_attribute = LLVMAddInstrAttribute(instr : ValueRef, index : UInt32, attr : LLVM::Attribute)
- fun add_function_attr = LLVMAddFunctionAttr(fn : ValueRef, pa : LLVM::Attribute)
- fun get_function_attr = LLVMGetFunctionAttr(fn : ValueRef) : LLVM::Attribute
- fun get_attribute = LLVMGetAttribute(arg : ValueRef) : LLVM::Attribute
-- {% else %}
-+ {% else %} # LLVM >= 3.9
- type AttributeRef = Void*
- alias AttributeIndex = UInt
-
-diff --git a/src/llvm/lib_llvm_ext.cr b/src/llvm/lib_llvm_ext.cr
-index 84c65cccb..953567eb8 100644
---- a/src/llvm/lib_llvm_ext.cr
-+++ b/src/llvm/lib_llvm_ext.cr
-@@ -13,19 +13,11 @@ lib LibLLVMExt
- fun create_di_builder = LLVMNewDIBuilder(LibLLVM::ModuleRef) : DIBuilder
- fun di_builder_finalize = LLVMDIBuilderFinalize(DIBuilder)
-
-- {% if LibLLVM::IS_36 || LibLLVM::IS_35 %}
-- fun di_builder_create_function = LLVMDIBuilderCreateFunction(
-- builder : DIBuilder, scope : Metadata, name : Char*,
-- linkage_name : Char*, file : Metadata, line : UInt,
-- composite_type : Metadata, is_local_to_unit : Int, is_definition : Int,
-- scope_line : UInt, flags : LLVM::DIFlags, is_optimized : Int, func : LibLLVM::ValueRef) : Metadata
-- {% else %}
-- fun di_builder_create_function = LLVMDIBuilderCreateFunction(
-- builder : DIBuilder, scope : Metadata, name : Char*,
-- linkage_name : Char*, file : Metadata, line : UInt,
-- composite_type : Metadata, is_local_to_unit : Bool, is_definition : Bool,
-- scope_line : UInt, flags : LLVM::DIFlags, is_optimized : Bool, func : LibLLVM::ValueRef) : Metadata
-- {% end %}
-+ fun di_builder_create_function = LLVMDIBuilderCreateFunction(
-+ builder : DIBuilder, scope : Metadata, name : Char*,
-+ linkage_name : Char*, file : Metadata, line : UInt,
-+ composite_type : Metadata, is_local_to_unit : Bool, is_definition : Bool,
-+ scope_line : UInt, flags : LLVM::DIFlags, is_optimized : Bool, func : LibLLVM::ValueRef) : Metadata
-
- fun di_builder_create_file = LLVMDIBuilderCreateFile(builder : DIBuilder, file : Char*, dir : Char*) : Metadata
- fun di_builder_create_compile_unit = LLVMDIBuilderCreateCompileUnit(builder : DIBuilder,
-@@ -94,17 +86,12 @@ lib LibLLVMExt
- align_in_bits : UInt64,
- name : Char*) : Metadata
-
-- {% if LibLLVM::IS_35 || LibLLVM::IS_36 %}
-- fun temporary_md_node = LLVMTemporaryMDNode(context : LibLLVM::ContextRef, mds : Metadata*, count : UInt) : Metadata
-- fun metadata_replace_all_uses_with = LLVMMetadataReplaceAllUsesWith(Metadata, Metadata)
-- {% else %}
-- fun di_builder_create_replaceable_composite_type = LLVMDIBuilderCreateReplaceableCompositeType(builder : DIBuilder,
-- scope : Metadata,
-- name : Char*,
-- file : Metadata,
-- line : UInt) : Metadata
-- fun di_builder_replace_temporary = LLVMDIBuilderReplaceTemporary(builder : DIBuilder, from : Metadata, to : Metadata)
-- {% end %}
-+ fun di_builder_create_replaceable_composite_type = LLVMDIBuilderCreateReplaceableCompositeType(builder : DIBuilder,
-+ scope : Metadata,
-+ name : Char*,
-+ file : Metadata,
-+ line : UInt) : Metadata
-+ fun di_builder_replace_temporary = LLVMDIBuilderReplaceTemporary(builder : DIBuilder, from : Metadata, to : Metadata)
-
- fun set_current_debug_location = LLVMSetCurrentDebugLocation2(LibLLVM::BuilderRef, Int, Int, Metadata, Metadata)
-
-diff --git a/src/llvm/module.cr b/src/llvm/module.cr
-index cb71e3b21..c15a56e77 100644
---- a/src/llvm/module.cr
-+++ b/src/llvm/module.cr
-@@ -6,7 +6,7 @@ class LLVM::Module
-
- getter context : Context
-
-- {% if LibLLVM::IS_38 || LibLLVM::IS_36 || LibLLVM::IS_35 %}
-+ {% if LibLLVM::IS_38 %}
- def initialize(@unwrap : LibLLVM::ModuleRef, @name : String, @context : Context)
- @owned = false
- end
-@@ -14,7 +14,7 @@ class LLVM::Module
- def name : String
- @name
- end
-- {% else %}
-+ {% else %} # LLVM >= 3.9
- def initialize(@unwrap : LibLLVM::ModuleRef, @context : Context)
- @owned = false
- end
-@@ -34,9 +34,9 @@ class LLVM::Module
- end
-
- def data_layout=(data : TargetData)
-- {% if LibLLVM::IS_38 || LibLLVM::IS_36 || LibLLVM::IS_35 %}
-+ {% if LibLLVM::IS_38 %}
- LibLLVM.set_data_layout(self, data.to_data_layout_string)
-- {% else %}
-+ {% else %} # LLVM >= 3.9
- LibLLVM.set_module_data_layout(self, data)
- {% end %}
- end
-@@ -57,11 +57,9 @@ class LLVM::Module
- LibLLVM.write_bitcode_to_file self, filename
- end
-
-- {% unless LibLLVM::IS_35 %}
-- def write_bitcode_to_memory_buffer
-- MemoryBuffer.new(LibLLVM.write_bitcode_to_memory_buffer self)
-- end
-- {% end %}
-+ def write_bitcode_to_memory_buffer
-+ MemoryBuffer.new(LibLLVM.write_bitcode_to_memory_buffer self)
-+ end
-
- def write_bitcode_to_fd(fd : Int, should_close = false, buffered = false)
- LibLLVM.write_bitcode_to_fd(self, fd, should_close ? 1 : 0, buffered ? 1 : 0)
-diff --git a/src/llvm/module_pass_manager.cr b/src/llvm/module_pass_manager.cr
-index 10bfa60bd..519227809 100644
---- a/src/llvm/module_pass_manager.cr
-+++ b/src/llvm/module_pass_manager.cr
-@@ -3,12 +3,6 @@ class LLVM::ModulePassManager
- @unwrap = LibLLVM.pass_manager_create
- end
-
-- {% if LibLLVM::IS_35 || LibLLVM::IS_36 %}
-- def add_target_data(target_data)
-- LibLLVM.add_target_data target_data, self
-- end
-- {% end %}
--
- def run(mod)
- LibLLVM.run_pass_manager(self, mod) != 0
- end
-diff --git a/src/llvm/target_machine.cr b/src/llvm/target_machine.cr
-index e4bb081e9..42e44abe2 100644
---- a/src/llvm/target_machine.cr
-+++ b/src/llvm/target_machine.cr
-@@ -9,9 +9,9 @@ class LLVM::TargetMachine
-
- def data_layout
- @layout ||= begin
-- layout = {% if LibLLVM::IS_38 || LibLLVM::IS_36 || LibLLVM::IS_35 %}
-+ layout = {% if LibLLVM::IS_38 %}
- LibLLVM.get_target_machine_data(self)
-- {% else %}
-+ {% else %} # LLVM >= 3.9
- LibLLVM.create_target_data_layout(self)
- {% end %}
- layout ? TargetData.new(layout) : raise "Missing layout for #{self}"
---
-2.14.1
-
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 18e05ded085d..823ba3088532 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 05a136ab7e7a..2dbf9cd3960b 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1 +1,2 @@
DIST nettle-3.3.tar.gz 1887927 BLAKE2B 4bcf3c4bfb9f9dae97ea6780d146f3313e8b51182d9942e69581428d9f602d16467d37f993700a4e94e2e0dee17bdf354694c94d0383164c3de6e57e7e24de4e SHA512 271981d89766f151af3cdc4e5fc43c438222f0f6f44475bad114f4209955b5235fced6526c7abca001cca223e8cfcd2a6bf389b160b305a499e7acf52425ec70
+DIST nettle-3.4.tar.gz 1935069 BLAKE2B b73c88236c8233360607a6ed65cd4f6d19bfbbf683b46149326ce3440bf0a42b8add69de5c64145720163b1095fdab3cb8bf410c2ef727d0ea4fb58391ff0f14 SHA512 3bea3aabd2c99cc42d084a94fd6b0b5dbdb24cd6c7020271a6ee87a81a904b21b21756f590cb1afdf2e85fd1cb59e5c3651c5c4032e30204e7ea6f8801d1ea3b
diff --git a/dev-libs/nettle/nettle-3.4.ebuild b/dev-libs/nettle/nettle-3.4.ebuild
new file mode 100644
index 000000000000..d9a9f00c9a03
--- /dev/null
+++ b/dev-libs/nettle/nettle-3.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-build multilib-minimal multilib toolchain-funcs
+
+DESCRIPTION="Low-level cryptographic library"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
+SRC_URI="https://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 LGPL-2.1 )"
+SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-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"
+IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
+
+DEPEND="gmp? ( >=dev-libs/gmp-5.0:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20131008-r17
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/nettle/nettle-stdint.h
+ /usr/include/nettle/version.h
+)
+
+DOCS=()
+HTML_DOCS=()
+
+S="${WORKDIR}/${PN}-3.4"
+
+pkg_setup() {
+ use doc && DOCS+=(
+ nettle.pdf
+ )
+ use doc && HTML_DOCS+=(
+ nettle.html
+ )
+}
+
+src_prepare() {
+ default
+
+ sed -e '/CFLAGS=/s: -ggdb3::' \
+ -e 's/solaris\*)/sunldsolaris*)/' \
+ -i configure.ac || die
+
+ # conditionally build tests and examples required by tests
+ use test || sed -i '/SUBDIRS/s/testsuite examples//' Makefile.in || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # --disable-openssl bug #427526
+ ECONF_SOURCE="${S}" econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --disable-openssl \
+ --disable-fat \
+ $(use_enable gmp public-key) \
+ $(use_enable static-libs static) \
+ $(tc-is-static-only && echo --disable-shared) \
+ $(use_enable doc documentation) \
+ $(use_enable neon arm-neon) \
+ $(use_enable cpu_flags_x86_aes x86-aesni)
+}
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index aef35ab8b4e4..30a64eddb308 100644
Binary files a/dev-lisp/Manifest.gz and b/dev-lisp/Manifest.gz differ
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 670c7cbe49f7..4b0e12dda85f 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,2 +1,3 @@
DIST clisp-2.48.tar.bz2 7885098 BLAKE2B 42ebfe4721015f522184bce710bf95d79aa7f2a239410af249a8e85d80f140344ec80daaa34f7cdbfd2ae86407984657163ce3f6e4201eb132f7c71e21523cba SHA512 3288b6a2973c924006b14bbed1e8e3e688276a187ac2a6c7851dc7ae699e7832d30e5e7eecdabc76c08c7e8e8ce1b562eb97a44570d3035e558ea2310de2b719
+DIST clisp-2.49.60.tar.bz2 8745713 BLAKE2B 5dffd594c6d00c2057a98e3f93c888cd5cdc60009cd8fc987e39ff5182e71e575e148839d9c973fbfd0842b82ddf1b5918e86d128d9c79f6d0d4b6afcdc5853f SHA512 656cd59a23ba9be5304a6e0d64d79ac518072c431820b8cf95759fa8f3a66e2efe4d07939315b93e5e06b6e5348d8b32739b129a9e8ac0dc362dd5d1f1eb8aa8
DIST clisp-2.49.tar.bz2 8091011 BLAKE2B e034c581b8100837b34d0adf1ef45bd667272d062945875175958178b4ef5b11e899dfb76505eb8cb51fca6101c11a9f21fb2cc9a78a3c0f82b06166211434f7 SHA512 eef66fc85199a2c283b616db61bf67ff103eeb0f19fa907da48994dc790b6f5f8d0c74fb3bd723c6b827c0ff3cfd89fa6ba67934fc669ed5d5249044b5140d81
diff --git a/dev-lisp/clisp/clisp-2.49.60.ebuild b/dev-lisp/clisp/clisp-2.49.60.ebuild
new file mode 100644
index 000000000000..84dc47a3bc6a
--- /dev/null
+++ b/dev-lisp/clisp/clisp-2.49.60.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
+HOMEPAGE="http://clisp.sourceforge.net/"
+SRC_URI="https://haible.de/bruno/gnu/clisp-2.49.60.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2/7"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
+# "jit" disabled ATM
+
+RDEPEND=">=dev-lisp/asdf-2.33-r3
+ virtual/libiconv
+ >=dev-libs/libsigsegv-2.10
+ >=dev-libs/ffcall-1.10
+ dbus? ( sys-apps/dbus )
+ fastcgi? ( dev-libs/fcgi )
+ gdbm? ( sys-libs/gdbm )
+ gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 )
+ pari? ( =dev-db/postgresql-8.0:* )
+ readline? ( >=sys-libs/readline-7.0:0= )
+ pcre? ( dev-libs/libpcre:3 )
+ svm? ( sci-libs/libsvm )
+ zlib? ( sys-libs/zlib )
+ X? ( x11-libs/libXpm )
+ hyperspec? ( dev-lisp/hyperspec )
+ berkdb? ( sys-libs/db:4.8 )"
+
+DEPEND="${RDEPEND}
+ X? ( x11-misc/imake x11-proto/xextproto )"
+
+enable_modules() {
+ [[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument"
+ for m in "$@" ; do
+ einfo "enabling module $m"
+ myconf+=" --with-module=${m}"
+ done
+}
+
+BUILDDIR="builddir"
+
+# modules not enabled:
+# * berkdb: must figure out a way to make the configure script pick up the
+# currect version of the library and headers
+# * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs
+# * matlab, netica: not in portage
+# * oracle: can't install oracle-instantclient
+
+src_prepare() {
+ # More than -O1 breaks alpha/ia64
+ if use alpha || use ia64; then
+ sed -i -e 's/-O2//g' src/makemake.in || die
+ fi
+ eapply "${FILESDIR}"/"${P}"-after_glibc_cfree_bdb.patch
+ eapply_user
+}
+
+src_configure() {
+ # We need this to build on alpha/ia64
+ if use alpha || use ia64; then
+ replace-flags -O? -O1
+ append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP'
+ fi
+
+ if use x86; then
+ append-flags -falign-functions=4
+ fi
+
+ # QA issue with lisp.run
+ append-flags -Wa,--noexecstack
+
+ # built-in features
+ local myconf="--with-ffcall --without-dynamic-modules"
+# There's a problem with jit_allocai function
+# if use jit; then
+# myconf+=" --with-jitc=lightning"
+# fi
+ if use threads; then
+ myconf+=" --with-threads=POSIX_THREADS"
+ fi
+
+ # default modules
+ enable_modules rawsock
+ # optional modules
+ use elibc_glibc && enable_modules bindings/glibc
+ use X && enable_modules clx/new-clx
+ if use postgres; then
+ enable_modules postgresql
+ append-cppflags -I$(pg_config --includedir)
+ fi
+ if use berkdb; then
+ enable_modules berkeley-db
+ append-cppflags -I/usr/include/db4.8
+ fi
+ use dbus && enable_modules dbus
+ use fastcgi && enable_modules fastcgi
+ use gdbm && enable_modules gdbm
+ use gtk && enable_modules gtk2
+ use pari && enable_modules pari
+ use pcre && enable_modules pcre
+ use svm && enable_modules libsvm
+ use zlib && enable_modules zlib
+
+ if use hyperspec; then
+ CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
+ else
+ CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
+ fi
+
+ # configure chokes on --sysconfdir option
+ local configure="./configure --prefix=/usr --enable-portability \
+ --libdir=/usr/$(get_libdir) $(use_with readline) $(use_with unicode) \
+ ${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
+ einfo "${configure}"
+ ${configure} || die "./configure failed"
+
+ IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
+ sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \
+ "${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes"
+}
+
+src_compile() {
+ export VARTEXFONTS="${T}"/fonts
+ cd "${BUILDDIR}" || die
+ # parallel build fails
+ emake -j1
+}
+
+src_install() {
+ pushd "${BUILDDIR}"
+ make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
+ doman clisp.1
+ dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
+ # stripping them removes common symbols (defined but uninitialised variables)
+ # which are then needed to build modules...
+ export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
+ popd
+ dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png
+ dodoc doc/{CLOS-guide,LISP-tutorial}.txt
+}
diff --git a/dev-lisp/clisp/files/clisp-2.49.60-after_glibc_cfree_bdb.patch b/dev-lisp/clisp/files/clisp-2.49.60-after_glibc_cfree_bdb.patch
new file mode 100644
index 000000000000..3ab075badf4a
--- /dev/null
+++ b/dev-lisp/clisp/files/clisp-2.49.60-after_glibc_cfree_bdb.patch
@@ -0,0 +1,207 @@
+diff --git a/modules/berkeley-db/bdb.c b/modules/berkeley-db/bdb.c
+index a266d41..942652a 100644
+--- a/modules/berkeley-db/bdb.c
++++ b/modules/berkeley-db/bdb.c
+@@ -2216,7 +2216,13 @@ DEFUN(BDB:DB-COMPACT, db &key TRANSACTION :START STOP FREE FILL TIMEOUT \
+ c_data.compact_timeout = timeout;
+ c_data.compact_pages = pages;
+ SYSCALL(db->compact,(db,txn,pstart,pstop,&c_data,flags,&end));
+- pushSTACK(uint32_to_I(c_data.compact_empty_buckets));
++ /* ====
++ * compact_empty_buckets is in bdb-5.3 as part of output stats
++ * however this version use bdb-4.8 which does not have it
++ * ====
++ *
++ * pushSTACK(uint32_to_I(c_data.compact_empty_buckets));
++ * */
+ pushSTACK(uint32_to_I(c_data.compact_pages_free));
+ pushSTACK(uint32_to_I(c_data.compact_pages_examine));
+ pushSTACK(uint32_to_I(c_data.compact_levels));
+diff --git a/modules/bindings/glibc/linux.lisp b/modules/bindings/glibc/linux.lisp
+index c960753..2993990 100644
+--- a/modules/bindings/glibc/linux.lisp
++++ b/modules/bindings/glibc/linux.lisp
+@@ -1,7 +1,7 @@
+ ;; Foreign functions provided by the Linux C library version 6,
+ ;; i.e. the GNU C library version 2.0.7.
+ ;; Bruno Haible 10.4.1998, 19.4.1998
+-;; Sam Steingold 2002-2008, 2011
++;; Sam Steingold 2002-2008, 2011, 2013, 2016-2017
+
+ ;; NB: quite a few functions here have more portable counterparts in POSIX
+
+@@ -649,7 +649,6 @@
+ (def-call-out calloc (:arguments (nmemb size_t) (size size_t))
+ (:return-type c-pointer))
+ (def-call-out free (:arguments (ptr c-pointer)) (:return-type nil))
+-(def-call-out cfree (:arguments (ptr c-pointer)) (:return-type nil))
+ (def-call-out valloc (:arguments (size size_t)) (:return-type c-pointer))
+
+ (def-call-out abort (:arguments) (:return-type nil))
+@@ -687,9 +686,8 @@
+ (def-call-out system? (:arguments (null c-string))
+ (:return-type boolean) (:name "system"))
+
+-; You can uncomment this if your compiler sets __USE_GNU
+-; (def-call-out canonicalize_file_name (:arguments (name c-string))
+-; (:return-type c-string :malloc-free))
++(def-call-out canonicalize_file_name (:arguments (name c-string))
++ (:return-type c-string :malloc-free) (:guard "defined(__USE_GNU)"))
+
+ (def-call-out realpath
+ (:arguments (name c-string)
+@@ -1041,9 +1039,8 @@
+ (def-call-out access (:arguments (name c-string) (type int))
+ (:return-type int))
+
+-; You can uncomment this if your compiler sets __USE_GNU
+-; (def-call-out euidaccess (:arguments (name c-string) (type int))
+-; (:return-type int))
++(def-call-out euidaccess (:arguments (name c-string) (type int))
++ (:return-type int) (:guard "defined(__USE_GNU)"))
+
+ (defconstant SEEK_SET 0)
+ (defconstant SEEK_CUR 1)
+@@ -1094,9 +1091,8 @@
+ ;(def-call-out getcwd (:arguments (buf c-string :out) (size size_t)) ; ??
+ ; (:return-type c-string))
+
+-; You can uncomment this if your compiler sets __USE_GNU
+-; (def-call-out get_current_dir_name (:arguments)
+-; (:return-type c-string :malloc-free))
++(def-call-out get_current_dir_name (:arguments)
++ (:return-type c-string :malloc-free) (:guard "defined(__USE_GNU)"))
+
+ ;(def-call-out getwd (:arguments (buf c-string :out)) ; ??
+ ; (:return-type c-string))
+@@ -1324,8 +1320,8 @@
+ ; (:arguments (size int) (list (c-ptr (c-array gid_t ??)) :out)) ; ??
+ ; (:return-type int))
+
+-; You can uncomment this if your compiler sets __USE_GNU
+-; (def-call-out group_member (:arguments (gid gid_t)) (:return-type boolean))
++(def-call-out group_member (:arguments (gid gid_t)) (:return-type boolean)
++ (:guard "defined(__USE_GNU)"))
+ (def-call-out setuid (:arguments (uid uid_t)) (:return-type int))
+ (def-call-out setreuid (:arguments (ruid uid_t) (euid uid_t))
+ (:return-type int))
+@@ -1822,8 +1818,8 @@
+ (:return-type c-string :malloc-free))
+ (def-call-out ungetc (:arguments (c int) (fp FILE))
+ (:return-type int))
+-; You can uncomment this if your compiler sets __USE_GNU
+-; (def-call-out fcloseall (:arguments) (:return-type int))
++(def-call-out fcloseall (:arguments) (:return-type int)
++ (:guard "defined(__USE_GNU)"))
+ (def-call-out fdopen (:arguments (fildes int) (mode c-string))
+ (:return-type c-pointer))
+ (def-call-out fileno (:arguments (fp FILE)) (:return-type int))
+@@ -1901,11 +1897,11 @@ typedef __off64_t clisp_dirent_off_t;
+ (:return-type (c-ptr-null dirent)))
+ (def-call-out readdir64 (:arguments (dirp c-pointer))
+ (:return-type (c-ptr-null dirent64)))
+-(def-call-out readdir_r
++(def-call-out readdir_r ; deprecated
+ (:arguments (dirp c-pointer) (entry (c-ptr dirent) :out :alloca)
+ (result (c-ptr (c-ptr dirent)) :out :alloca)) ; ??
+ (:return-type int))
+-(def-call-out readdir64_r
++(def-call-out readdir64_r ; deprecated
+ (:arguments (dirp c-pointer) (entry (c-ptr dirent64) :out :alloca)
+ (result (c-ptr (c-ptr dirent64)) :out :alloca)) ; ??
+ (:return-type int))
+diff --git a/modules/bindings/glibc/test.tst b/modules/bindings/glibc/test.tst
+index f807389..b2c1222 100644
+--- a/modules/bindings/glibc/test.tst
++++ b/modules/bindings/glibc/test.tst
+@@ -5,6 +5,16 @@
+ (progn (require "linux") T) T
+ (listp (show (multiple-value-list (ext:module-info "linux" t)) :pretty t)) T
+
++(stringp (show (linux:get-domain-name))) T
++(stringp (show (linux:get-host-name))) T
++
++;; usually __USE_GNU is defined, so this should work:
++(let* ((d (linux:get_current_dir_name))
++ (c (linux:canonicalize_file_name (concatenate 'string d "/."))))
++ (or (string= d c)
++ (list :cur-dir d :canonical c)))
++T
++
+ (defparameter *d* (show (linux:opendir "."))) *D*
+ (linux:dirent64-d_name (show (linux:readdir64 *d*))) "."
+ (linux:dirent64-d_name (show (linux:readdir64 *d*))) ".."
+diff --git a/src/foreign1.lisp b/src/foreign1.lisp
+index 26a3ba5..0e43de7 100644
+--- a/src/foreign1.lisp
++++ b/src/foreign1.lisp
+@@ -1,6 +1,6 @@
+ ;;; Foreign function interface for CLISP
+ ;;; Bruno Haible 19.2.1995
+-;;; Sam Steingold 1998-2010
++;;; Sam Steingold 1998-2010, 2017
+
+ #+UNICODE
+ (progn
+@@ -805,14 +805,17 @@
+ c-name (to-c-string c-name) (third variable) (first variable))
+ (when *foreign-guard* (format *coutput-stream* "# endif~%"))))
+ (dolist (function *function-list*)
+- (let ((c-name (first function)))
+- (when *foreign-guard*
+- (format *coutput-stream* "# if defined(HAVE_~A)~%"
+- (string-upcase c-name)))
++ (let ((c-name (first function))
++ (guard (fourth function)))
++ (when guard
++ (format *coutput-stream* "# if ~A~%"
++ (if (eq guard t)
++ (format nil "defined(HAVE_~A)" (string-upcase c-name))
++ guard)))
+ (format *coutput-stream*
+ " register_foreign_function((void*)&~A,~A,~D);~%"
+ c-name (to-c-string c-name) (svref (second function) 3))
+- (when *foreign-guard* (format *coutput-stream* "# endif~%"))))
++ (when guard (format *coutput-stream* "# endif~%"))))
+ (maphash (lambda (type fun-vec)
+ (declare (ignore type))
+ (let ((c-name (to-c-name (car fun-vec))))
+@@ -1083,7 +1086,7 @@
+ (defmacro DEF-CALL-OUT (&whole whole-form name &rest options)
+ (setq name (check-symbol name (first whole-form)))
+ (let* ((alist
+- (parse-options options '(:name :arguments :return-type :language
++ (parse-options options '(:name :arguments :return-type :language :guard
+ :built-in :library :version :documentation)
+ whole-form))
+ (def (gensym "DEF-CALL-OUT-"))
+@@ -1095,6 +1098,7 @@
+ (version (second (assoc :version alist)))
+ (c-name (foreign-name name (assoc :name alist)))
+ (built-in (second (assoc :built-in alist)))
++ (guard (get-assoc :guard alist '*foreign-guard*))
+ ;; Maximize sharing in .fas file, reuse options
+ ;; parse-c-function ignores unknown options, e.g. :name
+ (ctype `(PARSE-C-FUNCTION ',options ',whole-form)))
+@@ -1102,7 +1106,7 @@
+ ',c-name ,ctype ',properties ,library ,version NIL)))
+ (EXT:COMPILER-LET ((,def ,ctype))
+ (EVAL-WHEN (COMPILE)
+- (UNLESS ,LIBRARY (NOTE-C-FUN ',c-name ,def ',built-in)))
++ (UNLESS ,LIBRARY (NOTE-C-FUN ',c-name ,def ',built-in ,guard)))
+ (SYSTEM::EVAL-WHEN-COMPILE
+ (SYSTEM::C-DEFUN ',name (C-TYPE-TO-SIGNATURE ,ctype))))
+ (WHEN ,def ; found library function
+@@ -1110,10 +1114,10 @@
+ (SYSTEM::%PUTD ',name ,def))
+ ',name)))
+
+-(defun note-c-fun (c-name ctype built-in) ; not ABI, compile-time only
++(defun note-c-fun (c-name ctype built-in guard) ; not ABI, compile-time only
+ (when (system::prepare-coutput-file)
+ (prepare-module)
+- (push (list c-name ctype built-in)
++ (push (list c-name ctype built-in guard)
+ *function-list*)))
+
+ (defun count-inarguments (arg-vector)
diff --git a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
index 98b151d56d40..1e2e1d86bb26 100644
--- a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
+++ b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
@@ -18,7 +18,10 @@ RDEPEND="dev-perl/libwww-perl
virtual/perl-Digest-MD5
virtual/perl-Storable"
DEPEND="${RDEPEND}
- test? ( virtual/perl-Test-Simple )"
+ test? (
+ dev-perl/Test-RequiresInternet
+ virtual/perl-Test-Simple
+ )"
src_test() {
perl_rm_files t/pod.t t/pod-coverage.t
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 87b8028a1949..64962d416b0b 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Net-Pcap/Manifest b/dev-perl/Net-Pcap/Manifest
index 390ed6867cd0..01d2ffeadf20 100644
--- a/dev-perl/Net-Pcap/Manifest
+++ b/dev-perl/Net-Pcap/Manifest
@@ -1 +1,2 @@
DIST Net-Pcap-0.17.tar.gz 92853 BLAKE2B 147f0a11be36e7b5022f138611ad4226ea36d61902e966ab3400463aed4aecfd0022852df2589f363a6590270750b427cac9532f22a42e18d0f959a23e990ff1 SHA512 14747661b220b119b4182f13dbc1509cae5665e77588dbc8576f7d959f33ef6ee3785f2d9022093c1f1b808c37d04ee313f5ac39cc6eaa917962c9215c5a4de6
+DIST Net-Pcap-0.18.tar.gz 94207 BLAKE2B 257e2b7c5bf6ad05936b64171db3ee530249f40d695ca2aba21d4bfe4796989e3a4aa955472b9c39e33aab5d67d2eebb26b43e173dbd359d01201926fa3a6b6e SHA512 63cc216345eb65b1e76efa657623c9d444d20f4b54ab0c75e787483baaa4f1de7e3a9294967aa7eccbdca04c60b089194dd7e0d19838f899b332c5881a8c7f6d
diff --git a/dev-perl/Net-Pcap/Net-Pcap-0.180.0.ebuild b/dev-perl/Net-Pcap/Net-Pcap-0.180.0.ebuild
new file mode 100644
index 000000000000..0c7010719f04
--- /dev/null
+++ b/dev-perl/Net-Pcap/Net-Pcap-0.180.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SAPER
+DIST_VERSION=0.18
+DIST_EXAMPLES=( "eg/*" )
+inherit perl-module eutils
+
+DESCRIPTION="Interface to the pcap(3) LBL packet capture library"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="net-libs/libpcap
+ dev-perl/IO-Interface"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-${DIST_VERSION}-test-error.patch"
+)
+
+src_test() {
+ if [[ $EUID != 0 ]]; then
+ elog "Comprehensive testing of this module requires root permissions."
+ elog "For details, see:"
+ elog "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}"
+ fi
+ perl_rm_files t/pod{,cover,spell}.t t/distchk.t t/portfs.t
+ perl-module_src_test
+}
diff --git a/dev-perl/Net-Pcap/files/Net-Pcap-0.18-test-error.patch b/dev-perl/Net-Pcap/files/Net-Pcap-0.18-test-error.patch
new file mode 100644
index 000000000000..1bd8af5e87a9
--- /dev/null
+++ b/dev-perl/Net-Pcap/files/Net-Pcap-0.18-test-error.patch
@@ -0,0 +1,39 @@
+From 7c831efcb06d6254e54423cdcd95bebbb7725270 Mon Sep 17 00:00:00 2001
+From: Kent Fredric
+Date: Fri, 8 Dec 2017 17:52:13 +1300
+Subject: Allow error message to be a suffix
+
+Previously, the error message emitted by the native calls was of the
+form:
+
+ 'syntax error'
+
+However, more recently the error message takes the form:
+
+ 'syntax error in filter expression: syntax error'
+
+This patch pretends the part before the ":" is functionally equivalent
+to a line start, for the purposes of testing.
+
+Bug: https://github.com/maddingue/Net-Pcap/issues/8
+Bug: https://github.com/maddingue/Net-Pcap/pull/9
+---
+ t/09-error.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/09-error.t b/t/09-error.t
+index 90337b8..eee679d 100644
+--- a/t/09-error.t
++++ b/t/09-error.t
+@@ -22,7 +22,7 @@ is( $@, '', "compile() with an invalid filter string" );
+ is( $res, -1, " - result must not be null: $res" );
+ eval { $err = Net::Pcap::geterr($pcap) };
+ is( $@, '', "geterr()" );
+-like( $err, '/^(?:parse|syntax) error$/', " - \$err must not be null: $err" );
++like( $err, '/(^|: )(?:parse|syntax) error$/', " - \$err must not be null: $err" );
+
+ # Testing compile() with a valid filter
+ eval { $res = Net::Pcap::compile($pcap, \$filter, "tcp", 0, $mask) };
+--
+2.14.3
+
diff --git a/dev-perl/Net-SMTP-SSL/Manifest b/dev-perl/Net-SMTP-SSL/Manifest
index 73fa76b1c75d..c61c9337831a 100644
--- a/dev-perl/Net-SMTP-SSL/Manifest
+++ b/dev-perl/Net-SMTP-SSL/Manifest
@@ -1 +1,2 @@
DIST Net-SMTP-SSL-1.03.tar.gz 2271 BLAKE2B 8f131527139a96155bb33c4b1c0530ba88955f08d4a7d1a2b8afec6119300b102c5ba0f4ac3757c216491b5aea9a3311a0b501a5a4dbb2d453ddf3abf3a18719 SHA512 71e766274745893cb6eddc91a4b24d7b538051974a2cd93d4abd8447daec72907b482edb25e628cfa480c99af935568c4765e85ddfc951e0ec9b2de25c366bc8
+DIST Net-SMTP-SSL-1.04.tar.gz 2457 BLAKE2B a55dea686b5dd6b0ecdf025a40a71f8a87fc8fdb8cab49b6e310c1bca8a513945ca33914d762174a907ec5f146765f7aea0f70f59be4e9fee88051d2bf9c8ba5 SHA512 dfbf59e5d895add19f5684c999c941ab56a58be39492a02e5a9bdac47039bf388279eda734c6b0422d228ac14efed899b3572561e6a34cfd9582423252efb509
diff --git a/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild b/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild
new file mode 100644
index 000000000000..5c0979c1aeae
--- /dev/null
+++ b/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=1.04
+inherit perl-module
+
+DESCRIPTION="(Deprecated) SSL support for Net::SMTP"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+ virtual/perl-libnet
+ dev-perl/IO-Socket-SSL
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? ( >=virtual/perl-Test-Simple-0.470.0 )
+"
+
+pkg_postinst() {
+ elog "This package is deprecated by upstream as equivalent support for SSL and"
+ elog "STARTTLS is available with Net::SMTP 2.35, found in:"
+ elog " >=virtual/perl-libnet-1.28 ( >=dev-lang/perl-5.20.0 )"
+ elog "Subsequently, this package is only available for compatibility reasons, and"
+ elog "should be avoided in new code."
+}
diff --git a/dev-perl/Net-SMTPS/Manifest b/dev-perl/Net-SMTPS/Manifest
index df74d636fd40..fbd9df4e7fd9 100644
--- a/dev-perl/Net-SMTPS/Manifest
+++ b/dev-perl/Net-SMTPS/Manifest
@@ -1,3 +1,4 @@
DIST Net-SMTPS-0.04.tar.gz 4712 BLAKE2B 7cb6175e8aad3db5efb0f1e4413e08dd0d88666643ddb6c1c0122aff1b6ed99ecd7e5b71d59d372df956968224b507f0ab07daf96eaa94f2f6fa120d315b568e SHA512 69fcfb221a139a9d92f56d3917081a21de786095314efaa840e41dcd27bebd29d66f0f9c63cc2eb8adbaa1b701877b4ab9b9fe2790c335a13b256b742319054b
DIST Net-SMTPS-0.05.tar.gz 4601 BLAKE2B 708b7918de43468dd457b1cf6836071bc13aa2af14470b87ca61f90ee17a7a524e9759878bb37606c2d24175cd514ffbe56d0df2e2315c0bf801034adc82163f SHA512 8c5a49820997eec65566d86a6eb69ba36800772ab1a400a4a005ce771895264de7b38d037c5e5ebcfb18b39e91f71d78aa251f721882a448a565da5038e49273
DIST Net-SMTPS-0.06.tar.gz 4701 BLAKE2B 9500e403b79dec920d1d10f30a3a935982f528babc6b882c06f5328d69a49a72257474751c42b24b8fda3789c542cf14f64d38ca0f0139bdc8b8d67bc1332793 SHA512 c27a60860c8d4ffaf7ba1382664255fd24417efbffec79ad4c219d9caf7ca5c36e2697185e9b4c513466657bf7f70476f0f565c4a9570845b14c37f87c11394b
+DIST Net-SMTPS-0.09.tar.gz 5263 BLAKE2B a2091fd29de5a3c8b8bee1612bb6b7813222f0cce45070aebfced77362b029795ca51c4de818b203b454c1be14d6c6835e57fe34bf95866d4b06f916ca96401a SHA512 856d7068fe3c41c48048dae564db5d526521753f58ac4ec9b973360991853c3a7b7ea3d3e25b17692601765be522fc5bf1456a0b645325e724a482ec559d5e5f
diff --git a/dev-perl/Net-SMTPS/Net-SMTPS-0.90.0.ebuild b/dev-perl/Net-SMTPS/Net-SMTPS-0.90.0.ebuild
new file mode 100644
index 000000000000..c3b8c7f28c8b
--- /dev/null
+++ b/dev-perl/Net-SMTPS/Net-SMTPS-0.90.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=TOMO
+DIST_VERSION=0.09
+DIST_SECTION=src
+inherit perl-module
+
+DESCRIPTION="SSL/STARTTLS support for Net::SMTP"
+IUSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-perl/Authen-SASL-2.150.0
+ >=dev-perl/IO-Socket-SSL-1
+ >=virtual/perl-libnet-2"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Net-SSH-Any/Manifest b/dev-perl/Net-SSH-Any/Manifest
index 3af9e51f04ec..d0fd99769b3b 100644
--- a/dev-perl/Net-SSH-Any/Manifest
+++ b/dev-perl/Net-SSH-Any/Manifest
@@ -1 +1,2 @@
DIST Net-SSH-Any-0.04.tar.gz 14688 BLAKE2B 325fb89e7c6f15c65f71f30864a2322261d1fff181cb3728676422648998eb1646e9c8e53767d7b6dcc5daeb297a5ec589240915aca7ff886b346c21d107409b SHA512 40d7ffc9efcd252dcdf8b3af86146c2f56c0c316d9935e231c0d1ef8a64e8fe9a3153a7106bfca0b1cbdadaa10c8918b525455593fb2d07301247180d4226c49
+DIST Net-SSH-Any-0.10.tar.gz 105899 BLAKE2B c83f21e5bddfac9ab7356c575ff164ac4fc4d3ea5ed260569db2b7d813e04a5397d8eeb94df8f367ec48c4ef86d503dd8e3ce9fefe0813b39493faa3a45b419b SHA512 b34e29e8e126b2296ecf67b01bf7420f511adbf6ef72369c2fcac51cd4dbfdf747c9cca9859bb48489675233dd9ce4b0d939c587244cd36c8791fa55b434fd96
diff --git a/dev-perl/Net-SSH-Any/Net-SSH-Any-0.100.0.ebuild b/dev-perl/Net-SSH-Any/Net-SSH-Any-0.100.0.ebuild
new file mode 100644
index 000000000000..7c1b5b9d0a58
--- /dev/null
+++ b/dev-perl/Net-SSH-Any/Net-SSH-Any-0.100.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=SALVA
+DIST_VERSION=0.10
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Use any SSH module"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=virtual/perl-Test-Simple-1.302.26
+ )
+"
+mydoc="docs/*"
diff --git a/dev-perl/Net-SSH-Any/metadata.xml b/dev-perl/Net-SSH-Any/metadata.xml
index 4bb54e680ac3..63caea2f63e1 100644
--- a/dev-perl/Net-SSH-Any/metadata.xml
+++ b/dev-perl/Net-SSH-Any/metadata.xml
@@ -8,9 +8,44 @@
Net-SSH-Any
Net::SSH::Any
+ Net::SSH::Any::Autodetector
+ Net::SSH::Any::Backend::Dbclient_Cmd
Net::SSH::Any::Backend::Net_OpenSSH
+ Net::SSH::Any::Backend::Net_OpenSSH::DPipe
Net::SSH::Any::Backend::Net_SSH2
+ Net::SSH::Any::Backend::Net_SSH2::DPipe
+ Net::SSH::Any::Backend::Net_SSH2::DPipe::Tie
+ Net::SSH::Any::Backend::Net_SSH2::SFTP
+ Net::SSH::Any::Backend::Plink_Cmd
+ Net::SSH::Any::Backend::Sexec_Cmd
+ Net::SSH::Any::Backend::Ssh_Cmd
+ Net::SSH::Any::Backend::Sshg3_Cmd
Net::SSH::Any::Constants
+ Net::SSH::Any::DPipe
+ Net::SSH::Any::OS::AnyEvent
+ Net::SSH::Any::OS::MSWin
+ Net::SSH::Any::OS::MSWin::DPipe
+ Net::SSH::Any::OS::MSWin::Process
+ Net::SSH::Any::OS::POSIX
+ Net::SSH::Any::OS::POSIX::DPipe
+ Net::SSH::Any::POSIXShellQuoter
+ Net::SSH::Any::SCP::Base
+ Net::SSH::Any::SCP::Getter
+ Net::SSH::Any::SCP::Getter::Content
+ Net::SSH::Any::SCP::Getter::Finder
+ Net::SSH::Any::SCP::Getter::Standard
+ Net::SSH::Any::SCP::Putter
+ Net::SSH::Any::SCP::Putter::Content
+ Net::SSH::Any::SCP::Putter::DirMaker
+ Net::SSH::Any::SCP::Putter::Standard
+ Net::SSH::Any::Test
+ Net::SSH::Any::Test::Backend::Cygwin
+ Net::SSH::Any::Test::Backend::Dropbear_Daemon
+ Net::SSH::Any::Test::Backend::OpenSSH_Daemon
+ Net::SSH::Any::Test::Backend::Remote
+ Net::SSH::Any::Test::Isolated
+ Net::SSH::Any::Test::Isolated::Util
+ Net::SSH::Any::URI
Net::SSH::Any::Util
diff --git a/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest b/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest
index 698ca9b5ba12..ee82425080b1 100644
--- a/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest
+++ b/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest
@@ -1 +1,2 @@
DIST Net-SSH-AuthorizedKeysFile-0.17.tar.gz 16040 BLAKE2B b21886051b529d44d30b04079b6ab01454b85218f1505ecceb57ab15bedaa39b558fef5b2b1be0331580edec2241977bb6d9193c66c4138270f303bc197771d9 SHA512 2d6f59bd93a2e0ef25ea5f438dcb9be7ae670d9a012596da07f23b37ed781ebed6559a474665e66adea4a5f3550f1898b26cf6026705d851099e26f1934c5259
+DIST Net-SSH-AuthorizedKeysFile-0.18.tar.gz 16413 BLAKE2B ee22c2b456a5b8ad98fb9648d86e106f04266ef132d079d512fe980c08cceecc06c3946ac4fa43ad8dddb47d266debf986db47e6a3b7d72d1d1bc999284a4989 SHA512 1ebb5f2faa9ab414e49b9c8e85c27c81f858bd18669ff5508fe4dd70e8980977348121034d69fb094fd75c3d8d2c686694092bf0c0db2bcecb7ba05d85fa8a4c
diff --git a/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0.ebuild b/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0.ebuild
new file mode 100644
index 000000000000..d8ecc15d60a7
--- /dev/null
+++ b/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MSCHILLI
+DIST_VERSION=0.18
+inherit perl-module
+
+DESCRIPTION="Read and modify ssh's authorized_keys files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ virtual/perl-Digest-MD5
+ virtual/perl-File-Spec
+ >=dev-perl/Log-Log4perl-1.0.0
+ virtual/perl-Text-ParseWords
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-File-Temp
+ virtual/perl-Test-Simple
+ )
+"
diff --git a/dev-perl/Net-SSH-Perl/Manifest b/dev-perl/Net-SSH-Perl/Manifest
index 382119cc1710..bcbae24142d0 100644
--- a/dev-perl/Net-SSH-Perl/Manifest
+++ b/dev-perl/Net-SSH-Perl/Manifest
@@ -1,3 +1,4 @@
DIST Net-SSH-Perl-1.36.tar.gz 117219 BLAKE2B ed23b89d5d4f8a32f875a12433cc7c6258273120fde596f496a2342d8f99786dd31ce6caa6c0b7418ffed7f0be400adf34232e16c131e8a50f5ee2ec856627f8 SHA512 4157d10a8dc107af17ab711102dea79b4b0b598d6c15d6f350f3a2eaf9be917c4410885d38de0dab4bbf1277875f03d5b10ca7350ba1300fdffc385c430c588f
DIST Net-SSH-Perl-1.42.tar.gz 120783 BLAKE2B c8423aa71b679e67636f53c74b8158e4898bccfa5036eaeaf0150237548a249125fa203f3c986cd6e55a5ac1e7953f757e6914baf14286b36a9b51b808d7e604 SHA512 67275e99890948376c7f6feb5be1979f45b5fda2afe440108b3819db192fd41b43e9ee94e7e643671384b37972842f40ce3519cbeef98b6ee796a68e4bfe20dd
DIST Net-SSH-Perl-2.09.01.tar.gz 255286 BLAKE2B fa299b63f1c82e5adc936513dc2fbda495abe087d32d80ffbf03bd9b9467114b710e7f74186514157b19c13259bde576c5f251aa038948a3114800b9ee675158 SHA512 e7d7194e175490ba0849357ebbb504932d97b358722f2045e0acbaba9c14dc945629bd5653b36934317632e0d3894525e4f34ea48b494f2cc815959106138b44
+DIST Net-SSH-Perl-2.14.tar.gz 256963 BLAKE2B 700e9a852ab65ce881db043bf7ce775bbb60022299bf27936b90bb78c085136df1c6119b67f48bfd540b6b7cc2cb6406c252c4a6b9a7b73fc11760c28e527f58 SHA512 49fee3e7969260a97453adfdac7ed3852130a7404ca5016f6d16549e478b8f2808f47c5801f2dbf991cfb33b5f2653d55360ba938d9b36016620a46e1ffea879
diff --git a/dev-perl/Net-SSH-Perl/Net-SSH-Perl-2.140.0.ebuild b/dev-perl/Net-SSH-Perl/Net-SSH-Perl-2.140.0.ebuild
new file mode 100644
index 000000000000..ea851df135aa
--- /dev/null
+++ b/dev-perl/Net-SSH-Perl/Net-SSH-Perl-2.140.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SCHWIGON
+DIST_VERSION=2.14
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Perl client Interface to SSH"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal test"
+
+RDEPEND="
+ >=dev-perl/Crypt-Curve25519-0.50.0
+ dev-perl/Crypt-IDEA
+ >=dev-perl/CryptX-0.32.0
+ virtual/perl-Digest-MD5
+ dev-perl/File-HomeDir
+ virtual/perl-File-Spec
+ virtual/perl-IO
+ >=dev-perl/Math-GMP-1.40.0
+ virtual/perl-Scalar-List-Utils
+ >=dev-perl/String-CRC32-1.200.0
+ !minimal? (
+ dev-perl/Digest-BubbleBabble
+ dev-perl/Crypt-RSA
+ dev-perl/TermReadKey
+ )
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? ( >=virtual/perl-Test-Simple-0.610.0 )
+"
+
+PERL_RM_FILES=(
+ # Gentoo integrity checks are used instead
+ 'SIGNATURE'
+ 't/00-signature.t'
+ # Annoying author tests
+ 't/99-perlcritic.t'
+ 't/99-pod.t'
+ 't/99-spellcheck.t'
+ 't/99-yaml.t'
+)
+PATCHES=(
+ "${FILESDIR}/${PN}-2.14-no-signatures.patch"
+)
diff --git a/dev-perl/Net-SSH-Perl/files/Net-SSH-Perl-2.14-no-signatures.patch b/dev-perl/Net-SSH-Perl/files/Net-SSH-Perl-2.14-no-signatures.patch
new file mode 100644
index 000000000000..c1df6ae59596
--- /dev/null
+++ b/dev-perl/Net-SSH-Perl/files/Net-SSH-Perl-2.14-no-signatures.patch
@@ -0,0 +1,27 @@
+From ad32ac31952120cf20f8830233148188b6c26139 Mon Sep 17 00:00:00 2001
+From: Kent Fredric
+Date: Fri, 24 Mar 2017 05:10:15 +1300
+Subject: Remove use of Module::Signature
+
+Gentoo has its own integrity protocols anyway, and even minor
+patching upsets signatures.
+
+Its not worth the added dependency complexity.
+---
+ Makefile.PL | 1 -
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 0ff11dc..fa62a64 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -64,7 +64,6 @@ MSG
+ }
+
+ WriteMakefile(
+- (MM->can('signature_target') ? (SIGN => 1) : ()),
+ NAME => 'Net::SSH::Perl',
+ DISTNAME => 'Net-SSH-Perl',
+ VERSION_FROM => 'lib/Net/SSH/Perl.pm',
+--
+2.14.3
+
diff --git a/dev-perl/Net-SSH2/Manifest b/dev-perl/Net-SSH2/Manifest
index a702d3146c08..e646bd048fce 100644
--- a/dev-perl/Net-SSH2/Manifest
+++ b/dev-perl/Net-SSH2/Manifest
@@ -1 +1,2 @@
DIST Net-SSH2-0.58.tar.gz 124853 BLAKE2B be4732906154977f08d66689d75f9edf565706047be693354548bf8402223ea06522cc477f8d815f33ee1ba638def40fcc3222362796f8183076928403c29fec SHA512 753e5037d08405f9c401631cd77f1df57e7ee14db44033df8ce0b82f02377bdf7fdecd32bb6f9e1cd80f3fed88adb37e3abdb0b1dbfa50d115ee9e31fd735380
+DIST Net-SSH2-0.67.tar.gz 140610 BLAKE2B dfc43e31f3ededcbdd51e87e91e223614212b3247925a16fcc708695b9b1957950e7609c8463d02db229ff3e3ac3fdfe99da6154f7216b2618a9298073babe20 SHA512 3d6dde36e9e763da024b6d03184d6e41675576914cb8ceffe7e98e64ad83a1418c499ac6afebbde8f871aebab7a78e2aa355905efcaec766d5146ef9e6fd7f5f
diff --git a/dev-perl/Net-SSH2/Net-SSH2-0.670.0.ebuild b/dev-perl/Net-SSH2/Net-SSH2-0.670.0.ebuild
new file mode 100644
index 000000000000..e4ebc8b94087
--- /dev/null
+++ b/dev-perl/Net-SSH2/Net-SSH2-0.670.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SALVA
+DIST_VERSION=0.67
+DIST_EXAMPLES=( "example/*" )
+inherit perl-module
+
+DESCRIPTION="Support for the SSH 2 protocol via libssh2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gcrypt libressl"
+
+RDEPEND="
+ sys-libs/zlib
+ net-libs/libssh2
+ !gcrypt? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ gcrypt? (
+ dev-libs/libgcrypt:0
+ )
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-Constant
+ >=virtual/perl-ExtUtils-MakeMaker-6.50
+"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.67-perl-5.26.patch"
+)
+
+src_configure() {
+ use gcrypt && myconf=gcrypt
+ perl-module_src_configure
+}
diff --git a/dev-perl/Net-SSH2/files/Net-SSH2-0.67-perl-5.26.patch b/dev-perl/Net-SSH2/files/Net-SSH2-0.67-perl-5.26.patch
new file mode 100644
index 000000000000..49e575835db2
--- /dev/null
+++ b/dev-perl/Net-SSH2/files/Net-SSH2-0.67-perl-5.26.patch
@@ -0,0 +1,23 @@
+From 11b70a6e74a8705d40ffb7b277c96c5e2d896cf9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?=
+Date: Thu, 6 Jul 2017 04:58:22 +1200
+Subject: Add build fix for Perl 5.26, bug 623008
+
+Bug: https://bugs.gentoo.org/623008
+Bug: https://github.com/rkitover/net-ssh2/pull/42
+---
+ Makefile.PL | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 6b9d6d5..7bd8094 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1,3 +1,4 @@
++use lib q[.];
+ use inc::Module::Install 0.91;
+ use Cwd;
+ use Config;
+--
+2.14.3
+
diff --git a/dev-perl/Net-SSH2/metadata.xml b/dev-perl/Net-SSH2/metadata.xml
index cade61a47899..3240d6b9ca0e 100644
--- a/dev-perl/Net-SSH2/metadata.xml
+++ b/dev-perl/Net-SSH2/metadata.xml
@@ -14,6 +14,7 @@
Net::SSH2::Channel
Net::SSH2::Dir
Net::SSH2::File
+ Net::SSH2::KnownHosts
Net::SSH2::Listener
Net::SSH2::PublicKey
Net::SSH2::SFTP
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2cbbf49a5c6b..4984c8a837d3 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 4ff6a0d34ea8..68af93c3d61c 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,6 +1,6 @@
-DIST jenkins-bin-2.73.2.war 73280014 BLAKE2B 0a8fd83913486315d0abecb0c3fa34cade3ecab4e205dcd32a7a519698d30be82142a6cc14f2c8c89d70ce45a81b00c687441c353002b1c940be1b93ea05121d SHA512 36fe7d2581f9a2f13b07c43ac9d5915d057bfede3522a17abc9376f19656166586c207c7516f46df7b2cef46ec67444ec44a97df0fc9af50ff41e9938465cebf
DIST jenkins-bin-2.73.3.war 73286753 BLAKE2B b9421b62ac1859d31b3954c551d04ca6f799e6fc630b81d8292bdf676a7d8b247ec9fe2a5f132bdb4f7d8a36c383ec5dadd30d9b2ed521c04710e8792758027d SHA512 55e25bb9ea058b4a64517faec23ec649f77c3342f074a41d1da00901b759895d0e98fe2de9ab1babf0a0bfb165a6f438b8e5204b1edf1c280dffe2f5442285ad
DIST jenkins-bin-2.84.war 73749405 BLAKE2B 89f2e54e51a9f5086d4bf017a99c50cee680b18ebe16bd7076fb0db7c98640355c8b7da4da18312295d331c88d229c8e1fe3e166d9f9b435ae3c8747c18e4163 SHA512 0074b2299f72f45040b4afd087caae0e08362708d3370d17f3bda047d11240881a3fd779753a49c298961e87c509d0b278ac2712934febed23c13c7e36d6c51c
DIST jenkins-bin-2.86.war 73796979 BLAKE2B 7357659340e9314a691c25892d8f89332df2d29adbc2f0f53ee73c0e2ff825eba9ec26c13cbcb3b973fd7ef66d821f897556335c217f11f0f6690e8d1fc4b5be SHA512 a94abb3230c90319f6a632e56afbbc0d19591a6a67ab6ac35856c2bb99ead33d4b23ab3d19a15c1f9501dbf932b3101f569af0f557fb884cd07dadd8a1c968bf
DIST jenkins-bin-2.87.war 74271222 BLAKE2B 54aa5215146407682e3d0f69e67bd1b911c5525cf15222c03df0648e6c4526467be15320554421a2995d9314a72945251f6e329673da64cc26935be15c443efc SHA512 210c2e23d71c3081d4cd6f28af6bac0db7b43f3f93785ee0b53622b7ff05c25aa6dab0a847bf9ee59a2b4952263a67fbc2cb88fd47557809153e191fd95d4da9
+DIST jenkins-bin-2.89.1.war 74286103 BLAKE2B 019cf6318ad0a92a22efc2f0e5feea5386ae60aaa4f48e368c81de62522dd1bf6b0e0ddd3b495fc87f7782f45c40203aa7273c23667342f1ac9da08ae4612d09 SHA512 906d4ab8d6d6aaf56c1d9b9ee731449845fc2cda25008a4b83e87cb2f32569946414361e10275f25dcdfd846368d267a2df4cc7900383f5f63ff5768fd09a9b8
DIST jenkins-bin-2.90.war 74292811 BLAKE2B 0539a55c0d9e63fc6df2cb57f7acf794829f5dba47b82903e1dce0d41067a9bc1ca20fdffa65bc73b0931b47b928076047254c50aaa0fba7f63788a7b640930e SHA512 ee5b201716c02896191ca4a531abe9fe43774e79b7eb2dacf5aa64d481e3ee16b56ce3cc8f1f97c61397846d77bf7886ac6cecc560fe2dc998936c8883b5eb76
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.73.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.89.1.ebuild
similarity index 100%
rename from dev-util/jenkins-bin/jenkins-bin-2.73.2.ebuild
rename to dev-util/jenkins-bin/jenkins-bin-2.89.1.ebuild
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 320afb90f7f5..9cc65ba5db48 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,3 +2,4 @@ DIST meson-0.41.2.tar.gz 1013526 BLAKE2B b41b8132f435aa71598043830537002555c15c8
DIST meson-0.42.0.tar.gz 1042920 BLAKE2B 8d537abcb641a033e228bf93401345ee4c493ba41048e2c3acca960039a6d464bfd8fcc47c0d3be8c1d66a267e2b9ca8d0d8ea55baa8525bc7d40eb5108545c2 SHA512 0a8c3c8c4da70f19de7e10faaf7aef9e950cc21db116a886d0dd7732a70a3dc26996ef15c5eeed79638cf34ee994008e5cb68f7f38b18174e311572ba44e1594
DIST meson-0.42.1.tar.gz 1044883 BLAKE2B 23a3df2b294a59bf6a5ad355afe448f2a96c638cb6ae3529bc1925aca841b3c02e698db9b238fd902ce2acbd1fc232e94a2100ea6f7a4aed4d8eb11a10ad84c4 SHA512 43dc72ea4aa697c0dea6cef57308f487814fb6cf2a4a2338b658172a43603924122ed892c707eb6b974db72f86d767aac23a7397b97270cfe2032d2e6a68911d
DIST meson-0.43.0.tar.gz 1066663 BLAKE2B caf96bcc1b5a3b538b2cbb9edd40221a7b826cf06034db3cfe1a9cf941ff2ebe8d6864a4bdad53f1b6678557cdf75dbb45fd9fa49848a9824ac65a42b14bb528 SHA512 17f7e7f87c344ae0a2f53975c65ef3b4eae204a57eb97141aedb4edf65aa21af29a6f61e3870022efd2d126ce768602fbb894ec7d919875dd44ccdb39a5df044
+DIST meson-0.44.0.tar.gz 1102630 BLAKE2B 8365c54ea0ebc72685f4c98966bead90b5c44d761a92e00c5d4801aa83fa6bdeb8386c12e0214ac6a7582a2603649e344c5447a989f7de07ad396e5d5646c6d4 SHA512 32312842bef6d15a73abb250972df29212ae495eb13f9ddf50f300974a42c679c51d34af560b430ef5465f8353d9f98e91a90e749590584968da766ad75ae989
diff --git a/dev-util/meson/meson-0.44.0.ebuild b/dev-util/meson/meson-0.44.0.ebuild
new file mode 100644
index 000000000000..7a5db9258bc7
--- /dev/null
+++ b/dev-util/meson/meson-0.44.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+ ${EPYTHON} run_tests.py || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ insinto /usr/share/vim/vimfiles
+ doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+ insinto /usr/share/zsh/site-functions
+ doins data/shell-completions/zsh/_meson
+}
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 51a22639ad68..f826050186e1 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/gish-demo/Manifest b/games-arcade/gish-demo/Manifest
index f32d1c97ec02..bea39469f4ca 100644
--- a/games-arcade/gish-demo/Manifest
+++ b/games-arcade/gish-demo/Manifest
@@ -1 +1 @@
-DIST gish-demo-1.6.tar.gz 12712912 SHA256 335e28ae5b9f91ebb9487e341d9bb9cf679083a0a3ed5a49daaa27f2b3e3908d SHA512 2d6f37b8a7971ada524c75bafcbe7e92fd3dbb96677774b0295aad2553e6094027f9b43da8318f20071679412f95dd66ab9738178ffec4f853cf1845d536a0a6 WHIRLPOOL d3fb001f01f52df78f39d23994cd6d57558c76c0a94944a3202285860cea5cf0d1eb4ad3f48465d5b3b85e47453a558f66d647ce153cd332d7be429ef0d0ec3e
+DIST gish-demo-1.6.tar.gz 12712912 BLAKE2B bb482ba341e688056a45077d6a6832e13e1a9785cbefbb7e76b7875e9df22f33f324a515ca3465bb3f4c4a34d1577b5eddf5ff7793d35556958b3f11d81f9f7f SHA512 2d6f37b8a7971ada524c75bafcbe7e92fd3dbb96677774b0295aad2553e6094027f9b43da8318f20071679412f95dd66ab9738178ffec4f853cf1845d536a0a6
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index a77511d84980..5b858f863f45 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/doom3-lms/Manifest b/games-fps/doom3-lms/Manifest
index 3ba87338b7cf..40cd867b905b 100644
--- a/games-fps/doom3-lms/Manifest
+++ b/games-fps/doom3-lms/Manifest
@@ -1 +1 @@
-DIST LastManStandingCoop4Multiplatform.zip 309768743 SHA256 3e88196efc60a9046b9518a249c99021aca1c6341c654129a772b1f28f04c37e SHA512 f3d6fb1beab25dafc51a59153edb4cbb173ea4cdfd924b8f9610873bc1326efc2d85d62a23c6523b4a61319718a35ed44fecdf59bc8346fb1abb159ac93e6b15 WHIRLPOOL f9a2f06ac687df06782b0bb8ec54f2042ed5fc5051a2fa4fa893b57ba221c05b5f95f99eaad9bdcc0efca71b6ec38ba7c8d9919fd0cd3c207be55f29e85d7625
+DIST LastManStandingCoop4Multiplatform.zip 309768743 BLAKE2B 3ae67e85eb267e62d1158832f215c2c6b3e9dcf2593824ad45318c151e847eb8f057e2b6336c4e5c148194d0006496164cfccd7b93d1590e7fa2ac50b97c5b1c SHA512 f3d6fb1beab25dafc51a59153edb4cbb173ea4cdfd924b8f9610873bc1326efc2d85d62a23c6523b4a61319718a35ed44fecdf59bc8346fb1abb159ac93e6b15
diff --git a/games-fps/doom3-mitm/Manifest b/games-fps/doom3-mitm/Manifest
index 6d2ac8829ec5..dec47aaeffe8 100644
--- a/games-fps/doom3-mitm/Manifest
+++ b/games-fps/doom3-mitm/Manifest
@@ -1 +1 @@
-DIST MakeItToMorning1-6.zip 184131772 SHA256 d9757e51f6d474fe992b19008d2723253f27496baea6729576e460c3c31b0e64 SHA512 5c8b58b51fb4308366db74705c6f1c5ed7a99f41992000c0ceb3b57fe1d61cb617cc03725ab213d6d7cfbad76104efebe647e50d5ad78e5b0ec480ed840118ea WHIRLPOOL 24317336168b2bc3d05582ed745858597f4248fc3261f102de8ca539641574221cd39850ef83f0ee422038ed43422801cf87c80330c1d85d35432bf23e2ebdf1
+DIST MakeItToMorning1-6.zip 184131772 BLAKE2B 03de634789cdd62293b39617e807d9137e9fef84849555cb6b87ade9bcd1f3ad2f9973cb2510716a5fe38a5bbb1b2ebfa4a38357a65ae9355af7d53785edd048 SHA512 5c8b58b51fb4308366db74705c6f1c5ed7a99f41992000c0ceb3b57fe1d61cb617cc03725ab213d6d7cfbad76104efebe647e50d5ad78e5b0ec480ed840118ea
diff --git a/games-fps/ut2004-hamsterbash/Manifest b/games-fps/ut2004-hamsterbash/Manifest
index 3f2931cfbde3..dfd60e76c9e4 100644
--- a/games-fps/ut2004-hamsterbash/Manifest
+++ b/games-fps/ut2004-hamsterbash/Manifest
@@ -1 +1 @@
-DIST HamsterBashFinal.zip 98608028 SHA256 104a2c09dd5c698877301f3f899dbb6a1b092e31b1c8112ad119824468ca8d9b SHA512 641a642ce08d5188045f9d015a92f0846ac22c65b7b047bb0096f216d7cb9d0a8074e5e11b01fc187b56fbdf2d5cbc0e5cd56c2eb3f40f744fbeadf291e08573 WHIRLPOOL a3d4e08875cd8e9d1b8a9b4301bf1ae980851414cfdfa61b1f965ca41feba170e4b7ace326c7542f38e22981bb365fd1c3c932c176c77b691509b01edcd2e797
+DIST HamsterBashFinal.zip 98608028 BLAKE2B f80aabf16768adfa511efd72d762e50fdf45e98286306dab861d1989405d32712d03631d53b3f959c033e4e9c491b3ff16825fb00f33f75bfbe697d1f22be65b SHA512 641a642ce08d5188045f9d015a92f0846ac22c65b7b047bb0096f216d7cb9d0a8074e5e11b01fc187b56fbdf2d5cbc0e5cd56c2eb3f40f744fbeadf291e08573
diff --git a/games-fps/ut2004-troopers/Manifest b/games-fps/ut2004-troopers/Manifest
index 0c3b06e14874..4058253b8fa3 100644
--- a/games-fps/ut2004-troopers/Manifest
+++ b/games-fps/ut2004-troopers/Manifest
@@ -1 +1 @@
-DIST troopersversion60zip.zip 447383148 SHA256 350156938b62c311873087fcf438b4e0ac9bc50171ba657f0f9193037d5e45d4 SHA512 2eec66a55b0733f2f5ee65e8a4deb329a50bcd47aa6fdcb7252a88c01e4e8db563b568d3176233a51711240e7b4dfebe0d8a8712d624915a872e8bfeb321cda4 WHIRLPOOL 94d306026a47f6e9170664b901af29d5be64bea3df69ce8c54c0e125828bb7eacf64f706d3d159c4a27f6b861be3cea1b2dd975b8ff52466e33ad8950bd93bd0
+DIST troopersversion60zip.zip 447383148 BLAKE2B 4eed868b0a8631529f0e09227d45db4f0a89ff7088cec2c03c263323aa9385f204561b278a9e6c408db6d972e773e2c3d3cbc7dff64ba0cd04fc603ce541d297 SHA512 2eec66a55b0733f2f5ee65e8a4deb329a50bcd47aa6fdcb7252a88c01e4e8db563b568d3176233a51711240e7b4dfebe0d8a8712d624915a872e8bfeb321cda4
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 674c47f1695a..a78f3b029406 100644
Binary files a/games-rpg/Manifest.gz and b/games-rpg/Manifest.gz differ
diff --git a/games-rpg/arx-fatalis-demo/Manifest b/games-rpg/arx-fatalis-demo/Manifest
index 3ee0d4855c5d..ed8eae152c00 100644
--- a/games-rpg/arx-fatalis-demo/Manifest
+++ b/games-rpg/arx-fatalis-demo/Manifest
@@ -1 +1 @@
-DIST arx_demo_english.zip 160545354 SHA256 9e85d4bfa081a4ccc40a1f3722b32c23cd9fa95e91f47d32be76aa62c9fd7187 SHA512 0cbf0d6da1a373ed29edc49c65ed431117c868ec7bcab04166abd59f5d799460faec506baf191c83fa7c61372888009abb260d8a50e28507a5ec8ab7913a9ad7 WHIRLPOOL 2ef662feac747fc7da44c224d46bd2bc9ab48c01c572912df3464dbef04cd47c4c3768e09f26dde27104e62e3c7c9f4ffe828ec2dac53a80467b31533bcc6731
+DIST arx_demo_english.zip 160545354 BLAKE2B 2693bdd2546c8788eb8c9fc303065f880c3995cfa1d75ca613b8ebb32238a3852dd7eeb20731f7c685521b669c47df45bcf22842772227be5cc3483ec3869c77 SHA512 0cbf0d6da1a373ed29edc49c65ed431117c868ec7bcab04166abd59f5d799460faec506baf191c83fa7c61372888009abb260d8a50e28507a5ec8ab7913a9ad7
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 5ea62cdd18d1..8e92064d3527 100644
Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ
diff --git a/games-server/etqw-ded/Manifest b/games-server/etqw-ded/Manifest
index ece718155cdc..e73506fdd1bd 100644
--- a/games-server/etqw-ded/Manifest
+++ b/games-server/etqw-ded/Manifest
@@ -1 +1 @@
-DIST ETQW-server-1.5-full.x86.run 452679053 SHA256 7dc4cf69b3355063b4f8767e23b19d8224ff9b4f556ad906056063ddfe581ac0 SHA512 8daa5f192330be09b476d9633af79085f8b45d64e99fb50f6dc2ded085171f3d310218308b813bc7fc9a56b5fb34d52d72248a1e926a0e499ce096690407b0cd WHIRLPOOL d4306d1309e51d53cc2296d5ff1c6b995bca33b1eb5b225837f52bbdef17887e55cc056bf1c16ccd4a44af2e45e55e604c3ebc34cae2b55e1af714747c9df6fa
+DIST ETQW-server-1.5-full.x86.run 452679053 BLAKE2B 01721b7a288671873a87164e438cb4bf3483f86fe282fc0a306043bb44e18bf126736e57f6ee5ec0880057b7f53119e1b2f6c9ddd625f9083a01f3e12c613bef SHA512 8daa5f192330be09b476d9633af79085f8b45d64e99fb50f6dc2ded085171f3d310218308b813bc7fc9a56b5fb34d52d72248a1e926a0e499ce096690407b0cd
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a00a229724c6..c0a297940a70 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index ae9afd1ef7c3..1e7131300e92 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,2 +1,3 @@
DIST GraphicsMagick-1.3.25.tar.xz 5387880 BLAKE2B dbde32a869bde374cd453569fbc4b7b2bf54fdb8dc07fa40e83b92b788771797f7b4a529fc8b7ae439482e4e456ac9f947c8f47ac83000bdaf4d4079f4ea5e83 SHA512 d62d6aee96d7b8444f1aa206b0c5cbbed9511612cb71d667af072ea52b68dcd11088699debc58faacbb014ad83fb8c2b3e474220f506069f7b5d22f0340f8ef8
DIST GraphicsMagick-1.3.26.tar.xz 5400564 BLAKE2B bd7c5286f4ff0abe8fafee680f9bea5e96c23d1787b5dc5b1a33580b5b8fd2dc8c5932606e0c8f2d783c377104232e8efb6be83ea10e0105c83e9d1925314e0b SHA512 b33ca0f1c858428693aee27a9089acff9e63d1110f85fa036894cfefe6274e7b2422758ea39852f94fdb4823c9c3f3c44b0d8906627503301f5928096f739f22
+DIST GraphicsMagick-1.3.27.tar.xz 5412544 BLAKE2B 130ce964f3745f4a9f3b54180529fb45afb4ecc63ecb88f626fa4dd2c6fb54675ff9b5b79527dc89d375cad5c4f1136063e612d91cc9d69b0c330c32c786fd96 SHA512 27c2fccebe1ae079040986979405f9840ad39f773e2e0399712695146ec1b0f92a53533e6052df124f5db38aacc95bbd4b2e8692e81c92dade4e169ddfcc9b8c
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.27-version.sh-fix.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.27-version.sh-fix.patch
new file mode 100644
index 000000000000..e21b8e7de7e8
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.27-version.sh-fix.patch
@@ -0,0 +1,11 @@
+--- a/version.sh
++++ b/version.sh
+@@ -27,7 +27,7 @@ PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"
+ #
+ # Formal Package release date
+ # Set to string "unreleased" if package is not a formal release.
+-PACKAGE_RELEASE_DATE="2017-12-09
++PACKAGE_RELEASE_DATE="2017-12-09"
+ #PACKAGE_RELEASE_DATE="unreleased"
+
+ #
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
new file mode 100644
index 000000000000..1c2940db9eaf
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs
+
+MY_P=${P/graphicsm/GraphicsM}
+
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/"
+LICENSE="MIT"
+SLOT="0/${PV%.*}"
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit mercurial
+ EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
+else
+ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
+ perl png postscript q16 q32 static-libs svg test threads tiff truetype
+ webp wmf X zlib"
+
+RDEPEND="dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ fpx? ( media-libs/libfpx )
+ imagemagick? ( !media-gfx/imagemagick )
+ jbig? ( media-libs/jbigkit )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/jasper:= )
+ lcms? ( media-libs/lcms:2 )
+ lzma? ( app-arch/xz-utils )
+ perl? ( dev-lang/perl )
+ png? ( media-libs/libpng:0 )
+ postscript? ( app-text/ghostscript-gpl )
+ svg? ( dev-libs/libxml2 )
+ tiff? ( media-libs/tiff:0 )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libSM
+ x11-libs/libXext
+ )
+ zlib? ( sys-libs/zlib )"
+# corefonts are required because needed arial font (bug #588398).
+DEPEND="${RDEPEND}
+ test? ( media-fonts/corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.19-flags.patch
+ "${FILESDIR}"/${PN}-1.3.19-perl.patch
+ "${FILESDIR}"/${PN}-1.3.27-version.sh-fix.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local depth=8
+ use q16 && depth=16
+ use q32 && depth=32
+
+ local openmp=disable
+ if use openmp && tc-has-openmp; then
+ openmp=enable
+ fi
+
+ econf \
+ --${openmp}-openmp \
+ --enable-largefile \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ $(use_enable debug prof) \
+ $(use_enable debug gcov) \
+ $(use_enable imagemagick magick-compat) \
+ $(use_with threads) \
+ $(use_with modules) \
+ --with-quantum-depth=${depth} \
+ --without-frozenpaths \
+ $(use_with cxx magick-plus-plus) \
+ $(use_with perl) \
+ --with-perl-options=INSTALLDIRS=vendor \
+ $(use_with bzip2 bzlib) \
+ $(use_with postscript dps) \
+ $(use_with fpx) \
+ --without-gslib \
+ $(use_with jbig) \
+ $(use_with webp) \
+ $(use_with jpeg) \
+ $(use_with jpeg2k jp2) \
+ $(use_with lcms lcms2) \
+ $(use_with lzma) \
+ $(use_with png) \
+ $(use_with tiff) \
+ $(use_with truetype ttf) \
+ $(use_with wmf) \
+ --with-fontpath="${EPREFIX}"/usr/share/fonts \
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
+ --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts \
+ $(use_with svg xml) \
+ $(use_with zlib) \
+ $(use_with X x)
+}
+
+src_compile() {
+ default
+ use perl && emake perl-build
+}
+
+src_test() {
+ unset DISPLAY # some perl tests fail when DISPLAY is set
+ default
+}
+
+src_install() {
+ default
+
+ if use perl; then
+ emake -C PerlMagick DESTDIR="${D}" install
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index bc91b0c6e276..930eb330274b 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 63298e29c040..6694cca7373b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 11 Dec 2017 12:08:31 +0000
+Mon, 11 Dec 2017 20:08:34 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 63298e29c040..6694cca7373b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 11 Dec 2017 12:08:31 +0000
+Mon, 11 Dec 2017 20:08:34 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 7b34a56d053e..8514f93782c1 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 3937569a2153..90598368a37d 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/helm-2.7.2-r2 b/metadata/md5-cache/app-admin/helm-2.7.2-r3
similarity index 99%
rename from metadata/md5-cache/app-admin/helm-2.7.2-r2
rename to metadata/md5-cache/app-admin/helm-2.7.2-r3
index 727787f40941..573453cf57c9 100644
--- a/metadata/md5-cache/app-admin/helm-2.7.2-r2
+++ b/metadata/md5-cache/app-admin/helm-2.7.2-r3
@@ -9,4 +9,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/kubernetes/helm/archive/v2.7.2.tar.gz -> helm-2.7.2.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/aokoli/goutils/archive/9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz -> github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/chai2010/gettext-go/archive/bf70f2a70fb1b1f36d90d671a72795984eab0fcb.tar.gz -> github.com-chai2010-gettext-go-bf70f2a70fb1b1f36d90d671a72795984eab0fcb.tar.gz https://github.com/cpuguy83/go-md2man/archive/71acacd42f85e5e82f70a55327789582a5200a90.tar.gz -> github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz -> github.com-docker-docker-4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/evanphx/json-patch/archive/944e07253867aacae43c04b2e6a239005443f33a.tar.gz -> github.com-evanphx-json-patch-944e07253867aacae43c04b2e6a239005443f33a.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/camelcase/archive/f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz -> github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gobwas/glob/archive/bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz -> github.com-gobwas-glob-bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gosuri/uitable/archive/36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz -> github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/huandu/xstrings/archive/3959339b333561bf62a38b424fd41517c2c90f40.tar.gz -> github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/Masterminds/semver/archive/517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz -> github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz https://github.com/Masterminds/sprig/archive/efda631a76d70875162cdc25ffa0d0164bf69758.tar.gz -> github.com-Masterminds-sprig-efda631a76d70875162cdc25ffa0d0164bf69758.tar.gz https://github.com/Masterminds/vcs/archive/3084677c2c188840777bff30054f2b553729d329.tar.gz -> github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz https://github.com/mattn/go-runewidth/archive/d6bea18f789704b5f83375793155289da36a3c7f.tar.gz -> github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/naoina/go-stringutil/archive/6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz -> github.com-naoina-go-stringutil-6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/opencontainers/image-spec/archive/372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz -> github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/russross/blackfriday/archive/300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz -> github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz https://github.com/satori/go.uuid/archive/879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz -> github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz -> github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz https://github.com/spf13/cobra/archive/f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz -> github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/technosophos/moniker/archive/ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz -> github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz https://github.com/ugorji/go/archive/ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz -> github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz https://github.com/golang/crypto/archive/81e90905daefcd6fd217b62423c0908922eadb30.tar.gz -> github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/43eea11bc92608addb41b8a406b0407495c106f6.tar.gz -> github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz -> github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz -> github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/cadaf100c0a3dd6b254f320d6d651df079ec8e0a.tar.gz -> github.com-kubernetes-api-cadaf100c0a3dd6b254f320d6d651df079ec8e0a.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz -> github.com-kubernetes-apiextensions-apiserver-a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz https://github.com/kubernetes/apimachinery/archive/3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz -> github.com-kubernetes-apimachinery-3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz https://github.com/kubernetes/apiserver/archive/c1e53d745d0fe45bf7d5d44697e6eface25fceca.tar.gz -> github.com-kubernetes-apiserver-c1e53d745d0fe45bf7d5d44697e6eface25fceca.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz https://github.com/kubernetes/kubernetes/archive/0b9efaeb34a2fc51ff8e4d34ad9bc6375459c4a4.tar.gz -> github.com-kubernetes-kubernetes-0b9efaeb34a2fc51ff8e4d34ad9bc6375459c4a4.tar.gz https://github.com/kubernetes/metrics/archive/8efbc8e22d00b9c600afec5f1c14073fd2412fce.tar.gz -> github.com-kubernetes-metrics-8efbc8e22d00b9c600afec5f1c14073fd2412fce.tar.gz https://github.com/kubernetes/utils/archive/9fdc871a36f37980dd85f96d576b20d564cc0784.tar.gz -> github.com-kubernetes-utils-9fdc871a36f37980dd85f96d576b20d564cc0784.tar.gz https://github.com/fvbommel/util/archive/db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz -> github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 golang-base 51a1f13e065f1cff4507685d9cc268c7 golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=dc8e5bc896d955e574c3b097ae0bd9d3
+_md5_=7e9f02b15564d2f47df204ed71a795d5
diff --git a/metadata/md5-cache/app-admin/kube-bench-0.0.6 b/metadata/md5-cache/app-admin/kube-bench-0.0.6
new file mode 100644
index 000000000000..851fb7ef927e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/kube-bench-0.0.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Bench for Security runs the CIS Kubernetes Benchmark
+EAPI=6
+HOMEPAGE=https://github.com/aquasecurity/kube-bench
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.6.tar.gz -> kube-bench-0.0.6.tar.gz https://github.com/fatih/color/archive/5df930a27be2502f99b292b7cc09ebad4d0891f4.tar.gz -> github.com-fatih-color-5df930a27be2502f99b292b7cc09ebad4d0891f4.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/jinzhu/gorm/archive/0a51f6cdc55d1650d9ed3b4c13026cfa9133b01e.tar.gz -> github.com-jinzhu-gorm-0a51f6cdc55d1650d9ed3b4c13026cfa9133b01e.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/spf13/cobra/archive/ccaecb155a2177302cb56cae929251a256d0f646.tar.gz -> github.com-spf13-cobra-ccaecb155a2177302cb56cae929251a256d0f646.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/4e9e0ee19b60b13eb79915933f44d8ed5f268bdd.tar.gz -> github.com-pelletier-go-toml-4e9e0ee19b60b13eb79915933f44d8ed5f268bdd.tar.gz https://github.com/spf13/afero/archive/8d919cbe7e2627e417f3e45c3c0e489a5b7e2536.tar.gz -> github.com-spf13-afero-8d919cbe7e2627e417f3e45c3c0e489a5b7e2536.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/viper/archive/1a0c4a370c3e8286b835467d2dfcdaf636c3538b.tar.gz -> github.com-spf13-viper-1a0c4a370c3e8286b835467d2dfcdaf636c3538b.tar.gz https://github.com/golang/sys/archive/b8f5ef32195cae6470b728e8ca677f0dbed1a004.tar.gz -> github.com-golang-sys-b8f5ef32195cae6470b728e8ca677f0dbed1a004.tar.gz https://github.com/golang/text/archive/3b24cac7bc3a458991ab409aa2a339ac9e0d60d6.tar.gz -> github.com-golang-text-3b24cac7bc3a458991ab409aa2a339ac9e0d60d6.tar.gz https://github.com/go-yaml/yaml/archive/287cf08546ab5e7e37d55a84f7ed3fd1db036de5.tar.gz -> github.com-go-yaml-yaml-287cf08546ab5e7e37d55a84f7ed3fd1db036de5.tar.gz
+_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 golang-base 51a1f13e065f1cff4507685d9cc268c7 golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=90a1384960efe0f8b7eb503a244e8ca0
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index c613be749137..d3ed97a6bcc5 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/lrzip-0.631 b/metadata/md5-cache/app-arch/lrzip-0.631
index de4e2af478b1..95ca59f13886 100644
--- a/metadata/md5-cache/app-arch/lrzip-0.631
+++ b/metadata/md5-cache/app-arch/lrzip-0.631
@@ -4,10 +4,10 @@ DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
EAPI=6
HOMEPAGE=https://github.com/ckolivas/lrzip
IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib
SLOT=0
SRC_URI=http://ck.kolivas.org/apps/lrzip/lrzip-0.631.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=08d524289742bfc6e67803cc09a1b5a4
+_md5_=00eb59665fa4753c5964cf49f865db8a
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 85ecf6cb7967..38be7cac6a89 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.4-r1 b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.4-r1
index 6a43696c433a..8d6a719848ae 100644
--- a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.4-r1
+++ b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.4-r1
@@ -10,4 +10,4 @@ RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:
SLOT=0
SRC_URI=mirror://sourceforge/tpm-emulator/tpm_emulator-0.7.4.tar.gz
_eclasses_=cmake-utils 77a5a8d3308359caadcdd91688f20093 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 user 8bc2845510e2109af75e3eeac607ec81 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=88a4871dee20d0da5f561d9b817dc9c1
+_md5_=396d5e96e98f54026c7c10fd459644e1
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 9ce599640596..69df3c4ddd60 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.18.0_rc2 b/metadata/md5-cache/app-emulation/docker-compose-1.18.0_rc2
new file mode 100644
index 000000000000..1932e42569f8
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.18.0_rc2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/docker-py-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/PySocks-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/PySocks-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( =dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Multi-container orchestration for Docker
+EAPI=6
+HOMEPAGE=https://www.docker.com/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+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(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/docker-py-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/PySocks-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/PySocks-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( =dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/d/docker-compose/docker-compose-1.18.0rc2.tar.gz -> docker-compose-1.18.0_rc2.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 vcs-snapshot 03289f51c769cf409d200d2d628cdd6e xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0372012f58b7e366f00ee87211e658c0
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index e7739b844906..b607fb30bfd1 100644
Binary files a/metadata/md5-cache/app-eselect/Manifest.gz and b/metadata/md5-cache/app-eselect/Manifest.gz differ
diff --git a/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r3 b/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r3
deleted file mode 100644
index d0cfa7fbf41e..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=virtual/pkgconfig
-DESCRIPTION=PHP eselect module
-EAPI=6
-HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-php.git/
-IUSE=fpm apache2
-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=GPL-2
-RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] ) fpm? ( sys-apps/gentoo-functions )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mjo/distfiles/eselect-php-0.9.4.tar.xz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=15e0d439147e990574ebd595952b7274
diff --git a/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r2 b/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r5
similarity index 82%
rename from metadata/md5-cache/app-eselect/eselect-php-0.9.4-r2
rename to metadata/md5-cache/app-eselect/eselect-php-0.9.4-r5
index f3242db74c33..982632c192f6 100644
--- a/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r2
+++ b/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r5
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install postinst
+DEFINED_PHASES=configure install
DEPEND=virtual/pkgconfig
DESCRIPTION=PHP eselect module
EAPI=6
@@ -6,8 +6,8 @@ HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-php.git/
IUSE=fpm apache2
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=GPL-2
-RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] ) fpm? ( sys-apps/gentoo-functions )
+RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] )
SLOT=0
SRC_URI=https://dev.gentoo.org/~mjo/distfiles/eselect-php-0.9.4.tar.xz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=ae2e6fdf658aa288ce36453f78fd2026
+_md5_=d1dde0d1289c0d975422e8e882dedffc
diff --git a/metadata/md5-cache/app-eselect/eselect-php-9999 b/metadata/md5-cache/app-eselect/eselect-php-9999
index d4bb46a15d94..45c492a80340 100644
--- a/metadata/md5-cache/app-eselect/eselect-php-9999
+++ b/metadata/md5-cache/app-eselect/eselect-php-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=configure install postinst prepare unpack
+DEFINED_PHASES=configure install prepare unpack
DEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1 >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=PHP eselect module
EAPI=6
HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-php.git/
IUSE=fpm apache2
LICENSE=GPL-2
-RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] ) fpm? ( sys-apps/gentoo-functions )
+RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] )
SLOT=0
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 git-r3 fec09a83ae965b041b47f5ff7c8ba29a libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=f8daceb8923ba4ee8103c815d2e52f2f
+_md5_=2238dafe35ba53ce800990c336004b2d
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 9e416e313b22..65d418d0443a 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-5.4.2.2-r1 b/metadata/md5-cache/app-office/libreoffice-bin-5.4.2.2-r1
new file mode 100644
index 000000000000..153447872f2a
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-5.4.2.2-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/xdelta:3 >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) kde? ( 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 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite. Binary package
+EAPI=6
+HOMEPAGE=http://www.libreoffice.org
+IUSE=gnome java kde kde elibc_FreeBSD java python_targets_python3_5
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-3
+PDEPEND==app-office/libreoffice-l10n-5.4.2.2*
+RDEPEND=app-text/hunspell:0/1.6 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.63.0 dev-libs/icu:0/58.2 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-6.4.0 >=sys-libs/glibc-2.25 virtual/jpeg:62 kde? ( >=kde-frameworks/kdelibs-4.14.37:4 >=dev-qt/qtcore-4.8.7-r3:4 >=dev-qt/qtgui-4.8.7:4 ) python_targets_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.0d:0 >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl net-print/cups dev-libs/dbus-glib gnome? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) gnome? ( gnome-base/dconf ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 gnome? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) !app-office/libreoffice !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( 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 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) python_targets_python3_5
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-5.4.2.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-5.4.2.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-5.4.2.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-5.4.2.2-r1.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-5.4.2.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-5.4.2.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-5.4.2.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-5.4.2.2-r1.xd3 ) ) ) )
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 gnome2-utils 4d211d7614f303710fca59db6ec12c88 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd kde4-base 18e8aba8f8143fa51dc0f48b9d19712e kde4-functions 5d5c723ca3cbd3a92b826a68c3729969 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee prefix e51c7882b7b721e54e684f7eb143cbfe python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7c818d63867eb51e2f42973c54e17bc0
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.2.2-r1 b/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.2.2-r1
new file mode 100644
index 000000000000..498ef99c23a1
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.2.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=dev-util/xdelta:3
+DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
+EAPI=6
+HOMEPAGE=http://www.libreoffice.org
+IUSE=gnome java kde
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND==app-office/libreoffice-bin-5.4.2.2-r1[gnome=,java=,kde=]
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-5.4.2.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-java-5.4.2.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-java-5.4.2.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-java-5.4.2.2-r1.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-5.4.2.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-java-5.4.2.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-java-5.4.2.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-java-5.4.2.2-r1.xd3 ) ) ) )
+_md5_=8fc6cd4bc4edb93c351bbfc6e7e5d831
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index a40bbafd415b..08884fe8f1c2 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/crystal-0.23.1 b/metadata/md5-cache/dev-lang/crystal-0.23.1
index 58cb2e267214..4ab17eb2333e 100644
--- a/metadata/md5-cache/dev-lang/crystal-0.23.1
+++ b/metadata/md5-cache/dev-lang/crystal-0.23.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
LICENSE=Apache-2.0
RDEPEND=>=sys-devel/llvm-3.9.0:* dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0 xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml )
SLOT=0
-SRC_URI=https://github.com/crystal-lang/crystal/archive/0.23.1.tar.gz -> crystal-0.23.1.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.23.1/crystal-0.23.0-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.23.1/crystal-0.23.0-1-linux-i686.tar.gz )
+SRC_URI=https://github.com/crystal-lang/crystal/archive/0.23.1.tar.gz -> crystal-0.23.1.tar.gz https://dev.gentoo.org/~mgorny/dist/crystal-0.23.1-patchset.tar.bz2 amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.23.1/crystal-0.23.0-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.23.1/crystal-0.23.0-1-linux-i686.tar.gz )
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=b867b32871772a2575dc5c2289c66c7d
+_md5_=3ffd155757c3909e5a620479359c688b
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index aa68b06fa980..7c3557c64ac2 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/nettle-3.4 b/metadata/md5-cache/dev-libs/nettle-3.4
new file mode 100644
index 000000000000..78909d463ea9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nettle-3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=gmp? ( >=dev-libs/gmp-5.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(-)?] ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Low-level cryptographic library
+EAPI=6
+HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
+IUSE=doc +gmp neon static-libs test cpu_flags_x86_aes 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 ~x64-cygwin ~amd64-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
+LICENSE=|| ( LGPL-3 LGPL-2.1 )
+RDEPEND=gmp? ( >=dev-libs/gmp-5.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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r17 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+SLOT=0/6.2
+SRC_URI=https://www.lysator.liu.se/~nisse/archive/nettle-3.4.tar.gz
+_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 libtool 0081a71a261724730ec4c248494f044d multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=c4fab3b90c009632d55754742a7b714a
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 96529c6dae17..0e8049cc4fd3 100644
Binary files a/metadata/md5-cache/dev-lisp/Manifest.gz and b/metadata/md5-cache/dev-lisp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lisp/clisp-2.49.60 b/metadata/md5-cache/dev-lisp/clisp-2.49.60
new file mode 100644
index 000000000000..a02774664fdb
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/clisp-2.49.60
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.10 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) pari? ( =dev-db/postgresql-8.0:* ) readline? ( >=sys-libs/readline-7.0:0= ) pcre? ( dev-libs/libpcre:3 ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 ) X? ( x11-misc/imake x11-proto/xextproto )
+DESCRIPTION=A portable, bytecode-compiled implementation of Common Lisp
+EAPI=6
+HOMEPAGE=http://clisp.sourceforge.net/
+IUSE=hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.10 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) pari? ( =dev-db/postgresql-8.0:* ) readline? ( >=sys-libs/readline-7.0:0= ) pcre? ( dev-libs/libpcre:3 ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 )
+SLOT=2/7
+SRC_URI=https://haible.de/bruno/gnu/clisp-2.49.60.tar.bz2
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=3948356d266e37a5cb26dd2fac7e466e
diff --git a/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0 b/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
index 21c5724b17bd..2f1b997a5a08 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Storable test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DEPEND=dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Storable test? ( dev-perl/Test-RequiresInternet virtual/perl-Test-Simple ) dev-lang/perl:=
DESCRIPTION=Cache the result of http get-requests persistently
EAPI=6
HOMEPAGE=http://search.cpan.org/dist/HTTP-Cache-Transparent/
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Storable dev-l
SLOT=0
SRC_URI=mirror://cpan/authors/id/M/MA/MATTIASH/HTTP-Cache-Transparent-1.4.tar.gz
_eclasses_=multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
-_md5_=df6454e1ae3ea0903b4539dfdecfad54
+_md5_=aefcf76a3de59b45005a6554452a9842
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 4ab6909a2f4f..ccee40f7ec19 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Net-Pcap-0.180.0 b/metadata/md5-cache/dev-perl/Net-Pcap-0.180.0
new file mode 100644
index 000000000000..74713646b2a4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Pcap-0.180.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-libs/libpcap dev-perl/IO-Interface dev-lang/perl:=
+DESCRIPTION=Interface to the pcap(3) LBL packet capture library
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Net-Pcap/
+IUSE=examples
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=net-libs/libpcap dev-perl/IO-Interface dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SAPER/Net-Pcap-0.18.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=28bc1daa12be7ea62091a2907281bbf7
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0 b/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0
new file mode 100644
index 000000000000..74b3e79b9960
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=virtual/perl-libnet dev-perl/IO-Socket-SSL virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl:=
+DESCRIPTION=(Deprecated) SSL support for Net::SMTP
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Net-SMTP-SSL/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-libnet dev-perl/IO-Socket-SSL dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.04.tar.gz
+_eclasses_=multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
+_md5_=d4e21d07018c3b5dcf53ce73e0e9b399
diff --git a/metadata/md5-cache/dev-perl/Net-SMTPS-0.90.0 b/metadata/md5-cache/dev-perl/Net-SMTPS-0.90.0
new file mode 100644
index 000000000000..a9c2d5e1e01d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SMTPS-0.90.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Authen-SASL-2.150.0 >=dev-perl/IO-Socket-SSL-1 >=virtual/perl-libnet-2 virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=SSL/STARTTLS support for Net::SMTP
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Net-SMTPS/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Authen-SASL-2.150.0 >=dev-perl/IO-Socket-SSL-1 >=virtual/perl-libnet-2 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TOMO/src/Net-SMTPS-0.09.tar.gz
+_eclasses_=multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
+_md5_=cf24ccbd070a5ab11e95c951a7000a65
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-Any-0.100.0 b/metadata/md5-cache/dev-perl/Net-SSH-Any-0.100.0
new file mode 100644
index 000000000000..e933f7221d5a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SSH-Any-0.100.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-1.302.26 ) dev-lang/perl:=
+DESCRIPTION=Use any SSH module
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Net-SSH-Any/
+IUSE=test examples
+KEYWORDS=~amd64 ~hppa ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Net-SSH-Any-0.10.tar.gz
+_eclasses_=multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
+_md5_=02d23d91df913fb4d909cd7df7bfb1be
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0 b/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0
new file mode 100644
index 000000000000..95544a227d84
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec >=dev-perl/Log-Log4perl-1.0.0 virtual/perl-Text-ParseWords virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Temp virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Read and modify ssh's authorized_keys files
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Net-SSH-AuthorizedKeysFile/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec >=dev-perl/Log-Log4perl-1.0.0 virtual/perl-Text-ParseWords dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MS/MSCHILLI/Net-SSH-AuthorizedKeysFile-0.18.tar.gz
+_eclasses_=multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
+_md5_=51124ebe7f341ab0e650430aa5301f79
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-Perl-2.140.0 b/metadata/md5-cache/dev-perl/Net-SSH-Perl-2.140.0
new file mode 100644
index 000000000000..aa76a0cd1656
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SSH-Perl-2.140.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Crypt-Curve25519-0.50.0 dev-perl/Crypt-IDEA >=dev-perl/CryptX-0.32.0 virtual/perl-Digest-MD5 dev-perl/File-HomeDir virtual/perl-File-Spec virtual/perl-IO >=dev-perl/Math-GMP-1.40.0 virtual/perl-Scalar-List-Utils >=dev-perl/String-CRC32-1.200.0 !minimal? ( dev-perl/Digest-BubbleBabble dev-perl/Crypt-RSA dev-perl/TermReadKey ) virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.610.0 ) dev-lang/perl:=
+DESCRIPTION=Perl client Interface to SSH
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Net-SSH-Perl/
+IUSE=minimal test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Crypt-Curve25519-0.50.0 dev-perl/Crypt-IDEA >=dev-perl/CryptX-0.32.0 virtual/perl-Digest-MD5 dev-perl/File-HomeDir virtual/perl-File-Spec virtual/perl-IO >=dev-perl/Math-GMP-1.40.0 virtual/perl-Scalar-List-Utils >=dev-perl/String-CRC32-1.200.0 !minimal? ( dev-perl/Digest-BubbleBabble dev-perl/Crypt-RSA dev-perl/TermReadKey ) dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SC/SCHWIGON/Net-SSH-Perl-2.14.tar.gz
+_eclasses_=multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
+_md5_=f7f128e8f86cfbed66ac8261a9306ee5
diff --git a/metadata/md5-cache/dev-perl/Net-SSH2-0.670.0 b/metadata/md5-cache/dev-perl/Net-SSH2-0.670.0
new file mode 100644
index 000000000000..af7392d28089
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SSH2-0.670.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib net-libs/libssh2 !gcrypt? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) gcrypt? ( dev-libs/libgcrypt:0 ) virtual/perl-ExtUtils-Constant >=virtual/perl-ExtUtils-MakeMaker-6.50 dev-lang/perl:=
+DESCRIPTION=Support for the SSH 2 protocol via libssh2
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Net-SSH2/
+IUSE=gcrypt libressl examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=sys-libs/zlib net-libs/libssh2 !gcrypt? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) gcrypt? ( dev-libs/libgcrypt:0 ) dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Net-SSH2-0.67.tar.gz
+_eclasses_=multiprocessing 6f5991c7101863d0b29df63990ad852e perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
+_md5_=7bd205e416c912613efc3d16afd640c3
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c5fe762de6a5..a1dd5d56e05e 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.73.2 b/metadata/md5-cache/dev-util/jenkins-bin-2.89.1
similarity index 84%
rename from metadata/md5-cache/dev-util/jenkins-bin-2.73.2
rename to metadata/md5-cache/dev-util/jenkins-bin-2.89.1
index d7e31cbb59cd..c08bf35e4e88 100644
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.73.2
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.89.1
@@ -8,6 +8,6 @@ LICENSE=MIT
RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
RESTRICT=mirror
SLOT=lts
-SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.73.2/jenkins.war -> jenkins-bin-2.73.2.war
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.89.1/jenkins.war -> jenkins-bin-2.89.1.war
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 185a06792159ca143528e7010368e8af user 8bc2845510e2109af75e3eeac607ec81
_md5_=1985c920b4162d4f6ce97d4b66581d14
diff --git a/metadata/md5-cache/dev-util/meson-0.44.0 b/metadata/md5-cache/dev-util/meson-0.44.0
new file mode 100644
index 000000000000..6e05d3a6fd48
--- /dev/null
+++ b/metadata/md5-cache/dev-util/meson-0.44.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)] 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 build system
+EAPI=6
+HOMEPAGE=http://mesonbuild.com/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/m/meson/meson-0.44.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_=5bf6db3f9ba18bc5fae6fe98cb097f4e
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index c34ed6683292..22d565861a56 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.27 b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.27
new file mode 100644
index 000000000000..bf95b35d0ceb
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.27
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0 ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib ) test? ( media-fonts/corefonts ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=http://www.graphicsmagick.org/
+IUSE=bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp perl png postscript q16 q32 static-libs svg test threads tiff truetype webp wmf X zlib
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=MIT
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0 ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
+SLOT=0/1.3
+SRC_URI=mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.27.tar.xz
+_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=45b256344be94f56eedb39bcbe441113
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 417cc4d61718..6e275c46e680 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.0.8 b/metadata/md5-cache/net-dns/pdns-recursor-4.0.8
new file mode 100644
index 000000000000..a8a6b66b21de
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.0.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst setup
+DEPEND=lua? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= virtual/pkgconfig
+DESCRIPTION=The PowerDNS Recursor
+EAPI=6
+HOMEPAGE=https://www.powerdns.com/
+IUSE=libressl lua luajit protobuf systemd
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=lua? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= !=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=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
-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.20.1 )
-SLOT=0
-SRC_URI=https://openafs.org/dl/openafs/1.6.20.1/openafs-1.6.20.1-src.tar.bz2 https://openafs.org/dl/openafs/1.6.20.1/openafs-1.6.20.1-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170212.tar.xz
-_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0727da34a41e2d1cdd17dbe040a18026
diff --git a/metadata/md5-cache/net-fs/openafs-1.6.20.2-r1 b/metadata/md5-cache/net-fs/openafs-1.6.20.2-r1
deleted file mode 100644
index 4ee9c13fa64e..000000000000
--- a/metadata/md5-cache/net-fs/openafs-1.6.20.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare
-DEPEND=virtual/libintl fuse? ( sys-fs/fuse ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) pam? ( virtual/pam ) virtual/yacc doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) >=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=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
-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.20.2 )
-SLOT=0
-SRC_URI=https://openafs.org/dl/openafs/1.6.20.2/openafs-1.6.20.2-src.tar.bz2 https://openafs.org/dl/openafs/1.6.20.2/openafs-1.6.20.2-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170822.tar.xz
-_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9fbc4d0b2a9dfd236551ed32bea9aa2c
diff --git a/metadata/md5-cache/net-fs/openafs-1.6.21.1 b/metadata/md5-cache/net-fs/openafs-1.6.21.1
deleted file mode 100644
index fb594d5cbaca..000000000000
--- a/metadata/md5-cache/net-fs/openafs-1.6.21.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare
-DEPEND=virtual/libintl fuse? ( sys-fs/fuse ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) pam? ( virtual/pam ) virtual/yacc doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) >=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=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
-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.1 )
-SLOT=0
-SRC_URI=https://openafs.org/dl/openafs/1.6.21.1/openafs-1.6.21.1-src.tar.bz2 https://openafs.org/dl/openafs/1.6.21.1/openafs-1.6.21.1-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170822.tar.xz
-_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9fbc4d0b2a9dfd236551ed32bea9aa2c
diff --git a/metadata/md5-cache/net-fs/openafs-1.6.21-r1 b/metadata/md5-cache/net-fs/openafs-1.6.22
similarity index 90%
rename from metadata/md5-cache/net-fs/openafs-1.6.21-r1
rename to metadata/md5-cache/net-fs/openafs-1.6.22
index f3102ec81360..a8f2772cf32b 100644
--- a/metadata/md5-cache/net-fs/openafs-1.6.21-r1
+++ b/metadata/md5-cache/net-fs/openafs-1.6.22
@@ -6,8 +6,8 @@ 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
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 )
+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.22 )
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
+SRC_URI=https://openafs.org/dl/openafs/1.6.22/openafs-1.6.22-src.tar.bz2 https://openafs.org/dl/openafs/1.6.22/openafs-1.6.22-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170822.tar.xz
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=6aff462e1ef2f7334be2946704f4a8b2
diff --git a/metadata/md5-cache/net-fs/openafs-kernel-1.6.20.1 b/metadata/md5-cache/net-fs/openafs-kernel-1.6.20.1
deleted file mode 100644
index dce274f1cf99..000000000000
--- a/metadata/md5-cache/net-fs/openafs-kernel-1.6.20.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=>=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 )
-DESCRIPTION=The OpenAFS distributed file system kernel module
-EAPI=6
-HOMEPAGE=https://www.openafs.org/
-IUSE=debug kernel_linux
-KEYWORDS=amd64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=IBM BSD openafs-krb5-a APSL-2
-RDEPEND=kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://openafs.org/dl/openafs/1.6.20.1/openafs-1.6.20.1-src.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170212.tar.xz
-_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1be61b010b1c2b8e363e984785977bd2
diff --git a/metadata/md5-cache/net-fs/openafs-kernel-1.6.20.2-r1 b/metadata/md5-cache/net-fs/openafs-kernel-1.6.20.2-r1
deleted file mode 100644
index fc554ad6ac4b..000000000000
--- a/metadata/md5-cache/net-fs/openafs-kernel-1.6.20.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=>=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 )
-DESCRIPTION=The OpenAFS distributed file system kernel module
-EAPI=6
-HOMEPAGE=https://www.openafs.org/
-IUSE=debug kernel_linux
-KEYWORDS=~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=IBM BSD openafs-krb5-a APSL-2
-RDEPEND=kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://openafs.org/dl/openafs/1.6.20.2/openafs-1.6.20.2-src.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170822.tar.xz
-_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=222553e32982009194f2aff935ff2a6e
diff --git a/metadata/md5-cache/net-fs/openafs-kernel-1.6.21.1 b/metadata/md5-cache/net-fs/openafs-kernel-1.6.21.1
deleted file mode 100644
index 693b22218d69..000000000000
--- a/metadata/md5-cache/net-fs/openafs-kernel-1.6.21.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=>=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 )
-DESCRIPTION=The OpenAFS distributed file system kernel module
-EAPI=6
-HOMEPAGE=https://www.openafs.org/
-IUSE=debug kernel_linux
-KEYWORDS=~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=IBM BSD openafs-krb5-a APSL-2
-RDEPEND=kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://openafs.org/dl/openafs/1.6.21.1/openafs-1.6.21.1-src.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170822.tar.xz
-_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=99741e660f3c0ad99f1023eaf8b62577
diff --git a/metadata/md5-cache/net-fs/openafs-kernel-1.6.21-r1 b/metadata/md5-cache/net-fs/openafs-kernel-1.6.22
similarity index 92%
rename from metadata/md5-cache/net-fs/openafs-kernel-1.6.21-r1
rename to metadata/md5-cache/net-fs/openafs-kernel-1.6.22
index f2541963a117..92e8a59f237e 100644
--- a/metadata/md5-cache/net-fs/openafs-kernel-1.6.21-r1
+++ b/metadata/md5-cache/net-fs/openafs-kernel-1.6.22
@@ -8,6 +8,6 @@ KEYWORDS=amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=IBM BSD openafs-krb5-a APSL-2
RDEPEND=kernel_linux? ( virtual/modutils )
SLOT=0
-SRC_URI=https://openafs.org/dl/openafs/1.6.21/openafs-1.6.21-src.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170822.tar.xz
+SRC_URI=https://openafs.org/dl/openafs/1.6.22/openafs-1.6.22-src.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170822.tar.xz
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=520f987d61a2e921a9a9b4095fcf045e
+_md5_=f5f90f1a2422c310cec3493a6b379598
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 878fdd7c3a20..c51516a8dcda 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.3.5 b/metadata/md5-cache/sci-mathematics/pari-2.3.5
index 3a833c5a4edb..c8320fdb0176 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.3.5
+++ b/metadata/md5-cache/sci-mathematics/pari-2.3.5
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
LICENSE=GPL-2
RDEPEND=sys-libs/readline fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp ) X? ( x11-libs/libX11 ) doc? ( X? ( x11-misc/xdg-utils ) )
SLOT=0
-SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.3.5.tar.gz data? ( http://pari.math.u-bordeaux.fr/pub/pari/packages/elldata.tgz http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz http://pari.math.u-bordeaux.fr/pub/pari/packages/seadata.tgz http://pari.math.u-bordeaux.fr/pub/pari/packages/nftables.tgz )
+SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.3.5.tar.gz https://dev.gentoo.org/~mgorny/dist/pari-2.3.5-patchset.tar.bz2 data? ( http://pari.math.u-bordeaux.fr/pub/pari/packages/elldata.tgz http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz http://pari.math.u-bordeaux.fr/pub/pari/packages/seadata.tgz http://pari.math.u-bordeaux.fr/pub/pari/packages/nftables.tgz )
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=f25c5e6564b71e15863893da9cdc6fc6
+_md5_=20ff11dea800ae16609f4abc88a9d7d7
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.5.0-r3 b/metadata/md5-cache/sci-mathematics/pari-2.5.0-r3
deleted file mode 100644
index 5d061d10f92e..000000000000
--- a/metadata/md5-cache/sci-mathematics/pari-2.5.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/readline fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp ) X? ( x11-libs/libX11 ) doc? ( X? ( x11-misc/xdg-utils ) ) data? ( sci-mathematics/pari-data ) doc? ( virtual/latex-base )
-DESCRIPTION=A software package for computer-aided number theory
-EAPI=4
-HOMEPAGE=http://pari.math.u-bordeaux.fr/
-IUSE=doc data fltk gmp X
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp ) X? ( x11-libs/libX11 ) doc? ( X? ( x11-misc/xdg-utils ) ) data? ( sci-mathematics/pari-data )
-SLOT=0
-SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.5.0.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=96e071ad5a3fb143fc4c8d01dd046351
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.5.1 b/metadata/md5-cache/sci-mathematics/pari-2.5.1
deleted file mode 100644
index 5db2d1b95622..000000000000
--- a/metadata/md5-cache/sci-mathematics/pari-2.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/readline fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp ) X? ( x11-libs/libX11 ) doc? ( X? ( x11-misc/xdg-utils ) ) data? ( sci-mathematics/pari-data ) doc? ( virtual/latex-base )
-DESCRIPTION=A software package for computer-aided number theory
-EAPI=4
-HOMEPAGE=http://pari.math.u-bordeaux.fr/
-IUSE=doc data fltk gmp X
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp ) X? ( x11-libs/libX11 ) doc? ( X? ( x11-misc/xdg-utils ) ) data? ( sci-mathematics/pari-data )
-SLOT=0
-SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.5.1.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=1bd081daec612d8995963d9031578b3c
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.5.1-r1 b/metadata/md5-cache/sci-mathematics/pari-2.5.1-r1
deleted file mode 100644
index 2bc03225bd0c..000000000000
--- a/metadata/md5-cache/sci-mathematics/pari-2.5.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/readline data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp ) qt4? ( dev-qt/qtgui:4 ) X? ( x11-libs/libX11 ) doc? ( virtual/latex-base )
-DESCRIPTION=A software package for computer-aided number theory
-EAPI=4
-HOMEPAGE=http://pari.math.u-bordeaux.fr/
-IUSE=data doc fltk gmp qt4 X
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp ) qt4? ( dev-qt/qtgui:4 ) X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.5.1.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=1c3f75983b1d70c1ababee5a7bf9a9ce
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.5.2 b/metadata/md5-cache/sci-mathematics/pari-2.5.2
deleted file mode 100644
index 00744e2ee06c..000000000000
--- a/metadata/md5-cache/sci-mathematics/pari-2.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/readline data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp ) qt4? ( dev-qt/qtgui:4 ) X? ( x11-libs/libX11 ) doc? ( virtual/latex-base )
-DESCRIPTION=A software package for computer-aided number theory
-EAPI=4
-HOMEPAGE=http://pari.math.u-bordeaux.fr/
-IUSE=data doc fltk gmp qt4 X
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp ) qt4? ( dev-qt/qtgui:4 ) X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.5.2.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=a5c0aca42b8659f26fac4cc2253cf15c
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.5.3 b/metadata/md5-cache/sci-mathematics/pari-2.5.3
deleted file mode 100644
index 87c0f7a27878..000000000000
--- a/metadata/md5-cache/sci-mathematics/pari-2.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/readline data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp ) qt4? ( dev-qt/qtgui:4 ) X? ( x11-libs/libX11 ) doc? ( virtual/latex-base )
-DESCRIPTION=A software package for computer-aided number theory
-EAPI=4
-HOMEPAGE=http://pari.math.u-bordeaux.fr/
-IUSE=data doc fltk gmp qt4 X
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp ) qt4? ( dev-qt/qtgui:4 ) X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.5.3.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=eacae868a4d725bfc02743b6ca9410bf
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.5.4 b/metadata/md5-cache/sci-mathematics/pari-2.5.4
index 70874f742d6e..847985a8d00a 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.5.4
+++ b/metadata/md5-cache/sci-mathematics/pari-2.5.4
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbs
LICENSE=GPL-2
RDEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp:0= ) qt4? ( dev-qt/qtgui:4 ) X? ( x11-libs/libX11 )
SLOT=0
-SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.5.4.tar.gz
+SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.5.4.tar.gz https://dev.gentoo.org/~mgorny/dist/pari-2.5.4-patchset.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=013717c9f5fcc9287aec231a751152f2
+_md5_=0620a83563c861fcc0da737b8e1d34c2
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.7.0 b/metadata/md5-cache/sci-mathematics/pari-2.7.0
deleted file mode 100644
index daa63982cbdc..000000000000
--- a/metadata/md5-cache/sci-mathematics/pari-2.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) qt4? ( dev-qt/qtgui:4= ) X? ( x11-libs/libX11:0= ) doc? ( virtual/latex-base )
-DESCRIPTION=Computer-aided number theory C library and tools
-EAPI=5
-HOMEPAGE=http://pari.math.u-bordeaux.fr/
-IUSE=data doc fltk gmp qt4 X
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) qt4? ( dev-qt/qtgui:4= ) X? ( x11-libs/libX11:0= )
-SLOT=0/4
-SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.7.0.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=5c3a46bf2581e16e6c493a6997ddf0a7
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.7.1 b/metadata/md5-cache/sci-mathematics/pari-2.7.1
index 2b4510ccaf1a..a4986da73054 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.7.1
+++ b/metadata/md5-cache/sci-mathematics/pari-2.7.1
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64
LICENSE=GPL-2
RDEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) qt4? ( dev-qt/qtgui:4= ) X? ( x11-libs/libX11:0= )
SLOT=0/4
-SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.7.1.tar.gz
+SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.7.1.tar.gz https://dev.gentoo.org/~mgorny/dist/pari-2.7.1-patchset.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=23fb66dc9cabaa67b65026f22c7094f5
+_md5_=ea184120c113229addc54929b08f6517
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 44d7afca3bde..48f845ca70c3 100644
Binary files a/metadata/md5-cache/sci-visualization/Manifest.gz and b/metadata/md5-cache/sci-visualization/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-visualization/spyview-20150124 b/metadata/md5-cache/sci-visualization/spyview-20150124
deleted file mode 100644
index eb272d848e55..000000000000
--- a/metadata/md5-cache/sci-visualization/spyview-20150124
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=dev-libs/boost:= media-libs/netpbm x11-libs/fltk:1[opengl] app-text/ghostscript-gpl virtual/glu sys-apps/groff >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=2D and 3D data visualization and analysis program
-EAPI=6
-HOMEPAGE=http://nsweb.tn.tudelft.nl/~gsteele/spyview/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/boost:= media-libs/netpbm x11-libs/fltk:1[opengl] app-text/ghostscript-gpl virtual/glu sci-visualization/gnuplot
-SLOT=0
-SRC_URI=https://github.com/gsteele13/spyview/archive/966012afae2fbb77262bd96a7e530e81b0ed3b90.tar.gz -> spyview-20150124.tgz
-_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=de0deb332fd7e3f2bbf8dfc1c4a85823
diff --git a/metadata/md5-cache/sci-visualization/spyview-20150124-r1 b/metadata/md5-cache/sci-visualization/spyview-20150124-r1
index 86b09d2672e3..30cb971051d8 100644
--- a/metadata/md5-cache/sci-visualization/spyview-20150124-r1
+++ b/metadata/md5-cache/sci-visualization/spyview-20150124-r1
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=>=dev-libs/boost-1.62.0:= media-libs/netpbm x11-libs/fltk:1[opengl] app-text/ghostscript-gpl virtual/glu sci-visualization/gnuplot
SLOT=0
-SRC_URI=https://github.com/gsteele13/spyview/archive/966012afae2fbb77262bd96a7e530e81b0ed3b90.tar.gz -> spyview-20150124.tgz
+SRC_URI=https://github.com/gsteele13/spyview/archive/966012afae2fbb77262bd96a7e530e81b0ed3b90.tar.gz -> spyview-20150124.tgz https://dev.gentoo.org/~mgorny/dist/spyview-20150124-patchset.tar.bz2
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=90cea3967aafa9a00dfa02a61a66dffe
+_md5_=24953532c38ce5dfea4cd9f3bc01c93a
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 3bf90c11e5b0..be47d404690d 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/bison-1.875d b/metadata/md5-cache/sys-devel/bison-1.875d
index 9b1f81f704fa..a964d0863654 100644
--- a/metadata/md5-cache/sys-devel/bison-1.875d
+++ b/metadata/md5-cache/sys-devel/bison-1.875d
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
LICENSE=GPL-2
RDEPEND=sys-devel/m4 nls? ( sys-devel/gettext )
SLOT=0
-SRC_URI=ftp://alpha.gnu.org/pub/gnu/bison/bison-1.875d.tar.bz2
+SRC_URI=ftp://alpha.gnu.org/pub/gnu/bison/bison-1.875d.tar.bz2 https://dev.gentoo.org/~mgorny/dist/bison-1.875d-patchset.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=eda7d1b54928d9aa365b828c5ff3abdc
+_md5_=73e0f84d993b0e8fddbcd6b17a9c47f9
diff --git a/metadata/md5-cache/sys-devel/bison-2.4.3 b/metadata/md5-cache/sys-devel/bison-2.4.3
index c06c6c4d560c..4c17d6c9bd68 100644
--- a/metadata/md5-cache/sys-devel/bison-2.4.3
+++ b/metadata/md5-cache/sys-devel/bison-2.4.3
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
LICENSE=GPL-2
RDEPEND=sys-devel/m4
SLOT=0
-SRC_URI=mirror://gnu/bison/bison-2.4.3.tar.bz2
+SRC_URI=mirror://gnu/bison/bison-2.4.3.tar.bz2 https://dev.gentoo.org/~mgorny/dist/bison-2.4.3-patchset.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=c8ad2b59b42eeae58d9f5bfd9d175446
+_md5_=4a681479d0ad986280abc35836ffa1b9
diff --git a/metadata/md5-cache/sys-devel/bison-3.0.4-r1 b/metadata/md5-cache/sys-devel/bison-3.0.4-r1
index 2d8401302610..7a51b3e4f78e 100644
--- a/metadata/md5-cache/sys-devel/bison-3.0.4-r1
+++ b/metadata/md5-cache/sys-devel/bison-3.0.4-r1
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
LICENSE=GPL-2
RDEPEND=>=sys-devel/m4-1.4.16
SLOT=0
-SRC_URI=mirror://gnu/bison/bison-3.0.4.tar.xz
+SRC_URI=mirror://gnu/bison/bison-3.0.4.tar.xz https://dev.gentoo.org/~mgorny/dist/bison-3.0.4-patchset.tar.xz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=28ea8c9ae790fa3e7fee63574210e386
+_md5_=29fc57d11271d2d588ddff06367447d8
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 1c88b2b0f7a2..ac310b587269 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.13.12 b/metadata/md5-cache/sys-kernel/ck-sources-4.13.12
deleted file mode 100644
index b14ec16a07ac..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.13.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.13
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.13.12
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-4.13 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-check -> deblob-check-4.13 ) mirror://gentoo/genpatches-4.13-14.base.tar.xz mirror://gentoo/genpatches-4.13-14.extras.tar.xz mirror://gentoo/genpatches-4.13-14.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.13/4.13-ck1/patch-4.13-ck1.xz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2029188dc8186858902febdf36f41e9a
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.13.13 b/metadata/md5-cache/sys-kernel/ck-sources-4.13.13
deleted file mode 100644
index e782002149dc..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.13.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.13
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.13.13
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-4.13 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-check -> deblob-check-4.13 ) mirror://gentoo/genpatches-4.13-15.base.tar.xz mirror://gentoo/genpatches-4.13-15.extras.tar.xz mirror://gentoo/genpatches-4.13-15.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.13/4.13-ck1/patch-4.13-ck1.xz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6595fd3e38806e3e1d0e38d60039749a
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.13.14 b/metadata/md5-cache/sys-kernel/ck-sources-4.13.14
deleted file mode 100644
index 82f20b67327e..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.13.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.13
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.13.14
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-4.13 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-check -> deblob-check-4.13 ) mirror://gentoo/genpatches-4.13-17.base.tar.xz mirror://gentoo/genpatches-4.13-17.extras.tar.xz mirror://gentoo/genpatches-4.13-17.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.13/4.13-ck1/patch-4.13-ck1.xz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c3bd4eab0fcd64daec470e02304fa7c1
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.13.15 b/metadata/md5-cache/sys-kernel/ck-sources-4.13.15
deleted file mode 100644
index 2ba82c1056cd..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.13.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.13
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.13.15
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-4.13 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-check -> deblob-check-4.13 ) mirror://gentoo/genpatches-4.13-18.base.tar.xz mirror://gentoo/genpatches-4.13-18.extras.tar.xz mirror://gentoo/genpatches-4.13-18.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.13/4.13-ck1/patch-4.13-ck1.xz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c854b3fda910faafaa70c13bbe4c2592
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.13.16 b/metadata/md5-cache/sys-kernel/ck-sources-4.13.16
deleted file mode 100644
index 05bc54b35552..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.13.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.13
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.13.16
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-4.13 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-check -> deblob-check-4.13 ) mirror://gentoo/genpatches-4.13-19.base.tar.xz mirror://gentoo/genpatches-4.13-19.extras.tar.xz mirror://gentoo/genpatches-4.13-19.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.13/4.13-ck1/patch-4.13-ck1.xz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b05da98fdf22fe266c484cbf7675adb4
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.2 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.2
deleted file mode 100644
index 6a57beb0c73a..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.14
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.14.2
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-4.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-3.base.tar.xz mirror://gentoo/genpatches-4.14-3.extras.tar.xz mirror://gentoo/genpatches-4.14-3.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.14/4.14-ck1/patch-4.14-ck1.xz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a333716a4a0685fa6f749a12c2d7e565
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.1 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.5
similarity index 81%
rename from metadata/md5-cache/sys-kernel/ck-sources-4.14.1
rename to metadata/md5-cache/sys-kernel/ck-sources-4.14.5
index 8c25280f4155..d4726f566dbd 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.1
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.5
@@ -3,12 +3,12 @@ DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed
DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.14
EAPI=6
HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
+IUSE=experimental symlink build deblob
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 !deblob? ( freedist )
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
RESTRICT=binchecks strip
-SLOT=4.14.1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-4.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-2.base.tar.xz mirror://gentoo/genpatches-4.14-2.extras.tar.xz mirror://gentoo/genpatches-4.14-2.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.14/4.14-ck1/patch-4.14-ck1.xz
+SLOT=4.14.5
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-4.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-6.base.tar.xz mirror://gentoo/genpatches-4.14-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-6.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.14/4.14-ck1/patch-4.14-ck1.xz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=492418a93bb99e3bd6cea0f4467253ef
+_md5_=cd25a1cd1fbe46d96e4395c2c5f34881
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.62 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.62
deleted file mode 100644
index 7fbe6f4adcca..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.62
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.9.62
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-64.base.tar.xz mirror://gentoo/genpatches-4.9-64.extras.tar.xz mirror://gentoo/genpatches-4.9-64.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.9/4.9-ck1/patch-4.9-ck1.xz https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=eb0bcb1e9f452ad4bb90905910c155ba
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.63 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.63
deleted file mode 100644
index 1410779057f0..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.63
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.9.63
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-65.base.tar.xz mirror://gentoo/genpatches-4.9-65.extras.tar.xz mirror://gentoo/genpatches-4.9-65.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.9/4.9-ck1/patch-4.9-ck1.xz https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b68e5f304e3c91bb93ce1d850eea6183
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.64 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.64
deleted file mode 100644
index 59272c99520e..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.64
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.9.64
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-66.base.tar.xz mirror://gentoo/genpatches-4.9-66.extras.tar.xz mirror://gentoo/genpatches-4.9-66.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.9/4.9-ck1/patch-4.9-ck1.xz https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=acc6e8c2ad607a89827ee62fba6b4aba
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.65 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.65
deleted file mode 100644
index 836dd929c89d..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.65
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.9.65
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-67.base.tar.xz mirror://gentoo/genpatches-4.9-67.extras.tar.xz mirror://gentoo/genpatches-4.9-67.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.9/4.9-ck1/patch-4.9-ck1.xz https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4d729cb42280a999bb7b75956de18735
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.61 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.68
similarity index 86%
rename from metadata/md5-cache/sys-kernel/ck-sources-4.9.61
rename to metadata/md5-cache/sys-kernel/ck-sources-4.9.68
index 667560947920..5c9fef1042fb 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.61
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.68
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 !deblob? ( freedist )
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
RESTRICT=binchecks strip
-SLOT=4.9.61
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-63.base.tar.xz mirror://gentoo/genpatches-4.9-63.extras.tar.xz mirror://gentoo/genpatches-4.9-63.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.9/4.9-ck1/patch-4.9-ck1.xz https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
+SLOT=4.9.68
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-70.base.tar.xz mirror://gentoo/genpatches-4.9-70.extras.tar.xz mirror://gentoo/genpatches-4.9-70.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.9/4.9-ck1/patch-4.9-ck1.xz https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fb350fd192614bc1c3fac5144eca1d64
+_md5_=93c99aa2accdaa78eec8f4c54d0e6a7e
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 834c220f98b2..da405b7a7e57 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/opera-developer-51.0.2791.0 b/metadata/md5-cache/www-client/opera-developer-51.0.2802.0
similarity index 82%
rename from metadata/md5-cache/www-client/opera-developer-51.0.2791.0
rename to metadata/md5-cache/www-client/opera-developer-51.0.2802.0
index c928e1c39d98..8105b5616a10 100644
--- a/metadata/md5-cache/www-client/opera-developer-51.0.2791.0
+++ b/metadata/md5-cache/www-client/opera-developer-51.0.2802.0
@@ -8,6 +8,6 @@ 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+:3 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=amd64? ( http://download1.operacdn.com/pub/opera-developer/51.0.2791.0/linux/opera-developer_51.0.2791.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/51.0.2791.0/linux/opera-developer_51.0.2791.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/51.0.2791.0/linux/opera-developer_51.0.2791.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/51.0.2791.0/linux/opera-developer_51.0.2791.0_amd64.deb )
+SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-developer/51.0.2802.0/linux/opera-developer_51.0.2802.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/51.0.2802.0/linux/opera-developer_51.0.2802.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/51.0.2802.0/linux/opera-developer_51.0.2802.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/51.0.2802.0/linux/opera-developer_51.0.2802.0_amd64.deb )
_eclasses_=chromium-2 fcd0e1c5eaae64392927ca67cdb13e0c desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 gnome2-utils 4d211d7614f303710fca59db6ec12c88 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
_md5_=2f289653ba805aca8e89ce3ba7355cb9
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1030.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1038.3_p1
similarity index 87%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1030.3_p1
rename to metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1038.3_p1
index ed9b0867352f..76b527606ba4 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1030.3_p1
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1038.3_p1
@@ -9,6 +9,6 @@ LICENSE=Vivaldi
RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap 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/pango[X]
RESTRICT=bindist mirror
SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1030.3-1_amd64.deb -> vivaldi-snapshot-1.14.1030.3_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1030.3-1_armhf.deb -> vivaldi-snapshot-1.14.1030.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1030.3-1_i386.deb -> vivaldi-snapshot-1.14.1030.3_p1-i386.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1038.3-1_amd64.deb -> vivaldi-snapshot-1.14.1038.3_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1038.3-1_armhf.deb -> vivaldi-snapshot-1.14.1038.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1038.3-1_i386.deb -> vivaldi-snapshot-1.14.1038.3_p1-i386.deb )
_eclasses_=chromium-2 fcd0e1c5eaae64392927ca67cdb13e0c desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 gnome2-utils 4d211d7614f303710fca59db6ec12c88 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
_md5_=a1489af0cf7a98049bce86e08b9613a9
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index d32ae9d1105c..2d86afb94d73 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6 b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6
index ae71b252d4db..fdb3712d7911 100644
--- a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6
+++ b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6
@@ -6,6 +6,6 @@ HOMEPAGE=https://www.x.org/wiki/
KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
SLOT=0
-SRC_URI=https://www.x.org/releases/individual/util/xorg-cf-files-1.0.6.tar.bz2
+SRC_URI=https://www.x.org/releases/individual/util/xorg-cf-files-1.0.6.tar.bz2 https://dev.gentoo.org/~mgorny/dist/xorg-cf-files-1.0.2-solaris-prefix.patch.bz2
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 flag-o-matic a6089a2a4027ae3da4a460dc87b21050 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af xorg-2 234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=5942e68742ac9e88921482d487722533
+_md5_=778e7eaebab30a29d5035b998bb1d55c
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index d11e87a50458..f032de0b0f4f 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1 b/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1
new file mode 100644
index 000000000000..41e0238bb375
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=dev-libs/glib-2.30 virtual/libgudev:= >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Daemon that enforces volume-related policies
+EAPI=6
+HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-volman
+IUSE=libnotify
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.30 virtual/libgudev:= >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/udev >=xfce-base/thunar-1.6[udisks]
+SLOT=0
+SRC_URI=mirror://xfce/src/apps/thunar-volman/0.8/thunar-volman-0.8.1.tar.bz2
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 97ce9decef1ff4b6c5be700283f67343 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=580a305dde4f715a2bdb2e3a60aaa99d
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 63298e29c040..6694cca7373b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 11 Dec 2017 12:08:31 +0000
+Mon, 11 Dec 2017 20:08:34 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 6ec8b79d0ca0..04c4a614bfdc 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Dec 11 12:08:31 UTC 2017
+Mon Dec 11 20:08:34 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4a5885806ca0..67e8521bb369 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 11 Dec 2017 12:30:01 +0000
+Mon, 11 Dec 2017 20:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 7600499f93c1..611dfb5d6aee 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-18454042167cb4faad599bbb1c6e8af4ee99a77e 1512990458 2017-12-11T11:07:38+00:00
+e4e28b774ec066428e0116b94af8baad3e95c559 1513022618 2017-12-11T20:03:38+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e7530605de29..cb3cd384679d 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1512993901 Mon 11 Dec 2017 12:05:01 PM UTC
+1513022701 Mon 11 Dec 2017 08:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 63298e29c040..6694cca7373b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 11 Dec 2017 12:08:31 +0000
+Mon, 11 Dec 2017 20:08:34 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 742306b7132b..26fe840f95e0 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index c9752e96db9e..41d623100561 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,2 +1,3 @@
DIST pdns-recursor-4.0.7.tar.bz2 1107546 BLAKE2B 3ccda73878599e3ade69e4dc6b0787e588a8403fb7cacfbe574409513b8723cbfd29a3c73d857120def801da60a4bedbc0f0c396e6642adb0287204cde301331 SHA512 0c8873adcce5ed9b41f161bc71635da23496b4ae48dbffff7dcdf9c5181e720f9aa94e18bd64e0dff9fa03eae8410dc93585a74d13f0c16d38b0d1c0f4146bb2
+DIST pdns-recursor-4.0.8.tar.bz2 1071831 BLAKE2B d9ab0dada8efa4b05c136650b9a2eab3aec4acab28ffb6da5bb4f627dc085b2c2d046d1f0dac5cf6e7054b47d76b8d7b95f56cc096b613891a4422b77e9abe9d SHA512 9886fccd3042904b7133e03a7b45479c8f2f57ecb33e4a043703b5e84816cd04a331503870e16030c86b353c1e14d9283dba767c1247e46ed6e14b7e0e93a5ef
DIST pdns-recursor-4.1.0.tar.bz2 1222751 BLAKE2B b2b5a7dee227b28eb3a1451a4d07cb1804e039e6b405c332f30fbb8df39f395906607f3c074b2469b01885b702d12e86e4ffd6114811404134c16956905c744f SHA512 1e4d70f3794005c3f45b2ec0ab580c3697e7de3096f3378b9b9d1cd53f10f95e577522ca9f634eb235b166f007e8a2bfa99f312ddf19f266ad4bb0965167fd7c
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.0.8.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.0.8.ebuild
new file mode 100644
index 000000000000..9d36d7629444
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.0.8.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs flag-o-matic eutils versionator
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="libressl lua luajit protobuf systemd"
+REQUIRED_USE="?? ( lua luajit )"
+
+DEPEND="lua? ( >=dev-lang/lua-5.1:= )
+ luajit? ( dev-lang/luajit:= )
+ protobuf? (
+ dev-libs/protobuf
+ >=dev-libs/boost-1.42:=
+ )
+ systemd? ( sys-apps/systemd:0= )
+ libressl? ( dev-libs/libressl:= )
+ !libressl? ( dev-libs/openssl:= )
+ >=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+ ! "${ED}"/etc/openafs/cacheinfo
- echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
-
- # pam_afs and pam_afs.krb have been installed in irregular locations, fix
- if use pam ; then
- dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
- fi
- rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
-
- # remove kdump stuff provided by kexec-tools #222455
- rm -rf "${ED}"/usr/sbin/kdump*
-
- # avoid collision with mit_krb5's version of kpasswd
- mv "${ED}"/usr/bin/kpasswd{,_afs} || die
- mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
- # move lwp stuff around #200674 #330061
- mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
- mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
- # update paths to the relocated lwp headers
- sed -ri \
- -e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>::' \
- "${ED}"/usr/include/*.h \
- "${ED}"/usr/include/*/*.h \
- || die
-
- # minimal documentation
- use pam && doman src/pam/pam_afs.5
- DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
- src/afsd/CellServDB NEWS README )
-
- # documentation package
- if use doc ; then
- DOCS+=( doc/{arch,examples,pdf,protocol,txt} )
- dohtml -r doc/xml/
- fi
-
- einstalldocs
-
- # Gentoo related scripts
- newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
- newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
- newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
- newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
- systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
- systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
- systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
- systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
- systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf
-
- # used directories: client
- keepdir /etc/openafs
-
- # used directories: server
- keepdir /etc/openafs/server
- diropts -m0700
- keepdir /var/lib/openafs
- keepdir /var/lib/openafs/db
- diropts -m0755
- keepdir /var/lib/openafs/logs
-
- # link logfiles to /var/log
- dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
- ## Somewhat intelligently install default configuration files
- ## (when they are not present)
- local x
- for x in cacheinfo CellServDB ThisCell ; do
- if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
- cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
- fi
- done
-}
-
-pkg_postinst() {
- elog "This installation should work out of the box (at least the"
- elog "client part doing global afs-cell browsing, unless you had"
- elog "a previous and different configuration). If you want to"
- elog "set up your own cell or modify the standard config,"
- elog "please have a look at the Gentoo OpenAFS documentation"
- elog "(warning: it is not yet up to date wrt the new file locations)"
- elog
- elog "The documentation can be found at:"
- elog " https://wiki.gentoo.org/wiki/OpenAFS"
- elog
- elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before"
- elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited."
-}
-
-pkg_config() {
- elog "Setting cache options for systemd."
-
- SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf
- [ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found."
-
- CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo)
- [ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo."
-
- if [ ${CACHESIZE} -lt 131070 ]; then
- AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
- elif [ ${CACHESIZE} -lt 524288 ]; then
- AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
- elif [ ${CACHESIZE} -lt 1048576 ]; then
- AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
- elif [ ${CACHESIZE} -lt 2209715 ]; then
- AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
- else
- AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
- fi
-
- # Replace existing env var if exists, else append line
- grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \
- sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \
- sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \
- die "Updating ${SERVICED_FILE} failed."
-}
diff --git a/net-fs/openafs/openafs-1.6.20.2-r1.ebuild b/net-fs/openafs/openafs-1.6.20.2-r1.ebuild
deleted file mode 100644
index 4ecf063fc89f..000000000000
--- a/net-fs/openafs/openafs-1.6.20.2-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-PVER="20170822"
-
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="https://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
- https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
- https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
- https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-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"
-
-CDEPEND="
- virtual/libintl
- fuse? ( sys-fs/fuse )
- kerberos? ( virtual/krb5 )
- ncurses? ( sys-libs/ncurses:0= )
- pam? ( virtual/pam )"
-
-DEPEND="${CDEPEND}
- virtual/yacc
- doc? (
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- )"
-
-RDEPEND="${CDEPEND}
- modules? ( ~net-fs/openafs-kernel-${PV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${WORKDIR}/gentoo/patches" )
-
-src_prepare() {
- default
-
- # fixing 2-nd level makefiles to honor flags
- sed -i -r 's/\ "${ED}"/etc/openafs/cacheinfo
- echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
-
- # pam_afs and pam_afs.krb have been installed in irregular locations, fix
- if use pam ; then
- dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
- fi
- rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
-
- # remove kdump stuff provided by kexec-tools #222455
- rm -rf "${ED}"/usr/sbin/kdump*
-
- # avoid collision with mit_krb5's version of kpasswd
- mv "${ED}"/usr/bin/kpasswd{,_afs} || die
- mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
- # move lwp stuff around #200674 #330061
- mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
- mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
- # update paths to the relocated lwp headers
- sed -ri \
- -e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>::' \
- "${ED}"/usr/include/*.h \
- "${ED}"/usr/include/*/*.h \
- || die
-
- # minimal documentation
- use pam && doman src/pam/pam_afs.5
- DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
- src/afsd/CellServDB NEWS README )
-
- # documentation package
- if use doc ; then
- DOCS+=( doc/{arch,examples,pdf,protocol,txt} )
- dohtml -r doc/xml/
- fi
-
- einstalldocs
-
- # Gentoo related scripts
- newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
- newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
- newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
- newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
- systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
- systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
- systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
- systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
- systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf
-
- # used directories: client
- keepdir /etc/openafs
-
- # used directories: server
- keepdir /etc/openafs/server
- diropts -m0700
- keepdir /var/lib/openafs
- keepdir /var/lib/openafs/db
- diropts -m0755
- keepdir /var/lib/openafs/logs
-
- # link logfiles to /var/log
- dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
- ## Somewhat intelligently install default configuration files
- ## (when they are not present)
- local x
- for x in cacheinfo CellServDB ThisCell ; do
- if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
- cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
- fi
- done
-}
-
-pkg_postinst() {
- elog "This installation should work out of the box (at least the"
- elog "client part doing global afs-cell browsing, unless you had"
- elog "a previous and different configuration). If you want to"
- elog "set up your own cell or modify the standard config,"
- elog "please have a look at the Gentoo OpenAFS documentation"
- elog "(warning: it is not yet up to date wrt the new file locations)"
- elog
- elog "The documentation can be found at:"
- elog " https://wiki.gentoo.org/wiki/OpenAFS"
- elog
- elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before"
- elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited."
-}
-
-pkg_config() {
- elog "Setting cache options for systemd."
-
- SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf
- [ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found."
-
- CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo)
- [ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo."
-
- if [ ${CACHESIZE} -lt 131070 ]; then
- AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
- elif [ ${CACHESIZE} -lt 524288 ]; then
- AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
- elif [ ${CACHESIZE} -lt 1048576 ]; then
- AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
- elif [ ${CACHESIZE} -lt 2209715 ]; then
- AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
- else
- AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
- fi
-
- # Replace existing env var if exists, else append line
- grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \
- sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \
- sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \
- die "Updating ${SERVICED_FILE} failed."
-}
diff --git a/net-fs/openafs/openafs-1.6.21.1.ebuild b/net-fs/openafs/openafs-1.6.21.1.ebuild
deleted file mode 100644
index 4ecf063fc89f..000000000000
--- a/net-fs/openafs/openafs-1.6.21.1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-PVER="20170822"
-
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="https://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
- https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
- https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
- https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-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"
-
-CDEPEND="
- virtual/libintl
- fuse? ( sys-fs/fuse )
- kerberos? ( virtual/krb5 )
- ncurses? ( sys-libs/ncurses:0= )
- pam? ( virtual/pam )"
-
-DEPEND="${CDEPEND}
- virtual/yacc
- doc? (
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- )"
-
-RDEPEND="${CDEPEND}
- modules? ( ~net-fs/openafs-kernel-${PV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${WORKDIR}/gentoo/patches" )
-
-src_prepare() {
- default
-
- # fixing 2-nd level makefiles to honor flags
- sed -i -r 's/\ "${ED}"/etc/openafs/cacheinfo
- echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
-
- # pam_afs and pam_afs.krb have been installed in irregular locations, fix
- if use pam ; then
- dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
- fi
- rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
-
- # remove kdump stuff provided by kexec-tools #222455
- rm -rf "${ED}"/usr/sbin/kdump*
-
- # avoid collision with mit_krb5's version of kpasswd
- mv "${ED}"/usr/bin/kpasswd{,_afs} || die
- mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
- # move lwp stuff around #200674 #330061
- mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
- mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
- # update paths to the relocated lwp headers
- sed -ri \
- -e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>::' \
- "${ED}"/usr/include/*.h \
- "${ED}"/usr/include/*/*.h \
- || die
-
- # minimal documentation
- use pam && doman src/pam/pam_afs.5
- DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
- src/afsd/CellServDB NEWS README )
-
- # documentation package
- if use doc ; then
- DOCS+=( doc/{arch,examples,pdf,protocol,txt} )
- dohtml -r doc/xml/
- fi
-
- einstalldocs
-
- # Gentoo related scripts
- newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
- newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
- newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
- newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
- systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
- systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
- systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
- systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
- systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf
-
- # used directories: client
- keepdir /etc/openafs
-
- # used directories: server
- keepdir /etc/openafs/server
- diropts -m0700
- keepdir /var/lib/openafs
- keepdir /var/lib/openafs/db
- diropts -m0755
- keepdir /var/lib/openafs/logs
-
- # link logfiles to /var/log
- dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
- ## Somewhat intelligently install default configuration files
- ## (when they are not present)
- local x
- for x in cacheinfo CellServDB ThisCell ; do
- if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
- cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
- fi
- done
-}
-
-pkg_postinst() {
- elog "This installation should work out of the box (at least the"
- elog "client part doing global afs-cell browsing, unless you had"
- elog "a previous and different configuration). If you want to"
- elog "set up your own cell or modify the standard config,"
- elog "please have a look at the Gentoo OpenAFS documentation"
- elog "(warning: it is not yet up to date wrt the new file locations)"
- elog
- elog "The documentation can be found at:"
- elog " https://wiki.gentoo.org/wiki/OpenAFS"
- elog
- elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before"
- elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited."
-}
-
-pkg_config() {
- elog "Setting cache options for systemd."
-
- SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf
- [ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found."
-
- CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo)
- [ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo."
-
- if [ ${CACHESIZE} -lt 131070 ]; then
- AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
- elif [ ${CACHESIZE} -lt 524288 ]; then
- AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
- elif [ ${CACHESIZE} -lt 1048576 ]; then
- AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
- elif [ ${CACHESIZE} -lt 2209715 ]; then
- AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
- else
- AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
- fi
-
- # Replace existing env var if exists, else append line
- grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \
- sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \
- sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \
- die "Updating ${SERVICED_FILE} failed."
-}
diff --git a/net-fs/openafs/openafs-1.6.21-r1.ebuild b/net-fs/openafs/openafs-1.6.22.ebuild
similarity index 100%
rename from net-fs/openafs/openafs-1.6.21-r1.ebuild
rename to net-fs/openafs/openafs-1.6.22.ebuild
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index ff7315857d87..65c540ad8a11 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/base/packages b/profiles/base/packages
index b782c6fb9315..2decf0cad968 100644
--- a/profiles/base/packages
+++ b/profiles/base/packages
@@ -43,8 +43,6 @@
*sys-apps/kbd
# temporary bugfix for #398295
*sys-apps/less
-# stopgap solution for functions.sh #373219 and #504116
-*sys-apps/openrc
*sys-process/procps
*sys-process/psmisc
*sys-apps/sed
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 650b982036b0..99d0ce582262 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index c43b709a4c73..a78f8a17c5f2 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,12 +1,10 @@
DIST elldata.tgz 14185595 BLAKE2B eb90a0e392eeeaad81b6b01ba4e8258aaf2a4b4a01950b18a0e91f176629aecc693453d8fe99b49a28f2dfbbb6fae1a06d7d4137cb13ced298e64e5aa4062f53 SHA512 dc13d1cacb98a6c2774936997452bd34ae198da9206fea69bc7cdd28240d0cdd07bb0ec1f14b8e97bea4321a60a6a6144464ab3b629be2e37dd76a73efaf43ef
DIST galdata.tgz 53229 BLAKE2B 08f0a1be3c5252fbe534b2ed7e66b9bc8cddab807b7caf12b783aacc2e75de82dc000e762da2ec895d52424281234af121e1edfd84adf9f02c26c4e59d23e2f3 SHA512 bc89c8a42416e8ca25c356b7ad6d80ffcfff127e561fc338df87147a9e370ec71f7ae2eb6bef73d634cc7a8f18c794d7fd5ebfd0a042d3d356526a2eee28125a
DIST nftables.tgz 8393731 BLAKE2B d33cbf1f52d3e8a040087da28014ab727b59c641d1a53c97d311a9d1613b59f6b317b7632e0fc89943bea0a507a737543890109b888707c4fb7879279549a2e9 SHA512 cccc62fb0f6d8c578a4e165a1f2daf3b87acbbc38377044ddd98e2901a8e0554a46c8714bad0f4f4e09107b0c0c8f43069b4ddf4fba9c7832bad65ce3c901183
+DIST pari-2.3.5-patchset.tar.bz2 1773 BLAKE2B 08358dcb7e353eb41a784a6daa9400b74b8f331a54eea8ef159fbbecdbed5d00955a821db20e3a4f7e254160cd600d0255d6648aa0e1b2b7aca9910d5cd17f1d SHA512 f616eac3049fea684413f8f221a1604a5e62ae2804207513fcfff513d8b162a3a4d1063dad059907682404ee30f840182d75e29a44b44cda4f80266b46f75364
DIST pari-2.3.5.tar.gz 2018097 BLAKE2B b5f4f8bc83cd77aceab791263e1a2f0294d0663d354fea454bad8cac3cdbac9c4c8381cc83bc947d518522701c36e94ce1d6862125a9bfd3b17b1a31c9baabc8 SHA512 0e49e6310b4c76ef3370786a13aa8cbc5bb0b7dc84ec1665866d623e6284f45db8584eea759e8b5954dc9b5c8a3e866e77a377d18073ed33f11708a7e88a4cca
-DIST pari-2.5.0.tar.gz 2714449 BLAKE2B 2c3bdc52c9c5332670656910a425847633a39831d372f69966542564a0bc5b35d767b84df68a357285e06357ebe110fb55134d1e34675f7e9b27c78cfc0945d4 SHA512 701abdf4d65bcaeac9bdd314b1fc24a59de9ee1874b9abba5761cb88bb871c18d108a99cf1cbf9a357ac192196c043592e0e5d1645689d5a6f85afbfa7a9096f
-DIST pari-2.5.1.tar.gz 2718726 BLAKE2B 28149a9af879fed26dd5d7effee8a821a293518743fb5c1ef2ca97e903cf1ab24afbeb4116b2bf833c05aebddacd026a584b8b2c60fef5b036af44d666f22f60 SHA512 dd304bd02402602c1f114a7f4d1e54af0fce8707b196fd9da617c028ba3426418813aeaf818fecaa9f76572b1d36847463a3aa7f60848cdec607ec70131dc263
-DIST pari-2.5.2.tar.gz 2719367 BLAKE2B a48109c1c5ec85306eef4b6bff8c7c05bfe0479f1f9e4e57e2b914286117c2768be869109e7701d74f29fee80fcff9e0f05d6863fde6cf881e7ecc00b7539ba0 SHA512 2d0332e5604a6bd41c8328c4cffc42302dd85db077a950e19769a0cc7b8c3e17b7c4c5c1514ecb2f75757015baa7e7df76f6174e997fbaa90874c5e6cf5e7fce
-DIST pari-2.5.3.tar.gz 2720543 BLAKE2B a52473c817c9625f30e6c3ee08942f8e69d4cba0ef6d50972c20ac0995dc00d605d19d90793b88d59e5d47ac87d0ef68d4dbc6b77c3887677cd7b290e0b41bbb SHA512 8606f1f1b59a8e9e8b5bdbaacd03f980da99616568c180eb37f6f530efad396343e3146f6c7adfc5dac6e43a1d35c898531ecf61dd6d62c26cafcd2554f8c43b
+DIST pari-2.5.4-patchset.tar.bz2 11050 BLAKE2B 0ea4727bb03045c7cda9b39cd429db8ea1b8d9e2656cf81fb4d401abc57803d8a6b4c538727f6744dd75c6b95530a0cca058cfdb0e85d4b9eaf39e7d43a14929 SHA512 5b70b6e15e651118c5dba339601eee1b8dfe55eb37f30d0b350d73eef33a4119ba366ba48fa171e450e27af2823b96d8006aadf0f994ae76002f98a76adcf6bb
DIST pari-2.5.4.tar.gz 2721861 BLAKE2B 003113716c4aaea3836ee7f813ff4aacecb40e6c7d9119c0a6d6073f951e6c5fae887ee22d87d5c7d7320e0d873585f145dd14e7014075bf198143dde68325f9 SHA512 de2f0593682d638288908636d848489acf115f4858b91c574168db26c4ab7443465a21d1e6c43be19ecc57dcedcd883e5af72b65467a59a2c8811e4eec64e0b9
-DIST pari-2.7.0.tar.gz 3142306 BLAKE2B eb4a62af1eaa502d38e04116a34e2c9b186ef075cfa647c242ec5384de8d1c12acdb1ad55397a2c3af19b93b95115a60a8a6e8ae2b2bd6d197d68a1907df79e8 SHA512 312ed6032e5b1b431d04cccb593e5ca6ca323361736669be0ed345cbb6cf22114c670984ae74120aacb4ac1af822a1fdf76aed7ba59a1cd4f94e26150562ad84
+DIST pari-2.7.1-patchset.tar.bz2 4318 BLAKE2B 881354eec4f89f7b7e0a1d53d5fa169b0ea0de3964baff454f2e7aca1b7bd2e7ffa2f404e4df7a8ff7a662aed3920e10df4a3a1d5d86967579c360869abce557 SHA512 1ff40adcf638230e1aca951b4fdb291cd4d2048ef66215de0ec157b9ec0040e28c115c2684056cf582695e66ee8363aa776a4a50f8654c8dde7bad490a47b304
DIST pari-2.7.1.tar.gz 3140893 BLAKE2B 0f5c69ac2decb0ac26f51de7843c282606f854c257b06d1596eb7f4157e8f64d65b65f887e2d9bb8b77cbdffdac0bb1902e373b1d44e457ac25993bc308d3e09 SHA512 ff32c181e6810af8a38f0dfe45b9f15d930923da5759c3e88595f56bf3c65ec0a79fdb9fb5f0e4ce0adb1ebc56a84e6b1606085057762073a85c0d1946857d5f
DIST seadata.tgz 19214199 BLAKE2B cafb89905180ff481f578ff2cdb150b04533ecbccfa96d045bdb61e5fe2c230262f3459d31b11f049ad1e16ed9dd6fb734569ee621efa3831800cc3d99583e60 SHA512 393f2fae45964ad0921fcf417113e10b296cb4c3a0e0eec138c896827f43a5464c4b42a07313e0f3a4383e8df97912e2e359a4cd5225d014d7575e80c7dd996a
diff --git a/sci-mathematics/pari/files/50pari-gentoo.el b/sci-mathematics/pari/files/50pari-gentoo.el
deleted file mode 100644
index 2f5b4da9084e..000000000000
--- a/sci-mathematics/pari/files/50pari-gentoo.el
+++ /dev/null
@@ -1,10 +0,0 @@
-
-;; site-init for sci-mathematics/pari
-
-(add-to-list 'load-path "@SITELISP@")
-
-(autoload 'gp-mode "pari" nil t)
-(autoload 'gp-script-mode "pari" nil t)
-(autoload 'gp "pari" nil t)
-(autoload 'gpman "pari" nil t)
-(add-to-list 'auto-mode-alist '("\\.gp$" . gp-script-mode))
diff --git a/sci-mathematics/pari/files/pari-2.3.2-ppc-powerpc-arch-fix.patch b/sci-mathematics/pari/files/pari-2.3.2-ppc-powerpc-arch-fix.patch
deleted file mode 100644
index e3581c9de349..000000000000
--- a/sci-mathematics/pari/files/pari-2.3.2-ppc-powerpc-arch-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur pari-2.3.2/config/arch-osname pari-2.3.2.new/config/arch-osname
---- pari-2.3.2/config/arch-osname 2006-02-15 05:12:59.000000000 -0500
-+++ pari-2.3.2.new/config/arch-osname 2007-11-26 00:17:17.000000000 -0500
-@@ -30,6 +30,7 @@
- osf1) case "$5" in alpha) arch=alpha;; esac;;
- linux) arch=`uname -m`
- case $arch in
-+ ppc) arch=powerpc;;
- sparc64) arch=sparcv9;;
- parisc*) arch=hppa;;
- sparc) case "`cat /proc/cpuinfo`" in
diff --git a/sci-mathematics/pari/files/pari-2.3.2-strip.patch b/sci-mathematics/pari/files/pari-2.3.2-strip.patch
deleted file mode 100644
index 0fee947fd556..000000000000
--- a/sci-mathematics/pari/files/pari-2.3.2-strip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/Makefile.SH. 2007-10-01 23:45:45.000000000 +0200
-+++ config/Makefile.SH 2007-10-01 23:55:10.000000000 +0200
-@@ -208,7 +208,7 @@
- MV = mv -f
- LN = $ln_s
- CP_F = cp -f
--STRIP = strip
-+STRIP = true
- STRIPFLAGS =
-
- # Change these installation directories to suit your needs.
diff --git a/sci-mathematics/pari/files/pari-2.3.5-doc-make.patch b/sci-mathematics/pari/files/pari-2.3.5-doc-make.patch
deleted file mode 100644
index 67edc8c70f11..000000000000
--- a/sci-mathematics/pari/files/pari-2.3.5-doc-make.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- config/DOC_Make.SH.orig 2010-09-21 21:24:56.655520480 +1200
-+++ config/DOC_Make.SH 2010-09-21 21:26:24.683520242 +1200
-@@ -30,23 +30,23 @@
- -rm -f libpari.std
- pdftex libpari
- pdftex libpari
-- make libpari.std; pdftex libpari; rm -f libpari.std
-+ \$(MAKE) libpari.std; pdftex libpari; rm -f libpari.std
- libpari.dvi: \$(PARI_TEX) \$(MACROS)
- -rm -f libpari.std
- tex libpari
- tex libpari
-- make libpari.std; tex libpari; rm -f libpari.std
-+ \$(MAKE) libpari.std; tex libpari; rm -f libpari.std
-
- develop.pdf: develop.tex \$(MACROS)
- -rm -f develop.std
- pdftex develop
- pdftex develop
-- make develop.std; pdftex develop; rm -f develop.std
-+ \$(MAKE) develop.std; pdftex develop; rm -f develop.std
- develop.dvi: develop.tex \$(MACROS)
- -rm -f develop.std
- tex develop
- tex develop
-- make develop.std; tex develop; rm -f develop.std
-+ \$(MAKE) develop.std; tex develop; rm -f develop.std
-
- tutorial.pdf: tutorial.tex \$(MACROS)
- -rm -f tutorial.std
-@@ -74,13 +74,13 @@
- -rm -f users.std
- tex users
- tex users
-- make users.std; tex users; rm -f users.std
-+ \$(MAKE) users.std; tex users; rm -f users.std
-
- users.pdf: \$(USERS_TEX)
- -rm -f users.std
- pdftex users
- pdftex users
-- make users.std; pdftex users; rm -f users.std
-+ \$(MAKE) users.std; pdftex users; rm -f users.std
-
- gpman: gp.1
- nroff -man gp.1 | unix2dos -ascii > gp.man
diff --git a/sci-mathematics/pari/files/pari-2.3.5-no-dot-inc.patch b/sci-mathematics/pari/files/pari-2.3.5-no-dot-inc.patch
deleted file mode 100644
index cd34851a30fb..000000000000
--- a/sci-mathematics/pari/files/pari-2.3.5-no-dot-inc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 4f1e00df5ea1e51042146f6277bb1af02f249cc3 Mon Sep 17 00:00:00 2001
-From: Kent Fredric
-Date: Sun, 11 Jun 2017 10:31:03 +1200
-Subject: [PATCH] Fix for 5.26 removal of '.' in @INC
-
-Previous scripts assumed CWD was in @INC and that "PARI::822" was in
-wherever CWD was.
-
-This fixes both of those, and the latter, because its not obvious
-from the build system where one should assume CWD to be.
-
-Instead, the absolute path of the directory of these scripts is
-inserted into @INC
----
- src/desc/gen_member | 4 ++++
- src/desc/gen_proto | 4 ++++
- src/desc/merge_822 | 4 ++++
- 3 files changed, 12 insertions(+)
-
-diff --git a/src/desc/gen_member b/src/desc/gen_member
-index 2f3cf52..66dea2b 100755
---- a/src/desc/gen_member
-+++ b/src/desc/gen_member
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl -w
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- $class='member_functions';
-diff --git a/src/desc/gen_proto b/src/desc/gen_proto
-index 1b507fa..2fb4d3f 100755
---- a/src/desc/gen_proto
-+++ b/src/desc/gen_proto
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl -w
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- $class=$ARGV[0];
-diff --git a/src/desc/merge_822 b/src/desc/merge_822
-index a02d612..9ca8252 100755
---- a/src/desc/merge_822
-+++ b/src/desc/merge_822
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl -w
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- PARI::822::read(\%funcs,$_,1)
---
-2.13.1
-
diff --git a/sci-mathematics/pari/files/pari-2.5.0-doc-make.patch b/sci-mathematics/pari/files/pari-2.5.0-doc-make.patch
deleted file mode 100644
index 0882da03e6a4..000000000000
--- a/sci-mathematics/pari/files/pari-2.5.0-doc-make.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- config/DOC_Make.SH.orig 2011-07-28 14:11:34.430896929 +1200
-+++ config/DOC_Make.SH 2011-07-28 14:11:39.832738158 +1200
-@@ -21,7 +21,8 @@
-
- doc all: develop.dvi libpari.dvi users.dvi refcard.ps tutorial.dvi
- docps: develop.ps libpari.ps refcard.ps tutorial.ps users.ps INSTALL.ps
--docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
-+#docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
-+docpdf: \$(PARI_TEX) \$(MACROS) pass1 pass2 indexing refcard.pdf INSTALL.pdf
-
- .SUFFIXES: .tex .ipf .pod .inf .dumbpod .3 .html
-
-@@ -37,27 +38,49 @@
- %.dvi: %.tex \$(MACROS)
- tex \$<
-
-+pass1: \$(PARI_TEX) \$(USERS_TEX) develop.tex tutorial.tex \$(MACROS)
-+ -rm -f *.std
-+ pdftex libpari
-+ pdftex develop
-+ pdftex tutorial
-+ pdftex users
-+
-+pass2: pass1
-+ pdftex libpari
-+ pdftex develop
-+ pdftex tutorial
-+ pdftex users
-+
-+indexing: pass2
-+ \$(MAKE) libpari.std
-+ \$(MAKE) develop.std
-+ \$(MAKE) users.std
-+ pdftex libpari
-+ pdftex develop
-+ pdftex users
-+ -rm -f *.std
-+
- libpari.pdf: \$(PARI_TEX) \$(MACROS)
- -rm -f libpari.std
- pdftex libpari
- pdftex libpari
-- make libpari.std; pdftex libpari; rm -f libpari.std
-+ \$(MAKE) libpari.std; pdftex libpari; rm -f libpari.std
- libpari.dvi: \$(PARI_TEX) \$(MACROS)
- -rm -f libpari.std
- tex libpari
- tex libpari
-- make libpari.std; tex libpari; rm -f libpari.std
-+ \$(MAKE) libpari.std; tex libpari; rm -f libpari.std
-
- develop.pdf: develop.tex \$(MACROS)
- -rm -f develop.std
- pdftex develop
- pdftex develop
-- make develop.std; pdftex develop; rm -f develop.std
-+ \$(MAKE)make develop.std; pdftex develop; rm -f develop.std
- develop.dvi: develop.tex \$(MACROS)
- -rm -f develop.std
- tex develop
- tex develop
-- make develop.std; tex develop; rm -f develop.std
-+ \$(MAKE) develop.std; tex develop; rm -f develop.std
-
- tutorial.pdf: tutorial.tex \$(MACROS)
- -rm -f tutorial.std
-@@ -85,13 +108,13 @@
- -rm -f users.std
- tex users
- tex users
-- make users.std; tex users; rm -f users.std
-+ \$(MAKE) users.std; tex users; rm -f users.std
-
- users.pdf: \$(USERS_TEX)
- -rm -f users.std
- pdftex users
- pdftex users
-- make users.std; pdftex users; rm -f users.std
-+ \$(MAKE) users.std; pdftex users; rm -f users.std
-
- gpman: gp.1
- nroff -man gp.1 | unix2dos -ascii > gp.man
diff --git a/sci-mathematics/pari/files/pari-2.5.0-macos.patch b/sci-mathematics/pari/files/pari-2.5.0-macos.patch
deleted file mode 100644
index 1b4076009379..000000000000
--- a/sci-mathematics/pari/files/pari-2.5.0-macos.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- config/get_dlld.orig 2011-07-28 14:27:13.341072367 +1200
-+++ config/get_dlld 2011-07-28 14:27:46.225178023 +1200
-@@ -94,7 +94,7 @@
- *) extra=;;
- esac
- case "$osname" in
-- darwin) shared=-dynamiclib;;
-+ darwin) shared="-dynamiclib -install_name \$(PURELIBDIR)/\$(LIBPARI_DYN)";;
- *) shared=-shared;;
- esac
- DLLDFLAGS="$shared $extra \$(CFLAGS) \$(DLCFLAGS) $DLLDFLAGS"
---- config/Makefile.SH.orig 2011-07-28 14:29:06.753681364 +1200
-+++ config/Makefile.SH 2011-07-28 14:29:10.589276933 +1200
-@@ -234,6 +234,7 @@
- # DESTDIR is used to install to a false hierachy (to build a Debian package)
- INCLUDEDIR= "\$(DESTDIR)$includedir"
- LIBDIR = "\$(DESTDIR)$libdir"
-+PURELIBDIR= $libdir
- BINDIR = "\$(DESTDIR)$bindir"
- MANDIR = "\$(DESTDIR)$mandir"
- DATADIR = "\$(DESTDIR)$datadir"
diff --git a/sci-mathematics/pari/files/pari-2.5.0-mp.c.patch b/sci-mathematics/pari/files/pari-2.5.0-mp.c.patch
deleted file mode 100644
index 0bcfffc08176..000000000000
--- a/sci-mathematics/pari/files/pari-2.5.0-mp.c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: src/kernel/gmp/mp.c
-===================================================================
---- src/kernel/gmp/mp.c (revision 13151)
-+++ src/kernel/gmp/mp.c (working copy)
-@@ -45,18 +45,8 @@
- /*We need PARI invmod renamed to invmod_pari*/
- #define INVMOD_PARI
-
--static void *gmp_realloc(void *ptr, size_t old_size, size_t new_size) {
-- (void)old_size; return (void *) pari_realloc(ptr,new_size);
--}
--
--static void gmp_free(void *ptr, size_t old_size){
-- (void)old_size; pari_free(ptr);
--}
--
- int pari_kernel_init(void)
- {
-- /* Use pari_malloc instead of malloc */
-- mp_set_memory_functions((void *(*)(size_t)) pari_malloc, gmp_realloc, gmp_free);
- return 0;
- }
-
diff --git a/sci-mathematics/pari/files/pari-2.5.0-no-dot-inc.patch b/sci-mathematics/pari/files/pari-2.5.0-no-dot-inc.patch
deleted file mode 100644
index e34fa6b352ab..000000000000
--- a/sci-mathematics/pari/files/pari-2.5.0-no-dot-inc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 03df0cdd7228a412d2adfe9ee9c746b3ec69dd6b Mon Sep 17 00:00:00 2001
-From: Kent Fredric
-Date: Sun, 11 Jun 2017 10:31:03 +1200
-Subject: [PATCH] Fix for 5.26 removal of '.' in @INC
-
-Previous scripts assumed CWD was in @INC and that "PARI::822" was in
-wherever CWD was.
-
-This fixes both of those, and the latter, because its not obvious
-from the build system where one should assume CWD to be.
-
-Instead, the absolute path of the directory of these scripts is
-inserted into @INC
----
- src/desc/doc_make | 4 ++++
- src/desc/gen_proto | 4 ++++
- src/desc/merge_822 | 4 ++++
- 3 files changed, 12 insertions(+)
-
-diff --git a/src/desc/doc_make b/src/desc/doc_make
-index 02dc90d..55296ed 100755
---- a/src/desc/doc_make
-+++ b/src/desc/doc_make
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- PARI::822::read(\%funcs, "pari.desc");
-diff --git a/src/desc/gen_proto b/src/desc/gen_proto
-index 38c2daf..ffb4276 100755
---- a/src/desc/gen_proto
-+++ b/src/desc/gen_proto
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl -w
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- $class=$ARGV[0];
-diff --git a/src/desc/merge_822 b/src/desc/merge_822
-index 4c9217b..32b3cc9 100755
---- a/src/desc/merge_822
-+++ b/src/desc/merge_822
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl -w
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- open(IN, $ARGV[0]) || die "cannot find $ARGV[0]";
---
-2.13.1
-
diff --git a/sci-mathematics/pari/files/pari-2.5.1-1302.patch b/sci-mathematics/pari/files/pari-2.5.1-1302.patch
deleted file mode 100644
index 245e587d275c..000000000000
--- a/sci-mathematics/pari/files/pari-2.5.1-1302.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 917b505c86a70dda2191d380861af05becc03858
-Author: Karim Belabas
-Date: Mon Mar 12 23:54:11 2012 +0100
-
- ispower(x < 0,, &n): n could have the wrong sign [#1302]
-
-diff --git a/src/basemath/arith1.c b/src/basemath/arith1.c
-index ded946b..5502ba5 100644
---- a/src/basemath/arith1.c
-+++ b/src/basemath/arith1.c
-@@ -1109,6 +1109,7 @@ Z_isanypower(GEN x, GEN *pty)
- *pty = gerepileuptoint(av, y);
- return k;
- }
-+ if (pty) togglesign_safe(pty);
- }
- if (pty) *pty = gerepilecopy(av, *pty); else avma = av;
- return k;
-diff --git a/src/test/32/ispower b/src/test/32/ispower
-index bf4b6f0..84d8de7 100644
---- a/src/test/32/ispower
-+++ b/src/test/32/ispower
-@@ -1118,7 +1118,7 @@
- [2, 999]
- [6, 10]
- [3, -4]
--[3, 2]
--[3, 21218]
-+[3, -2]
-+[3, -21218]
- [3, -1/4]
--Total time spent: 3236
-+Total time spent: 3012
diff --git a/sci-mathematics/pari/files/pari-2.5.1-1304.patch b/sci-mathematics/pari/files/pari-2.5.1-1304.patch
deleted file mode 100644
index 3da2e8558dac..000000000000
--- a/sci-mathematics/pari/files/pari-2.5.1-1304.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit ff707a3f2ba2d5c555434ba50547453833a7570f
-Author: Karim Belabas
-Date: Sun Mar 18 23:54:02 2012 +0100
-
- 71- issquarefree(0) => error [#1304]
-
-diff --git a/src/basemath/ifactor1.c b/src/basemath/ifactor1.c
-index 046491f..8f9fbaa 100644
---- a/src/basemath/ifactor1.c
-+++ b/src/basemath/ifactor1.c
-@@ -3493,7 +3493,11 @@ moebius(GEN n)
- GEN
- gissquarefree(GEN x) { return map_proto_lG(issquarefree,x); }
- long
--Z_issquarefree(GEN n) { return moebius(n)? 1: 0; }
-+Z_issquarefree(GEN n)
-+{
-+ if (!signe(n)) return 0;
-+ return moebius(n)? 1: 0;
-+}
- long
- issquarefree(GEN x)
- {
-diff --git a/src/test/32/arith b/src/test/32/arith
-new file mode 100644
-index 0000000..3c5981a
---- /dev/null
-+++ b/src/test/32/arith
-@@ -0,0 +1,2 @@
-+0
-+Total time spent: 8
-diff --git a/src/test/in/arith b/src/test/in/arith
-new file mode 100644
-index 0000000..fb92bed
---- /dev/null
-+++ b/src/test/in/arith
-@@ -0,0 +1,2 @@
-+\\#1304
-+issquarefree(0)
diff --git a/sci-mathematics/pari/files/pari-2.5.1-gcc47.patch b/sci-mathematics/pari/files/pari-2.5.1-gcc47.patch
deleted file mode 100644
index e7b27159fa06..000000000000
--- a/sci-mathematics/pari/files/pari-2.5.1-gcc47.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: pari-2.5.1/src/basemath/bibli2.c
-===================================================================
---- pari-2.5.1.orig/src/basemath/bibli2.c 2012-01-26 17:26:13.000000000 +0100
-+++ pari-2.5.1/src/basemath/bibli2.c 2012-06-04 10:08:41.000000000 +0200
-@@ -1394,12 +1394,12 @@
- int (*CMP)(void*,GEN,GEN);
- int (*cmp)(GEN,GEN) = (flag & cmp_LEX)? &lexcmp: &gcmp;
- void *E;
-+ struct veccmp_s v;
-
- if (flag < 0 || flag > (cmp_REV|cmp_LEX|cmp_IND|cmp_UNIQ))
- pari_err(flagerr,"vecsort");
- if (k) {
- long i, j, l, lk, tx, lx;
-- struct veccmp_s v;
- GEN y;
-
- /* cf init_sort */
diff --git a/sci-mathematics/pari/files/pari-2.5.1-no-automagic.patch b/sci-mathematics/pari/files/pari-2.5.1-no-automagic.patch
deleted file mode 100644
index 8fee1f7eaf70..000000000000
--- a/sci-mathematics/pari/files/pari-2.5.1-no-automagic.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -Nur pari-2.5.1.orig/config/get_config_options pari-2.5.1/config/get_config_options
---- pari-2.5.1.orig/config/get_config_options 2012-08-01 18:32:03.000000000 +0100
-+++ pari-2.5.1/config/get_config_options 2012-08-01 20:57:09.000000000 +0100
-@@ -83,10 +83,12 @@
- --with-ncurses-lib=*|--with-ncurses=*)
- with_ncurses_lib=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-
-+ --without-qt|--with-qt=no) without_qt=yes ;;
- --with-qt) with_qt=yes ;;
- --with-qt=*)
- with_qt=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-
-+ --without-fltk|--with-fltk=no) without_fltk=yes ;;
- --with-fltk) with_fltk=yes ;;
- --with-fltk=*)
- with_fltk=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-@@ -158,7 +160,9 @@
- --with-gmp-lib=DIR specify location of gmp libs
-
- --with-qt[=DIR] use the Qt graphical library [prefix for Qt dir.]
-+ --without-qt do not try to use the Qt lib
- --with-fltk[=DIR] use the FLTK graphical library [prefix for FLTK dir.]
-+ --without-fltk do not try to use the FLTK lib
-
- EOT
- exit 1
-diff -Nur pari-2.5.1.orig/config/get_fltk pari-2.5.1/config/get_fltk
---- pari-2.5.1.orig/config/get_fltk 2012-08-01 18:32:03.000000000 +0100
-+++ pari-2.5.1/config/get_fltk 2012-08-01 22:28:23.000000000 +0100
-@@ -2,6 +2,9 @@
- with_fltk=yes
- fi
- FLTKDIR=
-+if test -z "$without_fltk; then
-+ FLTKDIR="`fltk-config --prefix 2>/dev/null`"
-+fi
- case "$with_fltk" in
- yes)
- pth=$libpth; lib=fltk; . ./locatelib
-diff -Nur pari-2.5.1.orig/config/get_graphic_lib pari-2.5.1/config/get_graphic_lib
---- pari-2.5.1.orig/config/get_graphic_lib 2012-08-01 18:32:03.000000000 +0100
-+++ pari-2.5.1/config/get_graphic_lib 2012-08-01 22:16:57.000000000 +0100
-@@ -11,6 +11,7 @@
- else
- if test -n "$with_fltk"; then which_graphic_lib=fltk; fi
- if test -n "$with_qt"; then which_graphic_lib=Qt; fi
-+ if test -n "$without_fltk" -a -n "$without_qt"; then which_graphic_lib=none; fi
- if test "$which_graphic_lib" != none; then
- case $osname in
- mingw) case $which_graphic_lib in
-@@ -41,7 +42,7 @@
- case $which_graphic_lib in
- auto|fltk)
- . ./get_fltk # FLTKDIR, FLTK_LIBS
-- if test -z "$FLTKDIR"; then
-+ if test -z "`fltk-config --ldflags 2> /dev/null`"; then
- case $which_graphic_lib in fltk) which_graphic_lib=none;; esac
- else
- which_graphic_lib=fltk
-diff -Nur pari-2.5.1.orig/config/get_Qt pari-2.5.1/config/get_Qt
---- pari-2.5.1.orig/config/get_Qt 2012-08-01 18:32:03.000000000 +0100
-+++ pari-2.5.1/config/get_Qt 2012-08-01 20:39:28.000000000 +0100
-@@ -5,7 +5,7 @@
- case "$with_qt" in
- yes)
- pth="/usr/local/lib /usr/local/share /usr/lib /usr/share"
-- QTDIR=`locatedir qt4/bin $pth`
-+ QTDIR=`locatedir qt4 $pth`
- QTLIB="-lQtCore -lQtGui"
- which_graphic_lib=Qt4
- if test -z "$QTDIR"; then
-diff -Nur pari-2.5.1.orig/config/Makefile.SH pari-2.5.1/config/Makefile.SH
---- pari-2.5.1.orig/config/Makefile.SH 2012-08-01 18:32:03.000000000 +0100
-+++ pari-2.5.1/config/Makefile.SH 2012-08-01 21:08:20.000000000 +0100
-@@ -65,12 +65,12 @@
- PLOTLIBS="-L\$(QTDIR)/lib $QTLIB"
- graph=plotQt;;
- Qt4)
-- PLOTCFLAGS='-D__FANCY_WIN__ -I$(QTDIR)/include'
-- PLOTLIBS="-L\$(QTDIR)/lib $QTLIB"
-+ PLOTCFLAGS='-D__FANCY_WIN__ `pkg-config --cflags QtGui`'
-+ PLOTLIBS="`pkg-config --libs QtGui`"
- graph=plotQt4;;
- fltk)
-- PLOTCFLAGS="-I\$(FLTKDIR)/include $X11_INC"
-- PLOTLIBS="-L\$(FLTKDIR)/lib -lfltk $FLTK_LIBS"
-+ PLOTCFLAGS="`fltk-config --cxxflags` $X11_INC"
-+ PLOTLIBS="`fltk-config --ldflags`"
- postconfig='-fltk-config --post '
- graph=plotfltk;;
- win32)
-@@ -254,7 +254,7 @@
- GMPINCLUDE = $GMPINCLUDE
- # Graphic library.
- QTDIR = "$QTDIR"
--MOC = \$(QTDIR)/bin/moc
-+MOC = "`which moc`"
- PLOTCFLAGS = $PLOTCFLAGS
- PLOTLIBS = $PLOTLIBS
- CPLUSPLUS = g++
diff --git a/sci-mathematics/pari/files/pari-2.5.4-polred.patch b/sci-mathematics/pari/files/pari-2.5.4-polred.patch
deleted file mode 100644
index 4287c9d35d66..000000000000
--- a/sci-mathematics/pari/files/pari-2.5.4-polred.patch
+++ /dev/null
@@ -1,754 +0,0 @@
-diff -ru src/src/basemath/base1.c b/src/basemath/base1.c
---- src/src/basemath/base1.c 2013-05-06 16:01:56.000000000 +0200
-+++ b/src/basemath/base1.c 2013-05-06 16:49:09.042406927 +0200
-@@ -1675,40 +1675,42 @@
- ZX_is_better(GEN y, GEN x, GEN *dx)
- {
- GEN d = ZX_disc(y);
-- long cmp = absi_cmp(d, *dx);
-+ int cmp;
-+ if (!*dx) *dx = ZX_disc(x);
-+ cmp = absi_cmp(d, *dx);
- if (cmp < 0) { *dx = d; return 1; }
- if (cmp == 0) return cmp_abs_ZX(y, x) < 0;
- return 0;
- }
-
--static GEN polred_aux(nfbasic_t *T, GEN *pro, long flag);
-+static void polredbest_aux(nfbasic_t *T, GEN *pro, GEN *px, GEN *pdx, GEN *pa);
- /* Seek a simpler, polynomial pol defining the same number field as
- * x (assumed to be monic at this point) */
- static GEN
- nfpolred(nfbasic_t *T, GEN *pro)
- {
-- GEN x = T->x, dx = T->dx, a, z, rev, pow, dpow;
-+ GEN x = T->x, dx, b, rev, pow, dpow;
- long i, n = degpol(x), v = varn(x);
-
- if (n == 1) {
- T->x = deg1pol_shallow(gen_1, gen_m1, v);
- *pro = NULL; return pol_1(v);
- }
-- z = polred_aux(T, pro, nf_ORIG | nf_RED);
-- if (typ(z) != t_VEC || !ZX_is_better(gel(z,1),x,&dx))
-- return NULL; /* no improvement */
--
-- rev = QXQ_reverse(gel(z,2), x);
-- x = gel(z,1); if (DEBUGLEVEL>1) err_printf("xbest = %Ps\n",x);
-+ polredbest_aux(T, pro, &x, &dx, &b);
-+ if (x == T->x) return NULL; /* no improvement */
-+ if (DEBUGLEVEL>1) err_printf("xbest = %Ps\n",x);
-
- /* update T */
-+ rev = QXQ_reverse(b, T->x);
- pow = QXQ_powers(rev, n-1, x);
- pow = Q_remove_denom(pow, &dpow);
-- a = T->bas;
-- for (i=2; i<=n; i++) gel(a,i) = QX_ZXQV_eval(gel(a,i), pow, dpow);
-+ for (i=2; i<=n; i++) gel(T->bas,i) = QX_ZXQV_eval(gel(T->bas,i), pow, dpow);
- (void)Z_issquareall(diviiexact(dx,T->dK), &(T->index));
-- T->basden = get_bas_den(a);
-- T->dx = dx; T->x = x; *pro = NULL; return rev;
-+ T->basden = get_bas_den(T->bas);
-+ T->dx = dx;
-+ T->x = x;
-+ *pro = NULL; /* reset */
-+ return rev;
- }
-
- /* let bas a t_VEC of QX giving a Z-basis of O_K. Return the index of the
-@@ -1776,7 +1778,7 @@
- x = Q_primpart(x);
- RgX_check_ZX(x, "nfinit");
- if (!ZX_is_irred(x)) pari_err(redpoler, "nfinit");
-- if (flag & nf_RED || !gequal1(gel(x,lg(x)-1)))
-+ if (flag & nf_RED || !equali1(gel(x,lg(x)-1)))
- x = ZX_Q_normalize(x, &(T->lead));
- nfmaxord(&S, x, flag, fa);
- index = S.index;
-@@ -1822,26 +1824,32 @@
- nfinitall(GEN x, long flag, long prec)
- {
- const pari_sp av = avma;
-- GEN nf;
-+ GEN nf, lead;
- nfbasic_t T;
-
- nfbasic_init(x, flag, NULL, &T);
- nfbasic_add_disc(&T); /* more expensive after set_LLL_basis */
-- if (T.lead != gen_1 && !(flag & nf_RED))
-+ lead = T.lead;
-+ if (lead != gen_1 && !(flag & nf_RED))
- {
- pari_warn(warner,"non-monic polynomial. Result of the form [nf,c]");
- flag |= nf_RED | nf_ORIG;
- }
- if (flag & nf_RED)
- {
-- GEN ro, rev = nfpolred(&T, &ro);
-+ GEN ro, rev;
-+ /* lie to polred: more efficient to update *after* modreverse, than to
-+ * unscale in the polred subsystem */
-+ T.lead = gen_1;
-+ rev = nfpolred(&T, &ro);
- nf = nfbasic_to_nf(&T, ro, prec);
- if (flag & nf_ORIG)
- {
- if (!rev) rev = pol_x(varn(T.x)); /* no improvement */
-- if (T.lead != gen_1) rev = RgX_Rg_div(rev, T.lead);
-+ if (lead != gen_1) rev = RgX_Rg_div(rev, lead);
- nf = mkvec2(nf, mkpolmod(rev, T.x));
- }
-+ T.lead = lead; /* restore */
- } else {
- GEN ro; set_LLL_basis(&T, &ro, 0.99);
- nf = nfbasic_to_nf(&T, ro, prec);
-@@ -1948,7 +1956,7 @@
- get_polchar(CG_data *d, GEN x)
- { return get_pol(d, RgM_RgC_mul(d->ZKembed,x)); }
-
--/* return a defining polynomial for Q(w_i) */
-+/* return a defining polynomial for Q(w_k) */
- static GEN
- get_polmin_w(CG_data *d, long k)
- {
-@@ -1956,6 +1964,22 @@
- if (g) (void)ZX_gcd_all(g, ZX_deriv(g), &g);
- return g;
- }
-+/* return a defining polynomial for Q(w_k+w_l) */
-+static GEN
-+get_polmin_add2(CG_data *d, long k, long l)
-+{
-+ GEN g = get_pol(d, RgV_add(gel(d->ZKembed,k), gel(d->ZKembed,l)));
-+ if (g) (void)ZX_gcd_all(g, ZX_deriv(g), &g);
-+ return g;
-+}
-+/* return a defining polynomial for Q(w_k-w_l) */
-+static GEN
-+get_polmin_sub2(CG_data *d, long k, long l)
-+{
-+ GEN g = get_pol(d, RgV_sub(gel(d->ZKembed,k), gel(d->ZKembed,l)));
-+ if (g) (void)ZX_gcd_all(g, ZX_deriv(g), &g);
-+ return g;
-+}
-
- /* does x generate the correct field ? */
- static GEN
-@@ -2044,13 +2068,67 @@
- d->v = varn(T->x);
- d->r1= T->r1; return prec;
- }
-+static void
-+update(GEN *pai, GEN *pch, nfbasic_t *T, long orig)
-+{
-+ GEN ch = *pch, ai = *pai;
-+ if (!ch)
-+ { /* accuracy too low, compute algebraically */
-+ ch = ZXQ_charpoly(ai, T->x, varn(T->x));
-+ (void)ZX_gcd_all(ch, ZX_deriv(ch), &ch);
-+ }
-+ if (ZX_canon_neg(ch) && orig) ai = RgX_neg(ai);
-+ if (DEBUGLEVEL>3) err_printf("polred: generator %Ps\n", ch);
-+ if (T->lead != gen_1 && orig) ai = RgX_unscale(ai, ginv(T->lead));
-+ *pch = ch; *pai = ai;
-+}
-+static GEN
-+findmindisc(GEN y, GEN *pa)
-+{
-+ GEN a = *pa, x = gel(y,1), b = gel(a,1), dx = NULL;
-+ long i, l = lg(y);
-+ for (i = 2; i < l; i++)
-+ {
-+ GEN yi = gel(y,i);
-+ if (ZX_is_better(yi,x,&dx)) { x = yi; b = gel(a,i); }
-+ }
-+ *pa = b; return x;
-+}
-+/* filter [y,b] from polred_aux: keep a single polynomial of degree n in y
-+ * [ the best wrt discriminant ordering ], but keep all non-primitive
-+ * polynomials */
-+static void
-+filter(GEN y, GEN b, long n)
-+{
-+ GEN x, a, dx;
-+ long i, k = 1, l = lg(y);
-+ a = x = dx = NULL;
-+ for (i = 1; i < l; i++)
-+ {
-+ GEN yi = gel(y,i), ai = gel(b,i);
-+ if (degpol(yi) == n)
-+ {
-+ if (dx && !ZX_is_better(yi,x,&dx)) continue;
-+ if (!dx) dx = ZX_disc(yi);
-+ x = yi; a = ai; continue;
-+ }
-+ gel(y,k) = yi;
-+ gel(b,k) = ai; k++;
-+ }
-+ if (dx)
-+ {
-+ gel(y,k) = x;
-+ gel(b,k) = a; k++;
-+ }
-+ setlg(y, k);
-+ setlg(b, k);
-+}
-+
- static GEN
--polred_aux(nfbasic_t *T, GEN *pro, long flag)
-+polred_aux(nfbasic_t *T, GEN *pro, long orig)
- {
- GEN b, y, x = T->x;
-- long i, v = varn(x), l = lg(T->bas);
-- const long orig = flag & nf_ORIG;
-- const long nfred = flag & nf_RED;
-+ long maxi, i, j, k, v = varn(x), n = lg(T->bas)-1;
- nffp_t F;
- CG_data d;
-
-@@ -2058,27 +2136,41 @@
- *pro = F.ro;
- d.ZKembed = F.M;
-
-- y = cgetg(l, t_VEC);
-- b = cgetg(l, t_COL);
-+ /* n + 2 sum_{1 <= i <= n} n-i = n + n(n-1) = n*n */
-+ y = cgetg(n*n + 1, t_VEC);
-+ b = cgetg(n*n + 1, t_COL);
-+ /* i = 1 */
- gel(y,1) = deg1pol_shallow(gen_1, gen_m1, v);
- gel(b,1) = gen_1;
-- for (i = 2; i < l; i++)
-+ for (i = k = 2; i <= n; i++)
- {
-- GEN ch, ai = gel(T->bas,i);
-+ GEN ch, ai;
-+ ai = gel(T->bas,i);
- ch = get_polmin_w(&d, i);
-- /* if accuracy too low, compute algebraically */
-- if (!ch)
-+ update(&ai, &ch, T, orig);
-+ gel(y,k) = ch;
-+ gel(b,k) = ai; k++;
-+ }
-+ k = i;
-+ maxi = minss(n, 3);
-+ for (i = 1; i <= maxi; i++)
-+ for (j = i+1; j <= n; j++)
- {
-- ch = ZXQ_charpoly(ai, x, v);
-- (void)ZX_gcd_all(ch, ZX_deriv(ch), &ch);
-+ GEN ch, ai;
-+ ai = gadd(gel(T->bas,i), gel(T->bas,j));
-+ ch = get_polmin_add2(&d, i, j);
-+ update(&ai, &ch, T, orig);
-+ gel(y,k) = ch;
-+ gel(b,k) = ai; k++;
-+
-+ ai = gsub(gel(T->bas,i), gel(T->bas,j));
-+ ch = get_polmin_sub2(&d, i, j);
-+ update(&ai, &ch, T, orig);
-+ gel(y,k) = ch;
-+ gel(b,k) = ai; k++;
- }
-- if (ZX_canon_neg(ch) && orig) ai = RgX_neg(ai);
-- if (nfred && degpol(ch) == l-1) return mkvec2(ch, ai);
-- if (DEBUGLEVEL>3) err_printf("polred: generator %Ps\n", ch);
-- if (T->lead != gen_1 && orig) ai = RgX_unscale(ai, ginv(T->lead));
-- gel(y,i) = ch;
-- gel(b,i) = ai;
-- }
-+ setlg(y, k);
-+ setlg(b, k); filter(y, b, n);
- if (!orig) return gen_sort_uniq(y, (void*)cmpii, &gen_cmp_RgX);
- (void)sort_factor_pol(mkmat2(y, b), cmpii);
- settyp(y, t_COL); return mkmat2(b, y);
-@@ -2089,10 +2181,58 @@
- {
- pari_sp av = avma;
- GEN ro;
-- nfbasic_t T; nfbasic_init(x, flag & (nf_PARTIALFACT|nf_RED), fa, &T);
-+ nfbasic_t T; nfbasic_init(x, flag & nf_PARTIALFACT, fa, &T);
- return gerepilecopy(av, polred_aux(&T, &ro, flag & nf_ORIG));
- }
-
-+/* finds "best" polynomial in polred_aux list, defaulting to T->x if none of
-+ * them is primitive. *px is the ZX, characteristic polynomial of *pb, *pdx
-+ * its discriminant.
-+ * Set *pro = polroots(T->x) [ NOT *px ], in case caller needs it. */
-+static void
-+polredbest_aux(nfbasic_t *T, GEN *pro, GEN *px, GEN *pdx, GEN *pb)
-+{
-+ GEN a, v, y, x = T->x, b = pol_x(varn(x)); /* default values */
-+ long i, l, n = degpol(x);
-+ v = polred_aux(T, pro, nf_ORIG);
-+ *pdx = T->dx;
-+ y = gel(v,2);
-+ a = gel(v,1); l = lg(a);
-+ for (i=1; i ((n+2)>>1)) max = (n+2)>>1;
- for (j = 1; j <= n; j++)
-@@ -3193,9 +3205,10 @@
- }
- if (best_row)
- {
-+ double d = lbest-1;
- GEN s = NULL;
- long k;
-- bound /= (lbest-1);
-+ bound /= d*d*d;
- for (k = 1; k < lbest; k++)
- {
- GEN c = coeff_det(M, best_row, best[k], max, bound);
-@@ -3205,9 +3218,10 @@
- }
- if (best_col)
- {
-+ double d = lbest-1;
- GEN s = NULL;
- long k;
-- bound /= (lbest-1);
-+ bound /= d*d*d;
- for (k = 1; k < lbest; k++)
- {
- GEN c = coeff_det(M, best[k], best_col, max, bound);
-@@ -3230,15 +3244,24 @@
- if (!n) return gen_1;
- if (n != lg(a[1])-1) pari_err(mattype1,"det");
- if (n == 1) return gcopy(gcoeff(a,1,1));
-- if (RgM_is_FpM(a, &p) && p)
-+ if (RgM_is_FpM(a, &p))
- {
-- pari_sp av = avma;
-- return gerepilecopy(av, Fp_to_mod(FpM_det(RgM_to_FpM(a, p), p), p));
-+ pari_sp av;
-+ if (!p)
-+ { /* ZM */
-+ return det_simple_gauss(a, NULL, &gauss_get_pivot_NZ);
-+ }
-+ else
-+ { /* FpM */
-+ av = avma;
-+ return gerepilecopy(av, Fp_to_mod(FpM_det(RgM_to_FpM(a, p), p), p));
-+ }
- }
-+ if (n == 2) return det2x2 (a);
- pivot = get_pivot_fun(a, &data);
- if (pivot != gauss_get_pivot_NZ) return det_simple_gauss(a, data, pivot);
-- B = (double)n; B = B*B; B = B*B;
-- return det_develop(a, 7, B);
-+ B = (double)n;
-+ return det_develop(a, 7, B*B*B);
- }
-
-
diff --git a/sci-mathematics/pari/files/pari-2.7.0-doc-make.patch b/sci-mathematics/pari/files/pari-2.7.0-doc-make.patch
deleted file mode 100644
index 4292688d97af..000000000000
--- a/sci-mathematics/pari/files/pari-2.7.0-doc-make.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Naur pari-2.7.0/config/DOC_Make.SH pari-2.7.0_a/config/DOC_Make.SH
---- pari-2.7.0/config/DOC_Make.SH 2014-03-20 21:59:28.000000000 +1300
-+++ pari-2.7.0_a/config/DOC_Make.SH 2014-05-05 13:20:09.119923587 +1200
-@@ -23,7 +23,8 @@
-
- doc all: develop.dvi libpari.dvi parallel.dvi users.dvi refcard.ps tutorial.dvi
- docps: develop.ps libpari.ps parallel.ps refcard.ps tutorial.ps users.ps INSTALL.ps
--docpdf: develop.pdf libpari.pdf parallel.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
-+#docpdf: develop.pdf libpari.pdf parallel.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
-+docpdf: \$(PARI_TEX) \$(MACROS) pass1 pass2 indexing refcard.pdf INSTALL.pdf
-
- .SUFFIXES: .tex .ipf .pod .inf .dumbpod .3 .html
-
-@@ -39,38 +40,60 @@
- %.dvi: %.tex \$(MACROS)
- \$(TEX) \$<
-
-+pass1: \$(PARI_TEX) \$(USERS_TEX) develop.tex tutorial.tex \$(MACROS)
-+ -rm -f *.std
-+ pdftex libpari
-+ pdftex develop
-+ pdftex tutorial
-+ pdftex users
-+
-+pass2: pass1
-+ pdftex libpari
-+ pdftex develop
-+ pdftex tutorial
-+ pdftex users
-+
-+indexing: pass2
-+ \$(MAKE) libpari.std
-+ \$(MAKE) develop.std
-+ \$(MAKE) users.std
-+ pdftex libpari
-+ pdftex develop
-+ pdftex users
-+ -rm -f *.std
-+
- libpari.pdf: \$(PARI_TEX) \$(MACROS)
- -rm -f libpari.std
- \$(PDFTEX) libpari
- \$(PDFTEX) libpari
-- make libpari.std; \$(PDFTEX) libpari; rm -f libpari.std
-+ \$(MAKE) libpari.std; \$(PDFTEX) libpari; rm -f libpari.std
- libpari.dvi: \$(PARI_TEX) \$(MACROS)
- -rm -f libpari.std
- \$(TEX) libpari
- \$(TEX) libpari
-- make libpari.std; \$(TEX) libpari; rm -f libpari.std
-+ \$(MAKE) libpari.std; \$(TEX) libpari; rm -f libpari.std
-
- develop.pdf: develop.tex \$(MACROS)
- -rm -f develop.std
- \$(PDFTEX) develop
- \$(PDFTEX) develop
-- make develop.std; \$(PDFTEX) develop; rm -f develop.std
-+ \$(MAKE) develop.std; \$(PDFTEX) develop; rm -f develop.std
- develop.dvi: develop.tex \$(MACROS)
- -rm -f develop.std
- \$(TEX) develop
- \$(TEX) develop
-- make develop.std; \$(TEX) develop; rm -f develop.std
-+ \$(MAKE) develop.std; \$(TEX) develop; rm -f develop.std
-
- parallel.pdf: parallel.tex \$(MACROS)
- -rm -f parallel.std
- \$(PDFTEX) parallel
- \$(PDFTEX) parallel
-- make parallel.std; \$(PDFTEX) parallel; rm -f parallel.std
-+ \$(MAKE) parallel.std; \$(PDFTEX) parallel; rm -f parallel.std
- parallel.dvi: parallel.tex \$(MACROS)
- -rm -f parallel.std
- \$(TEX) parallel
- \$(TEX) parallel
-- make parallel.std; \$(TEX) parallel; rm -f parallel.std
-+ \$(MAKE) parallel.std; \$(TEX) parallel; rm -f parallel.std
-
- tutorial.pdf: tutorial.tex \$(MACROS)
- -rm -f tutorial.std
-@@ -104,7 +127,7 @@
- -rm -f users.std
- \$(PDFTEX) users
- \$(PDFTEX) users
-- make users.std; \$(PDFTEX) users; rm -f users.std
-+ \$(MAKE) users.std; \$(PDFTEX) users; rm -f users.std
-
- gpman: gp.1
- nroff -man gp.1 | unix2dos -ascii > gp.man
diff --git a/sci-mathematics/pari/files/pari-2.7.0-no-automagic.patch b/sci-mathematics/pari/files/pari-2.7.0-no-automagic.patch
deleted file mode 100644
index 2d77f19f9f54..000000000000
--- a/sci-mathematics/pari/files/pari-2.7.0-no-automagic.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -Naur pari-2.7.0/config/Makefile.SH pari-2.7.0_a/config/Makefile.SH
---- pari-2.7.0/config/Makefile.SH 2014-03-20 21:59:28.000000000 +1300
-+++ pari-2.7.0_a/config/Makefile.SH 2014-05-05 12:00:21.095724368 +1200
-@@ -75,12 +75,12 @@
- PLOTLIBS="-L\$(QTDIR)/lib $QTLIB"
- graph=plotQt;;
- Qt4)
-- PLOTCFLAGS='-D__FANCY_WIN__ -I$(QTDIR)/include'
-- PLOTLIBS="-L\$(QTDIR)/lib $QTLIB"
-+ PLOTCFLAGS='-D__FANCY_WIN__ `pkg-config --cflags QtGui`'
-+ PLOTLIBS="`pkg-config --libs QtGui`"
- graph=plotQt4;;
- fltk)
-- PLOTCFLAGS="-I\$(FLTKDIR)/include $X11_INC"
-- PLOTLIBS="$FLTK_LIBS"
-+ PLOTCFLAGS="`fltk-config --cxxflags` $X11_INC"
-+ PLOTLIBS="`fltk-config --ldflags`"
- postconfig='fltk-config --post '
- graph=plotfltk;;
- win32)
-@@ -269,7 +269,7 @@
- GMPINCLUDE = $GMPINCLUDE
- # Graphic library.
- QTDIR = "$QTDIR"
--MOC = \$(QTDIR)/bin/moc
-+MOC = "`which moc`"
- PLOTCFLAGS = $PLOTCFLAGS
- PLOTLIBS = $PLOTLIBS
- CPLUSPLUS = g++
-diff -Naur pari-2.7.0/config/get_Qt pari-2.7.0_a/config/get_Qt
---- pari-2.7.0/config/get_Qt 2014-03-20 21:59:28.000000000 +1300
-+++ pari-2.7.0_a/config/get_Qt 2014-05-05 11:56:42.453465262 +1200
-@@ -5,7 +5,7 @@
- case "$with_qt" in
- yes)
- pth="/usr/local/lib /usr/local/share /usr/lib /usr/share"
-- QTDIR=`locatedir qt4/bin $pth`
-+ QTDIR=`locatedir qt4 $pth`
- if test -n "$QTDIR"; then
- QTLIB="-lQtCore -lQtGui"
- which_graphic_lib=Qt4
-diff -Naur pari-2.7.0/config/get_config_options pari-2.7.0_a/config/get_config_options
---- pari-2.7.0/config/get_config_options 2014-03-20 21:59:28.000000000 +1300
-+++ pari-2.7.0_a/config/get_config_options 2014-05-05 11:49:14.577963840 +1200
-@@ -85,10 +85,12 @@
- --with-ncurses-lib=*|--with-ncurses=*)
- with_ncurses_lib=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-
-+ --without-qt|--with-qt=no) without_qt=yes ;;
- --with-qt) with_qt=yes ;;
- --with-qt=*)
- with_qt=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-
-+ --without-fltk|--with-fltk=no) without_fltk=yes ;;
- --with-fltk) with_fltk=yes ;;
- --with-fltk=*)
- with_fltk=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-@@ -164,7 +166,9 @@
- --with-gmp-lib=DIR specify location of gmp libs
-
- --with-qt[=DIR] use the Qt graphical library [prefix for Qt dir.]
-+ --without-qt do not try to use the Qt lib
- --with-fltk[=DIR] use the FLTK graphical library [prefix for FLTK dir.]
-+ --without-fltk do not try to use the FLTK lib
-
- Environment variables affecting the build:
- CC C compiler
-diff -Naur pari-2.7.0/config/get_fltk pari-2.7.0_a/config/get_fltk
---- pari-2.7.0/config/get_fltk 2014-03-20 21:59:28.000000000 +1300
-+++ pari-2.7.0_a/config/get_fltk 2014-05-05 11:49:14.578963841 +1200
-@@ -2,6 +2,9 @@
- with_fltk=yes
- fi
- FLTKDIR=
-+if test -z "$without_fltk; then
-+ FLTKDIR="`fltk-config --prefix 2>/dev/null`"
-+fi
- case "$with_fltk" in
- yes)
- pth=$libpth; lib=fltk; . ./locatelib
-diff -Naur pari-2.7.0/config/get_graphic_lib pari-2.7.0_a/config/get_graphic_lib
---- pari-2.7.0/config/get_graphic_lib 2014-03-20 21:59:28.000000000 +1300
-+++ pari-2.7.0_a/config/get_graphic_lib 2014-05-05 11:54:45.469333702 +1200
-@@ -7,6 +7,7 @@
-
- if test -n "$with_fltk"; then which_graphic_lib=fltk; fi
- if test -n "$with_qt"; then which_graphic_lib=Qt; fi
-+if test -n "$without_fltk" -a -n "$without_qt"; then which_graphic_lib=none; fi
- if test "$fastread" != yes; then
- cat << EOT
- ==========================================================================
-@@ -38,7 +39,7 @@
- case $osname in
- darwin) ;; # fltk brings in CoreFoundation, incompatible with pari_daemon
- *). ./get_fltk # FLTKDIR, FLTK_LIBS ;;
-- if test -z "$FLTKDIR"; then
-+ if test -z "`fltk-config --ldflags 2> /dev/null`"; then
- case $which_graphic_lib in fltk) which_graphic_lib=none;; esac
- else
- which_graphic_lib=fltk
diff --git a/sci-mathematics/pari/files/pari-2.7.0-no-dot-inc.patch b/sci-mathematics/pari/files/pari-2.7.0-no-dot-inc.patch
deleted file mode 100644
index 9d868ef6b6a0..000000000000
--- a/sci-mathematics/pari/files/pari-2.7.0-no-dot-inc.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 2864fe5b852e443d98af92d8929e359525ccb1a2 Mon Sep 17 00:00:00 2001
-From: Kent Fredric
-Date: Sun, 11 Jun 2017 10:31:03 +1200
-Subject: [PATCH] Fix for 5.26 removal of '.' in @INC
-
-Previous scripts assumed CWD was in @INC and that "PARI::822" was in
-wherever CWD was.
-
-This fixes both of those, and the latter, because its not obvious
-from the build system where one should assume CWD to be.
-
-Instead, the absolute path of the directory of these scripts is
-inserted into @INC
----
- src/desc/doc_make | 5 +++++
- src/desc/gen_proto | 4 ++++
- src/desc/merge_822 | 4 ++++
- 3 files changed, 13 insertions(+)
-
-diff --git a/src/desc/doc_make b/src/desc/doc_make
-index 91b894e..ffbbb78 100755
---- a/src/desc/doc_make
-+++ b/src/desc/doc_make
-@@ -1,6 +1,11 @@
- #!/usr/bin/perl
- use warnings FATAL => 'all';
- use strict;
-+
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- my (%funcs, %Fun_by_sec);
-diff --git a/src/desc/gen_proto b/src/desc/gen_proto
-index ee55449..5ca0305 100755
---- a/src/desc/gen_proto
-+++ b/src/desc/gen_proto
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl -w
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- $class=$ARGV[0];
-diff --git a/src/desc/merge_822 b/src/desc/merge_822
-index 4c9217b..32b3cc9 100755
---- a/src/desc/merge_822
-+++ b/src/desc/merge_822
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl -w
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- open(IN, $ARGV[0]) || die "cannot find $ARGV[0]";
---
-2.13.1
-
diff --git a/sci-mathematics/pari/files/pari-2.7.0-slow-discriminant.patch b/sci-mathematics/pari/files/pari-2.7.0-slow-discriminant.patch
deleted file mode 100644
index 814dc4b2ab9d..000000000000
--- a/sci-mathematics/pari/files/pari-2.7.0-slow-discriminant.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ru src/src/basemath/alglin1.c b/src/basemath/alglin1.c
---- src/src/basemath/alglin1.c 2014-01-29 18:00:27.000000000 +0100
-+++ b/src/basemath/alglin1.c 2014-02-09 01:54:37.676725196 +0100
-@@ -247,6 +247,7 @@
- a = RgM_shallowcopy(a);
- for (i=1; ired(E,gcoeff(a,k,i));
-@@ -271,7 +272,7 @@
- for (j=i+1; j<=nbco; j++)
- {
- gcoeff(a,j,k) = ff->add(E, gcoeff(a,j,k), ff->mul(E,m,gcoeff(a,j,i)));
-- if (low_stack(lim, stack_lim(av,1)))
-+ if (low_stack(lim, stack_lim(av,1)) && (garbage++ == 0))
- {
- if(DEBUGMEM>1) pari_warn(warnmem,"det. col = %ld",i);
- gerepileall(av,4, &a,&x,&q,&m);
-@@ -3721,6 +3722,7 @@
- a = RgM_shallowcopy(a);
- for (i=1; i nbco) return gerepilecopy(av, gcoeff(a,i,i));
- if (k != i)
-@@ -3740,7 +3742,7 @@
- for (j=i+1; j<=nbco; j++)
- {
- gcoeff(a,j,k) = gsub(gcoeff(a,j,k), gmul(m,gcoeff(a,j,i)));
-- if (low_stack(lim, stack_lim(av,3)))
-+ if (low_stack(lim, stack_lim(av,3)) && (garbage++ == 0))
- {
- if(DEBUGMEM>1) pari_warn(warnmem,"det. col = %ld",i);
- gerepileall(av,2, &a,&x);
-@@ -3791,6 +3793,7 @@
- {
- GEN ci, ck, m;
- int diveuc = (gequal1(pprec)==0);
-+ int garbage = 0; /* Only gerepile() once per loop iteration */
-
- p = gcoeff(a,i,i);
- if (gequal0(p))
-@@ -3827,7 +3830,7 @@
- GEN p1 = gsub(gmul(p,gel(ck,j)), gmul(m,gel(ci,j)));
- if (diveuc) p1 = mydiv(p1,pprec);
- gel(ck,j) = gerepileupto(av2, p1);
-- if (low_stack(lim,stack_lim(av,2)))
-+ if (low_stack(lim,stack_lim(av,2)) && (garbage++ == 0))
- {
- if(DEBUGMEM>1) pari_warn(warnmem,"det. col = %ld",i);
- gerepileall(av,2, &a,&pprec);
diff --git a/sci-mathematics/pari/files/pari-2.7.1-perl-5.22-doc.patch b/sci-mathematics/pari/files/pari-2.7.1-perl-5.22-doc.patch
deleted file mode 100644
index c4bbadcb2e0c..000000000000
--- a/sci-mathematics/pari/files/pari-2.7.1-perl-5.22-doc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -U2 -r pari-2.7.1.orig/src/desc/doc_make pari-2.7.1/src/desc/doc_make
---- pari-2.7.1.orig/src/desc/doc_make 2014-05-11 00:59:29.000000000 +0700
-+++ pari-2.7.1/src/desc/doc_make 2015-11-15 00:51:11.494845695 +0600
-@@ -39,6 +39,6 @@
- $v =~ s/(\w\w+)/\\var{$1}/g;
- $v =~ s/\^([a-z])/\\hbox{\\kbd{\\pow}}$1/g;
-- $v =~ s/\\var{flag}/\\fl/g;
-- $v =~ s/\\var{(\d+)}/{$1}/g;
-+ $v =~ s/\\var\{flag}/\\fl/g;
-+ $v =~ s/\\var\{(\d+)}/{$1}/g;
-
- $v = "\$($v)\$";
diff --git a/sci-mathematics/pari/pari-2.3.5.ebuild b/sci-mathematics/pari/pari-2.3.5.ebuild
index a0f484b46778..d996d2354694 100644
--- a/sci-mathematics/pari/pari-2.3.5.ebuild
+++ b/sci-mathematics/pari/pari-2.3.5.ebuild
@@ -9,6 +9,7 @@ HOMEPAGE="http://pari.math.u-bordeaux.fr/"
SRC_COM="http://pari.math.u-bordeaux.fr/pub/${PN}"
SRC_URI="${SRC_COM}/unix/${P}.tar.gz
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2
data? ( ${SRC_COM}/packages/elldata.tgz
${SRC_COM}/packages/galdata.tgz
${SRC_COM}/packages/seadata.tgz
@@ -40,10 +41,10 @@ src_prepare() {
if use data; then
mv "${WORKDIR}"/data "${S}" || die "failed to move data"
fi
- epatch "${FILESDIR}/"${PN}-2.3.2-strip.patch
- epatch "${FILESDIR}/"${PN}-2.3.2-ppc-powerpc-arch-fix.patch
- epatch "${FILESDIR}/"${PN}-2.3.5-doc-make.patch
- epatch "${FILESDIR}/"${PN}-2.3.5-no-dot-inc.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-strip.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.5-doc-make.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.5-no-dot-inc.patch
# disable default building of docs during install
sed -i \
diff --git a/sci-mathematics/pari/pari-2.5.0-r3.ebuild b/sci-mathematics/pari/pari-2.5.0-r3.ebuild
deleted file mode 100644
index 57421935e631..000000000000
--- a/sci-mathematics/pari/pari-2.5.0-r3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A software package for computer-aided number theory"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="doc data fltk gmp X"
-
-RDEPEND="sys-libs/readline
- fltk? ( x11-libs/fltk:1 )
- gmp? ( dev-libs/gmp )
- X? ( x11-libs/libX11 )
- doc? ( X? ( x11-misc/xdg-utils ) )
- data? ( sci-mathematics/pari-data )"
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )"
-
-get_compile_dir() {
- pushd "${S}/config" > /dev/null
- local fastread=yes
- source ./get_archos
- popd > /dev/null
- echo "O${osname}-${arch}"
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}"-2.3.2-strip.patch
- epatch "${FILESDIR}/${PN}"-2.3.2-ppc-powerpc-arch-fix.patch
- # fix parallel make
- epatch "${FILESDIR}/${PN}"-2.5.0-doc-make.patch
- # sage error handling patch
- epatch "${FILESDIR}/${PN}"-2.5.0-mp.c.patch
- # OS X: add -install_name to the linker option
- epatch "${FILESDIR}/${PN}"-2.5.0-macos.patch
- # Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
-
- # disable default building of docs during install
- sed -i \
- -e "s:install-doc install-examples:install-examples:" \
- config/Makefile.SH || die "Failed to fix makefile"
-
- # propagate ldflags
- sed -i \
- -e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
- config/get_dlld || die "failed to fix LDFLAGS"
- # move doc dir to a gentoo doc dir and replace acroread by xdg-open
- sed -i \
- -e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
- -e 's:"acroread":"xdg-open":' \
- doc/gphelp.in || die "Failed to fix doc dir"
-
- sed -i "s:/usr:${EPREFIX}/usr:g" config/get_X11 \
- || die "Failed to fix get_X11"
-
- # usersch3.tex is generated
- rm -f doc/usersch3.tex || die "failed to remove generated file"
-}
-
-src_configure() {
- tc-export CC
-
- # need to force optimization here, as it breaks without
- if is-flag -O0; then
- replace-flags -O0 -O2
- elif ! is-flag -O?; then
- append-flags -O2
- fi
-
- local myconfig
- if use gmp ; then
- myconfig="--with-gmp=${EPREFIX}/usr"
- else
- myconfig="--with-gmp=no"
- fi
-
- # sysdatadir installs a pari.cfg stuff which is informative only
- ./Configure \
- --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share/${PN} \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
- --mandir="${EPREFIX}"/usr/share/man/man1 \
- --with-readline="${EPREFIX}"/usr \
- --with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
- $myconfig \
- || die "./Configure failed"
-}
-
-src_compile() {
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
-
- # upstream set -fno-strict-aliasing.
- # aliasing is a known issue on amd64, work on x86 by sheer luck
- emake ${mymake} \
- CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
- emake ${mymake} \
- CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
-
- if use doc; then
- cd "${S}" || die "failed to change directory"
- # To prevent sandbox violations by metafont
- VARTEXFONTS="${T}"/fonts emake docpdf
- fi
-}
-
-src_test() {
- emake dobench
-}
-
-src_install() {
- default
- dodoc MACHINES COMPAT
- if use doc; then
- # install gphelp and the pdf documentations manually.
- # the install-doc target is overkill.
- dodoc doc/*.pdf
- dobin doc/gphelp
- insinto /usr/share/doc/${PF}
- # gphelp looks for some of the tex sources...
- doins doc/*.tex doc/translations
- # Install the examples - for real.
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- emake EXDIR="${ED}/usr/share/doc/${PF}/examples" install-examples
- fi
-}
diff --git a/sci-mathematics/pari/pari-2.5.1-r1.ebuild b/sci-mathematics/pari/pari-2.5.1-r1.ebuild
deleted file mode 100644
index 7202ed087dea..000000000000
--- a/sci-mathematics/pari/pari-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="A software package for computer-aided number theory"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="data doc fltk gmp qt4 X"
-
-RDEPEND="sys-libs/readline
- data? ( sci-mathematics/pari-data )
- doc? ( X? ( x11-misc/xdg-utils ) )
- fltk? ( x11-libs/fltk:1 )
- gmp? ( dev-libs/gmp )
- qt4? ( dev-qt/qtgui:4 )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )"
-
-get_compile_dir() {
- pushd "${S}/config" > /dev/null
- local fastread=yes
- source ./get_archos
- popd > /dev/null
- echo "O${osname}-${arch}"
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.2-strip.patch
- epatch "${FILESDIR}"/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
- # fix parallel make
- epatch "${FILESDIR}"/${PN}-2.5.0-doc-make.patch
- # sage error handling patch
- epatch "${FILESDIR}"/${PN}-2.5.0-mp.c.patch
- # OS X: add -install_name to the linker option
- epatch "${FILESDIR}"/${PN}-2.5.0-macos.patch
- # Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
- # from debian, fies bug #423617
- epatch "${FILESDIR}"/${PN}-2.5.1-gcc47.patch
- # fix automagic
- epatch "${FILESDIR}"/${PN}-2.5.1-no-automagic.patch
- # upstream fixes
- epatch "${FILESDIR}"/${PN}-2.5.1-1302.patch
- epatch "${FILESDIR}"/${PN}-2.5.1-1304.patch
-
- # disable default building of docs during install
- sed -i \
- -e "s:install-doc install-examples:install-examples:" \
- config/Makefile.SH || die "Failed to fix makefile"
-
- # propagate ldflags
- sed -i \
- -e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
- config/get_dlld || die "failed to fix LDFLAGS"
- # move doc dir to a gentoo doc dir and replace acroread by xdg-open
- sed -i \
- -e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
- -e 's:"acroread":"xdg-open":' \
- doc/gphelp.in || die "Failed to fix doc dir"
-
- sed -i "s:/usr:${EPREFIX}/usr:g" config/get_X11 \
- || die "Failed to fix get_X11"
-
- # usersch3.tex is generated
- rm -f doc/usersch3.tex || die "failed to remove generated file"
-}
-
-src_configure() {
- tc-export CC
-
- # need to force optimization here, as it breaks without
- if is-flag -O0; then
- replace-flags -O0 -O2
- elif ! is-flag -O?; then
- append-flags -O2
- fi
-
- # sysdatadir installs a pari.cfg stuff which is informative only
- ./Configure \
- --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share/${PN} \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
- --mandir="${EPREFIX}"/usr/share/man/man1 \
- --with-readline="${EPREFIX}"/usr \
- --with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
- $(use_with fltk) \
- $(use_with gmp) \
- $(use_with qt4 qt) \
- || die "./Configure failed"
-}
-
-src_compile() {
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- # upstream set -fno-strict-aliasing.
- # aliasing is a known issue on amd64, work on x86 by sheer luck
- emake ${mymake} \
- CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
- emake ${mymake} \
- CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
-
- if use doc; then
- cd "${S}" || die "failed to change directory"
- # To prevent sandbox violations by metafont
- VARTEXFONTS="${T}"/fonts emake docpdf
- fi
-}
-
-src_test() {
- emake dobench
-}
-
-src_install() {
- default
- dodoc MACHINES COMPAT
- if use doc; then
- # install gphelp and the pdf documentations manually.
- # the install-doc target is overkill.
- dodoc doc/*.pdf
- dobin doc/gphelp
- insinto /usr/share/doc/${PF}
- # gphelp looks for some of the tex sources...
- doins doc/*.tex doc/translations
- # Install the examples - for real.
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- emake EXDIR="${ED}/usr/share/doc/${PF}/examples" install-examples
- fi
-}
diff --git a/sci-mathematics/pari/pari-2.5.1.ebuild b/sci-mathematics/pari/pari-2.5.1.ebuild
deleted file mode 100644
index fb1efebef0c3..000000000000
--- a/sci-mathematics/pari/pari-2.5.1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A software package for computer-aided number theory"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="doc data fltk gmp X"
-
-RDEPEND="sys-libs/readline
- fltk? ( x11-libs/fltk:1 )
- gmp? ( dev-libs/gmp )
- X? ( x11-libs/libX11 )
- doc? ( X? ( x11-misc/xdg-utils ) )
- data? ( sci-mathematics/pari-data )"
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )"
-
-get_compile_dir() {
- pushd "${S}/config" > /dev/null
- local fastread=yes
- source ./get_archos
- popd > /dev/null
- echo "O${osname}-${arch}"
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}"-2.3.2-strip.patch
- epatch "${FILESDIR}/${PN}"-2.3.2-ppc-powerpc-arch-fix.patch
- # fix parallel make
- epatch "${FILESDIR}/${PN}"-2.5.0-doc-make.patch
- # sage error handling patch
- epatch "${FILESDIR}/${PN}"-2.5.0-mp.c.patch
- # OS X: add -install_name to the linker option
- epatch "${FILESDIR}/${PN}"-2.5.0-macos.patch
- # Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
- # from debian, fies bug #423617
- epatch "${FILESDIR}/${PN}"-2.5.1-gcc47.patch
-
- # disable default building of docs during install
- sed -i \
- -e "s:install-doc install-examples:install-examples:" \
- config/Makefile.SH || die "Failed to fix makefile"
-
- # propagate ldflags
- sed -i \
- -e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
- config/get_dlld || die "failed to fix LDFLAGS"
- # move doc dir to a gentoo doc dir and replace acroread by xdg-open
- sed -i \
- -e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
- -e 's:"acroread":"xdg-open":' \
- doc/gphelp.in || die "Failed to fix doc dir"
-
- sed -i "s:/usr:${EPREFIX}/usr:g" config/get_X11 \
- || die "Failed to fix get_X11"
-
- # usersch3.tex is generated
- rm -f doc/usersch3.tex || die "failed to remove generated file"
-}
-
-src_configure() {
- tc-export CC
-
- # need to force optimization here, as it breaks without
- if is-flag -O0; then
- replace-flags -O0 -O2
- elif ! is-flag -O?; then
- append-flags -O2
- fi
-
- local myconfig
- if use gmp ; then
- myconfig="--with-gmp=${EPREFIX}/usr"
- else
- myconfig="--with-gmp=no"
- fi
-
- # sysdatadir installs a pari.cfg stuff which is informative only
- ./Configure \
- --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share/${PN} \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
- --mandir="${EPREFIX}"/usr/share/man/man1 \
- --with-readline="${EPREFIX}"/usr \
- --with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
- $myconfig \
- || die "./Configure failed"
-}
-
-src_compile() {
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
-
- # upstream set -fno-strict-aliasing.
- # aliasing is a known issue on amd64, work on x86 by sheer luck
- emake ${mymake} \
- CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
- emake ${mymake} \
- CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
-
- if use doc; then
- cd "${S}" || die "failed to change directory"
- # To prevent sandbox violations by metafont
- VARTEXFONTS="${T}"/fonts emake docpdf
- fi
-}
-
-src_test() {
- emake dobench
-}
-
-src_install() {
- default
- dodoc MACHINES COMPAT
- if use doc; then
- # install gphelp and the pdf documentations manually.
- # the install-doc target is overkill.
- dodoc doc/*.pdf
- dobin doc/gphelp
- insinto /usr/share/doc/${PF}
- # gphelp looks for some of the tex sources...
- doins doc/*.tex doc/translations
- # Install the examples - for real.
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- emake EXDIR="${ED}/usr/share/doc/${PF}/examples" install-examples
- fi
-}
diff --git a/sci-mathematics/pari/pari-2.5.2.ebuild b/sci-mathematics/pari/pari-2.5.2.ebuild
deleted file mode 100644
index 3bc68a6ccdc0..000000000000
--- a/sci-mathematics/pari/pari-2.5.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="A software package for computer-aided number theory"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="data doc fltk gmp qt4 X"
-
-RDEPEND="sys-libs/readline
- data? ( sci-mathematics/pari-data )
- doc? ( X? ( x11-misc/xdg-utils ) )
- fltk? ( x11-libs/fltk:1 )
- gmp? ( dev-libs/gmp )
- qt4? ( dev-qt/qtgui:4 )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )"
-
-get_compile_dir() {
- pushd "${S}/config" > /dev/null
- local fastread=yes
- source ./get_archos
- popd > /dev/null
- echo "O${osname}-${arch}"
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.2-strip.patch
- epatch "${FILESDIR}"/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
- # fix parallel make
- epatch "${FILESDIR}"/${PN}-2.5.0-doc-make.patch
- # sage error handling patch
- epatch "${FILESDIR}"/${PN}-2.5.0-mp.c.patch
- # OS X: add -install_name to the linker option
- epatch "${FILESDIR}"/${PN}-2.5.0-macos.patch
- # Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
- # fix automagic
- epatch "${FILESDIR}"/${PN}-2.5.1-no-automagic.patch
-
- # disable default building of docs during install
- sed -i \
- -e "s:install-doc install-examples:install-examples:" \
- config/Makefile.SH || die "Failed to fix makefile"
-
- # propagate ldflags
- sed -i \
- -e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
- config/get_dlld || die "failed to fix LDFLAGS"
- # move doc dir to a gentoo doc dir and replace acroread by xdg-open
- sed -i \
- -e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
- -e 's:"acroread":"xdg-open":' \
- doc/gphelp.in || die "Failed to fix doc dir"
-
- sed -i "s:/\(usr\|lib64\):${EPREFIX}/\1:g" \
- config/get_{Qt,X11,include_path,libpth} \
- || die "Failed to fix get_X11"
-
- # usersch3.tex is generated
- rm doc/usersch3.tex || die "failed to remove generated file"
-}
-
-src_configure() {
- tc-export CC
-
- # need to force optimization here, as it breaks without
- if is-flag -O0; then
- replace-flags -O0 -O2
- elif ! is-flag -O?; then
- append-flags -O2
- fi
-
- # sysdatadir installs a pari.cfg stuff which is informative only
- ./Configure \
- --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share/${PN} \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
- --mandir="${EPREFIX}"/usr/share/man/man1 \
- --with-readline="${EPREFIX}"/usr \
- --with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
- $(use_with fltk) \
- $(use_with gmp) \
- $(use_with qt4 qt) \
- || die "./Configure failed"
-}
-
-src_compile() {
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- # upstream set -fno-strict-aliasing.
- # aliasing is a known issue on amd64, work on x86 by sheer luck
- emake ${mymake} \
- CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
- emake ${mymake} \
- CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
-
- if use doc; then
- cd "${S}" || die "failed to change directory"
- # To prevent sandbox violations by metafont
- VARTEXFONTS="${T}"/fonts emake docpdf
- fi
-}
-
-src_test() {
- emake dobench
-}
-
-src_install() {
- default
- dodoc MACHINES COMPAT
- if use doc; then
- # install gphelp and the pdf documentations manually.
- # the install-doc target is overkill.
- dodoc doc/*.pdf
- dobin doc/gphelp
- insinto /usr/share/doc/${PF}
- # gphelp looks for some of the tex sources...
- doins doc/*.tex doc/translations
- # Install the examples - for real.
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- emake EXDIR="${ED}/usr/share/doc/${PF}/examples" install-examples
- fi
-}
diff --git a/sci-mathematics/pari/pari-2.5.3.ebuild b/sci-mathematics/pari/pari-2.5.3.ebuild
deleted file mode 100644
index 8f42ea7f9a84..000000000000
--- a/sci-mathematics/pari/pari-2.5.3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="A software package for computer-aided number theory"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="data doc fltk gmp qt4 X"
-
-RDEPEND="sys-libs/readline
- data? ( sci-mathematics/pari-data )
- doc? ( X? ( x11-misc/xdg-utils ) )
- fltk? ( x11-libs/fltk:1 )
- gmp? ( dev-libs/gmp )
- qt4? ( dev-qt/qtgui:4 )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )"
-
-get_compile_dir() {
- pushd "${S}/config" > /dev/null
- local fastread=yes
- source ./get_archos
- popd > /dev/null
- echo "O${osname}-${arch}"
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.2-strip.patch
- epatch "${FILESDIR}"/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
- # fix parallel make
- epatch "${FILESDIR}"/${PN}-2.5.0-doc-make.patch
- # sage error handling patch
- epatch "${FILESDIR}"/${PN}-2.5.0-mp.c.patch
- # OS X: add -install_name to the linker option
- epatch "${FILESDIR}"/${PN}-2.5.0-macos.patch
- # Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
- # fix automagic
- epatch "${FILESDIR}"/${PN}-2.5.1-no-automagic.patch
-
- # disable default building of docs during install
- sed -i \
- -e "s:install-doc install-examples:install-examples:" \
- config/Makefile.SH || die "Failed to fix makefile"
-
- # propagate ldflags
- sed -i \
- -e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
- config/get_dlld || die "failed to fix LDFLAGS"
- # move doc dir to a gentoo doc dir and replace acroread by xdg-open
- sed -i \
- -e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
- -e 's:"acroread":"xdg-open":' \
- doc/gphelp.in || die "Failed to fix doc dir"
-
- sed -i "s:/\(usr\|lib64\):${EPREFIX}/\1:g" \
- config/get_{Qt,X11,include_path,libpth} \
- || die "Failed to fix get_X11"
-
- # usersch3.tex is generated
- rm doc/usersch3.tex || die "failed to remove generated file"
-}
-
-src_configure() {
- tc-export CC
-
- # need to force optimization here, as it breaks without
- if is-flag -O0; then
- replace-flags -O0 -O2
- elif ! is-flag -O?; then
- append-flags -O2
- fi
-
- # sysdatadir installs a pari.cfg stuff which is informative only
- ./Configure \
- --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share/${PN} \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
- --mandir="${EPREFIX}"/usr/share/man/man1 \
- --with-readline="${EPREFIX}"/usr \
- --with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
- $(use_with fltk) \
- $(use_with gmp) \
- $(use_with qt4 qt) \
- || die "./Configure failed"
-}
-
-src_compile() {
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- # upstream set -fno-strict-aliasing.
- # aliasing is a known issue on amd64, work on x86 by sheer luck
- emake ${mymake} \
- CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
- emake ${mymake} \
- CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
-
- if use doc; then
- cd "${S}" || die "failed to change directory"
- # To prevent sandbox violations by metafont
- VARTEXFONTS="${T}"/fonts emake docpdf
- fi
-}
-
-src_test() {
- emake dobench
-}
-
-src_install() {
- default
- dodoc MACHINES COMPAT
- if use doc; then
- # install gphelp and the pdf documentations manually.
- # the install-doc target is overkill.
- dodoc doc/*.pdf
- dobin doc/gphelp
- insinto /usr/share/doc/${PF}
- # gphelp looks for some of the tex sources...
- doins doc/*.tex doc/translations
- # Install the examples - for real.
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- emake EXDIR="${ED}/usr/share/doc/${PF}/examples" install-examples
- fi
-}
diff --git a/sci-mathematics/pari/pari-2.5.4.ebuild b/sci-mathematics/pari/pari-2.5.4.ebuild
index 2c261d95efc2..78f5d5418c9c 100644
--- a/sci-mathematics/pari/pari-2.5.4.ebuild
+++ b/sci-mathematics/pari/pari-2.5.4.ebuild
@@ -7,7 +7,8 @@ inherit eutils flag-o-matic toolchain-funcs multilib
DESCRIPTION="Computer-aided number theory C library and tools"
HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
+SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -34,22 +35,22 @@ get_compile_dir() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.2-strip.patch
- epatch "${FILESDIR}"/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-strip.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
# fix parallel make
- epatch "${FILESDIR}"/${PN}-2.5.0-doc-make.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-doc-make.patch
# sage error handling patch
- epatch "${FILESDIR}"/${PN}-2.5.0-mp.c.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-mp.c.patch
# OS X: add -install_name to the linker option
- epatch "${FILESDIR}"/${PN}-2.5.0-macos.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-macos.patch
# Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-no-dot-inc.patch
# fix automagic
- epatch "${FILESDIR}"/${PN}-2.5.1-no-automagic.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.1-no-automagic.patch
# sage-on-gentoo trac 13902: Slowdown for PARI integer determinant
- epatch "${FILESDIR}"/${PN}-2.5.4-slow_determinant.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.4-slow_determinant.patch
# sage-on-gentoo trac 13054: polred bug / pari bug 1395
- epatch "${FILESDIR}"/${PN}-2.5.4-polred.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.4-polred.patch
# disable default building of docs during install
sed -i \
diff --git a/sci-mathematics/pari/pari-2.7.0.ebuild b/sci-mathematics/pari/pari-2.7.0.ebuild
deleted file mode 100644
index 5553fa2865b9..000000000000
--- a/sci-mathematics/pari/pari-2.7.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="Computer-aided number theory C library and tools"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="data doc fltk gmp qt4 X"
-
-RDEPEND="
- sys-libs/readline:0=
- data? ( sci-mathematics/pari-data )
- doc? ( X? ( x11-misc/xdg-utils ) )
- fltk? ( x11-libs/fltk:1= )
- gmp? ( dev-libs/gmp:0= )
- qt4? ( dev-qt/qtgui:4= )
- X? ( x11-libs/libX11:0= )"
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )"
-
-get_compile_dir() {
- pushd "${S}/config" > /dev/null
- local fastread=yes
- source ./get_archos
- popd > /dev/null
- echo "O${osname}-${arch}"
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.2-strip.patch
- epatch "${FILESDIR}"/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
- # fix parallel make
- epatch "${FILESDIR}"/${PN}-2.7.0-doc-make.patch
- # fix automagic
- epatch "${FILESDIR}"/${PN}-2.7.0-no-automagic.patch
- # sage-on-gentoo trac 15654: PARI discriminant speed depends on stack size
- epatch "${FILESDIR}"/${PN}-2.7.0-slow-discriminant.patch
- # Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.7.0-no-dot-inc.patch
-
- # disable default building of docs during install
- sed -i \
- -e "s:install-doc install-examples:install-examples:" \
- config/Makefile.SH || die "Failed to fix makefile"
-
- # propagate ldflags
- sed -i \
- -e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
- config/get_dlld || die "failed to fix LDFLAGS"
- # move doc dir to a gentoo doc dir and replace acroread by xdg-open
- sed -i \
- -e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
- -e 's:"acroread":"xdg-open":' \
- doc/gphelp.in || die "Failed to fix doc dir"
-
- # usersch3.tex is generated
- rm doc/usersch3.tex || die "failed to remove generated file"
-}
-
-src_configure() {
- tc-export CC
- export CPLUSPLUS=$(tc-getCXX)
-
- # need to force optimization here, as it breaks without
- if is-flag -O0; then
- replace-flags -O0 -O2
- elif ! is-flag -O?; then
- append-flags -O2
- fi
-
- # sysdatadir installs a pari.cfg stuff which is informative only
- ./Configure \
- --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share/${PN} \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
- --mandir="${EPREFIX}"/usr/share/man/man1 \
- --with-readline="${EPREFIX}"/usr \
- --with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
- $(use_with fltk) \
- $(use_with gmp) \
- $(use_with qt4 qt) \
- || die "./Configure failed"
-}
-
-src_compile() {
- use hppa && \
- mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
-
- mycxxmake=LD\=$(tc-getCXX)
-
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- # upstream set -fno-strict-aliasing.
- # aliasing is a known issue on amd64, work on x86 by sheer luck
- emake ${mymake} \
- CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
- emake ${mymake} ${mycxxmake} \
- CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
-
- if use doc; then
- cd "${S}" || die "failed to change directory"
- # To prevent sandbox violations by metafont
- VARTEXFONTS="${T}"/fonts emake docpdf
- fi
-}
-
-src_test() {
- emake dobench
-}
-
-src_install() {
- emake ${mymake} ${mycxxmake} DESTDIR="${D}" install
- dodoc MACHINES COMPAT
- if use doc; then
- # install gphelp and the pdf documentations manually.
- # the install-doc target is overkill.
- dodoc doc/*.pdf
- dobin doc/gphelp
- insinto /usr/share/doc/${PF}
- # gphelp looks for some of the tex sources...
- doins doc/*.tex doc/translations
- # Install the examples - for real.
- emake EXDIR="${ED}/usr/share/doc/${PF}/examples" \
- -C $(get_compile_dir) install-examples
- fi
-}
diff --git a/sci-mathematics/pari/pari-2.7.1.ebuild b/sci-mathematics/pari/pari-2.7.1.ebuild
index 1bf046344426..8a6913099592 100644
--- a/sci-mathematics/pari/pari-2.7.1.ebuild
+++ b/sci-mathematics/pari/pari-2.7.1.ebuild
@@ -7,7 +7,8 @@ inherit eutils flag-o-matic toolchain-funcs multilib
DESCRIPTION="Computer-aided number theory C library and tools"
HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
+SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
LICENSE="GPL-2"
SLOT="0/4"
@@ -34,18 +35,18 @@ get_compile_dir() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.2-strip.patch
- epatch "${FILESDIR}"/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-strip.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
# fix parallel make
- epatch "${FILESDIR}"/${PN}-2.7.0-doc-make.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-doc-make.patch
# fix automagic
- epatch "${FILESDIR}"/${PN}-2.7.0-no-automagic.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-no-automagic.patch
# sage-on-gentoo trac 15654: PARI discriminant speed depends on stack size
- epatch "${FILESDIR}"/${PN}-2.7.0-slow-discriminant.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-slow-discriminant.patch
# Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.7.0-no-dot-inc.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-no-dot-inc.patch
# fix building docs with perl-5.22
- epatch "${FILESDIR}"/${PN}-2.7.1-perl-5.22-doc.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.1-perl-5.22-doc.patch
# disable default building of docs during install
sed -i \
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 8138f918c586..a902b33ebd5d 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/spyview/Manifest b/sci-visualization/spyview/Manifest
index 1ef9bbc835bb..4c8bca76ba0e 100644
--- a/sci-visualization/spyview/Manifest
+++ b/sci-visualization/spyview/Manifest
@@ -1 +1,2 @@
+DIST spyview-20150124-patchset.tar.bz2 8268 BLAKE2B db7a710e2d61ad4f68e9dd31834f855b122b57fa532eb047a5efd7dd02423974f47652e4770144d02a317bf5a50c0ff852fd752ab331bad0c9efe237905916e0 SHA512 615465056df3786e18d5916dea0ad8ebd31c37ddf6531b85c080f53e0d9776c4f7519bd160ca8a0f29343b2f9fad40abef8d6b7194c4e54d6e2e14557562cc49
DIST spyview-20150124.tgz 14772947 BLAKE2B 18d3298e0498c4be91065c8651d379428541f3156ec7f2f0a6970ce5caafaa81da2ff6fbfcca42d77cfffedd293484aad19c7240ab9500e0cf7764cdb5e6ee4c SHA512 63c58c7729ceab9e1bfbb14b5d257a1d4ca51e43f7b014caffc8adf66767c17b47794b34cfc2f754c2905ff926302d66d438a582fe359a6c8d3e04b072993f5b
diff --git a/sci-visualization/spyview/files/spyview-20150124-gcc6cxx14-9.patch b/sci-visualization/spyview/files/spyview-20150124-gcc6cxx14-9.patch
deleted file mode 100644
index 0c19851d4459..000000000000
--- a/sci-visualization/spyview/files/spyview-20150124-gcc6cxx14-9.patch
+++ /dev/null
@@ -1,1249 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 5e1cfff..f1d777f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -6,6 +6,9 @@ AC_CONFIG_SRCDIR([spyview/ImageWindow.C])
- AC_CONFIG_HEADER([config.h])
- USER_DIRS
-
-+# For local macros
-+AC_CONFIG_MACRO_DIR([m4])
-+
- #
- # Work out our target
- #
-@@ -27,6 +30,10 @@ AM_CONDITIONAL(WINDOWS,test $windows_target = yes)
- AC_PROG_CXX
- AC_PROG_CC
- AM_PROG_CC_C_O
-+
-+# Check for C++11 language standard
-+AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
-+
- # Check for fluid
- AC_PATH_PROG(FLUID,fluid,none)
- AC_ARG_VAR(FLUID,[path to executable to compile .fl files])
-diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
-new file mode 100644
-index 0000000..5032bba
---- /dev/null
-+++ b/m4/ax_cxx_compile_stdcxx.m4
-@@ -0,0 +1,982 @@
-+# ===========================================================================
-+# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
-+#
-+# DESCRIPTION
-+#
-+# Check for baseline language coverage in the compiler for the specified
-+# version of the C++ standard. If necessary, add switches to CXX and
-+# CXXCPP to enable support. VERSION may be '11' (for the C++11 standard)
-+# or '14' (for the C++14 standard).
-+#
-+# The second argument, if specified, indicates whether you insist on an
-+# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-+# -std=c++11). If neither is specified, you get whatever works, with
-+# preference for an extended mode.
-+#
-+# The third argument, if specified 'mandatory' or if left unspecified,
-+# indicates that baseline support for the specified C++ standard is
-+# required and that the macro should error out if no mode with that
-+# support is found. If specified 'optional', then configuration proceeds
-+# regardless, after defining HAVE_CXX${VERSION} if and only if a
-+# supporting mode is found.
-+#
-+# LICENSE
-+#
-+# Copyright (c) 2008 Benjamin Kosnik
-+# Copyright (c) 2012 Zack Weinberg
-+# Copyright (c) 2013 Roy Stogner
-+# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov
-+# Copyright (c) 2015 Paul Norman
-+# Copyright (c) 2015 Moritz Klammler
-+# Copyright (c) 2016 Krzesimir Nowak
-+#
-+# Copying and distribution of this file, with or without modification, are
-+# permitted in any medium without royalty provided the copyright notice
-+# and this notice are preserved. This file is offered as-is, without any
-+# warranty.
-+
-+#serial 7
-+
-+dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
-+dnl (serial version number 13).
-+
-+AX_REQUIRE_DEFINED([AC_MSG_WARN])
-+AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-+ m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
-+ [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
-+ [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
-+ [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
-+ m4_if([$2], [], [],
-+ [$2], [ext], [],
-+ [$2], [noext], [],
-+ [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
-+ m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
-+ [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
-+ [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
-+ [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
-+ AC_LANG_PUSH([C++])dnl
-+ ac_success=no
-+ AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
-+ ax_cv_cxx_compile_cxx$1,
-+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-+ [ax_cv_cxx_compile_cxx$1=yes],
-+ [ax_cv_cxx_compile_cxx$1=no])])
-+ if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
-+ ac_success=yes
-+ fi
-+
-+ m4_if([$2], [noext], [], [dnl
-+ if test x$ac_success = xno; then
-+ for alternative in ${ax_cxx_compile_alternatives}; do
-+ switch="-std=gnu++${alternative}"
-+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-+ AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-+ $cachevar,
-+ [ac_save_CXX="$CXX"
-+ CXX="$CXX $switch"
-+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-+ [eval $cachevar=yes],
-+ [eval $cachevar=no])
-+ CXX="$ac_save_CXX"])
-+ if eval test x\$$cachevar = xyes; then
-+ CXX="$CXX $switch"
-+ if test -n "$CXXCPP" ; then
-+ CXXCPP="$CXXCPP $switch"
-+ fi
-+ ac_success=yes
-+ break
-+ fi
-+ done
-+ fi])
-+
-+ m4_if([$2], [ext], [], [dnl
-+ if test x$ac_success = xno; then
-+ dnl HP's aCC needs +std=c++11 according to:
-+ dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
-+ dnl Cray's crayCC needs "-h std=c++11"
-+ for alternative in ${ax_cxx_compile_alternatives}; do
-+ for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-+ AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-+ $cachevar,
-+ [ac_save_CXX="$CXX"
-+ CXX="$CXX $switch"
-+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-+ [eval $cachevar=yes],
-+ [eval $cachevar=no])
-+ CXX="$ac_save_CXX"])
-+ if eval test x\$$cachevar = xyes; then
-+ CXX="$CXX $switch"
-+ if test -n "$CXXCPP" ; then
-+ CXXCPP="$CXXCPP $switch"
-+ fi
-+ ac_success=yes
-+ break
-+ fi
-+ done
-+ if test x$ac_success = xyes; then
-+ break
-+ fi
-+ done
-+ fi])
-+ AC_LANG_POP([C++])
-+ if test x$ax_cxx_compile_cxx$1_required = xtrue; then
-+ if test x$ac_success = xno; then
-+ AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
-+ fi
-+ fi
-+ if test x$ac_success = xno; then
-+ HAVE_CXX$1=0
-+ AC_MSG_NOTICE([No compiler with C++$1 support was found])
-+ else
-+ HAVE_CXX$1=1
-+ AC_DEFINE(HAVE_CXX$1,1,
-+ [define if the compiler supports basic C++$1 syntax])
-+ fi
-+ AC_SUBST(HAVE_CXX$1)
-+ m4_if([$1], [17], [AC_MSG_WARN([C++17 is not yet standardized, so the checks may change in incompatible ways anytime])])
-+])
-+
-+
-+dnl Test body for checking C++11 support
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
-+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-+)
-+
-+
-+dnl Test body for checking C++14 support
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
-+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-+)
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
-+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
-+)
-+
-+dnl Tests for new features in C++11
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
-+
-+// If the compiler admits that it is not ready for C++11, why torture it?
-+// Hopefully, this will speed up the test.
-+
-+#ifndef __cplusplus
-+
-+#error "This is not a C++ compiler"
-+
-+#elif __cplusplus < 201103L
-+
-+#error "This is not a C++11 compiler"
-+
-+#else
-+
-+namespace cxx11
-+{
-+
-+ namespace test_static_assert
-+ {
-+
-+ template
-+ struct check
-+ {
-+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+ };
-+
-+ }
-+
-+ namespace test_final_override
-+ {
-+
-+ struct Base
-+ {
-+ virtual void f() {}
-+ };
-+
-+ struct Derived : public Base
-+ {
-+ virtual void f() override {}
-+ };
-+
-+ }
-+
-+ namespace test_double_right_angle_brackets
-+ {
-+
-+ template < typename T >
-+ struct check {};
-+
-+ typedef check single_type;
-+ typedef check> double_type;
-+ typedef check>> triple_type;
-+ typedef check>>> quadruple_type;
-+
-+ }
-+
-+ namespace test_decltype
-+ {
-+
-+ int
-+ f()
-+ {
-+ int a = 1;
-+ decltype(a) b = 2;
-+ return a + b;
-+ }
-+
-+ }
-+
-+ namespace test_type_deduction
-+ {
-+
-+ template < typename T1, typename T2 >
-+ struct is_same
-+ {
-+ static const bool value = false;
-+ };
-+
-+ template < typename T >
-+ struct is_same
-+ {
-+ static const bool value = true;
-+ };
-+
-+ template < typename T1, typename T2 >
-+ auto
-+ add(T1 a1, T2 a2) -> decltype(a1 + a2)
-+ {
-+ return a1 + a2;
-+ }
-+
-+ int
-+ test(const int c, volatile int v)
-+ {
-+ static_assert(is_same::value == true, "");
-+ static_assert(is_same::value == false, "");
-+ static_assert(is_same::value == false, "");
-+ auto ac = c;
-+ auto av = v;
-+ auto sumi = ac + av + 'x';
-+ auto sumf = ac + av + 1.0;
-+ static_assert(is_same::value == true, "");
-+ static_assert(is_same::value == true, "");
-+ static_assert(is_same::value == true, "");
-+ static_assert(is_same::value == false, "");
-+ static_assert(is_same::value == true, "");
-+ return (sumf > 0.0) ? sumi : add(c, v);
-+ }
-+
-+ }
-+
-+ namespace test_noexcept
-+ {
-+
-+ int f() { return 0; }
-+ int g() noexcept { return 0; }
-+
-+ static_assert(noexcept(f()) == false, "");
-+ static_assert(noexcept(g()) == true, "");
-+
-+ }
-+
-+ namespace test_constexpr
-+ {
-+
-+ template < typename CharT >
-+ unsigned long constexpr
-+ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
-+ {
-+ return *s ? strlen_c_r(s + 1, acc + 1) : acc;
-+ }
-+
-+ template < typename CharT >
-+ unsigned long constexpr
-+ strlen_c(const CharT *const s) noexcept
-+ {
-+ return strlen_c_r(s, 0UL);
-+ }
-+
-+ static_assert(strlen_c("") == 0UL, "");
-+ static_assert(strlen_c("1") == 1UL, "");
-+ static_assert(strlen_c("example") == 7UL, "");
-+ static_assert(strlen_c("another\0example") == 7UL, "");
-+
-+ }
-+
-+ namespace test_rvalue_references
-+ {
-+
-+ template < int N >
-+ struct answer
-+ {
-+ static constexpr int value = N;
-+ };
-+
-+ answer<1> f(int&) { return answer<1>(); }
-+ answer<2> f(const int&) { return answer<2>(); }
-+ answer<3> f(int&&) { return answer<3>(); }
-+
-+ void
-+ test()
-+ {
-+ int i = 0;
-+ const int c = 0;
-+ static_assert(decltype(f(i))::value == 1, "");
-+ static_assert(decltype(f(c))::value == 2, "");
-+ static_assert(decltype(f(0))::value == 3, "");
-+ }
-+
-+ }
-+
-+ namespace test_uniform_initialization
-+ {
-+
-+ struct test
-+ {
-+ static const int zero {};
-+ static const int one {1};
-+ };
-+
-+ static_assert(test::zero == 0, "");
-+ static_assert(test::one == 1, "");
-+
-+ }
-+
-+ namespace test_lambdas
-+ {
-+
-+ void
-+ test1()
-+ {
-+ auto lambda1 = [](){};
-+ auto lambda2 = lambda1;
-+ lambda1();
-+ lambda2();
-+ }
-+
-+ int
-+ test2()
-+ {
-+ auto a = [](int i, int j){ return i + j; }(1, 2);
-+ auto b = []() -> int { return '0'; }();
-+ auto c = [=](){ return a + b; }();
-+ auto d = [&](){ return c; }();
-+ auto e = [a, &b](int x) mutable {
-+ const auto identity = [](int y){ return y; };
-+ for (auto i = 0; i < a; ++i)
-+ a += b--;
-+ return x + identity(a + b);
-+ }(0);
-+ return a + b + c + d + e;
-+ }
-+
-+ int
-+ test3()
-+ {
-+ const auto nullary = [](){ return 0; };
-+ const auto unary = [](int x){ return x; };
-+ using nullary_t = decltype(nullary);
-+ using unary_t = decltype(unary);
-+ const auto higher1st = [](nullary_t f){ return f(); };
-+ const auto higher2nd = [unary](nullary_t f1){
-+ return [unary, f1](unary_t f2){ return f2(unary(f1())); };
-+ };
-+ return higher1st(nullary) + higher2nd(nullary)(unary);
-+ }
-+
-+ }
-+
-+ namespace test_variadic_templates
-+ {
-+
-+ template
-+ struct sum;
-+
-+ template
-+ struct sum
-+ {
-+ static constexpr auto value = N0 + sum::value;
-+ };
-+
-+ template <>
-+ struct sum<>
-+ {
-+ static constexpr auto value = 0;
-+ };
-+
-+ static_assert(sum<>::value == 0, "");
-+ static_assert(sum<1>::value == 1, "");
-+ static_assert(sum<23>::value == 23, "");
-+ static_assert(sum<1, 2>::value == 3, "");
-+ static_assert(sum<5, 5, 11>::value == 21, "");
-+ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-+
-+ }
-+
-+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
-+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
-+ // because of this.
-+ namespace test_template_alias_sfinae
-+ {
-+
-+ struct foo {};
-+
-+ template
-+ using member = typename T::member_type;
-+
-+ template
-+ void func(...) {}
-+
-+ template
-+ void func(member*) {}
-+
-+ void test();
-+
-+ void test() { func(0); }
-+
-+ }
-+
-+} // namespace cxx11
-+
-+#endif // __cplusplus >= 201103L
-+
-+]])
-+
-+
-+dnl Tests for new features in C++14
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
-+
-+// If the compiler admits that it is not ready for C++14, why torture it?
-+// Hopefully, this will speed up the test.
-+
-+#ifndef __cplusplus
-+
-+#error "This is not a C++ compiler"
-+
-+#elif __cplusplus < 201402L
-+
-+#error "This is not a C++14 compiler"
-+
-+#else
-+
-+namespace cxx14
-+{
-+
-+ namespace test_polymorphic_lambdas
-+ {
-+
-+ int
-+ test()
-+ {
-+ const auto lambda = [](auto&&... args){
-+ const auto istiny = [](auto x){
-+ return (sizeof(x) == 1UL) ? 1 : 0;
-+ };
-+ const int aretiny[] = { istiny(args)... };
-+ return aretiny[0];
-+ };
-+ return lambda(1, 1L, 1.0f, '1');
-+ }
-+
-+ }
-+
-+ namespace test_binary_literals
-+ {
-+
-+ constexpr auto ivii = 0b0000000000101010;
-+ static_assert(ivii == 42, "wrong value");
-+
-+ }
-+
-+ namespace test_generalized_constexpr
-+ {
-+
-+ template < typename CharT >
-+ constexpr unsigned long
-+ strlen_c(const CharT *const s) noexcept
-+ {
-+ auto length = 0UL;
-+ for (auto p = s; *p; ++p)
-+ ++length;
-+ return length;
-+ }
-+
-+ static_assert(strlen_c("") == 0UL, "");
-+ static_assert(strlen_c("x") == 1UL, "");
-+ static_assert(strlen_c("test") == 4UL, "");
-+ static_assert(strlen_c("another\0test") == 7UL, "");
-+
-+ }
-+
-+ namespace test_lambda_init_capture
-+ {
-+
-+ int
-+ test()
-+ {
-+ auto x = 0;
-+ const auto lambda1 = [a = x](int b){ return a + b; };
-+ const auto lambda2 = [a = lambda1(x)](){ return a; };
-+ return lambda2();
-+ }
-+
-+ }
-+
-+ namespace test_digit_separators
-+ {
-+
-+ constexpr auto ten_million = 100'000'000;
-+ static_assert(ten_million == 100000000, "");
-+
-+ }
-+
-+ namespace test_return_type_deduction
-+ {
-+
-+ auto f(int& x) { return x; }
-+ decltype(auto) g(int& x) { return x; }
-+
-+ template < typename T1, typename T2 >
-+ struct is_same
-+ {
-+ static constexpr auto value = false;
-+ };
-+
-+ template < typename T >
-+ struct is_same
-+ {
-+ static constexpr auto value = true;
-+ };
-+
-+ int
-+ test()
-+ {
-+ auto x = 0;
-+ static_assert(is_same::value, "");
-+ static_assert(is_same::value, "");
-+ return x;
-+ }
-+
-+ }
-+
-+} // namespace cxx14
-+
-+#endif // __cplusplus >= 201402L
-+
-+]])
-+
-+
-+dnl Tests for new features in C++17
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
-+
-+// If the compiler admits that it is not ready for C++17, why torture it?
-+// Hopefully, this will speed up the test.
-+
-+#ifndef __cplusplus
-+
-+#error "This is not a C++ compiler"
-+
-+#elif __cplusplus <= 201402L
-+
-+#error "This is not a C++17 compiler"
-+
-+#else
-+
-+#if defined(__clang__)
-+ #define REALLY_CLANG
-+#else
-+ #if defined(__GNUC__)
-+ #define REALLY_GCC
-+ #endif
-+#endif
-+
-+#include
-+#include
-+#include
-+
-+namespace cxx17
-+{
-+
-+#if !defined(REALLY_CLANG)
-+ namespace test_constexpr_lambdas
-+ {
-+
-+ // TODO: test it with clang++ from git
-+
-+ constexpr int foo = [](){return 42;}();
-+
-+ }
-+#endif // !defined(REALLY_CLANG)
-+
-+ namespace test::nested_namespace::definitions
-+ {
-+
-+ }
-+
-+ namespace test_fold_expression
-+ {
-+
-+ template
-+ int multiply(Args... args)
-+ {
-+ return (args * ... * 1);
-+ }
-+
-+ template
-+ bool all(Args... args)
-+ {
-+ return (args && ...);
-+ }
-+
-+ }
-+
-+ namespace test_extended_static_assert
-+ {
-+
-+ static_assert (true);
-+
-+ }
-+
-+ namespace test_auto_brace_init_list
-+ {
-+
-+ auto foo = {5};
-+ auto bar {5};
-+
-+ static_assert(std::is_same, decltype(foo)>::value);
-+ static_assert(std::is_same::value);
-+ }
-+
-+ namespace test_typename_in_template_template_parameter
-+ {
-+
-+ template typename X> struct D;
-+
-+ }
-+
-+ namespace test_fallthrough_nodiscard_maybe_unused_attributes
-+ {
-+
-+ int f1()
-+ {
-+ return 42;
-+ }
-+
-+ [[nodiscard]] int f2()
-+ {
-+ [[maybe_unused]] auto unused = f1();
-+
-+ switch (f1())
-+ {
-+ case 17:
-+ f1();
-+ [[fallthrough]];
-+ case 42:
-+ f1();
-+ }
-+ return f1();
-+ }
-+
-+ }
-+
-+ namespace test_extended_aggregate_initialization
-+ {
-+
-+ struct base1
-+ {
-+ int b1, b2 = 42;
-+ };
-+
-+ struct base2
-+ {
-+ base2() {
-+ b3 = 42;
-+ }
-+ int b3;
-+ };
-+
-+ struct derived : base1, base2
-+ {
-+ int d;
-+ };
-+
-+ derived d1 {{1, 2}, {}, 4}; // full initialization
-+ derived d2 {{}, {}, 4}; // value-initialized bases
-+
-+ }
-+
-+ namespace test_general_range_based_for_loop
-+ {
-+
-+ struct iter
-+ {
-+ int i;
-+
-+ int& operator* ()
-+ {
-+ return i;
-+ }
-+
-+ const int& operator* () const
-+ {
-+ return i;
-+ }
-+
-+ iter& operator++()
-+ {
-+ ++i;
-+ return *this;
-+ }
-+ };
-+
-+ struct sentinel
-+ {
-+ int i;
-+ };
-+
-+ bool operator== (const iter& i, const sentinel& s)
-+ {
-+ return i.i == s.i;
-+ }
-+
-+ bool operator!= (const iter& i, const sentinel& s)
-+ {
-+ return !(i == s);
-+ }
-+
-+ struct range
-+ {
-+ iter begin() const
-+ {
-+ return {0};
-+ }
-+
-+ sentinel end() const
-+ {
-+ return {5};
-+ }
-+ };
-+
-+ void f()
-+ {
-+ range r {};
-+
-+ for (auto i : r)
-+ {
-+ [[maybe_unused]] auto v = i;
-+ }
-+ }
-+
-+ }
-+
-+ namespace test_lambda_capture_asterisk_this_by_value
-+ {
-+
-+ struct t
-+ {
-+ int i;
-+ int foo()
-+ {
-+ return [*this]()
-+ {
-+ return i;
-+ }();
-+ }
-+ };
-+
-+ }
-+
-+ namespace test_enum_class_construction
-+ {
-+
-+ enum class byte : unsigned char
-+ {};
-+
-+ byte foo {42};
-+
-+ }
-+
-+ namespace test_constexpr_if
-+ {
-+
-+ template
-+ int f ()
-+ {
-+ if constexpr(cond)
-+ {
-+ return 13;
-+ }
-+ else
-+ {
-+ return 42;
-+ }
-+ }
-+
-+ }
-+
-+ namespace test_selection_statement_with_initializer
-+ {
-+
-+ int f()
-+ {
-+ return 13;
-+ }
-+
-+ int f2()
-+ {
-+ if (auto i = f(); i > 0)
-+ {
-+ return 3;
-+ }
-+
-+ switch (auto i = f(); i + 4)
-+ {
-+ case 17:
-+ return 2;
-+
-+ default:
-+ return 1;
-+ }
-+ }
-+
-+ }
-+
-+#if !defined(REALLY_CLANG)
-+ namespace test_template_argument_deduction_for_class_templates
-+ {
-+
-+ // TODO: test it with clang++ from git
-+
-+ template
-+ struct pair
-+ {
-+ pair (T1 p1, T2 p2)
-+ : m1 {p1},
-+ m2 {p2}
-+ {}
-+
-+ T1 m1;
-+ T2 m2;
-+ };
-+
-+ void f()
-+ {
-+ [[maybe_unused]] auto p = pair{13, 42u};
-+ }
-+
-+ }
-+#endif // !defined(REALLY_CLANG)
-+
-+ namespace test_non_type_auto_template_parameters
-+ {
-+
-+ template
-+ struct B
-+ {};
-+
-+ B<5> b1;
-+ B<'a'> b2;
-+
-+ }
-+
-+#if !defined(REALLY_CLANG)
-+ namespace test_structured_bindings
-+ {
-+
-+ // TODO: test it with clang++ from git
-+
-+ int arr[2] = { 1, 2 };
-+ std::pair pr = { 1, 2 };
-+
-+ auto f1() -> int(&)[2]
-+ {
-+ return arr;
-+ }
-+
-+ auto f2() -> std::pair&
-+ {
-+ return pr;
-+ }
-+
-+ struct S
-+ {
-+ int x1 : 2;
-+ volatile double y1;
-+ };
-+
-+ S f3()
-+ {
-+ return {};
-+ }
-+
-+ auto [ x1, y1 ] = f1();
-+ auto& [ xr1, yr1 ] = f1();
-+ auto [ x2, y2 ] = f2();
-+ auto& [ xr2, yr2 ] = f2();
-+ const auto [ x3, y3 ] = f3();
-+
-+ }
-+#endif // !defined(REALLY_CLANG)
-+
-+#if !defined(REALLY_CLANG)
-+ namespace test_exception_spec_type_system
-+ {
-+
-+ // TODO: test it with clang++ from git
-+
-+ struct Good {};
-+ struct Bad {};
-+
-+ void g1() noexcept;
-+ void g2();
-+
-+ template
-+ Bad
-+ f(T*, T*);
-+
-+ template
-+ Good
-+ f(T1*, T2*);
-+
-+ static_assert (std::is_same_v);
-+
-+ }
-+#endif // !defined(REALLY_CLANG)
-+
-+ namespace test_inline_variables
-+ {
-+
-+ template void f(T)
-+ {}
-+
-+ template inline T g(T)
-+ {
-+ return T{};
-+ }
-+
-+ template<> inline void f<>(int)
-+ {}
-+
-+ template<> int g<>(int)
-+ {
-+ return 5;
-+ }
-+
-+ }
-+
-+} // namespace cxx17
-+
-+#endif // __cplusplus <= 201402L
-+
-+]])
-diff --git a/spyview/Fl_Listbox.H b/spyview/Fl_Listbox.H
-index 35803fc..832792b 100644
---- a/spyview/Fl_Listbox.H
-+++ b/spyview/Fl_Listbox.H
-@@ -5,7 +5,8 @@
- #include
- #include
-
--using namespace std;
-+using std::string;
-+using std::vector;
-
- class Fl_Listbox : public Fl_Table
- {
-diff --git a/spyview/ImageData.C b/spyview/ImageData.C
-index 7ee936a..eaac7a6 100644
---- a/spyview/ImageData.C
-+++ b/spyview/ImageData.C
-@@ -9,6 +9,9 @@
- #include "mypam.h"
- #include "../config.h"
-
-+#include
-+using std::isnan;
-+
- #include
- // From http://www.redhat.com/docs/manuals/enterprise/RHEL-3-Manual/gcc/variadic-macros.html
-
-@@ -2007,7 +2010,7 @@ void ImageData::grad_mag(double axis_bias)
- xderv();
- width = w;
- height = h;
-- swap(tmpx,raw_data);
-+ std::swap(tmpx,raw_data);
- yderv();
- width = w;
- height = h;
-@@ -2083,7 +2086,7 @@ void ImageData::dderv(double theta) // theta in degrees!
- xderv();
- width = w;
- height = h;
-- swap(tmpx,raw_data);
-+ std::swap(tmpx,raw_data);
- yderv();
- width = w;
- height = h;
-diff --git a/spyview/ImageData.H b/spyview/ImageData.H
-index b68cb73..4cdecb1 100644
---- a/spyview/ImageData.H
-+++ b/spyview/ImageData.H
-@@ -22,7 +22,8 @@
-
- #define CHECK_ARRAY_LIMITS 0
-
--using namespace std;
-+using std::string;
-+using std::vector;
-
- typedef enum { YZ = 0, XY = 2, XZ = 1 } mtxcut_t;
- typedef enum { COLUMNS = 0, INDEX = 1} gpload_t;
-diff --git a/spyview/ImagePrinter.H b/spyview/ImagePrinter.H
-index d85b440..f34ee67 100644
---- a/spyview/ImagePrinter.H
-+++ b/spyview/ImagePrinter.H
-@@ -11,7 +11,7 @@
-
- #include "ImagePrinter_Control.h"
-
--using namespace std;
-+using std::string;
-
- class ImageWindow;
- class Image_Printer_Control;
-diff --git a/spyview/ImageWindow.C b/spyview/ImageWindow.C
-index b8bd0f9..eeae649 100644
---- a/spyview/ImageWindow.C
-+++ b/spyview/ImageWindow.C
-@@ -12,6 +12,11 @@
- #include "ImageWindow_Module.H"
- #include
-
-+#include
-+using std::isnan;
-+
-+#include "mypam.h"
-+
- #ifdef WIN32
-
- #include
-@@ -36,8 +41,6 @@
- #define alt(state) (!(state & FL_CTRL) && !(state & FL_SHIFT) && (state & FL_ALT))
- #define none(state) (!(state & FL_CTRL) && !(state & FL_SHIFT) && !(state & FL_ALT))
-
--using namespace std;
--
- FILE *fopenwarn(const char *name, const char *mode)
- {
- FILE *fp = fopen(name, mode);
-@@ -482,7 +485,7 @@ double current_time()
- stop.tv_usec = (long)(tmpres % 1000000UL);
- #endif
- double time = (((double)(stop.tv_sec)) + ((double)(stop.tv_usec) * 1e-6));
-- if (!isnormal(time))
-+ if (!std::isnormal(time))
- info("time %e sec %d usec %d\n", time, stop.tv_sec, stop.tv_usec);
- return time;
- }
-@@ -1609,7 +1612,7 @@ void ImageWindow::runQueue()
- for (int n=0; nnum_parameters; n++)
- {
- operations_string += "-";
-- ostringstream os;
-+ std::ostringstream os;
- os << op->parameters[n].value;
- operations_string += os.str();
- }
-diff --git a/spyview/ImageWindow.H b/spyview/ImageWindow.H
-index 30e94ba..5d1a1e1 100644
---- a/spyview/ImageWindow.H
-+++ b/spyview/ImageWindow.H
-@@ -32,7 +32,7 @@
- #define VERTLINE 4
- #define OTHERLINE 8
-
--#include "mypam.h"
-+using std::string;
-
- typedef enum { XAXIS, YAXIS, DISTANCE } lc_axis_t;
- typedef enum { KEEPZOOM, KEEPSIZE, RESETZOOM } window_size_action_t;
-diff --git a/spyview/ImageWindow3d.C b/spyview/ImageWindow3d.C
-index 40b93e6..24fa8f4 100644
---- a/spyview/ImageWindow3d.C
-+++ b/spyview/ImageWindow3d.C
-@@ -5,6 +5,8 @@
- #define LINEMESH 2
- #define POLYGONS 3
-
-+#include "mypam.h"
-+
- ImageWindow3d::ImageWindow3d(int x,int y,int w,int h,const char *l) : Fl_Gl_Window(x,y,w,h,l)
- {
- data_matrix = NULL;
-diff --git a/spyview/ImageWindow3d.H b/spyview/ImageWindow3d.H
-index 683015b..e6f296f 100644
---- a/spyview/ImageWindow3d.H
-+++ b/spyview/ImageWindow3d.H
-@@ -25,9 +25,7 @@
- #define POINTSOURCE 1
- #define DIRECTIONAL 2
-
--#include "mypam.h"
-
--using namespace std;
-
- #define LMAX USHRT_MAX
-
-diff --git a/spyview/bisector.H b/spyview/bisector.H
-index b22fb8f..c7e64a6 100644
---- a/spyview/bisector.H
-+++ b/spyview/bisector.H
-@@ -2,7 +2,9 @@
- #define __bisector_h__
- #include
- #include
--using namespace std;
-+
-+#include
-+using std::isnan;
-
- class bisector
- {
-diff --git a/spyview/misc.h b/spyview/misc.h
-index 9ed7dfc..8ed8ba8 100644
---- a/spyview/misc.h
-+++ b/spyview/misc.h
-@@ -3,7 +3,7 @@
-
- #include
-
--using namespace std;
-+using std::string;
-
- //Some useful functions
-
-diff --git a/spyview/spypal_gradient.C b/spyview/spypal_gradient.C
-index e522b42..4997fbd 100644
---- a/spyview/spypal_gradient.C
-+++ b/spyview/spypal_gradient.C
-@@ -22,7 +22,7 @@ void Spypal_Slider_Dragger::start_dragging(Fl_Spypal_GSlider *todrag, bool can_d
- assert(dragging == NULL);
- can_delete = can_delete_p;
- dragging = todrag;
-- colored = false;
-+ colored = NULL;
- shown = find(g->sliders.begin(),g->sliders.end(), dragging) != g->sliders.end();
- if(!shown && (Fl::event_inside(g) || !can_delete))
- show_dragged();
-diff --git a/spyview/spyview.C b/spyview/spyview.C
-index cd99eeb..5e5c1f6 100644
---- a/spyview/spyview.C
-+++ b/spyview/spyview.C
-@@ -27,8 +27,6 @@
- #include "spypal_import.H"
- #include
-
--using namespace std;
--
- //How's this for lazy...?
- char **arg_values;
- int arg_count;
-diff --git a/spyview/spyview.H b/spyview/spyview.H
-index 3536354..0411e87 100644
---- a/spyview/spyview.H
-+++ b/spyview/spyview.H
-@@ -10,6 +10,8 @@
- #include
- #include "spyview_ui.h"
-
-+using std::string;
-+
- /*void minl_cb(Fl_Widget *, void *);
- void maxl_cb(Fl_Widget *, void *);
- void dminl_cb(Fl_Widget *, void *);
-diff --git a/spyview/spyview3d.C b/spyview/spyview3d.C
-index b9398d5..068d4a1 100644
---- a/spyview/spyview3d.C
-+++ b/spyview/spyview3d.C
-@@ -18,8 +18,6 @@
-
- #include "mypam.h"
-
--using namespace std;
--
- int *data;
- int *databuf;
- int w,h;
diff --git a/sci-visualization/spyview/files/spyview-20150124-gnuplot_interface_fix.patch b/sci-visualization/spyview/files/spyview-20150124-gnuplot_interface_fix.patch
deleted file mode 100644
index 6f15296012f2..000000000000
--- a/sci-visualization/spyview/files/spyview-20150124-gnuplot_interface_fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/spyview/Gnuplot_Interface.C
-+++ b/spyview/Gnuplot_Interface.C
-@@ -13,6 +13,7 @@
- #else
- #include
- #include
-+#include
- #endif
- using namespace boost;
-
diff --git a/sci-visualization/spyview/spyview-20150124-r1.ebuild b/sci-visualization/spyview/spyview-20150124-r1.ebuild
index d873c7d008cc..e031660d4b12 100644
--- a/sci-visualization/spyview/spyview-20150124-r1.ebuild
+++ b/sci-visualization/spyview/spyview-20150124-r1.ebuild
@@ -7,7 +7,8 @@ inherit autotools flag-o-matic
DESCRIPTION="2D and 3D data visualization and analysis program"
HOMEPAGE="http://nsweb.tn.tudelft.nl/~gsteele/spyview/"
-SRC_URI="https://github.com/gsteele13/spyview/archive/966012afae2fbb77262bd96a7e530e81b0ed3b90.tar.gz -> $P.tgz"
+SRC_URI="https://github.com/gsteele13/spyview/archive/966012afae2fbb77262bd96a7e530e81b0ed3b90.tar.gz -> $P.tgz
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
@@ -29,8 +30,8 @@ RDEPEND="${COMMON_DEPEND}
sci-visualization/gnuplot"
PATCHES=(
- "${FILESDIR}/${P}"-gnuplot_interface_fix.patch
- "${FILESDIR}/${P}"-gcc6cxx14-9.patch
+ "${WORKDIR}/${P}-patchset/${P}"-gnuplot_interface_fix.patch
+ "${WORKDIR}/${P}-patchset/${P}"-gcc6cxx14-9.patch
)
src_unpack() {
diff --git a/sci-visualization/spyview/spyview-20150124.ebuild b/sci-visualization/spyview/spyview-20150124.ebuild
deleted file mode 100644
index 2608591392d7..000000000000
--- a/sci-visualization/spyview/spyview-20150124.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="2D and 3D data visualization and analysis program"
-HOMEPAGE="http://nsweb.tn.tudelft.nl/~gsteele/spyview/"
-SRC_URI="https://github.com/gsteele13/spyview/archive/966012afae2fbb77262bd96a7e530e81b0ed3b90.tar.gz -> $P.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
- dev-libs/boost:=
- media-libs/netpbm
- x11-libs/fltk:1[opengl]
- app-text/ghostscript-gpl
- virtual/glu
-"
-
-DEPEND="${COMMON_DEPEND}
- sys-apps/groff"
-
-RDEPEND="${COMMON_DEPEND}
- sci-visualization/gnuplot"
-
-PATCHES=( ${FILESDIR}/${P}-gnuplot_interface_fix.patch )
-
-src_unpack() {
- default
- mv -v "${WORKDIR}"/spyview-*/source "${S}" || die
-}
-
-src_prepare() {
- append-cflags $(fltk-config --cflags)
- append-cxxflags $(fltk-config --cxxflags)
- append-cppflags -I"${EPREFIX}"/usr/include/netpbm
-
- # append-ldflags $(fltk-config --ldflags)
- # this one leads to an insane amount of warnings
- append-ldflags -L$(dirname $(fltk-config --libs))
-
- while IFS="" read -d $'\0' -r file; do
- sed -i -e 's:-mwindows -mconsole::g' "$file" || die
- done < <(find "${S}" -name Makefile.am -print0)
-
- default
- eautoreconf
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 9151013c07e9..7a84b51780b6 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index f1b34ffa424e..2a2ef94536f0 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,4 +1,7 @@
+DIST bison-1.875d-patchset.tar.bz2 698 BLAKE2B a68e6009c24437a36c81e7fb97112f8ad721217b65a03531e5375e7310988f81d8c868485bdfc9b4ea99d4285ead91ad8f4670fb358abe92dc206cf6df4c80a1 SHA512 ac650b6f1b2b26057eda0d9ceae6f36604c88a67419b6190e423a08f863c460ded2a58040a71ce79b5e0b85ab3ede1b7a2ebd204c9bd8eb53f6551f39b160beb
DIST bison-1.875d.tar.bz2 882745 BLAKE2B c85ce71986ae095e9dcfa24c1a9c7c484b3663994c1e394b7cc78a0ec1cc95df60369ff9878ef82edb4be144298d8648e336e861de98152bf79f6d66369c6dd4 SHA512 f84c6cf41a289ea7e0805cf9b0da6fe2d77f2e03a35c3db7d2e36e5186bba7c0853c3d518bd89f6cfa1030e346e046aa03b33974bb892dbd8f040e5ea2de1126
+DIST bison-2.4.3-patchset.tar.bz2 1102 BLAKE2B 3615841400ba984e563933d31e59a4810e17aed48b8314a3ceb66b47b2ad432e287cf9588b632594311f68d28d2bcce3c6a4f2c4be527c676fcbfd2a4480d04a SHA512 a36cf45b475e55e8baae265e43a151d3324026878d4bb4c119b9fccfc7be3c26ed183632bf210fdb587e2741d298df1e9d4ebb6c3d440f6ae33f40a29949f7a0
DIST bison-2.4.3.tar.bz2 1652612 BLAKE2B 712444aec9898d2dc5dabd5008363f22f6beeb37e119edbdecb119965652e707d827e621c061b13be2206e29da59d661f1466c976c200ce749cf24062dbb5cf1 SHA512 b789f55d9cb95c1b4fba004691ed9f79b76da55020c9b202e1704a02aab1ba43b9fc1015e29843ed552e6df6165cef9c6ebc8a29d15a21c6e194cad8a42ab055
DIST bison-2.7.1.tar.xz 1781068 BLAKE2B bd3161bcf4d2a9f046073280a8d751eb770147f942d48326a9ac869cf31fd8f127759167dced662b826fa54a24cd0cf87b0c096814c84e34afed8078368828a1 SHA512 ac0c7ca57142bcb84af498f606acb86091984a00359294fbf721a4ca8112f9fcf26497f7dd2e65f527e04a6e1de94142ecb76602d407e548475970e5a566d370
+DIST bison-3.0.4-patchset.tar.xz 8216 BLAKE2B dd059a7a24faf351fa28bc72b6e183935d4409f91b5dcd8640a14d01b480a3e5b28ddb8f5660f16300a3cf1639d67bd3436d016fa304bb4666c9a43fd7897bd7 SHA512 87b62c5848360fee5b566c664c378ff08bb81d2b6c07b0d385ebd4dfd6b1a687af1da96ed43ca120695877cfc5e30a149ef35424c7a332e9223179dab6665d0b
DIST bison-3.0.4.tar.xz 1973796 BLAKE2B 6320424a5fece04734325226981af287e5745c898df7f0f79c26207599227f40e9ef54f93b2e231e20766ab9a19c0b266545bc5d0bfeabbb958e3e2f6686386c SHA512 bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412
diff --git a/sys-devel/bison/bison-1.875d.ebuild b/sys-devel/bison/bison-1.875d.ebuild
index 522e7d85706a..4afeb739bc8f 100644
--- a/sys-devel/bison/bison-1.875d.ebuild
+++ b/sys-devel/bison/bison-1.875d.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit toolchain-funcs flag-o-matic eutils
DESCRIPTION="A yacc-compatible parser generator"
HOMEPAGE="https://www.gnu.org/software/bison/bison.html"
-SRC_URI="ftp://alpha.gnu.org/pub/gnu/bison/${P}.tar.bz2"
+SRC_URI="ftp://alpha.gnu.org/pub/gnu/bison/${P}.tar.bz2
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -18,7 +19,7 @@ DEPEND="sys-devel/m4
src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}"/${PN}-1.32-extfix.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-1.32-extfix.patch
}
src_compile() {
diff --git a/sys-devel/bison/bison-2.4.3.ebuild b/sys-devel/bison/bison-2.4.3.ebuild
index fde4389df171..faed48df0515 100644
--- a/sys-devel/bison/bison-2.4.3.ebuild
+++ b/sys-devel/bison/bison-2.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
@@ -7,7 +7,8 @@ inherit flag-o-matic eutils
DESCRIPTION="A yacc-compatible parser generator"
HOMEPAGE="https://www.gnu.org/software/bison/bison.html"
-SRC_URI="mirror://gnu/bison/${P}.tar.bz2"
+SRC_URI="mirror://gnu/bison/${P}.tar.bz2
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -19,8 +20,8 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
src_prepare() {
- epatch "${FILESDIR}"/${P}-uclibc-sched_param-def.patch
- epatch "${FILESDIR}"/${P}-no-gets.patch
+ epatch "${WORKDIR}"/${P}-patchset/${P}-uclibc-sched_param-def.patch
+ epatch "${WORKDIR}"/${P}-patchset/${P}-no-gets.patch
}
src_configure() {
diff --git a/sys-devel/bison/bison-3.0.4-r1.ebuild b/sys-devel/bison/bison-3.0.4-r1.ebuild
index 3672e2275c1f..46bac9ecda73 100644
--- a/sys-devel/bison/bison-3.0.4-r1.ebuild
+++ b/sys-devel/bison/bison-3.0.4-r1.ebuild
@@ -7,7 +7,8 @@ inherit flag-o-matic eutils
DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
HOMEPAGE="https://www.gnu.org/software/bison/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz"
LICENSE="GPL-2"
SLOT="0"
@@ -24,9 +25,9 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog-2012 NEWS README THANKS TODO ) # ChangeLog-1998 PACKAGING README-alpha README-release
src_prepare() {
- epatch "${FILESDIR}"/${P}-optional-perl.patch #538300
- epatch "${FILESDIR}"/${P}-darwin17-printf-n.patch #632500
- epatch "${FILESDIR}"/${P}-fix-tests-gcc-7.patch #638308
+ epatch "${WORKDIR}"/${P}-patchset/${P}-optional-perl.patch #538300
+ epatch "${WORKDIR}"/${P}-patchset/${P}-darwin17-printf-n.patch #632500
+ epatch "${WORKDIR}"/${P}-patchset/${P}-fix-tests-gcc-7.patch #638308
# The makefiles make the man page depend on the configure script
# which we patched above. Touch it to prevent regeneration.
touch doc/bison.1 #548778 #538300#9
diff --git a/sys-devel/bison/files/bison-1.32-extfix.patch b/sys-devel/bison/files/bison-1.32-extfix.patch
deleted file mode 100644
index 363d038d8a52..000000000000
--- a/sys-devel/bison/files/bison-1.32-extfix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-2002-02-15 Gwenole Beauchesne
-
- * src/files (compute_exts_from_gf, compute_exts_from_src): Handle
- the case where header_extension is the same as src_extension, aka
- handle -d -o where doesn't have a known EXT to
- transform. e.g. if is .yxx, set the
- header_extension to .yxx.h, as would do bison 1.28.
-
---- bison-1.32/src/files.c.extfix Mon Jan 21 16:41:46 2002
-+++ bison-1.32/src/files.c Fri Feb 15 15:40:43 2002
-@@ -288,6 +288,8 @@ compute_exts_from_gf (const char *ext)
- src_extension = tr (src_extension, 'Y', 'C');
- header_extension = tr (ext, 'y', 'h');
- header_extension = tr (header_extension, 'Y', 'H');
-+ if (!strcmp (header_extension, src_extension))
-+ header_extension = concat2 (src_extension, ".h");
- }
-
- /* Computes extensions from the given c source file extension. */
-@@ -300,6 +302,8 @@ compute_exts_from_src (const char *ext)
- src_extension = xstrdup (ext);
- header_extension = tr (ext, 'c', 'h');
- header_extension = tr (header_extension, 'C', 'H');
-+ if (!strcmp (header_extension, src_extension))
-+ header_extension = concat2 (src_extension, ".h");
- }
-
-
diff --git a/sys-devel/bison/files/bison-2.4.3-no-gets.patch b/sys-devel/bison/files/bison-2.4.3-no-gets.patch
deleted file mode 100644
index a49a816f4761..000000000000
--- a/sys-devel/bison/files/bison-2.4.3-no-gets.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-hack until bizon pulls a newer gnulib version
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -125,7 +125,6 @@
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/sys-devel/bison/files/bison-2.4.3-uclibc-sched_param-def.patch b/sys-devel/bison/files/bison-2.4.3-uclibc-sched_param-def.patch
deleted file mode 100644
index 50652d8babc2..000000000000
--- a/sys-devel/bison/files/bison-2.4.3-uclibc-sched_param-def.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
-and is not needed too per standard. gnulib attempts to use it but we have to account
-for it because in this case uclibc does not behave like glibc.
-
--Khem
-
-http://bugs.gentoo.org/336484
-
---- m4-1.4.14/lib/spawn.in.h
-+++ m4-1.4.14/lib/spawn.in.h
-@@ -31,7 +31,7 @@
-
- /* Get definitions of 'struct sched_param' and 'sigset_t'.
- But avoid namespace pollution on glibc systems. */
--#ifndef __GLIBC__
-+#if !defined __GLIBC__ || defined __UCLIBC__
- # include
- # include
- #endif
diff --git a/sys-devel/bison/files/bison-3.0.4-darwin17-printf-n.patch b/sys-devel/bison/files/bison-3.0.4-darwin17-printf-n.patch
deleted file mode 100644
index 1c77ed773c28..000000000000
--- a/sys-devel/bison/files/bison-3.0.4-darwin17-printf-n.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://lists.gnu.org/archive/html/bug-gnulib/2017-07/txtmumXtpD69v.txt
-
-extract of only the relevant hunk to avoid irrelevant conflicts
-
-From c41f233c4c38e84023a16339782ee306f03e7f59 Mon Sep 17 00:00:00 2001
-From: Paul Eggert
-Date: Fri, 7 Jul 2017 14:10:20 -0700
-Subject: [PATCH] vasnprintf: port to macOS 10.13
-
-Problem reported by comex in:
-http://lists.gnu.org/archive/html/bug-gnulib/2017-07/msg00056.html
-* lib/vasnprintf.c (VASNPRINTF): DonĂ¢Â€Â™t use %n on macOS.
-
-diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
-index 9c2af0e..fecaf27 100644
---- a/lib/vasnprintf.c
-+++ b/lib/vasnprintf.c
-@@ -4869,7 +4869,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
- #endif
- *fbp = dp->conversion;
- #if USE_SNPRINTF
--# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
-+# if ! (((__GLIBC__ > 2 \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
-+ && !defined __UCLIBC__) \
-+ || (defined __APPLE__ && defined __MACH__) \
-+ || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
- fbp[1] = '%';
- fbp[2] = 'n';
- fbp[3] = '\0';
diff --git a/sys-devel/bison/files/bison-3.0.4-fix-tests-gcc-7.patch b/sys-devel/bison/files/bison-3.0.4-fix-tests-gcc-7.patch
deleted file mode 100644
index 89fc5f6c39ae..000000000000
--- a/sys-devel/bison/files/bison-3.0.4-fix-tests-gcc-7.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-commit 952416114729b95209dccfc4edacfc1ff13b4e82
-Author: Akim Demaille
-Date: Mon Jan 26 18:23:12 2015 +0100
-
- tests: c++: fix symbol lookup issue
-
- Sun C 5.13 SunOS_sparc 2014/10/20 reports errors on tests 430-432.
-
- Reported by Dennis Clarke.
-
-
- * tests/c++.at (Variants): Be sure to emit operator<< before using it:
- use "%code top" rather than "%code".
- Prefer std::vector to std::list.
- Do not define anything in std::, to avoid undefined behavior.
-
-diff --git a/tests/c++.at b/tests/c++.at
-index 55d7d40..60292f4 100644
---- a/tests/c++.at
-+++ b/tests/c++.at
-@@ -96,7 +96,7 @@ AT_SETUP([C++ Variant-based Symbols])
- AT_KEYWORDS([variant])
-
- AT_BISON_OPTION_PUSHDEFS([%skeleton "lalr1.cc" %debug $1])
--# Store strings and integers in a list of strings.
-+# Store strings and integers in a vector of strings.
- AT_DATA_GRAMMAR([list.y],
- [[%skeleton "lalr1.cc"
- %define api.value.type variant
-@@ -114,20 +114,20 @@ AT_DATA_GRAMMAR([list.y],
- }
-
- %token INT "int"
--%type < std::list > exp
-+%type < std::vector > exp
-
- %printer { yyo << $$; }
- %printer
- {
-- for (std::list::const_iterator i = $$.begin (); i != $$.end (); ++i)
-+ for (std::vector::const_iterator i = $$.begin (); i != $$.end (); ++i)
- {
- if (i != $$.begin ())
- yyo << ", ";
- yyo << *i;
- }
-- } < std::list >
-+ } < std::vector >
-
--%code requires { #include }
-+%code requires { #include }
- %code { int yylex (yy::parser::semantic_type* yylval); }
-
- %%
-@@ -185,7 +185,7 @@ m4_pushdef([AT_TEST],
- [AT_SETUP([Variants $1])
-
- AT_BISON_OPTION_PUSHDEFS([%debug $1])
--# Store strings and integers in a list of strings.
-+# Store strings and integers in a vector of strings.
- AT_DATA_GRAMMAR([list.y],
- [[%debug
- %define api.value.type variant
-@@ -194,29 +194,25 @@ AT_DATA_GRAMMAR([list.y],
-
- %code requires // code for the .hh file
- {
--#include
-+#include
- #include
--typedef std::list strings_type;
-+typedef std::vector strings_type;
- }
-
--%code // code for the .cc file
-+%code top // code for the .cc file.
- {
- #include // abort, getenv
- #include
-+#include
- #include
-+#include
-
-- namespace yy
-- {
-- static]AT_TOKEN_CTOR_IF([[
-- parser::symbol_type yylex ()]], [[
-- parser::token_type yylex (parser::semantic_type* yylval]AT_LOCATION_IF([,
-- parser::location_type* yylloc])[)]])[;
-- }
-
-- // Printing a list of strings (for %printer).
-- // Koening look up will look into std, since that's an std::list.
-- namespace std
-+ typedef std::vector strings_type;
-+
-+ namespace yy
- {
-+ // Must be available early, as is used in %destructor.
- std::ostream&
- operator<<(std::ostream& o, const strings_type& s)
- {
-@@ -230,16 +226,27 @@ typedef std::list strings_type;
- return o << ')';
- }
- }
-+}
-
-- // Conversion to string.
-- template
-- inline
-- std::string
-- to_string (const T& t)
-+%code // code for the .cc file.
-+{
-+ namespace yy
- {
-- std::ostringstream o;
-- o << t;
-- return o.str ();
-+ static]AT_TOKEN_CTOR_IF([[
-+ parser::symbol_type yylex ()]], [[
-+ parser::token_type yylex (parser::semantic_type* yylval]AT_LOCATION_IF([,
-+ parser::location_type* yylloc])[)]])[;
-+
-+ // Conversion to string.
-+ template