diff --git a/Manifest.files.gz b/Manifest.files.gz
index e11f06fc4cbb..2cd67cdff509 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index d552bf3065d4..5660bd7a3137 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/minecraft/Manifest b/acct-group/minecraft/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/minecraft/metadata.xml b/acct-group/minecraft/metadata.xml
new file mode 100644
index 000000000000..54d5423c4060
--- /dev/null
+++ b/acct-group/minecraft/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ ck+gentoo@bl4ckb0x.de
+ Conrad Kostecki
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/minecraft/minecraft-0.ebuild b/acct-group/minecraft/minecraft-0.ebuild
new file mode 100644
index 000000000000..4b075b5967f2
--- /dev/null
+++ b/acct-group/minecraft/minecraft-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Minecraft server"
+
+ACCT_GROUP_ID="490"
diff --git a/acct-group/mysql/mysql-0.ebuild b/acct-group/mysql/mysql-0.ebuild
index 5d035f877952..e6012a6461f2 100644
--- a/acct-group/mysql/mysql-0.ebuild
+++ b/acct-group/mysql/mysql-0.ebuild
@@ -8,4 +8,3 @@ inherit acct-group
DESCRIPTION="MySQL program group"
ACCT_GROUP_ID=60
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/acct-group/unrealircd/Manifest b/acct-group/unrealircd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/unrealircd/metadata.xml b/acct-group/unrealircd/metadata.xml
new file mode 100644
index 000000000000..69570e849328
--- /dev/null
+++ b/acct-group/unrealircd/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ kensington@gentoo.org
+
+
diff --git a/acct-group/unrealircd/unrealircd-0.ebuild b/acct-group/unrealircd/unrealircd-0.ebuild
new file mode 100644
index 000000000000..7ff6675f2c53
--- /dev/null
+++ b/acct-group/unrealircd/unrealircd-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=494
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 3c0607eba242..ac53db9b1ef1 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/minecraft/Manifest b/acct-user/minecraft/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/minecraft/metadata.xml b/acct-user/minecraft/metadata.xml
new file mode 100644
index 000000000000..54d5423c4060
--- /dev/null
+++ b/acct-user/minecraft/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ ck+gentoo@bl4ckb0x.de
+ Conrad Kostecki
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/minecraft/minecraft-0.ebuild b/acct-user/minecraft/minecraft-0.ebuild
new file mode 100644
index 000000000000..8762fb77e5a7
--- /dev/null
+++ b/acct-user/minecraft/minecraft-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Minecraft server"
+
+ACCT_USER_GROUPS=( "minecraft" )
+ACCT_USER_HOME="/var/lib/minecraft-server"
+ACCT_USER_ID="490"
+
+acct-user_add_deps
diff --git a/acct-user/mysql/mysql-0.ebuild b/acct-user/mysql/mysql-0.ebuild
index 3062dd5c5fae..567a061bd14e 100644
--- a/acct-user/mysql/mysql-0.ebuild
+++ b/acct-user/mysql/mysql-0.ebuild
@@ -10,4 +10,3 @@ ACCT_USER_ID=60
ACCT_USER_GROUPS=( mysql )
acct-user_add_deps
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/acct-user/unrealircd/Manifest b/acct-user/unrealircd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/unrealircd/metadata.xml b/acct-user/unrealircd/metadata.xml
new file mode 100644
index 000000000000..69570e849328
--- /dev/null
+++ b/acct-user/unrealircd/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ kensington@gentoo.org
+
+
diff --git a/acct-user/unrealircd/unrealircd-0.ebuild b/acct-user/unrealircd/unrealircd-0.ebuild
new file mode 100644
index 000000000000..c7be65b9fb5c
--- /dev/null
+++ b/acct-user/unrealircd/unrealircd-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=494
+ACCT_USER_GROUPS=( unrealircd )
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index b3c24d5e27eb..e45ad1583f01 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index fa95c2af9151..f58988e5509e 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1 +1,2 @@
DIST mcelog-162.tar.gz 308347 BLAKE2B bd438e85ea793c6c5ce4d561f0400e91b101a010cce7f937751a11a0a974fec49db7e9d768fc50db68a91c973c90c8ab1b4ffa80964cb6fde860b9f2ac217435 SHA512 d61a0b7ad3974098963edde1e9e9acdf4dbd1a025577b7044bafc17302abd19080c8145a2700c691400af0768ff4b6833d47697e1478c5bef8831f7f8b61ae48
+DIST mcelog-164.tar.gz 308393 BLAKE2B da1f425faa88eb8377eb11c3e13aa6fd4c0b4f4d3b02afc2fba8e4137979bb5619b075b0d0ecd80ec6059c9eb912376291e56e667bf7b838bd2f641c4a6c175f SHA512 10c8c580b10caa6d40c2a4887cb9e9ec07eb81a353d24a4d1a89ad8ec5cc29f7976c26335f077393794b060e62b5cbbe348c64567a3cf3fabc3ec5c3fe59da5a
diff --git a/app-admin/mcelog/mcelog-164.ebuild b/app-admin/mcelog/mcelog-164.ebuild
new file mode 100644
index 000000000000..557b542b3a9f
--- /dev/null
+++ b/app-admin/mcelog/mcelog-164.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ local CONFIG_CHECK="~X86_MCE"
+ kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+ check_extra_config
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+ "${FILESDIR}"/${PN}-129-debugflags.patch
+ eapply_user
+ tc-export CC
+}
+
+src_install() {
+ default
+
+ insinto /etc/cron.daily
+ newins ${PN}.cron ${PN}
+
+ insinto /etc/logrotate.d/
+ newins ${PN}.logrotate ${PN}
+
+ newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ dodoc *.pdf
+}
+
+pkg_postinst() {
+ einfo "The default configuration set is now installed in /etc/${PN}"
+ einfo "you might want to edit those files."
+ einfo
+ einfo "A sample cronjob is installed into /etc/cron.daily"
+ einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 799fe68405e7..4ef051351805 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1,3 +1 @@
-DIST sshguard-2.1.0.tar.gz 1117466 BLAKE2B 1a105f346aa9b774fb0314161d779eadaab299d3b74181a449ab86534e11375e4c017c142bc621733593369bcebada9511dd40c64cb4a49cd124eb7537ae0717 SHA512 0a75e9d1a8c9c010c767a49e96e88db4a92aae8d428deebcff1ce8befa36b77cb1937f2fcb2a4e2a3e86d47896a8405265eb30ee7a603fc18a3ee117d646b119
-DIST sshguard-2.3.1.tar.gz 765330 BLAKE2B d86fe596c788209cb35c699601ccb698365e0c6b497ef8184c64d879ebb821a57e5f366c3b518e6f0c6bf65952b2c675f87f029b7b8184466c7f90d6dfebaca3 SHA512 b24f5dba34bed9246665c432b379afa4f1edacb56fd41e0b254a698ded1280c33fd51fb36466ae70d44ef4a31a0a75b59fa4df97d0e8ed8d194bf8046a3ac84d
DIST sshguard-2.4.0.tar.gz 771506 BLAKE2B 82e9caf70dc9a1ba9ef6ba1c0916424a74891c84069a4a879c9057f3baea32af68f35d8b31cacdd60d323f5ec7b02a6e12aff1ec72fc0291b74c4882cd441d93 SHA512 64293700ef85f0843c333c3a27b04c5b2f69bf8dddf46353a371d4178915deb931362b3641ded0eeb5365f30cb63ce6ce17256d8d094383d1cfe661065b9c1c6
diff --git a/app-admin/sshguard/files/sshguard.initd b/app-admin/sshguard/files/sshguard.initd
deleted file mode 100644
index f1360ce8610b..000000000000
--- a/app-admin/sshguard/files/sshguard.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- after iptables
- use logger
-}
-
-SSHGUARD_PIDFILE=${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}
-
-start() {
- ebegin "Starting sshguard"
- [ -z "${SSHGUARD_WAIT}" ] && SSHGUARD_WAIT=999
- start-stop-daemon --start --wait ${SSHGUARD_WAIT} --background --quiet --exec \
- /usr/sbin/sshguard -- -i ${SSHGUARD_PIDFILE} ${SSHGUARD_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping sshguard"
- start-stop-daemon --stop -p ${SSHGUARD_PIDFILE}
- eend $?
-}
diff --git a/app-admin/sshguard/files/sshguard.initd-r1 b/app-admin/sshguard/files/sshguard.initd-r2
similarity index 65%
rename from app-admin/sshguard/files/sshguard.initd-r1
rename to app-admin/sshguard/files/sshguard.initd-r2
index e7b5ca7428b3..4404566eb117 100644
--- a/app-admin/sshguard/files/sshguard.initd-r1
+++ b/app-admin/sshguard/files/sshguard.initd-r2
@@ -1,12 +1,11 @@
#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
command="/usr/sbin/sshguard"
pidfile="${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}"
command_args="-i \"${pidfile}\" ${SSHGUARD_OPTS}"
-command_background=1
-start_stop_daemon_args="--wait ${SSHGUARD_WAIT:-999} --interpreted --quiet"
+start_stop_daemon_args="--background --wait ${SSHGUARD_WAIT:-999} --interpreted --quiet"
depend() {
after iptables
diff --git a/app-admin/sshguard/sshguard-2.1.0-r1.ebuild b/app-admin/sshguard/sshguard-2.1.0-r1.ebuild
deleted file mode 100644
index 5fc804a5f545..000000000000
--- a/app-admin/sshguard/sshguard-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="protects hosts from brute force attacks against ssh"
-HOMEPAGE="http://sshguard.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x86-fbsd"
-
-DEPEND="
- sys-devel/flex
-"
-RDEPEND="
- virtual/logger
-"
-DOCS=(
- CHANGELOG.rst
- CONTRIBUTING.rst
- README.rst
- examples/net.sshguard.plist
- examples/sshguard.service
- examples/whitelistfile.example
-)
-PATCHES=(
- "${FILESDIR}"/${PN}-2.1.0-conf.patch
-)
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
- insinto /etc
- newins examples/sshguard.conf.sample sshguard.conf
-}
diff --git a/app-admin/sshguard/sshguard-2.3.1.ebuild b/app-admin/sshguard/sshguard-2.3.1.ebuild
deleted file mode 100644
index 3fac136a82f9..000000000000
--- a/app-admin/sshguard/sshguard-2.3.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="protects hosts from brute force attacks against ssh"
-HOMEPAGE="https://www.sshguard.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-
-DEPEND="
- sys-devel/flex
-"
-RDEPEND="
- virtual/logger
-"
-DOCS=(
- CHANGELOG.rst
- CONTRIBUTING.rst
- README.rst
- examples/net.sshguard.plist
- examples/sshguard.service
- examples/whitelistfile.example
-)
-PATCHES=(
- "${FILESDIR}"/${PN}-2.1.0-conf.patch
-)
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
- insinto /etc
- newins examples/sshguard.conf.sample sshguard.conf
-}
diff --git a/app-admin/sshguard/sshguard-2.4.0.ebuild b/app-admin/sshguard/sshguard-2.4.0.ebuild
index 3fac136a82f9..8926537ef84c 100644
--- a/app-admin/sshguard/sshguard-2.4.0.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm x86 ~x86-fbsd"
DEPEND="
sys-devel/flex
@@ -32,7 +32,7 @@ PATCHES=(
src_install() {
default
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
insinto /etc
diff --git a/app-admin/sshguard/sshguard-99999.ebuild b/app-admin/sshguard/sshguard-99999.ebuild
index 407363556f81..0f9a63205b67 100644
--- a/app-admin/sshguard/sshguard-99999.ebuild
+++ b/app-admin/sshguard/sshguard-99999.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
src_install() {
default
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
insinto /etc
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index ae328fd01ca9..e4c974f98f60 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/lbzip2/files/lbzip2-2.5_p20181227-fix-unaligned.patch b/app-arch/lbzip2/files/lbzip2-2.5_p20181227-fix-unaligned.patch
new file mode 100644
index 000000000000..c23d1afc4ca5
--- /dev/null
+++ b/app-arch/lbzip2/files/lbzip2-2.5_p20181227-fix-unaligned.patch
@@ -0,0 +1,33 @@
+https://github.com/kjn/lbzip2/pull/25
+
+From d570020ade2add591b97e61927545a005a2d4a6f Mon Sep 17 00:00:00 2001
+From: Matt Turner
+Date: Wed, 7 Aug 2019 11:47:04 -0700
+Subject: [PATCH] Align zero-length array to avoid unaligned accesses
+
+When make_tree() creates the left-justified base table (uint64_t *B)
+it does so with 64-bit stores:
+
+ B[k] = sofar;
+
+But B points to memory in the zero-length array "uint32_t tt[0]" at the
+end of struct decoder_state. Since tt's type is uint32_t, it is only
+aligned to a four byte boundary, and so the 64-bit store in make_tree()
+causes an unaligned trap on strict platforms like sparc.
+---
+ src/decode.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/decode.h b/src/decode.h
+index c9a9086..7c0ca3f 100644
+--- a/src/decode.h
++++ b/src/decode.h
+@@ -62,7 +62,7 @@ struct decoder_state {
+ uint8_t rle_char; /* current character */
+ uint8_t rle_prev; /* prevoius character */
+
+- uint32_t tt[0];
++ uint32_t tt[0] __attribute__((aligned (8)));
+ };
+
+
diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
similarity index 92%
rename from app-arch/lbzip2/lbzip2-2.5_p20181227.ebuild
rename to app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
index 04fa9267b153..7dc8fcd267ff 100644
--- a/app-arch/lbzip2/lbzip2-2.5_p20181227.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
@@ -3,8 +3,6 @@
EAPI="7"
-inherit autotools
-
DESCRIPTION="Parallel bzip2 utility"
HOMEPAGE="https://github.com/kjn/lbzip2/"
SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz"
@@ -19,14 +17,9 @@ DEPEND=""
PATCHES=(
"${FILESDIR}"/${PN}-2.3-s_isreg.patch
+ "${FILESDIR}"/${P}-fix-unaligned.patch
)
-src_prepare() {
- default
-
- eautoreconf
-}
-
src_configure() {
local myeconfargs=(
--disable-silent-rules
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index e058a247dbff..b456e2eab27a 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/qxmledit/qxmledit-0.9.12.ebuild b/app-editors/qxmledit/qxmledit-0.9.12.ebuild
index 92f6d26cf065..aaa5c63c57ea 100644
--- a/app-editors/qxmledit/qxmledit-0.9.12.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.9.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
DEPEND="
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index a4aec0c2d1d7..60ef2b1d487b 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/containers-storage/Manifest b/app-emulation/containers-storage/Manifest
index 8aaa370a6f9b..a11d4ce2e0c2 100644
--- a/app-emulation/containers-storage/Manifest
+++ b/app-emulation/containers-storage/Manifest
@@ -1,5 +1,3 @@
-DIST containers-storage-1.12.10.tar.gz 1593313 BLAKE2B 4b0c412304dc6b3aa79064a6071abfdd325cffd7405c50d57008f3139cfd9afd450a21773e4463650b63720210381e58e11b8c019efcf0297377821c3b76c276 SHA512 83b7e353efe89192e1c956742202395981849f68d53967df14a6952e36c458a2a2adaed4cf7d959e3b73114906deb5056591b8fc3aefbc83b85f9f5dd378f031
-DIST containers-storage-1.12.15.tar.gz 5968064 BLAKE2B 180583da6271c23f828ba5d91e8f1db64ac1aa8f9bb1f308b59e0eb0bdcd7afb94509aa0556bfc86a4e182cbdb6501b9c51b58499a61c2773254b03a6c3bc621 SHA512 523e4d35995fa169701551f91362fafd67f25ad1cbe733a5ae2614a198a4d71c5b5f319a539dd5a6a38e79ca46b8979ed62918a3bd69fb39d8d14d259f197408
DIST containers-storage-1.12.16.tar.gz 5970004 BLAKE2B 0e9f473c9315acb22b94c9cd17072659afe2270e05d7c7c595d0563bd4d96420b3ecaaaeaf61ce4a10647e40c7177b7483aadf62ce40237dea10c23cb91bba62 SHA512 17a073bb338547c1e64065a1a0013e083565abeb6aa366989160c90dfb6bd6d306ea25fc938194b607b0cc74918b1ff40b12ea274b3df771e2d848b2bbab2b5c
-DIST containers-storage-1.12.9.tar.gz 1593286 BLAKE2B f53ef233e3d08dad84cda9154271254f9fe04e951643f20e8ab5bd37456e4eeb7083c1810656072c2b4bdeea0f6188871d4db566363c8363d2c2087ab9a4d3cb SHA512 0b5ad6cb52b4b74da7c574ec6841d74b92ef20f853e8d8fed83e0f9d529a7749692225e26ae4ab89fbd2a6202651c8a3a44a57bc1f42bcbb755fdba26e9cb3fd
+DIST containers-storage-1.13.1.tar.gz 5983556 BLAKE2B 1d0b6aba0464603fb26c45beecdb9b4afe6566dff4698da980ad6f9736a6d810ec41334f181d5709f78bab986e704c965b1967ed591348cd687d9cb92875321d SHA512 9fa686f44dda3d363f7c623abc9baa0911e26eb5e7dbb7bc60da259fe8d52411cb25fb98e2c8db10a5a80ebf04d07af8390acd48d26706f913900b19e58eac9f
DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 103470 BLAKE2B 81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4 SHA512 fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6
diff --git a/app-emulation/containers-storage/containers-storage-1.12.15.ebuild b/app-emulation/containers-storage/containers-storage-1.12.15.ebuild
deleted file mode 100644
index 312d2cda060a..000000000000
--- a/app-emulation/containers-storage/containers-storage-1.12.15.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_VENDOR=(
- "github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
-)
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="containers/storage library"
-HOMEPAGE="https://github.com/containers/storage"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="btrfs +device-mapper ostree test"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
- ${EGO_VENDOR_URI}"
-RDEPEND="
- btrfs? ( sys-fs/btrfs-progs )
- device-mapper? ( sys-fs/lvm2:= )
- ostree? (
- dev-libs/glib:=
- dev-util/ostree:=
- )"
-DEPEND="${RDEPEND}
- dev-go/go-md2man
- test? (
- sys-fs/btrfs-progs
- sys-fs/lvm2
- sys-apps/util-linux
- )"
-RESTRICT="test? ( userpriv ) !test? ( test )"
-
-src_unpack() {
- golang-vcs-snapshot_src_unpack
-}
-
-src_prepare() {
- default
-
- [[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
- use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_btrfs" > \
- "${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
-
- [[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
- use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
- "${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
-
- [[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
- use ostree || { echo -e "#!/bin/sh\ntrue" > \
- "${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
-
- sed -e 's:TestChrootUntarPath(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
- sed -e 's:TestTarUntar(:_\0:' \
- -e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
- -e 's:TestTarWithOptions(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
- sed -e 's:TestTarUntarWithXattr(:_\0:' \
- -e 's:TestTarWithBlockCharFifo(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
- sed -e 's:TestTarUntarWithXattr(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
- sed -e 's:TestApplyLayer(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die
- sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
- -e 's:TestApplyLayerInvalidHardlink(:_\0:' \
- -e 's:TestApplyLayerInvalidSymlink(:_\0:' \
- -e 's:TestApplyLayerWhiteouts(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die
- sed -e 's:TestCopyCaseE(:_\0:' \
- -e 's:TestCopyCaseEFSym(:_\0:' \
- -e 's:TestCopyCaseG(:_\0:' \
- -e 's:TestCopyCaseGFSym(:_\0:' \
- -e 's:TestCopyCaseH(:_\0:' \
- -e 's:TestCopyCaseHFSym(:_\0:' \
- -e 's:TestCopyCaseJ(:_\0:' \
- -e 's:TestCopyCaseJFSym(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die
- sed -e 's:TestMount(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die
-}
-
-src_compile() {
- export -n GOCACHE XDG_CACHE_HOME #678856
- mkdir -p "${S}/src/github.com/pquerna" || die
- ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die
- mkdir -p "${S}/bin" || die
- cd "${S}/bin" || die
- GOPATH="${S}" GOBIN="${S}/bin" \
- go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die
- GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
- emake -C "${S}/src/${EGO_PN}" containers-storage docs
-}
-
-src_install() {
- dobin "${S}/src/${EGO_PN}/${PN}"
- while read -r -d ''; do
- mv "${REPLY}" "${REPLY%.1}" || die
- done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
- find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
-}
-
-src_test() {
- GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit || die
-}
diff --git a/app-emulation/containers-storage/containers-storage-1.12.16.ebuild b/app-emulation/containers-storage/containers-storage-1.12.16.ebuild
index 23a29fc2a6f9..a472e58367b6 100644
--- a/app-emulation/containers-storage/containers-storage-1.12.16.ebuild
+++ b/app-emulation/containers-storage/containers-storage-1.12.16.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
default
[[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
- use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion" > \
+ use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
"${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
[[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
diff --git a/app-emulation/containers-storage/containers-storage-1.12.9.ebuild b/app-emulation/containers-storage/containers-storage-1.12.9.ebuild
deleted file mode 100644
index 312d2cda060a..000000000000
--- a/app-emulation/containers-storage/containers-storage-1.12.9.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_VENDOR=(
- "github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
-)
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="containers/storage library"
-HOMEPAGE="https://github.com/containers/storage"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="btrfs +device-mapper ostree test"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
- ${EGO_VENDOR_URI}"
-RDEPEND="
- btrfs? ( sys-fs/btrfs-progs )
- device-mapper? ( sys-fs/lvm2:= )
- ostree? (
- dev-libs/glib:=
- dev-util/ostree:=
- )"
-DEPEND="${RDEPEND}
- dev-go/go-md2man
- test? (
- sys-fs/btrfs-progs
- sys-fs/lvm2
- sys-apps/util-linux
- )"
-RESTRICT="test? ( userpriv ) !test? ( test )"
-
-src_unpack() {
- golang-vcs-snapshot_src_unpack
-}
-
-src_prepare() {
- default
-
- [[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
- use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_btrfs" > \
- "${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
-
- [[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
- use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
- "${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
-
- [[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
- use ostree || { echo -e "#!/bin/sh\ntrue" > \
- "${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
-
- sed -e 's:TestChrootUntarPath(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
- sed -e 's:TestTarUntar(:_\0:' \
- -e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
- -e 's:TestTarWithOptions(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
- sed -e 's:TestTarUntarWithXattr(:_\0:' \
- -e 's:TestTarWithBlockCharFifo(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
- sed -e 's:TestTarUntarWithXattr(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
- sed -e 's:TestApplyLayer(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die
- sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
- -e 's:TestApplyLayerInvalidHardlink(:_\0:' \
- -e 's:TestApplyLayerInvalidSymlink(:_\0:' \
- -e 's:TestApplyLayerWhiteouts(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die
- sed -e 's:TestCopyCaseE(:_\0:' \
- -e 's:TestCopyCaseEFSym(:_\0:' \
- -e 's:TestCopyCaseG(:_\0:' \
- -e 's:TestCopyCaseGFSym(:_\0:' \
- -e 's:TestCopyCaseH(:_\0:' \
- -e 's:TestCopyCaseHFSym(:_\0:' \
- -e 's:TestCopyCaseJ(:_\0:' \
- -e 's:TestCopyCaseJFSym(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die
- sed -e 's:TestMount(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die
-}
-
-src_compile() {
- export -n GOCACHE XDG_CACHE_HOME #678856
- mkdir -p "${S}/src/github.com/pquerna" || die
- ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die
- mkdir -p "${S}/bin" || die
- cd "${S}/bin" || die
- GOPATH="${S}" GOBIN="${S}/bin" \
- go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die
- GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
- emake -C "${S}/src/${EGO_PN}" containers-storage docs
-}
-
-src_install() {
- dobin "${S}/src/${EGO_PN}/${PN}"
- while read -r -d ''; do
- mv "${REPLY}" "${REPLY%.1}" || die
- done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
- find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
-}
-
-src_test() {
- GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit || die
-}
diff --git a/app-emulation/containers-storage/containers-storage-1.12.10.ebuild b/app-emulation/containers-storage/containers-storage-1.13.1.ebuild
similarity index 97%
rename from app-emulation/containers-storage/containers-storage-1.12.10.ebuild
rename to app-emulation/containers-storage/containers-storage-1.13.1.ebuild
index 312d2cda060a..a472e58367b6 100644
--- a/app-emulation/containers-storage/containers-storage-1.12.10.ebuild
+++ b/app-emulation/containers-storage/containers-storage-1.13.1.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
default
[[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
- use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_btrfs" > \
+ use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
"${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
[[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild
index 295da5632494..a8490f1cf230 100644
--- a/app-emulation/faudio/faudio-19.06.ebuild
+++ b/app-emulation/faudio/faudio-19.06.ebuild
@@ -52,7 +52,7 @@ multilib_src_configure() {
"-DXNASONG=$(usex xnasong ON OFF)"
)
if use ffmpeg; then
- mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)" )
+ mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)" )
fi
cmake-utils_src_configure
}
@@ -70,8 +70,8 @@ multilib_src_install() {
# FIXME: do we want to install the FAudio tools?
cmake-utils_src_install
- sed -e "s/%LIB%/$(get_libdir)/g" "${FILESDIR}/faudio.pc" \
- > "${T}/faudio.pc" \
+ sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \
+ "${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \
|| die "sed failed"
insinto "/usr/$(get_libdir)/pkgconfig"
doins "${T}/faudio.pc"
diff --git a/app-emulation/faudio/files/faudio.pc b/app-emulation/faudio/files/faudio.pc
index c632922c1f66..cdb3bf49e64a 100644
--- a/app-emulation/faudio/files/faudio.pc
+++ b/app-emulation/faudio/files/faudio.pc
@@ -1,4 +1,4 @@
-prefix=/usr
+prefix=%PREFIX%
exec_prefix=${prefix}
libdir=${prefix}/%LIB%
includedir=${prefix}/include/FAudio
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild
index 2c4c919612cd..42d4ca69bfa1 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild
@@ -368,7 +368,7 @@ multilib_src_configure() {
--libexecdir="${MY_LIBEXECDIR}"
--localstatedir="${MY_LOCALSTATEDIR}"
--mandir="${MY_MANDIR}"
- --sysconfdir=/etc/wine
+ --sysconfdir="${EPREFIX}/etc/wine"
$(use_with alsa)
$(use_with capi)
$(use_with lcms cms)
@@ -481,6 +481,9 @@ multilib_src_install_all() {
use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+ # Avoid double prefix from dosym and make_wrapper
+ MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
if use abi_x86_64 && ! use abi_x86_32; then
dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
@@ -491,7 +494,7 @@ multilib_src_install_all() {
# Make wrappers for binaries for handling multiple variants
# Note: wrappers instead of symlinks because some are shell which use basename
local b
- for b in "${D%/}${MY_PREFIX}"/bin/*; do
+ for b in "${ED%/}${MY_PREFIX}"/bin/*; do
make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
done
eshopts_pop
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild
index 2c4c919612cd..42d4ca69bfa1 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild
@@ -368,7 +368,7 @@ multilib_src_configure() {
--libexecdir="${MY_LIBEXECDIR}"
--localstatedir="${MY_LOCALSTATEDIR}"
--mandir="${MY_MANDIR}"
- --sysconfdir=/etc/wine
+ --sysconfdir="${EPREFIX}/etc/wine"
$(use_with alsa)
$(use_with capi)
$(use_with lcms cms)
@@ -481,6 +481,9 @@ multilib_src_install_all() {
use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+ # Avoid double prefix from dosym and make_wrapper
+ MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
if use abi_x86_64 && ! use abi_x86_32; then
dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
@@ -491,7 +494,7 @@ multilib_src_install_all() {
# Make wrappers for binaries for handling multiple variants
# Note: wrappers instead of symlinks because some are shell which use basename
local b
- for b in "${D%/}${MY_PREFIX}"/bin/*; do
+ for b in "${ED%/}${MY_PREFIX}"/bin/*; do
make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
done
eshopts_pop
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 3b4ff7a4a2f5..9d9fe4965fef 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild b/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
index fe548e75e5cf..b8645bc091a2 100644
--- a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
+++ b/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ueno/${PN}/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="nls"
CDEPEND="app-i18n/ibus
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 99391a2de6dd..841b490416ce 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/elasticsearch_exporter/Manifest b/app-metrics/elasticsearch_exporter/Manifest
index ff844f70c7e3..a4e956c24c48 100644
--- a/app-metrics/elasticsearch_exporter/Manifest
+++ b/app-metrics/elasticsearch_exporter/Manifest
@@ -1,3 +1,4 @@
DIST elasticsearch_exporter-1.0.2.tar.gz 207764 BLAKE2B f626c53d04e05912d1db480d6078b44fb6a05e42ec1751bfc2ddd45ff2f0bc0550517e16b10064adcf8c2ab2db175011543a2953fff1624cd575318e6fad943b SHA512 f610660761d761a26b840a969008763ecb19bdc07ab4a076cec7fc40f7d00a68e863fb72b0ea3b56446621a99fa31384ab79789a2e6526fc5b12dcc20df3c684
DIST elasticsearch_exporter-1.0.4_rc1.tar.gz 212553 BLAKE2B 9f6f8f0117af4e59a483eda378df8a2ac5419a5319a02f69210250be952dc6cd401f0c20dbc3d416446d3af183750919f190112795652180d64ea3f6c62f5a56 SHA512 073fcce3417ae2147076b0fbbe3387494f9e2e8613284f03c6761d5e81d50aba648c6b47d423d79209d0b9221963951c21b2fa44aabe29c1eb0c36546dd140eb
+DIST elasticsearch_exporter-1.1.0.tar.gz 316279 BLAKE2B 86e994ea0765a231b8ebaeaf495fa160ce53795e191e25cf82994214b53c62f03030b27040e95b770dc526ed2b772961b12ac73700b0da9f8994d532a0958789 SHA512 81cd7a44a2cd07bde7e716eac688c06ca93059de5ba7e1d3e009683b133f8c84c91a09a9e4775a558a3856389e165ce8ec2f04bd856b7b39b8f4a6072623b103
DIST elasticsearch_exporter-1.1.0_rc1.tar.gz 314275 BLAKE2B 1548cbecb6f5a0ae70ffb7a1ccceedbc5e9f980841b9ddb47f56c522a0f0fdc4f9c0613ec95c6a8705f1affd8d713e70d6cfaeacd84cd552a21466a490cac387 SHA512 ba571fec3cdbc32279008ddfc6b72b093fef4ba4ee0eaed98000cecadf81f61adcce24989f36c8dc6abde51129ed638473267e2636ec669ac30440338001930e
diff --git a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild
new file mode 100644
index 000000000000..cedeaf364c0b
--- /dev/null
+++ b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+MY_PV=${PV/_/}
+
+EGO_PN="github.com/justwatchcom/elasticsearch_exporter"
+EXPORTER_COMMIT="fe20e49"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Elasticsearch stats exporter for Prometheus"
+HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ default
+ sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+ pushd src/${EGO_PN} || die
+ mkdir -p bin || die
+ GOPATH="${S}" promu build -v --prefix bin || die
+ popd || die
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ dobin bin/elasticsearch_exporter
+ dodoc {README,CHANGELOG}.md
+ popd || die
+ keepdir /var/log/elasticsearch_exporter
+ fowners ${PN}:${PN} /var/log/elasticsearch_exporter
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index ae0b65f9e123..6598f39b735c 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild b/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
index 3a914692acec..baabf0037baf 100644
--- a/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
+++ b/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
@@ -9,11 +9,13 @@ MY_P="${MY_PN}-${PV}"
inherit toolchain-funcs
DESCRIPTION="A glue between the graphlcd-base library from the GraphLCD project"
-HOMEPAGE="https://lucianm.github.io/GLCDprocDriver
- https://github.com/lucianm/GLCDprocDriver"
+HOMEPAGE="
+ https://lucianm.github.io/GLCDprocDriver
+ https://github.com/lucianm/GLCDprocDriver
+"
SRC_URI="https://github.com/lucianm/${MY_PN}/archive/0.1.2.tar.gz -> ${MY_P}.tar.gz"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
SLOT="0"
LICENSE="GPL-2"
diff --git a/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild b/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
index ed6379c3013a..9c5ac5cb28c7 100644
--- a/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
SLOT="0"
LICENSE="GPL-2"
IUSE="fontconfig freetype g15 graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
@@ -27,6 +27,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+
BDEPEND="virtual/pkgconfig"
DOCS=( "HISTORY" "README" "TODO" "docs/." )
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 9a31a9e29983..bdde6b7da2d5 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 9581259d5145..da04c0403d7b 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,3 +1,4 @@
DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
DIST mariadb-connector-c-3.0.9-src.tar.gz 668142 BLAKE2B f61f855c334268b1cb079abc566a600093d7e0bdd164c22045000e337f43d2b57d14988cba1b3fd2f6316f6e0d949be7e67ac73410ddb1abc66e0faa16422946 SHA512 6f45bcd4bee07f6d72d1c4fee0bdb903ef4fa879eb7508156bc885a5657caf69b145d95647c4bc663eb2a2b03569b41ef9d87ca532b77901c2f67fd608048a1a
DIST mariadb-connector-c-3.1.2-src.tar.gz 735530 BLAKE2B c441cb69b0affaaa5ed87a9e81232ef2dfab305bf5d92ad60ad0198508294c1153ad517347d2af1336722149200a1a62ddd4c289913b09de0195c9da79279305 SHA512 8ad0ec5aea07a04e7ac9da6af3d067755dd8f22deed071de2321c581374b5ed1e4d6bab048b231655d3c2a3722b2b99f276d95046c659f867cbd58d772fb17bb
+DIST mariadb-connector-c-3.1.3-src.tar.gz 738250 BLAKE2B a3ea70d2dc226b7c8e907dddaa39e280a76fac7b0a8a74971aa9cc6c1fadf3e5cb96fb3f55e29a639a899d5eeb30dd28d4cfaef0256f030af86909d68e9f85dc SHA512 ca3809a5f1a33317962908ee40d5c339ba6b02c5c8818bf12af9b78eb2289efad711ab74ac7706d711951b22957ba897b5e80b60e8df44924ca70569a4e1c5e7
diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.3-fix-pkconfig-file.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.3-fix-pkconfig-file.patch
new file mode 100644
index 000000000000..ea4798ea9439
--- /dev/null
+++ b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.3-fix-pkconfig-file.patch
@@ -0,0 +1,21 @@
+--- a/mariadb_config/libmariadb.pc.in
++++ b/mariadb_config/libmariadb.pc.in
+@@ -7,14 +7,13 @@
+ #
+
+ prefix=@CMAKE_INSTALL_PREFIX@
+-includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@
+-libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@
++includedir=${prefix}/include
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+
+ Name: libmariadb
+ Version: @CPACK_PACKAGE_VERSION@
++URL: https://mariadb.com/kb/en/library/mariadb-connector-c/
+ Description: MariaDB Connector/C dynamic library
+-Cflags: -I${includedir}
++Cflags: -I${includedir}/mariadb
+ Libs: -L${libdir} -lmariadb
+ Libs.private: @extra_dynamic_LDFLAGS@
+-
+-
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.3.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.3.ebuild
new file mode 100644
index 000000000000..234dbab69749
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VCS_INHERIT=""
+if [[ "${PV}" == 9999 ]] ; then
+ VCS_INHERIT="git-r3"
+ EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
+else
+ MY_PN=${PN#mariadb-}
+ MY_PV=${PV/_b/-b}
+ SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
+ S="${WORKDIR%/}/${PN}-${MY_PV}-src"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+ /usr/include/mariadb/mariadb_version.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/3"
+IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+ virtual/libiconv:=[${MULTILIB_USEDEP}]
+ curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
+ kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+ app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
+ !gnutls? (
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+ !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+ )
+ )
+ "
+RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/gentoo-layout-3.0.patch
+ "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+src_configure() {
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DWITH_EXTERNAL_ZLIB=ON
+ -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+ -DWITH_CURL=$(usex curl ON OFF)
+ -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
+ -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_LIBDIR="$(get_libdir)"
+ -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+ -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+ -DINSTALL_BINDIR=bin
+ -DWITH_UNIT_TESTS=$(usex test ON OFF)
+ )
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+ if ! use static-libs ; then
+ find "${D}" -name "*.a" -delete || die
+ fi
+}
diff --git a/dev-db/mariadb/files/MDEV-20247-replication-10.2.patch b/dev-db/mariadb/files/MDEV-20247-replication-10.2.patch
new file mode 100644
index 000000000000..193f2dd77509
--- /dev/null
+++ b/dev-db/mariadb/files/MDEV-20247-replication-10.2.patch
@@ -0,0 +1,108 @@
+From 47f8a18fec604983e47fdf7c822d94b26d85cade Mon Sep 17 00:00:00 2001
+From: Thirunarayanan Balathandayuthapani
+Date: Wed, 7 Aug 2019 12:35:04 +0530
+Subject: [PATCH] MDEV-20247 Replication hangs with "preparing" and never
+ starts
+
+- The commit ab6dd774082c57f48d998e03655c06b672799b2d wrongly sets the
+condition inside innobase_srv_conc_enter_innodb(). Problem is that
+InnoDB makes the thread to sleep indefinitely if it is a replication
+slave thread.
+
+Thanks to Sujatha Sivakumar for contributing the replication test case.
+---
+ .../r/rpl_sync_with_innodb_thd_conc.result | 13 ++++++
+ .../rpl/t/rpl_sync_with_innodb_thd_conc.test | 41 +++++++++++++++++++
+ storage/innobase/handler/ha_innodb.cc | 6 +--
+ 4 files changed, 60 insertions(+), 6 deletions(-)
+ create mode 100644 mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result
+ create mode 100644 mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test
+
+diff --git a/mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result b/mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result
+new file mode 100644
+index 000000000000..0ed894336a1c
+--- /dev/null
++++ b/mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result
+@@ -0,0 +1,18 @@
++include/master-slave.inc
++[connection master]
++connection slave;
++SET @old_innodb_thread_concurrency := @@innodb_thread_concurrency;
++SET @old_innodb_thread_sleep_delay := @@innodb_thread_sleep_delay;
++SET GLOBAL innodb_thread_concurrency = 100;
++connection master;
++CREATE TABLE t(f INT) ENGINE=INNODB;
++INSERT INTO t VALUES (10);
++connection slave;
++include/diff_tables.inc [master:t, slave:t]
++"===== Clean up======="
++connection master;
++DROP TABLE t;
++connection slave;
++SET GLOBAL innodb_thread_concurrency = @old_innodb_thread_concurrency;
++SET GLOBAL innodb_thread_sleep_delay = @old_innodb_thread_sleep_delay;
++include/rpl_end.inc
+diff --git a/mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test b/mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test
+new file mode 100644
+index 000000000000..b4c2971d2fbc
+--- /dev/null
++++ b/mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test
+@@ -0,0 +1,41 @@
++# ==== Purpose ====
++#
++# Test verifies that replication shouldn't hang when number of active threads
++# on the slave server are less than the allowed innodb_thread_concurrency value.
++#
++# ==== Implementation ====
++#
++# Steps:
++# 0 - Have master slave replication setup with engine being Innodb.
++# 1 - Configure innodb_thread_concurrency = 100.
++# 2 - Do some DML on master and sync the slave with master.
++# 3 - Ensure replication doesn't hang.
++#
++# ==== References ====
++#
++# MDEV-20247: Replication hangs with "preparing" and never starts
++#
++
++--source include/master-slave.inc
++--source include/have_innodb.inc
++
++--connection slave
++SET @old_innodb_thread_concurrency := @@innodb_thread_concurrency;
++SET @old_innodb_thread_sleep_delay := @@innodb_thread_sleep_delay;
++SET GLOBAL innodb_thread_concurrency = 100;
++
++--connection master
++CREATE TABLE t(f INT) ENGINE=INNODB;
++INSERT INTO t VALUES (10);
++--sync_slave_with_master
++
++--let $diff_tables=master:t, slave:t
++--source include/diff_tables.inc
++
++--echo "===== Clean up======="
++--connection master
++DROP TABLE t;
++--sync_slave_with_master
++SET GLOBAL innodb_thread_concurrency = @old_innodb_thread_concurrency;
++SET GLOBAL innodb_thread_sleep_delay = @old_innodb_thread_sleep_delay;
++--source include/rpl_end.inc
+diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
+index 081fcbd9c51e..5dfe240631b8 100644
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
+@@ -1686,9 +1686,9 @@ innobase_srv_conc_enter_innodb(
+ && thd_is_replication_slave_thread(trx->mysql_thd)) {
+ const ulonglong end = my_interval_timer()
+ + ulonglong(srv_replication_delay) * 1000000;
+- while (srv_conc_get_active_threads()
+- >= srv_thread_concurrency
+- || my_interval_timer() >= end) {
++ while ((srv_conc_get_active_threads()
++ >= srv_thread_concurrency)
++ && my_interval_timer() < end) {
+ os_thread_sleep(2000 /* 2 ms */);
+ }
+ } else {
diff --git a/dev-db/mariadb/files/MDEV-20247-replication.patch b/dev-db/mariadb/files/MDEV-20247-replication.patch
new file mode 100644
index 000000000000..92f8e0e1a67d
--- /dev/null
+++ b/dev-db/mariadb/files/MDEV-20247-replication.patch
@@ -0,0 +1,121 @@
+From 47f8a18fec604983e47fdf7c822d94b26d85cade Mon Sep 17 00:00:00 2001
+From: Thirunarayanan Balathandayuthapani
+Date: Wed, 7 Aug 2019 12:35:04 +0530
+Subject: [PATCH] MDEV-20247 Replication hangs with "preparing" and never
+ starts
+
+- The commit ab6dd774082c57f48d998e03655c06b672799b2d wrongly sets the
+condition inside innobase_srv_conc_enter_innodb(). Problem is that
+InnoDB makes the thread to sleep indefinitely if it is a replication
+slave thread.
+
+Thanks to Sujatha Sivakumar for contributing the replication test case.
+---
+ .../r/rpl_sync_with_innodb_thd_conc.result | 13 ++++++
+ .../rpl/t/rpl_sync_with_innodb_thd_conc.test | 41 +++++++++++++++++++
+ storage/innobase/handler/ha_innodb.cc | 6 +--
+ storage/xtradb/handler/ha_innodb.cc | 6 +--
+ 4 files changed, 60 insertions(+), 6 deletions(-)
+ create mode 100644 mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result
+ create mode 100644 mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test
+
+diff --git a/mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result b/mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result
+new file mode 100644
+index 000000000000..0ed894336a1c
+--- /dev/null
++++ b/mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result
+@@ -0,0 +1,13 @@
++include/master-slave.inc
++[connection master]
++SET @old_innodb_thread_concurrency := @@innodb_thread_concurrency;
++SET @old_innodb_thread_sleep_delay := @@innodb_thread_sleep_delay;
++SET GLOBAL innodb_thread_concurrency = 100;
++CREATE TABLE t(f INT) ENGINE=INNODB;
++INSERT INTO t VALUES (10);
++include/diff_tables.inc [master:t, slave:t]
++"===== Clean up======="
++DROP TABLE t;
++SET GLOBAL innodb_thread_concurrency = @old_innodb_thread_concurrency;
++SET GLOBAL innodb_thread_sleep_delay = @old_innodb_thread_sleep_delay;
++include/rpl_end.inc
+diff --git a/mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test b/mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test
+new file mode 100644
+index 000000000000..b4c2971d2fbc
+--- /dev/null
++++ b/mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test
+@@ -0,0 +1,41 @@
++# ==== Purpose ====
++#
++# Test verifies that replication shouldn't hang when number of active threads
++# on the slave server are less than the allowed innodb_thread_concurrency value.
++#
++# ==== Implementation ====
++#
++# Steps:
++# 0 - Have master slave replication setup with engine being Innodb.
++# 1 - Configure innodb_thread_concurrency = 100.
++# 2 - Do some DML on master and sync the slave with master.
++# 3 - Ensure replication doesn't hang.
++#
++# ==== References ====
++#
++# MDEV-20247: Replication hangs with "preparing" and never starts
++#
++
++--source include/master-slave.inc
++--source include/have_innodb.inc
++
++--connection slave
++SET @old_innodb_thread_concurrency := @@innodb_thread_concurrency;
++SET @old_innodb_thread_sleep_delay := @@innodb_thread_sleep_delay;
++SET GLOBAL innodb_thread_concurrency = 100;
++
++--connection master
++CREATE TABLE t(f INT) ENGINE=INNODB;
++INSERT INTO t VALUES (10);
++--sync_slave_with_master
++
++--let $diff_tables=master:t, slave:t
++--source include/diff_tables.inc
++
++--echo "===== Clean up======="
++--connection master
++DROP TABLE t;
++--sync_slave_with_master
++SET GLOBAL innodb_thread_concurrency = @old_innodb_thread_concurrency;
++SET GLOBAL innodb_thread_sleep_delay = @old_innodb_thread_sleep_delay;
++--source include/rpl_end.inc
+diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
+index 081fcbd9c51e..5dfe240631b8 100644
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
+@@ -1686,9 +1686,9 @@ innobase_srv_conc_enter_innodb(
+ && thd_is_replication_slave_thread(trx->mysql_thd)) {
+ const ulonglong end = my_interval_timer()
+ + ulonglong(srv_replication_delay) * 1000000;
+- while (srv_conc_get_active_threads()
+- >= srv_thread_concurrency
+- || my_interval_timer() >= end) {
++ while ((srv_conc_get_active_threads()
++ >= srv_thread_concurrency)
++ && my_interval_timer() < end) {
+ os_thread_sleep(2000 /* 2 ms */);
+ }
+ } else {
+diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
+index 5e7482ff6bfa..b5002187e3b2 100644
+--- a/storage/xtradb/handler/ha_innodb.cc
++++ b/storage/xtradb/handler/ha_innodb.cc
+@@ -1949,9 +1949,9 @@ innobase_srv_conc_enter_innodb(
+ && thd_is_replication_slave_thread(trx->mysql_thd)) {
+ const ulonglong end = my_interval_timer()
+ + ulonglong(srv_replication_delay) * 1000000;
+- while (srv_conc_get_active_threads()
+- >= srv_thread_concurrency
+- || my_interval_timer() >= end) {
++ while ((srv_conc_get_active_threads()
++ >= srv_thread_concurrency)
++ && my_interval_timer() < end) {
+ os_thread_sleep(2000 /* 2 ms */);
+ }
+ } else {
diff --git a/dev-db/mariadb/mariadb-10.1.41.ebuild b/dev-db/mariadb/mariadb-10.1.41-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.1.41.ebuild
rename to dev-db/mariadb/mariadb-10.1.41-r1.ebuild
index 40a3c6f6fd67..a94d8c0ce083 100644
--- a/dev-db/mariadb/mariadb-10.1.41.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.41-r1.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
"${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch
"${MY_PATCH_DIR}"/20029_all_mariadb-10.1.37-enable-numa.patch
"${MY_PATCH_DIR}"/20035_all_mariadb-10.1-atomic-detection.patch
+ "${FILESDIR}/MDEV-20247-replication.patch"
)
# Be warned, *DEPEND are version-dependant
diff --git a/dev-db/mariadb/mariadb-10.2.26.ebuild b/dev-db/mariadb/mariadb-10.2.26-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.2.26.ebuild
rename to dev-db/mariadb/mariadb-10.2.26-r1.ebuild
index b43d53dfd0b7..797d944ec897 100644
--- a/dev-db/mariadb/mariadb-10.2.26.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.26-r1.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
"${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
"${MY_PATCH_DIR}"/20035_all_mariadb-10.2-atomic-detection.patch
+ "${FILESDIR}/MDEV-20247-replication-10.2.patch"
)
# Be warned, *DEPEND are version-dependant
diff --git a/dev-db/mariadb/mariadb-10.3.17.ebuild b/dev-db/mariadb/mariadb-10.3.17-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.3.17.ebuild
rename to dev-db/mariadb/mariadb-10.3.17-r1.ebuild
index d960aec7eba8..0c288122d446 100644
--- a/dev-db/mariadb/mariadb-10.3.17.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.17-r1.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
"${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
"${MY_PATCH_DIR}"/20035_all_mariadb-10.3-atomic-detection.patch
+ "${FILESDIR}/MDEV-20247-replication-10.2.patch"
)
# Be warned, *DEPEND are version-dependant
diff --git a/dev-db/mariadb/mariadb-10.4.7.ebuild b/dev-db/mariadb/mariadb-10.4.7-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.4.7.ebuild
rename to dev-db/mariadb/mariadb-10.4.7-r1.ebuild
index 4ab8c38d3729..5e4da733a884 100644
--- a/dev-db/mariadb/mariadb-10.4.7.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.7-r1.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
"${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
"${MY_PATCH_DIR}"/20035_all_mariadb-10.3-atomic-detection.patch
+ "${FILESDIR}/MDEV-20247-replication-10.2.patch"
)
# Be warned, *DEPEND are version-dependant
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index fa901e2f4848..ed16e8849295 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/crystal/files/crystal-0.24.2-gentoo-tests-network-sandbox.patch b/dev-lang/crystal/files/crystal-0.24.2-gentoo-tests-network-sandbox.patch
deleted file mode 100644
index 12565c1d8390..000000000000
--- a/dev-lang/crystal/files/crystal-0.24.2-gentoo-tests-network-sandbox.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/spec/std/socket_spec.cr b/spec/std/socket_spec.cr
-index 0caa51a..f21b3b3 100644
---- a/spec/std/socket_spec.cr
-+++ b/spec/std/socket_spec.cr
-@@ -537,13 +537,15 @@ describe TCPSocket do
- end
- end
-
-- it "fails when host doesn't exist" do
-+ # gentoo's FEATURES=network-sandbox blocks DNS
-+ pending "fails when host doesn't exist" do
- expect_raises(Socket::Error, /No address/i) do
- TCPSocket.new("doesnotexist.example.org.", 12345)
- end
- end
-
-- it "fails (rather than segfault on darwin) when host doesn't exist and port is 0" do
-+ # gentoo's FEATURES=network-sandbox blocks DNS
-+ pending "fails (rather than segfault on darwin) when host doesn't exist and port is 0" do
- expect_raises(Socket::Error, /No address/i) do
- TCPSocket.new("doesnotexist.example.org.", 0)
- end
-@@ -634,7 +636,9 @@ describe UDPSocket do
- client.close
- end
-
-- it "broadcasts messages" do
-+ # gentoo's FEATURES=network-sandbox blocks external network:
-+ # connect: Network is unreachable
-+ pending "broadcasts messages" do
- port = free_udp_socket_port
-
- client = UDPSocket.new(Socket::Family::INET)
diff --git a/dev-lang/crystal/files/crystal-0.25.0-verbose.patch b/dev-lang/crystal/files/crystal-0.25.0-verbose.patch
deleted file mode 100644
index c26e12335e67..000000000000
--- a/dev-lang/crystal/files/crystal-0.25.0-verbose.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 63a9687..995299f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -29,3 +29,3 @@ SOURCES := $(shell find src -name '*.cr')
- SPEC_SOURCES := $(shell find spec -name '*.cr')
--override FLAGS += $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(static),--static )$(if $(LDFLAGS),--link-flags="$(LDFLAGS)" )
-+override FLAGS += $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(static),--static )$(if $(LDFLAGS),--link-flags="$(LDFLAGS)" )$(if $(verbose),--verbose )
- SPEC_FLAGS := $(if $(verbose),-v )$(if $(junit_output),--junit_output $(junit_output) )
diff --git a/dev-lang/crystal/files/crystal-0.26.0-gentoo-tests-network-sandbox-2.patch b/dev-lang/crystal/files/crystal-0.26.0-gentoo-tests-network-sandbox-2.patch
deleted file mode 100644
index bfe23f9ade8e..000000000000
--- a/dev-lang/crystal/files/crystal-0.26.0-gentoo-tests-network-sandbox-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/spec/std/http/server/server_spec.cr
-+++ b/spec/std/http/server/server_spec.cr
-@@ -381,7 +381,9 @@ module HTTP
- end
-
- describe "#bind_ssl" do
-- it "binds SSL server context" do
-+ # gentoo's FEATURES=network-sandbox blocks external network:
-+ # connect: Connection timed out (Errno)
-+ pending "binds SSL server context" do
- server = Server.new do |context|
- context.response.puts "Test Server (#{context.request.headers["Host"]?})"
- context.response.close
---- a/spec/std/http/web_socket_spec.cr
-+++ b/spec/std/http/web_socket_spec.cr
-@@ -335,4 +335,6 @@ describe HTTP::WebSocket do
- end
-
-- it "negotiates over HTTPS correctly" do
-+ # gentoo's FEATURES=network-sandbox blocks external network:
-+ # connect: Connection timed out (Errno)
-+ pending "negotiates over HTTPS correctly" do
- address_chan = Channel(Socket::IPAddress).new
diff --git a/dev-lang/moarvm/moarvm-2018.06-r1.ebuild b/dev-lang/moarvm/moarvm-2018.06-r1.ebuild
index eb788374664f..e9f95796d05a 100644
--- a/dev-lang/moarvm/moarvm-2018.06-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2018.06-r1.ebuild
@@ -38,8 +38,8 @@ RESTRICT=test
src_configure() {
use doc && DOCS+=( docs/* )
- local prefix="${EROOT%/}/usr"
- local libdir="${EROOT%/}/usr/$(get_libdir)"
+ local prefix="${EPREFIX%/}/usr"
+ local libdir="${EPREFIX%/}/usr/$(get_libdir)"
einfo "--prefix '${prefix}'"
einfo "--libdir '${libdir}'"
local myconfigargs=(
diff --git a/dev-lang/moarvm/moarvm-2018.08-r1.ebuild b/dev-lang/moarvm/moarvm-2018.08-r1.ebuild
index eb788374664f..e9f95796d05a 100644
--- a/dev-lang/moarvm/moarvm-2018.08-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2018.08-r1.ebuild
@@ -38,8 +38,8 @@ RESTRICT=test
src_configure() {
use doc && DOCS+=( docs/* )
- local prefix="${EROOT%/}/usr"
- local libdir="${EROOT%/}/usr/$(get_libdir)"
+ local prefix="${EPREFIX%/}/usr"
+ local libdir="${EPREFIX%/}/usr/$(get_libdir)"
einfo "--prefix '${prefix}'"
einfo "--libdir '${libdir}'"
local myconfigargs=(
diff --git a/dev-lang/moarvm/moarvm-2018.09-r1.ebuild b/dev-lang/moarvm/moarvm-2018.09-r1.ebuild
index eb788374664f..e9f95796d05a 100644
--- a/dev-lang/moarvm/moarvm-2018.09-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2018.09-r1.ebuild
@@ -38,8 +38,8 @@ RESTRICT=test
src_configure() {
use doc && DOCS+=( docs/* )
- local prefix="${EROOT%/}/usr"
- local libdir="${EROOT%/}/usr/$(get_libdir)"
+ local prefix="${EPREFIX%/}/usr"
+ local libdir="${EPREFIX%/}/usr/$(get_libdir)"
einfo "--prefix '${prefix}'"
einfo "--libdir '${libdir}'"
local myconfigargs=(
diff --git a/dev-lang/moarvm/moarvm-2018.12-r1.ebuild b/dev-lang/moarvm/moarvm-2018.12-r1.ebuild
index eb788374664f..e9f95796d05a 100644
--- a/dev-lang/moarvm/moarvm-2018.12-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2018.12-r1.ebuild
@@ -38,8 +38,8 @@ RESTRICT=test
src_configure() {
use doc && DOCS+=( docs/* )
- local prefix="${EROOT%/}/usr"
- local libdir="${EROOT%/}/usr/$(get_libdir)"
+ local prefix="${EPREFIX%/}/usr"
+ local libdir="${EPREFIX%/}/usr/$(get_libdir)"
einfo "--prefix '${prefix}'"
einfo "--libdir '${libdir}'"
local myconfigargs=(
diff --git a/dev-lang/moarvm/moarvm-2019.03-r1.ebuild b/dev-lang/moarvm/moarvm-2019.03-r1.ebuild
index eb788374664f..e9f95796d05a 100644
--- a/dev-lang/moarvm/moarvm-2019.03-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2019.03-r1.ebuild
@@ -38,8 +38,8 @@ RESTRICT=test
src_configure() {
use doc && DOCS+=( docs/* )
- local prefix="${EROOT%/}/usr"
- local libdir="${EROOT%/}/usr/$(get_libdir)"
+ local prefix="${EPREFIX%/}/usr"
+ local libdir="${EPREFIX%/}/usr/$(get_libdir)"
einfo "--prefix '${prefix}'"
einfo "--libdir '${libdir}'"
local myconfigargs=(
diff --git a/dev-lang/moarvm/moarvm-2019.07-r1.ebuild b/dev-lang/moarvm/moarvm-2019.07-r1.ebuild
index bc5d5b1fa0ad..ff7796fe5a35 100644
--- a/dev-lang/moarvm/moarvm-2019.07-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2019.07-r1.ebuild
@@ -43,8 +43,8 @@ PATCHES="${FILESDIR}/fix-quoting.patch"
src_configure() {
use doc && DOCS+=( docs/* )
- local prefix="${EROOT%/}/usr"
- local libdir="${EROOT%/}/usr/$(get_libdir)"
+ local prefix="${EPREFIX%/}/usr"
+ local libdir="${EPREFIX%/}/usr/$(get_libdir)"
einfo "--prefix '${prefix}'"
einfo "--libdir '${libdir}'"
local myconfigargs=(
diff --git a/dev-lang/moarvm/moarvm-2019.07.1-r1.ebuild b/dev-lang/moarvm/moarvm-2019.07.1-r1.ebuild
index 2183e45ce3df..a819b78d97e6 100644
--- a/dev-lang/moarvm/moarvm-2019.07.1-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2019.07.1-r1.ebuild
@@ -49,8 +49,8 @@ src_prepare() {
src_configure() {
use doc && DOCS+=( docs/* )
- local prefix="${EROOT}/usr"
- local libdir="${EROOT}/usr/$(get_libdir)"
+ local prefix="${EPREFIX}/usr"
+ local libdir="${EPREFIX}/usr/$(get_libdir)"
einfo "--prefix '${prefix}'"
einfo "--libdir '${libdir}'"
local myconfigargs=(
diff --git a/dev-lang/moarvm/moarvm-9999.ebuild b/dev-lang/moarvm/moarvm-9999.ebuild
index 2183e45ce3df..a819b78d97e6 100644
--- a/dev-lang/moarvm/moarvm-9999.ebuild
+++ b/dev-lang/moarvm/moarvm-9999.ebuild
@@ -49,8 +49,8 @@ src_prepare() {
src_configure() {
use doc && DOCS+=( docs/* )
- local prefix="${EROOT}/usr"
- local libdir="${EROOT}/usr/$(get_libdir)"
+ local prefix="${EPREFIX}/usr"
+ local libdir="${EPREFIX}/usr/$(get_libdir)"
einfo "--prefix '${prefix}'"
einfo "--libdir '${libdir}'"
local myconfigargs=(
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index f006df352d4a..4dc7c3161e22 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1,5 +1,6 @@
-DIST nqp-2018.06.tar.gz 3792244 BLAKE2B 95cfa80c83951e91b71e14162c4c5cd78a8f546ba601002836d2b3fe79325aa26b963d0bb58df70935546f6960f3797a3a7762187defcb6b7c5124a7205bb257 SHA512 312f203c51f3d58bbc474cd7263a118f3438efe230a56a30f38a688b4a57aac88a94a0e6630736066255c122bb001d748a76272f7f634be8ddda91cc3340574b
-DIST nqp-2018.08.tar.gz 3769932 BLAKE2B 892eec3dcbfcf57bddbbbb296aea2d126176a5b5db79493beccb7625360c42e26fc9025c8f594430c8cdac346b5af93d7a5167fbbd6e17776070bc3b4b754b63 SHA512 b3f1729060c88407eee07fb32841febb51b68e375ff797aa9ebc6019a4c1229ea7e713262fbe7dfbd9e0317594eb8526179b9d63cf034ac3aca3d82c4ff7d565
-DIST nqp-2018.09.tar.gz 3797808 BLAKE2B e5c7c79d7577338e89190ee11673e65093f2e08cd5950727ed8f33a35769db8d6f5e5c7450a93ceb73bf011cdd0a492ce70de6026948a20dd972dcb79a07fb9e SHA512 7412ef9c25f9540ae399c8d83b090eec1c7cea63f0cda970e21e3d760ed915895f8d69c092847feda002702e401e6eee8a6521c41e879c82619340d096948126
-DIST nqp-2018.12.tar.gz 3928586 BLAKE2B a11480ae4f09810d349b3adeafb7a6317db41ca28937d99c936f3d8be39be0039fe88db03c9b3b248193a377260a3e21500eb3e11ad282e5ed02635724f05678 SHA512 6c075410490e4c3cab20fffdb986ef179a26c2f11e50e91b50e38e43f8d7909eb8e645ee9280f506da115866f73ef9013cd229e12b100ff43e8610ead69628da
-DIST nqp-2019.03.tar.gz 3949224 BLAKE2B 350bccdbcea8ed598292e6f2e312ad276db0ffe15ec8716eb7cafed35df9ab523f9cee3c0385fce41f5f680b4f4c6eb9e470857e2970c0bd4462579c577a122b SHA512 c3bcd02196b5628d7269aed581b54389e362dd7f0f04a1a5068b5d986fa182857b55e2b769fe2eb080ff2fe4e6fdf7d7adc9e184868c047c0c874ee9568b53cd
+DIST nqp-2018.06.official.tar.gz 3795050 BLAKE2B 9c5be1a93f5bba632778125fe3c13431606ef01b654775f890aef27c8bfd220930079cb820e933fdae2d151a7c3bacd57bd4f139547cd938e5c1eb0c54b16f19 SHA512 6b4a74098a3d55931a3c8934029f0e97e388b90c1babef023023e1bf3203dbe53b928155d24ecb6a3a54a3228e72a18a2a2747cd8389497569e24e22d489c68c
+DIST nqp-2018.08.official.tar.gz 3770932 BLAKE2B 2425c28a8192fe0d992650fe3d9c79e198c69abfece17276d62225cfa2029916af1ec7568f626a1a67eadc886a1544154af3c015370a67eb1e13e5da35e08bd8 SHA512 663b52677c49eb4b6c5f4ed68de821d9adbe4e3fbcabf2174227b1d3dfafffa357f720557b18a5fbd121c46704dda117395c996a78af70eb367f1b23d8b2564f
+DIST nqp-2018.09.official.tar.gz 3798897 BLAKE2B d9ac40be8f864a7c9a35cd21dde188396b15465568d7642dbd5dddc3468edc09b6e2f7997fb08a189e160cd5ec004cb4efdcee9262e23b6bb32650eb17d93c14 SHA512 5a673430c2dce5d51f90fd8da18636d1abfd5e841f8530a51020beaffd83635a77090e52968bcbcdee361681a436834490bd2f5c383b21972cf40a9d88b28020
+DIST nqp-2018.12.official.tar.gz 3930041 BLAKE2B 35876f63461aadc634e8ad3fd1a46aff4ead788ebf0d741eb1ff6a82e9227fd5edbcd1f733c184083f73073f2ac1a8dab094f2f8fe177183663697dc13da3065 SHA512 56b7821fc0164c8e8fcf58a16aa96c75347aa078cb3bf7f8f6c41df26338e51e2ddb6984049908de83126861c7406c4504e073e7203409c3f37b129661b8c2f8
+DIST nqp-2019.03.official.tar.gz 3951058 BLAKE2B 237b8cc0105396fc96349a0dd34502ab45fb7d02089dd2ef5aad2554610b4090adf11679271869e5ae06abfa509210959ae8762fbee30dfe6190d6a74ce32591 SHA512 248768c1b1c0f5e5bd19183404e2a1aa28ab488b05db0b1ed0f0bcceca8b9830885762e763ea38cdd2b54d975d2663e1defe236907096aabc5b668818d293533
+DIST nqp-2019.07.1.tar.gz 3937612 BLAKE2B 71f5ddadaa70d7eeadc122ef50f90c13bf7e3a1a4262069ee8564f739e99dfb780359e1155a28f61f90dd1cc419379e366d7274c9567a4319bd841005c3a51a9 SHA512 90c9cfbc3de165ba8c0b4653a849a6faafef9e3862743c3675277c25bc4578522a97a663a4ed7529831fa0b617c7412fcfe67b3e3ff1fc5994f6c42cdf7a4bc5
diff --git a/dev-lang/nqp/nqp-2019.03.ebuild b/dev-lang/nqp/nqp-2018.06-r1.ebuild
similarity index 94%
rename from dev-lang/nqp/nqp-2019.03.ebuild
rename to dev-lang/nqp/nqp-2018.06-r1.ebuild
index f014c8b7f45f..12c384f52897 100644
--- a/dev-lang/nqp/nqp-2019.03.ebuild
+++ b/dev-lang/nqp/nqp-2018.06-r1.ebuild
@@ -10,8 +10,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
KEYWORDS=""
else
- SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
- inherit vcs-snapshot
+ SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -30,10 +29,10 @@ CDEPEND="java? (
)
moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.7 )"
+ java? ( >=virtual/jre-1.8 )"
DEPEND="${CDEPEND}
clang? ( sys-devel/clang )
- java? ( >=virtual/jdk-1.7 )
+ java? ( >=virtual/jdk-1.8 )
dev-lang/perl"
pkg_pretend() {
@@ -70,7 +69,7 @@ nqp_configure() {
pushd "${BUILD_DIR}" > /dev/null || die
local myconfargs=(
"--backend=${MULTIBUILD_VARIANT}"
- "--prefix=/usr" )
+ "--prefix=${EPREFIX%/}/usr" )
perl Configure.pl "${myconfargs[@]}" || die
popd || die
diff --git a/dev-lang/nqp/nqp-2018.12.ebuild b/dev-lang/nqp/nqp-2018.08-r1.ebuild
similarity index 94%
rename from dev-lang/nqp/nqp-2018.12.ebuild
rename to dev-lang/nqp/nqp-2018.08-r1.ebuild
index f014c8b7f45f..12c384f52897 100644
--- a/dev-lang/nqp/nqp-2018.12.ebuild
+++ b/dev-lang/nqp/nqp-2018.08-r1.ebuild
@@ -10,8 +10,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
KEYWORDS=""
else
- SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
- inherit vcs-snapshot
+ SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -30,10 +29,10 @@ CDEPEND="java? (
)
moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.7 )"
+ java? ( >=virtual/jre-1.8 )"
DEPEND="${CDEPEND}
clang? ( sys-devel/clang )
- java? ( >=virtual/jdk-1.7 )
+ java? ( >=virtual/jdk-1.8 )
dev-lang/perl"
pkg_pretend() {
@@ -70,7 +69,7 @@ nqp_configure() {
pushd "${BUILD_DIR}" > /dev/null || die
local myconfargs=(
"--backend=${MULTIBUILD_VARIANT}"
- "--prefix=/usr" )
+ "--prefix=${EPREFIX%/}/usr" )
perl Configure.pl "${myconfargs[@]}" || die
popd || die
diff --git a/dev-lang/nqp/nqp-2018.08.ebuild b/dev-lang/nqp/nqp-2018.08.ebuild
deleted file mode 100644
index 2600c72c270a..000000000000
--- a/dev-lang/nqp/nqp-2018.08.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-opt-2 multibuild
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
- inherit vcs-snapshot
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="https://rakudo.org"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
- dev-java/asm:4
- dev-java/jline:0
- dev-java/jna:4
- )
- moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.7 )"
-DEPEND="${CDEPEND}
- clang? ( sys-devel/clang )
- java? ( >=virtual/jdk-1.7 )
- dev-lang/perl"
-
-pkg_pretend() {
- if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
- ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
- ewarn "already being installed. So if it fails, try uninstalling both"
- ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
- ewarn "(see Bug #584394)"
- fi
-}
-
-java_prepare() {
- # Don't clean stage0 jars.
- einfo "Cleaning upstream jars"
- java-pkg_clean 3rdparty/
-
- # Don't use jars we just deleted.
- sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
- src/vm/jvm/runners/nqp-j || die
-}
-
-src_prepare() {
- MULTIBUILD_VARIANTS=()
- use moar && MULTIBUILD_VARIANTS+=( moar )
- use java && MULTIBUILD_VARIANTS+=( jvm )
-
- multibuild_copy_sources
-
- # This will pull in conditional java_prepare
- default
-}
-
-nqp_configure() {
- pushd "${BUILD_DIR}" > /dev/null || die
- local myconfargs=(
- "--backend=${MULTIBUILD_VARIANT}"
- "--prefix=/usr" )
-
- perl Configure.pl "${myconfargs[@]}" || die
- popd || die
-}
-
-nqp_compile() {
- if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
- emake -j1 \
- -C "${BUILD_DIR}" \
- THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
- JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
- elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
- emake -j1 \
- -C "${BUILD_DIR}"
- fi
-}
-
-nqp_test() {
- emake -j1 \
- -C "${BUILD_DIR}" \
- test
-}
-
-nqp_install() {
- # This is the actual reason we need multibuild.eclass.
- # We need to distinguish the install procedure for MoarVM and JVM backends.
- case "${MULTIBUILD_VARIANT}" in
- moar)
- emake \
- DESTDIR="${ED}" \
- -C "${BUILD_DIR}" \
- install
- ;;
- jvm)
- pushd "${BUILD_DIR}" > /dev/null || die
- # Set JAVA_PKG_JARDEST early.
- java-pkg_init_paths_
-
- # Upstream sets the classpath to this location. Perhaps it's
- # used to locate the additional libraries?
- java-pkg_addcp "${JAVA_PKG_JARDEST}"
-
- insinto "${JAVA_PKG_JARDEST}"
- local jar
-
- for jar in *.jar; do
- if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
- # jars for NQP itself.
- java-pkg_dojar ${jar}
- else
- # jars used by NQP.
- doins ${jar}
- fi
- done
-
- # Upstream uses -Xbootclasspath/a, which is faster due to lack
- # of verification, but gjl isn't flexible enough yet. :(
- java-pkg_dolauncher ${PN}-j --main ${PN}
- dosym ${PN}-j /usr/bin/${PN}
- dobin tools/jvm/eval-client.pl
- popd > /dev/null || die
- ;;
- *)
- die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
- ;;
- esac
-}
-
-src_configure() {
- multibuild_foreach_variant nqp_configure
-}
-
-src_compile() {
- multibuild_foreach_variant nqp_compile
-}
-
-src_test() {
- multibuild_foreach_variant nqp_test
-}
-
-src_install() {
- multibuild_foreach_variant nqp_install
-
- dodoc CREDITS README.pod
- use doc && dodoc -r docs/*
-}
diff --git a/dev-lang/nqp/nqp-2018.09.ebuild b/dev-lang/nqp/nqp-2018.09-r1.ebuild
similarity index 93%
rename from dev-lang/nqp/nqp-2018.09.ebuild
rename to dev-lang/nqp/nqp-2018.09-r1.ebuild
index d4d6775bc3e0..12c384f52897 100644
--- a/dev-lang/nqp/nqp-2018.09.ebuild
+++ b/dev-lang/nqp/nqp-2018.09-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,8 +10,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
KEYWORDS=""
else
- SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
- inherit vcs-snapshot
+ SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -30,10 +29,10 @@ CDEPEND="java? (
)
moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.7 )"
+ java? ( >=virtual/jre-1.8 )"
DEPEND="${CDEPEND}
clang? ( sys-devel/clang )
- java? ( >=virtual/jdk-1.7 )
+ java? ( >=virtual/jdk-1.8 )
dev-lang/perl"
pkg_pretend() {
@@ -70,7 +69,7 @@ nqp_configure() {
pushd "${BUILD_DIR}" > /dev/null || die
local myconfargs=(
"--backend=${MULTIBUILD_VARIANT}"
- "--prefix=/usr" )
+ "--prefix=${EPREFIX%/}/usr" )
perl Configure.pl "${myconfargs[@]}" || die
popd || die
diff --git a/dev-lang/nqp/nqp-2018.06.ebuild b/dev-lang/nqp/nqp-2018.12-r1.ebuild
similarity index 93%
rename from dev-lang/nqp/nqp-2018.06.ebuild
rename to dev-lang/nqp/nqp-2018.12-r1.ebuild
index 2600c72c270a..12c384f52897 100644
--- a/dev-lang/nqp/nqp-2018.06.ebuild
+++ b/dev-lang/nqp/nqp-2018.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,8 +10,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
KEYWORDS=""
else
- SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
- inherit vcs-snapshot
+ SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -30,10 +29,10 @@ CDEPEND="java? (
)
moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.7 )"
+ java? ( >=virtual/jre-1.8 )"
DEPEND="${CDEPEND}
clang? ( sys-devel/clang )
- java? ( >=virtual/jdk-1.7 )
+ java? ( >=virtual/jdk-1.8 )
dev-lang/perl"
pkg_pretend() {
@@ -70,7 +69,7 @@ nqp_configure() {
pushd "${BUILD_DIR}" > /dev/null || die
local myconfargs=(
"--backend=${MULTIBUILD_VARIANT}"
- "--prefix=/usr" )
+ "--prefix=${EPREFIX%/}/usr" )
perl Configure.pl "${myconfargs[@]}" || die
popd || die
diff --git a/dev-lang/nqp/nqp-2019.03-r1.ebuild b/dev-lang/nqp/nqp-2019.03-r1.ebuild
new file mode 100644
index 000000000000..12c384f52897
--- /dev/null
+++ b/dev-lang/nqp/nqp-2019.03-r1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="https://rakudo.org"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+ dev-java/asm:4
+ dev-java/jline:0
+ dev-java/jna:4
+ )
+ moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
+RDEPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.8 )"
+DEPEND="${CDEPEND}
+ clang? ( sys-devel/clang )
+ java? ( >=virtual/jdk-1.8 )
+ dev-lang/perl"
+
+pkg_pretend() {
+ if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
+ ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+ ewarn "already being installed. So if it fails, try uninstalling both"
+ ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+ ewarn "(see Bug #584394)"
+ fi
+}
+
+java_prepare() {
+ # Don't clean stage0 jars.
+ einfo "Cleaning upstream jars"
+ java-pkg_clean 3rdparty/
+
+ # Don't use jars we just deleted.
+ sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
+ src/vm/jvm/runners/nqp-j || die
+}
+
+src_prepare() {
+ MULTIBUILD_VARIANTS=()
+ use moar && MULTIBUILD_VARIANTS+=( moar )
+ use java && MULTIBUILD_VARIANTS+=( jvm )
+
+ multibuild_copy_sources
+
+ # This will pull in conditional java_prepare
+ default
+}
+
+nqp_configure() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ local myconfargs=(
+ "--backend=${MULTIBUILD_VARIANT}"
+ "--prefix=${EPREFIX%/}/usr" )
+
+ perl Configure.pl "${myconfargs[@]}" || die
+ popd || die
+}
+
+nqp_compile() {
+ if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+ emake -j1 \
+ -C "${BUILD_DIR}" \
+ THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
+ JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+ elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+ emake -j1 \
+ -C "${BUILD_DIR}"
+ fi
+}
+
+nqp_test() {
+ emake -j1 \
+ -C "${BUILD_DIR}" \
+ test
+}
+
+nqp_install() {
+ # This is the actual reason we need multibuild.eclass.
+ # We need to distinguish the install procedure for MoarVM and JVM backends.
+ case "${MULTIBUILD_VARIANT}" in
+ moar)
+ emake \
+ DESTDIR="${ED}" \
+ -C "${BUILD_DIR}" \
+ install
+ ;;
+ jvm)
+ pushd "${BUILD_DIR}" > /dev/null || die
+ # Set JAVA_PKG_JARDEST early.
+ java-pkg_init_paths_
+
+ # Upstream sets the classpath to this location. Perhaps it's
+ # used to locate the additional libraries?
+ java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+ insinto "${JAVA_PKG_JARDEST}"
+ local jar
+
+ for jar in *.jar; do
+ if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+ # jars for NQP itself.
+ java-pkg_dojar ${jar}
+ else
+ # jars used by NQP.
+ doins ${jar}
+ fi
+ done
+
+ # Upstream uses -Xbootclasspath/a, which is faster due to lack
+ # of verification, but gjl isn't flexible enough yet. :(
+ java-pkg_dolauncher ${PN}-j --main ${PN}
+ dosym ${PN}-j /usr/bin/${PN}
+ dobin tools/jvm/eval-client.pl
+ popd > /dev/null || die
+ ;;
+ *)
+ die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
+ ;;
+ esac
+}
+
+src_configure() {
+ multibuild_foreach_variant nqp_configure
+}
+
+src_compile() {
+ multibuild_foreach_variant nqp_compile
+}
+
+src_test() {
+ multibuild_foreach_variant nqp_test
+}
+
+src_install() {
+ multibuild_foreach_variant nqp_install
+
+ dodoc CREDITS README.pod
+ use doc && dodoc -r docs/*
+}
diff --git a/dev-lang/nqp/nqp-2019.07.1.ebuild b/dev-lang/nqp/nqp-2019.07.1.ebuild
new file mode 100644
index 000000000000..120648d125d4
--- /dev/null
+++ b/dev-lang/nqp/nqp-2019.07.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="https://rakudo.org"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+ dev-java/asm:4
+ dev-java/jline:0
+ dev-java/jna:4
+ )
+ moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
+RDEPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.8 )"
+DEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}
+ clang? ( sys-devel/clang )
+ java? ( >=virtual/jdk-1.8 )
+ dev-lang/perl"
+
+pkg_pretend() {
+ if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
+ ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+ ewarn "already being installed. So if it fails, try uninstalling both"
+ ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+ ewarn "(see Bug #584394)"
+ fi
+}
+
+java_prepare() {
+ # Don't clean stage0 jars.
+ einfo "Cleaning upstream jars"
+ java-pkg_clean 3rdparty/
+
+ # Don't use jars we just deleted.
+ sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
+ src/vm/jvm/runners/nqp-j || die
+}
+
+src_prepare() {
+ MULTIBUILD_VARIANTS=()
+ use moar && MULTIBUILD_VARIANTS+=( moar )
+ use java && MULTIBUILD_VARIANTS+=( jvm )
+
+ multibuild_copy_sources
+
+ # This will pull in conditional java_prepare
+ default
+}
+
+nqp_configure() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ local myconfargs=(
+ "--backend=${MULTIBUILD_VARIANT}"
+ "--prefix=${EPREFIX%/}/usr" )
+
+ perl Configure.pl "${myconfargs[@]}" || die
+ popd || die
+}
+
+nqp_compile() {
+ if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+ emake -j1 \
+ -C "${BUILD_DIR}" \
+ THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
+ JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+ elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+ emake -j1 \
+ -C "${BUILD_DIR}"
+ fi
+}
+
+nqp_test() {
+ emake -j1 \
+ -C "${BUILD_DIR}" \
+ test
+}
+
+nqp_install() {
+ # This is the actual reason we need multibuild.eclass.
+ # We need to distinguish the install procedure for MoarVM and JVM backends.
+ case "${MULTIBUILD_VARIANT}" in
+ moar)
+ emake \
+ DESTDIR="${ED}" \
+ -C "${BUILD_DIR}" \
+ install
+ ;;
+ jvm)
+ pushd "${BUILD_DIR}" > /dev/null || die
+ # Set JAVA_PKG_JARDEST early.
+ java-pkg_init_paths_
+
+ # Upstream sets the classpath to this location. Perhaps it's
+ # used to locate the additional libraries?
+ java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+ insinto "${JAVA_PKG_JARDEST}"
+ local jar
+
+ for jar in *.jar; do
+ if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+ # jars for NQP itself.
+ java-pkg_dojar ${jar}
+ else
+ # jars used by NQP.
+ doins ${jar}
+ fi
+ done
+
+ # Upstream uses -Xbootclasspath/a, which is faster due to lack
+ # of verification, but gjl isn't flexible enough yet. :(
+ java-pkg_dolauncher ${PN}-j --main ${PN}
+ dosym ${PN}-j /usr/bin/${PN}
+ dobin tools/jvm/eval-client.pl
+ popd > /dev/null || die
+ ;;
+ *)
+ die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
+ ;;
+ esac
+}
+
+src_configure() {
+ multibuild_foreach_variant nqp_configure
+}
+
+src_compile() {
+ multibuild_foreach_variant nqp_compile
+}
+
+src_test() {
+ multibuild_foreach_variant nqp_test
+}
+
+src_install() {
+ multibuild_foreach_variant nqp_install
+
+ dodoc CREDITS README.pod
+ use doc && dodoc -r docs/*
+}
diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild
index 6adbdc268327..120648d125d4 100644
--- a/dev-lang/nqp/nqp-9999.ebuild
+++ b/dev-lang/nqp/nqp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit java-pkg-opt-2 multibuild
@@ -10,8 +10,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
KEYWORDS=""
else
- SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
- inherit vcs-snapshot
+ SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -30,10 +29,11 @@ CDEPEND="java? (
)
moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.7 )"
-DEPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.8 )"
+DEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}
clang? ( sys-devel/clang )
- java? ( >=virtual/jdk-1.7 )
+ java? ( >=virtual/jdk-1.8 )
dev-lang/perl"
pkg_pretend() {
@@ -70,7 +70,7 @@ nqp_configure() {
pushd "${BUILD_DIR}" > /dev/null || die
local myconfargs=(
"--backend=${MULTIBUILD_VARIANT}"
- "--prefix=/usr" )
+ "--prefix=${EPREFIX%/}/usr" )
perl Configure.pl "${myconfargs[@]}" || die
popd || die
diff --git a/dev-lang/parrot/parrot-7.1.0.ebuild b/dev-lang/parrot/parrot-7.1.0-r1.ebuild
similarity index 95%
rename from dev-lang/parrot/parrot-7.1.0.ebuild
rename to dev-lang/parrot/parrot-7.1.0-r1.ebuild
index 148ef1c2d811..3ba3c774a34c 100644
--- a/dev-lang/parrot/parrot-7.1.0.ebuild
+++ b/dev-lang/parrot/parrot-7.1.0-r1.ebuild
@@ -17,13 +17,13 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
-RDEPEND="sys-libs/readline
+RDEPEND="sys-libs/readline:0=
dev-libs/libffi
opengl? ( media-libs/freeglut )
nls? ( sys-devel/gettext )
unicode? ( >=dev-libs/icu-2.6:= )
gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
- gmp? ( >=dev-libs/gmp-4.1.4 )
+ gmp? ( >=dev-libs/gmp-4.1.4:0= )
ssl? ( dev-libs/openssl:0= )
pcre? ( dev-libs/libpcre )
doc? ( dev-perl/JSON )"
@@ -68,7 +68,7 @@ src_test() {
src_install() {
emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
- dosym /usr/bin/parrot-ops2c /usr/bin/ops2c || die
+ dosym parrot-ops2c /usr/bin/ops2c || die
if use examples; then
insinto "/usr/share/doc/${PF}/examples"
doins -r examples/* || die
diff --git a/dev-lang/parrot/parrot-7.5.0.ebuild b/dev-lang/parrot/parrot-7.11.0-r1.ebuild
similarity index 95%
rename from dev-lang/parrot/parrot-7.5.0.ebuild
rename to dev-lang/parrot/parrot-7.11.0-r1.ebuild
index 9655f5fbc606..ecedd1c6ff5f 100644
--- a/dev-lang/parrot/parrot-7.5.0.ebuild
+++ b/dev-lang/parrot/parrot-7.11.0-r1.ebuild
@@ -17,13 +17,13 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
-RDEPEND="sys-libs/readline
+RDEPEND="sys-libs/readline:0=
dev-libs/libffi
opengl? ( media-libs/freeglut )
nls? ( sys-devel/gettext )
unicode? ( >=dev-libs/icu-2.6:= )
gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
- gmp? ( >=dev-libs/gmp-4.1.4 )
+ gmp? ( >=dev-libs/gmp-4.1.4:0= )
ssl? ( dev-libs/openssl:0= )
pcre? ( dev-libs/libpcre )
doc? ( dev-perl/JSON )"
@@ -68,7 +68,7 @@ src_test() {
src_install() {
emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
- dosym /usr/bin/parrot-ops2c /usr/bin/ops2c || die
+ dosym parrot-ops2c /usr/bin/ops2c || die
if use examples; then
insinto "/usr/share/doc/${PF}/examples"
doins -r examples/* || die
diff --git a/dev-lang/parrot/parrot-7.11.0.ebuild b/dev-lang/parrot/parrot-7.5.0-r1.ebuild
similarity index 95%
rename from dev-lang/parrot/parrot-7.11.0.ebuild
rename to dev-lang/parrot/parrot-7.5.0-r1.ebuild
index 9655f5fbc606..ecedd1c6ff5f 100644
--- a/dev-lang/parrot/parrot-7.11.0.ebuild
+++ b/dev-lang/parrot/parrot-7.5.0-r1.ebuild
@@ -17,13 +17,13 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
-RDEPEND="sys-libs/readline
+RDEPEND="sys-libs/readline:0=
dev-libs/libffi
opengl? ( media-libs/freeglut )
nls? ( sys-devel/gettext )
unicode? ( >=dev-libs/icu-2.6:= )
gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
- gmp? ( >=dev-libs/gmp-4.1.4 )
+ gmp? ( >=dev-libs/gmp-4.1.4:0= )
ssl? ( dev-libs/openssl:0= )
pcre? ( dev-libs/libpcre )
doc? ( dev-perl/JSON )"
@@ -68,7 +68,7 @@ src_test() {
src_install() {
emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
- dosym /usr/bin/parrot-ops2c /usr/bin/ops2c || die
+ dosym parrot-ops2c /usr/bin/ops2c || die
if use examples; then
insinto "/usr/share/doc/${PF}/examples"
doins -r examples/* || die
diff --git a/dev-lang/parrot/parrot-8.1.0.ebuild b/dev-lang/parrot/parrot-8.1.0-r1.ebuild
similarity index 95%
rename from dev-lang/parrot/parrot-8.1.0.ebuild
rename to dev-lang/parrot/parrot-8.1.0-r1.ebuild
index dc938a69dfc2..271931b3b1af 100644
--- a/dev-lang/parrot/parrot-8.1.0.ebuild
+++ b/dev-lang/parrot/parrot-8.1.0-r1.ebuild
@@ -17,14 +17,14 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
-RDEPEND="sys-libs/readline
+RDEPEND="sys-libs/readline:0=
dev-libs/libffi
net-libs/libnsl:0=
opengl? ( media-libs/freeglut )
nls? ( sys-devel/gettext )
unicode? ( >=dev-libs/icu-2.6:= )
gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
- gmp? ( >=dev-libs/gmp-4.1.4 )
+ gmp? ( >=dev-libs/gmp-4.1.4:0= )
ssl? ( dev-libs/openssl:0= )
pcre? ( dev-libs/libpcre )
doc? ( dev-perl/JSON )"
@@ -69,7 +69,7 @@ src_test() {
src_install() {
emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
- dosym /usr/bin/parrot-ops2c /usr/bin/ops2c || die
+ dosym parrot-ops2c /usr/bin/ops2c || die
if use examples; then
insinto "/usr/share/doc/${PF}/examples"
doins -r examples/* || die
diff --git a/dev-lang/parrot/parrot-8.1.0-r2.ebuild b/dev-lang/parrot/parrot-8.1.0-r2.ebuild
new file mode 100644
index 000000000000..85f839ba76ae
--- /dev/null
+++ b/dev-lang/parrot/parrot-8.1.0-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib
+
+# weird failures
+RESTRICT="test"
+
+DESCRIPTION="Virtual machine designed to compile and execute bytecode for dynamic languages"
+HOMEPAGE="http://www.parrot.org/"
+SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
+
+CDEPEND="sys-libs/readline:0=
+ dev-libs/libffi
+ net-libs/libnsl:0=
+ opengl? ( media-libs/freeglut )
+ nls? ( sys-devel/gettext )
+ unicode? ( >=dev-libs/icu-2.6:= )
+ gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
+ gmp? ( >=dev-libs/gmp-4.1.4:0= )
+ ssl? ( dev-libs/openssl:0= )
+ pcre? ( dev-libs/libpcre )
+"
+RDEPEND="${CDEPEND}
+ doc? ( dev-perl/JSON )"
+DEPEND="${CDEPEND}"
+BDEPEND="dev-lang/perl[doc?]
+ ${RDEPEND}"
+
+src_configure() {
+ myconf="--disable-rpath"
+ use unicode || myconf+=" --without-icu"
+ use ssl || myconf+=" --without-crypto"
+ use gdbm || myconf+=" --without-gdbm"
+ use nls || myconf+=" --without-gettext"
+ use gmp || myconf+=" --without-gmp"
+ use opengl || myconf+=" --without-opengl"
+ use pcre || myconf+=" --without-pcre"
+
+ perl Configure.pl \
+ --ccflags="${CFLAGS}" \
+ --linkflags="${LDFLAGS}" \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --mandir="${EPREFIX}"/usr/share/man \
+ --sysconfdir="${EPREFIX}"/etc \
+ --sharedstatedir="${EPREFIX}"/var/lib/parrot \
+ $myconf || die
+}
+
+src_compile() {
+ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
+ # occasionally dies in parallel make
+ emake -j1
+ if use doc ; then
+ emake -j1 html
+ fi
+}
+
+src_test() {
+ emake -j1 test
+}
+
+src_install() {
+ emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+ dosym parrot-ops2c /usr/bin/ops2c
+ rm -vfr "${ED}/usr/share/doc/${PF}/parrot" || die "Unable to prune excess docs"
+ DOCS=(
+ CREDITS
+ ChangeLog
+ DONORS.pod
+ PBC_COMPAT
+ PLATFORMS
+ README.pod
+ RESPONSIBLE_PARTIES
+ TODO
+ )
+ use doc && DOCS+=( editor )
+ use examples && DOCS+=( examples )
+ use doc && HTML_DOCS=(
+ docs/html/developer.html
+ docs/html/DONORS.pod.html
+ docs/html/index.html
+ docs/html/ops.html
+ docs/html/parrotbug.html
+ docs/html/pdds.html
+ docs/html/pmc.html
+ docs/html/tools.html
+ docs/html/docs
+ docs/html/src
+ docs/html/tools
+ )
+ einstalldocs
+}
diff --git a/dev-lang/php/php-5.6.40-r5.ebuild b/dev-lang/php/php-5.6.40-r5.ebuild
index 11592d2ee3d2..6191b0eb9b01 100644
--- a/dev-lang/php/php-5.6.40-r5.ebuild
+++ b/dev-lang/php/php-5.6.40-r5.ebuild
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2"
diff --git a/dev-lang/php/php-7.1.31.ebuild b/dev-lang/php/php-7.1.31.ebuild
index e95712354ebd..611542e701e6 100644
--- a/dev-lang/php/php-7.1.31.ebuild
+++ b/dev-lang/php/php-7.1.31.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.2.21.ebuild b/dev-lang/php/php-7.2.21.ebuild
index 539a436458b7..8a7b09ad6366 100644
--- a/dev-lang/php/php-7.2.21.ebuild
+++ b/dev-lang/php/php-7.2.21.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.3.8.ebuild b/dev-lang/php/php-7.3.8.ebuild
index a7fcb9fd8e81..82044da0e8b1 100644
--- a/dev-lang/php/php-7.3.8.ebuild
+++ b/dev-lang/php/php-7.3.8.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-lang/zig/files/zig-0.4.0-r1-build-artifacts.patch b/dev-lang/zig/files/zig-0.4.0-r1-build-artifacts.patch
new file mode 100644
index 000000000000..11868e93a8a4
--- /dev/null
+++ b/dev-lang/zig/files/zig-0.4.0-r1-build-artifacts.patch
@@ -0,0 +1,61 @@
+From 81767a658d07219a402384f98a7553abcbbd2e70 Mon Sep 17 00:00:00 2001
+From: Marc Tiehuis
+Date: Thu, 18 Apr 2019 18:58:12 +1200
+Subject: [PATCH] Don't install stage2 artifacts
+
+Fixes #2220.
+---
+ CMakeLists.txt | 11 ++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b017a881..047d538e8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,6 +58,16 @@ endif()
+
+ set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp")
+
++# Handle multi-config builds and place each into a common lib. The VS generator
++# for example will append a Debug folder by default if not explicitly specified.
++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR})
++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR})
++foreach(CONFIG_TYPE ${CMAKE_CONFIGURATION_TYPES})
++ string(TOUPPER ${CONFIG_TYPE} CONFIG_TYPE)
++ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR})
++ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR})
++endforeach(CONFIG_TYPE CMAKE_CONFIGURATION_TYPES)
++
+ if(ZIG_FORCE_EXTERNAL_LLD)
+ find_package(lld)
+ include_directories(${LLVM_INCLUDE_DIRS})
+@@ -253,7 +263,6 @@ else()
+ embedded_lld_wasm
+ embedded_lld_lib
+ )
+- install(TARGETS embedded_lld_elf embedded_lld_coff embedded_lld_mingw embedded_lld_wasm embedded_lld_lib DESTINATION "${ZIG_CPP_LIB_DIR}")
+ endif()
+
+ # No patches have been applied to SoftFloat-3e
+
+From 40fe6afdad1a8676b5d3a5dd23d6d50d6ea9f059 Mon Sep 17 00:00:00 2001
+From: Marc Tiehuis
+Date: Wed, 1 May 2019 17:39:23 +1200
+Subject: [PATCH] Don't install zig_cpp lib for stage2 target
+
+Missed in last commit. See #2220.
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 047d538e8..9881ce1de 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6671,6 +6681,5 @@
+ endif()
+ install(TARGETS zig DESTINATION bin)
+-install(TARGETS zig_cpp DESTINATION "${ZIG_CPP_LIB_DIR}")
+
+ foreach(file ${ZIG_C_HEADER_FILES})
+ get_filename_component(file_dir "${C_HEADERS_DEST}/${file}" DIRECTORY)
diff --git a/dev-lang/zig/files/zig-0.4.0-r1-suppress-warnings.patch b/dev-lang/zig/files/zig-0.4.0-r1-suppress-warnings.patch
new file mode 100644
index 000000000000..1dc92f88ecb2
--- /dev/null
+++ b/dev-lang/zig/files/zig-0.4.0-r1-suppress-warnings.patch
@@ -0,0 +1,31 @@
+Don't attempt to look for static libraries that we're not going to use.
+The warnings are only triggered when building with portage.
+
+--- a/cmake/Findllvm.cmake
++++ b/cmake/Findllvm.cmake
+@@ -50,25 +50,6 @@
+ endif()
+ endfunction(NEED_TARGET)
+
+-if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug") OR ZIG_STATIC)
+- execute_process(
+- COMMAND ${LLVM_CONFIG_EXE} --libfiles --link-static
+- OUTPUT_VARIABLE LLVM_LIBRARIES_SPACES
+- OUTPUT_STRIP_TRAILING_WHITESPACE)
+- string(REPLACE " " ";" LLVM_LIBRARIES "${LLVM_LIBRARIES_SPACES}")
+-
+- execute_process(
+- COMMAND ${LLVM_CONFIG_EXE} --system-libs --link-static
+- OUTPUT_VARIABLE LLVM_SYSTEM_LIBS_SPACES
+- OUTPUT_STRIP_TRAILING_WHITESPACE)
+- string(REPLACE " " ";" LLVM_SYSTEM_LIBS "${LLVM_SYSTEM_LIBS_SPACES}")
+-
+- execute_process(
+- COMMAND ${LLVM_CONFIG_EXE} --libdir --link-static
+- OUTPUT_VARIABLE LLVM_LIBDIRS_SPACES
+- OUTPUT_STRIP_TRAILING_WHITESPACE)
+- string(REPLACE " " ";" LLVM_LIBDIRS "${LLVM_LIBDIRS_SPACES}")
+-endif()
+ if(NOT LLVM_LIBRARIES)
+ execute_process(
+ COMMAND ${LLVM_CONFIG_EXE} --libs
diff --git a/dev-lang/zig/zig-0.4.0.ebuild b/dev-lang/zig/zig-0.4.0-r1.ebuild
similarity index 70%
rename from dev-lang/zig/zig-0.4.0.ebuild
rename to dev-lang/zig/zig-0.4.0-r1.ebuild
index 606e696a4c59..bedd9d7ba9b7 100644
--- a/dev-lang/zig/zig-0.4.0.ebuild
+++ b/dev-lang/zig/zig-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=6
-inherit cmake-utils
+inherit cmake-utils llvm
DESCRIPTION="A robust, optimal, and maintainable programming language"
HOMEPAGE="https://ziglang.org/"
@@ -33,24 +33,17 @@ RDEPEND="
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}/zig-0.4.0-r1-build-artifacts.patch"
+ "${FILESDIR}/zig-0.4.0-r1-suppress-warnings.patch"
+)
+
+LLVM_MAX_SLOT=8
+
src_prepare() {
if use experimental; then
sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake"
fi
- sed -i '/^install(TARGETS zig_cpp/d' CMakeLists.txt || die "unable to modify CMakeLists.txt"
- sed -i '/install(TARGETS embedded/d' CMakeLists.txt || die "unable to modify CMakeLists.txt"
-
- # Suppress error messages
- sed -i '/if(NOT(CMAKE_BUILD_TYPE/,/endif()/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake"
-
cmake-utils_src_prepare
}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=OFF
- )
-
- cmake-utils_src_configure
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 770e8d7061e2..b74746a939d4 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/appstream/appstream-0.12.7.ebuild b/dev-libs/appstream/appstream-0.12.7.ebuild
index c8b8c7de8ce2..1cacb6a7e53f 100644
--- a/dev-libs/appstream/appstream-0.12.7.ebuild
+++ b/dev-libs/appstream/appstream-0.12.7.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
else
MY_PN="AppStream"
SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
- KEYWORDS="~amd64 ~arm arm64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
fi
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index b3c1145f24f0..ac5102e4f7e5 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,5 +1,3 @@
-DIST ell-0.18.tar.xz 439368 BLAKE2B 9e65ed73119f322fea7177771d21e46ce9ad7d4060e50d8850451939a66bc82dcc1731ddff56458f4cd60c1b6b82b5023bb96adaf3992d3ec982ed845283c8dd SHA512 cc62d01ffaa11a491d1a3ab2898da001f0a418b968350c2bdba2f381df931e53c4281cc4287937264eee72da263844886816af9baea96d7f65309b3e47e42d31
-DIST ell-0.19.tar.xz 439472 BLAKE2B 9d29f49ce401c686b2e2262310bb00552d703455dbe9190acbb479e8fa2be7a03e732250ed63c9721f6079a46841a7bbb954fd0943edf520893eccb1a4fb9b6f SHA512 f7a22d0c385d45661b7c630d39f31b67321d20635c938ef5ad3ddce7194501652381a6bfc39a1b9a404a59108977216e24e2c32f6f30fc00972a0ebca909fcab
DIST ell-0.20.tar.xz 443196 BLAKE2B 35daff12e43a27b44b60ff0fd0f10c8d6b8ba122a5825ff705394b2bfb401a90174133f63e6673690461ce2d56595186593fc65783dff2f795b83a461c3aa4b5 SHA512 91200ac000dc44ae593618c21012174af2614be0e7b33bd979aefb248e42d7bb0282f0a7ba256514dfb7657231b5fec29969c874417923f413d34c38500d4d97
DIST ell-0.21.tar.xz 448612 BLAKE2B a20e177bb2ef7620c79cecdb84e47db662d97904189c885c90232a21ca40125bee14218fe2f1f06df74b424ccdc88dcd89da12bc9bf3e86c453b9903ae93013d SHA512 7bb96194e03d0067b22745899eec3f7166dce69aeed2ece1cd362178c1b7f94d464a894417d8329554f5b707133280e6cadfbd4e3ee34a5652f396d719e6fd17
DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
diff --git a/dev-libs/ell/ell-0.18.ebuild b/dev-libs/ell/ell-0.18.ebuild
deleted file mode 100644
index cafd42ed2ce6..000000000000
--- a/dev-libs/ell/ell-0.18.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
- SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="glib pie"
-
-RDEPEND="
- glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
- [[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
- append-cflags "-fsigned-char" #662694
- local myeconfargs=(
- $(use_enable glib)
- $(use_enable pie)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- local DOCS=( ChangeLog README )
- einstalldocs
-
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.19.ebuild b/dev-libs/ell/ell-0.19.ebuild
deleted file mode 100644
index fd8d023bed3e..000000000000
--- a/dev-libs/ell/ell-0.19.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
- SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="glib pie"
-
-RDEPEND="
- glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
- [[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
- append-cflags "-fsigned-char" #662694
- local myeconfargs=(
- $(use_enable glib)
- $(use_enable pie)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- local DOCS=( ChangeLog README )
- einstalldocs
-
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-9999.ebuild b/dev-libs/ell/ell-9999.ebuild
index e067c9ec27f8..cafd42ed2ce6 100644
--- a/dev-libs/ell/ell-9999.ebuild
+++ b/dev-libs/ell/ell-9999.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
fi
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index ff71053391be..1aaaa3165040 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -4,3 +4,4 @@ DIST jemalloc-4.5.0.tar.bz2 449992 BLAKE2B 6141c71f7f5f9cee91a59eeed9c69b0a69b3c
DIST jemalloc-5.0.1.tar.bz2 499300 BLAKE2B 551933fcd93315968cbf89bfadc40313717ff216141af8a131f2333d10090438ddf36fbfdc0ee831cbec6f930ae15aa9cfaafae72ed4f38dd97b00712ca918e8 SHA512 8cb5957a5724eb2bbad120cf0028ea8b2b14b4a416c1751b7c967351a7fd51135058ea0d3c4dc1d127c86f3aa7e9fd5ef101857110aabfdb7789427791c432c3
DIST jemalloc-5.1.0.tar.bz2 515622 BLAKE2B 3c8b35d30fca0018e3e32452e6fa41c7ac59f9f2f7d4bc243237fde95025ab5a7562fb86b5afe2ca9b7bb072f7baf6ac7589a4862d9ebaafddae187d93e20da0 SHA512 d9abebe54d303ca931b8c31c1033f23ff5fb060f2377ec8386f4d79c352e65c78ed34f680c352dac14f7d7115d10245782d553d988bc13df2eb34a2f0942ef6f
DIST jemalloc-5.2.0.tar.bz2 543892 BLAKE2B 042dd32452713d0524ae8aedbd3aa96a420037ae3ff0345bbf56a7839ae6ba9e0c700034fab9d5c7b6f4cbb43e2d8199b412901afce16c2785a816d439166e6d SHA512 e3be4d534770126caf10f2684aed9fe4ba1422dd47625fe50343cfb750f26eff869fcc7d1e30a96dd6c73f6614c4bbcd560fd24fc26b55ac731c43e60fd05234
+DIST jemalloc-5.2.1.tar.bz2 554279 BLAKE2B 52cb8cd5e5807a750a7e5e9ee005afd61144d821d7f7029a5eca998fd61787a7271338dee3de586ddf93f5fdbddc2c2ca03ba64375a70096f273a6aa173da431 SHA512 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02
diff --git a/dev-libs/jemalloc/jemalloc-5.0.1.ebuild b/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
index f5ad09f06a68..ddad51b8e619 100644
--- a/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
LICENSE="BSD"
SLOT="0/2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug hardened +hugepages lazy-lock static-libs stats xmalloc"
+IUSE="debug hardened +hugepages lazy-lock prof static-libs stats xmalloc"
HTML_DOCS=( doc/jemalloc.html )
PATCHES=( "${FILESDIR}/${PN}-5.0.1-strip-optimization.patch"
"${FILESDIR}/${PN}-4.5.0-fix_html_install.patch"
@@ -40,6 +40,7 @@ multilib_src_configure() {
$(use_enable debug) \
$(use_enable lazy-lock) \
$(use_enable hugepages thp) \
+ $(use_enable prof) \
$(use_enable stats) \
$(use_enable xmalloc) \
"${myconf[@]}"
diff --git a/dev-libs/jemalloc/jemalloc-5.1.0.ebuild b/dev-libs/jemalloc/jemalloc-5.1.0.ebuild
index 7eda36ea909c..3a7b8d7c3def 100644
--- a/dev-libs/jemalloc/jemalloc-5.1.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
LICENSE="BSD"
SLOT="0/2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug hardened lazy-lock static-libs stats xmalloc"
+IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
HTML_DOCS=( doc/jemalloc.html )
PATCHES=( "${FILESDIR}/${PN}-5.0.1-strip-optimization.patch"
"${FILESDIR}/${PN}-4.5.0-fix_html_install.patch"
@@ -39,6 +39,7 @@ multilib_src_configure() {
econf \
$(use_enable debug) \
$(use_enable lazy-lock) \
+ $(use_enable prof) \
$(use_enable stats) \
$(use_enable xmalloc) \
"${myconf[@]}"
diff --git a/dev-libs/jemalloc/jemalloc-5.2.0.ebuild b/dev-libs/jemalloc/jemalloc-5.2.0.ebuild
index 16ced36e7579..3e82a451db07 100644
--- a/dev-libs/jemalloc/jemalloc-5.2.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
LICENSE="BSD"
SLOT="0/2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug hardened lazy-lock static-libs stats xmalloc"
+IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
HTML_DOCS=( doc/jemalloc.html )
PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
@@ -38,6 +38,7 @@ multilib_src_configure() {
econf \
$(use_enable debug) \
$(use_enable lazy-lock) \
+ $(use_enable prof) \
$(use_enable stats) \
$(use_enable xmalloc) \
"${myconf[@]}"
diff --git a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
new file mode 100644
index 000000000000..3e82a451db07
--- /dev/null
+++ b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools toolchain-funcs multilib-minimal
+
+DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
+HOMEPAGE="http://jemalloc.net/ https://github.com/jemalloc/jemalloc"
+SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
+HTML_DOCS=( doc/jemalloc.html )
+PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
+# autotools-utils.eclass auto-adds configure options when static-libs is in IUSE
+# but jemalloc doesn't implement them in its configure; need this here to
+# supress the warnings until automagic is removed from the eclass
+QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf=()
+
+ if use hardened ; then
+ myconf+=( --disable-syscall )
+ fi
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ $(use_enable debug) \
+ $(use_enable lazy-lock) \
+ $(use_enable prof) \
+ $(use_enable stats) \
+ $(use_enable xmalloc) \
+ "${myconf[@]}"
+}
+
+multilib_src_install() {
+ # Copy man file which the Makefile looks for
+ cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die
+ emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # fixup install_name, #437362
+ install_name_tool \
+ -id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.2.dylib \
+ "${ED}"/usr/$(get_libdir)/libjemalloc.2.dylib || die
+ fi
+ use static-libs || find "${ED}" -name '*.a' -delete
+}
diff --git a/dev-libs/jemalloc/metadata.xml b/dev-libs/jemalloc/metadata.xml
index 848a0a7987dd..14624ae1ff1b 100644
--- a/dev-libs/jemalloc/metadata.xml
+++ b/dev-libs/jemalloc/metadata.xml
@@ -11,6 +11,7 @@
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
new file mode 100644
index 000000000000..8e7150e7fd21
--- /dev/null
+++ b/dev-libs/rocm-comgr/Manifest
@@ -0,0 +1 @@
+DIST rocm-comgr-2.6.0.tar.gz 1484343 BLAKE2B fcb496b4997d672640e3f75622e74085eeb9dfe83c88ae025530389d3cdca7628155168060e71f7a3ff915e933ffe70c7026720dc124d128d16ef4df397525e7 SHA512 b14e90603d2b6e17f6b0335ea35da2e5d7e31710f301d7a7f7751a45d996e3dbbfbf84a03e2e911e8798e72e77b87b5cd88317e897cb4de3ee5cf0e7c3222d68
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch
new file mode 100644
index 000000000000..74206760f39a
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch
@@ -0,0 +1,44 @@
+From 98f589636729b1e25625db6880fbd7820dcf9e40 Mon Sep 17 00:00:00 2001
+From: Craig Andrews
+Date: Wed, 31 Jul 2019 10:04:11 -0400
+Subject: [PATCH] Install to standard locations using GNUInstallDirs
+
+Some distributions require 64 bit libraries to be installed to lib64, for example.
+Using GNUInstallDirs ensures that files are installed to the expected locations.
+---
+ CMakeLists.txt | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 454b830..a89af16 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ cmake_minimum_required(VERSION 3.2.0)
+
++include (GNUInstallDirs)
++
+ # Build ROCM-Compiler-Support with ccache if the package is present.
+ set(ROCM_COMPILER_SUPPORT_CCACHE_BUILD OFF CACHE BOOL "Set to ON for a ccache enabled build")
+ if(ROCM_COMPILER_SUPPORT_CCACHE_BUILD)
+@@ -146,17 +148,17 @@ configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in"
+
+ install(TARGETS amd_comgr
+ EXPORT amd_comgr_export
+- DESTINATION lib)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ install(FILES
+ "include/amd_comgr.h"
+- DESTINATION include)
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+ install(FILES
+ "README.md"
+ "LICENSE.txt"
+ "NOTICES.txt"
+- DESTINATION share/amd_comgr)
++ DESTINATION ${CMAKE_INSTALL_DATADIR}/amd_comgr)
+
+ # Generate the install-tree package.
+ set(AMD_COMGR_PREFIX_CODE "
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
new file mode 100644
index 000000000000..bce19d168b0a
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
@@ -0,0 +1,38 @@
+https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/19
+
+--- comgr/CMakeLists.old 2019-07-19 17:19:26.080276421 +0200
++++ comgr/CMakeLists.txt 2019-07-19 18:17:25.780163592 +0200
+@@ -185,7 +185,11 @@
+ include_directories(./yaml-cpp/include)
+
+ set(CLANG_LIBS
+- clangFrontendTool)
++ clangFrontendTool
++ clangFrontend
++ clangBasic
++ clangDriver
++ clangSerialization)
+
+ set(LLD_LIBS
+ lldELF
+@@ -193,8 +197,19 @@
+
+ llvm_map_components_to_libnames(LLVM_LIBS
+ ${LLVM_TARGETS_TO_BUILD}
++ Option
+ DebugInfoDWARF
+- Symbolize)
++ Symbolize
++ Support
++ Object
++ BitWriter
++ MC
++ MCParser
++ MCDisassembler
++ Core
++ IRReader
++ CodeGen
++ Linker)
+
+ target_link_libraries(amd_comgr
+ PUBLIC
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-clang.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-clang.patch
new file mode 100644
index 000000000000..dda005ab7a21
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-clang.patch
@@ -0,0 +1,26 @@
+https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/16
+
+From 09eb70afa22e2d6066a5f29888158c6005170ca6 Mon Sep 17 00:00:00 2001
+From: Craig Andrews
+Date: Wed, 31 Jul 2019 10:13:30 -0400
+Subject: [PATCH] Find Clang avoiding the system (non-ROC) LLVM
+
+Use NO_DEFAULT_PATH to avoid finding the system (non-ROC) LLVM.
+Use /opt/rocm/llvm as an additional hint to be consistent with the build systems of other ROC projects (such as ROCm-OpenCL-Driver)
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 454b830..8642c98 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,7 +13,7 @@ endif()
+
+ project(code_object_manager)
+
+-find_package(Clang REQUIRED CONFIG)
++find_package(Clang REQUIRED CONFIG PATHS ${LLVM_DIR} "/opt/rocm/llvm" NO_DEFAULT_PATH)
+ add_definitions(${LLVM_DEFINITIONS})
+ include_directories(${LLVM_INCLUDE_DIRS})
+ link_directories(${LLVM_LIBRARY_DIRS})
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-lld-includes.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-lld-includes.patch
new file mode 100644
index 000000000000..5b44feaf1b3d
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-lld-includes.patch
@@ -0,0 +1,43 @@
+https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/17
+
+From 4588c1a5aad3edae9d3e121685d8d1f5fddd54ba Mon Sep 17 00:00:00 2001
+From: Craig Andrews
+Date: Wed, 31 Jul 2019 10:45:01 -0400
+Subject: [PATCH] Find lld includes in LLVM_INCLUDE_DIRS
+
+Allows building against an LLVM build tree
+---
+ CMakeLists.txt | 20 ++------------------
+ 1 file changed, 2 insertions(+), 18 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 454b830..db28533 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,24 +19,8 @@ include_directories(${LLVM_INCLUDE_DIRS})
+ link_directories(${LLVM_LIBRARY_DIRS})
+ include_directories(${CLANG_INCLUDE_DIRS})
+
+-# FIXME: There is no way to directly determine the include paths for LLD when
+-# working with an LLVM build tree, but we want to avoid having to install LLVM
+-# to build Comgr. This should eventually be fixed in usptream LLD so this can
+-# be removed.
+-if(DEFINED LLVM_BUILD_MAIN_SRC_DIR)
+- set(INTERNAL_LLD_INCLUDE_DIRS "${LLVM_BUILD_MAIN_SRC_DIR}/tools/lld/include")
+- set(EXTERNAL_LLD_INCLUDE_DIRS "${LLVM_BUILD_MAIN_SRC_DIR}/../lld/include")
+- if (EXISTS "${INTERNAL_LLD_INCLUDE_DIRS}"
+- AND IS_DIRECTORY "${INTERNAL_LLD_INCLUDE_DIRS}")
+- set(LLD_INCLUDE_DIRS "${INTERNAL_LLD_INCLUDE_DIRS}")
+- elseif (EXISTS "${EXTERNAL_LLD_INCLUDE_DIRS}"
+- AND IS_DIRECTORY "${EXTERNAL_LLD_INCLUDE_DIRS}")
+- set(LLD_INCLUDE_DIRS "${EXTERNAL_LLD_INCLUDE_DIRS}")
+- else()
+- message(FATAL_ERROR "You are attempting to compile using an LLVM build tree, but the LLD include directory could not be located. The paths '${INTERNAL_LLD_INCLUDE_DIRS}' and '${EXTERNAL_LLD_INCLUDE_DIRS}' were tried.")
+- endif()
+- include_directories(${LLD_INCLUDE_DIRS})
+-endif()
++set(LLD_INCLUDE_DIRS "${LLVM_INCLUDE_DIRS}/lld")
++include_directories(${LLD_INCLUDE_DIRS})
+
+ find_package(AMDDeviceLibs CONFIG)
+
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch
new file mode 100644
index 000000000000..d61f4c2a2003
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch
@@ -0,0 +1,30 @@
+diff --git a/lib/comgr/CMakeLists.txt b/lib/comgr/CMakeLists.txt
+index 454b830..70e2526 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -90,12 +90,8 @@ if (UNIX)
+ -Wl,--no-undefined)
+ endif()
+ endif()
+- # FIXME: Remove when yaml-cpp is removed from the build.
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ else()
+ list(APPEND AMD_COMGR_PRIVATE_COMPILE_OPTIONS "/W0" "/wd4244")
+- # FIXME: Make this private once yaml-cpp is removed from the build.
+- add_definitions(-D_HAS_EXCEPTIONS=0)
+ endif()
+
+ # Windows is strict about visibility of exports in shared libraries, so we ask
+@@ -179,10 +175,8 @@ install(EXPORT amd_comgr_export
+ DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}"
+ FILE "${AMD_COMGR_TARGETS_NAME}")
+
+-set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Enable testing" FORCE)
+-set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "Enable parse tools" FORCE)
+-add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
+-include_directories(./yaml-cpp/include)
++find_package(yaml-cpp REQUIRED)
++include_directories(${YAML_CPP_INCLUDE_DIR})
+
+ set(CLANG_LIBS
+ clangFrontendTool)
diff --git a/dev-libs/rocm-comgr/metadata.xml b/dev-libs/rocm-comgr/metadata.xml
new file mode 100644
index 000000000000..20237687f91a
--- /dev/null
+++ b/dev-libs/rocm-comgr/metadata.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ candrews@gentoo.org
+ Craig Andrews
+
+
+ RadeonOpenCompute/ROCm-CompilerSupport
+
+
+ Radeon Open Compute Code Object Manager
+
+
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild
new file mode 100644
index 000000000000..c000ce55ab71
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
+ inherit git-r3
+ S="${WORKDIR}/${P}/lib/comgr"
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
+ KEYWORDS="~amd64"
+fi
+PATCHES=(
+ "${FILESDIR}/${P}-correctly-install.patch"
+ "${FILESDIR}/${P}-find-clang.patch"
+ "${FILESDIR}/${P}-find-lld-includes.patch"
+ "${FILESDIR}/${P}-dependencies.patch"
+ "${FILESDIR}/${P}-unbundle-yaml-cpp.patch"
+)
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocm-device-libs
+ dev-cpp/yaml-cpp:=
+ sys-devel/llvm-roc:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ rm -rf yaml-cpp || die
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+ )
+ cmake-utils_src_configure
+}
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
new file mode 100644
index 000000000000..cc781e9e0e8d
--- /dev/null
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -0,0 +1 @@
+DIST rocm-device-libs-2.6.0.tar.gz 221981 BLAKE2B 6350fafb31453daf015886bc2d3d2ba59b805fafdf12372fcad8f328c9e7c74d4e54093817b07961d7be77b990780038f7a7b91d5ab63650a92bf107e0be4a40 SHA512 4262c956ea8c212c2707acf74ee27f609a6faee1bee7c3fd436b2a4adbedf1b072b611e6143cc315bd4e9d1e306d874aa0f4629cff9301bd28be65fd16867180
diff --git a/dev-libs/rocm-device-libs/metadata.xml b/dev-libs/rocm-device-libs/metadata.xml
new file mode 100644
index 000000000000..e7986fbb2ae9
--- /dev/null
+++ b/dev-libs/rocm-device-libs/metadata.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ candrews@gentoo.org
+ Craig Andrews
+
+
+ RadeonOpenCompute/ROCm-Device-Libs
+
+
+ Radeon Open Compute Device Libraries
+
+
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-2.6.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-2.6.0.ebuild
new file mode 100644
index 000000000000..91d53a41976d
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-2.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+ inherit git-r3
+ S="${WORKDIR}/${P}/src"
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime
+ sys-devel/llvm-roc:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+ )
+ cmake-utils_src_configure
+}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
new file mode 100644
index 000000000000..91d53a41976d
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+ inherit git-r3
+ S="${WORKDIR}/${P}/src"
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime
+ sys-devel/llvm-roc:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+ )
+ cmake-utils_src_configure
+}
diff --git a/dev-libs/rocm-hostcall/Manifest b/dev-libs/rocm-hostcall/Manifest
new file mode 100644
index 000000000000..ca774830c73a
--- /dev/null
+++ b/dev-libs/rocm-hostcall/Manifest
@@ -0,0 +1 @@
+DIST rocm-hostcall-2.7.0.tar.gz 1500771 BLAKE2B 275ad4cab34d554f8a131101eda474926f7270a44a0af9941d8f1233c29b44b3efb3ba83c6b541d501a3e2fc751c591c0f6a993563bbacf539b5bcd04b23963b SHA512 afb4a7318c2e137db6ac0502041ed53e63783ec1ab458962b1b16f0f2f28e09ce2ae70d048b858740eca8bf06328858400a68bed4e91d7cfc4b7714a66d85bc9
diff --git a/dev-libs/rocm-hostcall/files/rocm-hostcall-2.7.0-install-correctly.patch b/dev-libs/rocm-hostcall/files/rocm-hostcall-2.7.0-install-correctly.patch
new file mode 100644
index 000000000000..f419674886a7
--- /dev/null
+++ b/dev-libs/rocm-hostcall/files/rocm-hostcall-2.7.0-install-correctly.patch
@@ -0,0 +1,39 @@
+https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/18
+
+From 345025de5c6c470e36505ff70978b168c05a1a71 Mon Sep 17 00:00:00 2001
+From: Craig Andrews
+Date: Wed, 31 Jul 2019 11:18:56 -0400
+Subject: [PATCH] Install to standard locations using GNUInstallDirs
+
+Some distributions require 64 bit libraries to be installed to lib64, for example.
+Using GNUInstallDirs ensures that files are installed to the expected locations.
+---
+ CMakeLists.txt | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0f524e6..009bab7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,6 +5,8 @@ if (NOT UNIX)
+ message(FATAL_ERROR "No Windows support due to lack of signals")
+ endif()
+
++include(GNUInstallDirs)
++
+ find_path(HSA_HEADER hsa/hsa.h PATHS /opt/rocm/include)
+ if (NOT EXISTS ${HSA_HEADER})
+ message(FATAL_ERROR "Cannot find HSA headers. Please check the CMAKE_PREFIX_PATH")
+@@ -34,9 +36,9 @@ target_compile_options(amd_hostcall
+ target_compile_definitions(amd_hostcall
+ PRIVATE "${AMD_HOSTCALL_PRIVATE_COMPILE_DEFINITIONS}")
+
+-set(INCLUDE_INSTALL_DIR include)
+-set(LIB_INSTALL_DIR lib)
+-set(SHARE_INSTALL_DIR share)
++set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
++set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
++set(SHARE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR})
+ set(CONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/amd_hostcall)
+
+ install(TARGETS amd_hostcall
diff --git a/dev-libs/rocm-hostcall/metadata.xml b/dev-libs/rocm-hostcall/metadata.xml
new file mode 100644
index 000000000000..6b2718fcba0e
--- /dev/null
+++ b/dev-libs/rocm-hostcall/metadata.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ candrews@gentoo.org
+ Craig Andrews
+
+
+ RadeonOpenCompute/ROCm-CompilerSupport
+
+
+ Radeon Open Compute hostcall API
+
+
diff --git a/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild b/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild
new file mode 100644
index 000000000000..848a8f3a5408
--- /dev/null
+++ b/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
+ inherit git-r3
+ S="${WORKDIR}/${P}/lib/hostcall"
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/hostcall"
+ KEYWORDS="~amd64"
+fi
+PATCHES=(
+ "${FILESDIR}/${P}-install-correctly.patch"
+)
+
+DESCRIPTION="Radeon Open Compute hostcall API"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+ )
+ cmake-utils_src_configure
+}
diff --git a/dev-libs/rocm-opencl-driver/Manifest b/dev-libs/rocm-opencl-driver/Manifest
new file mode 100644
index 000000000000..825e4bf6fabf
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/Manifest
@@ -0,0 +1 @@
+DIST rocm-opencl-driver-2.6.0.tar.gz 21311 BLAKE2B f17219b577ccd58de052d5936953fd78588a0b042ce002853b10c05e6f6d433edcd90045c15dcd2f2c31ccef89f8b420ef756a1dd1613702efcc8868163878d1 SHA512 7b8bf646d9a36b09d75a0408301c2f1771daad95b8075b1671ca0c8b1f5826e8cd9de8935946858268dc89863a0ee054b4dde3040c84dd37e90f28c7ffa6e097
diff --git a/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-correctly.patch b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-correctly.patch
new file mode 100644
index 000000000000..d70f0977ec8f
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-correctly.patch
@@ -0,0 +1,49 @@
+https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/pull/85
+
+From 8819a684c9b6e154abedc041b3da545aab353d67 Mon Sep 17 00:00:00 2001
+From: Craig Andrews
+Date: Fri, 26 Jul 2019 15:54:59 -0400
+Subject: [PATCH] Use GNUInstallDirs to install to standard locations
+
+Some distributions require 64 bit libraries to be installed to lib64, for example.
+Using GNUInstallDirs ensures that files are installed to the expected locations.
+---
+ CMakeLists.txt | 3 +++
+ src/driver/CMakeLists.txt | 2 +-
+ src/roc-cl/CMakeLists.txt | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d1759b7..d21e9da 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,6 +42,9 @@
+
+ cmake_minimum_required(VERSION 2.8)
+
++## Include common cmake modules
++include ( GNUInstallDirs )
++
+ # Build ROCm-OpenCL-Driver with ccache if the package is present.
+ set(ROCM_OPENCL_DRIVER_CCACHE_BUILD OFF CACHE BOOL "Set to ON for a ccache enabled build")
+ if(ROCM_OPENCL_DRIVER_CCACHE_BUILD)
+diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt
+index 7046e34..55ed13f 100644
+--- a/src/driver/CMakeLists.txt
++++ b/src/driver/CMakeLists.txt
+@@ -90,4 +90,4 @@ target_link_libraries(opencl_driver
+ target_link_libraries(opencl_driver ${llvm_libs})
+ target_include_directories(opencl_driver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+-install(TARGETS opencl_driver DESTINATION lib)
++install(TARGETS opencl_driver DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+diff --git a/src/roc-cl/CMakeLists.txt b/src/roc-cl/CMakeLists.txt
+index 5037453..a8e2801 100644
+--- a/src/roc-cl/CMakeLists.txt
++++ b/src/roc-cl/CMakeLists.txt
+@@ -54,4 +54,4 @@ link_directories(${LLVM_LIBRARY_DIRS})
+ add_executable(roc-cl ${sources})
+ target_link_libraries(roc-cl opencl_driver)
+
+-install(TARGETS roc-cl RUNTIME DESTINATION bin)
++install(TARGETS roc-cl RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
diff --git a/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-header.patch b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-header.patch
new file mode 100644
index 000000000000..b37100994e04
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-header.patch
@@ -0,0 +1,19 @@
+From 1258a99decf96092de8ea512150209e14152ed9c Mon Sep 17 00:00:00 2001
+From: Craig Andrews
+Date: Tue, 30 Jul 2019 16:46:20 -0400
+Subject: [PATCH] Install AmdCompiler.h header
+
+ROCm-OpenCL-Runtime uses AmdCompiler.h so it should be installed to the system and made available for use
+---
+ src/driver/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt
+index 55ed13f..8f68fb7 100644
+--- a/src/driver/CMakeLists.txt
++++ b/src/driver/CMakeLists.txt
+@@ -91,3 +91,4 @@ target_link_libraries(opencl_driver ${llvm_libs})
+ target_include_directories(opencl_driver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+ install(TARGETS opencl_driver DESTINATION ${CMAKE_INSTALL_LIBDIR} )
++install(FILES AmdCompiler.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/dev-libs/rocm-opencl-driver/metadata.xml b/dev-libs/rocm-opencl-driver/metadata.xml
new file mode 100644
index 000000000000..359755b2e5a5
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/metadata.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ candrews@gentoo.org
+ Craig Andrews
+
+
+ RadeonOpenCompute/ROCm-OpenCL-Runtime
+
+
+ Radeon Open Compute OpenCL Compatible Runtime
+
+
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild
new file mode 100644
index 000000000000..6ab3d1073d10
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/ROCm-OpenCL-Driver-roc-${PV}"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute OpenCL Compiler Tool Driver"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="test"
+
+RDEPEND="sys-devel/llvm-roc:=
+ dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-install-correctly.patch"
+ "${FILESDIR}/${P}-install-header.patch"
+)
+
+src_prepare() {
+ # remove unittest, because it downloads additional file from github.com
+ sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+ )
+ cmake-utils_src_configure
+}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 1049c994c5b7..6c90d6896c47 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1 +1,2 @@
DIST rocr-runtime-2.0.0.tar.gz 313087 BLAKE2B 5fe5ea99728f7d7337c9e8a174a31d4ca8bdd559fad3400955ba6d86947d5bf9004094d78548cab2cb2089bfd028d0e4dfdd4d5fd7b41bed73feeebf2f33b705 SHA512 662d3d8fff8aeb17557df67207d885edc1266bb9800ec46ecab28bbd6ace7fbffb9e4092d74beb0366cacfe8873b1b257bcf2f8345d81a9b6657a7adcfc53c0c
+DIST rocr-runtime-2.6.0.tar.gz 318296 BLAKE2B c04e04db32f650def8a7973fa73f0c0e9b99412b13676a05e9c4283ea07958ffe14f7c54002db469ddfd506f349087bd66fff138b7e7b19c41f4ca8789a7c384 SHA512 3b88cf4e1cb6fca6b4361a612abc2c02466d4f716838665d02f16b6fa975b5f69795622d6b96a01b796165980d2888be7eedd77957a7fd44fac19a0ea581f6b8
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.6.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.6.0.ebuild
new file mode 100644
index 000000000000..dc4aad01c299
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-2.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
+ inherit git-r3
+ S="${WORKDIR}/${P}/src"
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+PATCHES=(
+ "${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
+)
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl"
+DEPEND="${RDEPEND}
+ dev-libs/roct-thunk-interface"
+
+src_prepare() {
+ sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+ cmake-utils_src_prepare
+}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
new file mode 100644
index 000000000000..a31193337a6d
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
+ inherit git-r3
+ S="${WORKDIR}/${P}/src"
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl"
+DEPEND="${RDEPEND}
+ dev-libs/roct-thunk-interface"
+
+src_prepare() {
+ sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+ cmake-utils_src_prepare
+}
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index 5a78b9fd36af..8ba10b793412 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1 +1,2 @@
DIST roct-thunk-interface-2.0.0.tar.gz 1958218 BLAKE2B c1ba89cac9a18964e040e6b1e57a464216e7086c400e3360cfca6f376ac90b0b1afbb3a2a4d995581d1829ca57afe62bf6f2ac59cc103a48d384a8e52b1457d0 SHA512 7d2e35df2bec201bcc977328d7d36b921f76b57a0c54fc2332eb1faf3a722b6a3a1e3b1658e93b216ed68b965426c463a2dbf52a22af64ce1dcc9fad0f27ca9c
+DIST roct-thunk-interface-2.6.0.tar.gz 1957383 BLAKE2B 0335d4e219978d16bc8dbc77c6e1fb315f424ddf9225eb14968d4f8233348b358151f2baf279dc2a6e422da7839b704c847f1311b21d69e07738f3fca3235452 SHA512 e54f7cefa1854fb9967e373bd3ef5a0236987ebb26c21728ef5676e73cf63be6e9a49c1ce52d1156caa970473f214e02f25370e2cd7381c1f74a0b8cd5b2bc7f
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch
new file mode 100644
index 000000000000..4d0680415ce1
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch
@@ -0,0 +1,25 @@
+https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/39
+
+From 032a3e38c62b84ec56fad70d24cf82ee65d8c80b Mon Sep 17 00:00:00 2001
+From: Craig Andrews
+Date: Mon, 22 Jul 2019 17:06:16 -0400
+Subject: [PATCH] Install libhsakmt.pc to the standard location
+
+pkgconfig files should be installed to /usr/share/pkgconfig/, not /usr/libhsakmt/
+---
+ hsakmt-dev.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hsakmt-dev.txt b/hsakmt-dev.txt
+index eb0d3e2..195cc6c 100644
+--- a/hsakmt-dev.txt
++++ b/hsakmt-dev.txt
+@@ -43,7 +43,7 @@ set ( BUILD_VERSION_PATCH @BUILD_VERSION_PATCH@ )
+ set ( CMAKE_VERBOSE_MAKEFILE on )
+
+ ## Set the install targets
+-install ( FILES libhsakmt.pc DESTINATION libhsakmt )
++install ( FILES libhsakmt.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig )
+ install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} )
+
+
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch
new file mode 100644
index 000000000000..961d2978a2d1
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch
@@ -0,0 +1,25 @@
+https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/38
+
+From 1362864410579c35eb2ec428384ad883cb8b24b1 Mon Sep 17 00:00:00 2001
+From: Craig Andrews
+Date: Mon, 22 Jul 2019 16:18:08 -0400
+Subject: [PATCH] Install LICENSE.md to DOCDIR
+
+LICENSE.md should be installed to the DOCDIR, not /usr/libhsakmt
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e020132..398da3e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -145,7 +145,7 @@ add_custom_target ( package-dev DEPENDS build-dev
+
+ ## Add the install directives for the runtime library.
+ install ( TARGETS ${HSAKMT_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+-install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION libhsakmt )
++install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} )
+
+ ## Add the packaging directives for the runtime library.
+ set ( CPACK_PACKAGE_NAME ${HSAKMT_PACKAGE} )
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch
new file mode 100644
index 000000000000..0b4a716e6c9d
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch
@@ -0,0 +1,22 @@
+https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/40
+
+From fb42a02230ed5140b3ac3beadb38ca39eb9ea463 Mon Sep 17 00:00:00 2001
+From: Craig Andrews
+Date: Mon, 22 Jul 2019 17:17:09 -0400
+Subject: [PATCH] Use CMAKE_INSTALL_PREFIX in pkgconfig
+
+The location where files are installed is the value to use; the CPACK packaging directory isn't important as the pkgconfig file is used on the system after the package is installed.
+---
+ libhsakmt.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libhsakmt.pc.in b/libhsakmt.pc.in
+index 3093afc..1abb66d 100644
+--- a/libhsakmt.pc.in
++++ b/libhsakmt.pc.in
+@@ -1,4 +1,4 @@
+-prefix=@CPACK_PACKAGING_INSTALL_PREFIX@
++prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.6.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.6.0.ebuild
new file mode 100644
index 000000000000..8968eaaf9659
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.6.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
+ KEYWORDS="~amd64"
+fi
+PATCHES=(
+ "${FILESDIR}/${P}-correctly-install.patch"
+ "${FILESDIR}/${P}-correctly-install-pc.patch"
+ "${FILESDIR}/${P}-pc-prefix.patch"
+)
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
+CONFIG_CHECK="~HSA_AMD"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl
+ sys-apps/pciutils"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+ cmake-utils_src_prepare
+}
+src_compile() {
+ cmake-utils_src_compile build-dev
+}
+src_install() {
+ cmake-utils_src_install install-dev
+}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
new file mode 100644
index 000000000000..28db57d3c714
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
+CONFIG_CHECK="~HSA_AMD"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl
+ sys-apps/pciutils"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+ cmake-utils_src_prepare
+}
+src_configure() {
+ local mycmakeargs=(
+ -DCPACK_PACKAGING_INSTALL_PREFIX=/usr
+ )
+ cmake-utils_src_configure
+}
+src_compile() {
+ cmake-utils_src_compile build-dev
+}
+src_install() {
+ cmake-utils_src_install install-dev
+}
diff --git a/dev-libs/serdisplib/serdisplib-2.01.ebuild b/dev-libs/serdisplib/serdisplib-2.01.ebuild
index 85de825917ea..0a3e778a8d1b 100644
--- a/dev-libs/serdisplib/serdisplib-2.01.ebuild
+++ b/dev-libs/serdisplib/serdisplib-2.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="threads tools"
# Define the list of valid lcd devices.
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 20c41aa25264..8f9a73f94f5f 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index a25469b04ee5..ec432c4df5ba 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -3,3 +3,4 @@ DIST cmd2-0.7.9.tar.gz 71298 BLAKE2B d1623e2d6a7ac66058b5a43a9688ba850962fa7b565
DIST cmd2-0.8.9.tar.gz 112543 BLAKE2B b55edd450abcff863a34252b724919ace9f65b62b8175f28a1bb4fb64692a67723339a887dac45e87f37db71773689cfa213038740a4b3d165bf95f9cdad1d0e SHA512 80c80b67f8a1709156450fa476215a5466cca2853102f6012f1d83867a311d86a68d441dcea9895b62add731b3d00a7c3ecefde939b4f2ccd61d058ef9386a84
DIST cmd2-0.9.14.tar.gz 530199 BLAKE2B a503e71959927e01986028da423c11f971972df0826f95cb06ca0594d9b90c19a5502ec19d741ea7a30b0ab9fb6f9d33fb5c20fc37c01695039b69979b862410 SHA512 4a606fc821f32dccb53b0558645850b383f814ae79f65e491376638960c5951ddff3ff860190d6ffe37b9fd616f44659793c1b1389eb76fbb369726cc1108c77
DIST cmd2-0.9.15.tar.gz 550232 BLAKE2B b9e57ca150ee94cfc38bf394f9a3a8de06c4e63c8787944491fc5802781c3afc585d075b07b636c673dd20e50cd1222a7cd146a6284abc0f87873ccb915ec2a3 SHA512 6a2405e6b83200fb53cc251a4095fea6dfe0d7edd26875aee5121267d7615599aef4d84592be2b72b9cbd38e22e25f320d4c334b82e360140d517b65f2be25a8
+DIST cmd2-0.9.16.tar.gz 550919 BLAKE2B 0c8fa50bc1df503b17fc1c753ddac755968a0d4886921baf5f1113cbe7d8928b6ee0be49c93e697e00a1951deaee5c35403da74ad4d14fabf566dbe8abf27bfc SHA512 63b973e63fe48675a25c76b5c79d3838aad8fea62e50287cc72f2dc431e798535fc24caf589a2358012e6c8c601e8b46ac08b0da63ca64e46727890657d7ddfa
diff --git a/dev-python/cmd2/cmd2-0.9.16.ebuild b/dev-python/cmd2/cmd2-0.9.16.ebuild
new file mode 100644
index 000000000000..715f6032dc28
--- /dev/null
+++ b/dev-python/cmd2/cmd2-0.9.16.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-python/attrs[${PYTHON_USEDEP}]
+ >=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+ >=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python3_5)
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
+"
+
+python_test() {
+ # test rely on very specific text wrapping...
+ local -x COLUMNS=80
+ pytest -vv || die
+}
+
+src_test() {
+ virtx distutils-r1_src_test
+}
diff --git a/dev-python/cython/cython-0.29.13.ebuild b/dev-python/cython/cython-0.29.13.ebuild
index fde90453842e..5af794bfd500 100644
--- a/dev-python/cython/cython-0.29.13.ebuild
+++ b/dev-python/cython/cython-0.29.13.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1 toolchain-funcs elisp-common
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index a5f3f80baefc..2d5cc7cc0f3b 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,3 +1,4 @@
DIST lxml-4.2.5.tar.gz 4414081 BLAKE2B c1c75a0a0c33011e2becb729de2c15dd786dd12bddeba4f2f26032d0d17104f258b471f5f961cbf96340df66cbce3e874d7a16c59731af280a309132b669d1b9 SHA512 4cf336d3e1471e8a26492760a143881517d12eb1c2dad82f8786540471bfabd68f8c795d97b7362166418c2be3c7996816638fdbd5a594536b9981478b90fdfe
DIST lxml-4.3.3.tar.gz 4378439 BLAKE2B 30c2a29e58951164fbff1c9d23362d46987c86b671e0cfa6cf15cbbb3db23ead856786babe57ce553f7b8a66d8ac333410ea1bb3b8b521aac43a038b90daf488 SHA512 cbc1cd30bac4b9ac845d99949c8c231a7870398f942695df5a00586d70d0f6b6ebd457a1a9306806af7d0fd521a14c54d266902943263927a0d940abc3cdf5c0
DIST lxml-4.3.4.tar.gz 2488557 BLAKE2B 5059ea45d3d833955636216a7c096322496882de4592a0d19604885dca8dffbc763afb7dc804b7a34561d0c94dfa2130a61835d6c12b97dc83008e8fa33e098a SHA512 7349cb4805e538da5b11edcb79fcd09ddedf0d52e50273a4e587f209e6b147b50737c45dcfc8eb3ee8e7be8f99769046f704c5fc8c35cee74d5d22ef72d503ed
+DIST lxml-4.4.0.tar.gz 939001 BLAKE2B 9fc473729286e98cd73e4b39d7acf22ccb957dd4b366924dc171a6c89c2e435a3dae771342eb3b143451b0550960cb821430de3e8f6470dc87e3a85efc389314 SHA512 23e7b5157a6520f3e1dab76b023e828a5afe9d0103e2d3ff8fd1a8791000ed8f859e26fe9809676b89d4ef9fa4b27a6f1662a2b0f54e5ae04776643f5b06c0c3
diff --git a/dev-python/lxml/lxml-4.4.0.ebuild b/dev-python/lxml/lxml-4.4.0.ebuild
new file mode 100644
index 000000000000..e7c16048171c
--- /dev/null
+++ b/dev-python/lxml/lxml-4.4.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+
+inherit distutils-r1 eutils toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
+SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+ >=dev-libs/libxml2-2.9.5
+ >=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*')
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+ "
+
+DISTUTILS_IN_SOURCE_BUILD=1
+S=${WORKDIR}/lxml-${P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
+)
+
+python_prepare_all() {
+ # avoid replacing PYTHONPATH in tests.
+ sed -i -e '/sys\.path/d' test.py || die
+
+ # don't use some random SDK on Darwin
+ sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+ setupinfo.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ if ! python_is_python3; then
+ local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ fi
+ tc-export PKG_CONFIG
+ distutils-r1_python_compile
+}
+
+python_test() {
+ cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+ cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+ ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+ "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+ if use doc; then
+ local DOCS=( README.rst *.txt doc/*.txt )
+ local HTML_DOCS=( doc/html/. )
+ fi
+ if use examples; then
+ dodoc -r samples
+ fi
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
+ optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/numpy/numpy-1.16.1.ebuild b/dev-python/numpy/numpy-1.16.1.ebuild
index 1ec2abd0447f..89aa5f734305 100644
--- a/dev-python/numpy/numpy-1.16.1.ebuild
+++ b/dev-python/numpy/numpy-1.16.1.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
PYTHON_REQ_USE="threads(+)"
FORTRAN_NEEDED=lapack
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 829d1e182836..9d604313700f 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/pgf/Manifest b/dev-tex/pgf/Manifest
index 68313fe968cc..462b15f52c57 100644
--- a/dev-tex/pgf/Manifest
+++ b/dev-tex/pgf/Manifest
@@ -1,3 +1,4 @@
DIST pgf-3.1.4-pgfmanual.pdf 10376398 BLAKE2B 4e45a0d69000d1f89a995f3e5e9295b82a79af5cfd5863aba4f1fd9c3b40d05f2f07b6fc2b34a933136448728aea3dfacc4943fd013896cd4cfe52c9dc8aa3c3 SHA512 a2b934d6e9836fce0a731d238b713ebdc3764e8aa76ea4c7fd54c88f59f31fe17f8c306b6a381adc73becb410e0c6350427112e5d46ae762665fc73fcdca54a0
DIST pgf-3.1.4.tar.gz 2426346 BLAKE2B 44d1c709774586b4de81def3d4e7133d147e9e3c1b69078789c8f62378b97a6fc6cfbd580a5f1d292190282dbec5ca4f080d4567b2e1fa526909f08e07169547 SHA512 472ffca8f465bfb5f98cbe0880887afc5b9043bfc878aa8f64a79970502546cc3e0901010b8662aa582af9bc4a90b622ade828c075396542a1e2ee7af694181c
-DIST pgf_3.0.1.tds.zip 10423731 BLAKE2B ca1513213f47279f7cb67cd6459e01082c6693c0da97e873205f2ed5dad1d3e83ccd036d6b56c245d334a4c9eff44bb81cd673962def80f075b56e6b7e0b7477 SHA512 0899e0fbd6d196504c5d15176015557d38e027429a84de661a5627fa003bfeffdb3f013df23c298b32c3a5605388160f42621e92d626e3ce88561fe4b4b7bddf
+DIST pgf-3.1.4b-pgfmanual.pdf 10371181 BLAKE2B c619e56fd184fea8761175efed7130b37b10f719e04e87b40448a0a72641f2b7c6be0270ae0c2386d91caf06d9cd46f8eb3eb9293d8ff46d8f4a8400662cc1d8 SHA512 f18e836774b8ad8d7a2adb1c876e529240907b9a9c695ab6366d4bc321766106ced3085dc0d17394d6c19654a2232e10d782e93152c075f7915ffb2f0e09b680
+DIST pgf-3.1.4b.tar.gz 2426541 BLAKE2B 91f1b0ea1f2f3526da6a57cd2deec76b49b4204047b9dcdbeb064db48357055324ffe83bb5bd09dd8931a9c8e8768305a72b82ec77257e20badc543a5ca803b8 SHA512 4ba8d9c70d573ff69128d41b20525badf3a3bd0bbbf76ef3c2f2e54ccc05bc0bf1da1f20102df04f8188fe1733d469965228445e6c4af0611c2aa5737ed72180
diff --git a/dev-tex/pgf/pgf-3.0.1-r1.ebuild b/dev-tex/pgf/pgf-3.0.1-r1.ebuild
deleted file mode 100644
index 2749c270c6df..000000000000
--- a/dev-tex/pgf/pgf-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit latex-package
-
-DESCRIPTION="pgf -- The TeX Portable Graphic Format"
-HOMEPAGE="https://sourceforge.net/projects/pgf"
-SRC_URI="mirror://sourceforge/pgf/${PN}_${PV}.tds.zip"
-
-LICENSE="GPL-2 LPPL-1.3c FDL-1.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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-RDEPEND="dev-texlive/texlive-latexrecommended
- >=dev-tex/xcolor-2.11"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_install() {
- # Bug #607642
- cp "${FILESDIR}/pgfsys-luatex.def" "${WORKDIR}/tex/generic/pgf/systemlayer/" || die
-
- insinto ${TEXMF}
- doins -r tex || die
-
- if use source ; then
- doins -r source || die
- fi
-
- cd "${S}/doc/generic/pgf"
- dodoc AUTHORS ChangeLog README || die
- if use doc ; then
- insinto /usr/share/doc/${PF}/texdoc
- doins pgfmanual.pdf || die
- doins -r images macros text-en version-* || die
- dosym /usr/share/doc/${PF}/texdoc ${TEXMF}/doc/latex/${PN} || die
- docompress -x /usr/share/doc/${PF}/texdoc/
- fi
-}
diff --git a/dev-tex/pgf/pgf-3.1.4.ebuild b/dev-tex/pgf/pgf-3.1.4.ebuild
index b34e9dfc0947..a8ea44db8ec0 100644
--- a/dev-tex/pgf/pgf-3.1.4.ebuild
+++ b/dev-tex/pgf/pgf-3.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI=" https://github.com/pgf-tikz/pgf/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-2 LPPL-1.3c FDL-1.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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source"
RDEPEND="dev-texlive/texlive-latexrecommended
diff --git a/dev-tex/pgf/pgf-3.1.4b.ebuild b/dev-tex/pgf/pgf-3.1.4b.ebuild
new file mode 100644
index 000000000000..b34e9dfc0947
--- /dev/null
+++ b/dev-tex/pgf/pgf-3.1.4b.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package
+
+DESCRIPTION="The TeX Portable Graphic Format"
+HOMEPAGE="https://github.com/pgf-tikz/pgf"
+SRC_URI=" https://github.com/pgf-tikz/pgf/archive/${PV}.tar.gz -> ${P}.tar.gz
+ doc? ( https://github.com/pgf-tikz/pgf/releases/download/${PV}/pgfmanual.pdf -> ${P}-pgfmanual.pdf )"
+
+LICENSE="GPL-2 LPPL-1.3c FDL-1.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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc source"
+
+RDEPEND="dev-texlive/texlive-latexrecommended
+ dev-tex/xcolor"
+
+src_install() {
+ insinto "${TEXMF}"
+ doins -r tex
+
+ if use source ; then
+ doins -r source
+ fi
+
+ cd "${S}/doc/generic/pgf" || die
+ dodoc AUTHORS ChangeLog README
+ if use doc; then
+ insinto /usr/share/doc/${PF}/texdoc
+ # pgfmanual is now split from the main tar archive
+ newdoc "${DISTDIR}/${P}-pgfmanual.pdf" pgfmanual.pdf
+ doins -r images macros text-en version-*
+
+ dosym "/usr/share/doc/${PF}/texdoc" "${TEXMF}/doc/latex/${PN}"
+ docompress -x "/usr/share/doc/${PF}/texdoc/"
+ fi
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 290e36494362..3fd20e0d65ca 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index c3a90d5a2b6a..6498fdc5f9f2 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,4 +1,6 @@
DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
+DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560 SHA512 b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
+DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822 SHA512 a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.18.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.18.0.ebuild
new file mode 100644
index 000000000000..9c64bb0e597b
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.18.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
+KNOTS_PV="${PV}.knots20190502"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+ https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+ https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots libressl"
+
+DEPEND="
+ >=dev-libs/boost-1.52.0:=[threads(+)]
+ >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+ >=dev-libs/univalue-1.0.4:=
+ !libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+ if use knots; then
+ elog "You are building ${PN} from Bitcoin Knots."
+ elog "For more information, see:"
+ elog "https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+ else
+ elog "You are building ${PN} from Bitcoin Core."
+ elog "For more information, see:"
+ elog "https://bitcoincore.org/en/2019/05/02/release-${PV}/"
+ fi
+}
+
+src_prepare() {
+ local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+ eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+ if use knots; then
+ eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+ fi
+
+ eapply_user
+
+ echo '#!/bin/true' >share/genbuild.sh || die
+ mkdir -p src/obj || die
+ echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+ eautoreconf
+ rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+ local my_econf=(
+ --disable-asm
+ --without-qtdbus
+ --without-qrencode
+ --without-miniupnpc
+ --disable-tests
+ --disable-wallet
+ --disable-zmq
+ --enable-util-tx
+ --disable-util-cli
+ --disable-util-wallet
+ --disable-bench
+ --without-libs
+ --without-daemon
+ --without-gui
+ --without-rapidcheck
+ --disable-fuzz
+ --disable-ccache
+ --disable-static
+ --with-system-libsecp256k1
+ --with-system-univalue
+ )
+ econf "${my_econf[@]}"
+}
+
+src_install() {
+ default
+
+ newbashcomp contrib/${PN}.bash-completion ${PN}
+}
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 8d49e9c29d1d..8722f1337b4e 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,3 +1,3 @@
-DIST debhelper_12.1.1.tar.xz 483732 BLAKE2B 39938f9ec0793154da6405c1b0ef2a8a10a10753475b09f8fbc6e7411457713eb7bc035dfc21f9b7b9f82ec276674802c0cd7599252956cf455cc8d203070a9c SHA512 ab006450258c6c3d5c89bddb8bc5a87d61d80e8232cbbd2f15a32d1045d1fa9f1858df536d8cf813048f4e755a8e5bca765f1da7800ebf8f1237096e659d9ddd
DIST debhelper_12.2.3.tar.xz 492468 BLAKE2B 2771364f0f531b29d676ea5dd3a7bb0a138b6fea3b11fc92d4c5dc19748e3b029d6d620e650cd997d3b164913be992868727c8f37e3194d7d89e8bd846a811aa SHA512 83acc2961dd964cfc0cda67b523fe5b41385e35f3884b6cf02ae6fc57c00e5b0633a0a5a57feb0fbd1898cb7028271102f291c761e58006449c2b278191c0af3
+DIST debhelper_12.3.tar.xz 493796 BLAKE2B 65ed2b494bd7dc70ecefe1a999681af1648385ec4addde8dbe39a650e37d4613c1712ba8005dd1efc8bcc688c02f23d02afe661e6126d29d8855930a34ed74d7 SHA512 94abe39f4df1d0b95b49fc20141f46f8f0438de89f904556dcb26f9ddcb6530d04d92c2c719549c0f1f5bc8c5edc395fd770e74097b353ec521affa227d77f4f
DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
diff --git a/dev-util/debhelper/debhelper-12.1.1.ebuild b/dev-util/debhelper/debhelper-12.3.ebuild
similarity index 100%
rename from dev-util/debhelper/debhelper-12.1.1.ebuild
rename to dev-util/debhelper/debhelper-12.3.ebuild
diff --git a/dev-util/perf/perf-4.14.33-r1.ebuild b/dev-util/perf/perf-4.14.33-r1.ebuild
index 6eb3fa30238f..62f2873092f0 100644
--- a/dev-util/perf/perf-4.14.33-r1.ebuild
+++ b/dev-util/perf/perf-4.14.33-r1.ebuild
@@ -163,8 +163,8 @@ src_install() {
perf_make -f Makefile.perf install DESTDIR="${D}"
if use gtk; then
- mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
- "${D}"/usr/libexec/perf-core || die
+ mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
fi
dodoc CREDITS
diff --git a/dev-util/perf/perf-4.20.3.ebuild b/dev-util/perf/perf-4.20.3.ebuild
index 5439d2b00ec3..04e3df46fcb0 100644
--- a/dev-util/perf/perf-4.20.3.ebuild
+++ b/dev-util/perf/perf-4.20.3.ebuild
@@ -198,11 +198,11 @@ src_test() {
src_install() {
perf_make -f Makefile.perf install DESTDIR="${D}"
- rm -rv "${D}"/usr/share/doc/perf-tip || die
+ rm -rv "${ED}"/usr/share/doc/perf-tip || die
if use gtk; then
- mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
- "${D}"/usr/libexec/perf-core || die
+ mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
fi
dodoc CREDITS
diff --git a/dev-util/perf/perf-5.1.15.ebuild b/dev-util/perf/perf-5.1.15.ebuild
index 269c7c597ef7..791892da875c 100644
--- a/dev-util/perf/perf-5.1.15.ebuild
+++ b/dev-util/perf/perf-5.1.15.ebuild
@@ -212,11 +212,11 @@ src_test() {
src_install() {
perf_make -f Makefile.perf install DESTDIR="${D}"
- rm -rv "${D}"/usr/share/doc/perf-tip || die
+ rm -rv "${ED}"/usr/share/doc/perf-tip || die
if use gtk; then
- mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
- "${D}"/usr/libexec/perf-core || die
+ mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
fi
dodoc CREDITS
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
new file mode 100644
index 000000000000..24991e568f19
--- /dev/null
+++ b/dev-util/rocm-cmake/Manifest
@@ -0,0 +1 @@
+DIST rocm-cmake-0.2.tar.gz 12729 BLAKE2B 6380e077cdc0dcc8c40c487789bd4405a9104e0c55e68df0587c74ea140c329b28ef224bea0d9d529ddaca2c3b874e64be840f96191b8bae7d662de5854756b6 SHA512 b2ebd749fb99ac6dbeac005bb0de5ca57e12ae3590d560c0fd03371f2dd0fc6e7862e0bc96046b98b8248770852c6ee64dd349f22405e77d8a210884246213bd
diff --git a/dev-util/rocm-cmake/metadata.xml b/dev-util/rocm-cmake/metadata.xml
new file mode 100644
index 000000000000..a82bb12bfd85
--- /dev/null
+++ b/dev-util/rocm-cmake/metadata.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ candrews@gentoo.org
+ Craig Andrews
+
+
+ RadeonOpenCompute/rocm-cmake
+
+
+ Radeon Open Compute CMake Modules
+
+
diff --git a/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild b/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
new file mode 100644
index 000000000000..eee840d3674b
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test"
+
+src_prepare() {
+ sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
+ cmake-utils_src_prepare
+}
diff --git a/dev-util/rocm-cmake/rocm-cmake-9999.ebuild b/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
new file mode 100644
index 000000000000..eee840d3674b
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test"
+
+src_prepare() {
+ sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
+ cmake-utils_src_prepare
+}
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
new file mode 100644
index 000000000000..28fcd10b1e6e
--- /dev/null
+++ b/dev-util/rocminfo/Manifest
@@ -0,0 +1 @@
+DIST rocminfo-2.6.0.tar.gz 12293 BLAKE2B b08725b45f48e78841da9d6e57bb19a441a423e20f853d16024c620914059abf3cb2e61c12ae6fdfdb85eb3e984d488ae9975ab3fd2fcc529ecb576c6816fc92 SHA512 e2dae7e2e02b674b3ad959a3dffdcd8f550842edfd0eac5866259a6a12de1a5f935afbdcb37845fa189d0937c41186f0eb8be08e7b346ddef959d5dd7b62dca7
diff --git a/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch b/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch
new file mode 100644
index 000000000000..1678f5043273
--- /dev/null
+++ b/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch
@@ -0,0 +1,31 @@
+https://github.com/RadeonOpenCompute/rocminfo/pull/17
+
+From c9bfc4b3db029b8502f900cd9bb545a675ca0898 Mon Sep 17 00:00:00 2001
+From: Craig Andrews
+Date: Thu, 25 Jul 2019 17:59:51 -0400
+Subject: [PATCH] Use CACHE variables, allow overriding
+ ROCR_LIB_DIR/ROCR_INC_DIR
+
+CACHE variables allow for variables to be documented, and ROCR_LIB_DIR/ROCR_INC_DIR should be overridable as they'll have different values on different Linux distributions.
+---
+ CMakeLists.txt | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b5fa9dd..f8f430f 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,9 +43,10 @@ endif()
+ #
+
+ # Required Defines first:
+-
+-set(ROCR_INC_DIR ${ROCM_DIR}/include)
+-set(ROCR_LIB_DIR ${ROCM_DIR}/lib)
++set(ROCRTST_BLD_BITS CACHE "64" STRING "Either 32 or 64")
++set(ROCM_DIR CACHE PATH "Root for RocM install")
++set(ROCR_INC_DIR ${ROCM_DIR}/include CACHE PATH "Path for RocM includes")
++set(ROCR_LIB_DIR ${ROCM_DIR}/lib CACHE PATH "Path for RocM libraries")
+ #
+ # Determine ROCR Header files are present
+ #
diff --git a/dev-util/rocminfo/metadata.xml b/dev-util/rocminfo/metadata.xml
new file mode 100644
index 000000000000..c7439799c48a
--- /dev/null
+++ b/dev-util/rocminfo/metadata.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ candrews@gentoo.org
+ Craig Andrews
+
+
+ RadeonOpenCompute/rocminfo
+
+
+ ROCm Application for Reporting System Info
+
+
diff --git a/dev-util/rocminfo/rocminfo-2.6.0.ebuild b/dev-util/rocminfo/rocminfo-2.6.0.ebuild
new file mode 100644
index 000000000000..9d2f7d5e0eb0
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-2.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/rocminfo-roc-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-cmake-variables.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DROCM_DIR="${ESYSROOT}/usr"
+ -DROCR_INC_DIR="${ESYSROOT}/usr/include"
+ -DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/hsa"
+ )
+ cmake-utils_src_configure
+}
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 839a0f57b030..596f5d29ceac 100644
Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index 56408723aea3..ab9e6c34163c 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1,2 +1,2 @@
DIST minecraft-server-1.13.2.jar 33835116 BLAKE2B 4d92068d51555ab44a2efcdbb1676ef34a7085e4d666a7915c4c5a3d1f9502536df4bf67909d27b7b94cb8ebb483dc55f935f21930d4bc454645ed44ef8e6ed8 SHA512 c9a98f1d224519369d6c4882cfe93a94983661c0c0b8a7f0b2f271af752fde5693025b684a01665992b3c70b37ac891ce1747f062bd86354777c416219629b64
-DIST minecraft-server-1.14.2.jar 35932967 BLAKE2B 1dbba4ae065a05539db59412c393de9c183384ce5c4edf2f19ffd702c60e1f85c10362abd3f75c01bff08d764bdcab2783c569ea722d582ef1049d7a688f2448 SHA512 9670c1038aa23c3012241a5a103ab5a3e989efcb13edd45f318f92e9968f5f2e99314d3edd0c6851238772e2e1cc5b4bdaeac686a7622e321ac81bf40e2a3cf7
+DIST minecraft-server-1.14.4.jar 35958734 BLAKE2B 058d6609296394e4714a159976d4de0261a552a919e33db1e54d97e3d2ee90cd4356b60190b807050d3c7ab336149d1c9be55093ba002735ccc6a162706c6ee3 SHA512 b3d2852c6fa1b996bbf2fa9fc1fb860c6bca5136bcc5ddd3d236d85789c6bce81620f6b2d69eaa10c41d020fe0bb54de2fa601b3df3093af2691853a4445e1f8
diff --git a/games-server/minecraft-server/minecraft-server-1.14.2.ebuild b/games-server/minecraft-server/minecraft-server-1.14.4.ebuild
similarity index 76%
rename from games-server/minecraft-server/minecraft-server-1.14.2.ebuild
rename to games-server/minecraft-server/minecraft-server-1.14.4.ebuild
index 3d9540765c05..c0814321c97e 100644
--- a/games-server/minecraft-server/minecraft-server-1.14.2.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.14.4.ebuild
@@ -1,34 +1,34 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-MY_PV="808be3869e2ca6b62378f9f4b33c946621620019"
+EGIT_COMMIT="3dc3d84a581f14691199cf6831b71ed1296a9fdf"
-inherit readme.gentoo-r1 java-pkg-2 user
+inherit readme.gentoo-r1 java-pkg-2
DESCRIPTION="The official server for the sandbox video game"
HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/v1/objects/${MY_PV}/server.jar -> ${P}.jar"
+SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar"
LICENSE="Mojang"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="
+ acct-group/minecraft
+ acct-user/minecraft
app-misc/screen
- >=virtual/jre-1.8
+ || (
+ >=virtual/jre-1.8
+ >=virtual/jdk-1.8
+ )
"
RESTRICT="bindist mirror strip"
S="${WORKDIR}"
-pkg_setup() {
- enewgroup minecraft
- enewuser minecraft -1 -1 /var/lib/minecraft-server minecraft
-}
-
src_unpack() {
# Don't unpack that jar, just copy it to WORKDIR
cp "${DISTDIR}"/${A} "${WORKDIR}" || die
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 59d6c3459939..db178b8b1293 100644
Binary files a/licenses/Manifest.gz and b/licenses/Manifest.gz differ
diff --git a/licenses/lha b/licenses/lha
index 6ac02e9fb6ad..75330f275ffa 100644
--- a/licenses/lha
+++ b/licenses/lha
@@ -1,27 +1,172 @@
This license explanation was derived from the copyright notice distributed
with the Debian package maintained by Atsushi KAMOSHIDA .
-Upstream Author: Tsugio Okamoto
+Upstream Authors:
+
+ LHarc 0.01-1.00: Yooichi Tagawa (LHa code taken from here, 1988-1989)
+ Nikkei-mix ID: y.tagawa (Now this is defunct BBS, Licensing term
+ in manual page come from his licence for lharc)
+ His new web page seems to be www2s.biglibe.ne.jp/~yex/
+ yooedit2001@yahoo.co.jp is the contact e-mail address for another
+ software. Page updated at least July/2001
+
+ LHa 0.01-1.00: Masaru Oki (LHa original author, 1991-1992)
+ E-Mail address: oki@netbsd.org
+
+ LHa 1.10-1.14: Nobutaka Watazaki (Last official release? 1993-1995)
+ ALICE-NET ALS00595 Nasty
+ E-Mail JBD02514@niftyserve.or.jp
+ E-Mail femcs@mbox.kyoto-inet.or.jp
+ NIFTY-Serve JBD02514
+ E-Mail address: watazaki@shimadzu.co.jp
+ E-Mail address: watazaki@shimadzusd.co.jp
+
+ Lha 1.14a-1.14e: Tsugio Okamoto (1996-2000)
+
Copyright:
- Original License Statement (in Japanese):
+Original Source Code License Statement:
+
+ /* Copyright (C) MCMLXXXIX Yooichi.Tagawa */
+ /* Modified Nobutaka Watazaki */
+ /* Thanks to H.Yoshizaki. (MS-DOS LHarc) */
+
+
+Original Authors License Statement (from man/lha.man, in Japanese
+EUC-JP):
+
+ 再配布について
+ 以下の条件で、再配布、転載、改変を許可します。
+
+ 1. 著作権表示を削除しないこと。
+
+ 2. 配布内容については、
+
+ a. 配布の際に存在する内容(すなわち ソー ス コー
+ ド、 ド キュメント、プログラマーへの手引きな
+ ど)が再配布されたものの中に必ず存在 す る こ
+ と。 改 変されているならば、それを明示したド
+ キュメントを用意すること。
+
+ b. LHa に対する付加価値が付けられて再配布される
+ 場合にはそれらもできるだけ含めるよう努力する
+ こと。また、その際には付加価値が付けられてい
+ ることを明示したドキュメントを用意すること。
+
+ c. バイナリのみの配布は許されない。(付加価値 の
+ ものも含む)
+
+ 3. 最新版の配布に務めること。(義務はない)
+
+ 注. なお、ネットでの配付は自由であるが、ネットに
+ アクセスできない方(雑誌および、 CDROM な ど
+ に よる)配付は、配付前にこちらに EMail をお
+ 願いします。配付前に出来ない際には、後日必ず
+ EMail をお願いします。
+
+ 4. このプログラムの存在や使用したことによって生じた損
+ 害は全く保証しない。
+
+ 5. 作者は、このプログラムに不備があっても、それを訂 正
+ する義務を負わない。
+
+ 6. このプログラムの一部、または全部を他のプログラムに
+ 組み込んで利用してもかまわない。この場合、そのプ ロ
+ グラムは LHa ではなく、 LHa と名乗ってはいけない。
+
+ 7. 商利用に関しては、上記の条件に加え、下記の条件のも
+ とにこれを認める。
+
+ a. このプログラムをメインとする商利用は禁 止 す
+ る。
+
+ b. 商利用の相手がこのプログラムの使用者として不
+ 適切と判断した場合には配布しない。
+
+ c. インストールの手段として使用する場合、このプ
+ ログラムを使うことを相手に強制しない。この場
+ 合、商利用者が作業を行う。また、そのときの損
+ 害は、商利用者が全責任を負う。
+
+ d. 商利用を付加価値として行いこのプログラムを使
+ 用する場合、商利用者は、そのサポートを行う。
+
+
+Original Authors License Statement (from man/lha.man, translated by
+Osamu Aoki ):
+
+ Permission is given for redistribution, copy, and modification provided
+ following conditions are met.
+
+ 1. Do not remove copyright clause.
+
+ 2. Distribution shall conform:
+
+ a. The content of redistribution (i.e., source code, documentation,
+ and reference guide for programmers) shall include original contents.
+ If contents are modified, the document clearly indicating
+ the fact of modification must be included.
+ b. If LHa is redistributed with added values, you must put your best
+ effort to include them (Translator comment: If read literally,
+ original Japanese was unclear what "them" means here. But
+ undoubtedly this "them" means source code for the added value
+ portion and this is a typical Japanese sloppy writing style to
+ abbreviate as such) Also the document clearly indicating that
+ added value was added must be included.
+ c. Binary only distribution is not allowed (including added value
+ ones.)
+
+ 3. You need to put effort to distribute the latest version (This is not
+ your duty).
+
+ NB: Distribution on Internet is free. Please notify me by e-mail or
+ other means prior to the distribution if distribution is done through
+ non-Internet media (Magazine, CDROM etc.) If not, make sure to Email
+ me later.
+
+ 4. Any damage caused by the existence and use of this program will not
+ be compensated.
+
+ 5. Author will not be responsible to correct errors even if program is
+ defective.
+
+ 6. This program, either as a part of this or as a whole of this, may be
+ included into other programs. In this case, that program is not LHa
+ and can not call itself LHa.
+
+ 7. For commercial use, in addition to above conditions, following
+ condition needs to be met.
+
+ a. The program whose content is mainly this program can not be used
+ commercially.
+ b. If the recipient of commercial use deems inappropriate as a
+ program user, you must not distribute.
+ c. If used as a method for the installation, you must not force
+ others to use this program. In this case, commercial user will
+ perform its work while taking full responsibility of its outcome.
+ d. If added value is done under the commercial use by using this
+ program, commercial user shall provide its support.
+
+
+(Osamu Aoki also comments:
+ Here "commercial" may be interpreted as "for-fee". "Added value" seems
+ to mean "feature enhancement". )
+
+
+License Statement by Tsugio Okamoto (in Japanese EUC-JP):
なお、ネットでの配付は自由ですが、ネットにアクセスできない方(雑誌および、
CD-ROM などによる)への配付は、配付前にこちらに Inter-Net の方にE-Mail
を お願いします。 どこそこに、掲載するという旨があれば結構ですので。
また、それも出来ない際には、後日 E-Mail を必ずお願いします。
- Translated License Statement (translated by GOTO Masanori ):
+
+Translated License Statement by Tsugio Okamoto (translated by
+GOTO Masanori ):
It's free to distribute on the network, but if you distribute for
the people who cannot access the network (by magazine or CD-ROM),
please send E-Mail (Inter-Net address) to the author before the
distribution. That's well where this software is appeard.
If you cannot do, you must send me the E-Mail later.
-
- Original Source Code License Statement:
-
- /* Copyright (C) MCMLXXXIX Yooichi.Tagawa */
- /* Modified Nobutaka Watazaki */
- /* Thanks to H.Yoshizaki. (MS-DOS LHarc) */
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index a58b8574df13..b42186888eb7 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 276f10f8e9de..e9ebe5f421b2 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1 +1,2 @@
DIST amavis-amavisd-new-2.11.1.tar.gz 1093467 BLAKE2B 1e43ddea86ff269b02cbbcd125d913c51b66728b1063cde6ca3f3f24f1bd36f9f3c7f51a8baf509d2aca0d41a07a00bb9abe08dd70724391c552634715d01a75 SHA512 6ef291868908bd13d6ce913f5c8c3898b35eba490877e8eded3951a32be7549145df5db1409f124a3631ec88dd7eeb9457ce2b063ae3e3bccd76cc2a9b8741ae
+DIST amavis-v2.12.0.tar.bz2 873702 BLAKE2B cae44bb9cfa9125f44b1ef548947a5f826e91fc349b12a52f0267933e65c450a708c7a18e5ae90ee1a0d452d0b3d30a6c1cabcc310e3609de1eda8c35f222306 SHA512 f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844
diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
new file mode 100644
index 000000000000..6648dadf9c13
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd user
+
+DESCRIPTION="High-performance interface between the MTA and content checkers"
+HOMEPAGE="https://gitlab.com/amavis/amavis"
+SRC_URI="${HOMEPAGE}/-/archive/v${PV}/amavis-v${PV}.tar.bz2"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
+
+MY_RSPAMD_DEPEND="( dev-perl/JSON dev-perl/HTTP-Message dev-perl/LWP-UserAgent-Determined )"
+RDEPEND=">=dev-lang/perl-5.10.0
+ app-arch/arc
+ app-arch/bzip2
+ app-arch/cabextract
+ app-arch/cpio
+ app-arch/gzip
+ app-arch/lha
+ app-arch/lrzip
+ app-arch/lzop
+ app-arch/ncompress
+ app-arch/p7zip
+ app-arch/pax
+ app-arch/unarj
+ app-arch/unrar
+ app-arch/xz-utils
+ app-arch/zoo
+ clamav? ( app-antivirus/clamav )
+ >=dev-perl/Archive-Zip-1.14
+ dev-perl/BerkeleyDB
+ dev-perl/Convert-BinHex
+ dev-perl/File-LibMagic
+ dev-perl/IO-Socket-SSL
+ dev-perl/IO-stringy
+ >=dev-perl/Mail-DKIM-0.31
+ >=dev-perl/MailTools-1.58
+ >=dev-perl/MIME-tools-5.415
+ dev-perl/Net-LibIDN
+ >=dev-perl/Net-Server-0.91
+ dev-perl/Net-SSLeay
+ dev-perl/Unix-Syslog
+ ldap? ( >=dev-perl/perl-ldap-0.33 )
+ mysql? ( dev-perl/DBD-mysql )
+ net-mail/ripole
+ net-mail/tnef
+ postgres? ( dev-perl/DBD-Pg )
+ razor? ( mail-filter/razor )
+ rspamd? ( ${MY_RSPAMD_DEPEND} )
+ rspamd-https? ( ${MY_RSPAMD_DEPEND} dev-perl/LWP-Protocol-https dev-perl/Net-SSLeay )
+ snmp? ( net-analyzer/net-snmp[perl] )
+ spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
+ >=sys-apps/coreutils-5.0-r3
+ >=sys-libs/db-4.4.20
+ virtual/mta
+ >=virtual/perl-Compress-Raw-Zlib-2.017
+ virtual/perl-Digest-MD5
+ virtual/perl-File-Temp
+ >=virtual/perl-IO-Compress-1.35
+ virtual/perl-IO-Socket-IP
+ virtual/perl-MIME-Base64
+ >=virtual/perl-Time-HiRes-1.49
+ zmq? ( dev-perl/ZMQ-LibZMQ3 )"
+
+AMAVIS_ROOT="/var/amavis"
+S="${WORKDIR}/amavis-v${PV}"
+
+pkg_setup() {
+ # Create the user beforehand so that we can install the config file
+ # (and some directories) with group "amavis" in src_install().
+ enewgroup amavis
+ enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
+}
+
+src_prepare() {
+ if use courier ; then
+ eapply -p0 amavisd-new-courier.patch
+ fi
+
+ if use qmail ; then
+ eapply -p0 amavisd-new-qmqpqq.patch
+ fi
+
+ # We need to fix the daemon_user and daemon_group in amavis-mc even
+ # though we're going to run it in the foreground, because it calls
+ # "drop_priv" unconditionally and will crash if its user/group
+ # doesn't exist.
+ sed -i \
+ -e '/daemon/s/vscan/amavis/' \
+ -e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
+ "${S}/amavisd.conf" "${S}/amavis-mc" || die "missing conf file"
+
+ if ! use dkim ; then
+ sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
+ || die "missing conf file - dkim"
+ fi
+
+ if use zmq ; then
+ sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \
+ || die "missing conf file - zmq"
+ fi
+
+ if ! use spamassassin ; then
+ sed -i -e \
+ "/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
+ "${S}/amavisd.conf" || die "missing conf file - sa"
+ fi
+
+ eapply_user
+}
+
+src_install() {
+ dosbin amavisd{,-agent,-nanny,-release,-signer,-status}
+ dobin p0f-analyzer.pl amavisd-submit
+
+ if use snmp ; then
+ dosbin amavisd-snmp-subagent
+ newinitd "${FILESDIR}/amavisd-snmp-subagent.initd" \
+ amavisd-snmp-subagent
+ dodoc AMAVIS-MIB.txt
+
+ if use zmq ; then
+ dosbin amavisd-snmp-subagent-zmq
+ newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
+ amavisd-snmp-subagent-zmq
+ fi
+ fi
+
+ if use zmq ; then
+ dosbin amavis-services amavis-mc
+ newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
+ fi
+
+ if use ldap ; then
+ dodir /etc/openldap/schema
+ insinto /etc/openldap/schema
+ newins LDAP.schema "${PN}.schema"
+ fi
+
+ # The config file should be root:amavis so that the amavis user can
+ # read (only) it after dropping privileges. And of course he should
+ # own everything in his home directory.
+ insinto /etc
+ insopts -m0640 -g amavis
+ doins amavisd.conf
+
+ # Implementation detail? Keepdir calls dodir under the hood.
+ diropts -o amavis -g amavis
+ keepdir "${AMAVIS_ROOT}"/{,db,quarantine,tmp,var}
+
+ # BEWARE:
+ #
+ # Anything below this line is using the mangled insopts/diropts from
+ # above!
+ #
+
+ newinitd "${FILESDIR}/amavisd.initd-r2" amavisd
+
+ systemd_newunit "${FILESDIR}/amavisd.service-r1" amavisd.service
+
+ dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
+ amavisd.conf-default amavisd-custom.conf
+
+ docinto README_FILES
+ dodoc README_FILES/README*
+ dodoc -r README_FILES/*.{html,css}
+ docinto README_FILES/images
+ dodoc README_FILES/images/*.png
+ docinto README_FILES/images/callouts
+ dodoc README_FILES/images/callouts/*.png
+
+ docinto test-messages
+ dodoc test-messages/README
+ dodoc test-messages/sample.tar.gz.compl
+}
+
+pkg_preinst() {
+ # TODO: the following is done as root, but should probably be done
+ # as the amavis user.
+ if use razor ; then
+ if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
+ elog "Setting up initial razor config files..."
+
+ razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor"
+ sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
+ "${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die
+ fi
+ fi
+}
diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml
index 1b1c868add7e..3aa9e6828631 100644
--- a/mail-filter/amavisd-new/metadata.xml
+++ b/mail-filter/amavisd-new/metadata.xml
@@ -9,11 +9,17 @@
mjo@gentoo.org
Michael Orlitzky
+
+ gentoo@seichter.de
+ Ralph Seichter
+
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 4f539baf717c..469cc43b6e8a 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index b94bafd32716..23ba1de06932 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,7 +1,4 @@
DIST postfix-2.10.9.tar.gz 3820525 BLAKE2B ed1fc10f016cdc63fe2b86c68cca270c98348417babf6d8e05f76fa2550f5cbca95825f14cf54897e66323cdbe6132a1046402b853b6f000ade630277278c748 SHA512 c77df7ccc051bd72271dc5298da0ca4e45397b1ba96fc8be31e095f5b15cd30ebc0b29cf638e76efc65503cb241efd937f2d64aaa97243402c35e2927b7a7b91
-DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 132a6b467f9156d716a92cc7beae0f9a7c47e6a2045e83726a5e7305e6f9bf666ebcfb93a9ab1a96ec988431661059d62e926287bd13089eeb4bab3e8f4b9fc7 SHA512 6dc583d3b1c98f5c8d6486351bee9f92a98b5379cd0d76d26a382379c112317e7a2a58c3a200477a6d0f831c73395257d1a63170df17ea8a65a4048a7df391f8
-DIST postfix-3.3.1.tar.gz 4420912 BLAKE2B 065fd04cdfa343a6c50a629e8da47fad71465df790ca88adcad4efc7ab273330c39998c6bf503587b8bcba3d87bb98b1be6413e49449e2241258a99217473c11 SHA512 2307f50f8b7dab1db46ebe4ae30bc5682a25b9c49ae5ae65aa95b4620bb5450dd5929977c0f34b9e73a92ca6af36fd8e24167732420a1a2d89167c7a3b197276
-DIST postfix-3.3.4.tar.gz 4429964 BLAKE2B 58812a75e7f8e2e89dce3dd8cb8b779c4b90995ce9d1885cec0fc475c8dc267741ea6c7af6e82fc80e3f71244964df9a5fe776c3b09e5e0cad1f59424dfab6b3 SHA512 fccc524167ea3b85f4fe0fc4ad8312f6d684c1900e7c5c355d4522513f74b588bbfcfd28074a8b69ce038982fcaa359abf585a296df4046184c7da6d0405d0ee
DIST postfix-3.4.5.tar.gz 4581301 BLAKE2B 9de66cab6eea610fc83e4629980b3e201b4e3f9185729cb84933aa940b64b7818d0439c5145ea0b635666db92c970e1974f4f439cd3b733c58e1fe5794c046fa SHA512 af59d960b40799f7667935bef8fafb93ae6dcb70abaa77a15cf498571f37fa0429f411f9f08b1b6bfa588d3f572260d14d6d5409f0cd1e82b1c59928b2124c94
DIST postfix-3.4.6.tar.gz 4571771 BLAKE2B e08b2e6c01fe54fcc7439182783190f4adb81758a1bbcc1bfec71e02dca91a779308f624e081837f7e2deec8666f10bc51238e90cc952de6c8371fb18790604f SHA512 96430d60cf58b9876e52a742dbfe3ca1da4ec82eeea5cd35c6ee4e69714ddd5601561a6663aac51a34b2d64db4f7678d7c5d720ec9ead807b5d7e87e37434961
DIST postfix-3.5-20190724.tar.gz 4606145 BLAKE2B e197542d71d953ca1b86e8bd4bc433a50b52d0ad2aa0874680d1c611be1cf9fdbf309b29884fb7bb7707a5d3380de5131fb5361fceb359048ca0106e5576f7b6 SHA512 eb08681c8660073681ab5c8b6c36acebddaf4f8780b69583117293ba275d03a1bd94f7c08cbcd0dd65f010a480867e419cd008eb9c29a9b95a2101b5ad3b34a0
diff --git a/mail-mta/postfix/files/postfix-libressl-eccurve.patch b/mail-mta/postfix/files/postfix-libressl-eccurve.patch
deleted file mode 100644
index 7ce14fd17ad6..000000000000
--- a/mail-mta/postfix/files/postfix-libressl-eccurve.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Bug: https://bugs.gentoo.org/659224
-$OpenBSD: patch-src_tls_tls_dh_c,v 1.2 2017/02/04 22:09:44 sthen Exp $
-
-Fix building with LibreSSL
-
---- src/tls/tls_dh.c.orig Mon Dec 26 18:47:24 2016
-+++ src/tls/tls_dh.c Sat Feb 4 01:45:39 2017
-@@ -314,7 +314,7 @@ void tls_auto_eecdh_curves(SSL_CTX *ctx)
- * This is a NOP in OpenSSL 1.1.0 and later, where curves are always
- * auto-negotiated.
- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000UL
-+#if OPENSSL_VERSION_NUMBER < 0x10100000UL || defined(LIBRESSL_VERSION_NUMBER)
- if (SSL_CTX_set_ecdh_auto(ctx, 1) <= 0) {
- msg_warn("failed to enable automatic ECDHE curve selection");
- tls_print_errors();
diff --git a/mail-mta/postfix/files/postfix-libressl-runtime.patch b/mail-mta/postfix/files/postfix-libressl-runtime.patch
deleted file mode 100644
index 814088610a8d..000000000000
--- a/mail-mta/postfix/files/postfix-libressl-runtime.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- src/posttls-finger/posttls-finger.c.orig 2016-08-27 20:27:50 UTC
-+++ src/posttls-finger/posttls-finger.c
-@@ -1511,7 +1511,8 @@ static int finger(STATE *state)
- return (0);
- }
-
--#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(USE_TLS) && \
-+ ( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
-
- /* ssl_cleanup - free memory allocated in the OpenSSL library */
-
-@@ -1958,7 +1959,8 @@ int main(int argc, char *argv[])
- cleanup(&state);
-
- /* OpenSSL 1.1.0 and later (de)initialization is implicit */
--#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(USE_TLS) && \
-+ ( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
- ssl_cleanup();
- #endif
-
---- src/tls/tls_client.c.orig 2016-08-27 20:27:50 UTC
-+++ src/tls/tls_client.c
-@@ -299,7 +299,7 @@ TLS_APPL_STATE *tls_client_init(const TL
- */
- tls_check_version();
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * Initialize the OpenSSL library by the book! To start with, we must
-@@ -441,7 +441,7 @@ TLS_APPL_STATE *tls_client_init(const TL
- /*
- * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * According to the OpenSSL documentation, temporary RSA key is needed
---- src/tls/tls_dane.c.orig 2016-08-27 20:27:50 UTC
-+++ src/tls/tls_dane.c
-@@ -2163,7 +2163,7 @@ static SSL_CTX *ctx_init(const char *CAf
- tls_param_init();
- tls_check_version();
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- SSL_load_error_strings();
- SSL_library_init();
- #endif
---- src/tls/tls_rsa.c.orig 2016-01-03 14:49:51 UTC
-+++ src/tls/tls_rsa.c
-@@ -57,7 +57,7 @@
- /*
- * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* tls_tmp_rsa_cb - call-back to generate ephemeral RSA key */
-
-@@ -109,7 +109,7 @@ int main(int unused_argc, char *cons
- /*
- * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- RSA *rsa;
-
- msg_vstream_init(argv[0], VSTREAM_ERR);
---- src/tls/tls_server.c.orig 2016-08-27 20:27:50 UTC
-+++ src/tls/tls_server.c
-@@ -174,7 +174,7 @@ static const char server_session_id_cont
- #endif /* OPENSSL_VERSION_NUMBER */
-
- /* OpenSSL 1.1.0 bitrot */
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- typedef const unsigned char *session_id_t;
-
- #else
-@@ -377,7 +377,7 @@ TLS_APPL_STATE *tls_server_init(const TL
- */
- tls_check_version();
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * Initialize the OpenSSL library by the book! To start with, we must
-@@ -588,7 +588,7 @@ TLS_APPL_STATE *tls_server_init(const TL
- /*
- * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * According to OpenSSL documentation, a temporary RSA key is needed when
diff --git a/mail-mta/postfix/files/postfix-libressl-session-tickets.patch b/mail-mta/postfix/files/postfix-libressl-session-tickets.patch
deleted file mode 100644
index fcbc9df63aca..000000000000
--- a/mail-mta/postfix/files/postfix-libressl-session-tickets.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tls/tls_server.c 2018-11-18 20:11:20.120000000 +1100
-+++ src/tls/tls_server.c 2018-11-18 20:11:58.430000000 +1100
-@@ -486,7 +486,7 @@
- * OpenSSL 0.9.8h, while SSL_NO_TICKET was added in 0.9.8f.
- */
- #ifdef SSL_OP_NO_TICKET
--#if !defined(OPENSSL_NO_TLSEXT) && OPENSSL_VERSION_NUMBER >= 0x0090808fL
-+#if !defined(OPENSSL_NO_TLSEXT) && OPENSSL_VERSION_NUMBER >= 0x0090808fL && !defined(LIBRESSL_VERSION_NUMBER)
- ticketable = (*var_tls_tkt_cipher && scache_timeout > 0
- && !(off & SSL_OP_NO_TICKET));
- if (ticketable) {
diff --git a/mail-mta/postfix/files/postfix-libressl.patch b/mail-mta/postfix/files/postfix-libressl.patch
deleted file mode 100644
index ce047b760399..000000000000
--- a/mail-mta/postfix/files/postfix-libressl.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-OpenBSD patch at:
-http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/mail/postfix/snapshot/patches/patch-src_tls_tls_h
-$OpenBSD: patch-src_tls_tls_h,v 1.2 2016/02/25 09:39:49 sthen Exp $
-
-Fix building with LibreSSL
-
---- src/tls/tls.h.orig Sat Feb 6 15:09:41 2016
-+++ src/tls/tls.h Sun Feb 14 19:54:38 2016
-@@ -89,7 +89,7 @@ extern const char *str_tls_level(int);
- #endif
-
- /* Backwards compatibility with OpenSSL < 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define OpenSSL_version_num SSLeay
- #define OpenSSL_version SSLeay_version
- #define OPENSSL_VERSION SSLEAY_VERSION
diff --git a/mail-mta/postfix/files/postfix-linux-5.patch b/mail-mta/postfix/files/postfix-linux-5.patch
deleted file mode 100644
index a806ab0dbb9c..000000000000
--- a/mail-mta/postfix/files/postfix-linux-5.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-See http://postfix.1071664.n5.nabble.com/Support-for-quot-Linux-5-quot-td99786.html
---- a/makedefs 2018-02-03 12:20:46.000000000 -0500
-+++ b/makedefs 2019-02-18 15:39:17.711376206 -0500
-@@ -546,7 +546,7 @@
- : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
- : ${PLUGIN_LD="${CC-gcc} -shared"}
- ;;
-- Linux.[34].*) SYSTYPE=LINUX$RELEASE_MAJOR
-+ Linux.[345].*) SYSTYPE=LINUX$RELEASE_MAJOR
- case "$CCARGS" in
- *-DNO_DB*) ;;
- *-DHAS_DB*) ;;
---- a/src/util/sys_defs.h 2019-02-18 15:40:19.008167828 -0500
-+++ b/src/util/sys_defs.h 2019-02-18 15:42:17.241742169 -0500
-@@ -748,7 +748,7 @@
- /*
- * LINUX.
- */
--#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4)
-+#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5)
- #define SUPPORTED
- #define UINT32_TYPE unsigned int
- #define UINT16_TYPE unsigned short
diff --git a/mail-mta/postfix/postfix-3.2.4.ebuild b/mail-mta/postfix/postfix-3.2.4.ebuild
deleted file mode 100644
index 26ce14a75ba4..000000000000
--- a/mail-mta/postfix/postfix-3.2.4.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic pam systemd toolchain-funcs user
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND=">=dev-libs/libpcre-3.4
- dev-lang/perl
- berkdb? ( >=sys-libs/db-3.2:* )
- cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
- eai? ( dev-libs/icu:= )
- ldap? ( net-nds/openldap )
- ldap-bind? ( net-nds/openldap[sasl] )
- lmdb? ( >=dev-db/lmdb-0.9.11 )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )"
-
-RDEPEND="${DEPEND}
- dovecot-sasl? ( net-mail/dovecot )
- memcached? ( net-misc/memcached )
- net-mail/mailbase
- !mail-mta/courier
- !mail-mta/esmtp
- !mail-mta/exim
- !mail-mta/mini-qmail
- !mail-mta/msmtp[mta]
- !mail-mta/netqmail
- !mail-mta/nullmailer
- !mail-mta/qmail-ldap
- !mail-mta/sendmail
- !mail-mta/opensmtpd
- !=mail-mta/ssmtp-2.64-r2[mta]
- !net-mail/fastforward
- selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
- # Add postfix, postdrop user/group (bug #77565)
- enewgroup postfix 207
- enewgroup postdrop 208
- enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
- default
- sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
- src/util/sys_defs.h || die "sed failed"
- # change default paths to better comply with portage standard paths
- sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
- eapply -p0 "${FILESDIR}/${PN}-libressl.patch"
- eapply -p0 "${FILESDIR}/${PN}-libressl-runtime.patch"
-}
-
-src_configure() {
- for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
- do
- local AUXLIBS_${name}=""
- done
-
- # Make sure LDFLAGS get passed down to the executables.
- local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
- AUXLIBS_PCRE="$(pcre-config --libs)"
-
- use pam && mylibs="${mylibs} -lpam"
-
- if use ldap; then
- mycc="${mycc} -DHAS_LDAP"
- AUXLIBS_LDAP="-lldap -llber"
- fi
-
- if use mysql; then
- mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
- AUXLIBS_MYSQL="$(mysql_config --libs)"
- fi
-
- if use postgres; then
- mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
- AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
- fi
-
- if use sqlite; then
- mycc="${mycc} -DHAS_SQLITE"
- AUXLIBS_SQLITE="-lsqlite3 -lpthread"
- fi
-
- if use ssl; then
- mycc="${mycc} -DUSE_TLS"
- mylibs="${mylibs} -lssl -lcrypto"
- fi
-
- if use lmdb; then
- mycc="${mycc} -DHAS_LMDB"
- AUXLIBS_LMDB="-llmdb -lpthread"
- fi
-
- if ! use eai; then
- mycc="${mycc} -DNO_EAI"
- fi
-
- # broken. and "in other words, not supported" by upstream.
- # Use inet_protocols setting in main.cf
- #if ! use ipv6; then
- # mycc="${mycc} -DNO_IPV6"
- #fi
-
- if use sasl; then
- if use dovecot-sasl; then
- # Set dovecot as default.
- mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
- fi
- if use ldap-bind; then
- mycc="${mycc} -DUSE_LDAP_SASL"
- fi
- mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
- mylibs="${mylibs} -lsasl2"
- elif use dovecot-sasl; then
- mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
- fi
-
- if ! use nis; then
- mycc="${mycc} -DNO_NIS"
- fi
-
- if ! use berkdb; then
- mycc="${mycc} -DNO_DB"
- if use cdb; then
- # change default hash format from Berkeley DB to cdb
- mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
- fi
- fi
-
- if use cdb; then
- mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
- # Tinycdb is preferred.
- if has_version dev-db/tinycdb ; then
- einfo "Building with dev-db/tinycdb"
- AUXLIBS_CDB="-lcdb"
- else
- einfo "Building with dev-db/cdb"
- CDB_PATH="/usr/$(get_libdir)"
- for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
- AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
- done
- fi
- fi
-
- # Robin H. Johnson 17/Nov/2006
- # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
- mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
- filter-lfs-flags
-
- # Workaround for bug #76512
- if use hardened; then
- [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
- fi
-
- # Remove annoying C++ comment style warnings - bug #378099
- append-flags -Wno-comment
-
- sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
- sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
- emake makefiles shared=yes dynamicmaps=no pie=yes \
- shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
- DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
- AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
- AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
- AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
- AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install () {
- local myconf
- use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
- html_directory=\"/usr/share/doc/${PF}/html\""
-
- LD_LIBRARY_PATH="${S}/lib" \
- /bin/sh postfix-install \
- -non-interactive \
- install_root="${D}" \
- config_directory="/etc/postfix" \
- manpage_directory="/usr/share/man" \
- command_directory="/usr/sbin" \
- mailq_path="/usr/bin/mailq" \
- newaliases_path="/usr/bin/newaliases" \
- sendmail_path="/usr/sbin/sendmail" \
- ${myconf} \
- || die "postfix-install failed"
-
- # Fix spool removal on upgrade
- rm -Rf "${D}"/var
- keepdir /var/spool/postfix
-
- # Install rmail for UUCP, closes bug #19127
- dobin auxiliary/rmail/rmail
-
- # Provide another link for legacy FSH
- dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
- # Install qshape and posttls-finger
- dobin auxiliary/qshape/qshape.pl
- doman man/man1/qshape.1
- dobin bin/posttls-finger
- doman man/man1/posttls-finger.1
-
- # Performance tuning tools and their manuals
- dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
- doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
- # Set proper permissions on required files/directories
- dodir /var/lib/postfix
- keepdir /var/lib/postfix
- fowners -R postfix:postfix /var/lib/postfix
- fperms 0750 /var/lib/postfix
- fowners root:postdrop /usr/sbin/post{drop,queue}
- fperms 02711 /usr/sbin/post{drop,queue}
-
- keepdir /etc/postfix
- if use mbox; then
- mypostconf="mail_spool_directory=/var/spool/mail"
- else
- mypostconf="home_mailbox=.maildir/"
- fi
- LD_LIBRARY_PATH="${S}/lib" \
- "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
- -e ${mypostconf} || die "postconf failed"
-
- insinto /etc/postfix
- newins "${FILESDIR}"/smtp.pass saslpass
- fperms 600 /etc/postfix/saslpass
-
- newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
- # do not start mysql/postgres unnecessarily - bug #359913
- use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
- use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
- dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
- use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
- pamd_mimic_system smtp auth account
-
- if use sasl; then
- insinto /etc/sasl2
- newins "${FILESDIR}"/smtp.sasl smtpd.conf
- fi
-
- # header files
- insinto /usr/include/postfix
- doins include/*.h
-
- # Keep config_dir clean
- rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
- rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-
- if has_version mail-mta/postfix; then
- # let the sysadmin decide when to change the compatibility_level
- sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
- fi
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
- if [[ ! -e /etc/mail/aliases.db ]] ; then
- ewarn
- ewarn "You must edit /etc/mail/aliases to suit your needs"
- ewarn "and then run /usr/bin/newaliases. Postfix will not"
- ewarn "work correctly without it."
- ewarn
- fi
-
- # configure tls
- if use ssl ; then
- if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
- elog "To configure client side TLS settings:"
- elog "${EROOT}"usr/sbin/postfix tls enable-client
- fi
- if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
- elog "To configure server side TLS settings:"
- elog "${EROOT}"usr/sbin/postfix tls enable-server
- fi
- fi
-}
diff --git a/mail-mta/postfix/postfix-3.3.1-r1.ebuild b/mail-mta/postfix/postfix-3.3.1-r1.ebuild
deleted file mode 100644
index a171b99951aa..000000000000
--- a/mail-mta/postfix/postfix-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic pam systemd toolchain-funcs user
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND=">=dev-libs/libpcre-3.4
- dev-lang/perl
- berkdb? ( >=sys-libs/db-3.2:* )
- cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
- eai? ( dev-libs/icu:= )
- ldap? ( net-nds/openldap )
- ldap-bind? ( net-nds/openldap[sasl] )
- lmdb? ( >=dev-db/lmdb-0.9.11 )
- mysql? ( virtual/mysql )
- nis? ( net-libs/libnsl )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )"
-
-RDEPEND="${DEPEND}
- memcached? ( net-misc/memcached )
- net-mail/mailbase
- !mail-mta/courier
- !mail-mta/esmtp
- !mail-mta/exim
- !mail-mta/mini-qmail
- !mail-mta/msmtp[mta]
- !mail-mta/netqmail
- !mail-mta/nullmailer
- !mail-mta/qmail-ldap
- !mail-mta/sendmail
- !mail-mta/opensmtpd
- !=mail-mta/ssmtp-2.64-r2[mta]
- !net-mail/fastforward
- selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
- # Add postfix, postdrop user/group (bug #77565)
- enewgroup postfix 207
- enewgroup postdrop 208
- enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
- default
- sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
- src/util/sys_defs.h || die "sed failed"
- # change default paths to better comply with portage standard paths
- sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
- eapply -p0 "${FILESDIR}/${PN}-libressl.patch" \
- "${FILESDIR}/${PN}-libressl-runtime.patch" \
- "${FILESDIR}/${PN}-libressl-eccurve.patch"
-}
-
-src_configure() {
- for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
- do
- local AUXLIBS_${name}=""
- done
-
- # Make sure LDFLAGS get passed down to the executables.
- local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
- AUXLIBS_PCRE="$(pcre-config --libs)"
-
- use pam && mylibs="${mylibs} -lpam"
-
- if use ldap; then
- mycc="${mycc} -DHAS_LDAP"
- AUXLIBS_LDAP="-lldap -llber"
- fi
-
- if use mysql; then
- mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
- AUXLIBS_MYSQL="$(mysql_config --libs)"
- fi
-
- if use postgres; then
- mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
- AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
- fi
-
- if use sqlite; then
- mycc="${mycc} -DHAS_SQLITE"
- AUXLIBS_SQLITE="-lsqlite3 -lpthread"
- fi
-
- if use ssl; then
- mycc="${mycc} -DUSE_TLS"
- mylibs="${mylibs} -lssl -lcrypto"
- fi
-
- if use lmdb; then
- mycc="${mycc} -DHAS_LMDB"
- AUXLIBS_LMDB="-llmdb -lpthread"
- fi
-
- if ! use eai; then
- mycc="${mycc} -DNO_EAI"
- fi
-
- # broken. and "in other words, not supported" by upstream.
- # Use inet_protocols setting in main.cf
- #if ! use ipv6; then
- # mycc="${mycc} -DNO_IPV6"
- #fi
-
- if use sasl; then
- if use dovecot-sasl; then
- # Set dovecot as default.
- mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
- fi
- if use ldap-bind; then
- mycc="${mycc} -DUSE_LDAP_SASL"
- fi
- mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
- mylibs="${mylibs} -lsasl2"
- elif use dovecot-sasl; then
- mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
- fi
-
- if ! use nis; then
- mycc="${mycc} -DNO_NIS"
- fi
-
- if ! use berkdb; then
- mycc="${mycc} -DNO_DB"
- if use cdb; then
- # change default hash format from Berkeley DB to cdb
- mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
- fi
- fi
-
- if use cdb; then
- mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
- # Tinycdb is preferred.
- if has_version dev-db/tinycdb ; then
- einfo "Building with dev-db/tinycdb"
- AUXLIBS_CDB="-lcdb"
- else
- einfo "Building with dev-db/cdb"
- CDB_PATH="/usr/$(get_libdir)"
- for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
- AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
- done
- fi
- fi
-
- # Robin H. Johnson 17/Nov/2006
- # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
- mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
- filter-lfs-flags
-
- # Workaround for bug #76512
- if use hardened; then
- [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
- fi
-
- # Remove annoying C++ comment style warnings - bug #378099
- append-flags -Wno-comment
-
- sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
- sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
- emake makefiles shared=yes dynamicmaps=no pie=yes \
- shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
- DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
- AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
- AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
- AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
- AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install () {
- LD_LIBRARY_PATH="${S}/lib" \
- /bin/sh postfix-install \
- -non-interactive \
- install_root="${D}" \
- config_directory="/etc/postfix" \
- manpage_directory="/usr/share/man" \
- command_directory="/usr/sbin" \
- mailq_path="/usr/bin/mailq" \
- newaliases_path="/usr/bin/newaliases" \
- sendmail_path="/usr/sbin/sendmail" \
- || die "postfix-install failed"
-
- # Fix spool removal on upgrade
- rm -Rf "${D}"/var
- keepdir /var/spool/postfix
-
- # Install rmail for UUCP, closes bug #19127
- dobin auxiliary/rmail/rmail
-
- # Provide another link for legacy FSH
- dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
- # Install qshape, posttls-finger and collate
- dobin auxiliary/qshape/qshape.pl
- doman man/man1/qshape.1
- dobin bin/posttls-finger
- doman man/man1/posttls-finger.1
- dobin auxiliary/collate/collate.pl
- newdoc auxiliary/collate/README README.collate
-
- # Performance tuning tools and their manuals
- dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
- doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
- keepdir /etc/postfix
- keepdir /etc/postfix/postfix-files.d
- if use mbox; then
- mypostconf="mail_spool_directory=/var/spool/mail"
- else
- mypostconf="home_mailbox=.maildir/"
- fi
- LD_LIBRARY_PATH="${S}/lib" \
- "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
- -e ${mypostconf} || die "postconf failed"
-
- insinto /etc/postfix
- newins "${FILESDIR}"/smtp.pass saslpass
- fperms 600 /etc/postfix/saslpass
-
- newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
- # do not start mysql/postgres unnecessarily - bug #359913
- use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
- use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
- dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
- mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
- # postfix set-permissions expects uncompressed man files
- docompress -x /usr/share/man
-
- pamd_mimic_system smtp auth account
-
- if use sasl; then
- insinto /etc/sasl2
- newins "${FILESDIR}"/smtp.sasl smtpd.conf
- fi
-
- # header files
- insinto /usr/include/postfix
- doins include/*.h
-
- if has_version mail-mta/postfix; then
- # let the sysadmin decide when to change the compatibility_level
- sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
- fi
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
- if [[ ! -e /etc/mail/aliases.db ]] ; then
- ewarn
- ewarn "You must edit /etc/mail/aliases to suit your needs"
- ewarn "and then run /usr/bin/newaliases. Postfix will not"
- ewarn "work correctly without it."
- ewarn
- fi
-
- # check and fix file permissions
- "${EROOT}"/usr/sbin/postfix set-permissions
-
- # configure tls
- if use ssl ; then
- if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
- elog "To configure client side TLS settings:"
- elog "${EROOT}"usr/sbin/postfix tls enable-client
- fi
- if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
- elog "To configure server side TLS settings:"
- elog "${EROOT}"usr/sbin/postfix tls enable-server
- fi
- fi
-}
diff --git a/mail-mta/postfix/postfix-3.3.4.ebuild b/mail-mta/postfix/postfix-3.3.4.ebuild
deleted file mode 100644
index 0cd7f819f752..000000000000
--- a/mail-mta/postfix/postfix-3.3.4.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic pam systemd toolchain-funcs user
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND=">=dev-libs/libpcre-3.4
- dev-lang/perl
- berkdb? ( >=sys-libs/db-3.2:* )
- cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
- eai? ( dev-libs/icu:= )
- ldap? ( net-nds/openldap )
- ldap-bind? ( net-nds/openldap[sasl] )
- lmdb? ( >=dev-db/lmdb-0.9.11 )
- mysql? ( dev-db/mysql-connector-c:0= )
- nis? ( net-libs/libnsl )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )"
-
-RDEPEND="${DEPEND}
- memcached? ( net-misc/memcached )
- net-mail/mailbase
- !mail-mta/courier
- !mail-mta/esmtp
- !mail-mta/exim
- !mail-mta/mini-qmail
- !mail-mta/msmtp[mta]
- !mail-mta/netqmail
- !mail-mta/nullmailer
- !mail-mta/qmail-ldap
- !mail-mta/sendmail
- !mail-mta/opensmtpd
- !=mail-mta/ssmtp-2.64-r2[mta]
- !net-mail/fastforward
- selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
- # Add postfix, postdrop user/group (bug #77565)
- enewgroup postfix 207
- enewgroup postdrop 208
- enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
- default
- sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
- src/util/sys_defs.h || die "sed failed"
- # change default paths to better comply with portage standard paths
- sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
- eapply "${FILESDIR}/${PN}-linux-5.patch"
- eapply -p0 "${FILESDIR}/${PN}-libressl.patch" \
- "${FILESDIR}/${PN}-libressl-runtime.patch" \
- "${FILESDIR}/${PN}-libressl-eccurve.patch" \
- "${FILESDIR}/${PN}-libressl-session-tickets.patch"
-}
-
-src_configure() {
- for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
- do
- local AUXLIBS_${name}=""
- done
-
- # Make sure LDFLAGS get passed down to the executables.
- local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
- AUXLIBS_PCRE="$(pcre-config --libs)"
-
- use pam && mylibs="${mylibs} -lpam"
-
- if use ldap; then
- mycc="${mycc} -DHAS_LDAP"
- AUXLIBS_LDAP="-lldap -llber"
- fi
-
- if use mysql; then
- mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
- AUXLIBS_MYSQL="$(mysql_config --libs)"
- fi
-
- if use postgres; then
- mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
- AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
- fi
-
- if use sqlite; then
- mycc="${mycc} -DHAS_SQLITE"
- AUXLIBS_SQLITE="-lsqlite3 -lpthread"
- fi
-
- if use ssl; then
- mycc="${mycc} -DUSE_TLS"
- mylibs="${mylibs} -lssl -lcrypto"
- fi
-
- if use lmdb; then
- mycc="${mycc} -DHAS_LMDB"
- AUXLIBS_LMDB="-llmdb -lpthread"
- fi
-
- if ! use eai; then
- mycc="${mycc} -DNO_EAI"
- fi
-
- # broken. and "in other words, not supported" by upstream.
- # Use inet_protocols setting in main.cf
- #if ! use ipv6; then
- # mycc="${mycc} -DNO_IPV6"
- #fi
-
- if use sasl; then
- if use dovecot-sasl; then
- # Set dovecot as default.
- mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
- fi
- if use ldap-bind; then
- mycc="${mycc} -DUSE_LDAP_SASL"
- fi
- mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
- mylibs="${mylibs} -lsasl2"
- elif use dovecot-sasl; then
- mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
- fi
-
- if ! use nis; then
- mycc="${mycc} -DNO_NIS"
- fi
-
- if ! use berkdb; then
- mycc="${mycc} -DNO_DB"
- if use cdb; then
- # change default hash format from Berkeley DB to cdb
- mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
- fi
- fi
-
- if use cdb; then
- mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
- # Tinycdb is preferred.
- if has_version dev-db/tinycdb ; then
- einfo "Building with dev-db/tinycdb"
- AUXLIBS_CDB="-lcdb"
- else
- einfo "Building with dev-db/cdb"
- CDB_PATH="/usr/$(get_libdir)"
- for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
- AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
- done
- fi
- fi
-
- # Robin H. Johnson 17/Nov/2006
- # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
- mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
- filter-lfs-flags
-
- # Workaround for bug #76512
- if use hardened; then
- [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
- fi
-
- # Remove annoying C++ comment style warnings - bug #378099
- append-flags -Wno-comment
-
- sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
- sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
- emake makefiles shared=yes dynamicmaps=no pie=yes \
- shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
- DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
- AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
- AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
- AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
- AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install () {
- LD_LIBRARY_PATH="${S}/lib" \
- /bin/sh postfix-install \
- -non-interactive \
- install_root="${D}" \
- config_directory="/etc/postfix" \
- manpage_directory="/usr/share/man" \
- command_directory="/usr/sbin" \
- mailq_path="/usr/bin/mailq" \
- newaliases_path="/usr/bin/newaliases" \
- sendmail_path="/usr/sbin/sendmail" \
- || die "postfix-install failed"
-
- # Fix spool removal on upgrade
- rm -Rf "${D}"/var
- keepdir /var/spool/postfix
-
- # Install rmail for UUCP, closes bug #19127
- dobin auxiliary/rmail/rmail
-
- # Provide another link for legacy FSH
- dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
- # Install qshape, posttls-finger and collate
- dobin auxiliary/qshape/qshape.pl
- doman man/man1/qshape.1
- dobin bin/posttls-finger
- doman man/man1/posttls-finger.1
- dobin auxiliary/collate/collate.pl
- newdoc auxiliary/collate/README README.collate
-
- # Performance tuning tools and their manuals
- dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
- doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
- # Set proper permissions on required files/directories
- keepdir /var/lib/postfix
- fowners -R postfix:postfix /var/lib/postfix
- fperms 0750 /var/lib/postfix
- fowners root:postdrop /usr/sbin/post{drop,queue}
- fperms 02755 /usr/sbin/post{drop,queue}
-
- keepdir /etc/postfix
- keepdir /etc/postfix/postfix-files.d
- if use mbox; then
- mypostconf="mail_spool_directory=/var/spool/mail"
- else
- mypostconf="home_mailbox=.maildir/"
- fi
- LD_LIBRARY_PATH="${S}/lib" \
- "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
- -e ${mypostconf} || die "postconf failed"
-
- insinto /etc/postfix
- newins "${FILESDIR}"/smtp.pass saslpass
- fperms 600 /etc/postfix/saslpass
-
- newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
- # do not start mysql/postgres unnecessarily - bug #359913
- use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
- use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
- dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
- mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
- # postfix set-permissions expects uncompressed man files
- docompress -x /usr/share/man
-
- pamd_mimic_system smtp auth account
-
- if use sasl; then
- insinto /etc/sasl2
- newins "${FILESDIR}"/smtp.sasl smtpd.conf
- fi
-
- # header files
- insinto /usr/include/postfix
- doins include/*.h
-
- if has_version mail-mta/postfix; then
- # let the sysadmin decide when to change the compatibility_level
- sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
- fi
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
- if [[ ! -e /etc/mail/aliases.db ]] ; then
- ewarn
- ewarn "You must edit /etc/mail/aliases to suit your needs"
- ewarn "and then run /usr/bin/newaliases. Postfix will not"
- ewarn "work correctly without it."
- ewarn
- fi
-
- # check and fix file permissions
- "${EROOT}"/usr/sbin/postfix set-permissions
-
- # configure tls
- if use ssl ; then
- if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
- elog "To configure client side TLS settings:"
- elog "${EROOT}"usr/sbin/postfix tls enable-client
- fi
- if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
- elog "To configure server side TLS settings:"
- elog "${EROOT}"usr/sbin/postfix tls enable-server
- fi
- fi
-}
diff --git a/mail-mta/postfix/postfix-3.4.5.ebuild b/mail-mta/postfix/postfix-3.4.5.ebuild
deleted file mode 100644
index 6b1a50eca24e..000000000000
--- a/mail-mta/postfix/postfix-3.4.5.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic pam systemd toolchain-funcs user
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND=">=dev-libs/libpcre-3.4
- dev-lang/perl
- berkdb? ( >=sys-libs/db-3.2:* )
- cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
- eai? ( dev-libs/icu:= )
- ldap? ( net-nds/openldap )
- ldap-bind? ( net-nds/openldap[sasl] )
- lmdb? ( >=dev-db/lmdb-0.9.11 )
- mysql? ( dev-db/mysql-connector-c:0= )
- nis? ( net-libs/libnsl )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )"
-
-RDEPEND="${DEPEND}
- memcached? ( net-misc/memcached )
- net-mail/mailbase
- !mail-mta/courier
- !mail-mta/esmtp
- !mail-mta/exim
- !mail-mta/mini-qmail
- !mail-mta/msmtp[mta]
- !mail-mta/netqmail
- !mail-mta/nullmailer
- !mail-mta/qmail-ldap
- !mail-mta/sendmail
- !mail-mta/opensmtpd
- !=mail-mta/ssmtp-2.64-r2[mta]
- !net-mail/fastforward
- selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
- if use libressl; then
- die "LibreSSL patches are not yet available for postfix-3.4 releases."
- fi
- # Add postfix, postdrop user/group (bug #77565)
- enewgroup postfix 207
- enewgroup postdrop 208
- enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
- default
- sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
- src/util/sys_defs.h || die "sed failed"
- # change default paths to better comply with portage standard paths
- sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
- # libressl support needs work for postfix-3.4
- #eapply -p0 "${FILESDIR}/${PN}-libressl.patch" \
- # "${FILESDIR}/${PN}-libressl-runtime.patch" \
- # "${FILESDIR}/${PN}-libressl-eccurve.patch"
- # "${FILESDIR}/${PN}-libressl-session-tickets.patch"
-}
-
-src_configure() {
- for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
- do
- local AUXLIBS_${name}=""
- done
-
- # Make sure LDFLAGS get passed down to the executables.
- local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
- AUXLIBS_PCRE="$(pcre-config --libs)"
-
- use pam && mylibs="${mylibs} -lpam"
-
- if use ldap; then
- mycc="${mycc} -DHAS_LDAP"
- AUXLIBS_LDAP="-lldap -llber"
- fi
-
- if use mysql; then
- mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
- AUXLIBS_MYSQL="$(mysql_config --libs)"
- fi
-
- if use postgres; then
- mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
- AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
- fi
-
- if use sqlite; then
- mycc="${mycc} -DHAS_SQLITE"
- AUXLIBS_SQLITE="-lsqlite3 -lpthread"
- fi
-
- if use ssl; then
- mycc="${mycc} -DUSE_TLS"
- mylibs="${mylibs} -lssl -lcrypto"
- fi
-
- if use lmdb; then
- mycc="${mycc} -DHAS_LMDB"
- AUXLIBS_LMDB="-llmdb -lpthread"
- fi
-
- if ! use eai; then
- mycc="${mycc} -DNO_EAI"
- fi
-
- # broken. and "in other words, not supported" by upstream.
- # Use inet_protocols setting in main.cf
- #if ! use ipv6; then
- # mycc="${mycc} -DNO_IPV6"
- #fi
-
- if use sasl; then
- if use dovecot-sasl; then
- # Set dovecot as default.
- mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
- fi
- if use ldap-bind; then
- mycc="${mycc} -DUSE_LDAP_SASL"
- fi
- mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
- mylibs="${mylibs} -lsasl2"
- elif use dovecot-sasl; then
- mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
- fi
-
- if ! use nis; then
- mycc="${mycc} -DNO_NIS"
- fi
-
- if ! use berkdb; then
- mycc="${mycc} -DNO_DB"
- if use cdb; then
- # change default hash format from Berkeley DB to cdb
- mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
- fi
- fi
-
- if use cdb; then
- mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
- # Tinycdb is preferred.
- if has_version dev-db/tinycdb ; then
- einfo "Building with dev-db/tinycdb"
- AUXLIBS_CDB="-lcdb"
- else
- einfo "Building with dev-db/cdb"
- CDB_PATH="/usr/$(get_libdir)"
- for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
- AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
- done
- fi
- fi
-
- # Robin H. Johnson 17/Nov/2006
- # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
- mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
- filter-lfs-flags
-
- # Workaround for bug #76512
- if use hardened; then
- [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
- fi
-
- # Remove annoying C++ comment style warnings - bug #378099
- append-flags -Wno-comment
-
- sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
- sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
- emake makefiles shared=yes dynamicmaps=no pie=yes \
- shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
- DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
- AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
- AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
- AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
- AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install () {
- LD_LIBRARY_PATH="${S}/lib" \
- /bin/sh postfix-install \
- -non-interactive \
- install_root="${D}" \
- config_directory="/etc/postfix" \
- manpage_directory="/usr/share/man" \
- command_directory="/usr/sbin" \
- mailq_path="/usr/bin/mailq" \
- newaliases_path="/usr/bin/newaliases" \
- sendmail_path="/usr/sbin/sendmail" \
- || die "postfix-install failed"
-
- # Fix spool removal on upgrade
- rm -Rf "${D}"/var
- keepdir /var/spool/postfix
-
- # Install rmail for UUCP, closes bug #19127
- dobin auxiliary/rmail/rmail
-
- # Provide another link for legacy FSH
- dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
- # Install qshape, posttls-finger and collate
- dobin auxiliary/qshape/qshape.pl
- doman man/man1/qshape.1
- dobin bin/posttls-finger
- doman man/man1/posttls-finger.1
- dobin auxiliary/collate/collate.pl
- newdoc auxiliary/collate/README README.collate
-
- # Performance tuning tools and their manuals
- dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
- doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
- # Set proper permissions on required files/directories
- keepdir /var/lib/postfix
- fowners -R postfix:postfix /var/lib/postfix
- fperms 0750 /var/lib/postfix
- fowners root:postdrop /usr/sbin/post{drop,queue}
- fperms 02755 /usr/sbin/post{drop,queue}
-
- keepdir /etc/postfix
- keepdir /etc/postfix/postfix-files.d
- if use mbox; then
- mypostconf="mail_spool_directory=/var/spool/mail"
- else
- mypostconf="home_mailbox=.maildir/"
- fi
- LD_LIBRARY_PATH="${S}/lib" \
- "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
- -e ${mypostconf} || die "postconf failed"
-
- insinto /etc/postfix
- newins "${FILESDIR}"/smtp.pass saslpass
- fperms 600 /etc/postfix/saslpass
-
- newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
- # do not start mysql/postgres unnecessarily - bug #359913
- use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
- use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
- dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
- mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
- # postfix set-permissions expects uncompressed man files
- docompress -x /usr/share/man
-
- pamd_mimic_system smtp auth account
-
- if use sasl; then
- insinto /etc/sasl2
- newins "${FILESDIR}"/smtp.sasl smtpd.conf
- fi
-
- # header files
- insinto /usr/include/postfix
- doins include/*.h
-
- if has_version mail-mta/postfix; then
- # let the sysadmin decide when to change the compatibility_level
- sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
- fi
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
- if has_version '=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ abi_x86_32? ( dev-lang/nasm )
+"
+BDEPEND="
+ app-arch/xz-utils
+ virtual/pkgconfig
+ !elibc_uclibc? ( sys-devel/gettext )
+"
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --disable-doxygen-docs
+ --disable-examples
+ --disable-xmms-plugin
+ $([[ ${CHOST} == *-darwin* ]] && echo "--disable-asm-optimizations")
+ $(use_enable altivec)
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable cxx cpplibs)
+ $(use_enable debug)
+ $(use_enable ogg)
+ $(use_enable static-libs static)
+
+ # cross-compile fix (bug #521446)
+ # no effect if ogg support is disabled
+ --with-ogg
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+ if [[ ${UID} != 0 ]]; then
+ emake -j1 check
+ else
+ ewarn "Tests will fail if ran as root, skipping."
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/libbluray/libbluray-1.1.2.ebuild b/media-libs/libbluray/libbluray-1.1.2.ebuild
index 063a4718742b..cc5173455c29 100644
--- a/media-libs/libbluray/libbluray-1.1.2.ebuild
+++ b/media-libs/libbluray/libbluray-1.1.2.ebuild
@@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
else
- KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
fi
diff --git a/media-libs/libvpx/files/libvpx-1.8.0-ppc64le-disable-vsx.patch b/media-libs/libvpx/files/libvpx-1.8.0-ppc64le-disable-vsx.patch
new file mode 100644
index 000000000000..5c6a36ca8670
--- /dev/null
+++ b/media-libs/libvpx/files/libvpx-1.8.0-ppc64le-disable-vsx.patch
@@ -0,0 +1,28 @@
+From 7bf48f92e884fc01c28a4652ea0883b28744519d Mon Sep 17 00:00:00 2001
+From: Johann
+Date: Mon, 10 Jun 2019 14:35:03 -0700
+Subject: [PATCH] ppc: disable vsx optimizations with hbd
+
+vsx optimizations do not support 32 bit tran_low_t values.
+
+BUG=webm:1563
+
+Change-Id: I9e6348078f6e4855acfd381133eb840a435b7f81
+---
+
+diff --git a/build/make/configure.sh b/build/make/configure.sh
+index e950353..4a874f1 100644
+--- a/build/make/configure.sh
++++ b/build/make/configure.sh
+@@ -1239,7 +1239,10 @@
+ ppc64le*)
+ link_with_cc=gcc
+ setup_gnu_toolchain
+- check_gcc_machine_option "vsx"
++ # Only enable vsx optimizations when vp9_highbitdepth is not enabled.
++ # https://bugs.chromium.org/p/webm/issues/detail?id=1538
++ enabled vp9_highbitdepth || check_gcc_machine_option "vsx"
++ enabled vsx || RTCD_OPTIONS="${RTCD_OPTIONS}--disable-vsx "
+ if [ -n "${tune_cpu}" ]; then
+ case ${tune_cpu} in
+ power?)
diff --git a/media-libs/libvpx/libvpx-1.8.0-r1.ebuild b/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
index b75c00c5ca4f..c45449b70d2d 100644
--- a/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
+++ b/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
@@ -42,6 +42,7 @@ DEPEND="abi_x86_32? ( dev-lang/yasm )
PATCHES=(
"${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
+ "${FILESDIR}/libvpx-1.8.0-ppc64le-disable-vsx.patch" #688138
)
src_configure() {
diff --git a/media-libs/libvpx/libvpx-1.8.0.ebuild b/media-libs/libvpx/libvpx-1.8.0.ebuild
index 73214ce5133d..cc1164e1ea8e 100644
--- a/media-libs/libvpx/libvpx-1.8.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.8.0.ebuild
@@ -46,6 +46,7 @@ DEPEND="abi_x86_32? ( dev-lang/yasm )
PATCHES=(
"${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
+ "${FILESDIR}/libvpx-1.8.0-ppc64le-disable-vsx.patch" #688138
)
src_configure() {
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index ef0c1c24e2f3..3bbd7ac2972f 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,2 +1,3 @@
DIST mesa-19.0.8.tar.xz 11967592 BLAKE2B 91a46b67bdb8cb3ab4c7337be7c2b0dc6ab5ec8cc126afc2d8af8d056bff0392a5b443c26304bf4c68472eb6ba16d29ca248c1fc0c0f2dd6af03d3e10d3ec1b3 SHA512 fbddc3a74f223564343027380af776b3fa5d63fe1af4e34121273235d1c6eced96439f601eb19bf658eb927aff3965b520f0329fcbd4650f3112167303e1746d
DIST mesa-19.1.3.tar.xz 10935604 BLAKE2B 4dfda4b3ef7a2d53b20a7a0c81b08901d6b88431b6b56679b8d97d6f2f57ce18f6dcdbae9b79c5d02b9175f47db629833da6012658295fe456829ef07a5ff087 SHA512 787310c43089142209ff7db298489b0815b630577680d5ce1bc3f796eed3772ba41f03e5e773b77ae084c191ed4e365eac1753166ce60f12b8f5974d55762eeb
+DIST mesa-19.1.4.tar.xz 10938008 BLAKE2B 4745fc7e844397378fe1adf61bcd5b54aad11ec0b375ced85fd80ced01227432b491ad8b7ba7d9013190cfbb451bc11cdb7c8af0e1f298dd5d793d3ce43aa92b SHA512 234032d917c9b378c3f6ceb921677b64e549344c3957331810b50fd73e0dccd2f4f62e2bd39e619590f389bc58fdab10fab4b88f7c117557cbeb1dda049b9fc5
diff --git a/media-libs/mesa/mesa-19.1.4.ebuild b/media-libs/mesa/mesa-19.1.4.ebuild
new file mode 100644
index 000000000000..0fd4ae716a5f
--- /dev/null
+++ b/media-libs/mesa/mesa-19.1.4.ebuild
@@ -0,0 +1,540 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+ EXPERIMENTAL="true"
+ inherit git-r3
+else
+ SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+ !test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+ +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+ lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+ vdpau vulkan vulkan-overlay wayland xa xvmc"
+
+REQUIRED_USE="
+ d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+ gles1? ( egl )
+ gles2? ( egl )
+ vulkan? ( dri3
+ || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+ video_cards_radeonsi? ( llvm ) )
+ vulkan-overlay? ( vulkan )
+ wayland? ( egl gbm )
+ video_cards_freedreno? ( gallium )
+ video_cards_intel? ( classic )
+ video_cards_i915? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
+ video_cards_iris? ( gallium )
+ video_cards_nouveau? ( || ( classic gallium ) )
+ video_cards_radeon? ( || ( classic gallium )
+ gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+ video_cards_r100? ( classic )
+ video_cards_r200? ( classic )
+ video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
+ video_cards_r600? ( gallium )
+ video_cards_radeonsi? ( gallium llvm )
+ video_cards_vc4? ( gallium )
+ video_cards_virgl? ( gallium )
+ video_cards_vivante? ( gallium gbm )
+ video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+ !app-eselect/eselect-mesa
+ >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ libglvnd? (
+ media-libs/libglvnd[${MULTILIB_USEDEP}]
+ !app-eselect/eselect-opengl
+ )
+ !libglvnd? (
+ >=app-eselect/eselect-opengl-1.3.0
+ )
+ gallium? (
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ llvm? (
+ video_cards_radeonsi? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_r600? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_radeon? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ )
+ lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+ opencl? (
+ dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+ dev-libs/libclc
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ vaapi? (
+ >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+ video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+ )
+ vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+ )
+ wayland? (
+ >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.8
+ )
+ ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+ video_cards_intel? (
+ !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ )
+ video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+ RDEPEND="${RDEPEND}
+ video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+ "
+done
+RDEPEND="${RDEPEND}
+ video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="9"
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:9[${MULTILIB_USEDEP}]
+ sys-devel/llvm:8[${MULTILIB_USEDEP}]
+ sys-devel/llvm:7[${MULTILIB_USEDEP}]
+ )
+ sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+ llvm? (
+ opencl? (
+ video_cards_r600? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${CLANG_DEPSTR}
+ )
+ )
+ )
+ )
+ !opencl? (
+ video_cards_r600? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${LLVM_DEPSTR}
+ )
+ )
+ )
+ )
+ )
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+ valgrind? ( dev-util/valgrind )
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-base/xorg-proto
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ opencl? (
+ >=sys-devel/gcc-4.6
+ )
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+ !pic? (
+ usr/lib*/libglapi.so.0.0.0
+ usr/lib*/libGLESv1_CM.so.1.0.0
+ usr/lib*/libGLESv2.so.2.0.0
+ usr/lib*/libGL.so.1.2.0
+ usr/lib*/libOSMesa.so.8.0.0
+ )
+)"
+
+llvm_check_deps() {
+ local flags=${MULTILIB_USEDEP}
+ if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+ then
+ flags+=",llvm_targets_AMDGPU(-)"
+ fi
+
+ if use opencl; then
+ has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+ fi
+ has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+ if use opencl; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi; then
+ ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi"
+ fi
+ fi
+
+ if use vaapi; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use vdpau; then
+ if ! use video_cards_r300 &&
+ ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use xa; then
+ if ! use video_cards_freedreno &&
+ ! use video_cards_nouveau &&
+ ! use video_cards_vmware; then
+ ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+ fi
+ fi
+
+ if use xvmc; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau"
+ fi
+ fi
+
+ if ! use gallium; then
+ use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+ use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
+ use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
+ use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
+ use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
+ use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
+ use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
+ fi
+
+ if ! use llvm; then
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
+ fi
+}
+
+python_check_deps() {
+ has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ # warning message for bug 459306
+ if use llvm && has_version sys-devel/llvm[!debug=]; then
+ ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+ ewarn "detected! This can cause problems. For details, see bug 459306."
+ fi
+
+ if use llvm; then
+ llvm_pkg_setup
+ fi
+ python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+ local emesonargs=()
+
+ if use classic; then
+ # Intel code
+ dri_driver_enable video_cards_i915 i915
+ dri_driver_enable video_cards_i965 i965
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ dri_driver_enable video_cards_intel i915 i965
+ fi
+
+ # Nouveau code
+ dri_driver_enable video_cards_nouveau nouveau
+
+ # ATI code
+ dri_driver_enable video_cards_r100 r100
+ dri_driver_enable video_cards_r200 r200
+ if ! use video_cards_r100 && \
+ ! use video_cards_r200; then
+ dri_driver_enable video_cards_radeon r100 r200
+ fi
+ fi
+
+ emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+ if use gallium; then
+ emesonargs+=(
+ $(meson_use llvm)
+ $(meson_use lm_sensors lmsensors)
+ $(meson_use unwind libunwind)
+ )
+
+ if use video_cards_iris ||
+ use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use d3d9 gallium-nine))
+ else
+ emesonargs+=(-Dgallium-nine=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use vaapi gallium-va))
+ use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+ else
+ emesonargs+=(-Dgallium-va=false)
+ fi
+
+ if use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use vdpau gallium-vdpau))
+ else
+ emesonargs+=(-Dgallium-vdpau=false)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use xa gallium-xa))
+ else
+ emesonargs+=(-Dgallium-xa=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use xvmc gallium-xvmc))
+ else
+ emesonargs+=(-Dgallium-xvmc=false)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_vc4 ||
+ use video_cards_vivante; then
+ gallium_enable -- kmsro
+ fi
+
+ gallium_enable video_cards_vc4 vc4
+ gallium_enable video_cards_vivante etnaviv
+ gallium_enable video_cards_vmware svga
+ gallium_enable video_cards_nouveau nouveau
+
+ # Only one i915 driver (classic vs gallium). Default to classic.
+ if ! use classic; then
+ gallium_enable video_cards_i915 i915
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ gallium_enable video_cards_intel i915
+ fi
+ fi
+
+ gallium_enable video_cards_iris iris
+
+ gallium_enable video_cards_r300 r300
+ gallium_enable video_cards_r600 r600
+ gallium_enable video_cards_radeonsi radeonsi
+ if ! use video_cards_r300 && \
+ ! use video_cards_r600; then
+ gallium_enable video_cards_radeon r300 r600
+ fi
+
+ gallium_enable video_cards_freedreno freedreno
+ gallium_enable video_cards_virgl virgl
+
+ # opencl stuff
+ emesonargs+=(
+ -Dgallium-opencl="$(usex opencl icd disabled)"
+ )
+ fi
+
+ if use vulkan; then
+ vulkan_enable video_cards_i965 intel
+ vulkan_enable video_cards_iris intel
+ vulkan_enable video_cards_radeonsi amd
+ fi
+
+ # x86 hardened pax_kernel needs glx-rts, bug 240956
+ if [[ ${ABI} == x86 ]]; then
+ emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+ fi
+
+ # on abi_x86_32 hardened we need to have asm disable
+ if [[ ${ABI} == x86* ]] && use pic; then
+ emesonargs+=( -Dasm=false )
+ fi
+
+ if use gallium; then
+ gallium_enable -- swrast
+ emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+ else
+ dri_driver_enable -- swrast
+ emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+ fi
+
+ driver_list() {
+ local drivers="$(sort -u <<< "${1// /$'\n'}")"
+ echo "${drivers//$'\n'/,}"
+ }
+
+ emesonargs+=(
+ $(meson_use test build-tests)
+ -Dglx=dri
+ -Dshared-glapi=true
+ $(meson_use dri3)
+ $(meson_use egl)
+ $(meson_use gbm)
+ $(meson_use gles1)
+ $(meson_use gles2)
+ $(meson_use libglvnd glvnd)
+ $(meson_use selinux)
+ -Dvalgrind=$(usex valgrind auto false)
+ -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+ -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+ -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+ $(meson_use vulkan-overlay vulkan-overlay-layer)
+ --buildtype $(usex debug debug plain)
+ -Db_ndebug=$(usex debug false true)
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_install() {
+ meson_src_install
+
+ use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+ einstalldocs
+}
+
+multilib_src_test() {
+ meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+ # Switch to the xorg implementation.
+ echo
+ eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ DRI_DRIVERS+=("$@")
+ fi
+}
+
+gallium_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ GALLIUM_DRIVERS+=("$@")
+ fi
+}
+
+vulkan_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ VULKAN_DRIVERS+=("$@")
+ fi
+}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index f3ac7e582984..3bb3c560eba4 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/hexter/hexter-1.1.0.ebuild b/media-plugins/hexter/hexter-1.1.0.ebuild
index 868f59e31325..0b90f9ea2b75 100644
--- a/media-plugins/hexter/hexter-1.1.0.ebuild
+++ b/media-plugins/hexter/hexter-1.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/smbolton/${PN}/releases/download/version_${PV}/${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="gtk2 readline"
BDEPEND="
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 11299cada681..63663b25faaa 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/qsynth/qsynth-0.5.6.ebuild b/media-sound/qsynth/qsynth-0.5.6.ebuild
index e4f0b6bb00dc..f92252f7a460 100644
--- a/media-sound/qsynth/qsynth-0.5.6.ebuild
+++ b/media-sound/qsynth/qsynth-0.5.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
BDEPEND="
dev-qt/linguist-tools:5
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f2e6e8c88298..6cbd98a82c8a 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 8e55ee77fbaf..67cee596385e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Aug 2019 08:39:03 +0000
+Thu, 08 Aug 2019 09:08:49 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8e55ee77fbaf..67cee596385e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Aug 2019 08:39:03 +0000
+Thu, 08 Aug 2019 09:08:49 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index fa419e10d5a0..a04dfd46f009 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index c5b48d01d20a..8bb4346c3475 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/minecraft-0 b/metadata/md5-cache/acct-group/minecraft-0
new file mode 100644
index 000000000000..2d70358c810e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/minecraft-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=A group for the Minecraft server
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group 7492872b6eb7bc0267595a831befa7ba user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
+_md5_=0ac2f37208671fa68c6faeb53e64a554
diff --git a/metadata/md5-cache/acct-group/mysql-0 b/metadata/md5-cache/acct-group/mysql-0
index e8d18fb55404..244b19865c82 100644
--- a/metadata/md5-cache/acct-group/mysql-0
+++ b/metadata/md5-cache/acct-group/mysql-0
@@ -4,4 +4,4 @@ EAPI=7
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
SLOT=0
_eclasses_=acct-group 7492872b6eb7bc0267595a831befa7ba user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
-_md5_=3361c5e311624fe8383f94e81e85c818
+_md5_=d8c9ba10da6756eb6b8d6be422784cf0
diff --git a/metadata/md5-cache/acct-group/unrealircd-0 b/metadata/md5-cache/acct-group/unrealircd-0
new file mode 100644
index 000000000000..2d028355e9ce
--- /dev/null
+++ b/metadata/md5-cache/acct-group/unrealircd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: unrealircd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group 7492872b6eb7bc0267595a831befa7ba user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
+_md5_=260b93e0bc769d63e90462b952aebf54
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 61227136ed5f..22603e77a49f 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/minecraft-0 b/metadata/md5-cache/acct-user/minecraft-0
new file mode 100644
index 000000000000..31d13e3708ec
--- /dev/null
+++ b/metadata/md5-cache/acct-user/minecraft-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the Minecraft server
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/minecraft
+SLOT=0
+_eclasses_=acct-user 4257c71dde1a4622a9e79037d31884ca user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
+_md5_=c18cfc57e0d08d970e7644237883921e
diff --git a/metadata/md5-cache/acct-user/mysql-0 b/metadata/md5-cache/acct-user/mysql-0
index cffb704e818e..a9e0328660ab 100644
--- a/metadata/md5-cache/acct-user/mysql-0
+++ b/metadata/md5-cache/acct-user/mysql-0
@@ -5,4 +5,4 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh spa
RDEPEND=acct-group/mysql
SLOT=0
_eclasses_=acct-user 4257c71dde1a4622a9e79037d31884ca user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
-_md5_=16856efd4aa36aedf0adcc6da44a88ed
+_md5_=2239e70edb93016adb4f07506c64ee6f
diff --git a/metadata/md5-cache/acct-user/unrealircd-0 b/metadata/md5-cache/acct-user/unrealircd-0
new file mode 100644
index 000000000000..08584ca522b5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/unrealircd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: unrealircd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/unrealircd
+SLOT=0
+_eclasses_=acct-user 4257c71dde1a4622a9e79037d31884ca user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
+_md5_=b186b3ee3ae34799a7b3a365e580b64c
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index d9897a8c3191..27d681e76401 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/mcelog-164 b/metadata/md5-cache/app-admin/mcelog-164
new file mode 100644
index 000000000000..22c720a93da9
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mcelog-164
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare pretend setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A tool to log and decode Machine Check Exceptions
+EAPI=6
+HOMEPAGE=http://mcelog.org/
+IUSE=selinux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=selinux? ( sec-policy/selinux-mcelog )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/andikleen/mcelog/archive/v164.tar.gz -> mcelog-164.tar.gz
+_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=84f96ac98e1cfe9e7d93034bd9ed57ab
diff --git a/metadata/md5-cache/app-admin/sshguard-2.1.0-r1 b/metadata/md5-cache/app-admin/sshguard-2.1.0-r1
deleted file mode 100644
index 371964d26f8a..000000000000
--- a/metadata/md5-cache/app-admin/sshguard-2.1.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-devel/flex
-DESCRIPTION=protects hosts from brute force attacks against ssh
-EAPI=6
-HOMEPAGE=http://sshguard.sourceforge.net/
-KEYWORDS=amd64 ~arm x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=virtual/logger
-SLOT=0
-SRC_URI=mirror://sourceforge/sshguard/sshguard-2.1.0.tar.gz
-_md5_=95e72b6fc199494d817fc99950a12db3
diff --git a/metadata/md5-cache/app-admin/sshguard-2.3.1 b/metadata/md5-cache/app-admin/sshguard-2.3.1
deleted file mode 100644
index 5bc3ac8cf7f2..000000000000
--- a/metadata/md5-cache/app-admin/sshguard-2.3.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-devel/flex
-DESCRIPTION=protects hosts from brute force attacks against ssh
-EAPI=7
-HOMEPAGE=https://www.sshguard.net/
-KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=virtual/logger
-SLOT=0
-SRC_URI=mirror://sourceforge/sshguard/sshguard-2.3.1.tar.gz
-_md5_=9e4ce36e64e620a0bcdd55e342b24bc8
diff --git a/metadata/md5-cache/app-admin/sshguard-2.4.0 b/metadata/md5-cache/app-admin/sshguard-2.4.0
index 5797d859b718..2d538dd21980 100644
--- a/metadata/md5-cache/app-admin/sshguard-2.4.0
+++ b/metadata/md5-cache/app-admin/sshguard-2.4.0
@@ -3,9 +3,9 @@ DEPEND=sys-devel/flex
DESCRIPTION=protects hosts from brute force attacks against ssh
EAPI=7
HOMEPAGE=https://www.sshguard.net/
-KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm x86 ~x86-fbsd
LICENSE=BSD
RDEPEND=virtual/logger
SLOT=0
SRC_URI=mirror://sourceforge/sshguard/sshguard-2.4.0.tar.gz
-_md5_=9e4ce36e64e620a0bcdd55e342b24bc8
+_md5_=395cefe1e426d55a5f8bd8327bf4b331
diff --git a/metadata/md5-cache/app-admin/sshguard-99999 b/metadata/md5-cache/app-admin/sshguard-99999
index f50eeb308a46..34305a2487bb 100644
--- a/metadata/md5-cache/app-admin/sshguard-99999
+++ b/metadata/md5-cache/app-admin/sshguard-99999
@@ -9,4 +9,4 @@ PROPERTIES=live
RDEPEND=virtual/logger
SLOT=0
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=4b8c4bf7f636cd5750e8e719cf66ec92
+_md5_=36767db6f0d69c870244a39a9d89ec2f
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 3ab6138f3924..8eaad16f4409 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/lbzip2-2.5_p20181227 b/metadata/md5-cache/app-arch/lbzip2-2.5_p20181227
deleted file mode 100644
index a71d9476cee9..000000000000
--- a/metadata/md5-cache/app-arch/lbzip2-2.5_p20181227
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Parallel bzip2 utility
-EAPI=7
-HOMEPAGE=https://github.com/kjn/lbzip2/
-IUSE=debug symlink
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=symlink? ( !app-arch/pbzip2[symlink] )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~whissi/dist/lbzip2/lbzip2-2.5_p20181227.tar.gz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d3cd13a35f71782562b343da1d8029a6
diff --git a/metadata/md5-cache/app-arch/lbzip2-2.5_p20181227-r1 b/metadata/md5-cache/app-arch/lbzip2-2.5_p20181227-r1
new file mode 100644
index 000000000000..6d6715496f4b
--- /dev/null
+++ b/metadata/md5-cache/app-arch/lbzip2-2.5_p20181227-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Parallel bzip2 utility
+EAPI=7
+HOMEPAGE=https://github.com/kjn/lbzip2/
+IUSE=debug symlink
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=symlink? ( !app-arch/pbzip2[symlink] )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~whissi/dist/lbzip2/lbzip2-2.5_p20181227.tar.gz
+_md5_=21c30489c07f2722a357f9866bfb4e24
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 4b7686a2094a..8c945f3ee54d 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/qxmledit-0.9.12 b/metadata/md5-cache/app-editors/qxmledit-0.9.12
index 171c6eb5f860..b78299aab326 100644
--- a/metadata/md5-cache/app-editors/qxmledit-0.9.12
+++ b/metadata/md5-cache/app-editors/qxmledit-0.9.12
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 d
DESCRIPTION=Simple Qt-based XML editor
EAPI=7
HOMEPAGE=https://qxmledit.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=LGPL-2
RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
SLOT=0
SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.12-src.tgz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 1d91b03d42ab6308b5f4f6b598ed110e qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=ec32ca478d74f78b7f8087e650f7efc6
+_md5_=f9a1451881358e8cd42315739f41df07
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 9d5bae33c0bc..882cc01f7ed8 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/containers-storage-1.12.10 b/metadata/md5-cache/app-emulation/containers-storage-1.12.10
deleted file mode 100644
index d9060d25004c..000000000000
--- a/metadata/md5-cache/app-emulation/containers-storage-1.12.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-libs/glib:= dev-util/ostree:= ) dev-go/go-md2man test? ( sys-fs/btrfs-progs sys-fs/lvm2 sys-apps/util-linux )
-DESCRIPTION=containers/storage library
-EAPI=7
-HOMEPAGE=https://github.com/containers/storage
-IUSE=btrfs +device-mapper ostree test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-libs/glib:= dev-util/ostree:= )
-RESTRICT=test? ( userpriv ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/containers/storage/archive/v1.12.10.tar.gz -> containers-storage-1.12.10.tar.gz https://github.com/pquerna/ffjson/archive/e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz -> github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz
-_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b
-_md5_=149feb948fbd407bec3c1e0443a6560e
diff --git a/metadata/md5-cache/app-emulation/containers-storage-1.12.15 b/metadata/md5-cache/app-emulation/containers-storage-1.12.15
deleted file mode 100644
index e816dfb4d149..000000000000
--- a/metadata/md5-cache/app-emulation/containers-storage-1.12.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-libs/glib:= dev-util/ostree:= ) dev-go/go-md2man test? ( sys-fs/btrfs-progs sys-fs/lvm2 sys-apps/util-linux )
-DESCRIPTION=containers/storage library
-EAPI=7
-HOMEPAGE=https://github.com/containers/storage
-IUSE=btrfs +device-mapper ostree test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-libs/glib:= dev-util/ostree:= )
-RESTRICT=test? ( userpriv ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/containers/storage/archive/v1.12.15.tar.gz -> containers-storage-1.12.15.tar.gz https://github.com/pquerna/ffjson/archive/e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz -> github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz
-_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b
-_md5_=149feb948fbd407bec3c1e0443a6560e
diff --git a/metadata/md5-cache/app-emulation/containers-storage-1.12.16 b/metadata/md5-cache/app-emulation/containers-storage-1.12.16
index 2424bcd028c5..a53580bcb5bb 100644
--- a/metadata/md5-cache/app-emulation/containers-storage-1.12.16
+++ b/metadata/md5-cache/app-emulation/containers-storage-1.12.16
@@ -12,4 +12,4 @@ RESTRICT=test? ( userpriv ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/containers/storage/archive/v1.12.16.tar.gz -> containers-storage-1.12.16.tar.gz https://github.com/pquerna/ffjson/archive/e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz -> github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz
_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b
-_md5_=ff34107fe407d4032ae193b04c75061c
+_md5_=fd41406dfca0ea7940af3a47751f9f3d
diff --git a/metadata/md5-cache/app-emulation/containers-storage-1.12.9 b/metadata/md5-cache/app-emulation/containers-storage-1.13.1
similarity index 83%
rename from metadata/md5-cache/app-emulation/containers-storage-1.12.9
rename to metadata/md5-cache/app-emulation/containers-storage-1.13.1
index 7379ae4216b6..5880aa4f2c49 100644
--- a/metadata/md5-cache/app-emulation/containers-storage-1.12.9
+++ b/metadata/md5-cache/app-emulation/containers-storage-1.13.1
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0
RDEPEND=btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-libs/glib:= dev-util/ostree:= )
RESTRICT=test? ( userpriv ) !test? ( test )
SLOT=0
-SRC_URI=https://github.com/containers/storage/archive/v1.12.9.tar.gz -> containers-storage-1.12.9.tar.gz https://github.com/pquerna/ffjson/archive/e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz -> github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz
+SRC_URI=https://github.com/containers/storage/archive/v1.13.1.tar.gz -> containers-storage-1.13.1.tar.gz https://github.com/pquerna/ffjson/archive/e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz -> github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz
_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b
-_md5_=149feb948fbd407bec3c1e0443a6560e
+_md5_=fd41406dfca0ea7940af3a47751f9f3d
diff --git a/metadata/md5-cache/app-emulation/faudio-19.06 b/metadata/md5-cache/app-emulation/faudio-19.06
index 3565c4af974f..64def0bb457f 100644
--- a/metadata/md5-cache/app-emulation/faudio-19.06
+++ b/metadata/md5-cache/app-emulation/faudio-19.06
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
SLOT=0
SRC_URI=https://github.com/FNA-XNA/FAudio/archive/19.06.tar.gz -> FAudio-19.06.tar.gz
_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 virtualx 53625127887b62eabb9ec61d3d943462 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=c1153d451c728a87361a8f2bae3cb7d3
+_md5_=0c89faf9d54c7ba6c47eb6d0a0f265e1
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-4.12.1 b/metadata/md5-cache/app-emulation/wine-vanilla-4.12.1
index be3a50006224..d92c53847931 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-4.12.1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-4.12.1
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=4.12.1
SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.12.1.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190511.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnome2-utils 532371cfcba45b2ab0d2950547c97d95 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 53625127887b62eabb9ec61d3d943462 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=e13b33c1c00ae17f2a411986b282ab69
+_md5_=fb59e56d68663614484b03dc56738ec6
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-4.13 b/metadata/md5-cache/app-emulation/wine-vanilla-4.13
index 0a493aafda48..481e0eca8300 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-4.13
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-4.13
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=4.13
SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.13.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190511.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnome2-utils 532371cfcba45b2ab0d2950547c97d95 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 53625127887b62eabb9ec61d3d943462 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=e13b33c1c00ae17f2a411986b282ab69
+_md5_=fb59e56d68663614484b03dc56738ec6
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 9e1d8d58ea3d..4ee97a1b01c0 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/ibus-skk-1.4.2 b/metadata/md5-cache/app-i18n/ibus-skk-1.4.2
index 848c5bfb6b99..d5a5e55f89ba 100644
--- a/metadata/md5-cache/app-i18n/ibus-skk-1.4.2
+++ b/metadata/md5-cache/app-i18n/ibus-skk-1.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Japanese SKK engine for IBus
EAPI=6
HOMEPAGE=https://github.com/ueno/ibus-skk
IUSE=nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=GPL-2
RDEPEND=app-i18n/ibus >=app-i18n/libskk-1.0.2 x11-libs/gtk+:3 nls? ( virtual/libintl ) app-i18n/skk-jisyo
SLOT=0
SRC_URI=https://github.com/ueno/ibus-skk/releases/download/ibus-skk-1.4.2/ibus-skk-1.4.2.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vala 682da46cf615b9f7a7d3680058139dcd vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=abebe1c7c8fa870108fd80226847f3d0
+_md5_=0e6fb748f4360f1d6315f4875d764291
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 97d2d3efd7ea..a9db5eb545ac 100644
Binary files a/metadata/md5-cache/app-metrics/Manifest.gz and b/metadata/md5-cache/app-metrics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.1.0 b/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.1.0
new file mode 100644
index 000000000000..1b19b4cd76c3
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-util/promu >=dev-lang/go-1.10
+DESCRIPTION=Elasticsearch stats exporter for Prometheus
+EAPI=6
+HOMEPAGE=https://github.com/justwatchcom/elasticsearch_exporter
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/justwatchcom/elasticsearch_exporter/archive/v1.1.0.tar.gz -> elasticsearch_exporter-1.1.0.tar.gz
+_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-build dc25bafa8fc1305a4de66a0a448472e7 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
+_md5_=3644c8ebae1726cae4cf2b4b76a3a313
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index e5a8709c62d7..c9a25e1091fd 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/glcdprocdriver-0.1.2 b/metadata/md5-cache/app-misc/glcdprocdriver-0.1.2
index 9b16f28600eb..e3d5eea3237c 100644
--- a/metadata/md5-cache/app-misc/glcdprocdriver-0.1.2
+++ b/metadata/md5-cache/app-misc/glcdprocdriver-0.1.2
@@ -3,10 +3,10 @@ DEPEND=>=app-misc/graphlcd-base-1.0.0
DESCRIPTION=A glue between the graphlcd-base library from the GraphLCD project
EAPI=7
HOMEPAGE=https://lucianm.github.io/GLCDprocDriver https://github.com/lucianm/GLCDprocDriver
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=app-misc/graphlcd-base-1.0.0
SLOT=0
SRC_URI=https://github.com/lucianm/GLCDprocDriver/archive/0.1.2.tar.gz -> GLCDprocDriver-0.1.2.tar.gz
_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d36812238557f4a0d0f688aa5659db70
+_md5_=6df53dfd9541a85f17680dfae419848a
diff --git a/metadata/md5-cache/app-misc/graphlcd-base-1.0.2 b/metadata/md5-cache/app-misc/graphlcd-base-1.0.2
index 1f3c0085819d..726f9ff69a60 100644
--- a/metadata/md5-cache/app-misc/graphlcd-base-1.0.2
+++ b/metadata/md5-cache/app-misc/graphlcd-base-1.0.2
@@ -5,11 +5,11 @@ DESCRIPTION=Contains the lowlevel lcd drivers for GraphLCD
EAPI=7
HOMEPAGE=https://projects.vdr-developer.org/projects/graphlcd-base
IUSE=fontconfig freetype g15 graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/libhid net-libs/libvncserver freetype? ( media-libs/freetype:2= ) fontconfig? ( media-libs/fontconfig:1.0= ) graphicsmagick? ( media-gfx/graphicsmagick:0/1.3 ) imagemagick? ( =dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
+DESCRIPTION=C client library for MariaDB/MySQL
+EAPI=7
+HOMEPAGE=https://mariadb.org/
+IUSE=+curl gnutls kerberos libressl +ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
+SLOT=0/3
+SRC_URI=https://downloads.mariadb.org/f/connector-c-3.1.3/mariadb-connector-c-3.1.3-src.tar.gz?serve -> mariadb-connector-c-3.1.3-src.tar.gz
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=23972ff0b586efc28d726b39c6e0de62
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 7296e9e25e25..480bc95b17da 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/moarvm-2018.06-r1 b/metadata/md5-cache/dev-lang/moarvm-2018.06-r1
index ad485319afec..76f84dda0454 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2018.06-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2018.06-r1
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://moarvm.org/releases/MoarVM-2018.06.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=76482a5acf5d3660ba7cf71622e19e71
+_md5_=efb22757f32b751aaed979dd9b3f072e
diff --git a/metadata/md5-cache/dev-lang/moarvm-2018.08-r1 b/metadata/md5-cache/dev-lang/moarvm-2018.08-r1
index 8c6439377dd3..a0feeed27c64 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2018.08-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2018.08-r1
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://moarvm.org/releases/MoarVM-2018.08.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=76482a5acf5d3660ba7cf71622e19e71
+_md5_=efb22757f32b751aaed979dd9b3f072e
diff --git a/metadata/md5-cache/dev-lang/moarvm-2018.09-r1 b/metadata/md5-cache/dev-lang/moarvm-2018.09-r1
index d7605042f4aa..093ca0f5c637 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2018.09-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2018.09-r1
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://moarvm.org/releases/MoarVM-2018.09.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=76482a5acf5d3660ba7cf71622e19e71
+_md5_=efb22757f32b751aaed979dd9b3f072e
diff --git a/metadata/md5-cache/dev-lang/moarvm-2018.12-r1 b/metadata/md5-cache/dev-lang/moarvm-2018.12-r1
index bc8e520ab3ef..e6d4ce3baed4 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2018.12-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2018.12-r1
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://moarvm.org/releases/MoarVM-2018.12.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=76482a5acf5d3660ba7cf71622e19e71
+_md5_=efb22757f32b751aaed979dd9b3f072e
diff --git a/metadata/md5-cache/dev-lang/moarvm-2019.03-r1 b/metadata/md5-cache/dev-lang/moarvm-2019.03-r1
index 21acc31c0bf3..2d9128c4185b 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2019.03-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2019.03-r1
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://moarvm.org/releases/MoarVM-2019.03.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=76482a5acf5d3660ba7cf71622e19e71
+_md5_=efb22757f32b751aaed979dd9b3f072e
diff --git a/metadata/md5-cache/dev-lang/moarvm-2019.07-r1 b/metadata/md5-cache/dev-lang/moarvm-2019.07-r1
index c837f7a7a644..60ce280862df 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2019.07-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2019.07-r1
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://moarvm.org/releases/MoarVM-2019.07.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=20e8168ba84a158140f024debd8a9e83
+_md5_=290c6fd55de5d757f45a70da8a33d77d
diff --git a/metadata/md5-cache/dev-lang/moarvm-2019.07.1-r1 b/metadata/md5-cache/dev-lang/moarvm-2019.07.1-r1
index d0d28478bd61..de9b1b2147ed 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2019.07.1-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2019.07.1-r1
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://moarvm.org/releases/MoarVM-2019.07.1.tar.gz
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8764a14784fac8a6f28fe12c895ea9a1
+_md5_=1ef8c1b3d204765c6fe63de6619578c9
diff --git a/metadata/md5-cache/dev-lang/moarvm-9999 b/metadata/md5-cache/dev-lang/moarvm-9999
index b74c9da29833..cea632c22782 100644
--- a/metadata/md5-cache/dev-lang/moarvm-9999
+++ b/metadata/md5-cache/dev-lang/moarvm-9999
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26 dev-lang/lua:= virtual/libf
RESTRICT=test
SLOT=0
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8764a14784fac8a6f28fe12c895ea9a1
+_md5_=1ef8c1b3d204765c6fe63de6619578c9
diff --git a/metadata/md5-cache/dev-lang/nqp-2018.06 b/metadata/md5-cache/dev-lang/nqp-2018.06-r1
similarity index 77%
rename from metadata/md5-cache/dev-lang/nqp-2018.06
rename to metadata/md5-cache/dev-lang/nqp-2018.06-r1
index b91a9dacf47d..d2e32572a32f 100644
--- a/metadata/md5-cache/dev-lang/nqp-2018.06
+++ b/metadata/md5-cache/dev-lang/nqp-2018.06-r1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
-DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.06[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.06[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.8 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
EAPI=6
HOMEPAGE=https://rakudo.org
IUSE=doc clang java +moar test elibc_FreeBSD java
KEYWORDS=~amd64 ~x86
LICENSE=Artistic-2
-RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.06[clang=] ) java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.06[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( java moar )
SLOT=0
-SRC_URI=https://github.com/perl6/nqp/tarball/2018.06 -> nqp-2018.06.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd versionator 2352c3fc97241f6a02042773c8287748
-_md5_=540e2c28c3b6e7eaed3f4df7a4974a36
+SRC_URI=https://github.com/perl6/nqp/releases/download/2018.06/nqp-2018.06.tar.gz -> nqp-2018.06.official.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_md5_=44f0749ca199f5b84ec620f993ec8e56
diff --git a/metadata/md5-cache/dev-lang/nqp-2018.08 b/metadata/md5-cache/dev-lang/nqp-2018.08-r1
similarity index 77%
rename from metadata/md5-cache/dev-lang/nqp-2018.08
rename to metadata/md5-cache/dev-lang/nqp-2018.08-r1
index 911c09f12ad2..38b5689f3e62 100644
--- a/metadata/md5-cache/dev-lang/nqp-2018.08
+++ b/metadata/md5-cache/dev-lang/nqp-2018.08-r1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
-DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.08[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.08[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.8 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
EAPI=6
HOMEPAGE=https://rakudo.org
IUSE=doc clang java +moar test elibc_FreeBSD java
KEYWORDS=~amd64 ~x86
LICENSE=Artistic-2
-RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.08[clang=] ) java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.08[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( java moar )
SLOT=0
-SRC_URI=https://github.com/perl6/nqp/tarball/2018.08 -> nqp-2018.08.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd versionator 2352c3fc97241f6a02042773c8287748
-_md5_=540e2c28c3b6e7eaed3f4df7a4974a36
+SRC_URI=https://github.com/perl6/nqp/releases/download/2018.08/nqp-2018.08.tar.gz -> nqp-2018.08.official.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_md5_=44f0749ca199f5b84ec620f993ec8e56
diff --git a/metadata/md5-cache/dev-lang/nqp-2018.09 b/metadata/md5-cache/dev-lang/nqp-2018.09-r1
similarity index 77%
rename from metadata/md5-cache/dev-lang/nqp-2018.09
rename to metadata/md5-cache/dev-lang/nqp-2018.09-r1
index 8d511a1adc65..8cb3572655a0 100644
--- a/metadata/md5-cache/dev-lang/nqp-2018.09
+++ b/metadata/md5-cache/dev-lang/nqp-2018.09-r1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
-DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.09[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.09[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.8 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
EAPI=6
HOMEPAGE=https://rakudo.org
IUSE=doc clang java +moar test elibc_FreeBSD java
KEYWORDS=~amd64 ~x86
LICENSE=Artistic-2
-RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.09[clang=] ) java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.09[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( java moar )
SLOT=0
-SRC_URI=https://github.com/perl6/nqp/tarball/2018.09 -> nqp-2018.09.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd versionator 2352c3fc97241f6a02042773c8287748
-_md5_=9889f28d8197be424ef08c4396255fd5
+SRC_URI=https://github.com/perl6/nqp/releases/download/2018.09/nqp-2018.09.tar.gz -> nqp-2018.09.official.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_md5_=44f0749ca199f5b84ec620f993ec8e56
diff --git a/metadata/md5-cache/dev-lang/nqp-2018.12 b/metadata/md5-cache/dev-lang/nqp-2018.12-r1
similarity index 77%
rename from metadata/md5-cache/dev-lang/nqp-2018.12
rename to metadata/md5-cache/dev-lang/nqp-2018.12-r1
index e586f78daa9a..3c62cd41ce6f 100644
--- a/metadata/md5-cache/dev-lang/nqp-2018.12
+++ b/metadata/md5-cache/dev-lang/nqp-2018.12-r1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
-DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.12[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.12[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.8 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
EAPI=6
HOMEPAGE=https://rakudo.org
IUSE=doc clang java +moar test elibc_FreeBSD java
KEYWORDS=~amd64 ~x86
LICENSE=Artistic-2
-RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.12[clang=] ) java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.12[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( java moar )
SLOT=0
-SRC_URI=https://github.com/perl6/nqp/tarball/2018.12 -> nqp-2018.12.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd versionator 2352c3fc97241f6a02042773c8287748
-_md5_=a4c7a092c59a7957f0afcd9393edc902
+SRC_URI=https://github.com/perl6/nqp/releases/download/2018.12/nqp-2018.12.tar.gz -> nqp-2018.12.official.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_md5_=44f0749ca199f5b84ec620f993ec8e56
diff --git a/metadata/md5-cache/dev-lang/nqp-2019.03 b/metadata/md5-cache/dev-lang/nqp-2019.03-r1
similarity index 77%
rename from metadata/md5-cache/dev-lang/nqp-2019.03
rename to metadata/md5-cache/dev-lang/nqp-2019.03-r1
index 34c0d821107c..1105e08bee1e 100644
--- a/metadata/md5-cache/dev-lang/nqp-2019.03
+++ b/metadata/md5-cache/dev-lang/nqp-2019.03-r1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
-DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2019.03[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2019.03[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.8 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
EAPI=6
HOMEPAGE=https://rakudo.org
IUSE=doc clang java +moar test elibc_FreeBSD java
KEYWORDS=~amd64 ~x86
LICENSE=Artistic-2
-RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2019.03[clang=] ) java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2019.03[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( java moar )
SLOT=0
-SRC_URI=https://github.com/perl6/nqp/tarball/2019.03 -> nqp-2019.03.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd versionator 2352c3fc97241f6a02042773c8287748
-_md5_=a4c7a092c59a7957f0afcd9393edc902
+SRC_URI=https://github.com/perl6/nqp/releases/download/2019.03/nqp-2019.03.tar.gz -> nqp-2019.03.official.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_md5_=44f0749ca199f5b84ec620f993ec8e56
diff --git a/metadata/md5-cache/dev-lang/nqp-2019.07.1 b/metadata/md5-cache/dev-lang/nqp-2019.07.1
new file mode 100644
index 000000000000..3b66600cfd92
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nqp-2019.07.1
@@ -0,0 +1,15 @@
+BDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2019.07.1[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.8 ) dev-lang/perl
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2019.07.1[clang=] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
+EAPI=7
+HOMEPAGE=https://rakudo.org
+IUSE=doc clang java +moar test elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2019.07.1[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( java moar )
+SLOT=0
+SRC_URI=https://github.com/perl6/nqp/releases/download/2019.07.1/nqp-2019.07.1.tar.gz
+_eclasses_=java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 multibuild 40fe59465edacd730c644ec2bc197809
+_md5_=e34c17c92d7b2b0bd96afd29bbdb22f9
diff --git a/metadata/md5-cache/dev-lang/nqp-9999 b/metadata/md5-cache/dev-lang/nqp-9999
index 98803fe4d099..af0de168301a 100644
--- a/metadata/md5-cache/dev-lang/nqp-9999
+++ b/metadata/md5-cache/dev-lang/nqp-9999
@@ -1,13 +1,14 @@
+BDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.8 ) dev-lang/perl >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
-DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
-EAPI=5
+EAPI=7
HOMEPAGE=https://rakudo.org
IUSE=doc clang java +moar test elibc_FreeBSD java
LICENSE=Artistic-2
PROPERTIES=live
-RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( java moar )
SLOT=0
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-r3 562b380fc59ae6a8622171d0acb777d1 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=532adf5ffe6981b68aba541620995321
+_eclasses_=git-r3 562b380fc59ae6a8622171d0acb777d1 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 multibuild 40fe59465edacd730c644ec2bc197809
+_md5_=e34c17c92d7b2b0bd96afd29bbdb22f9
diff --git a/metadata/md5-cache/dev-lang/parrot-7.1.0 b/metadata/md5-cache/dev-lang/parrot-7.1.0-r1
similarity index 57%
rename from metadata/md5-cache/dev-lang/parrot-7.1.0
rename to metadata/md5-cache/dev-lang/parrot-7.1.0-r1
index 8eaed0fb8074..b05f9615c6b7 100644
--- a/metadata/md5-cache/dev-lang/parrot-7.1.0
+++ b/metadata/md5-cache/dev-lang/parrot-7.1.0-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install test
-DEPEND=dev-lang/perl[doc?] sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+DEPEND=dev-lang/perl[doc?] sys-libs/readline:0= dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
EAPI=5
HOMEPAGE=http://www.parrot.org/
IUSE=opengl nls doc examples gdbm gmp ssl +unicode pcre
KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=Artistic-2
-RDEPEND=sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+RDEPEND=sys-libs/readline:0= dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
RESTRICT=test
SLOT=0/7.1.0
SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/7.1.0/parrot-7.1.0.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9df17f0cb382bba23ea6b27ed398cb92
+_md5_=222fd863fa422e8e663a2d5c0f54f56d
diff --git a/metadata/md5-cache/dev-lang/parrot-7.11.0 b/metadata/md5-cache/dev-lang/parrot-7.11.0-r1
similarity index 57%
rename from metadata/md5-cache/dev-lang/parrot-7.11.0
rename to metadata/md5-cache/dev-lang/parrot-7.11.0-r1
index 58986e3e6fe1..646b57de3a90 100644
--- a/metadata/md5-cache/dev-lang/parrot-7.11.0
+++ b/metadata/md5-cache/dev-lang/parrot-7.11.0-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install test
-DEPEND=dev-lang/perl[doc?] sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+DEPEND=dev-lang/perl[doc?] sys-libs/readline:0= dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
EAPI=5
HOMEPAGE=http://www.parrot.org/
IUSE=opengl nls doc examples gdbm +gmp ssl +unicode pcre
KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=Artistic-2
-RDEPEND=sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+RDEPEND=sys-libs/readline:0= dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
RESTRICT=test
SLOT=0/7.11.0
SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/7.11.0/parrot-7.11.0.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=11db600e04c365be33b5d617b88f4702
+_md5_=8f83857265d0d7cfceac5b04a7418a5b
diff --git a/metadata/md5-cache/dev-lang/parrot-7.5.0 b/metadata/md5-cache/dev-lang/parrot-7.5.0-r1
similarity index 57%
rename from metadata/md5-cache/dev-lang/parrot-7.5.0
rename to metadata/md5-cache/dev-lang/parrot-7.5.0-r1
index bd77e5d8ae2f..6f6c522fc7a8 100644
--- a/metadata/md5-cache/dev-lang/parrot-7.5.0
+++ b/metadata/md5-cache/dev-lang/parrot-7.5.0-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install test
-DEPEND=dev-lang/perl[doc?] sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+DEPEND=dev-lang/perl[doc?] sys-libs/readline:0= dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
EAPI=5
HOMEPAGE=http://www.parrot.org/
IUSE=opengl nls doc examples gdbm +gmp ssl +unicode pcre
KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=Artistic-2
-RDEPEND=sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+RDEPEND=sys-libs/readline:0= dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
RESTRICT=test
SLOT=0/7.5.0
SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/7.5.0/parrot-7.5.0.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=11db600e04c365be33b5d617b88f4702
+_md5_=8f83857265d0d7cfceac5b04a7418a5b
diff --git a/metadata/md5-cache/dev-lang/parrot-8.1.0 b/metadata/md5-cache/dev-lang/parrot-8.1.0-r1
similarity index 56%
rename from metadata/md5-cache/dev-lang/parrot-8.1.0
rename to metadata/md5-cache/dev-lang/parrot-8.1.0-r1
index b2875967cf85..3e7d8d8bd8a5 100644
--- a/metadata/md5-cache/dev-lang/parrot-8.1.0
+++ b/metadata/md5-cache/dev-lang/parrot-8.1.0-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install test
-DEPEND=dev-lang/perl[doc?] sys-libs/readline dev-libs/libffi net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+DEPEND=dev-lang/perl[doc?] sys-libs/readline:0= dev-libs/libffi net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
EAPI=5
HOMEPAGE=http://www.parrot.org/
IUSE=opengl nls doc examples gdbm +gmp ssl +unicode pcre
KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=Artistic-2
-RDEPEND=sys-libs/readline dev-libs/libffi net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+RDEPEND=sys-libs/readline:0= dev-libs/libffi net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
RESTRICT=test
SLOT=0/8.1.0
SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/8.1.0/parrot-8.1.0.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c7df9f9763f05dac74c85d4c4fa77bec
+_md5_=13a0f09b58894acb25679c5d29c4adc6
diff --git a/metadata/md5-cache/dev-lang/parrot-8.1.0-r2 b/metadata/md5-cache/dev-lang/parrot-8.1.0-r2
new file mode 100644
index 000000000000..7b2bf648da92
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/parrot-8.1.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl[doc?] sys-libs/readline:0= dev-libs/libffi net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+DEFINED_PHASES=compile configure install test
+DEPEND=sys-libs/readline:0= dev-libs/libffi net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre )
+DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
+EAPI=7
+HOMEPAGE=http://www.parrot.org/
+IUSE=opengl nls doc examples gdbm +gmp ssl +unicode pcre
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=Artistic-2
+RDEPEND=sys-libs/readline:0= dev-libs/libffi net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+RESTRICT=test
+SLOT=0/8.1.0
+SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/8.1.0/parrot-8.1.0.tar.gz
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e3f49d84d0d9d738d4655375516957bb
diff --git a/metadata/md5-cache/dev-lang/php-5.6.40-r5 b/metadata/md5-cache/dev-lang/php-5.6.40-r5
index ab8f7da7675d..5c6f948572f4 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.40-r5
+++ b/metadata/md5-cache/dev-lang/php-5.6.40-r5
@@ -5,11 +5,11 @@ DESCRIPTION=The PHP language runtime engine
EAPI=7
HOMEPAGE=https://secure.php.net/
IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) vpx? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
SLOT=5.6
SRC_URI=https://php.net/distributions/php-5.6.40.tar.xz https://gitweb.gentoo.org/proj/php-patches.git/snapshot/php-patches-7.1.31bp.tar.bz2
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a823290576b473e060c64b0c77b2e019
+_md5_=3f0b1d9b9748184a6005e0ad249a1a75
diff --git a/metadata/md5-cache/dev-lang/php-7.1.31 b/metadata/md5-cache/dev-lang/php-7.1.31
index c625df5f2d33..8f02cc706174 100644
--- a/metadata/md5-cache/dev-lang/php-7.1.31
+++ b/metadata/md5-cache/dev-lang/php-7.1.31
@@ -5,11 +5,11 @@ DESCRIPTION=The PHP language runtime engine
EAPI=7
HOMEPAGE=https://php.net/
IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( =sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash )
SLOT=7.1
SRC_URI=https://php.net/distributions/php-7.1.31.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=054094930f35bb7bd14bb8444c32e8f0
+_md5_=4b332ddd2c047ab65ac3173693e9f318
diff --git a/metadata/md5-cache/dev-lang/php-7.2.21 b/metadata/md5-cache/dev-lang/php-7.2.21
index 4d82cfb85c98..73b2f9374863 100644
--- a/metadata/md5-cache/dev-lang/php-7.2.21
+++ b/metadata/md5-cache/dev-lang/php-7.2.21
@@ -5,11 +5,11 @@ DESCRIPTION=The PHP language runtime engine
EAPI=7
HOMEPAGE=https://php.net/
IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =net-misc/curl-7.10.5 ) enchant? ( =sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) zip-encryption? ( zip )
SLOT=7.2
SRC_URI=https://php.net/distributions/php-7.2.21.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=88ef83ea533578c404f9f31051608242
+_md5_=cfc223de111123bd82e333117fb2abfb
diff --git a/metadata/md5-cache/dev-lang/php-7.3.8 b/metadata/md5-cache/dev-lang/php-7.3.8
index d62d284ad3b5..ae2eb4963448 100644
--- a/metadata/md5-cache/dev-lang/php-7.3.8
+++ b/metadata/md5-cache/dev-lang/php-7.3.8
@@ -5,11 +5,11 @@ DESCRIPTION=The PHP language runtime engine
EAPI=7
HOMEPAGE=https://php.net/
IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =net-misc/curl-7.10.5 ) enchant? ( =sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
SLOT=7.3
SRC_URI=https://php.net/distributions/php-7.3.8.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=17b1912e894127f5fbc971725253c896
+_md5_=8afa538f7b9d418660dcf9b450962665
diff --git a/metadata/md5-cache/dev-lang/zig-0.4.0 b/metadata/md5-cache/dev-lang/zig-0.4.0-r1
similarity index 52%
rename from metadata/md5-cache/dev-lang/zig-0.4.0
rename to metadata/md5-cache/dev-lang/zig-0.4.0-r1
index afad71729615..54dfd8a69072 100644
--- a/metadata/md5-cache/dev-lang/zig-0.4.0
+++ b/metadata/md5-cache/dev-lang/zig-0.4.0-r1
@@ -1,8 +1,7 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/llvm:8 !experimental? ( sys-devel/llvm:8[llvm_targets_AArch64,llvm_targets_AMDGPU,llvm_targets_ARM,llvm_targets_BPF,llvm_targets_Hexagon,llvm_targets_Lanai,llvm_targets_Mips,llvm_targets_MSP430,llvm_targets_NVPTX,llvm_targets_PowerPC,llvm_targets_Sparc,llvm_targets_SystemZ,llvm_targets_WebAssembly,llvm_targets_X86,llvm_targets_XCore] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-devel/llvm:8 !experimental? ( sys-devel/llvm:8[llvm_targets_AArch64,llvm_targets_AMDGPU,llvm_targets_ARM,llvm_targets_BPF,llvm_targets_Hexagon,llvm_targets_Lanai,llvm_targets_Mips,llvm_targets_MSP430,llvm_targets_NVPTX,llvm_targets_PowerPC,llvm_targets_Sparc,llvm_targets_SystemZ,llvm_targets_WebAssembly,llvm_targets_X86,llvm_targets_XCore] ) sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=A robust, optimal, and maintainable programming language
-EAPI=7
+EAPI=6
HOMEPAGE=https://ziglang.org/
IUSE=+experimental
KEYWORDS=~amd64
@@ -10,5 +9,5 @@ LICENSE=MIT
RDEPEND=sys-devel/llvm:8 !experimental? ( sys-devel/llvm:8[llvm_targets_AArch64,llvm_targets_AMDGPU,llvm_targets_ARM,llvm_targets_BPF,llvm_targets_Hexagon,llvm_targets_Lanai,llvm_targets_Mips,llvm_targets_MSP430,llvm_targets_NVPTX,llvm_targets_PowerPC,llvm_targets_Sparc,llvm_targets_SystemZ,llvm_targets_WebAssembly,llvm_targets_X86,llvm_targets_XCore] )
SLOT=0
SRC_URI=https://github.com/ziglang/zig/archive/0.4.0.tar.gz -> zig-0.4.0.tar.gz
-_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=664f7d433bce0087ce210611997283ae
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=6567da54022c43dd3f05eb28f2968883
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 9bb9535be8c9..8bd75648c5ef 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/appstream-0.12.7 b/metadata/md5-cache/dev-libs/appstream-0.12.7
index 4d64d4c5ab6c..80aa17ee3503 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.12.7
+++ b/metadata/md5-cache/dev-libs/appstream-0.12.7
@@ -5,10 +5,10 @@ DESCRIPTION=Cross-distro effort for providing metadata for software in the Linux
EAPI=7
HOMEPAGE=https://www.freedesktop.org/wiki/Distributions/AppStream/
IUSE=apt +introspection qt5 test
-KEYWORDS=~amd64 ~arm arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~x86
LICENSE=LGPL-2.1+ GPL-2+
RDEPEND=dev-db/lmdb:= >=dev-libs/glib-2.54:2 dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer introspection? ( >=dev-libs/gobject-introspection-1.56:= ) qt5? ( dev-qt/qtcore:5 )
SLOT=0/4
SRC_URI=https://www.freedesktop.org/software/appstream/releases/AppStream-0.12.7.tar.xz
_eclasses_=meson 22b6eb3dc04a3ba65083811a5e17c913 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=417ec2f4058ddcc4c1acc937bf35e253
+_md5_=3e7d5ae2d50e7b884c8ae4c88b45c70b
diff --git a/metadata/md5-cache/dev-libs/ell-0.18 b/metadata/md5-cache/dev-libs/ell-0.18
deleted file mode 100644
index bb0d0c690735..000000000000
--- a/metadata/md5-cache/dev-libs/ell-0.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
-EAPI=7
-HOMEPAGE=https://01.org/ell
-IUSE=glib pie abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.18.tar.xz
-_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=abccb2a5a62c4f4a00f2fa35575488a9
diff --git a/metadata/md5-cache/dev-libs/ell-0.19 b/metadata/md5-cache/dev-libs/ell-0.19
deleted file mode 100644
index adefdde68b6c..000000000000
--- a/metadata/md5-cache/dev-libs/ell-0.19
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
-EAPI=7
-HOMEPAGE=https://01.org/ell
-IUSE=glib pie abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.19.tar.xz
-_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6be3162559c71d370c23f7b91030c088
diff --git a/metadata/md5-cache/dev-libs/ell-9999 b/metadata/md5-cache/dev-libs/ell-9999
index 4b9452896766..af9c82fd8664 100644
--- a/metadata/md5-cache/dev-libs/ell-9999
+++ b/metadata/md5-cache/dev-libs/ell-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=51665903dfc9c2aa6a8f3096e16d408c
+_md5_=abccb2a5a62c4f4a00f2fa35575488a9
diff --git a/metadata/md5-cache/dev-libs/jemalloc-5.0.1 b/metadata/md5-cache/dev-libs/jemalloc-5.0.1
index 69c18cda7ad4..ec1d651574db 100644
--- a/metadata/md5-cache/dev-libs/jemalloc-5.0.1
+++ b/metadata/md5-cache/dev-libs/jemalloc-5.0.1
@@ -3,10 +3,10 @@ DEPEND=>=app-portage/elt-patches-20170815 !
DESCRIPTION=Jemalloc is a general-purpose scalable concurrent allocator
EAPI=6
HOMEPAGE=http://jemalloc.net/ https://github.com/jemalloc/jemalloc
-IUSE=debug hardened +hugepages lazy-lock static-libs stats xmalloc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=debug hardened +hugepages lazy-lock prof static-libs stats xmalloc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
LICENSE=BSD
SLOT=0/2
SRC_URI=https://github.com/jemalloc/jemalloc/releases/download/5.0.1/jemalloc-5.0.1.tar.bz2
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d1cb6117388f3eae89628355e7dc7bac
+_md5_=6e3266ce1009c07707c10537ad8c12fa
diff --git a/metadata/md5-cache/dev-libs/jemalloc-5.1.0 b/metadata/md5-cache/dev-libs/jemalloc-5.1.0
index 146689ab09d2..89745a4c4e75 100644
--- a/metadata/md5-cache/dev-libs/jemalloc-5.1.0
+++ b/metadata/md5-cache/dev-libs/jemalloc-5.1.0
@@ -3,10 +3,10 @@ DEPEND=>=app-portage/elt-patches-20170815 !
DESCRIPTION=Jemalloc is a general-purpose scalable concurrent allocator
EAPI=6
HOMEPAGE=http://jemalloc.net/ https://github.com/jemalloc/jemalloc
-IUSE=debug hardened lazy-lock static-libs stats xmalloc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=debug hardened lazy-lock prof static-libs stats xmalloc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
LICENSE=BSD
SLOT=0/2
SRC_URI=https://github.com/jemalloc/jemalloc/releases/download/5.1.0/jemalloc-5.1.0.tar.bz2
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0587cc86404f0591a94b9fc53262f989
+_md5_=268182e3b1ddf2010919b189f5a7b8e9
diff --git a/metadata/md5-cache/dev-libs/jemalloc-5.2.0 b/metadata/md5-cache/dev-libs/jemalloc-5.2.0
index 0fd082b6a1e5..8d0ad5441a38 100644
--- a/metadata/md5-cache/dev-libs/jemalloc-5.2.0
+++ b/metadata/md5-cache/dev-libs/jemalloc-5.2.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Jemalloc is a general-purpose scalable concurrent allocator
EAPI=7
HOMEPAGE=http://jemalloc.net/ https://github.com/jemalloc/jemalloc
-IUSE=debug hardened lazy-lock static-libs stats xmalloc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=debug hardened lazy-lock prof static-libs stats xmalloc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
LICENSE=BSD
SLOT=0/2
SRC_URI=https://github.com/jemalloc/jemalloc/releases/download/5.2.0/jemalloc-5.2.0.tar.bz2
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7608b7344d0372f07fbe62a24850f07f
+_md5_=09e5a3cc964845335d6ea369bb02fd3c
diff --git a/metadata/md5-cache/dev-libs/jemalloc-5.2.1 b/metadata/md5-cache/dev-libs/jemalloc-5.2.1
new file mode 100644
index 000000000000..daa52d5cf425
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/jemalloc-5.2.1
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Jemalloc is a general-purpose scalable concurrent allocator
+EAPI=7
+HOMEPAGE=http://jemalloc.net/ https://github.com/jemalloc/jemalloc
+IUSE=debug hardened lazy-lock prof static-libs stats xmalloc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+SLOT=0/2
+SRC_URI=https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=09e5a3cc964845335d6ea369bb02fd3c
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-2.6.0 b/metadata/md5-cache/dev-libs/rocm-comgr-2.6.0
new file mode 100644
index 000000000000..30004ae1f44c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-2.6.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/rocm-device-libs dev-cpp/yaml-cpp:= sys-devel/llvm-roc:=
+DESCRIPTION=Radeon Open Compute Code Object Manager
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/rocm-device-libs dev-cpp/yaml-cpp:= sys-devel/llvm-roc:=
+SLOT=0/2.6
+SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-2.6.0.tar.gz -> rocm-comgr-2.6.0.tar.gz
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=20d3d101ff8075ec4b4e0255dfc4304c
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-2.6.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-2.6.0
new file mode 100644
index 000000000000..e6a0928c7359
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-2.6.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/rocr-runtime sys-devel/llvm-roc:=
+DESCRIPTION=Radeon Open Compute Device Libraries
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/rocr-runtime sys-devel/llvm-roc:=
+SLOT=0/2.6
+SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-2.6.0.tar.gz -> rocm-device-libs-2.6.0.tar.gz
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=ede8e5e21eadcb261891650b7fd87edc
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-9999 b/metadata/md5-cache/dev-libs/rocm-device-libs-9999
new file mode 100644
index 000000000000..0d5755bcb522
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-9999
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/rocr-runtime sys-devel/llvm-roc:=
+DESCRIPTION=Radeon Open Compute Device Libraries
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
+LICENSE=MIT
+PROPERTIES=live
+RDEPEND=dev-libs/rocr-runtime sys-devel/llvm-roc:=
+SLOT=0/9999
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=ede8e5e21eadcb261891650b7fd87edc
diff --git a/metadata/md5-cache/dev-libs/rocm-hostcall-2.7.0 b/metadata/md5-cache/dev-libs/rocm-hostcall-2.7.0
new file mode 100644
index 000000000000..383cb7d64e2a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocm-hostcall-2.7.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/rocr-runtime
+DESCRIPTION=Radeon Open Compute hostcall API
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/rocr-runtime
+SLOT=0/2.7
+SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-2.7.0.tar.gz -> rocm-hostcall-2.7.0.tar.gz
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=35d3b8f8b7a30c8b8eda353ae2aed7d4
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.6.0 b/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.6.0
new file mode 100644
index 000000000000..1e3b551a3972
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.6.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/llvm-roc:= dev-libs/rocr-runtime
+DESCRIPTION=Radeon Open Compute OpenCL Compiler Tool Driver
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=sys-devel/llvm-roc:= dev-libs/rocr-runtime
+SLOT=0/2.6
+SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-2.6.0.tar.gz -> rocm-opencl-driver-2.6.0.tar.gz
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=d93ca56f0444c84f4b64e826f2737eb8
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-2.6.0 b/metadata/md5-cache/dev-libs/rocr-runtime-2.6.0
new file mode 100644
index 000000000000..b8dcbf3d23c5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-2.6.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-process/numactl dev-libs/roct-thunk-interface
+DESCRIPTION=Radeon Open Compute Runtime
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=sys-process/numactl
+SLOT=0/2.6
+SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-2.6.0.tar.gz -> rocr-runtime-2.6.0.tar.gz
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=7ee1971916ac28fb1874640131eb049e
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-9999 b/metadata/md5-cache/dev-libs/rocr-runtime-9999
new file mode 100644
index 000000000000..963b48276b2a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-9999
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-process/numactl dev-libs/roct-thunk-interface
+DESCRIPTION=Radeon Open Compute Runtime
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+LICENSE=MIT
+PROPERTIES=live
+RDEPEND=sys-process/numactl
+SLOT=0/9999
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=0684db1188a899f8f24110b64d5ece7c
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-2.6.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-2.6.0
new file mode 100644
index 000000000000..9e34c288a48c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-2.6.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-process/numactl sys-apps/pciutils
+DESCRIPTION=Radeon Open Compute Thunk Interface
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface
+IUSE=kernel_linux
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=sys-process/numactl sys-apps/pciutils
+SLOT=0/2.6
+SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-2.6.0.tar.gz -> roct-thunk-interface-2.6.0.tar.gz
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=1b224f40a8bbe73cb3720ca1f4f14f62
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-9999 b/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
new file mode 100644
index 000000000000..1ca3b48167b2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-process/numactl sys-apps/pciutils
+DESCRIPTION=Radeon Open Compute Thunk Interface
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface
+IUSE=kernel_linux
+LICENSE=MIT
+PROPERTIES=live
+RDEPEND=sys-process/numactl sys-apps/pciutils
+SLOT=0/9999
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=16fe44f58edf27c7b1c2db6a30596c52
diff --git a/metadata/md5-cache/dev-libs/serdisplib-2.01 b/metadata/md5-cache/dev-libs/serdisplib-2.01
index 73bca4d1ab3b..b274e0bcd6ed 100644
--- a/metadata/md5-cache/dev-libs/serdisplib-2.01
+++ b/metadata/md5-cache/dev-libs/serdisplib-2.01
@@ -4,11 +4,11 @@ DESCRIPTION=Library to drive several displays with built-in controllers or displ
EAPI=6
HOMEPAGE=http://serdisplib.sourceforge.net
IUSE=threads tools lcd_devices_acoolsdcm lcd_devices_ddusbt lcd_devices_directgfx lcd_devices_displaylink lcd_devices_framebuffer lcd_devices_glcd2usb lcd_devices_goldelox lcd_devices_i2c lcd_devices_ks0108 lcd_devices_l4m lcd_devices_lc7981 lcd_devices_lh155 lcd_devices_nokcol lcd_devices_pcd8544 lcd_devices_remote lcd_devices_rs232 lcd_devices_sed133x lcd_devices_sed153x lcd_devices_sed156x lcd_devices_ssdoled lcd_devices_stv8105 lcd_devices_t6963
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=media-libs/gd[jpeg,png,tiff] lcd_devices_acoolsdcm? ( virtual/libusb:1= ) lcd_devices_directgfx? ( media-libs/libsdl ) lcd_devices_displaylink? ( x11-libs/libdlo ) lcd_devices_glcd2usb? ( virtual/libusb:1= )
REQUIRED_USE=|| ( lcd_devices_acoolsdcm lcd_devices_ddusbt lcd_devices_directgfx lcd_devices_displaylink lcd_devices_framebuffer lcd_devices_glcd2usb lcd_devices_goldelox lcd_devices_i2c lcd_devices_ks0108 lcd_devices_l4m lcd_devices_lc7981 lcd_devices_lh155 lcd_devices_nokcol lcd_devices_pcd8544 lcd_devices_remote lcd_devices_rs232 lcd_devices_sed133x lcd_devices_sed153x lcd_devices_sed156x lcd_devices_ssdoled lcd_devices_stv8105 lcd_devices_t6963 )
SLOT=0
SRC_URI=mirror://sourceforge/serdisplib/serdisplib-2.01.tar.gz
_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 udev 7752f306eec7b286d00bdb47b763e7ac
-_md5_=67ad897e3e85a4b5f9d68f06abf4d339
+_md5_=16077575d1c651728acca8d33e5afc8a
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 1694a83c2863..b4b2bea60378 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/cmd2-0.9.16 b/metadata/md5-cache/dev-python/cmd2-0.9.16
new file mode 100644
index 000000000000..80fc52f9f02e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cmd2-0.9.16
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/colorama-0.3.7[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyperclip-1.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-python/mock[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Extra features for standard library's cmd module
+EAPI=7
+HOMEPAGE=https://github.com/python-cmd2/cmd2
+IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/colorama-0.3.7[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyperclip-1.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/cmd2/cmd2-0.9.16.tar.gz
+_eclasses_=distutils-r1 9838160d624a44b2d56d1266a69fd473 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 virtualx 53625127887b62eabb9ec61d3d943462
+_md5_=8ff30ec122fbb36a28bb285321e8b143
diff --git a/metadata/md5-cache/dev-python/cython-0.29.13 b/metadata/md5-cache/dev-python/cython-0.29.13
index 0b89dd635729..4d38ecca0c8b 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.13
+++ b/metadata/md5-cache/dev-python/cython-0.29.13
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( virtual/emacs ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=emacs? ( virtual/emacs ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/numpy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
DESCRIPTION=A Python to C compiler
EAPI=7
HOMEPAGE=https://cython.org https://pypi.org/project/Cython/ https://github.com/cython/cython
-IUSE=doc emacs test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+IUSE=doc emacs test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
-RDEPEND=emacs? ( virtual/emacs ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=emacs? ( virtual/emacs ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/cython/cython/archive/0.29.13.tar.gz -> cython-0.29.13.gh.tar.gz
_eclasses_=distutils-r1 9838160d624a44b2d56d1266a69fd473 elisp-common 23f47b2e1de7abf387105eddd1318738 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=dca5eb98d0e38df4d0cb64efc1972d60
+_md5_=7f24b4ccf60677b8fc83aaa401e50018
diff --git a/metadata/md5-cache/dev-python/lxml-4.4.0 b/metadata/md5-cache/dev-python/lxml-4.4.0
new file mode 100644
index 000000000000..5d637fa81018
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lxml-4.4.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig python_targets_python2_7? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/cssselect[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/libxml2-2.9.5 >=dev-libs/libxslt-1.1.28
+DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
+EAPI=7
+HOMEPAGE=https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml
+IUSE=doc examples +threads test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD ElementTree GPL-2 PSF-2
+RDEPEND=>=dev-libs/libxml2-2.9.5 >=dev-libs/libxslt-1.1.28 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/lxml/lxml/archive/lxml-4.4.0.tar.gz
+_eclasses_=distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=56f800e79ed603814206df6bf15a5157
diff --git a/metadata/md5-cache/dev-python/numpy-1.16.1 b/metadata/md5-cache/dev-python/numpy-1.16.1
index 9505435fd6ff..aac9da6043ea 100644
--- a/metadata/md5-cache/dev-python/numpy-1.16.1
+++ b/metadata/md5-cache/dev-python/numpy-1.16.1
@@ -1,15 +1,15 @@
-BDEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/pkgconfig ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=app-arch/unzip dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/pkgconfig ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
DEFINED_PHASES=compile configure install prepare setup test unpack
DEPEND=lapack? ( virtual/cblas virtual/lapack ) lapack? ( virtual/fortran )
DESCRIPTION=Fast array and numerical python library
EAPI=7
HOMEPAGE=https://www.numpy.org
-IUSE=doc lapack test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+IUSE=doc lapack test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
-RDEPEND=lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=lapack? ( virtual/cblas virtual/lapack ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran )
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/n/numpy/numpy-1.16.1.zip doc? ( https://docs.scipy.org/doc/numpy-1.16.1/numpy-html-1.16.1.zip https://docs.scipy.org/doc/numpy-1.16.1/numpy-ref-1.16.1.pdf https://docs.scipy.org/doc/numpy-1.16.1/numpy-user-1.16.1.pdf )
_eclasses_=distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca fortran-2 f75a2d9321053acf424991e805f32ede multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6610fe0d06e40260968882c49ce82078
+_md5_=a12f63e18f7ffa2ee5c29b3d5ec82237
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 5db28e782c96..65e7d627632e 100644
Binary files a/metadata/md5-cache/dev-tex/Manifest.gz and b/metadata/md5-cache/dev-tex/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tex/pgf-3.0.1-r1 b/metadata/md5-cache/dev-tex/pgf-3.0.1-r1
deleted file mode 100644
index 5bde1f1f7966..000000000000
--- a/metadata/md5-cache/dev-tex/pgf-3.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=pgf -- The TeX Portable Graphic Format
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/pgf
-IUSE=doc source
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LPPL-1.3c FDL-1.2
-RDEPEND=dev-texlive/texlive-latexrecommended >=dev-tex/xcolor-2.11 virtual/latex-base
-SLOT=0
-SRC_URI=mirror://sourceforge/pgf/pgf_3.0.1.tds.zip
-_eclasses_=base 2ec5c64f5de125f0c65a927c4c128fef desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 latex-package 17f13abe0de88340745e52e6b627aee7 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=48967a7dc8d5b20b80d5c9508cf96f97
diff --git a/metadata/md5-cache/dev-tex/pgf-3.1.4 b/metadata/md5-cache/dev-tex/pgf-3.1.4
index 896d00b71dca..3f922f4534c1 100644
--- a/metadata/md5-cache/dev-tex/pgf-3.1.4
+++ b/metadata/md5-cache/dev-tex/pgf-3.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=The TeX Portable Graphic Format
EAPI=7
HOMEPAGE=https://github.com/pgf-tikz/pgf
IUSE=doc source
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2 LPPL-1.3c FDL-1.2
RDEPEND=dev-texlive/texlive-latexrecommended dev-tex/xcolor virtual/latex-base
SLOT=0
SRC_URI=https://github.com/pgf-tikz/pgf/archive/3.1.4.tar.gz -> pgf-3.1.4.tar.gz doc? ( https://github.com/pgf-tikz/pgf/releases/download/3.1.4/pgfmanual.pdf -> pgf-3.1.4-pgfmanual.pdf )
_eclasses_=latex-package 17f13abe0de88340745e52e6b627aee7
-_md5_=0081b9720e21e2d6810fe7bbb6aec1ff
+_md5_=7ec354d31e8acfcb5c96ee835db50b23
diff --git a/metadata/md5-cache/dev-tex/pgf-3.1.4b b/metadata/md5-cache/dev-tex/pgf-3.1.4b
new file mode 100644
index 000000000000..0ce4a7edcadd
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/pgf-3.1.4b
@@ -0,0 +1,13 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEFINED_PHASES=compile install postinst postrm
+DESCRIPTION=The TeX Portable Graphic Format
+EAPI=7
+HOMEPAGE=https://github.com/pgf-tikz/pgf
+IUSE=doc source
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LPPL-1.3c FDL-1.2
+RDEPEND=dev-texlive/texlive-latexrecommended dev-tex/xcolor virtual/latex-base
+SLOT=0
+SRC_URI=https://github.com/pgf-tikz/pgf/archive/3.1.4b.tar.gz -> pgf-3.1.4b.tar.gz doc? ( https://github.com/pgf-tikz/pgf/releases/download/3.1.4b/pgfmanual.pdf -> pgf-3.1.4b-pgfmanual.pdf )
+_eclasses_=latex-package 17f13abe0de88340745e52e6b627aee7
+_md5_=0081b9720e21e2d6810fe7bbb6aec1ff
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 5780dff35f62..10102c0782b9 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/bitcoin-tx-0.18.0 b/metadata/md5-cache/dev-util/bitcoin-tx-0.18.0
new file mode 100644
index 000000000000..8dcaf5a1c0a1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bitcoin-tx-0.18.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Command-line Bitcoin transaction tool
+EAPI=7
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=knots libressl
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/2472733a24a9364e4c6233ccd04166a26a68cc65.tar.gz -> bitcoin-v0.18.0.tar.gz https://bitcoinknots.org/files/0.18.x/0.18.0.knots20190502/bitcoin-0.18.0.knots20190502.patches.txz -> bitcoin-0.18.0.knots20190502.patches.tar.xz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 bash-completion-r1 47a7402d95930413ce25ba8d857339bb libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=205290d4983aced99290ad4d17988954
diff --git a/metadata/md5-cache/dev-util/debhelper-12.1.1 b/metadata/md5-cache/dev-util/debhelper-12.3
similarity index 92%
rename from metadata/md5-cache/dev-util/debhelper-12.1.1
rename to metadata/md5-cache/dev-util/debhelper-12.3
index 15a836c548ca..5d7519ea4c14 100644
--- a/metadata/md5-cache/dev-util/debhelper-12.1.1
+++ b/metadata/md5-cache/dev-util/debhelper-12.3
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=GPL-2
RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_12.1.1.tar.xz
+SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_12.3.tar.xz
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
_md5_=e0b59ccfc43fe797b946ca341a13367c
diff --git a/metadata/md5-cache/dev-util/perf-4.14.33-r1 b/metadata/md5-cache/dev-util/perf-4.14.33-r1
index b31adf73d633..3792b229435e 100644
--- a/metadata/md5-cache/dev-util/perf-4.14.33-r1
+++ b/metadata/md5-cache/dev-util/perf-4.14.33-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.33.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb eutils 6e6c2737b59a4b982de6fb3ecefd87f8 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=83674039c57afaff56908c952fd33c4b
+_md5_=3071deeddf15fd6fe7330f4bf4c54b71
diff --git a/metadata/md5-cache/dev-util/perf-4.20.3 b/metadata/md5-cache/dev-util/perf-4.20.3
index c934b5bd76c2..8a043e26020c 100644
--- a/metadata/md5-cache/dev-util/perf-4.20.3
+++ b/metadata/md5-cache/dev-util/perf-4.20.3
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.20.3.xz mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7fef13c6a0d142036d0f4fb9c8944a5c
+_md5_=5bde35823a811359319e8fd042be8627
diff --git a/metadata/md5-cache/dev-util/perf-5.1.15 b/metadata/md5-cache/dev-util/perf-5.1.15
index cdc40a58d08c..78074270f8e8 100644
--- a/metadata/md5-cache/dev-util/perf-5.1.15
+++ b/metadata/md5-cache/dev-util/perf-5.1.15
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.1.15.xz mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1fe9f8c870f02e422f01e36f11db51fc
+_md5_=041382de114c3a2f56d1e52ebfe5c513
diff --git a/metadata/md5-cache/dev-util/rocm-cmake-0.2 b/metadata/md5-cache/dev-util/rocm-cmake-0.2
new file mode 100644
index 000000000000..1fc81f0b935b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rocm-cmake-0.2
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Radeon Open Compute CMake Modules
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/rocm-cmake
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/RadeonOpenCompute/rocm-cmake/archive/0.2.tar.gz -> rocm-cmake-0.2.tar.gz
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=5404b520f29fc3fd89380dc0ae88d2fc
diff --git a/metadata/md5-cache/dev-util/rocm-cmake-9999 b/metadata/md5-cache/dev-util/rocm-cmake-9999
new file mode 100644
index 000000000000..45b9da2c6b1a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rocm-cmake-9999
@@ -0,0 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Radeon Open Compute CMake Modules
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/rocm-cmake
+LICENSE=MIT
+PROPERTIES=live
+RESTRICT=test
+SLOT=0
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=5404b520f29fc3fd89380dc0ae88d2fc
diff --git a/metadata/md5-cache/dev-util/rocminfo-2.6.0 b/metadata/md5-cache/dev-util/rocminfo-2.6.0
new file mode 100644
index 000000000000..f392e9f95751
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rocminfo-2.6.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/rocr-runtime
+DESCRIPTION=ROCm Application for Reporting System Info
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/rocminfo
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/rocr-runtime
+SLOT=0/2.6
+SRC_URI=https://github.com/RadeonOpenCompute/rocminfo/archive/roc-2.6.0.tar.gz -> rocminfo-2.6.0.tar.gz
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=83b5d5b66cb629baeab3e8d512d9fb2c
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index c67cfc1abed0..398dabd97d57 100644
Binary files a/metadata/md5-cache/games-server/Manifest.gz and b/metadata/md5-cache/games-server/Manifest.gz differ
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.14.2 b/metadata/md5-cache/games-server/minecraft-server-1.14.2
deleted file mode 100644
index 306a82222974..000000000000
--- a/metadata/md5-cache/games-server/minecraft-server-1.14.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=The official server for the sandbox video game
-EAPI=6
-HOMEPAGE=https://www.minecraft.net/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Mojang
-RDEPEND=app-misc/screen >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://launcher.mojang.com/v1/objects/808be3869e2ca6b62378f9f4b33c946621620019/server.jar -> minecraft-server-1.14.2.jar
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=1990ea3d7993c25a1d94a56e888d0471
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.14.4 b/metadata/md5-cache/games-server/minecraft-server-1.14.4
new file mode 100644
index 000000000000..2751f31d5968
--- /dev/null
+++ b/metadata/md5-cache/games-server/minecraft-server-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup unpack
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=The official server for the sandbox video game
+EAPI=7
+HOMEPAGE=https://www.minecraft.net/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Mojang
+RDEPEND=acct-group/minecraft acct-user/minecraft app-misc/screen || ( >=virtual/jre-1.8 >=virtual/jdk-1.8 ) >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar -> minecraft-server-1.14.4.jar
+_eclasses_=java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190
+_md5_=8314f07cabb71a6b70552857d66b7f34
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 5c5f6ce30232..6c3c7fb1edd7 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/amavisd-new-2.12.0 b/metadata/md5-cache/mail-filter/amavisd-new-2.12.0
new file mode 100644
index 000000000000..281d873e73c6
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/amavisd-new-2.12.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install preinst prepare setup
+DESCRIPTION=High-performance interface between the MTA and content checkers
+EAPI=7
+HOMEPAGE=https://gitlab.com/amavis/amavis
+IUSE=clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq
+KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
+LICENSE=GPL-2 BSD-2
+RDEPEND=>=dev-lang/perl-5.10.0 app-arch/arc app-arch/bzip2 app-arch/cabextract app-arch/cpio app-arch/gzip app-arch/lha app-arch/lrzip app-arch/lzop app-arch/ncompress app-arch/p7zip app-arch/pax app-arch/unarj app-arch/unrar app-arch/xz-utils app-arch/zoo clamav? ( app-antivirus/clamav ) >=dev-perl/Archive-Zip-1.14 dev-perl/BerkeleyDB dev-perl/Convert-BinHex dev-perl/File-LibMagic dev-perl/IO-Socket-SSL dev-perl/IO-stringy >=dev-perl/Mail-DKIM-0.31 >=dev-perl/MailTools-1.58 >=dev-perl/MIME-tools-5.415 dev-perl/Net-LibIDN >=dev-perl/Net-Server-0.91 dev-perl/Net-SSLeay dev-perl/Unix-Syslog ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) net-mail/ripole net-mail/tnef postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) rspamd? ( ( dev-perl/JSON dev-perl/HTTP-Message dev-perl/LWP-UserAgent-Determined ) ) rspamd-https? ( ( dev-perl/JSON dev-perl/HTTP-Message dev-perl/LWP-UserAgent-Determined ) dev-perl/LWP-Protocol-https dev-perl/Net-SSLeay ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info ) >=sys-apps/coreutils-5.0-r3 >=sys-libs/db-4.4.20 virtual/mta >=virtual/perl-Compress-Raw-Zlib-2.017 virtual/perl-Digest-MD5 virtual/perl-File-Temp >=virtual/perl-IO-Compress-1.35 virtual/perl-IO-Socket-IP virtual/perl-MIME-Base64 >=virtual/perl-Time-HiRes-1.49 zmq? ( dev-perl/ZMQ-LibZMQ3 )
+SLOT=0
+SRC_URI=https://gitlab.com/amavis/amavis/-/archive/v2.12.0/amavis-v2.12.0.tar.bz2
+_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
+_md5_=8aac53202c9e984e06ff1a059521743d
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 5af5b78a00e1..276fd2049aa3 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/postfix-3.2.4 b/metadata/md5-cache/mail-mta/postfix-3.2.4
deleted file mode 100644
index bd2876d0d6d5..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) virtual/pkgconfig
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=6
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
-LICENSE=IBM
-RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.2.4.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=73ab823be0bfe9f0ef02371391e4d45a
diff --git a/metadata/md5-cache/mail-mta/postfix-3.3.1-r1 b/metadata/md5-cache/mail-mta/postfix-3.3.1-r1
deleted file mode 100644
index 8c31b88861cc..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.3.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) nis? ( net-libs/libnsl ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) virtual/pkgconfig
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=6
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) nis? ( net-libs/libnsl ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.3.1.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=265d7d328a45452da8766d94c016c49d
diff --git a/metadata/md5-cache/mail-mta/postfix-3.3.4 b/metadata/md5-cache/mail-mta/postfix-3.3.4
deleted file mode 100644
index c18bb0986777..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) virtual/pkgconfig
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=6
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.3.4.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=16f31ce00f738131d632d7ffe0fe3f19
diff --git a/metadata/md5-cache/mail-mta/postfix-3.4.5 b/metadata/md5-cache/mail-mta/postfix-3.4.5
deleted file mode 100644
index b69b041e9bf1..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) )
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=7
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.4.5.tar.gz
-_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
-_md5_=7a6ff1c55ff4501a04ab4d11c2f2212d
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 2d58ea73164c..c6cdd09f4ffc 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/terminus-font-4.48 b/metadata/md5-cache/media-fonts/terminus-font-4.48
new file mode 100644
index 000000000000..8fe5953aa0c2
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/terminus-font-4.48
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=app-arch/gzip virtual/awk pcf? ( x11-apps/bdftopcf ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=A clean fixed font for the console and X11
+EAPI=6
+HOMEPAGE=http://terminus-font.sourceforge.net/
+IUSE=a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote ru-dv +ru-g ru-i ru-k X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=OFL-1.1 GPL-2
+REQUIRED_USE=X? ( pcf )
+SLOT=0
+SRC_URI=mirror://sourceforge/terminus-font/terminus-font-4.48/terminus-font-4.48.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 font 3a7bf49a5b835558d339d7bf8dfee9d6 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=31aaf41cb66e3fb01eee7320ae983851
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index e976e9995dce..40654f58aa94 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/flac-1.3.3 b/metadata/md5-cache/media-libs/flac-1.3.3
new file mode 100644
index 000000000000..fc76425d14d6
--- /dev/null
+++ b/metadata/md5-cache/media-libs/flac-1.3.3
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig !elibc_uclibc? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install test
+DEPEND=ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( dev-lang/nasm )
+DESCRIPTION=free lossless audio encoder and decoder
+EAPI=7
+HOMEPAGE=https://xiph.org/flac/
+IUSE=altivec +cxx debug ogg cpu_flags_x86_sse static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1
+RDEPEND=ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz
+_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=7c9b7721b82fa7b30dd00de5d58a820f
diff --git a/metadata/md5-cache/media-libs/libbluray-1.1.2 b/metadata/md5-cache/media-libs/libbluray-1.1.2
index 8bad5ef72396..a76bf22e398c 100644
--- a/metadata/md5-cache/media-libs/libbluray-1.1.2
+++ b/metadata/md5-cache/media-libs/libbluray-1.1.2
@@ -5,10 +5,10 @@ DESCRIPTION=Blu-ray playback libraries
EAPI=7
HOMEPAGE=https://www.videolan.org/developers/libbluray.html
IUSE=aacs bdplus +fontconfig java static-libs +truetype utils +xml elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
LICENSE=LGPL-2.1
RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacs? ( >=media-libs/libaacs-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bdplus? ( media-libs/libbdplus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0/2
SRC_URI=https://downloads.videolan.org/pub/videolan/libbluray/1.1.2/libbluray-1.1.2.tar.bz2
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=43694893b940e7b379c21a0651a19bde
+_md5_=ab00ff5e1d764e927566f72447e9bf71
diff --git a/metadata/md5-cache/media-libs/libvpx-1.8.0 b/metadata/md5-cache/media-libs/libvpx-1.8.0
index da661cfab93c..ed95e1b5157d 100644
--- a/metadata/md5-cache/media-libs/libvpx-1.8.0
+++ b/metadata/md5-cache/media-libs/libvpx-1.8.0
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/6
SRC_URI=https://github.com/webmproject/libvpx/archive/v1.8.0.tar.gz -> libvpx-1.8.0.tar.gz test? ( mirror://gentoo/libvpx-testdata-1.8.0.tar.xz )
_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=5cd98e87892a13e323621ff2402be495
+_md5_=c214bfd48124642ff9e3a2142e9ff00f
diff --git a/metadata/md5-cache/media-libs/libvpx-1.8.0-r1 b/metadata/md5-cache/media-libs/libvpx-1.8.0-r1
index 185f82b5d3bd..22dad36ff2f2 100644
--- a/metadata/md5-cache/media-libs/libvpx-1.8.0-r1
+++ b/metadata/md5-cache/media-libs/libvpx-1.8.0-r1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/6
SRC_URI=https://github.com/webmproject/libvpx/archive/v1.8.0.tar.gz -> libvpx-1.8.0.tar.gz test? ( mirror://gentoo/libvpx-testdata-1.8.0.tar.xz )
_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=006b17d4930acb8d97ae4e0899d57f8a
+_md5_=96c911f05cb5e4a623264ebbe1632cd9
diff --git a/metadata/md5-cache/media-libs/mesa-19.1.4 b/metadata/md5-cache/media-libs/mesa-19.1.4
new file mode 100644
index 000000000000..4922fa8e1ca1
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-19.1.4
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=7
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.1.4.tar.xz
+_eclasses_=llvm 5dbc14df2333105b7c006124ead9bf3f meson 22b6eb3dc04a3ba65083811a5e17c913 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=34bc129989d1324ced166def9e0ddf58
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 60d0c581fd52..1ca3dc3d4a77 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/hexter-1.1.0 b/metadata/md5-cache/media-plugins/hexter-1.1.0
index b6590a25ca83..37dfe66e02e6 100644
--- a/metadata/md5-cache/media-plugins/hexter-1.1.0
+++ b/metadata/md5-cache/media-plugins/hexter-1.1.0
@@ -5,9 +5,9 @@ DESCRIPTION=Yamaha DX7 modeling DSSI plugin
EAPI=7
HOMEPAGE=http://smbolton.com/hexter.html
IUSE=gtk2 readline
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/alsa-lib >=media-libs/dssi-0.4 >=media-libs/liblo-0.12 gtk2? ( x11-libs/gtk+:2 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= )
SLOT=0
SRC_URI=https://github.com/smbolton/hexter/releases/download/version_1.1.0/hexter-1.1.0.tar.bz2
-_md5_=6de339b3735d477e1e15cfb1ff16672f
+_md5_=abba73afd5773c4b255ae212b904bb29
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 5659ea1e3c76..a4c2a3ac61c8 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/qsynth-0.5.6 b/metadata/md5-cache/media-sound/qsynth-0.5.6
index b538c457399c..8ac276c70201 100644
--- a/metadata/md5-cache/media-sound/qsynth-0.5.6
+++ b/metadata/md5-cache/media-sound/qsynth-0.5.6
@@ -5,11 +5,11 @@ DESCRIPTION=A Qt application to control FluidSynth
EAPI=7
HOMEPAGE=http://qsynth.sourceforge.net/
IUSE=+alsa debug jack pulseaudio
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
REQUIRED_USE=|| ( alsa jack pulseaudio )
SLOT=0
SRC_URI=mirror://sourceforge/qsynth/qsynth-0.5.6.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a77c3a6cb2932d3e95a4f880aadc0eb0
+_md5_=fa62c828e6a1a0a5b75286603db61aa5
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 6337377c4147..3057c54a50ff 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/sslsplit-0.5.2 b/metadata/md5-cache/net-analyzer/sslsplit-0.5.2
deleted file mode 100644
index fff3b2da5d21..000000000000
--- a/metadata/md5-cache/net-analyzer/sslsplit-0.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=elibc_musl? ( sys-libs/fts-standalone ) dev-libs/libevent[ssl,threads] dev-libs/openssl:0= test? ( dev-libs/check )
-DESCRIPTION=Transparent SSL/TLS interception
-EAPI=6
-HOMEPAGE=https://www.roe.ch/SSLsplit
-IUSE=elibc_musl test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=elibc_musl? ( sys-libs/fts-standalone ) dev-libs/libevent[ssl,threads] dev-libs/openssl:0=
-SLOT=0
-SRC_URI=https://github.com/droe/sslsplit/archive/0.5.2.tar.gz -> sslsplit-0.5.2.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b6b9255b7f3b56ee3dd725d4331fb59f
diff --git a/metadata/md5-cache/net-analyzer/sslsplit-0.5.4 b/metadata/md5-cache/net-analyzer/sslsplit-0.5.4
new file mode 100644
index 000000000000..90cc82a8522c
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sslsplit-0.5.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/libevent[ssl,threads] dev-libs/openssl:0= net-libs/libnet:1.1 elibc_musl? ( sys-libs/fts-standalone ) test? ( dev-libs/check )
+DESCRIPTION=Transparent SSL/TLS interception
+EAPI=7
+HOMEPAGE=https://www.roe.ch/SSLsplit
+IUSE=elibc_musl test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-libs/libevent[ssl,threads] dev-libs/openssl:0= net-libs/libnet:1.1 elibc_musl? ( sys-libs/fts-standalone )
+SLOT=0
+SRC_URI=https://github.com/droe/sslsplit/archive/0.5.4.tar.gz -> sslsplit-0.5.4.tar.gz
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e16ded5611f308f802ee0eaa2f2fbbc6
diff --git a/metadata/md5-cache/net-analyzer/sslsplit-9999 b/metadata/md5-cache/net-analyzer/sslsplit-9999
index ad3cbb31822d..e26ca35f2e6d 100644
--- a/metadata/md5-cache/net-analyzer/sslsplit-9999
+++ b/metadata/md5-cache/net-analyzer/sslsplit-9999
@@ -1,12 +1,13 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=install prepare unpack
-DEPEND=elibc_musl? ( sys-libs/fts-standalone ) dev-libs/libevent[ssl,threads] dev-libs/openssl:0= test? ( dev-libs/check ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/libevent[ssl,threads] dev-libs/openssl:0= net-libs/libnet:1.1 elibc_musl? ( sys-libs/fts-standalone ) test? ( dev-libs/check )
DESCRIPTION=Transparent SSL/TLS interception
-EAPI=6
+EAPI=7
HOMEPAGE=https://www.roe.ch/SSLsplit
IUSE=elibc_musl test
LICENSE=BSD-2
PROPERTIES=live
-RDEPEND=elibc_musl? ( sys-libs/fts-standalone ) dev-libs/libevent[ssl,threads] dev-libs/openssl:0=
+RDEPEND=dev-libs/libevent[ssl,threads] dev-libs/openssl:0= net-libs/libnet:1.1 elibc_musl? ( sys-libs/fts-standalone )
SLOT=0
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ce3f253099a332e69ee1d63dc5ceb36c
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c10ba8e557991af33a768ce1c908599f
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 34dbed651a6b..71aa5fb07a78 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/bind-9.12.3_p4 b/metadata/md5-cache/net-dns/bind-9.12.3_p4
deleted file mode 100644
index 4de835e36a07..000000000000
--- a/metadata/md5-cache/net-dns/bind-9.12.3_p4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) gost? ( || ( =dev-libs/openssl-1.0*[-bindist] ( >=dev-libs/openssl-1.1 dev-libs/gost-engine ) ) ) seccomp? ( sys-libs/libseccomp ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
-EAPI=7
-HOMEPAGE=http://www.isc.org/software/bind
-IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi ipv6 json ldap libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs +threads urandom xml +zlib python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) gost? ( || ( =dev-libs/openssl-1.0*[-bindist] ( >=dev-libs/openssl-1.1 dev-libs/gost-engine ) ) ) seccomp? ( sys-libs/libseccomp ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )
-REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) gost? ( !libressl ssl ) threads? ( caps ) dnstap? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.isc.org/downloads/file/bind-9.12.3-P4/?version=tar-gz -> bind-9.12.3_p4.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
-_md5_=d1a57a2f633b5fd6bfc37d24ab1ad4fc
diff --git a/metadata/md5-cache/net-dns/bind-9.14.4 b/metadata/md5-cache/net-dns/bind-9.14.4
index 16f102d2a30b..386695ac9c12 100644
--- a/metadata/md5-cache/net-dns/bind-9.14.4
+++ b/metadata/md5-cache/net-dns/bind-9.14.4
@@ -5,7 +5,7 @@ DESCRIPTION=Berkeley Internet Name Domain - Name Server
EAPI=7
HOMEPAGE=https://www.isc.org/software/bind
IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi json ldap libressl lmdb mysql odbc postgres python selinux ssl static-libs urandom xml +zlib python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )
REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://downloads.isc.org/isc/bind9/9.14.4/bind-9.14.4.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
-_md5_=dc284f10fdc5762de26ead605354db14
+_md5_=708d779c99156687324f30773babbdc4
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.12.3_p4 b/metadata/md5-cache/net-dns/bind-tools-9.12.3_p4
deleted file mode 100644
index 2b59ca1a0fb2..000000000000
--- a/metadata/md5-cache/net-dns/bind-tools-9.12.3_p4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gost? ( || ( =dev-libs/openssl-1.0*[-bindist] ( >=dev-libs/openssl-1.1 dev-libs/gost-engine ) ) ) xml? ( dev-libs/libxml2 ) idn? ( =dev-libs/openssl-1.1 dev-libs/gost-engine ) ) ) xml? ( dev-libs/libxml2 ) idn? ( bind-9.12.3_p4.tar.gz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=552f8292e3d2ba8c10c65c7db33d7385
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.14.4 b/metadata/md5-cache/net-dns/bind-tools-9.14.4
index 5d67130b8df7..1542dbec6ccc 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.14.4
+++ b/metadata/md5-cache/net-dns/bind-tools-9.14.4
@@ -5,11 +5,11 @@ DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
EAPI=7
HOMEPAGE=http://www.isc.org/software/bind
IUSE=doc gssapi idn ipv6 libedit libressl readline ssl xml
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) ! bind-9.14.4.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=43ebc1cf33957fc05d0f5ceb46b08a74
+_md5_=a5fa9dfefd761927036bd7aba1ff4cf9
diff --git a/metadata/md5-cache/net-dns/pdns-4.1.10 b/metadata/md5-cache/net-dns/pdns-4.1.10
deleted file mode 100644
index 67b07ae55adf..000000000000
--- a/metadata/md5-cache/net-dns/pdns-4.1.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install postinst preinst
-DEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( dev-libs/botan:2= ) lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
-DESCRIPTION=The PowerDNS Daemon
-EAPI=7
-HOMEPAGE=https://www.powerdns.com/
-IUSE=botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( dev-libs/botan:2= ) lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
-REQUIRED_USE=mydns? ( mysql )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/pdns-4.1.10.tar.bz2
-_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
-_md5_=1121cc524750160123c58d476b899358
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 67492318914a..0431894f7e6a 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/quasselgrep-0_p20190211 b/metadata/md5-cache/net-irc/quasselgrep-0_p20190211
new file mode 100644
index 000000000000..d195f4c2b583
--- /dev/null
+++ b/metadata/md5-cache/net-irc/quasselgrep-0_p20190211
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Tool for searching quassel logs from the commandline
+EAPI=7
+HOMEPAGE=https://github.com/fish-face/quasselgrep
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/fish-face/quasselgrep/tarball/9b6b0bc1252daa6e574363d87d04eebd981215a5 -> quasselgrep-0_p20190211.tar.gz
+_eclasses_=distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=fbe962d94019b3656a0405d8f7e8ce7f
diff --git a/metadata/md5-cache/net-irc/unrealircd-4.2.4.1 b/metadata/md5-cache/net-irc/unrealircd-4.2.4.1
new file mode 100644
index 000000000000..ad2585aec24b
--- /dev/null
+++ b/metadata/md5-cache/net-irc/unrealircd-4.2.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare pretend
+DEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= net-libs/libnsl:= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) curl? ( net-misc/curl[adns] ) virtual/pkgconfig || ( dev-libs/openssl:0 dev-libs/libressl:0 )
+DESCRIPTION=An advanced Internet Relay Chat daemon
+EAPI=6
+HOMEPAGE=https://www.unrealircd.org/
+IUSE=class-nofakelag curl +extban-stacking libressl +operoverride operoverride-verify +prefixaq showlistmodes shunnotices +usermod
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= net-libs/libnsl:= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) curl? ( net-misc/curl[adns] )
+SLOT=0
+SRC_URI=https://www.unrealircd.org/unrealircd4/unrealircd-4.2.4.1.tar.gz
+_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 ssl-cert a1a4daed6b2479901759d6fe367c4c29
+_md5_=f2caf27e6450d9e0c2c5f15b4549b9c6
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index c944fcd74989..ea5f3bbc841e 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libbitcoinconsensus-0.18.0 b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.18.0
new file mode 100644
index 000000000000..2b8a894a6a4e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.18.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Bitcoin Core consensus library
+EAPI=7
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=+asm knots libressl
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/2472733a24a9364e4c6233ccd04166a26a68cc65.tar.gz -> bitcoin-v0.18.0.tar.gz https://bitcoinknots.org/files/0.18.x/0.18.0.knots20190502/bitcoin-0.18.0.knots20190502.patches.txz -> bitcoin-0.18.0.knots20190502.patches.tar.xz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c98bafa23162a7fcf5a0963d171364ed
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.13 b/metadata/md5-cache/net-libs/liblockfile-1.13
deleted file mode 100644
index 1334848de976..000000000000
--- a/metadata/md5-cache/net-libs/liblockfile-1.13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Implements functions designed to lock the standard mailboxes
-EAPI=6
-HOMEPAGE=http://www.debian.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/libl/liblockfile/liblockfile_1.13.orig.tar.gz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
-_md5_=e17dab30e741f42dd85aa9fece549387
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.14 b/metadata/md5-cache/net-libs/liblockfile-1.14
deleted file mode 100644
index 454ae711471f..000000000000
--- a/metadata/md5-cache/net-libs/liblockfile-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Implements functions designed to lock the standard mailboxes
-EAPI=6
-HOMEPAGE=http://www.debian.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/libl/liblockfile/liblockfile_1.14.orig.tar.gz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
-_md5_=e17dab30e741f42dd85aa9fece549387
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.15 b/metadata/md5-cache/net-libs/liblockfile-1.15
new file mode 100644
index 000000000000..f2882750e51a
--- /dev/null
+++ b/metadata/md5-cache/net-libs/liblockfile-1.15
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=acct-group/mail
+DESCRIPTION=Implements functions designed to lock the standard mailboxes
+EAPI=7
+HOMEPAGE=http://www.debian.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2
+RDEPEND=acct-group/mail
+SLOT=0
+SRC_URI=mirror://debian/pool/main/libl/liblockfile/liblockfile_1.15.orig.tar.gz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9c8b3be2c157e0a5c0d67a4e7e72bbdf
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 857a8f8d278a..720aad306da1 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.5.1 b/metadata/md5-cache/net-mail/dovecot-2.3.5.1
deleted file mode 100644
index ece40ebd97ed..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.3.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=6
-HOMEPAGE=https://www.dovecot.org/
-IUSE=kerberos ldap lua mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sparc x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
-SLOT=0
-SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.5.1.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.5.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.5.tar.gz )
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e ssl-cert a1a4daed6b2479901759d6fe367c4c29 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
-_md5_=b28a3c4337ba11ed7ec1d2e483372e23
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.5.2 b/metadata/md5-cache/net-mail/dovecot-2.3.5.2
deleted file mode 100644
index a78b69860fb7..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.3.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=6
-HOMEPAGE=https://www.dovecot.org/
-IUSE=kerberos ldap lua mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
-SLOT=0
-SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.5.2.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.5.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.5.tar.gz )
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e ssl-cert a1a4daed6b2479901759d6fe367c4c29 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
-_md5_=29e8ca4a691a838412500d22e24b65a7
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.7 b/metadata/md5-cache/net-mail/dovecot-2.3.7
deleted file mode 100644
index c46bcd4be015..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.3.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=6
-HOMEPAGE=https://www.dovecot.org/
-IUSE=kerberos ldap lua mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
-SLOT=0
-SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.7.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.7.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.7.tar.gz )
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e ssl-cert a1a4daed6b2479901759d6fe367c4c29 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
-_md5_=70cbb4846219a66f7c1db4c9190829d3
diff --git a/metadata/md5-cache/net-mail/mailutils-3.4-r2 b/metadata/md5-cache/net-mail/mailutils-3.4-r2
deleted file mode 100644
index f369e266178f..000000000000
--- a/metadata/md5-cache/net-mail/mailutils-3.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:12/22 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A useful collection of mail servers, clients, and filters
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
-IUSE=berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd tokyocabinet python_targets_python2_7
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:12/22 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
-REQUIRED_USE=python? ( python_targets_python2_7 ) servers? ( tcpd )
-SLOT=0
-SRC_URI=mirror://gnu/mailutils/mailutils-3.4.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=764851030af4a62a7364fccb0f50b3f3
diff --git a/metadata/md5-cache/net-mail/mailutils-3.5 b/metadata/md5-cache/net-mail/mailutils-3.5
deleted file mode 100644
index 65426350b2b8..000000000000
--- a/metadata/md5-cache/net-mail/mailutils-3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( virtual/emacs ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) virtual/pkgconfig
-DESCRIPTION=A useful collection of mail servers, clients, and filters
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
-IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd tokyocabinet python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( virtual/emacs ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) servers? ( tcpd )
-SLOT=0
-SRC_URI=mirror://gnu/mailutils/mailutils-3.5.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=fe81fe041c74edbe9154cf3754189dfd
diff --git a/metadata/md5-cache/net-mail/mailutils-3.6 b/metadata/md5-cache/net-mail/mailutils-3.6
deleted file mode 100644
index 307efe326b59..000000000000
--- a/metadata/md5-cache/net-mail/mailutils-3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( virtual/emacs ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) virtual/pkgconfig
-DESCRIPTION=A useful collection of mail servers, clients, and filters
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
-IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd tokyocabinet python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( virtual/emacs ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) servers? ( tcpd ldap )
-SLOT=0
-SRC_URI=mirror://gnu/mailutils/mailutils-3.6.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=3e9bd529209876b1b890312d5d597680
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index c015da6a73ed..69376bbdedfb 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/bitcoin-cli-0.18.0 b/metadata/md5-cache/net-p2p/bitcoin-cli-0.18.0
new file mode 100644
index 000000000000..8f674f26fd00
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/bitcoin-cli-0.18.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/univalue-1.0.4:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Command-line JSON-RPC client specifically for interfacing with bitcoind
+EAPI=7
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=knots libressl
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/univalue-1.0.4:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/2472733a24a9364e4c6233ccd04166a26a68cc65.tar.gz -> bitcoin-v0.18.0.tar.gz https://bitcoinknots.org/files/0.18.x/0.18.0.knots20190502/bitcoin-0.18.0.knots20190502.patches.txz -> bitcoin-0.18.0.knots20190502.patches.tar.xz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 bash-completion-r1 47a7402d95930413ce25ba8d857339bb libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=26dee928c2b77b6f6581536555de3821
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.18.0 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.18.0
new file mode 100644
index 000000000000..9d6ea5dc79a7
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.18.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare pretend
+DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 system-leveldb? ( virtual/bitcoin-leveldb ) bip70? ( dev-libs/protobuf:= ) dbus? ( dev-qt/qtdbus:5 ) dev-libs/libevent:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) qrcode? ( media-gfx/qrencode:= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= ) dev-qt/linguist-tools:5 knots? ( gnome-base/librsvg media-gfx/imagemagick[png] ) >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=An end-user Qt GUI for the Bitcoin crypto-currency
+EAPI=6
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=+asm +bip70 +bitcoin_policy_rbf dbus kde knots libressl +qrcode +system-leveldb test upnp +wallet zeromq
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 system-leveldb? ( virtual/bitcoin-leveldb ) bip70? ( dev-libs/protobuf:= ) dbus? ( dev-qt/qtdbus:5 ) dev-libs/libevent:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) qrcode? ( media-gfx/qrencode:= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/2472733a24a9364e4c6233ccd04166a26a68cc65.tar.gz -> bitcoin-v0.18.0.tar.gz https://bitcoinknots.org/files/0.18.x/0.18.0.knots20190502/bitcoin-0.18.0.knots20190502.patches.txz -> bitcoin-0.18.0.knots20190502.patches.tar.xz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 bash-completion-r1 47a7402d95930413ce25ba8d857339bb db-use 501a5d0963e0d17f30260023f292ae8e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=e268a0021443269d517e62a37ad95629
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.18.0 b/metadata/md5-cache/net-p2p/bitcoind-0.18.0
new file mode 100644
index 000000000000..540472050c8f
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.18.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare pretend setup
+DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= system-leveldb? ( virtual/bitcoin-leveldb ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
+DESCRIPTION=Original Bitcoin crypto-currency wallet for automated services
+EAPI=7
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=+asm +bitcoin_policy_rbf examples knots libressl +system-leveldb test upnp +wallet zeromq
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= system-leveldb? ( virtual/bitcoin-leveldb ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/2472733a24a9364e4c6233ccd04166a26a68cc65.tar.gz -> bitcoin-v0.18.0.tar.gz https://bitcoinknots.org/files/0.18.x/0.18.0.knots20190502/bitcoin-0.18.0.knots20190502.patches.txz -> bitcoin-0.18.0.knots20190502.patches.tar.xz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 bash-completion-r1 47a7402d95930413ce25ba8d857339bb db-use 501a5d0963e0d17f30260023f292ae8e libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
+_md5_=110d1036f16856599bfa8bbd84acf924
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 17422af17ca8..256ad5ce3061 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/dcmtk-3.6.4 b/metadata/md5-cache/sci-libs/dcmtk-3.6.4
new file mode 100644
index 000000000000..69f54c4286fb
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/dcmtk-3.6.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/icu:= virtual/jpeg:0 png? ( media-libs/libpng:* ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) tiff? ( media-libs/tiff:0 ) xml? ( dev-libs/libxml2:2 ) zlib? ( sys-libs/zlib ) media-gfx/graphviz doc? ( app-doc/doxygen )
+DESCRIPTION=The DICOM Toolkit
+EAPI=7
+HOMEPAGE=https://dicom.offis.de/dcmtk.php.en
+IUSE=doc png ssl tcpd tiff +threads xml zlib
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=OFFIS
+RDEPEND=dev-libs/icu:= virtual/jpeg:0 png? ( media-libs/libpng:* ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) tiff? ( media-libs/tiff:0 ) xml? ( dev-libs/libxml2:2 ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=http://dicom.offis.de/download/dcmtk/release/dcmtk-3.6.4.tar.gz
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=77e3107bc2758d23c4c320f4a56c49ac
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index b2233b76e92d..85484b84dfb8 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/yarn-1.17.3 b/metadata/md5-cache/sys-apps/yarn-1.17.3
new file mode 100644
index 000000000000..de0de4d86cc2
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/yarn-1.17.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=!dev-util/cmdtest net-libs/nodejs
+DESCRIPTION=Fast, reliable, and secure node dependency management
+EAPI=7
+HOMEPAGE=https://yarnpkg.com
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=!dev-util/cmdtest net-libs/nodejs
+SLOT=0
+SRC_URI=https://github.com/yarnpkg/yarn/releases/download/v1.17.3/yarn-v1.17.3.tar.gz
+_md5_=6fc6f14acd33237cd5fa94a9b8399820
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 95a8052f579c..db671ea58ace 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/llvm-roc-2.6.0 b/metadata/md5-cache/sys-devel/llvm-roc-2.6.0
new file mode 100644
index 000000000000..189fb45226e7
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-roc-2.6.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/cblas dev-libs/rocr-runtime
+DESCRIPTION=Radeon Open Compute llvm,lld,clang
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm/
+KEYWORDS=~amd64
+LICENSE=UoI-NCSA rc BSD public-domain
+RDEPEND=virtual/cblas dev-libs/rocr-runtime
+SLOT=0
+SRC_URI=https://github.com/RadeonOpenCompute/llvm/archive/roc-ocl-2.6.0.tar.gz -> llvm-roc-ocl-2.6.0.tar.gz https://github.com/RadeonOpenCompute/clang/archive/roc-2.6.0.tar.gz -> clang-roc-2.6.0.tar.gz https://github.com/RadeonOpenCompute/lld/archive/roc-ocl-2.6.0.tar.gz -> lld-roc-ocl-2.6.0.tar.gz
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=848a27c2d4b3e1cc7b926f871087bba8
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 43797ffe04d4..bf24334e4bb4 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/ncdu-1.14.1 b/metadata/md5-cache/sys-fs/ncdu-1.14.1
new file mode 100644
index 000000000000..f418ba9bdcf2
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/ncdu-1.14.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses:0=[unicode] virtual/pkgconfig
+DESCRIPTION=NCurses Disk Usage
+EAPI=7
+HOMEPAGE=https://dev.yorhel.nl/ncdu/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=MIT
+RDEPEND=sys-libs/ncurses:0=[unicode]
+SLOT=0
+SRC_URI=https://dev.yorhel.nl/download/ncdu-1.14.1.tar.gz
+_md5_=710f5ba42189e2d3bce769a74baa5a7b
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 05c0878c0e31..2aa995a48100 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/genkernel-4.0.0_beta10 b/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta11
similarity index 97%
rename from metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta10
rename to metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta11
index 1bb0f14b679d..d2a6a3a59646 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta10
+++ b/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta11
@@ -7,6 +7,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
LICENSE=GPL-2
RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware ) ! open-iscsi-2.0.875.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.4.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.36.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.185.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz mirror://kernel/linux/utils/raid/mdadm/mdadm-4.1.tar.xz https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.8.0;sf=tgz -> multipath-tools-0.8.0.tar.gz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.2/strace-5.2.tar.xz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://lttng.org/files/urcu/userspace-rcu-0.10.2.tar.bz2 mirror://kernel/linux/utils/util-linux/v2.34/util-linux-2.34.tar.xz mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.1.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.1.tar.gz -> zstd-1.4.1.tar.gz
+SRC_URI=mirror://gentoo/genkernel-4.0.0_beta11.tar.xz mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.2.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.0.tar.bz2 mirror://kernel/linux/utils/cryptsetup/v2.1/cryptsetup-2.1.0.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2019.78.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.8.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.3/e2fsprogs-1.45.3.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.875.tar.gz -> open-iscsi-2.0.875.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.4.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.36.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.185.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz mirror://kernel/linux/utils/raid/mdadm/mdadm-4.1.tar.xz https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.8.0;sf=tgz -> multipath-tools-0.8.0.tar.gz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.2/strace-5.2.tar.xz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://lttng.org/files/urcu/userspace-rcu-0.10.2.tar.bz2 mirror://kernel/linux/utils/util-linux/v2.34/util-linux-2.34.tar.xz mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.1.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.1.tar.gz -> zstd-1.4.1.tar.gz
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb mount-boot 1e82d96b7a7dcb483b412497a90bb646 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
_md5_=eadc2ea37bd257fcf960b98794695710
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20190726-r2 b/metadata/md5-cache/sys-kernel/linux-firmware-20190726-r2
index 9447d10ff721..635a41956e87 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20190726-r2
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20190726-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Linux firmware files
EAPI=7
HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 s390 sh sparc x86
LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !media-tv/cx18-firmware ! linux-firmware-20190726.tar.gz
_eclasses_=mount-boot 1e82d96b7a7dcb483b412497a90bb646 portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig 1de3f25f1039cd1772fbf707ef87dbe3
-_md5_=1fedf758ae16a43c0df9e8961bd6c7d0
+_md5_=2c71c1d999ebd881945a34e76cf6b89f
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 2ca074274e02..68033ae6549e 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.2.2 b/metadata/md5-cache/www-apps/grafana-bin-6.2.2
deleted file mode 100644
index c9fc68a60cc1..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-6.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install setup
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=7
-HOMEPAGE=https://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=media-libs/fontconfig
-SLOT=0
-SRC_URI=https://dl.grafana.com/oss/release/grafana-6.2.2.linux-amd64.tar.gz -> grafana-bin-6.2.2.tar.gz
-_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
-_md5_=1162edb714562148192c3848a89819c5
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.2.4 b/metadata/md5-cache/www-apps/grafana-bin-6.2.4
deleted file mode 100644
index 5a97ddb78053..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-6.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install setup
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=7
-HOMEPAGE=https://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=media-libs/fontconfig
-SLOT=0
-SRC_URI=https://dl.grafana.com/oss/release/grafana-6.2.4.linux-amd64.tar.gz -> grafana-bin-6.2.4.tar.gz
-_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
-_md5_=1162edb714562148192c3848a89819c5
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.2.1 b/metadata/md5-cache/www-apps/grafana-bin-6.3.2
similarity index 81%
rename from metadata/md5-cache/www-apps/grafana-bin-6.2.1
rename to metadata/md5-cache/www-apps/grafana-bin-6.3.2
index f4c6d87dddaf..bfca81c6743a 100644
--- a/metadata/md5-cache/www-apps/grafana-bin-6.2.1
+++ b/metadata/md5-cache/www-apps/grafana-bin-6.3.2
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
LICENSE=Apache-2.0
RDEPEND=media-libs/fontconfig
SLOT=0
-SRC_URI=https://dl.grafana.com/oss/release/grafana-6.2.1.linux-amd64.tar.gz -> grafana-bin-6.2.1.tar.gz
+SRC_URI=https://dl.grafana.com/oss/release/grafana-6.3.2.linux-amd64.tar.gz -> grafana-bin-6.3.2.tar.gz
_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 user f8dcb46ee7b0bcdec51dac1ef4bfdfc9
_md5_=1162edb714562148192c3848a89819c5
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index d55b90694dc4..6a14fca38a5b 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-62.0.3331.66 b/metadata/md5-cache/www-client/opera-62.0.3331.116
similarity index 80%
rename from metadata/md5-cache/www-client/opera-62.0.3331.66
rename to metadata/md5-cache/www-client/opera-62.0.3331.116
index 4bde667d9e2d..348ff1054fc2 100644
--- a/metadata/md5-cache/www-client/opera-62.0.3331.66
+++ b/metadata/md5-cache/www-client/opera-62.0.3331.116
@@ -7,6 +7,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=https://download1.operacdn.com/pub/opera/desktop/62.0.3331.66/linux/opera-stable_62.0.3331.66_amd64.deb https://download2.operacdn.com/pub/opera/desktop/62.0.3331.66/linux/opera-stable_62.0.3331.66_amd64.deb https://download3.operacdn.com/pub/opera/desktop/62.0.3331.66/linux/opera-stable_62.0.3331.66_amd64.deb https://download4.operacdn.com/pub/opera/desktop/62.0.3331.66/linux/opera-stable_62.0.3331.66_amd64.deb
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/62.0.3331.116/linux/opera-stable_62.0.3331.116_amd64.deb https://download2.operacdn.com/pub/opera/desktop/62.0.3331.116/linux/opera-stable_62.0.3331.116_amd64.deb https://download3.operacdn.com/pub/opera/desktop/62.0.3331.116/linux/opera-stable_62.0.3331.116_amd64.deb https://download4.operacdn.com/pub/opera/desktop/62.0.3331.116/linux/opera-stable_62.0.3331.116_amd64.deb
_eclasses_=chromium-2 92ff174aa2b13d6ea0c4539533f0b2de eutils 6e6c2737b59a4b982de6fb3ecefd87f8 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 unpacker 3cd8bad0d31e525cd26be1bfa4e61631 xdg-utils 14d00d009167652b1fa363e55effe213
_md5_=c405f1b3aeb4dfc4829a3aef6100e22d
diff --git a/metadata/md5-cache/www-client/opera-62.0.3331.99 b/metadata/md5-cache/www-client/opera-62.0.3331.99
deleted file mode 100644
index 14112de5ca5c..000000000000
--- a/metadata/md5-cache/www-client/opera-62.0.3331.99
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+: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=https://download1.operacdn.com/pub/opera/desktop/62.0.3331.99/linux/opera-stable_62.0.3331.99_amd64.deb https://download2.operacdn.com/pub/opera/desktop/62.0.3331.99/linux/opera-stable_62.0.3331.99_amd64.deb https://download3.operacdn.com/pub/opera/desktop/62.0.3331.99/linux/opera-stable_62.0.3331.99_amd64.deb https://download4.operacdn.com/pub/opera/desktop/62.0.3331.99/linux/opera-stable_62.0.3331.99_amd64.deb
-_eclasses_=chromium-2 92ff174aa2b13d6ea0c4539533f0b2de eutils 6e6c2737b59a4b982de6fb3ecefd87f8 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 unpacker 3cd8bad0d31e525cd26be1bfa4e61631 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=da3889161f4011bdda5da1700c2e7970
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 99f624544a10..e29828833685 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/libdlo-0.1.2-r1 b/metadata/md5-cache/x11-libs/libdlo-0.1.2-r1
index d1a85dd0e0c1..53ca803b2cca 100644
--- a/metadata/md5-cache/x11-libs/libdlo-0.1.2-r1
+++ b/metadata/md5-cache/x11-libs/libdlo-0.1.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A fully open source driver which supports all DisplayLink devices
EAPI=7
HOMEPAGE=https://libdlo.freedesktop.org/wiki/
IUSE=static-libs test-program
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=virtual/libusb:0=
SLOT=0
SRC_URI=https://people.freedesktop.org/~berniet/libdlo-0.1.2.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=077f3933b242962bd70e438176147d1d
+_md5_=7303902b4b2d423723bb3c78cb31fdc5
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 115dfc994b31..e77278bf4cff 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/kapow-1.5.7 b/metadata/md5-cache/x11-misc/kapow-1.5.7
deleted file mode 100644
index 505ec896b81c..000000000000
--- a/metadata/md5-cache/x11-misc/kapow-1.5.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5
-DESCRIPTION=A punch clock program designed to easily keep track of your hours
-EAPI=6
-HOMEPAGE=https://gottcode.org/kapow/
-IUSE=l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_en l10n_es l10n_fr l10n_it l10n_lt l10n_nl l10n_no l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_sv l10n_tr l10n_uk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://gottcode.org/kapow/kapow-1.5.7-src.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=0b0a6e27d9d24f9c1c4e5335416cb178
diff --git a/metadata/md5-cache/x11-misc/kapow-1.5.9 b/metadata/md5-cache/x11-misc/kapow-1.5.9
new file mode 100644
index 000000000000..8f18d23c0d3e
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/kapow-1.5.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5
+DESCRIPTION=A punch clock program designed to easily keep track of your hours
+EAPI=7
+HOMEPAGE=https://gottcode.org/kapow/
+IUSE=l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_en l10n_es l10n_fr l10n_it l10n_lt l10n_nl l10n_no l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_sv l10n_tr l10n_uk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://gottcode.org/kapow/kapow-1.5.9-src.tar.bz2
+_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 1d91b03d42ab6308b5f4f6b598ed110e qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs a3a237ef6c0c58546bf23b2c382f9e56 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=aca18796ebebfeb5e8b8189b8454e78f
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8e55ee77fbaf..67cee596385e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Aug 2019 08:39:03 +0000
+Thu, 08 Aug 2019 09:08:49 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 81ee35b0ad20..7368aadb7e87 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Aug 7 08:39:03 UTC 2019
+Thu Aug 8 09:08:49 UTC 2019
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6164a6b342bd..b381241ca681 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Aug 2019 09:00:01 +0000
+Thu, 08 Aug 2019 09:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 32dfc1d3eb53..1a2304429ed1 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-022cc591bdc537544a3a80986d18e0a0fdbd0e28 1565166837 2019-08-07T08:33:57+00:00
+9f30d006188df7230b61005c07f3d64cf18bb34d 1565254708 2019-08-08T08:58:28+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 84daa0832ae4..2c2769548f6b 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1565166901 Wed 07 Aug 2019 08:35:01 AM UTC
+1565255101 Thu 08 Aug 2019 09:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8e55ee77fbaf..67cee596385e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Aug 2019 08:39:03 +0000
+Thu, 08 Aug 2019 09:08:49 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 572db9b31b7d..d38fa91d69ba 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest
index c214847d798f..489c8c08bb3f 100644
--- a/net-analyzer/sslsplit/Manifest
+++ b/net-analyzer/sslsplit/Manifest
@@ -1 +1 @@
-DIST sslsplit-0.5.2.tar.gz 1526606 BLAKE2B 2eb9e1525072626cfdfdfe344a61d92cf340a87dbbabfd06c5a7b46ce6dd0305b27949f91260fe192ecf97484676600e39f79a74995b45fb5b59138726cfbffe SHA512 5f0560dbf89355ad0ef443df2fb0358046efd8c35be6c45f27b04495fd6194c826ef1c7b261683e7f22eb14436293d00395329284d9e709e1188c3c885251935
+DIST sslsplit-0.5.4.tar.gz 1750390 BLAKE2B 4ab9014c91938397c469bdc49dd307c47375047f018a5caaf8b32eb84596d2fbe623702349dc85776071363b2167c6ee8918604c6bf2843d357ffe64df36bb1b SHA512 5220cbf26a2d5201c4b36207ec52b290f95002c6d5a4d828868d163cff528095add8b333ecb844b86b4e83f62934aa840f80d3838d00997acd50b6e30cee7aed
diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
new file mode 100644
index 000000000000..65959f3e1090
--- /dev/null
+++ b/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
@@ -0,0 +1,26 @@
+diff --git a/GNUmakefile b/GNUmakefile
+index ebdcf0a..02cb4b7 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -519,21 +519,12 @@ $(TARGET).conf.5: $(TARGET).conf.5.in $(MKFS) FORCE
+
+ install: $(TARGET) $(TARGET).conf $(TARGET).1 $(TARGET).conf.5
+ test -d $(DESTDIR)$(PREFIX)/bin || $(MKDIR) -p $(DESTDIR)$(PREFIX)/bin
+- test -d $(DESTDIR)$(PREFIX)/$(TARGET) || \
+- $(MKDIR) -p $(DESTDIR)$(PREFIX)/sslsplit
+ test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 || \
+ $(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
+ test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man5 || \
+ $(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man5
+- test -d $(DESTDIR)/var/log/$(TARGET) || \
+- $(MKDIR) -p $(DESTDIR)/var/log/$(TARGET)
+- test -d $(DESTDIR)/var/run/$(TARGET) || \
+- $(MKDIR) -p $(DESTDIR)/var/run/$(TARGET)
+ $(INSTALL) $(BINOWNERFLAGS) -m $(BINMODE) \
+ $(TARGET) $(DESTDIR)$(PREFIX)/bin/
+- $(INSTALL) $(CNFOWNERFLAGS) -m $(CNFMODE) \
+- $(TARGET).conf \
+- $(DESTDIR)$(PREFIX)/$(TARGET)/$(TARGET).conf.sample
+ $(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
+ $(TARGET).1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/
+ $(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
diff --git a/net-analyzer/sslsplit/sslsplit-0.5.2.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
similarity index 71%
rename from net-analyzer/sslsplit/sslsplit-0.5.2.ebuild
rename to net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
index f823d37044fe..af09469872b6 100644
--- a/net-analyzer/sslsplit/sslsplit-0.5.2.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic
@@ -22,23 +22,29 @@ else
fi
RDEPEND="
- elibc_musl? ( sys-libs/fts-standalone )
dev-libs/libevent[ssl,threads]
- dev-libs/openssl:0="
+ dev-libs/openssl:0=
+ net-libs/libnet:1.1
+ elibc_musl? ( sys-libs/fts-standalone )"
DEPEND="${RDEPEND}
test? ( dev-libs/check )"
+BDEPEND=""
+
+PATCHES=(
+ "${FILESDIR}/${P}-install.patch"
+)
src_prepare() {
default
use elibc_musl && append-libs "-lfts"
- sed -i 's/-D_FORTIFY_SOURCE=2 //g' GNUmakefile || die
- sed -i 's/\/SSLSPLIT_FEATURES/g' GNUmakefile version.c || die
+ sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \
+ -e 's/\/SSLSPLIT_FEATURES/g' GNUmakefile || die
sed -i '/opts_suite/d' main.t.c || die
}
src_install() {
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
- dodoc AUTHORS.md NEWS.md README.md
+ dodoc AUTHORS.md NEWS.md README.md sslsplit.conf
}
diff --git a/net-analyzer/sslsplit/sslsplit-9999.ebuild b/net-analyzer/sslsplit/sslsplit-9999.ebuild
index f013b4bb5552..5ea7c49b62cf 100644
--- a/net-analyzer/sslsplit/sslsplit-9999.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic
@@ -22,23 +22,25 @@ else
fi
RDEPEND="
- elibc_musl? ( sys-libs/fts-standalone )
dev-libs/libevent[ssl,threads]
- dev-libs/openssl:0="
+ dev-libs/openssl:0=
+ net-libs/libnet:1.1
+ elibc_musl? ( sys-libs/fts-standalone )"
DEPEND="${RDEPEND}
test? ( dev-libs/check )"
+BDEPEND=""
src_prepare() {
default
use elibc_musl && append-libs "-lfts"
- sed -i 's/-D_FORTIFY_SOURCE=2 //g' GNUmakefile || die
- sed -i 's/\/SSLSPLIT_FEATURES/g' GNUmakefile build.c || die
+ sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \
+ -e 's/\/SSLSPLIT_FEATURES/g' GNUmakefile || die
sed -i '/opts_suite/d' main.t.c || die
}
src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" SYSCONFDIR="${EPREFIX}/etc" install
dodoc AUTHORS.md NEWS.md README.md
}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 0b943dd7bcc6..dbee00bee3f3 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 8d853f35818c..a0f8dc90482f 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,3 +1,2 @@
-DIST bind-9.12.3_p4.tar.gz 8627833 BLAKE2B f7f8b88d8179f2df92b3105a49f30f7de5ccfe78a4a51f6bfa08e732968bf8e4c35f298c4209d8d05bea4d71b8669fd360d4c17193574eda471ba4d7ad742092 SHA512 42c41f47a0282dc08ee875fe098ce84b26384dba5efbaf99b557d34c4271e0d6aac70126f280a3ee157e8604cce16901c8cd51fab791dec82f4a3d00c054f363
DIST bind-9.14.4.tar.gz 6295768 BLAKE2B c433344d2b431ebb2e9920a6d0af1dc6cf65df1e347c2a77882a7dd2ea165f9a91324edbd7171e6bab7487e13049e38d23a514323f1b4cc74a6ce1f5377f1589 SHA512 f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932
DIST bind-9.15.2.tar.gz 6303402 BLAKE2B c8a16a80c9f690adb61284b27a619b4dbe120eadad7b38138da099a1d5a1171443da6e1c717e876e2739ee4d543cb00665c07fac460a256b178bace96510f4a3 SHA512 df7499bc3eeabf39eebfe346efe15631929cd7287e12fc6b04baea90c332a02fc4b9a8d40f043e308ebd61a82baafb5cf9e69654511dc9a2dcb7415597d5a646
diff --git a/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild b/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
deleted file mode 100644
index 29540d5b0f5d..000000000000
--- a/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils autotools flag-o-matic toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="http://www.isc.org/software/bind"
-SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="gost? ( !libressl ssl )
- idn? ( !libidn2 )
- libidn2? ( !idn )"
-
-CDEPEND="
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- gost? (
- || (
- =dev-libs/openssl-1.0*[-bindist]
- (
- >=dev-libs/openssl-1.1
- dev-libs/gost-engine
- )
- )
- )
- xml? ( dev-libs/libxml2 )
- idn? ( > config.h
-}
-
-src_compile() {
- local AR=$(tc-getAR)
-
- emake AR="${AR}" -C lib/
- emake AR="${AR}" -C bin/delv/
- emake AR="${AR}" -C bin/dig/
- emake AR="${AR}" -C bin/nsupdate/
- emake AR="${AR}" -C bin/dnssec/
-}
-
-src_install() {
- dodoc README CHANGES
-
- cd "${S}"/bin/delv || die
- dobin delv
- doman delv.1
-
- cd "${S}"/bin/dig || die
- dobin dig host nslookup
- doman {dig,host,nslookup}.1
-
- cd "${S}"/bin/nsupdate || die
- dobin nsupdate
- doman nsupdate.1
- if use doc; then
- docinto html
- dodoc nsupdate.html
- fi
-
- cd "${S}"/bin/dnssec || die
- for tool in dsfromkey importkey keyfromlabel keygen \
- revoke settime signzone verify; do
- dobin dnssec-"${tool}"
- doman dnssec-"${tool}".8
- if use doc; then
- docinto html
- dodoc dnssec-"${tool}".html
- fi
- done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.14.4.ebuild b/net-dns/bind-tools/bind-tools-9.14.4.ebuild
index db161fabb6ac..b67d9a0e757e 100644
--- a/net-dns/bind-tools/bind-tools-9.14.4.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc gssapi idn ipv6 libedit libressl readline ssl xml"
# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
diff --git a/net-dns/bind-tools/metadata.xml b/net-dns/bind-tools/metadata.xml
index 99ad40d33f8d..c05099c71b55 100644
--- a/net-dns/bind-tools/metadata.xml
+++ b/net-dns/bind-tools/metadata.xml
@@ -10,10 +10,7 @@
Mikle Kolyada
ISC's Bind DNS' server tools
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index eb8b6a33ce60..fb84ed311b2e 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,4 +1,3 @@
-DIST bind-9.12.3_p4.tar.gz 8627833 BLAKE2B f7f8b88d8179f2df92b3105a49f30f7de5ccfe78a4a51f6bfa08e732968bf8e4c35f298c4209d8d05bea4d71b8669fd360d4c17193574eda471ba4d7ad742092 SHA512 42c41f47a0282dc08ee875fe098ce84b26384dba5efbaf99b557d34c4271e0d6aac70126f280a3ee157e8604cce16901c8cd51fab791dec82f4a3d00c054f363
DIST bind-9.14.4.tar.gz 6295768 BLAKE2B c433344d2b431ebb2e9920a6d0af1dc6cf65df1e347c2a77882a7dd2ea165f9a91324edbd7171e6bab7487e13049e38d23a514323f1b4cc74a6ce1f5377f1589 SHA512 f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932
DIST bind-9.15.2.tar.gz 6303402 BLAKE2B c8a16a80c9f690adb61284b27a619b4dbe120eadad7b38138da099a1d5a1171443da6e1c717e876e2739ee4d543cb00665c07fac460a256b178bace96510f4a3 SHA512 df7499bc3eeabf39eebfe346efe15631929cd7287e12fc6b04baea90c332a02fc4b9a8d40f043e308ebd61a82baafb5cf9e69654511dc9a2dcb7415597d5a646
DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
diff --git a/net-dns/bind/bind-9.12.3_p4.ebuild b/net-dns/bind/bind-9.12.3_p4.ebuild
deleted file mode 100644
index 61bd0cdbc4c3..000000000000
--- a/net-dns/bind/bind-9.12.3_p4.ebuild
+++ /dev/null
@@ -1,407 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Re dlz/mysql and threads, needs to be verified..
-# MySQL uses thread local storage in its C api. Thus MySQL
-# requires that each thread of an application execute a MySQL
-# thread initialization to setup the thread local storage.
-# This is impossible to do safely while staying within the DLZ
-# driver API. This is a limitation caused by MySQL, and not the DLZ API.
-# Because of this BIND MUST only run with a single thread when
-# using the MySQL driver.
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
-
-MY_PV="${PV/_p/-P}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SDB_LDAP_VER="1.1.0-fc14"
-
-RRL_PV="${MY_PV}"
-
-# SDB-LDAP: http://bind9-ldap.bayour.com/
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/software/bind"
-SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${P}.tar.gz
- doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-# sdb-ldap? (
-# http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
-# )"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# -berkdb by default re bug 602682
-IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi ipv6
-json ldap libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs
-+threads urandom xml +zlib"
-# sdb-ldap - patch broken
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="
- postgres? ( dlz )
- berkdb? ( dlz )
- mysql? ( dlz !threads )
- odbc? ( dlz )
- ldap? ( dlz )
- gost? ( !libressl ssl )
- threads? ( caps )
- dnstap? ( threads )
- python? ( ${PYTHON_REQUIRED_USE} )"
-# sdb-ldap? ( dlz )
-
-DEPEND="
- ssl? (
- !libressl? ( dev-libs/openssl:0[-bindist] )
- libressl? ( dev-libs/libressl )
- )
- mysql? ( dev-db/mysql-connector-c:0= )
- odbc? ( >=dev-db/unixODBC-2.2.6 )
- ldap? ( net-nds/openldap )
- postgres? ( dev-db/postgresql:= )
- caps? ( >=sys-libs/libcap-2.1.0 )
- xml? ( dev-libs/libxml2 )
- geoip? ( >=dev-libs/geoip-1.4.6 )
- gssapi? ( virtual/krb5 )
- gost? (
- || (
- =dev-libs/openssl-1.0*[-bindist]
- (
- >=dev-libs/openssl-1.1
- dev-libs/gost-engine
- )
- )
- )
- seccomp? ( sys-libs/libseccomp )
- json? ( dev-libs/json-c:= )
- lmdb? ( dev-db/lmdb )
- zlib? ( sys-libs/zlib )
- dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
- python? (
- ${PYTHON_DEPS}
- dev-python/ply[${PYTHON_USEDEP}]
- )"
-# sdb-ldap? ( net-nds/openldap )
-
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-bind )
- || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-pkg_setup() {
- ebegin "Creating named group and user"
- enewgroup named 40
- enewuser named 40 -1 /etc/bind named
- eend ${?}
-}
-
-src_prepare() {
- default
-
- # Adjusting PATHs in manpages
- for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
- sed -i \
- -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
- -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
- -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
- "${i}" || die "sed failed, ${i} doesn't exist"
- done
-
-# if use dlz; then
-# # sdb-ldap patch as per bug #160567
-# # Upstream URL: http://bind9-ldap.bayour.com/
-# # New patch take from bug 302735
-# if use sdb-ldap; then
-# epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
-# cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
-# cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
-# cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
-# fi
-# fi
-
- # should be installed by bind-tools
- sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
-
- # Disable tests for now, bug 406399
- sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
- # bug #220361
- rm aclocal.m4
- rm -rf libtool.m4/
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --sysconfdir=/etc/bind
- --localstatedir=/var
- --with-libtool
- --enable-full-report
- --without-readline
- $(use_enable caps linux-caps)
- $(use_enable dnsrps)
- $(use_enable dnstap)
- $(use_enable fixed-rrset)
- $(use_enable ipv6)
- $(use_enable rpz rpz-nsdname)
- $(use_enable rpz rpz-nsip)
- $(use_enable seccomp)
- # $(use_enable static-libs static)
- $(use_enable threads)
- $(use_with berkdb dlz-bdb)
- $(use_with dlz dlopen)
- $(use_with dlz dlz-filesystem)
- $(use_with dlz dlz-stub)
- $(use_with gost)
- $(use_with gssapi)
- $(use_with json libjson)
- $(use_with ldap dlz-ldap)
- $(use_with mysql dlz-mysql)
- $(use_with odbc dlz-odbc)
- $(use_with postgres dlz-postgres)
- $(use_with lmdb)
- $(use_with python)
- $(use_with ssl ecdsa)
- $(use_with ssl openssl "${EPREFIX}"/usr)
- $(use_with xml libxml2)
- $(use_with zlib)
- )
-
- if use urandom; then
- myeconfargs+=( --with-randomdev=/dev/urandom )
- else
- myeconfargs+=( --with-randomdev=/dev/random )
- fi
-
- use geoip && myeconfargs+=( --with-geoip )
-
- # bug #158664
-# gcc-specs-ssp && replace-flags -O[23s] -O
-
- # To include db.h from proper path
- use berkdb && append-flags "-I$(db_includedir)"
-
- export BUILD_CC=$(tc-getBUILD_CC)
- econf "${myeconfargs[@]}"
-
- # bug #151839
- echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc CHANGES README
-
- if use doc; then
- dodoc doc/arm/Bv9ARM.pdf
-
- docinto misc
- dodoc doc/misc/*
-
- # might a 'html' useflag make sense?
- docinto html
- dodoc -r doc/arm/*
-
- docinto contrib
- dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
-
- # some handy-dandy dynamic dns examples
- pushd "${ED%/}"/usr/share/doc/${PF} 1>/dev/null || die
- tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
- popd 1>/dev/null || die
- fi
-
- insinto /etc/bind
- newins "${FILESDIR}"/named.conf-r8 named.conf
-
- # ftp://ftp.rs.internic.net/domain/named.cache:
- insinto /var/bind
- newins "${FILESDIR}"/named.cache-r3 named.cache
-
- insinto /var/bind/pri
- newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
-
- newinitd "${FILESDIR}"/named.init-r13 named
- newconfd "${FILESDIR}"/named.confd-r7 named
-
- if use gost; then
- sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' \
- -i "${ED%/}/etc/init.d/named" || die
- else
- sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' \
- -i "${ED%/}/etc/init.d/named" || die
- fi
-
- newenvd "${FILESDIR}"/10bind.env 10bind
-
- # Let's get rid of those tools and their manpages since they're provided by bind-tools
- rm -f "${ED%/}"/usr/share/man/man1/{dig,host,nslookup}.1*
- rm -f "${ED%/}"/usr/share/man/man8/nsupdate.8*
- rm -f "${ED%/}"/usr/bin/{dig,host,nslookup,nsupdate}
- rm -f "${ED%/}"/usr/sbin/{dig,host,nslookup,nsupdate}
- for tool in dsfromkey importkey keyfromlabel keygen \
- revoke settime signzone verify; do
- rm -f "${ED%/}"/usr/{,s}bin/dnssec-"${tool}"
- rm -f "${ED%/}"/usr/share/man/man8/dnssec-"${tool}".8*
- done
-
- # bug 405251, library archives aren't properly handled by --enable/disable-static
- if ! use static-libs; then
- find "${ED}" -type f -name '*.a' -delete || die
- fi
-
- # bug 405251
- find "${ED}" -type f -name '*.la' -delete || die
-
- if use python; then
- install_python_tools() {
- dosbin bin/python/dnssec-{checkds,coverage}
- }
- python_foreach_impl install_python_tools
-
- python_replicate_script "${ED%/}/usr/sbin/dnssec-checkds"
- python_replicate_script "${ED%/}/usr/sbin/dnssec-coverage"
- fi
-
- # bug 450406
- dosym named.cache /var/bind/root.cache
-
- dosym /var/bind/pri /etc/bind/pri
- dosym /var/bind/sec /etc/bind/sec
- dosym /var/bind/dyn /etc/bind/dyn
- keepdir /var/bind/{pri,sec,dyn}
-
- dodir /var/log/named
-
- fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
- fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
- fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
- fperms 0750 /etc/bind /var/bind/pri
- fperms 0770 /var/log/named /var/bind/{,sec,dyn}
-
- systemd_newunit "${FILESDIR}/named.service-r1" named.service
- systemd_dotmpfilesd "${FILESDIR}"/named.conf
- exeinto /usr/libexec
- doexe "${FILESDIR}/generate-rndc-key.sh"
-}
-
-pkg_postinst() {
- if [ ! -f '/etc/bind/rndc.key' ]; then
- if use urandom; then
- einfo "Using /dev/urandom for generating rndc.key"
- /usr/sbin/rndc-confgen -r /dev/urandom -a
- echo
- else
- einfo "Using /dev/random for generating rndc.key"
- /usr/sbin/rndc-confgen -a
- echo
- fi
- chown root:named /etc/bind/rndc.key || die
- chmod 0640 /etc/bind/rndc.key || die
- fi
-
- einfo
- einfo "You can edit /etc/conf.d/named to customize named settings"
- einfo
- use mysql || use postgres || use ldap && {
- elog "If your named depends on MySQL/PostgreSQL or LDAP,"
- elog "uncomment the specified rc_named_* lines in your"
- elog "/etc/conf.d/named config to ensure they'll start before bind"
- einfo
- }
- einfo "If you'd like to run bind in a chroot AND this is a new"
- einfo "install OR your bind doesn't already run in a chroot:"
- einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
- einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
- einfo
-
- CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
- if [[ -n ${CHROOT} ]]; then
- elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
- elog "To enable the old behaviour (without using mount) uncomment the"
- elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
- elog "If you decide to use the new/default method, ensure to make backup"
- elog "first and merge your existing configs/zones to /etc/bind and"
- elog "/var/bind because bind will now mount the needed directories into"
- elog "the chroot dir."
- fi
-}
-
-pkg_config() {
- CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
- CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
- CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
- if [[ -z "${CHROOT}" ]]; then
- eerror "This config script is designed to automate setting up"
- eerror "a chrooted bind/named. To do so, please first uncomment"
- eerror "and set the CHROOT variable in '/etc/conf.d/named'."
- die "Unset CHROOT"
- fi
- if [[ -d "${CHROOT}" ]]; then
- ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
- ewarn "To enable the old behaviour (without using mount) uncomment the"
- ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
- ewarn
- ewarn "${CHROOT} already exists... some things might become overridden"
- ewarn "press CTRL+C if you don't want to continue"
- sleep 10
- fi
-
- echo; einfo "Setting up the chroot directory..."
-
- mkdir -m 0750 -p ${CHROOT} || die
- mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
- mkdir -m 0750 -p ${CHROOT}/etc/bind || die
- mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
- # As of bind 9.8.0
- if has_version net-dns/bind[gost]; then
- mkdir -m 0755 -p ${CHROOT}/usr/$(get_libdir)/engines || die
- if [ "$(get_libdir)" = "lib64" ]; then
- ln -s lib64 ${CHROOT}/usr/lib || die
- fi
- fi
- chown root:named \
- ${CHROOT} \
- ${CHROOT}/var/{bind,log/named} \
- ${CHROOT}/run/named/ \
- ${CHROOT}/etc/bind \
- || die
-
- mknod ${CHROOT}/dev/null c 1 3 || die
- chmod 0666 ${CHROOT}/dev/null || die
-
- mknod ${CHROOT}/dev/zero c 1 5 || die
- chmod 0666 ${CHROOT}/dev/zero || die
-
- if use urandom; then
- mknod ${CHROOT}/dev/urandom c 1 9 || die
- chmod 0666 ${CHROOT}/dev/urandom || die
- else
- mknod ${CHROOT}/dev/random c 1 8 || die
- chmod 0666 ${CHROOT}/dev/random || die
- fi
-
- if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
- cp -a /etc/bind ${CHROOT}/etc/ || die
- cp -a /var/bind ${CHROOT}/var/ || die
- fi
-
- if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
- mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
- fi
-
- elog "You may need to add the following line to your syslog-ng.conf:"
- elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-}
diff --git a/net-dns/bind/bind-9.14.4.ebuild b/net-dns/bind/bind-9.14.4.ebuild
index 62c6ec54a52e..73486f000eed 100644
--- a/net-dns/bind/bind-9.14.4.ebuild
+++ b/net-dns/bind/bind-9.14.4.ebuild
@@ -36,7 +36,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# -berkdb by default re bug 602682
IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi
json ldap libressl lmdb mysql odbc postgres python selinux ssl static-libs
diff --git a/net-dns/bind/metadata.xml b/net-dns/bind/metadata.xml
index c0702135991b..5c09dd2e7744 100644
--- a/net-dns/bind/metadata.xml
+++ b/net-dns/bind/metadata.xml
@@ -19,7 +19,6 @@
Enable gssapi support
Enable JSON statistics channel
Enable LMDB support to store configuration for 'addzone' zones
- Enable response policy rewriting (rpz)
Use /dev/urandom instead of /dev/random
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 89397ffbe5a5..83921db6acee 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,3 +1,2 @@
-DIST pdns-4.1.10.tar.bz2 1117663 BLAKE2B 9c1b8c608862b42019c6b753af950f940455538b439824e10d28a79a4f04fe926decf86f286d79c850f39e0df345d646ba774e5557cce1d44f6c120d8b2892a3 SHA512 59a7a52468f6daae8de01bb2b08d812906ef58047026369895341cfff253a5b9ba29d6a6b43a822f1632641eec34fa1afa6fbb5b0ba5e72ecce8e61787892136
DIST pdns-4.1.11.tar.bz2 1118103 BLAKE2B f4ba0c463c7ff5f2185b33956ef7749b5ca6496ce850a189ec5a537d174e1391784f2c0c2af3bc7b68d2f1e01ec57c8731dc07a7690905ab7a6e386a1a8f3e4d SHA512 18215f523a39d48c8756bc13ecae1bd78967c2d66619d93ddaafb13062690002a9bdfe1d337796820706692c449286c7b9e9b8d45933684d32acbc20e490c0c4
DIST pdns-4.2.0-rc2.tar.bz2 1245187 BLAKE2B 30ee03752dafa02f5618ba26def1cb8d49b0f7f004b54fcb8d7640b0d60897ac9a9b13e918ab3aaee1d679af772aacd0591e9c9cd3bf6b1af79305e06cac1cdb SHA512 695589980fc35e73fc0e72f57034e2cfefd7b046100dc6f8740ac94dd50ee068453c72aa2ee5626e6cccfca1eeb5e3f036b844039db52d5c45f070d291002122
diff --git a/net-dns/pdns/pdns-4.1.10.ebuild b/net-dns/pdns/pdns-4.1.10.ebuild
deleted file mode 100644
index ad05ab448209..000000000000
--- a/net-dns/pdns/pdns-4.1.10.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib user
-
-DESCRIPTION="The PowerDNS Daemon"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# other possible flags:
-# db2: we lack the dep
-# oracle: dito (need Oracle Client Libraries)
-# xdb: (almost) dead, surely not supported
-
-IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
-
-REQUIRED_USE="mydns? ( mysql )"
-
-RDEPEND="
- libressl? ( dev-libs/libressl:= )
- !libressl? ( dev-libs/openssl:= )
- >=dev-libs/boost-1.35:=
- botan? ( dev-libs/botan:2= )
- lua? (
- !luajit? ( dev-lang/lua:= )
- luajit? ( dev-lang/luajit:= )
- )
- mysql? ( dev-db/mysql-connector-c )
- postgres? ( dev-db/postgresql:= )
- ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
- sqlite? ( dev-db/sqlite:3 )
- opendbx? ( dev-db/opendbx )
- geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
- sodium? ( dev-libs/libsodium:= )
- tinydns? ( >=dev-db/tinycdb-0.77 )
- protobuf? ( dev-libs/protobuf )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/${P/_/-}
-
-src_configure() {
- local dynmodules="pipe bind" # the default backends, always enabled
-
- #use db2 && dynmodules+=" db2"
- use ldap && dynmodules+=" ldap"
- use lua && dynmodules+=" lua"
- use mydns && dynmodules+=" mydns"
- use mysql && dynmodules+=" gmysql"
- use opendbx && dynmodules+=" opendbx"
- #use oracle && dynmodules+=" goracle oracle"
- use postgres && dynmodules+=" gpgsql"
- use remote && dynmodules+=" remote"
- use sqlite && dynmodules+=" gsqlite3"
- use tinydns && dynmodules+=" tinydns"
- use geoip && dynmodules+=" geoip"
- #use xdb && dynmodules+=" xdb"
-
- econf \
- --disable-static \
- --sysconfdir=/etc/powerdns \
- --libdir=/usr/$(get_libdir)/powerdns \
- --with-modules= \
- --with-dynmodules="${dynmodules}" \
- --with-mysql-lib=/usr/$(get_libdir) \
- $(use_enable botan) \
- $(use_enable debug verbose-logging) \
- $(use_enable test unit-tests) \
- $(use_enable tools) \
- $(use_enable systemd) \
- $(use_enable sodium libsodium) \
- $(usex lua "$(use_with !luajit lua) $(use_with luajit)" \
- '--without-lua --without-luajit') \
- $(use_with protobuf) \
- ${myconf}
-}
-
-src_compile() {
- default
- use doc && emake -C codedocs codedocs
-}
-
-src_install() {
- default
-
- mv "${D}"/etc/powerdns/pdns.conf{-dist,}
-
- fperms 0700 /etc/powerdns
- fperms 0600 /etc/powerdns/pdns.conf
-
- # set defaults: setuid=pdns, setgid=pdns
- sed -i \
- -e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
- "${D}"/etc/powerdns/pdns.conf
-
- newinitd "${FILESDIR}"/pdns-r1 pdns
-
- keepdir /var/empty
-
- if use doc; then
- docinto html
- dodoc -r codedocs/html/.
- fi
-
- # Install development headers
- insinto /usr/include/pdns
- doins pdns/*.hh
- insinto /usr/include/pdns/backends/gsql
- doins pdns/backends/gsql/*.hh
-
- if use ldap ; then
- insinto /etc/openldap/schema
- doins "${FILESDIR}"/dnsdomain2.schema
- fi
-
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
- enewgroup pdns
- enewuser pdns -1 -1 /var/empty pdns
-}
-
-pkg_postinst() {
- elog "PowerDNS provides multiple instances support. You can create more instances"
- elog "by symlinking the pdns init script to another name."
- elog
- elog "The name must be in the format pdns. and PowerDNS will use the"
- elog "/etc/powerdns/pdns-.conf configuration file instead of the default."
-
- if use ldap ; then
- ewarn "The official LDAP backend module is only compile-tested by upstream."
- ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
- fi
-
- local old
- for old in ${REPLACING_VERSIONS}; do
- ver_test ${old} -lt 3.2 || continue
-
- ewarn "To fix a security bug (bug #458018) had the following"
- ewarn "files/directories the world-readable bit removed (if set):"
- ewarn " ${EPREFIX}/etc/powerdns"
- ewarn " ${EPREFIX}/etc/powerdns/pdns.conf"
- ewarn "Check if this is correct for your setup"
- ewarn "This is a one-time change and will not happen on subsequent updates."
- chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
-
- break
- done
-}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index e94a9f0b8086..4a4efe0159be 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/quasselgrep/Manifest b/net-irc/quasselgrep/Manifest
index 2585c141ad4c..2eef5a4a24be 100644
--- a/net-irc/quasselgrep/Manifest
+++ b/net-irc/quasselgrep/Manifest
@@ -1 +1,2 @@
DIST quasselgrep-0_p20170411.tar.gz 29117 BLAKE2B e55ef14015d1139dd967d1855a2994d47f189cb02b0b89dc1130a8d0756b137ddd58366c3cb87927cb6400b715efafe042ec929978a71d527ad640129d50cb71 SHA512 b216c49e340cddfeb4fe28046c698a5517a873602a4303c7c6976d6d7f0bfffbb78f170a33126a16089e239a67e1624410f8e727b5ed6ab977f78745362db0e2
+DIST quasselgrep-0_p20190211.tar.gz 29954 BLAKE2B 33862b642d6a24bd7ab8cc4f3628e19cf332feb24e0dba17849f4ee85af4d1d17a641e6ccaef89bcb44c47f28a674ab620610b8b624f9de71b8460b197953e27 SHA512 0d2bfccb87b7463ba032b9515c4a089518a3ca57f9ef6cbb0f00db9c5d0404cc9fe128329b12e1dbe022cbddeb6a3db473564ee734ddc30be56d4c1da5036f56
diff --git a/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild b/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
new file mode 100644
index 000000000000..b4bd7c876391
--- /dev/null
+++ b/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE=( sqlite )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Tool for searching quassel logs from the commandline"
+HOMEPAGE="https://github.com/fish-face/quasselgrep"
+
+if [[ "${PV}" == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/65278/quasselgrep.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ MY_COMMIT=9b6b0bc1252daa6e574363d87d04eebd981215a5
+ SRC_URI="https://github.com/fish-face/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
+ S="${WORKDIR}/fish-face-${PN}-${MY_COMMIT:0:7}"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="dev-python/future[${PYTHON_USEDEP}]
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+ optfeature "access postgres db" dev-python/psycopg:2
+}
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 32b60c6687af..cdf1f6c65c79 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,2 +1,3 @@
DIST unrealircd-4.2.2.tar.gz 6060272 BLAKE2B f45cae6aa85b478e7f667e379b557314fa509c17f150941f84ee80fb328b01de099235b69d3e2710afef01578f5898ba12f21245d6ce5370e7aa7ffdfa49d1f0 SHA512 961947e2286e10cd6032320d57cf3a99d4354f46ae28ad3142d11a0d423f7a0be915f8c09e8fe7b5816829752e4a03776907bb491366f418afc319fd8efb14ad
DIST unrealircd-4.2.3.tar.gz 6086716 BLAKE2B 26eae482b8b5ce599a3672981c5cf32725f0cf7d9dae16cf48c73dfcabbd4b897d8308be0eb1a6b7b44c657dfb66c42115e67c29eefc791da5fc01fc53e22323 SHA512 d71550d71d24f808141d235248600476167b82de089173f0c1814638df636bf999c931827e5952f0233932b2d5412bf2e26573c62cc8a0720f91bd8723867b0a
+DIST unrealircd-4.2.4.1.tar.gz 6090725 BLAKE2B 817a7c2a13a495944676d08ed90b36f6795fe43ee171efc6661980e6da9a8cc8d98c4fb0eb8221ac6af85ab1a9b5578a2e992d7b41696434430e58918bc30145 SHA512 752573c4af1f92a10739bb2b0cdaade1948207b46d28ae5177e1dfd6b0663044bc22dce5ffe8549882cd70325e3ef7e3296182fffbb84e08d59dbbdd6551a686
diff --git a/net-irc/unrealircd/unrealircd-4.2.4.1.ebuild b/net-irc/unrealircd/unrealircd-4.2.4.1.ebuild
new file mode 100644
index 000000000000..97c9a805e818
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-4.2.4.1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+inherit eapi7-ver ssl-cert
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/${PN}$(ver_cut 1)/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="class-nofakelag curl +extban-stacking libressl +operoverride operoverride-verify
+ +prefixaq showlistmodes shunnotices +usermod"
+
+RDEPEND="
+ acct-group/unrealircd
+ acct-user/unrealircd
+ >=app-crypt/argon2-20171227-r1:=
+ dev-libs/libpcre2
+ >=net-dns/c-ares-1.7:=
+ net-libs/libnsl:=
+ sys-libs/zlib
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ curl? ( net-misc/curl[adns] )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+DOCS=( doc/{Authors,Donation,RELEASE-NOTES{,.old},tao.of.irc,technical/,translations.txt} )
+
+pkg_pretend() {
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ ver_test "${v}" -ge 4 && continue
+ ewarn "The configuration file format has changed since ${v}."
+ ewarn "Please be prepared to manually update them and visit:"
+ ewarn "https://www.unrealircd.org/docs/Upgrading_from_3.2.x"
+ break
+ done
+}
+
+src_prepare() {
+ # QA check against bundled pkgs
+ rm -r extras || die
+
+ if use class-nofakelag; then
+ sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+ fi
+
+ # By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
+ # that to look for ca-certificates-provided file instead. %s is
+ # CONFDIR. #618066
+ sed -i -e 's:%s/ssl/curl-ca-bundle.crt:%s/../ssl/certs/ca-certificates.crt:' src/s_conf.c || die
+
+ eapply_user
+}
+
+src_configure() {
+ # Default value for privatelibdir adds a build path to -Wl,-rpath.
+ econf \
+ --with-bindir="${EPREFIX}"/usr/bin \
+ --with-cachedir="${EPREFIX}"/var/lib/${PN} \
+ --with-confdir="${EPREFIX}"/etc/${PN} \
+ --with-datadir="${EPREFIX}"/var/lib/${PN} \
+ --with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --with-logdir="${EPREFIX}"/var/log/${PN} \
+ --with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
+ --without-privatelibdir \
+ --with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
+ --with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
+ --with-maxconnections=1024 \
+ --with-nick-history=2000 \
+ --with-sendq=3000000 \
+ --with-permissions=0640 \
+ --with-system-argon2 \
+ --with-system-cares \
+ --with-system-pcre2 \
+ --without-tre \
+ --enable-dynamic-linking \
+ --enable-ssl="${EPREFIX}"/usr \
+ $(use_enable curl libcurl "${EPREFIX}"/usr) \
+ $(use_enable prefixaq) \
+ $(use_with showlistmodes) \
+ $(use_with shunnotices) \
+ $(use_with !operoverride no-operoverride) \
+ $(use_with operoverride-verify) \
+ $(use_with !usermod disableusermod) \
+ $(use_with !extban-stacking disable-extendedban-stacking)
+}
+
+src_install() {
+ keepdir /var/log/${PN}
+ keepdir /var/lib/${PN}/tmp
+
+ newbin src/ircd ${PN}
+
+ (
+ cd src/modules || die
+ for subdir in $(find . -type d -print); do
+ if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
+ exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
+ doexe "${subdir}"/*.so
+ fi
+ done
+ )
+
+ insinto /etc/${PN}
+ # Purposefully omitting the examples/ and ssl/ subdirectories. ssl
+ # is redundant with app-misc/ca-certificates and examples will all
+ # be in docs anyway.
+ doins -r doc/conf/{aliases,help}
+ doins doc/conf/*.conf
+ newins doc/conf/examples/example.conf ${PN}.conf
+ keepdir /etc/${PN}/ssl
+
+ einstalldocs
+
+ newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
+
+ # config should be read-only
+ fperms -R 0640 /etc/${PN}
+ fperms 0750 /etc/${PN}{,/aliases,/help}
+ fperms 0750 /etc/${PN}/ssl
+ # state is editable but not owned by unrealircd directly
+ fperms 0770 /var/log/${PN}
+ fperms 0770 /var/lib/${PN}{,/tmp}
+ fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
+}
+
+pkg_postinst() {
+ # Move docert call from src_install() to install_cert in pkg_postinst for
+ # bug #201682
+ if [[ ! -f "${EROOT}"etc/${PN}/ssl/server.cert.key ]]; then
+ if [[ -f "${EROOT}"etc/${PN}/server.cert.key ]]; then
+ ewarn "The location ${PN} looks for SSL certificates has changed"
+ ewarn "from ${EROOT}etc/${PN} to ${EROOT}etc/${PN}/ssl."
+ ewarn "Please move your existing certificates."
+ else
+ (
+ umask 0037
+ install_cert /etc/${PN}/ssl/server.cert
+ chown unrealircd "${EROOT}"etc/${PN}/ssl/server.cert.*
+ ln -snf server.cert.key "${EROOT}"etc/${PN}/ssl/server.key.pem
+ )
+ fi
+ fi
+
+ local unrealircd_conf="${EROOT}"etc/${PN}/${PN}.conf
+ # Fix up the default cloak keys.
+ if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
+ ebegin "Generating cloak-keys"
+ local keys=(
+ $(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
+ )
+ [[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
+ eend $?
+
+ ebegin "Substituting cloak-keys into ${unrealircd_conf}"
+ sed -i \
+ -e '/cloak-keys/ {
+n
+s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
+n
+s/"and another one";/"'"${keys[1]}"'";/
+n
+s/"and another one";/"'"${keys[2]}"'";/
+}' \
+ "${unrealircd_conf}"
+ eend $?
+ fi
+
+ elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+ elog
+ elog "You can also configure ${PN} start at boot with rc-update(1)."
+ elog "It is recommended to run unrealircd as an unprivileged user."
+ elog "The provided init.d script does this for you."
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 195a4d46c4db..3d792c8f0588 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index c3a90d5a2b6a..6498fdc5f9f2 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,4 +1,6 @@
DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
+DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560 SHA512 b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
+DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822 SHA512 a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.18.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.18.0.ebuild
new file mode 100644
index 000000000000..5a7d5d90d9ca
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.18.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
+KNOTS_PV="${PV}.knots20190502"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Bitcoin Core consensus library"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+ https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+ https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm knots libressl"
+
+DEPEND="
+ >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+ !libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+ if use knots; then
+ elog "You are building ${PN} from Bitcoin Knots."
+ elog "For more information, see:"
+ elog "https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+ else
+ elog "You are building ${PN} from Bitcoin Core."
+ elog "For more information, see:"
+ elog "https://bitcoincore.org/en/2019/05/02/release-${PV}/"
+ fi
+}
+
+src_prepare() {
+ local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+ eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+ if use knots; then
+ eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+ fi
+
+ eapply_user
+
+ echo '#!/bin/true' >share/genbuild.sh || die
+ mkdir -p src/obj || die
+ echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+ eautoreconf
+ rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+ local my_econf=(
+ $(use_enable asm)
+ --without-qtdbus
+ --without-qrencode
+ --without-miniupnpc
+ --disable-tests
+ --disable-wallet
+ --disable-zmq
+ --with-libs
+ --disable-util-cli
+ --disable-util-tx
+ --disable-util-wallet
+ --disable-bench
+ --without-daemon
+ --without-gui
+ --without-rapidcheck
+ --disable-fuzz
+ --disable-ccache
+ --disable-static
+ --with-system-libsecp256k1
+ )
+ econf "${my_econf[@]}"
+}
+
+src_install() {
+ default
+
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 0fd9eed430dd..a0d13e20200d 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -1,3 +1,3 @@
DIST liblockfile_1.09.orig.tar.gz 32178 BLAKE2B b78f632e3bf1ed926596abf9fb0450cc325f888ba245d724f6c02800d939f2d5933b0f90bac92d543cdc5ee6b27f8c4fb70901742e83e8d5becbdbc60e20e5b3 SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a
-DIST liblockfile_1.13.orig.tar.gz 67720 BLAKE2B c42248c652fda4604a0b4210f77046c2bbb50fc63459da03e1302d436abc21f34e77d17ca9f1e0f80abf674ac9942656014b2ea74bbf9ee92ab17d3c0b2e08cc SHA512 509b00e6841ecdbd6bef0fdf620a31f49b2e07d29c7dd2407297a3e92ded568933d75390f7cab43dd514949c6ccf8924e621324a8d4bbde4c71847b7b257318a
DIST liblockfile_1.14.orig.tar.gz 67856 BLAKE2B 1b83c79217c533ed3f5ef0e3ee33877d541670e14eaa2003b37b5a9b0ae544611f88beb28ecb527d82295e41744e1dfc653b7822436a314c25444a686f30b89d SHA512 d6d75a1ddb55bae8ee63bd0cbacf7ab8cd6d28b29a7d3c2e4a5c31c76c6743ed517cdebd42e3ef5c44698faebfd1537b023510c692b54a1275e7114605fe6550
+DIST liblockfile_1.15.orig.tar.gz 68238 BLAKE2B 3819e6f391467073836ed790ce9b8bbac8e9887d0aea19b1bb083c1020a2e18d3364a087a8c0e962aac66a904768dd843be28e6364b8b150049b6348cfaa944a SHA512 048bbe2c87e85e6ec9b0347809c07183e4210cd565b38653dd1d967106209ccef4146db97afe5a5b7a6d3c58579d4d17f7e241e87be085791bad65b9eeed23f0
diff --git a/net-libs/liblockfile/liblockfile-1.13.ebuild b/net-libs/liblockfile/liblockfile-1.13.ebuild
deleted file mode 100644
index 5e227dcd565d..000000000000
--- a/net-libs/liblockfile/liblockfile-1.13.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib user
-
-DESCRIPTION="Implements functions designed to lock the standard mailboxes"
-HOMEPAGE="http://www.debian.org/"
-SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="LGPL-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 ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( Changelog README )
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.13-makefile.patch"
-)
-
-pkg_setup() {
- enewgroup mail 12
-}
-
-src_prepare() {
- default
-
- # I don't feel like making the Makefile portable
- [[ ${CHOST} == *-darwin* ]] \
- && cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
-
- eautoreconf
-}
-
-src_configure() {
- local grp=mail
- if use prefix ; then
- # we never want to use LDCONFIG
- export LDCONFIG=${EPREFIX}/bin/true
- # in unprivileged installs this is "mail"
- grp=$(id -g)
- fi
- econf --with-mailgroup=${grp} --enable-shared
-}
diff --git a/net-libs/liblockfile/liblockfile-1.14.ebuild b/net-libs/liblockfile/liblockfile-1.15.ebuild
similarity index 76%
rename from net-libs/liblockfile/liblockfile-1.14.ebuild
rename to net-libs/liblockfile/liblockfile-1.15.ebuild
index 5e227dcd565d..bcfa527efdce 100644
--- a/net-libs/liblockfile/liblockfile-1.14.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit autotools multilib user
+inherit autotools multilib
DESCRIPTION="Implements functions designed to lock the standard mailboxes"
HOMEPAGE="http://www.debian.org/"
@@ -11,10 +11,11 @@ SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="LGPL-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 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
-S="${WORKDIR}/${PN}"
+RDEPEND="acct-group/mail"
+DEPEND="${RDEPEND}"
DOCS=( Changelog README )
@@ -22,10 +23,6 @@ PATCHES=(
"${FILESDIR}/${PN}-1.13-makefile.patch"
)
-pkg_setup() {
- enewgroup mail 12
-}
-
src_prepare() {
default
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 510bf50693ca..d01cd6be8ab7 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index fdf7e81dd847..078f5158c009 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,11 +1,6 @@
DIST dovecot-2.2-pigeonhole-0.4.24.1.tar.gz 1810959 BLAKE2B f24b28dc7422ea4f379e372adf33ebbf7cbb146d55b01dbf40580767a14adf695b0a2726f591c0c34436bd93a8b48ee8a8c4307fffc6b082d9c028ce93e29a0a SHA512 99af8a1f4588d821c7000133c5c173ab05640d3411b826a0978db2d60c9a59d5b330ca2d38aa25aa1163f6d1b669dc97b8303e2bceda554f67d0029d5d0b34fd
DIST dovecot-2.2.36.3.tar.gz 6270735 BLAKE2B 90bd6f7cd3769040215f574bb368c1ad835041fff54273e2477be2d2e057c1700472b08a24ed3a7cad469bd39449d94986bc6801373bb97a63975ddbb54cefa5 SHA512 47611dbde7ee854ad323dcdb726757c7172376761fa774f28fce3f9d74ed590319d812f0555abed5f8178c326c3cb7661ac0b708ca5982914e255cec60f72e35
-DIST dovecot-2.3-pigeonhole-0.5.5.tar.gz 1847487 BLAKE2B 9574388566778a4011ce6546021675ed9e07ba0d874dc4163e4cea10096f3bb8a434f198c3bb446b628ee18402afe94bd90b7123b3cf4d47e4095ddad12d9bfc SHA512 21519fc9b1152a947b64ce4251e1a4bdbe003b48233b1856a32696f9c1e29f730268c56eb38f9431bbfac345e6cd42e8c78c87d0702f39ebf20c6d326dcdbb94
DIST dovecot-2.3-pigeonhole-0.5.6.tar.gz 1854287 BLAKE2B a26edf2a298d8c3de0d9977d56583bd2e0933495c5f554871a38d7b9e31701ebf3587d221c5ec398721a9c34816918c41b069de39c13f879334f9776fede1a17 SHA512 998a046d2eb5ff7bba615fd1a3efdfb1e7e1dabf191257f7fa2882074acc1735a0a4c11c5f31bab1e964b0118f1a8e9e51b3d5529b8fff6d1312c9a8257d9c20
DIST dovecot-2.3-pigeonhole-0.5.7.1.tar.gz 1857291 BLAKE2B 09763c87099ac50fbe86870855b100379a9b2a72d6077438bbf1f76ff3aed162ad781be27e6587a9742819137f6636f142a220f3b46d3c46115b10cbf4cb2efc SHA512 121eac4ad8bc1ddc55c554d00338bb553590b6aedffcb11e34f6cba102d59bd34580cb7218bd5fe820038c004d12db73f7a27ca135c3d4a12c4449bae3216355
-DIST dovecot-2.3-pigeonhole-0.5.7.tar.gz 1856779 BLAKE2B ce9fe5570f058ceed6ef5ea5f732b079e7924bcdc8910cb13e8686898b654705ea006286cbb19105975f83d6c96a0256106b6f0ec10f561cd6040311be2087d8 SHA512 f58098ae13b41a6378080340240928083514a541f2fe3c8f516853455ab27635e0c47587a101aca5eb4e97ec8afe6a5dd5360c46e956b009ae971316e491f1b8
-DIST dovecot-2.3.5.1.tar.gz 6953150 BLAKE2B 04484325e7b87f78c0aa6e3c769bc921e9dc62562cd8705b99166b7291b794f434b088dcf6512bc21c96d8937475cafa4d49c6ac611cb07f74a0d20e15e185c7 SHA512 e87754461fb0b065acd0ff10dc955000a2fe5baffed69efaf328ce9268f90140e9de444bc68e0bd48b565c7622885a79b1f90ff3dd2335c0c2362d05d9e73e8a
-DIST dovecot-2.3.5.2.tar.gz 6953228 BLAKE2B d3634ca0621349ed82c552b416bd633497ce9e4bdd5df30c2e35da1ab70a5934e2dda2b88ac6bbebeebc23918d9dcfb7a0976b1b51fba5eefd14327b2b2ea734 SHA512 041ec1c33c6accb5c89d96d7ab2f7dd59795f496c17faea1906e7977983e4a387aa855a238376515c09532731634d9d42e6d6be22659062855241847ea0213d5
DIST dovecot-2.3.6.tar.gz 6980135 BLAKE2B 59ce625aafb96092cbd687aa0d5ccc3d7697228606978efa89bbf50e608915e381abb79348197aaf3b3fa046618bcf88acdc77420f9f028035653b8cb9843009 SHA512 ec28af2efcbd4ab534298c3342709251074dcdb0f0f4bcad0d24b996b273387e2ce557d7ab54abafb69be3ed7dd61f25c82b9710d78156932e2eff7f941c9eb2
DIST dovecot-2.3.7.1.tar.gz 7076500 BLAKE2B fba84e324de44a4f463769ee8b99ddc532f3ac3fad3c55a1035a367c7b186850cd49c3c45ecea439469e84abf2ae26dcfc8f454c3d2dab43be0fd89721c8053f SHA512 9addfe2be9ae745ac9164e1658e6638df96bd611d45f172e2cd1cb2c6596e4ce534674e9eea3c1d17f497555061031916e0fb9a9fbc6de0eb6034e2fd0bed3b9
-DIST dovecot-2.3.7.tar.gz 7074117 BLAKE2B 30aa02cc1dbd83f2ecc65f7b27543d3a1614c857e3d432454f13e4108cb4a15fc37c8c07835a2eaeb6b03077066fba2ed947e30f033926f52213a7446dd096eb SHA512 a8828b6cdf0ada0d317a4606d88370f1360415dadcf0f3a6f157d76396bcaf7379d85114d9747011b429ee94bee8eff7de8d0b6cf25e2618af15fdfba8ae4508
diff --git a/net-mail/dovecot/dovecot-2.3.5.1.ebuild b/net-mail/dovecot/dovecot-2.3.5.1.ebuild
deleted file mode 100644
index f708782a71c8..000000000000
--- a/net-mail/dovecot/dovecot-2.3.5.1.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# do not add a ssl USE flag. ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools eapi7-ver ssl-cert systemd user
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.5"
-if [[ ${PV} == *_rc* ]] ; then
- rc_dir="rc/"
-else
- rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
- sieve? (
- https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
- )
- managesieve? (
- https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
- ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sparc x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="argon2? ( dev-libs/libsodium )
- bzip2? ( app-arch/bzip2 )
- caps? ( sys-libs/libcap )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap )
- lua? ( dev-lang/lua:* )
- lucene? ( >=dev-cpp/clucene-2.3 )
- lzma? ( app-arch/xz-utils )
- lz4? ( app-arch/lz4 )
- mysql? ( dev-db/mysql-connector-c:0= )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
- selinux? ( sec-policy/selinux-dovecot )
- solr? ( net-misc/curl dev-libs/expat )
- sqlite? ( dev-db/sqlite:* )
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- tcpd? ( sys-apps/tcp-wrappers )
- textcat? ( app-text/libexttextcat )
- vpopmail? ( net-mail/vpopmail )
- zlib? ( sys-libs/zlib )
- virtual/libiconv
- dev-libs/icu:="
-
-RDEPEND="${DEPEND}
- net-mail/mailbase"
-
-PATCHES=(
- "${FILESDIR}/${PN}-userdb-passwd-fix.patch"
-)
-
-pkg_setup() {
- if use managesieve && ! use sieve; then
- ewarn "managesieve USE flag selected but sieve USE flag unselected"
- ewarn "sieve USE flag will be turned on"
- fi
- # default internal user
- enewgroup dovecot 97
- enewuser dovecot 97 -1 /dev/null dovecot
- # default login user
- enewuser dovenull -1 -1 /dev/null
- # add "mail" group for suid'ing. Better security isolation.
- if use suid; then
- enewgroup mail
- fi
-}
-
-src_prepare() {
- default
- # bug 657108
- # elibtoolize
- eautoreconf
-}
-
-src_configure() {
- local conf=""
-
- if use postgres || use mysql || use sqlite; then
- conf="${conf} --with-sql"
- fi
-
- # turn valgrind tests off. Bug #340791
- VALGRIND=no econf \
- --with-rundir="${EPREFIX}/run/dovecot" \
- --with-statedir="${EPREFIX}/var/lib/dovecot" \
- --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
- --without-stemmer \
- --disable-rpath \
- --without-libbsd \
- --with-icu \
- --with-ssl \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $( use_with argon2 sodium ) \
- $( use_with bzip2 bzlib ) \
- $( use_with caps libcap ) \
- $( use_with kerberos gssapi ) \
- $( use_with lua ) \
- $( use_with ldap ) \
- $( use_with lucene ) \
- $( use_with lz4 ) \
- $( use_with lzma ) \
- $( use_with mysql ) \
- $( use_with pam ) \
- $( use_with postgres pgsql ) \
- $( use_with sqlite ) \
- $( use_with solr ) \
- $( use_with tcpd libwrap ) \
- $( use_with textcat ) \
- $( use_with vpopmail ) \
- $( use_with zlib ) \
- $( use_enable static-libs static ) \
- ${conf}
-
- if use sieve || use managesieve ; then
- # The sieve plugin needs this file to be build to determine the plugin
- # directory and the list of libraries to link to.
- emake dovecot-config
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
- econf \
- $( use_enable static-libs static ) \
- --localstatedir="${EPREFIX%/}/var" \
- --enable-shared \
- --with-dovecot="${S}" \
- $( use_with managesieve )
- fi
-}
-
-src_compile() {
- default
- if use sieve || use managesieve ; then
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
- fi
-}
-
-src_test() {
- default
- if use sieve || use managesieve ; then
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
- default
- fi
-}
-
-src_install () {
- default
-
- # insecure:
- # use suid && fperms u+s /usr/libexec/dovecot/deliver
- # better:
- if use suid;then
- einfo "Changing perms to allow deliver to be suided"
- fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
- fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
- fi
-
- newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
- rm -rf "${ED}"/usr/share/doc/dovecot
-
- dodoc AUTHORS NEWS README TODO
- dodoc doc/*.{txt,cnf,xml,sh}
- docinto example-config
- dodoc doc/example-config/*.{conf,ext}
- docinto example-config/conf.d
- dodoc doc/example-config/conf.d/*.{conf,ext}
- docinto wiki
- dodoc doc/wiki/*
- doman doc/man/*.{1,7}
-
- # Create the dovecot.conf file from the dovecot-example.conf file that
- # the dovecot folks nicely left for us....
- local conf="${ED}/etc/dovecot/dovecot.conf"
- local confd="${ED}/etc/dovecot/conf.d"
-
- insinto /etc/dovecot
- doins doc/example-config/*.{conf,ext}
- insinto /etc/dovecot/conf.d
- doins doc/example-config/conf.d/*.{conf,ext}
- fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
- rm -f "${confd}/../README"
-
- # .maildir is the Gentoo default
- local mail_location="maildir:~/.maildir"
- sed -i -e \
- "s|#mail_location =|mail_location = ${mail_location}|" \
- "${confd}/10-mail.conf" \
- || die "failed to update mail location settings in 10-mail.conf"
-
- # We're using pam files (imap and pop3) provided by mailbase
- if use pam; then
- sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
- "${confd}/auth-system.conf.ext" \
- || die "failed to update PAM settings in auth-system.conf.ext"
- # mailbase does not provide a sieve pam file
- use managesieve && dosym imap /etc/pam.d/sieve
- sed -i -e \
- 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
- "${confd}/10-auth.conf" \
- || die "failed to update PAM settings in 10-auth.conf"
- fi
-
- # Disable ipv6 if necessary
- if ! use ipv6; then
- sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
- || die "failed to update listen settings in dovecot.conf"
- fi
-
- # Update ssl cert locations
- sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
- || die "ssl conf failed"
- sed -i -e 's:^ssl_cert =.*:ssl_cert = =dev-cpp/clucene-2.3 )
- lzma? ( app-arch/xz-utils )
- lz4? ( app-arch/lz4 )
- mysql? ( dev-db/mysql-connector-c:0= )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
- selinux? ( sec-policy/selinux-dovecot )
- solr? ( net-misc/curl dev-libs/expat )
- sqlite? ( dev-db/sqlite:* )
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- tcpd? ( sys-apps/tcp-wrappers )
- textcat? ( app-text/libexttextcat )
- vpopmail? ( net-mail/vpopmail )
- zlib? ( sys-libs/zlib )
- virtual/libiconv
- dev-libs/icu:="
-
-RDEPEND="${DEPEND}
- net-mail/mailbase"
-
-PATCHES=(
- "${FILESDIR}/${PN}-userdb-passwd-fix.patch"
-)
-
-pkg_setup() {
- if use managesieve && ! use sieve; then
- ewarn "managesieve USE flag selected but sieve USE flag unselected"
- ewarn "sieve USE flag will be turned on"
- fi
- # default internal user
- enewgroup dovecot 97
- enewuser dovecot 97 -1 /dev/null dovecot
- # default login user
- enewuser dovenull -1 -1 /dev/null
- # add "mail" group for suid'ing. Better security isolation.
- if use suid; then
- enewgroup mail
- fi
-}
-
-src_prepare() {
- default
- # bug 657108
- elibtoolize
- #eautoreconf
-}
-
-src_configure() {
- local conf=""
-
- if use postgres || use mysql || use sqlite; then
- conf="${conf} --with-sql"
- fi
-
- # turn valgrind tests off. Bug #340791
- VALGRIND=no econf \
- --with-rundir="${EPREFIX}/run/dovecot" \
- --with-statedir="${EPREFIX}/var/lib/dovecot" \
- --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
- --without-stemmer \
- --disable-rpath \
- --without-libbsd \
- --with-icu \
- --with-ssl \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $( use_with argon2 sodium ) \
- $( use_with bzip2 bzlib ) \
- $( use_with caps libcap ) \
- $( use_with kerberos gssapi ) \
- $( use_with lua ) \
- $( use_with ldap ) \
- $( use_with lucene ) \
- $( use_with lz4 ) \
- $( use_with lzma ) \
- $( use_with mysql ) \
- $( use_with pam ) \
- $( use_with postgres pgsql ) \
- $( use_with sqlite ) \
- $( use_with solr ) \
- $( use_with tcpd libwrap ) \
- $( use_with textcat ) \
- $( use_with vpopmail ) \
- $( use_with zlib ) \
- $( use_enable static-libs static ) \
- ${conf}
-
- if use sieve || use managesieve ; then
- # The sieve plugin needs this file to be build to determine the plugin
- # directory and the list of libraries to link to.
- emake dovecot-config
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
- econf \
- $( use_enable static-libs static ) \
- --localstatedir="${EPREFIX%/}/var" \
- --enable-shared \
- --with-dovecot="${S}" \
- $( use_with managesieve )
- fi
-}
-
-src_compile() {
- default
- if use sieve || use managesieve ; then
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
- fi
-}
-
-src_test() {
- default
- if use sieve || use managesieve ; then
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
- default
- fi
-}
-
-src_install () {
- default
-
- # insecure:
- # use suid && fperms u+s /usr/libexec/dovecot/deliver
- # better:
- if use suid;then
- einfo "Changing perms to allow deliver to be suided"
- fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
- fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
- fi
-
- newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
- rm -rf "${ED}"/usr/share/doc/dovecot
-
- dodoc AUTHORS NEWS README TODO
- dodoc doc/*.{txt,cnf,xml,sh}
- docinto example-config
- dodoc doc/example-config/*.{conf,ext}
- docinto example-config/conf.d
- dodoc doc/example-config/conf.d/*.{conf,ext}
- docinto wiki
- dodoc doc/wiki/*
- doman doc/man/*.{1,7}
-
- # Create the dovecot.conf file from the dovecot-example.conf file that
- # the dovecot folks nicely left for us....
- local conf="${ED}/etc/dovecot/dovecot.conf"
- local confd="${ED}/etc/dovecot/conf.d"
-
- insinto /etc/dovecot
- doins doc/example-config/*.{conf,ext}
- insinto /etc/dovecot/conf.d
- doins doc/example-config/conf.d/*.{conf,ext}
- fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
- rm -f "${confd}/../README"
-
- # .maildir is the Gentoo default
- local mail_location="maildir:~/.maildir"
- sed -i -e \
- "s|#mail_location =|mail_location = ${mail_location}|" \
- "${confd}/10-mail.conf" \
- || die "failed to update mail location settings in 10-mail.conf"
-
- # We're using pam files (imap and pop3) provided by mailbase
- if use pam; then
- sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
- "${confd}/auth-system.conf.ext" \
- || die "failed to update PAM settings in auth-system.conf.ext"
- # mailbase does not provide a sieve pam file
- use managesieve && dosym imap /etc/pam.d/sieve
- sed -i -e \
- 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
- "${confd}/10-auth.conf" \
- || die "failed to update PAM settings in 10-auth.conf"
- fi
-
- # Disable ipv6 if necessary
- if ! use ipv6; then
- sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
- || die "failed to update listen settings in dovecot.conf"
- fi
-
- # Update ssl cert locations
- sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
- || die "ssl conf failed"
- sed -i -e 's:^ssl_cert =.*:ssl_cert = =dev-cpp/clucene-2.3 )
- lzma? ( app-arch/xz-utils )
- lz4? ( app-arch/lz4 )
- mysql? ( dev-db/mysql-connector-c:0= )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
- selinux? ( sec-policy/selinux-dovecot )
- solr? ( net-misc/curl dev-libs/expat )
- sqlite? ( dev-db/sqlite:* )
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- suid? ( acct-group/mail )
- tcpd? ( sys-apps/tcp-wrappers )
- textcat? ( app-text/libexttextcat )
- vpopmail? ( net-mail/vpopmail )
- zlib? ( sys-libs/zlib )
- virtual/libiconv
- dev-libs/icu:="
-
-RDEPEND="${DEPEND}
- net-mail/mailbase"
-
-PATCHES=(
- "${FILESDIR}/${PN}-userdb-passwd-fix.patch"
- "${FILESDIR}/${PN}-no-log-error-tcp_nodelay.patch"
-)
-
-pkg_setup() {
- if use managesieve && ! use sieve; then
- ewarn "managesieve USE flag selected but sieve USE flag unselected"
- ewarn "sieve USE flag will be turned on"
- fi
- # default internal user
- enewgroup dovecot 97
- enewuser dovecot 97 -1 /dev/null dovecot
- # default login user
- enewuser dovenull -1 -1 /dev/null
-}
-
-src_prepare() {
- default
- # bug 657108
- elibtoolize
- #eautoreconf
-}
-
-src_configure() {
- local conf=""
-
- if use postgres || use mysql || use sqlite; then
- conf="${conf} --with-sql"
- fi
-
- # turn valgrind tests off. Bug #340791
- VALGRIND=no econf \
- --with-rundir="${EPREFIX}/run/dovecot" \
- --with-statedir="${EPREFIX}/var/lib/dovecot" \
- --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
- --without-stemmer \
- --disable-rpath \
- --without-libbsd \
- --with-icu \
- --with-ssl \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $( use_with argon2 sodium ) \
- $( use_with bzip2 bzlib ) \
- $( use_with caps libcap ) \
- $( use_with kerberos gssapi ) \
- $( use_with lua ) \
- $( use_with ldap ) \
- $( use_with lucene ) \
- $( use_with lz4 ) \
- $( use_with lzma ) \
- $( use_with mysql ) \
- $( use_with pam ) \
- $( use_with postgres pgsql ) \
- $( use_with sqlite ) \
- $( use_with solr ) \
- $( use_with tcpd libwrap ) \
- $( use_with textcat ) \
- $( use_with vpopmail ) \
- $( use_with zlib ) \
- $( use_enable static-libs static ) \
- ${conf}
-
- if use sieve || use managesieve ; then
- # The sieve plugin needs this file to be build to determine the plugin
- # directory and the list of libraries to link to.
- emake dovecot-config
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
- econf \
- $( use_enable static-libs static ) \
- --localstatedir="${EPREFIX%/}/var" \
- --enable-shared \
- --with-dovecot="${S}" \
- $( use_with managesieve )
- fi
-}
-
-src_compile() {
- default
- if use sieve || use managesieve ; then
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
- fi
-}
-
-src_test() {
- default
- if use sieve || use managesieve ; then
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
- default
- fi
-}
-
-src_install () {
- default
-
- # insecure:
- # use suid && fperms u+s /usr/libexec/dovecot/deliver
- # better:
- if use suid;then
- einfo "Changing perms to allow deliver to be suided"
- fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
- fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
- fi
-
- newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
- rm -rf "${ED}"/usr/share/doc/dovecot
-
- dodoc AUTHORS NEWS README TODO
- dodoc doc/*.{txt,cnf,xml,sh}
- docinto example-config
- dodoc doc/example-config/*.{conf,ext}
- docinto example-config/conf.d
- dodoc doc/example-config/conf.d/*.{conf,ext}
- docinto wiki
- dodoc doc/wiki/*
- doman doc/man/*.{1,7}
-
- # Create the dovecot.conf file from the dovecot-example.conf file that
- # the dovecot folks nicely left for us....
- local conf="${ED}/etc/dovecot/dovecot.conf"
- local confd="${ED}/etc/dovecot/conf.d"
-
- insinto /etc/dovecot
- doins doc/example-config/*.{conf,ext}
- insinto /etc/dovecot/conf.d
- doins doc/example-config/conf.d/*.{conf,ext}
- fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
- rm -f "${confd}/../README"
-
- # .maildir is the Gentoo default
- local mail_location="maildir:~/.maildir"
- sed -i -e \
- "s|#mail_location =|mail_location = ${mail_location}|" \
- "${confd}/10-mail.conf" \
- || die "failed to update mail location settings in 10-mail.conf"
-
- # We're using pam files (imap and pop3) provided by mailbase
- if use pam; then
- sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
- "${confd}/auth-system.conf.ext" \
- || die "failed to update PAM settings in auth-system.conf.ext"
- # mailbase does not provide a sieve pam file
- use managesieve && dosym imap /etc/pam.d/sieve
- sed -i -e \
- 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
- "${confd}/10-auth.conf" \
- || die "failed to update PAM settings in 10-auth.conf"
- fi
-
- # Disable ipv6 if necessary
- if ! use ipv6; then
- sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
- || die "failed to update listen settings in dovecot.conf"
- fi
-
- # Update ssl cert locations
- sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
- || die "ssl conf failed"
- sed -i -e 's:^ssl_cert =.*:ssl_cert =
-Date: Sun, 24 Feb 2019 22:56:21 +0200
-Subject: Bugfix
-
-* python/3/libmu_py/mailcap.c: Fix leftover uses of PyString_FromString
-and PyInt_FromLong.
----
- python/3/libmu_py/mailcap.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/python/3/libmu_py/mailcap.c b/python/3/libmu_py/mailcap.c
-index 6db1770..fdb5b71 100644
---- a/python/3/libmu_py/mailcap.c
-+++ b/python/3/libmu_py/mailcap.c
-@@ -91,11 +91,11 @@ api_mailcap_create (PyObject *self, PyObject *args)
-
- status = mu_mailcap_create (&py_mc->mc);
- if (status)
-- return _ro (PyInt_FromLong (status));
-+ return _ro (PyLong_FromLong (status));
- status = mu_mailcap_parse (py_mc->mc, py_stm->stm, NULL);
- if (status == MU_ERR_PARSE)
- status = 0; /* FIXME */
-- return _ro (PyInt_FromLong (status));
-+ return _ro (PyLong_FromLong (status));
- }
-
- static PyObject *
-@@ -183,7 +183,7 @@ api_mailcap_entry_get_field (PyObject *self, PyObject *args)
- status = mu_mailcap_entry_sget_field (py_entry->entry, name, &value);
- return status_object (status,
- status == 0
-- ? (value ? PyString_FromString (value)
-+ ? (value ? PyUnicode_FromString (value)
- : PyBool_FromLong (1))
- : PyBool_FromLong (0));
- }
-@@ -199,7 +199,7 @@ api_mailcap_entry_get_typefield (PyObject *self, PyObject *args)
- return NULL;
-
- status = mu_mailcap_entry_sget_type (py_entry->entry, &value);
-- return status_object (status, PyString_FromString (status == 0 ? value : ""));
-+ return status_object (status, PyUnicode_FromString (status == 0 ? value : ""));
- }
-
- static PyObject *
-@@ -213,7 +213,7 @@ api_mailcap_entry_get_viewcommand (PyObject *self, PyObject *args)
- return NULL;
-
- status = mu_mailcap_entry_sget_command (py_entry->entry, &value);
-- return status_object (status, PyString_FromString (status == 0 ? value : ""));
-+ return status_object (status, PyUnicode_FromString (status == 0 ? value : ""));
- }
-
- static PyMethodDef methods[] = {
---
-cgit v1.0-41-gc330
-
diff --git a/net-mail/mailutils/mailutils-3.4-r2.ebuild b/net-mail/mailutils/mailutils-3.4-r2.ebuild
deleted file mode 100644
index 00f17a8e4344..000000000000
--- a/net-mail/mailutils/mailutils-3.4-r2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
- mysql nls pam postgres python servers ssl static-libs +threads tcpd \
- tokyocabinet"
-
-RDEPEND="!mail-client/nmh
- !mail-filter/libsieve
- !mail-client/mailx
- !mail-client/nail
- sys-libs/ncurses:=
- sys-libs/readline:=
- dev-libs/libltdl:0
- virtual/mta
- berkdb? ( sys-libs/db:= )
- bidi? ( dev-libs/fribidi )
- gdbm? ( sys-libs/gdbm )
- guile? ( dev-scheme/guile:12/22 )
- kerberos? ( virtual/krb5 )
- kyotocabinet? ( dev-db/kyotocabinet )
- ldap? ( net-nds/openldap )
- mysql? ( virtual/mysql )
- nls? ( sys-devel/gettext )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( virtual/gsasl )
- ssl? ( net-libs/gnutls:= )
- tcpd? ( sys-apps/tcp-wrappers )
- tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- servers? ( tcpd )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Disable bytecompilation of Python modules.
- echo "#!/bin/sh" > build-aux/py-compile
- eapply "${FILESDIR}/${P}-MH-testsuite.patch" \
- "${FILESDIR}/${P}-fix-endianness.patch"
- # add missing tests so that make check doesn't fail
- cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
- if use mysql; then
- sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
- sql/Makefile.am || die
- fi
- eapply_user
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # maildir is the Gentoo default
- econf MU_DEFAULT_SCHEME=maildir \
- CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
- $(use_with berkdb berkeley-db) \
- $(use_with bidi fribidi) \
- $(use_enable ipv6) \
- $(use_with gdbm) \
- $(use_with sasl gsasl) \
- $(use_with guile) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_with postgres) \
- $(use_enable python) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with tokyocabinet) \
- $(use_with kyotocabinet) \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable servers build-servers) \
- $(use_enable clients build-clients) \
- --with-mail-spool=/var/spool/mail \
- --with-readline \
- --enable-sendmail \
- --disable-debug \
- --disable-rpath
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- insinto /etc
- # bug 613112
- newins "${FILESDIR}/mailutils.rc" mailutils.conf
- keepdir /etc/mailutils.d/
- insinto /etc/mailutils.d
- doins "${FILESDIR}/mail"
-
- if use python; then
- python_optimize
- if use static-libs; then
- rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
- fi
- fi
-
- if use servers; then
- newinitd "${FILESDIR}"/imap4d.initd imap4d
- newinitd "${FILESDIR}"/pop3d.initd pop3d
- newinitd "${FILESDIR}"/comsatd.initd comsatd
- fi
-
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
-
- # compatibility link
- use clients && dosym /usr/bin/mail /bin/mail
-
- use static-libs || find "${D}" -name "*.la" -delete
-}
diff --git a/net-mail/mailutils/mailutils-3.5.ebuild b/net-mail/mailutils/mailutils-3.5.ebuild
deleted file mode 100644
index 8e882f408c46..000000000000
--- a/net-mail/mailutils/mailutils-3.5.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
- ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd \
- tokyocabinet"
-
-RDEPEND="!mail-client/nmh
- !mail-filter/libsieve
- !mail-client/mailx
- !mail-client/nail
- sys-libs/ncurses:=
- sys-libs/readline:=
- dev-libs/libltdl:0
- virtual/mta
- berkdb? ( sys-libs/db:= )
- bidi? ( dev-libs/fribidi )
- emacs? ( virtual/emacs )
- gdbm? ( sys-libs/gdbm )
- guile? ( dev-scheme/guile:12/2.2-1 )
- kerberos? ( virtual/krb5 )
- kyotocabinet? ( dev-db/kyotocabinet )
- ldap? ( net-nds/openldap )
- mysql? ( virtual/mysql )
- nls? ( sys-devel/gettext )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( virtual/gsasl )
- ssl? ( net-libs/gnutls:= )
- tcpd? ( sys-apps/tcp-wrappers )
- tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- servers? ( tcpd )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- if use mysql; then
- sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
- sql/Makefile.am || die
- fi
- # bug 669946
- eapply "${FILESDIR}/${PN}-3.5-add-include.patch"
- eapply_user
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # maildir is the Gentoo default
- econf MU_DEFAULT_SCHEME=maildir \
- CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
- $(use_with berkdb berkeley-db) \
- $(use_with bidi fribidi) \
- $(use_enable ipv6) \
- $(use_with gdbm) \
- $(use_with sasl gsasl) \
- $(use_with guile) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_with postgres) \
- $(use_enable python) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with tokyocabinet) \
- $(use_with kyotocabinet) \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable servers build-servers) \
- $(use_enable clients build-clients) \
- EMACS=$(usex emacs emacs no) \
- --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
- --with-mail-spool=/var/spool/mail \
- --with-readline \
- --enable-sendmail \
- --disable-debug
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- insinto /etc
- # bug 613112
- newins "${FILESDIR}/mailutils.rc" mailutils.conf
- keepdir /etc/mailutils.d/
- insinto /etc/mailutils.d
- doins "${FILESDIR}/mail"
-
- if use python; then
- python_optimize
- if use static-libs; then
- rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
- fi
- fi
-
- if use servers; then
- newinitd "${FILESDIR}"/imap4d.initd imap4d
- newinitd "${FILESDIR}"/pop3d.initd pop3d
- newinitd "${FILESDIR}"/comsatd.initd comsatd
- fi
-
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
-
- # compatibility link
- use clients && dosym /usr/bin/mail /bin/mail
-
- use static-libs || find "${D}" -name "*.la" -delete
-}
diff --git a/net-mail/mailutils/mailutils-3.6.ebuild b/net-mail/mailutils/mailutils-3.6.ebuild
deleted file mode 100644
index 37a366e3af83..000000000000
--- a/net-mail/mailutils/mailutils-3.6.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
- ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd \
- tokyocabinet"
-
-RDEPEND="!mail-client/nmh
- !mail-filter/libsieve
- !mail-client/mailx
- !mail-client/nail
- sys-libs/ncurses:=
- sys-libs/readline:=
- dev-libs/libltdl:0
- virtual/mta
- berkdb? ( sys-libs/db:= )
- bidi? ( dev-libs/fribidi )
- emacs? ( virtual/emacs )
- gdbm? ( sys-libs/gdbm )
- guile? ( dev-scheme/guile:12/2.2-1 )
- kerberos? ( virtual/krb5 )
- kyotocabinet? ( dev-db/kyotocabinet )
- ldap? ( net-nds/openldap )
- mysql? ( dev-db/mysql-connector-c )
- nls? ( sys-devel/gettext )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( virtual/gsasl )
- servers? ( virtual/libiconv dev-libs/libunistring )
- ssl? ( net-libs/gnutls:= )
- tcpd? ( sys-apps/tcp-wrappers )
- tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- servers? ( tcpd ldap )"
-
-DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=( "${FILESDIR}/${PN}-3.5-add-include.patch" \
- "${FILESDIR}/${PN}-3.6-python3.patch"
- "${FILESDIR}/${PN}-3.6-underlinking.patch" )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- if use mysql; then
- sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
- sql/Makefile.am || die
- fi
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # maildir is the Gentoo default
- econf MU_DEFAULT_SCHEME=maildir \
- CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
- $(use_with berkdb berkeley-db) \
- $(use_with bidi fribidi) \
- $(use_enable ipv6) \
- $(use_with gdbm) \
- $(use_with sasl gsasl) \
- $(use_with guile) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_with postgres) \
- $(use_enable python) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with tokyocabinet) \
- $(use_with kyotocabinet) \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable servers build-servers) \
- $(use_with servers unistring ) \
- $(use_enable clients build-clients) \
- EMACS=$(usex emacs emacs no) \
- --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
- --with-mail-spool=/var/spool/mail \
- --with-readline \
- --enable-sendmail \
- --disable-debug
-}
-
-src_install() {
- default
- emake DESTDIR="${D}" install
-
- insinto /etc
- # bug 613112
- newins "${FILESDIR}/mailutils.rc" mailutils.conf
- keepdir /etc/mailutils.d/
- insinto /etc/mailutils.d
- doins "${FILESDIR}/mail"
-
- if use python; then
- python_optimize
- if use static-libs; then
- rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
- fi
- fi
-
- if use servers; then
- newinitd "${FILESDIR}"/imap4d.initd imap4d
- newinitd "${FILESDIR}"/pop3d.initd pop3d
- newinitd "${FILESDIR}"/comsatd.initd comsatd
- fi
-
- # compatibility link
- use clients && dosym /usr/bin/mail /bin/mail
-
- use static-libs || find "${D}" -name "*.la" -delete
-}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index ad1f1a067ecf..4534454dd3c2 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest
index c3a90d5a2b6a..6498fdc5f9f2 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -1,4 +1,6 @@
DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
+DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560 SHA512 b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
+DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822 SHA512 a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.18.0.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.18.0.ebuild
new file mode 100644
index 000000000000..e7b263ed02b8
--- /dev/null
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.18.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
+KNOTS_PV="${PV}.knots20190502"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitcoind"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+ https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+ https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots libressl"
+
+DEPEND="
+ >=dev-libs/boost-1.52.0:=[threads(+)]
+ dev-libs/libevent:=
+ >=dev-libs/univalue-1.0.4:=
+ !libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/release-notes.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+ if use knots; then
+ elog "You are building ${PN} from Bitcoin Knots."
+ elog "For more information, see:"
+ elog "https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+ else
+ elog "You are building ${PN} from Bitcoin Core."
+ elog "For more information, see:"
+ elog "https://bitcoincore.org/en/2019/05/02/release-${PV}/"
+ fi
+}
+
+src_prepare() {
+ local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+ eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+ if use knots; then
+ eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+ fi
+
+ eapply_user
+
+ echo '#!/bin/true' >share/genbuild.sh || die
+ mkdir -p src/obj || die
+ echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+ eautoreconf
+ rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+ local my_econf=(
+ --disable-asm
+ --without-qtdbus
+ --without-qrencode
+ --without-miniupnpc
+ --disable-tests
+ --disable-wallet
+ --disable-zmq
+ --enable-util-cli
+ --disable-util-tx
+ --disable-util-wallet
+ --disable-bench
+ --without-libs
+ --without-daemon
+ --without-gui
+ --without-rapidcheck
+ --disable-fuzz
+ --disable-ccache
+ --disable-static
+ --with-system-univalue
+ )
+ econf "${my_econf[@]}"
+}
+
+src_install() {
+ default
+
+ newbashcomp contrib/bitcoin-cli.bash-completion ${PN}
+}
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index c3a90d5a2b6a..6498fdc5f9f2 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -1,4 +1,6 @@
DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
+DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560 SHA512 b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
+DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822 SHA512 a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild
new file mode 100644
index 000000000000..f682896336f2
--- /dev/null
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild
@@ -0,0 +1,184 @@
+# Copyright 2010-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DB_VER="4.8"
+inherit autotools bash-completion-r1 db-use gnome2-utils xdg-utils
+
+BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
+KNOTS_PV="${PV}.knots20190502"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+ https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+ https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde knots libressl +qrcode +system-leveldb test upnp +wallet zeromq"
+
+RDEPEND="
+ >=dev-libs/boost-1.52.0:=[threads(+)]
+ >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+ >=dev-libs/univalue-1.0.4:=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ system-leveldb? ( virtual/bitcoin-leveldb )
+ bip70? ( dev-libs/protobuf:= )
+ dbus? ( dev-qt/qtdbus:5 )
+ dev-libs/libevent:=
+ !libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:0= )
+ qrcode? (
+ media-gfx/qrencode:=
+ )
+ upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
+ wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
+ zeromq? ( net-libs/zeromq:= )
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ knots? (
+ gnome-base/librsvg
+ media-gfx/imagemagick[png]
+ )
+"
+
+DOCS=( doc/bips.md doc/bitcoin-conf.md doc/descriptors.md doc/files.md doc/JSON-RPC-interface.md doc/psbt.md doc/reduce-traffic.md doc/release-notes.md doc/REST-interface.md doc/tor.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+ if use knots; then
+ elog "You are building ${PN} from Bitcoin Knots."
+ elog "For more information, see:"
+ elog "https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+ else
+ elog "You are building ${PN} from Bitcoin Core."
+ elog "For more information, see:"
+ elog "https://bitcoincore.org/en/2019/05/02/release-${PV}/"
+ fi
+ if use bitcoin_policy_rbf; then
+ elog "Replace By Fee policy is enabled: Your node will preferentially mine and"
+ elog "relay transactions paying the highest fee, regardless of receive order."
+ else
+ elog "Replace By Fee policy is disabled: Your node will only accept the first"
+ elog "transaction seen consuming a conflicting input, regardless of fee"
+ elog "offered by later ones."
+ fi
+}
+
+src_prepare() {
+ sed -i 's/^\(complete -F _bitcoind \)bitcoind \(bitcoin-qt\)$/\1\2/' contrib/bitcoind.bash-completion || die
+
+ # Save the generic icon for later
+ cp src/qt/res/src/bitcoin.svg bitcoin128.svg || die
+
+ local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+ eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+ if use knots; then
+ eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+ fi
+
+ eapply_user
+
+ if ! use bitcoin_policy_rbf; then
+ sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
+ fi
+
+ echo '#!/bin/true' >share/genbuild.sh || die
+ mkdir -p src/obj || die
+ echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+ eautoreconf
+ rm -r src/secp256k1 || die
+ if use system-leveldb; then
+ rm -r src/leveldb || die
+ fi
+}
+
+src_configure() {
+ local my_econf=(
+ $(use_enable asm)
+ $(use_enable bip70)
+ $(use_with dbus qtdbus)
+ $(use_with qrcode qrencode)
+ $(use_with upnp miniupnpc)
+ $(use_enable upnp upnp-default)
+ $(use_enable test tests)
+ $(use_enable wallet)
+ $(use_enable zeromq zmq)
+ --with-gui=qt5
+ --disable-util-cli
+ --disable-util-tx
+ --disable-util-wallet
+ --disable-bench
+ --without-libs
+ --without-daemon
+ --without-rapidcheck
+ --disable-fuzz
+ --disable-ccache
+ --disable-static
+ $(use_with system-leveldb)
+ --with-system-libsecp256k1
+ --with-system-univalue
+ )
+ econf "${my_econf[@]}"
+}
+
+src_install() {
+ default
+
+ rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+
+ insinto /usr/share/icons/hicolor/scalable/apps/
+ doins bitcoin128.svg
+ if use knots; then
+ newins src/qt/res/src/bitcoin.svg bitcoinknots.svg
+ fi
+
+ insinto /usr/share/applications
+ doins "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop"
+ if ! use knots; then
+ sed -i 's/Knots/Core/;s/^\(Icon=\).*$/\1bitcoin128/' "${D}/usr/share/applications/org.bitcoin.bitcoin-qt.desktop" || die
+ fi
+
+ use zeromq && dodoc doc/zmq.md
+
+ newbashcomp contrib/bitcoind.bash-completion ${PN}
+
+ if use kde; then
+ insinto /usr/share/kservices5
+ doins "${FILESDIR}/bitcoin-qt.protocol"
+ dosym "../../kservices5/bitcoin-qt.protocol" "/usr/share/kde4/services/bitcoin-qt.protocol"
+ fi
+}
+
+update_caches() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postinst() {
+ update_caches
+
+ elog "To have ${PN} automatically use Tor when it's running, be sure your"
+ elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup"
+ elog "correctly, and add your user to the 'tor' user group."
+}
+
+pkg_postrm() {
+ update_caches
+}
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index c3a90d5a2b6a..6498fdc5f9f2 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,4 +1,6 @@
DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
+DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560 SHA512 b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
+DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822 SHA512 a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2
diff --git a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
new file mode 100644
index 000000000000..813f80934912
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DB_VER="4.8"
+inherit autotools bash-completion-r1 db-use systemd user
+
+BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
+KNOTS_PV="${PV}.knots20190502"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+ https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+ https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm +bitcoin_policy_rbf examples knots libressl +system-leveldb test upnp +wallet zeromq"
+
+DEPEND="
+ >=dev-libs/boost-1.52.0:=[threads(+)]
+ dev-libs/libevent:=
+ >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+ >=dev-libs/univalue-1.0.4:=
+ system-leveldb? ( virtual/bitcoin-leveldb )
+ !libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:0= )
+ upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
+ wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
+ zeromq? ( net-libs/zeromq:= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/bitcoin-conf.md doc/descriptors.md doc/files.md doc/JSON-RPC-interface.md doc/psbt.md doc/reduce-traffic.md doc/release-notes.md doc/REST-interface.md doc/tor.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-raii_event_tests-always.patch"
+)
+
+pkg_pretend() {
+ if use knots; then
+ elog "You are building ${PN} from Bitcoin Knots."
+ elog "For more information, see:"
+ elog "https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+ else
+ elog "You are building ${PN} from Bitcoin Core."
+ elog "For more information, see:"
+ elog "https://bitcoincore.org/en/2019/05/02/release-${PV}/"
+ fi
+ if use bitcoin_policy_rbf; then
+ elog "Replace By Fee policy is enabled: Your node will preferentially mine and"
+ elog "relay transactions paying the highest fee, regardless of receive order."
+ else
+ elog "Replace By Fee policy is disabled: Your node will only accept the first"
+ elog "transaction seen consuming a conflicting input, regardless of fee"
+ elog "offered by later ones."
+ fi
+}
+
+pkg_setup() {
+ enewgroup bitcoin
+ enewuser bitcoin -1 -1 /var/lib/bitcoin bitcoin
+}
+
+src_prepare() {
+ sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die
+
+ local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+ eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+ if use knots; then
+ eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+ eapply "${FILESDIR}/${PV}-daemon-fix.patch"
+ fi
+
+ default
+
+ if ! use bitcoin_policy_rbf; then
+ sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
+ fi
+
+ echo '#!/bin/true' >share/genbuild.sh || die
+ mkdir -p src/obj || die
+ echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+ eautoreconf
+ rm -r src/secp256k1 || die
+ if use system-leveldb; then
+ rm -r src/leveldb || die
+ fi
+}
+
+src_configure() {
+ local my_econf=(
+ $(use_enable asm)
+ --without-qtdbus
+ --without-qrencode
+ $(use_with upnp miniupnpc)
+ $(use_enable upnp upnp-default)
+ $(use_enable test tests)
+ $(use_enable wallet)
+ $(use_enable zeromq zmq)
+ --with-daemon
+ --disable-util-cli
+ --disable-util-tx
+ --disable-util-wallet
+ --disable-bench
+ --without-libs
+ --without-gui
+ --without-rapidcheck
+ --disable-fuzz
+ --disable-ccache
+ --disable-static
+ $(use_with system-leveldb)
+ --with-system-libsecp256k1
+ --with-system-univalue
+ )
+ econf "${my_econf[@]}"
+}
+
+src_install() {
+ default
+
+ rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+
+ insinto /etc/bitcoin
+ newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
+ fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+ fperms 600 /etc/bitcoin/bitcoin.conf
+
+ newconfd "contrib/init/bitcoind.openrcconf" ${PN}
+ newinitd "contrib/init/bitcoind.openrc" ${PN}
+ systemd_newunit "contrib/init/bitcoind.service" "bitcoind.service"
+
+ keepdir /var/lib/bitcoin/.bitcoin
+ fperms 700 /var/lib/bitcoin
+ fowners bitcoin:bitcoin /var/lib/bitcoin/
+ fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
+ dosym ../../../../etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
+
+ doman "${FILESDIR}/bitcoin.conf.5"
+
+ use zeromq && dodoc doc/zmq.md
+
+ newbashcomp contrib/${PN}.bash-completion ${PN}
+
+ if use examples; then
+ docinto examples
+ dodoc -r contrib/{linearize,qos}
+ use zeromq && dodoc -r contrib/zmq
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
+}
+
+pkg_postinst() {
+ elog "To have ${PN} automatically use Tor when it's running, be sure your"
+ elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup"
+ elog "correctly, and:"
+ elog "- Using an init script: add the 'bitcoin' user to the 'tor' user group."
+ elog "- Running bitcoind directly: add that user to the 'tor' user group."
+}
diff --git a/net-p2p/bitcoind/files/0.18.0-daemon-fix.patch b/net-p2p/bitcoind/files/0.18.0-daemon-fix.patch
new file mode 100644
index 000000000000..8a6737f88471
--- /dev/null
+++ b/net-p2p/bitcoind/files/0.18.0-daemon-fix.patch
@@ -0,0 +1,12 @@
+--- a/src/support/lockedpool.cpp
++++ b/src/support/lockedpool.cpp
+@@ -250,9 +250,6 @@ void *PosixLockedPageAllocator::AllocateLocked(size_t len, bool *lockingSuccess)
+ addr = mmap(nullptr, len, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+ if (addr) {
+ *lockingSuccess = mlock(addr, len) == 0;
+-#ifdef MADV_DONTFORK
+- madvise(addr, len, MADV_DONTFORK);
+-#endif
+ #ifdef MADV_DONTDUMP
+ madvise(addr, len, MADV_DONTDUMP);
+ #endif
diff --git a/net-p2p/bitcoind/files/bitcoind-0.18.0-raii_event_tests-always.patch b/net-p2p/bitcoind/files/bitcoind-0.18.0-raii_event_tests-always.patch
new file mode 100644
index 000000000000..8148d565967e
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoind-0.18.0-raii_event_tests-always.patch
@@ -0,0 +1,70 @@
+https://github.com/bitcoin/bitcoin/pull/16564
+
+From 272855746b18de76f51e84945d675904e9b907af Mon Sep 17 00:00:00 2001
+From: Craig Andrews
+Date: Wed, 7 Aug 2019 11:38:11 -0400
+Subject: [PATCH] Always define the raii_event_tests test suite
+
+The test suite must always be defined (even when EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED is not defined) so that the test harness doesn't fail due to not being able to find the raii_event_tests test.
+
+This improves upon 95f97f4 actually fixing https://github.com/bitcoin/bitcoin/issues/9493
+---
+ src/test/raii_event_tests.cpp | 24 +++++++++++++++---------
+ 1 file changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/src/test/raii_event_tests.cpp b/src/test/raii_event_tests.cpp
+index bdb411d53f57..6691de882930 100644
+--- a/src/test/raii_event_tests.cpp
++++ b/src/test/raii_event_tests.cpp
+@@ -4,20 +4,28 @@
+
+ #include
+
++#include
++
++#include
++
++BOOST_FIXTURE_TEST_SUITE(raii_event_tests, BasicTestingSetup)
++
++#ifndef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
++BOOST_AUTO_TEST_CASE(raii_event_creation)
++{
++ // dummy; do nothing
++}
++#endif // EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
++
+ #ifdef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
+-// It would probably be ideal to define dummy test(s) that report skipped, but boost::test doesn't seem to make that practical (at least not in versions available with common distros)
+
+ #include